misc: fix potential error

Signed-off-by: jinh0.choi <jinh0.choi@samsung.com>

4 files changed, 26 insertions, 20 deletions

diff --git a/ECP-CLI/src/org/tizen/cli/TizenEmulatorCli.java b/ECP-CLI/src/org/tizen/cli/TizenEmulatorCli.java
index cddb168d..145034f3 100644
--- a/ECP-CLI/src/org/tizen/cli/TizenEmulatorCli.java
+++ b/ECP-CLI/src/org/tizen/cli/TizenEmulatorCli.java
@@ -121,8 +121,16 @@ public class TizenEmulatorCli implements IConnection {
 		}
 
 		SocketClient.getInstance().registerDisconnectListener(this);
-		new Thread(null, new SocketMessage(), SocketConstants.SOCKET_MESSAGE_THREAD).start();
-		MessageSender.getInstance().sendInjectorReq("guest", 15, 0); //$NON-NLS-1$
+		SocketMessage sMessage = new SocketMessage();
+		new Thread(null, sMessage, SocketConstants.SOCKET_MESSAGE_THREAD).start();
+
+		synchronized (sMessage) {
+			try {
+				sMessage.wait(10);
+			} catch (InterruptedException e) {
+				logger.log(Level.WARNING, "Socket Message waiting is interrupted.", e); //$NON-NLS-1$
+			}
+		}
 
 		reader = new ConsoleReader();
 		reader.setBellEnabled(false);
@@ -163,9 +171,8 @@ public class TizenEmulatorCli implements IConnection {
 		}
 
 		String helpString = ""; //$NON-NLS-1$
-		String HELP_USAGE = CLIConstants.STRING_USAGE
-				+ ((CLIManager.getInstance().getSessionMode()) ? "" //$NON-NLS-1$
-						: CLIConstants.CMD_CLI + StringResources.SPACE)
+		String HELP_USAGE = CLIConstants.STRING_USAGE + ((CLIManager.getInstance().getSessionMode()) ? "" //$NON-NLS-1$
+				: CLIConstants.CMD_CLI + StringResources.SPACE)
 				+ ((CLIManager.getInstance().getSessionMode()) ? "" //$NON-NLS-1$
 						: CLIConstants.STRING_TARGET + StringResources.SPACE)
 				+ CLIConstants.STRING_PARAMS + StringResources.NEW_LINE + StringResources.NEW_LINE;
diff --git a/ECP-LIB/src/org/tizen/ecp/sock/SocketMessage.java b/ECP-LIB/src/org/tizen/ecp/sock/SocketMessage.java
index 57e093d0..d3513d5a 100644
--- a/ECP-LIB/src/org/tizen/ecp/sock/SocketMessage.java
+++ b/ECP-LIB/src/org/tizen/ecp/sock/SocketMessage.java
@@ -43,7 +43,7 @@ public class SocketMessage implements Runnable {
 		MessageQueue msgQueue = MessageQueue.getInstance();
 
 		try {
-			Object lock = this;
+			Object lock = this.getClass();
 			synchronized (lock) {
 				lock.notifyAll();
 			}
diff --git a/ECP-UI/src/org/tizen/ecp/control/TizenSpinner.java b/ECP-UI/src/org/tizen/ecp/control/TizenSpinner.java
index edcc7211..8932e9b3 100644
--- a/ECP-UI/src/org/tizen/ecp/control/TizenSpinner.java
+++ b/ECP-UI/src/org/tizen/ecp/control/TizenSpinner.java
@@ -28,7 +28,6 @@
  *
  */
 
-
 package org.tizen.ecp.control;
 
 import java.text.DecimalFormat;
@@ -124,12 +123,10 @@ public class TizenSpinner extends HBox {
 		this.getStyleClass().add("tizen-spinner");
 
 		decrementButton = new SpinnerArrowButton(Images.getImageView(ImageKind.ZOOM_BTN_LEFT_NOR),
-					Images.getImageView(ImageKind.ZOOM_BTN_LEFT_NOR),
-					Images.getImageView(ImageKind.ZOOM_BTN_LEFT_SEL));
+				Images.getImageView(ImageKind.ZOOM_BTN_LEFT_NOR), Images.getImageView(ImageKind.ZOOM_BTN_LEFT_SEL));
 
 		incrementButton = new SpinnerArrowButton(Images.getImageView(ImageKind.ZOOM_BTN_RIGHT_NOR),
-				Images.getImageView(ImageKind.ZOOM_BTN_RIGHT_NOR),
-				Images.getImageView(ImageKind.ZOOM_BTN_RIGHT_SEL));
+				Images.getImageView(ImageKind.ZOOM_BTN_RIGHT_NOR), Images.getImageView(ImageKind.ZOOM_BTN_RIGHT_SEL));
 
 		slider = new Slider();
 		slider.setSkin(new TizenSliderSkin(slider));
@@ -157,8 +154,11 @@ public class TizenSpinner extends HBox {
 			@Override
 			public void handle(ActionEvent event) {
 				String text = textField.getText();
-				double value;
+				if (text == null) {
+					return;
+				}
 
+				double value;
 				try {
 					value = Double.valueOf(text);
 				} catch (NumberFormatException e) {
@@ -172,7 +172,7 @@ public class TizenSpinner extends HBox {
 				}
 
 				if (isInteger) {
-					slider.setValue((int)value);
+					slider.setValue((int) value);
 				} else {
 					if (slider.getValue() == value) {
 						textField.setText(format.format(value));
@@ -184,11 +184,10 @@ public class TizenSpinner extends HBox {
 
 		});
 
-		slider.valueProperty().addListener(new ChangeListener<Number> () {
+		slider.valueProperty().addListener(new ChangeListener<Number>() {
 
 			@Override
-			public void changed(ObservableValue<? extends Number> observable,
-					Number oldValue, Number newValue) {
+			public void changed(ObservableValue<? extends Number> observable, Number oldValue, Number newValue) {
 				textField.setText(format.format(newValue));
 			}
 
@@ -212,7 +211,7 @@ public class TizenSpinner extends HBox {
 
 		});
 
-		incrementButton.setOnMouseClick(new EventHandler<MouseEvent>(){
+		incrementButton.setOnMouseClick(new EventHandler<MouseEvent>() {
 
 			@Override
 			public void handle(MouseEvent event) {
diff --git a/ECP-UI/src/org/tizen/ecp/dialog/DialogPane.java b/ECP-UI/src/org/tizen/ecp/dialog/DialogPane.java
index 1f5e7b6d..f52f1a47 100644
--- a/ECP-UI/src/org/tizen/ecp/dialog/DialogPane.java
+++ b/ECP-UI/src/org/tizen/ecp/dialog/DialogPane.java
@@ -369,10 +369,10 @@ public class DialogPane {
 			if (button instanceof Button) {
 				ButtonData buttonType = cmd.getButtonData();
 
-				button.setDefaultButton(!hasDefault && buttonType != null && buttonType.isDefaultButton());
-				button.setCancelButton(buttonType != null && buttonType.isCancelButton());
+				button.setDefaultButton(!hasDefault && buttonType.isDefaultButton());
+				button.setCancelButton(buttonType.isCancelButton());
 
-				hasDefault |= buttonType != null && buttonType.isDefaultButton();
+				hasDefault |= buttonType.isDefaultButton();
 			}
 			buttonBar.getButtons().add(button);
 		}