[Title]fixed emulator lock up when battery level changing rapidly

[Type]Bugfix
[Module]eventinjector-eplugin
[Priority]Major
[Jira#]Nabi_SE/N_SE-2498
[Redmine#] 	// Redmine Isuue Number
[Problem] 	// Problem Description
[Cause] 	// Cause Description
[Solution]	// Solution Description
[TestCase] 	// Executed the test-target (How to)

diff --git a/org.tizen.device/src/org/tizen/device/battery/page/BatteryPage.java b/org.tizen.device/src/org/tizen/device/battery/page/BatteryPage.java
index cd3c898..220c98c 100644 (file)
--- a/org.tizen.device/src/org/tizen/device/battery/page/BatteryPage.java
+++ b/org.tizen.device/src/org/tizen/device/battery/page/BatteryPage.java
@@ -56,7 +56,7 @@ public class BatteryPage extends AbstractInjectorPage implements ISelectionListe
        private final String levelNumber = "8\n";
        private final String batteryLevel = "Level    : ";
        private final String batteryCharger = "Charger : ";
-       private int sendData = 100;
+       private int sendData = 100, preSendData = -1;
        private Button radioButton[];
        private int sensorOn;
        private IDevice currentDevice;
@@ -71,14 +71,16 @@ public class BatteryPage extends AbstractInjectorPage implements ISelectionListe
                InjectorView.getDefault().addSelectionListener(this);
                sensorOn = 0;
                
-               Composite mainComposite = formUtil.createComposite(parent, 3);
+               Composite mainComposite = formUtil.createComposite(parent, 4);
                formUtil.createLabel(mainComposite, batteryLevel);
                slider = formUtil.createSlider(mainComposite, SWT.HORIZONTAL);
                slider.setValues(100, 1, 101, 1, 1, 1);
                slider.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-               sliderText = formUtil.createText(mainComposite, Integer.toString(slider.getSelection()));
-               sliderText.setEditable(false);
-               GridData gd = new GridData(GridData.BEGINNING, GridData.CENTER, false, false);
+               sliderText = new Text(mainComposite, SWT.COLOR_BLACK);
+               sliderText.setText(String.format("%d", slider.getSelection()));
+               sliderText.setEnabled(false);
+               
+               GridData gd = new GridData(GridData.CENTER, GridData.CENTER, false, false);
                gd.widthHint = 24;
                sliderText.setLayoutData(gd);
                sendData = slider.getSelection();
@@ -96,20 +98,28 @@ public class BatteryPage extends AbstractInjectorPage implements ISelectionListe
                        }
                });
                
-               slider.addMouseListener(new MouseListener() {
+               Button sendButton = formUtil.createButton(mainComposite, "Send", SWT.PUSH);
+               gd = new GridData(SWT.NONE, SWT.FILL, false, true);
+               gd.widthHint = 50;
+               sendButton.setLayoutData(gd);
+               
+               sendButton.addMouseListener(new MouseListener() {
                        @Override
                        public void mouseDoubleClick(MouseEvent e) {
+                               // TODO Auto-generated method stub
                        }
                        @Override
                        public void mouseDown(MouseEvent e) {
+                               // TODO Auto-generated method stub
                        }
                        @Override
                        public void mouseUp(MouseEvent e) {
+                               // TODO Auto-generated method stub
                                sendMessage(sendData, sensorOn);
                        }
                });
                
-               slider.addKeyListener(new KeyListener() {
+               sendButton.addKeyListener(new KeyListener() {
                        @Override
                        public void keyPressed(KeyEvent e) {
                                // TODO Auto-generated method stub
@@ -117,10 +127,13 @@ public class BatteryPage extends AbstractInjectorPage implements ISelectionListe
                        @Override
                        public void keyReleased(KeyEvent e) {
                                // TODO Auto-generated method stub
-                               sendMessage(sendData, sensorOn);
+                               if(e.keyCode == 13)     // enter
+                               {
+                                       radioButton[0].setFocus();              
+                               }
                        }
                });
-
+               
                Composite secondComposite = formUtil.createComposite(parent, 5);
                formUtil.createLabel(secondComposite, batteryCharger);
                radioButton = new Button[2];
@@ -177,6 +190,9 @@ public class BatteryPage extends AbstractInjectorPage implements ISelectionListe
                
        }
        public void sendMessage(int level, int charger) {
+                       if(preSendData == sendData)
+                               return;
+                       
                        TestSensorMessage msg = new TestSensorMessage(level, charger);
                        try {
                        //      sensorSocket.send(levelNumber + msg.getMessage());
@@ -185,6 +201,7 @@ public class BatteryPage extends AbstractInjectorPage implements ISelectionListe
                                // TODO Auto-generated catch block
                                e1.printStackTrace();
                        }
+                       preSendData = sendData;
        }
 
 //     @Override

diff --git a/org.tizen.device/src/org/tizen/device/earjack/page/EarjackPage.java b/org.tizen.device/src/org/tizen/device/earjack/page/EarjackPage.java
index c265083..da400a8 100644 (file)
--- a/org.tizen.device/src/org/tizen/device/earjack/page/EarjackPage.java
+++ b/org.tizen.device/src/org/tizen/device/earjack/page/EarjackPage.java
@@ -26,6 +26,8 @@
 
 package org.tizen.device.earjack.page;
 
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.widgets.Button;

diff --git a/org.tizen.device/src/org/tizen/device/rssi/page/RssiPage.java b/org.tizen.device/src/org/tizen/device/rssi/page/RssiPage.java
index 82f533a..4327c15 100644 (file)
--- a/org.tizen.device/src/org/tizen/device/rssi/page/RssiPage.java
+++ b/org.tizen.device/src/org/tizen/device/rssi/page/RssiPage.java
@@ -75,8 +75,9 @@ public class RssiPage extends AbstractInjectorPage implements ISelectionListener
                slider = formUtil.createSlider(mainComposite, SWT.HORIZONTAL);
                slider.setValues(5, 0, 6, 1, 1, 1);
                slider.setLayoutData(new GridData(GridData.FILL, GridData.CENTER, true, false));
-               sliderText = formUtil.createText(mainComposite, Integer.toString(slider.getSelection()));
-               sliderText.setEditable(false);
+               sliderText = new Text(mainComposite, SWT.COLOR_BLACK);
+               sliderText.setText(String.format("%d", slider.getSelection()));
+               sliderText.setEnabled(false);
                GridData gd = new GridData(GridData.BEGINNING, GridData.CENTER, false, false);
                gd.widthHint = 10;
                sliderText.setLayoutData(gd);

diff --git a/org.tizen.device/src/org/tizen/device/usb/page/UsbPage.java b/org.tizen.device/src/org/tizen/device/usb/page/UsbPage.java
index d1ef304..9dbe39a 100644 (file)
--- a/org.tizen.device/src/org/tizen/device/usb/page/UsbPage.java
+++ b/org.tizen.device/src/org/tizen/device/usb/page/UsbPage.java
@@ -26,6 +26,8 @@
 
 package org.tizen.device.usb.page;
 
+import org.eclipse.swt.events.KeyEvent;
+import org.eclipse.swt.events.KeyListener;
 import org.eclipse.swt.events.SelectionAdapter;
 import org.eclipse.swt.events.SelectionEvent;
 import org.eclipse.swt.widgets.Button;

diff --git a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/Accelerometer.java b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/Accelerometer.java
index a9b69cf..2a3cfe9 100644 (file)
--- a/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/Accelerometer.java
+++ b/org.tizen.sensor.accelerometer/src/org/tizen/sensor/accelerometer/page/Accelerometer.java
@@ -175,7 +175,7 @@ public class Accelerometer extends AbstractInjectorPage {
                gd = new GridData(GridData.CENTER, GridData.CENTER, true, false);
                gd.widthHint = 200;
                dataText.setLayoutData(gd);
-               
+               dataText.setEnabled(false);
                dataOutputTimer = new Timer(200, new ActionListener() {
             public void actionPerformed(ActionEvent evt) {
                if (PlatformUI.isWorkbenchRunning() == false){

diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 1778b94..b6a76c1 100644 (file)
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Package:eventinjector-eplugin
-Version:0.2.27
+Version:0.2.28
 OS:linux
 Build-host-os:linux
 Maintainer:yeongkyoon Lee <yeongkyoon.lee@samsung.com>, sungmin Ha <sungmin82.ha@samsung.com>
@@ -9,7 +9,7 @@ Install-dependency:common-eplugin[linux], base-ide-product[linux]
 Source:eventinjector-eplugin
 
 Package:eventinjector-eplugin
-Version:0.2.27
+Version:0.2.28
 OS:windows
 Build-host-os:linux
 Maintainer:yeongkyoon Lee <yeongkyoon.lee@samsung.com>, sungmin Ha <sungmin82.ha@samsung.com>