From: gune.kim Date: Sun, 12 Jun 2011 13:12:57 +0000 (+0900) Subject: Modify: event injector enable X-Git-Tag: 2.2.1_release^2~172^2~78 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=dae931902a0edcb50f7576b50f65f3d4cf697072;p=sdk%2Femulator%2Feventinjector-eplugin.git Modify: event injector enable --- diff --git a/com.samsung.linuxplatform.injector/bin/com/samsung/linuxplatform/injector/view/InjectorView.class b/com.samsung.linuxplatform.injector/bin/com/samsung/linuxplatform/injector/view/InjectorView.class index 5f3ed34..cfc45dc 100644 Binary files a/com.samsung.linuxplatform.injector/bin/com/samsung/linuxplatform/injector/view/InjectorView.class and b/com.samsung.linuxplatform.injector/bin/com/samsung/linuxplatform/injector/view/InjectorView.class differ diff --git a/com.samsung.linuxplatform.injector/src/com/samsung/linuxplatform/injector/view/InjectorView.java b/com.samsung.linuxplatform.injector/src/com/samsung/linuxplatform/injector/view/InjectorView.java index 0def124..7d26911 100644 --- a/com.samsung.linuxplatform.injector/src/com/samsung/linuxplatform/injector/view/InjectorView.java +++ b/com.samsung.linuxplatform.injector/src/com/samsung/linuxplatform/injector/view/InjectorView.java @@ -265,18 +265,6 @@ public class InjectorView extends ViewPart implements job.schedule(); } } - - @Override - public void StatusChanged(int Event) { -// if( DeviceManager.getSelectedDevice().getMachineType() == IMachine.VIRTUAL_DEVICE){ -// if (Event == IDeviceListener.RUNNING) { -// connect(); -// } -// else if( Event == IDeviceListener.NOT_RUNNING){ -// disconnect(); -// } -// } - } public ArrayList getCategoryList() { return this.categoryList; @@ -294,7 +282,8 @@ public class InjectorView extends ViewPart implements @Override public void ConnectionChanged() { - if (DeviceChecker.hasActiveVirtualDevice( DeviceManager.getSelectedDevice().getMachineId() )) { +// if (DeviceChecker.hasActiveVirtualDevice( DeviceManager.getSelectedDevice().getMachineId() )) { + if (DeviceChecker.hasActiveVirtualDevice( null )) { connect(); } else { diff --git a/com.samsung.linuxplatform.location.core/bin/com/samsung/linuxplatform/location/core/injector/LocationInjector.class b/com.samsung.linuxplatform.location.core/bin/com/samsung/linuxplatform/location/core/injector/LocationInjector.class index 529642d..f3965c4 100644 Binary files a/com.samsung.linuxplatform.location.core/bin/com/samsung/linuxplatform/location/core/injector/LocationInjector.class and b/com.samsung.linuxplatform.location.core/bin/com/samsung/linuxplatform/location/core/injector/LocationInjector.class differ diff --git a/com.samsung.linuxplatform.location.core/src/com/samsung/linuxplatform/location/core/injector/LocationInjector.java b/com.samsung.linuxplatform.location.core/src/com/samsung/linuxplatform/location/core/injector/LocationInjector.java index 64eef43..e6fcec2 100644 --- a/com.samsung.linuxplatform.location.core/src/com/samsung/linuxplatform/location/core/injector/LocationInjector.java +++ b/com.samsung.linuxplatform.location.core/src/com/samsung/linuxplatform/location/core/injector/LocationInjector.java @@ -184,21 +184,8 @@ public class LocationInjector implements IDeviceListener { } @Override - public void StatusChanged(int Event) { - // TODO Auto-generated method stub - if( DeviceManager.getSelectedDevice().getMachineType() == IMachine.VIRTUAL_DEVICE){ - if (Event == IDeviceListener.RUNNING) { - connect(); - } - else if( Event == IDeviceListener.NOT_RUNNING){ - disconnect(); - } - } - } - - @Override public void ConnectionChanged() { - if (DeviceChecker.hasActiveVirtualDevice( DeviceManager.getSelectedDevice().getMachineId() )) { + if (DeviceChecker.hasActiveVirtualDevice( null )) { connect(); } else { diff --git a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$10.class b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$10.class index 540c1c0..7bdbdd5 100644 Binary files a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$10.class and b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$10.class differ diff --git a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$11.class b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$11.class index 282d7de..5de8933 100644 Binary files a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$11.class and b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$11.class differ diff --git a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$12.class b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$12.class index 5f94ca5..57ecf16 100644 Binary files a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$12.class and b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$12.class differ diff --git a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$13.class b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$13.class index 7fa73e3..d3ec2fc 100644 Binary files a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$13.class and b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$13.class differ diff --git a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$14.class b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$14.class index 12546bc..a2b6eef 100644 Binary files a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$14.class and b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$14.class differ diff --git a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$15.class b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$15.class index b615819..28e1950 100644 Binary files a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$15.class and b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$15.class differ diff --git a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$16.class b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$16.class index e812450..954ce9e 100644 Binary files a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$16.class and b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$16.class differ diff --git a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$17.class b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$17.class index ad80776..f3c9bce 100644 Binary files a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$17.class and b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$17.class differ diff --git a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$18.class b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$18.class index bf2082f..5e8d90b 100644 Binary files a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$18.class and b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$18.class differ diff --git a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$19.class b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$19.class index 443e451..f467761 100644 Binary files a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$19.class and b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$19.class differ diff --git a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$20.class b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$20.class index c9bf26c..77cf008 100644 Binary files a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$20.class and b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$20.class differ diff --git a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$21.class b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$21.class index e972975..63a2bbe 100644 Binary files a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$21.class and b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$21.class differ diff --git a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$22.class b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$22.class index 32c96c3..13494ae 100644 Binary files a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$22.class and b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$22.class differ diff --git a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$23.class b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$23.class index 7306d65..5010775 100644 Binary files a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$23.class and b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$23.class differ diff --git a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$4$1.class b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$4$1.class index 75fa44f..c2fdcd2 100644 Binary files a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$4$1.class and b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$4$1.class differ diff --git a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$4.class b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$4.class index 797ebf5..cf192a4 100644 Binary files a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$4.class and b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$4.class differ diff --git a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$5.class b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$5.class index ec6093f..0dbcab3 100644 Binary files a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$5.class and b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$5.class differ diff --git a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$6.class b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$6.class index b05ed2a..c7e840a 100644 Binary files a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$6.class and b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$6.class differ diff --git a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$7.class b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$7.class index 926a65c..f68b686 100644 Binary files a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$7.class and b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$7.class differ diff --git a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$8.class b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$8.class index 3d616cd..ebaf11f 100644 Binary files a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$8.class and b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$8.class differ diff --git a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$9.class b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$9.class index 82f9441..4b753cf 100644 Binary files a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$9.class and b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$9.class differ diff --git a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$Mode.class b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$Mode.class index d7be57c..98b4551 100644 Binary files a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$Mode.class and b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer$Mode.class differ diff --git a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer.class b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer.class index 9e1e05c..77cc0d2 100644 Binary files a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer.class and b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer.class differ diff --git a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/MobilePanel.class b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/MobilePanel.class index ef9566d..f6b1925 100644 Binary files a/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/MobilePanel.class and b/com.samsung.linuxplatform.sensor.accelerometer/bin/com/samsung/linuxplatform/sensor/accelerometer/page/MobilePanel.class differ diff --git a/com.samsung.linuxplatform.sensor.accelerometer/src/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer.java b/com.samsung.linuxplatform.sensor.accelerometer/src/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer.java index 834ed1d..f861987 100644 --- a/com.samsung.linuxplatform.sensor.accelerometer/src/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer.java +++ b/com.samsung.linuxplatform.sensor.accelerometer/src/com/samsung/linuxplatform/sensor/accelerometer/page/Accelerometer.java @@ -119,8 +119,15 @@ public class Accelerometer extends AbstractInjectorPage { gd = new GridData(GridData.FILL, GridData.CENTER, true, false); dataText.setLayoutData(gd); - dataOutputTimer = new Timer(100, new ActionListener() { + dataOutputTimer = new Timer(300, new ActionListener() { public void actionPerformed(ActionEvent evt) { + if (PlatformUI.isWorkbenchRunning() == false){ + return; + } + if( PlatformUI.getWorkbench().isClosing() == true){ + return; + } + PlatformUI.getWorkbench().getDisplay().asyncExec(new Runnable(){ @Override public void run() { @@ -265,62 +272,6 @@ public class Accelerometer extends AbstractInjectorPage { super.widgetSelected(e); } }); - -// Composite magneticSection = formUtil.createSection(mainComposite, "GeoMagnetic filed"); -// createMagenticInput(magneticSection); -// Composite magneticComposite = formUtil.createComposite(magneticSection, 3); -// formUtil.createLabel(magneticComposite, "North component : "); -// Text northText = formUtil.createText(magneticComposite, String.valueOf(north)); -// northText.setTextLimit(10); -// formUtil.createLabel(magneticComposite, "nT"); -// formUtil.createLabel(magneticComposite, "East component : "); -// Text eastText = formUtil.createText(magneticComposite, String.valueOf(east)); -// eastText.setTextLimit(10); -// formUtil.createLabel(magneticComposite, "nT"); -// formUtil.createLabel(magneticComposite, "Vertical component : "); -// Text verticalText = formUtil.createText(magneticComposite, String.valueOf(vertical)); -// verticalText.setTextLimit(10); -// formUtil.createLabel(magneticComposite, "nT"); -// northText.addModifyListener(new ModifyListener(){ -// @Override -// public void modifyText(ModifyEvent e) { -// try{ -// north = Double.parseDouble(((Text)e.widget).getText()); -// } -// catch (NumberFormatException nfe) { -// int caret = ((Text)e.widget).getCaretPosition(); -// ((Text)e.widget).setText(String.valueOf(north)); -// ((Text)e.widget).setSelection(caret-1, caret-1); -// } -// } -// }); -// eastText.addModifyListener(new ModifyListener(){ -// @Override -// public void modifyText(ModifyEvent e) { -// try{ -// east = Double.parseDouble(((Text)e.widget).getText()); -// } -// catch (NumberFormatException nfe) { -// int caret = ((Text)e.widget).getCaretPosition(); -// ((Text)e.widget).setText(String.valueOf(east)); -// ((Text)e.widget).setSelection(caret-1, caret-1); -// System.out.println(caret); -// } -// } -// }); -// verticalText.addModifyListener(new ModifyListener(){ -// @Override -// public void modifyText(ModifyEvent e) { -// try{ -// vertical = Double.parseDouble(((Text)e.widget).getText()); -// } -// catch (NumberFormatException nfe) { -// int caret = ((Text)e.widget).getCaretPosition(); -// ((Text)e.widget).setText(String.valueOf(vertical)); -// ((Text)e.widget).setSelection(caret-1, caret-1); -// } -// } -// }); } @Override @@ -341,15 +292,6 @@ public class Accelerometer extends AbstractInjectorPage { } @Override public void widgetSelected(SelectionEvent e) { -// rollSlider.setSelection(90+180); -// pitchSlider.setSelection(-90+180); -// yawSlider.setSelection(90+180); -// rollValue = 90; -// pitchValue = -90; -// yawValue = 90; -// panel.rollDegree = rollValue; -// panel.pitchDegree = pitchValue; -// panel.yawDegree = yawValue; double axisX[] = {1,0,0}; double axisY[] = {0,0,1}; double axisZ[] = {0,-1,0}; @@ -365,15 +307,6 @@ public class Accelerometer extends AbstractInjectorPage { } @Override public void widgetSelected(SelectionEvent e) { -// rollSlider.setSelection(90+180); -// pitchSlider.setSelection(-180+180); -// yawSlider.setSelection(90+180); -// rollValue = 90; -// pitchValue = -180; -// yawValue = 90; -// panel.rollDegree = rollValue; -// panel.pitchDegree = pitchValue; -// panel.yawDegree = yawValue; double axisX[] = {0,0,1}; double axisY[] = {-1,0,0}; double axisZ[] = {0,-1,0}; @@ -391,15 +324,6 @@ public class Accelerometer extends AbstractInjectorPage { } @Override public void widgetSelected(SelectionEvent e) { -// rollSlider.setSelection(90+180); -// pitchSlider.setSelection(90+180); -// yawSlider.setSelection(90+180); -// rollValue = 90; -// pitchValue = 90; -// yawValue = 90; -// panel.rollDegree = rollValue; -// panel.pitchDegree = pitchValue; -// panel.yawDegree = yawValue; double axisX[] = {-1,0,0}; double axisY[] = {0,0,-1}; double axisZ[] = {0,-1,0}; @@ -417,15 +341,6 @@ public class Accelerometer extends AbstractInjectorPage { } @Override public void widgetSelected(SelectionEvent e) { -// rollSlider.setSelection(90+180); -// pitchSlider.setSelection(0+180); -// yawSlider.setSelection(90+180); -// rollValue = 90; -// pitchValue = 0; -// yawValue = 90; -// panel.rollDegree = rollValue; -// panel.pitchDegree = pitchValue; -// panel.yawDegree = yawValue; double axisX[] = {0,0,-1}; double axisY[] = {1,0,0}; double axisZ[] = {0,-1,0}; diff --git a/com.samsung.linuxplatform.sensor.accelerometer/src/com/samsung/linuxplatform/sensor/accelerometer/page/MobilePanel.java b/com.samsung.linuxplatform.sensor.accelerometer/src/com/samsung/linuxplatform/sensor/accelerometer/page/MobilePanel.java index ef41656..c0b2172 100644 --- a/com.samsung.linuxplatform.sensor.accelerometer/src/com/samsung/linuxplatform/sensor/accelerometer/page/MobilePanel.java +++ b/com.samsung.linuxplatform.sensor.accelerometer/src/com/samsung/linuxplatform/sensor/accelerometer/page/MobilePanel.java @@ -890,21 +890,8 @@ private void updateSensorGyro(){ } @Override - public void StatusChanged(int Event) { -// if( DeviceManager.getSelectedDevice().getMachineType() == IMachine.VIRTUAL_DEVICE){ -// if (Event == IDeviceListener.RUNNING) { -// connect(); -// } -// else if( Event == IDeviceListener.NOT_RUNNING){ -// disconnect(); -// } -// } - - } - - @Override public void ConnectionChanged() { - if (DeviceChecker.hasActiveVirtualDevice( DeviceManager.getSelectedDevice().getMachineId() )) { + if (DeviceChecker.hasActiveVirtualDevice( null )) { connect(); } else { diff --git a/com.samsung.linuxplatform.sensor.light/bin/com/samsung/linuxplatform/sensor/light/page/LightPage.class b/com.samsung.linuxplatform.sensor.light/bin/com/samsung/linuxplatform/sensor/light/page/LightPage.class index 442314f..140c286 100644 Binary files a/com.samsung.linuxplatform.sensor.light/bin/com/samsung/linuxplatform/sensor/light/page/LightPage.class and b/com.samsung.linuxplatform.sensor.light/bin/com/samsung/linuxplatform/sensor/light/page/LightPage.class differ diff --git a/com.samsung.linuxplatform.sensor.light/src/com/samsung/linuxplatform/sensor/light/page/LightPage.java b/com.samsung.linuxplatform.sensor.light/src/com/samsung/linuxplatform/sensor/light/page/LightPage.java index dca56ea..dd3a551 100644 --- a/com.samsung.linuxplatform.sensor.light/src/com/samsung/linuxplatform/sensor/light/page/LightPage.java +++ b/com.samsung.linuxplatform.sensor.light/src/com/samsung/linuxplatform/sensor/light/page/LightPage.java @@ -100,22 +100,17 @@ public class LightPage extends AbstractInjectorPage implements IDeviceListener { timer.stop(); } } - - @Override - public void StatusChanged(int Event) { -// if( DeviceManager.getSelectedDevice().getMachineType() == IMachine.VIRTUAL_DEVICE){ -// if (Event == IDeviceListener.RUNNING) { -// connect(); -// } -// else if( Event == IDeviceListener.NOT_RUNNING){ -// disconnect(); -// } -// } - } + + @Override + protected void finalize() throws Throwable { + DeviceLauncherManager.removeDeviceListener(this); +// TargetConnectionControl.removeTargetConnectionListener(this); + super.finalize(); + } @Override public void ConnectionChanged() { - if (DeviceChecker.hasActiveVirtualDevice( DeviceManager.getSelectedDevice().getMachineId() )) { + if (DeviceChecker.hasActiveVirtualDevice( null)) { connect(); } else { diff --git a/com.samsung.linuxplatform.sensor.proximity/bin/com/samsung/linuxplatform/sensor/proximity/page/ProximityPage.class b/com.samsung.linuxplatform.sensor.proximity/bin/com/samsung/linuxplatform/sensor/proximity/page/ProximityPage.class index 66b85be..280ea22 100644 Binary files a/com.samsung.linuxplatform.sensor.proximity/bin/com/samsung/linuxplatform/sensor/proximity/page/ProximityPage.class and b/com.samsung.linuxplatform.sensor.proximity/bin/com/samsung/linuxplatform/sensor/proximity/page/ProximityPage.class differ diff --git a/com.samsung.linuxplatform.sensor.proximity/src/com/samsung/linuxplatform/sensor/proximity/page/ProximityPage.java b/com.samsung.linuxplatform.sensor.proximity/src/com/samsung/linuxplatform/sensor/proximity/page/ProximityPage.java index 4f5227f..ef68f02 100644 --- a/com.samsung.linuxplatform.sensor.proximity/src/com/samsung/linuxplatform/sensor/proximity/page/ProximityPage.java +++ b/com.samsung.linuxplatform.sensor.proximity/src/com/samsung/linuxplatform/sensor/proximity/page/ProximityPage.java @@ -109,22 +109,17 @@ public class ProximityPage extends AbstractInjectorPage implements IDeviceListen timer.stop(); } } - - @Override - public void StatusChanged(int Event) { -// if( DeviceManager.getSelectedDevice().getMachineType() == IMachine.VIRTUAL_DEVICE){ -// if (Event == IDeviceListener.RUNNING) { -// connect(); -// } -// else if( Event == IDeviceListener.NOT_RUNNING){ -// disconnect(); -// } -// } - } + + @Override + protected void finalize() throws Throwable { + DeviceLauncherManager.removeDeviceListener(this); +// TargetConnectionControl.removeTargetConnectionListener(this); + super.finalize(); + } @Override public void ConnectionChanged() { - if (DeviceChecker.hasActiveVirtualDevice( DeviceManager.getSelectedDevice().getMachineId() )) { + if (DeviceChecker.hasActiveVirtualDevice( null )) { connect(); } else {