menu: modified popup message

modified popup message for screenshot window

Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSdlSkin.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSdlSkin.java
index baf86ad7d0564729d2b0c215a9ae27033d9dd662..5dac1956bd3a9774d43cfa3d6b9f4379f9394055 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSdlSkin.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSdlSkin.java
@@ -132,17 +132,17 @@ public class EmulatorSdlSkin extends EmulatorSkin {
 
                } catch (ScreenShotException ex) {
                        screenShotDialog = null;
-
                        logger.log(Level.SEVERE, ex.getMessage(), ex);
+
                        SkinUtil.openMessage(shell, null,
                                        "Fail to create a screen shot.", SWT.ICON_ERROR, config);
                } catch (Exception ex) {
                        screenShotDialog = null;
-
-                       /* defense exception handling */
                        logger.log(Level.SEVERE, ex.getMessage(), ex);
-                       String errorMessage = "Internal Error.\n[" + ex.getMessage() + "]";
-                       SkinUtil.openMessage(shell, null, errorMessage, SWT.ICON_ERROR, config);
+
+                       SkinUtil.openMessage(shell, null, "ScreenShot is not ready.\n" +
+                                       "Please wait until the emulator is completely boot up.",
+                                       SWT.ICON_WARNING, config);
                }
        }
 

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java
index 0eb4dbaf3899b7e1f077e129a351dea19055ff4f..c75613a81db36522b61bb0af8420126d9cee2b23 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorShmSkin.java
@@ -248,18 +248,19 @@ public class EmulatorShmSkin extends EmulatorSkin {
                        screenShotDialog.open();
 
                } catch (ScreenShotException ex) {
+                       screenShotDialog = null;
                        logger.log(Level.SEVERE, ex.getMessage(), ex);
+
                        SkinUtil.openMessage(shell, null,
                                        "Fail to create a screen shot.", SWT.ICON_ERROR, config);
 
                } catch (Exception ex) {
-                       // defense exception handling.
+                       screenShotDialog = null;
                        logger.log(Level.SEVERE, ex.getMessage(), ex);
-                       String errorMessage = "Internal Error.\n[" + ex.getMessage() + "]";
-                       SkinUtil.openMessage(shell, null, errorMessage, SWT.ICON_ERROR, config);
 
-               } finally {
-                       screenShotDialog = null;
+                       SkinUtil.openMessage(shell, null, "ScreenShot is not ready.\n" +
+                                       "Please wait until the emulator is completely boot up.",
+                                       SWT.ICON_WARNING, config);
                }
        }
 }

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
index f5eab8fb0cea6addbae51778c87084f9feac51e3..1e45b9e5f700eb35f9eecf2201877dd2a5a7c1b1 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/EmulatorSkin.java
@@ -1121,8 +1121,8 @@ public class EmulatorSkin {
                        @Override
                        public void widgetSelected(SelectionEvent e) {
                                if (!communicator.isSensorDaemonStarted()) {
-                                       SkinUtil.openMessage(shell, null,
-                                                       "SDB is not ready.\nPlease wait until the emulator is completely boot up.",
+                                       SkinUtil.openMessage(shell, null, "SDB is not ready.\n" +
+                                                       "Please wait until the emulator is completely boot up.",
                                                        SWT.ICON_WARNING, config);
                                        return;
                                }

diff --git a/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/SdlScreenShotWindow.java b/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/SdlScreenShotWindow.java
index 24bfc4c0db02989c26554da75f5dea25e49d9978..6d34eab2ffdc177a4c605628dbc98aad8d100ee2 100644 (file)
--- a/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/SdlScreenShotWindow.java
+++ b/tizen/src/skin/client/src/org/tizen/emulator/skin/screenshot/SdlScreenShotWindow.java
@@ -57,7 +57,7 @@ public class SdlScreenShotWindow extends ScreenShotDialog {
                        EmulatorConfig config, Image icon) throws ScreenShotException {
                super(parent, communicator, emulatorSkin, config, icon);
        }
-       
+
        protected void capture() throws ScreenShotException {
                DataTranfer dataTranfer = communicator.sendToQEMU( SendCommand.SCREEN_SHOT, null, true );
                byte[] receivedData = communicator.getReceivedData( dataTranfer );