INTERNAL: refactor DAResult and warning dialog

refactor DAResult
add global function to show warning dialog with message or DAResult

Change-Id: I15d7fdbb5e02645311dd12cab13b1911a32b9798
Signed-off-by: greatim <jaewon81.lim@samsung.com>

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AutoStartManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AutoStartManager.java
index a9e06c6..d003153 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AutoStartManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AutoStartManager.java
@@ -26,19 +26,15 @@
 
 package org.tizen.dynamicanalyzer.common;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
 import org.tizen.dynamicanalyzer.communicator.DACommunicator;
 import org.tizen.dynamicanalyzer.constant.CommonConstants;
+import org.tizen.dynamicanalyzer.handlers.UIAction;
 import org.tizen.dynamicanalyzer.model.DeviceInfo;
 import org.tizen.dynamicanalyzer.nl.UserErrorWarningLabels;
 import org.tizen.dynamicanalyzer.project.PackageInfo;
-import org.tizen.dynamicanalyzer.resources.ImageResources;
 import org.tizen.dynamicanalyzer.ui.toolbar.Toolbar;
 import org.tizen.dynamicanalyzer.util.Logger;
-import org.tizen.dynamicanalyzer.util.WorkbenchUtil;
-import org.tizen.dynamicanalyzer.widgets.da.base.DADialog;
 import org.tizen.dynamicanalyzer.workbench.SingletonFocusManager;
 
 public class AutoStartManager implements Runnable {
@@ -120,16 +116,12 @@ public class AutoStartManager implements Runnable {
                if (null == pkgInfo) {
                        Display.getDefault().syncExec(new Runnable() {
                                public void run() {
-                                       Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell();
-                                       DADialog warning = new DADialog(shell, SWT.NONE);
                                        String name = appName;
                                        if (name.length() > APPNAME_LENGTH) {
                                                name = appName.substring(0, APPNAME_LENGTH - 1) + "...";//$NON-NLS-1$ 
                                        }
-                                       warning.setMessage(name + CommonConstants.SPACE
+                                       UIAction.showWarning(name + CommonConstants.SPACE
                                                        + UserErrorWarningLabels.ERROR_NONEXIST_APPLICATION);
-                                       warning.setIcon(ImageResources.DIALOG_WARNING_ICON);
-                                       warning.open();
 
                                        Toolbar.INSTANCE.setAllControlState(true);
                                }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DAResult.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DAResult.java
index 58da229..b6f21bd 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DAResult.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DAResult.java
@@ -29,10 +29,9 @@ import org.tizen.dynamicanalyzer.nl.UserErrorWarningLabels;
 import org.tizen.dynamicanalyzer.util.Logger;
 
 public enum DAResult {
-       SUCCESS(0, "Success!"),
-       ERR_EXCEPTION_OCCURRED(-1, "Excpetion occurred "),
-       
-       // error from target (3 digits) ( -100 ~ -999 )
+       SUCCESS(0, "Success!"), ERR_EXCEPTION_OCCURRED(-1, "Excpetion occurred "),
+
+       // error that is not shown to the user (3 digits) ( -100 ~ -999 )
        ERR_INVALID_VERSION(-100, "not supported version "),
        ERR_REMOTE_PORT_GET_FAILED(-101, "remote port get failed!!"),
        ERR_CONTROL_SOCKET_CREATION_FAIL(-102, "control socket creation is failed "),
@@ -43,21 +42,15 @@ public enum DAResult {
        ERR_SDB_PUSH_FAILED(-203, "sdb push returns null"),
        ERR_READELF_SIZE_GET_FAILED(-204, "readelf size get failed"),
        ERR_READELF_UPLOAD_FAILED(-205, "readelf file size is different!!"),
-       ERR_DEVICE_IS_NULL(-301, "Current device is not available"),
-       ERR_DEVICE_IS_OFFLINE(-302, "current device is offline"),
-       ERR_SELECTED_APP_IS_NULL(-401, "selected app is null"),
-       ERR_MSG_START_FAIL(-501, "Current application is not available"),
        ERR_MSG_STOP_FAIL(-502, "stop message is not ok"),
        ERR_MSG_RUNTIME_FAIL(-503, "runtime message is not ok"),
-       ERR_MSG_SEND_FAIL(-504, "Communicator is not running"),
        ERR_TARGET_INFO_GET_FAIL(-505, "target info get fail..."),
        ERR_KEEP_ALIVE(-506, "keep alive message ack fail..."),
        ERR_BIN_INFO_GET_FAIL(-507, "binary info get fail..."),
        ERR_RECEIVE_ACK_FAIL(-508, "receiving ack message fail..."),
-       ERR_BY_SECURITY_REASON(-601, "error by security reason"),
        ERR_DA_IS_EXIT(-901, "Dynamic Analyzer is closing"),
-       
-       // error for DA host (4 digits) ( -1000 ~ -9999 )
+
+       // error that is shown to the user (4 digits) ( -1000 ~ -9999 )
        ERR_OUT_OF_MEMORY(-1001, UserErrorWarningLabels.ERROR_OUT_OF_MEMORY),
        ERR_NO_DEVICE(-1010, UserErrorWarningLabels.ERROR_DEVICE_NOT_FOUND),
        ERR_DISCONNECTED(-1011, UserErrorWarningLabels.ERROR_DEVICE_CONNECTION),
@@ -74,11 +67,13 @@ public enum DAResult {
        ERR_STOP_DATA_CHANNEL(-2004, UserErrorWarningLabels.ERROR_INTERNAL_REASON),
        ERR_STOP_MESSAGE_PARSER(-2005, UserErrorWarningLabels.ERROR_INTERNAL_REASON),
        ERR_STOP_LOG_PARSER(-2006, UserErrorWarningLabels.ERROR_INTERNAL_REASON),
+       ERR_MSG_START_FAIL(-2007, UserErrorWarningLabels.ERROR_START_TRACE_FAILED),
+       ERR_MSG_SEND_FAIL(-2008, UserErrorWarningLabels.ERROR_INTERNAL_REASON),
        ERR_CONTINUITY_BROKEN(-2010, UserErrorWarningLabels.WARNING_OVERHEAD_EXPLODE),
        ERR_WRONG_MESSAGE_FORMAT(-2011, UserErrorWarningLabels.ERROR_INTERNAL_REASON),
        ERR_DATA_SOCKET_CLOSED(-2012, UserErrorWarningLabels.ERROR_CONNECTION_CLOSED),
        ERR_UNKNOWN(-9999, UserErrorWarningLabels.ERROR_BY_UNKNOWN_REASON);
-       
+
        private final int errNo;
        private final String errMsg;
        private String detailMsg;

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PreWindowShellCloseCallback.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PreWindowShellCloseCallback.java
index e1d8e5a..4ab7cb9 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PreWindowShellCloseCallback.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/PreWindowShellCloseCallback.java
@@ -26,7 +26,6 @@
 package org.tizen.dynamicanalyzer.common;
 
 import org.tizen.dynamicanalyzer.callback.IExecutionCallback;
-import org.tizen.dynamicanalyzer.communicator.DACommunicator;
 import org.tizen.dynamicanalyzer.handlers.ExitHandler;
 import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;
 
@@ -34,10 +33,6 @@ public class PreWindowShellCloseCallback implements IExecutionCallback {
 
        @Override
        public void execute() {
-               if (DACommunicator.isRunning()) {
-                       DACommunicator.stopTrace();
-               }
-
                AnalyzerUtil.executeCommand(ExitHandler.ID);            
        }
        

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/CommunicatorUtils.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/CommunicatorUtils.java
index 4b74a63..ca4508e 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/CommunicatorUtils.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/CommunicatorUtils.java
@@ -335,9 +335,9 @@ public class CommunicatorUtils {
                                result.setDetailMessage(e.getMessage());
                        }
                } else if (null == device) {
-                       result = DAResult.ERR_DEVICE_IS_NULL;
+                       result = DAResult.ERR_NO_DEVICE;
                } else if (!isOnline(device)) {
-                       result = DAResult.ERR_DEVICE_IS_OFFLINE;
+                       result = DAResult.ERR_DISCONNECTED;
                } else {
                        result = DAResult.ERR_UNKNOWN;
                }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java
index 0dba5b1..5b7704d 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java
@@ -101,7 +101,7 @@ public class DACommunicator {
                if (curDev != null) {
                        return curDev.getCommunicator().sendHostMessage(curDev, msgid);
                } else {
-                       return DAResult.ERR_DEVICE_IS_NULL;
+                       return DAResult.ERR_NO_DEVICE;
                }
        }
 

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/IDECommunicator.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/IDECommunicator.java
index 6663db0..cf51e04 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/IDECommunicator.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/IDECommunicator.java
@@ -44,28 +44,24 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
 import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
 import org.tizen.dynamicanalyzer.common.AnalyzerManager;
 import org.tizen.dynamicanalyzer.common.Global;
 import org.tizen.dynamicanalyzer.common.path.PathManager;
 import org.tizen.dynamicanalyzer.constant.CommonConstants;
+import org.tizen.dynamicanalyzer.handlers.UIAction;
 import org.tizen.dynamicanalyzer.model.DeviceInfo;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.nl.UserErrorWarningLabels;
 import org.tizen.dynamicanalyzer.project.AppInfo;
 import org.tizen.dynamicanalyzer.project.PackageInfo;
-import org.tizen.dynamicanalyzer.resources.ImageResources;
 import org.tizen.dynamicanalyzer.swap.platform.BinarySettingData;
 import org.tizen.dynamicanalyzer.swap.platform.BinarySettingManager;
 import org.tizen.dynamicanalyzer.ui.toolbar.Toolbar;
 import org.tizen.dynamicanalyzer.util.CommonUtil;
 import org.tizen.dynamicanalyzer.util.Logger;
-import org.tizen.dynamicanalyzer.util.WorkbenchUtil;
 import org.tizen.dynamicanalyzer.utils.RpmUtil;
-import org.tizen.dynamicanalyzer.widgets.da.base.DADialog;
 import org.tizen.dynamicanalyzer.workbench.SingletonFocusManager;
 
 public class IDECommunicator implements Runnable {
@@ -171,7 +167,7 @@ public class IDECommunicator implements Runnable {
        }
 
        private void errorMessageBox() {
-               popupMessage(AnalyzerLabels.IDE_DA_COMMUNICATION_ERROR_MESSAGE);
+               UIAction.showWarning(AnalyzerLabels.IDE_DA_COMMUNICATION_ERROR_MESSAGE);
        }
 
        public synchronized static void startIDECommunicatorThread() {
@@ -245,7 +241,7 @@ public class IDECommunicator implements Runnable {
                        sendMessageToIDE(sendMessageString(IDE_DA_COMMUNICATION_TYPE_1,
                                        IDE_DA_COMMUNICATION_TYPE_1_RECORD, CommonConstants.EMPTY));
                        SingletonFocusManager.setFocusToDA();
-                       popupMessage(AnalyzerLabels.RE_TRACE_FORM_IDE);
+                       UIAction.showWarning(AnalyzerLabels.RE_TRACE_FORM_IDE);
                        return false;
                }
                return true;
@@ -314,7 +310,7 @@ public class IDECommunicator implements Runnable {
                        if (srcrpm != null) {
                                binaryData.setSourceRpmPath(srcrpm);
                        }
-                       
+
                        addBinPath.add(binPath);
                        addBinData.add(binaryData);
                }
@@ -359,7 +355,7 @@ public class IDECommunicator implements Runnable {
                DeviceInfo device = DACommunicator.getDeviceByName(deviceName);
                Global.setCurrentDeviceInfo(device);
                if (device == null) {
-                       popupMessage(UserErrorWarningLabels.ERROR_DEVICE_CONNECTION);
+                       UIAction.showWarning(UserErrorWarningLabels.ERROR_DEVICE_CONNECTION);
                        Toolbar.INSTANCE.setAllControlState(true);
                        return;
                }
@@ -382,8 +378,8 @@ public class IDECommunicator implements Runnable {
                } else if (projectType.equals(PROJECT_TYPE_LIBRARY)) {
                        if (localPackagePathList.size() == 0) {
                                Logger.error("rpm package for library is not set");
-                               popupMessage(UserErrorWarningLabels.ERROR_LIBTRACE_START + CommonConstants.NEW_LINE
-                                               + UserErrorWarningLabels.ERROR_RPM_NOT_FOUND);
+                               UIAction.showWarning(UserErrorWarningLabels.ERROR_LIBTRACE_START
+                                               + CommonConstants.NEW_LINE + UserErrorWarningLabels.ERROR_RPM_NOT_FOUND);
                                Toolbar.INSTANCE.setAllControlState(true);
                                return;
                        }
@@ -410,7 +406,7 @@ public class IDECommunicator implements Runnable {
                        String errormsg = binarySettingWithRPM(mainrpm, debugrpm, srcrpm);
                        if (errormsg != null) {
                                Logger.error("error during binary setting wit rpm");
-                               popupMessage(errormsg);
+                               UIAction.showWarning(errormsg);
                                Toolbar.INSTANCE.setAllControlState(true);
                                return;
                        }
@@ -433,7 +429,7 @@ public class IDECommunicator implements Runnable {
                                } else {
                                        // there is no appid
                                        Logger.error("there is no appid for library tracing");
-                                       popupMessage(UserErrorWarningLabels.ERROR_LIBTRACE_START
+                                       UIAction.showWarning(UserErrorWarningLabels.ERROR_LIBTRACE_START
                                                        + CommonConstants.NEW_LINE
                                                        + UserErrorWarningLabels.ERROR_NO_APPID_FOR_LAUNCHPAD);
                                        Toolbar.INSTANCE.setAllControlState(true);
@@ -473,19 +469,7 @@ public class IDECommunicator implements Runnable {
                if (name.length() > APPNAME_LENGTH) {
                        name = appName.substring(0, APPNAME_LENGTH - 1) + "...";//$NON-NLS-1$ 
                }
-               popupMessage(name + CommonConstants.SPACE + postfix);
-       }
-
-       private void popupMessage(final String message) {
-               Display.getDefault().syncExec(new Runnable() {
-                       public void run() {
-                               Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell();
-                               DADialog warning = new DADialog(shell, SWT.NONE);
-                               warning.setMessage(message);
-                               warning.setIcon(ImageResources.DIALOG_WARNING_ICON);
-                               warning.open();
-                       }
-               });
+               UIAction.showWarning(name + CommonConstants.SPACE + postfix);
        }
 
        public synchronized static Boolean isOpenWelcomeDlg() {

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/control/StartTraceManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/control/StartTraceManager.java
index 2a40b31..94606ad 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/control/StartTraceManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/control/StartTraceManager.java
@@ -41,7 +41,6 @@ import org.tizen.dynamicanalyzer.handlers.ReplayManager;
 import org.tizen.dynamicanalyzer.handlers.UIAction;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.project.Project;
-import org.tizen.dynamicanalyzer.resources.ImageResources;
 import org.tizen.dynamicanalyzer.shortcut.ShortCutManager;
 import org.tizen.dynamicanalyzer.swap.communicator.DataChannelThread;
 import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry;
@@ -55,7 +54,6 @@ import org.tizen.dynamicanalyzer.ui.toolbar.setting.data.SettingDataManager;
 import org.tizen.dynamicanalyzer.util.WorkbenchUtil;
 import org.tizen.dynamicanalyzer.widgets.button.DACustomButton;
 import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener;
-import org.tizen.dynamicanalyzer.widgets.da.base.DADialog;
 import org.tizen.dynamicanalyzer.widgets.da.base.ProgressDialog;
 import org.tizen.dynamicanalyzer.widgets.progress.Progress;
 import org.tizen.dynamicanalyzer.workbench.LayoutManager;
@@ -308,7 +306,7 @@ public class StartTraceManager implements Runnable {
 
                        // if error occurred, show the error dialog
                        if (!result.isSuccess()) {
-                               showError(result);
+                               UIAction.showWarning(result);
                        }
 
                        // set shortcut and toolbar UI as DA state
@@ -350,19 +348,4 @@ public class StartTraceManager implements Runnable {
                        throw new InterruptedException();
                }
        }
-
-       private void showError(DAResult result) {
-               // open error dialog
-               final DAResult fResult = result;
-               Display.getDefault().syncExec(new Runnable() {
-                       @Override
-                       public void run() {
-                               Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell();
-                               DADialog warning = new DADialog(shell, SWT.NONE);
-                               warning.setMessage(fResult.getMessage() + "(" + fResult.getErrorNumber() + ")");
-                               warning.setIcon(ImageResources.DIALOG_WARNING_ICON);
-                               warning.open();
-                       }
-               });
-       }
 }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/control/StopTraceManager.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/control/StopTraceManager.java
index a0f2ee2..df2358b 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/control/StopTraceManager.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/control/StopTraceManager.java
@@ -14,7 +14,6 @@ import org.tizen.dynamicanalyzer.handlers.ReplayManager;
 import org.tizen.dynamicanalyzer.handlers.UIAction;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.project.Project;
-import org.tizen.dynamicanalyzer.resources.ImageResources;
 import org.tizen.dynamicanalyzer.shortcut.ShortCutManager;
 import org.tizen.dynamicanalyzer.swap.communicator.DataChannelThread;
 import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry;
@@ -31,7 +30,6 @@ import org.tizen.dynamicanalyzer.util.WorkbenchUtil;
 import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;
 import org.tizen.dynamicanalyzer.widgets.button.DACustomButton;
 import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener;
-import org.tizen.dynamicanalyzer.widgets.da.base.DADialog;
 import org.tizen.dynamicanalyzer.widgets.da.base.ProgressDialog;
 import org.tizen.dynamicanalyzer.widgets.progress.Progress;
 import org.tizen.dynamicanalyzer.workbench.LayoutManager;
@@ -203,20 +201,4 @@ public class StopTraceManager implements Runnable {
        private void testCancel() throws InterruptedException {
                // do nothing
        }
-
-       @SuppressWarnings("unused")
-       private void showError(DAResult result) {
-               // open error dialog
-               final DAResult fResult = result;
-               Display.getDefault().syncExec(new Runnable() {
-                       @Override
-                       public void run() {
-                               Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell();
-                               DADialog warning = new DADialog(shell, SWT.NONE);
-                               warning.setMessage(fResult.getMessage() + "(" + fResult.getErrorNumber() + ")");
-                               warning.setIcon(ImageResources.DIALOG_WARNING_ICON);
-                               warning.open();
-                       }
-               });
-       }
 }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java
index 2f19f8d..429c4dc 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/OpenTraceHandler.java
@@ -32,9 +32,7 @@ import java.util.List;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.core.commands.ExecutionException;
-import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
 import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
 import org.tizen.dynamicanalyzer.common.AnalyzerManager;
 import org.tizen.dynamicanalyzer.common.Global;
@@ -43,7 +41,6 @@ import org.tizen.dynamicanalyzer.database.SqlConnectionManager;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.project.BinaryInfo;
 import org.tizen.dynamicanalyzer.project.Project;
-import org.tizen.dynamicanalyzer.resources.ImageResources;
 import org.tizen.dynamicanalyzer.swap.callstack.BaseCallstackManager;
 import org.tizen.dynamicanalyzer.swap.logparser.DataManagerRegistry;
 import org.tizen.dynamicanalyzer.ui.info.callstack.CallStackInserter;
@@ -62,10 +59,8 @@ import org.tizen.dynamicanalyzer.ui.toolbar.Toolbar;
 import org.tizen.dynamicanalyzer.ui.toolbar.opentrace.OpenTraceProgressManager;
 import org.tizen.dynamicanalyzer.ui.userinterface.UIDataManager;
 import org.tizen.dynamicanalyzer.util.Logger;
-import org.tizen.dynamicanalyzer.util.WorkbenchUtil;
 import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;
 import org.tizen.dynamicanalyzer.widgets.combo.DACustomCombo;
-import org.tizen.dynamicanalyzer.widgets.da.base.DADialog;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite;
 
 public class OpenTraceHandler extends AbstractHandler {
@@ -89,7 +84,7 @@ public class OpenTraceHandler extends AbstractHandler {
                if (!bsuccess) {
                        OpenTraceProgressManager.getInstance().closeOpenTraceDialog(
                                        AnalyzerLabels.OPEN_TRACE_PROGRESS_LOADING_FAILED);
-                       createWarningDialog(AnalyzerLabels.OPEN_TRACE_PROGRESS_VERSION_INVALID_REMOVE);
+                       UIAction.showWarning(AnalyzerLabels.OPEN_TRACE_PROGRESS_VERSION_INVALID_REMOVE);
                        CommonAction.clear();
                        return null;
                }
@@ -113,7 +108,7 @@ public class OpenTraceHandler extends AbstractHandler {
                } else {
                        OpenTraceProgressManager.getInstance().closeOpenTraceDialog(
                                        AnalyzerLabels.OPEN_TRACE_PROGRESS_LOADING_FAILED);
-                       createWarningDialog(AnalyzerLabels.OPEN_TRACE_PROGRESS_INVALID_REMOVE);
+                       UIAction.showWarning(AnalyzerLabels.OPEN_TRACE_PROGRESS_INVALID_REMOVE);
                        CommonAction.clear();
                        return null;
                }
@@ -121,7 +116,7 @@ public class OpenTraceHandler extends AbstractHandler {
                Toolbar.INSTANCE.setTime(project.getTotalStopTime());
                Toolbar.INSTANCE.setDeviceComboText(project.getDevice());
                Toolbar.INSTANCE.setAppComboText(project.getAppName());
-               
+
                Toolbar.INSTANCE.setAllControlState(true);
                OpenTraceProgressManager.getInstance().setProgressPercent(
                                AnalyzerLabels.OPEN_TRACE_PROGRESS_LOADING, percent += 3);
@@ -182,7 +177,8 @@ public class OpenTraceHandler extends AbstractHandler {
                                // possibility of extensions - network, efl, db, etc...
                                ProfileDataMaker profiler = FunctionUsageProfiler.getInstance()
                                                .getProfileDataMakerByPid(pid);
-                               int profilingDataID = (Integer) profilingData.get(ProfilingDataDBTable.COLUMN.PROFILINGDATAID.index);
+                               int profilingDataID = (Integer) profilingData
+                                               .get(ProfilingDataDBTable.COLUMN.PROFILINGDATAID.index);
                                byte type = (Byte) profilingData.get(ProfilingDataDBTable.COLUMN.TYPE.index);
                                int exCount = (Integer) profilingData
                                                .get(ProfilingDataDBTable.COLUMN.EXCOUNT.index);
@@ -253,13 +249,14 @@ public class OpenTraceHandler extends AbstractHandler {
                        int size = profilingChilds.size();
                        for (int i = 0; i < size; i++) {
                                List<Object> data = profilingChilds.get(i);
-                               int parentID = (Integer) data.get(ProfilingChildDataDBTable.COLUMN.PROFILINGDATAID.index);
+                               int parentID = (Integer) data
+                                               .get(ProfilingChildDataDBTable.COLUMN.PROFILINGDATAID.index);
                                int pid = (Integer) data.get(ProfilingChildDataDBTable.COLUMN.PID.index);
 
                                @SuppressWarnings("unchecked")
-                               List<Integer> childSeqList = 
-                                               (List<Integer>) data.get(ProfilingChildDataDBTable.COLUMN.CHILDSEQARRAY.index);
-       
+                               List<Integer> childSeqList = (List<Integer>) data
+                                               .get(ProfilingChildDataDBTable.COLUMN.CHILDSEQARRAY.index);
+
                                ProfileDataMaker profiler = FunctionUsageProfiler.getInstance()
                                                .getProfileDataMakerByPid(pid);
                                ProfilingData parent = profiler.getProfilingDataMap().get(parentID);
@@ -269,17 +266,4 @@ public class OpenTraceHandler extends AbstractHandler {
                }
                return isSuccess;
        }
-
-       private void createWarningDialog(String message) {
-               final Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell();
-               final DADialog dialog = new DADialog(shell, SWT.NONE);
-               dialog.setIcon(ImageResources.DIALOG_WARNING_ICON);
-               dialog.setMessage(message);
-               Display.getDefault().syncExec(new Runnable() {
-                       @Override
-                       public void run() {
-                               dialog.open();
-                       }
-               });
-       }
 }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/UIAction.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/UIAction.java
index 46466ac..1cc8ef6 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/UIAction.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/handlers/UIAction.java
@@ -26,17 +26,25 @@
 
 package org.tizen.dynamicanalyzer.handlers;
 
+import org.eclipse.swt.SWT;
 import org.eclipse.swt.widgets.Display;
+import org.eclipse.swt.widgets.Shell;
+import org.tizen.dynamicanalyzer.common.DAResult;
 import org.tizen.dynamicanalyzer.nl.SummaryLabels;
+import org.tizen.dynamicanalyzer.resources.ImageResources;
 import org.tizen.dynamicanalyzer.ui.info.screenshot.ScreenshotView;
 import org.tizen.dynamicanalyzer.ui.page.ScreenshotTabComposite;
 import org.tizen.dynamicanalyzer.ui.summary.SummaryPage;
 import org.tizen.dynamicanalyzer.ui.summary.leaks.LeakView;
 import org.tizen.dynamicanalyzer.ui.timeline.TimelinePage;
+import org.tizen.dynamicanalyzer.util.WorkbenchUtil;
 import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;
+import org.tizen.dynamicanalyzer.widgets.da.base.DADialog;
 import org.tizen.dynamicanalyzer.widgets.da.view.DATabComposite;
 
 public class UIAction {
+       public static final int DEFAULT_WARNING_WIDTH = 446;
+       public static final int DEFAULT_WARNING_HEIGHT = 153;
 
        /**
         * Reset UI. Disable lastest button in screenshot view, and change leak view title.
@@ -74,4 +82,38 @@ public class UIAction {
                        }
                });
        }
+
+       public static void showWarning(final String message, final int width, final int height) {
+               Display.getDefault().syncExec(new Runnable() {
+                       @Override
+                       public void run() {
+                               Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell();
+                               DADialog dialog = new DADialog(shell, SWT.NONE, width, height);
+                               dialog.setIcon(ImageResources.DIALOG_WARNING_ICON);
+                               dialog.setMessage(message);
+                               dialog.open();
+                       }
+               });
+       }
+
+       public static void showWarning(final DAResult result, final int width, final int height) {
+               showWarning(result.getMessage() + " (" + result.getErrorNumber() + ")", width, height);
+       }
+
+       public static void showWarning(final String message) {
+               Display.getDefault().syncExec(new Runnable() {
+                       @Override
+                       public void run() {
+                               Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell();
+                               DADialog dialog = new DADialog(shell, SWT.NONE);
+                               dialog.setIcon(ImageResources.DIALOG_WARNING_ICON);
+                               dialog.setMessage(message);
+                               dialog.open();
+                       }
+               });
+       }
+
+       public static void showWarning(final DAResult result) {
+               showWarning(result.getMessage() + " (" + result.getErrorNumber() + ")");
+       }
 }

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java
index 7d040c0..0bfa25d 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/listeners/TableTooltipListener.java
@@ -51,6 +51,7 @@ import org.tizen.dynamicanalyzer.common.SymbolManager;
 import org.tizen.dynamicanalyzer.common.SymbolManager.SourceLine;
 import org.tizen.dynamicanalyzer.communicator.IDECommunicator;
 import org.tizen.dynamicanalyzer.constant.CommonConstants;
+import org.tizen.dynamicanalyzer.handlers.UIAction;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.project.AppInfo;
 import org.tizen.dynamicanalyzer.project.BinaryInfo;
@@ -71,7 +72,6 @@ import org.tizen.dynamicanalyzer.ui.widgets.table.DATableDataFormat;
 import org.tizen.dynamicanalyzer.util.CommonUtil;
 import org.tizen.dynamicanalyzer.util.Logger;
 import org.tizen.dynamicanalyzer.util.WorkbenchUtil;
-import org.tizen.dynamicanalyzer.widgets.da.base.DADialog;
 
 public class TableTooltipListener implements Listener {
 
@@ -396,7 +396,7 @@ public class TableTooltipListener implements Listener {
                }
 
                if (IDECommunicator.isConnected() == false) {
-                       createErrorPopup(AnalyzerLabels.IDE_NOT_LAUNCHED);
+                       UIAction.showWarning(AnalyzerLabels.IDE_NOT_LAUNCHED);
                        return;
                }
                String filePath = getSourcePath(gridItem, sl);
@@ -413,14 +413,6 @@ public class TableTooltipListener implements Listener {
                }
        }
 
-       private void createErrorPopup(String message) {
-               Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell();
-               DADialog warning = new DADialog(shell, SWT.NONE);
-               warning.setMessage(message);
-               warning.setIcon(ImageResources.DIALOG_WARNING_ICON);
-               warning.open();
-       }
-
        private void createErrorTooltip(int x, int y, int errno) {
                // Creates tooltip.
                Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell();

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserErrorWarningLabels.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserErrorWarningLabels.java
index 9c4fcbf..abe2055 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserErrorWarningLabels.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserErrorWarningLabels.java
@@ -51,6 +51,8 @@ public class UserErrorWarningLabels extends NLS {
        public static String ERROR_BY_UNKNOWN_REASON;
        
        public static String ERROR_OUT_OF_MEMORY;
+       
+       public static String ERROR_START_TRACE_FAILED;
 
        public static String WARNING_PATH_NOT_FOUND;
        public static String WARNING_FILE_NOT_FOUND;

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserErrorWarningLabels.properties b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserErrorWarningLabels.properties
index 8c1a023..8d23f25 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserErrorWarningLabels.properties
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/UserErrorWarningLabels.properties
@@ -19,6 +19,8 @@ ERROR_BY_UNKNOWN_REASON=Failed by unknown reason.
 
 ERROR_OUT_OF_MEMORY=Out of memory in Dynamic Analyzer.\nIf you want to use more memory, increase the -xmx value\nof the dynamic-analyzer.ini file in Dynamic Analyzer installed directory.\n
 
+ERROR_START_TRACE_FAILED=Cannot start trace.\nCurrent application may not be available for trace.
+
 WARNING_PATH_NOT_FOUND=Path cannot be found.
 WARNING_FILE_NOT_FOUND=File cannot be found.
 

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java
index 21adb8b..a6f5206 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/communicator/Communicator30.java
@@ -56,9 +56,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
 
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.swt.widgets.Shell;
 import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
 import org.tizen.dynamicanalyzer.common.AnalyzerManager;
 import org.tizen.dynamicanalyzer.common.AnalyzerShellCommands;
@@ -73,14 +70,13 @@ import org.tizen.dynamicanalyzer.constant.CommonConstants;
 import org.tizen.dynamicanalyzer.control.ApplistManager;
 import org.tizen.dynamicanalyzer.control.IProgress;
 import org.tizen.dynamicanalyzer.handlers.ReplayManager;
+import org.tizen.dynamicanalyzer.handlers.UIAction;
 import org.tizen.dynamicanalyzer.model.AddrSymbolPair;
 import org.tizen.dynamicanalyzer.model.DeviceInfo;
-import org.tizen.dynamicanalyzer.nl.UserErrorWarningLabels;
 import org.tizen.dynamicanalyzer.project.AppInfo;
 import org.tizen.dynamicanalyzer.project.BinaryInfo;
 import org.tizen.dynamicanalyzer.project.DeviceStatusInfo;
 import org.tizen.dynamicanalyzer.project.PackageInfo;
-import org.tizen.dynamicanalyzer.resources.ImageResources;
 import org.tizen.dynamicanalyzer.swap.channel.control.ApplicationInst;
 import org.tizen.dynamicanalyzer.swap.channel.control.FunctionInst;
 import org.tizen.dynamicanalyzer.swap.channel.control.RunTimeConfiguration;
@@ -97,9 +93,7 @@ import org.tizen.dynamicanalyzer.ui.toolbar.setting.data.TargetData;
 import org.tizen.dynamicanalyzer.util.ByteUtil;
 import org.tizen.dynamicanalyzer.util.CommonUtil;
 import org.tizen.dynamicanalyzer.util.Logger;
-import org.tizen.dynamicanalyzer.util.WorkbenchUtil;
 import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;
-import org.tizen.dynamicanalyzer.widgets.da.base.DADialog;
 import org.tizen.sdblib.exception.SdbCommandRejectedException;
 import org.tizen.sdblib.exception.TimeoutException;
 import org.tizen.sdblib.service.SyncResult;
@@ -143,7 +137,7 @@ public class Communicator30 extends BaseCommunicator {
                        DAResult result = CommunicatorUtils.foward(devInfo.getIDevice(),
                                        CommunicatorUtils.LOCAL_PORT, remotePort);
                        Logger.debug(result.toString());
-                       if (!DAResult.SUCCESS.equals(result)) {
+                       if (!result.isSuccess()) {
                                Logger.debug(devInfo.getIDevice().getSerialNumber()
                                                + " port fowarding failed and remove this device");
                                return DAResult.ERR_REMOTE_PORT_GET_FAILED;
@@ -188,7 +182,7 @@ public class Communicator30 extends BaseCommunicator {
        public DAResult startTrace(IProgress progress) throws InterruptedException {
                DeviceInfo curDev = Global.getCurrentDeviceInfo();
                if (curDev == null) {
-                       return DAResult.ERR_DEVICE_IS_NULL;
+                       return DAResult.ERR_NO_DEVICE;
                }
 
                DACommunicator.setRunning(true);
@@ -379,7 +373,7 @@ public class Communicator30 extends BaseCommunicator {
 
                DeviceInfo curDevice = Global.getCurrentDeviceInfo();
                if (curDevice == null) {
-                       return DAResult.ERR_DEVICE_IS_NULL;
+                       return DAResult.ERR_NO_DEVICE;
                }
 
                if (AnalyzerConstants.RUNNING_PROCESS.equals(selectedPkg.getPackageId())) {
@@ -456,7 +450,7 @@ public class Communicator30 extends BaseCommunicator {
                        Logger.exception(e);
                } finally {
                        if (!becomeSuper) {
-                               return DAResult.ERR_BY_SECURITY_REASON;
+                               return DAResult.ERR_BY_SECURITY;
                        }
                }
 
@@ -515,17 +509,7 @@ public class Communicator30 extends BaseCommunicator {
                        Global.setCurrentConfiguration(rt);
                        return DAResult.SUCCESS;
                } else {
-                       Display.getDefault().asyncExec(new Runnable() {
-                               @Override
-                               public void run() {
-                                       final Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell();
-                                       DADialog dialog = new DADialog(shell, SWT.NONE, 550, 153);
-                                       dialog.setIcon(ImageResources.DIALOG_WARNING_ICON);
-                                       dialog.setMessage("Configuration failed..");
-                                       dialog.open();
-                               }
-                       });
-                       return DAResult.ERR_MSG_RUNTIME_FAIL;
+                       return DAResult.ERR_CONFIG_FAILED;
                }
        }
 
@@ -906,7 +890,7 @@ public class Communicator30 extends BaseCommunicator {
        public DAResult sendSWAPMessage(int messageId, List<BinarySettingData> settings) {
                DeviceInfo curDev = Global.getCurrentDeviceInfo();
                if (curDev == null) {
-                       return DAResult.ERR_DEVICE_IS_NULL;
+                       return DAResult.ERR_NO_DEVICE;
                }
 
                byte[] msg = new byte[0];
@@ -1093,19 +1077,9 @@ public class Communicator30 extends BaseCommunicator {
                                result = pullTheFile(targetPath, localBinaryPath);
                                if (result.isSuccess()) {
                                        binInfo.setTempBinaryPath(localBinaryPath);
-                               } else if (result.equals(DAResult.ERR_BY_SECURITY_REASON)) {
+                               } else if (result.equals(DAResult.ERR_BY_SECURITY)) {
                                        // popup by security reason
-                                       Display.getDefault().syncExec(new Runnable() {
-                                               @Override
-                                               public void run() {
-                                                       final Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell();
-                                                       DADialog dialog = new DADialog(shell, SWT.NONE, 480, 153);
-                                                       dialog.setIcon(ImageResources.DIALOG_ERROR_ICON);
-                                                       dialog.setMessage(UserErrorWarningLabels.ERROR_BY_SECURITY_REASON);
-                                                       dialog.open();
-                                               }
-                                       });
-
+                                       UIAction.showWarning(result, 480, 153);
                                        continue;
                                }
                        } else {
@@ -1146,19 +1120,9 @@ public class Communicator30 extends BaseCommunicator {
                                        result = pullTheFile(targetPath, localBinaryPath);
                                        if (result.isSuccess()) {
                                                binInfo.setTempBinaryPath(localBinaryPath);
-                                       } else if (result.equals(DAResult.ERR_BY_SECURITY_REASON)) {
+                                       } else if (result.equals(DAResult.ERR_BY_SECURITY)) {
                                                // popup by security reason
-                                               Display.getDefault().syncExec(new Runnable() {
-                                                       @Override
-                                                       public void run() {
-                                                               final Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell();
-                                                               DADialog dialog = new DADialog(shell, SWT.NONE, 480, 153);
-                                                               dialog.setIcon(ImageResources.DIALOG_ERROR_ICON);
-                                                               dialog.setMessage(UserErrorWarningLabels.ERROR_BY_SECURITY_REASON);
-                                                               dialog.open();
-                                                       }
-                                               });
-
+                                               UIAction.showWarning(result, 480, 153);
                                                continue;
                                        }
                                } else {
@@ -1214,7 +1178,7 @@ public class Communicator30 extends BaseCommunicator {
        @Override
        public DAResult sendHostMessage(DeviceInfo dev, int msgid) {
                if (dev == null) {
-                       return DAResult.ERR_DEVICE_IS_NULL;
+                       return DAResult.ERR_NO_DEVICE;
                }
 
                DAResult res = DAResult.ERR_MSG_SEND_FAIL;

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/SaveAsDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/SaveAsDialog.java
index cd1d266..934cace 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/SaveAsDialog.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/SaveAsDialog.java
@@ -43,19 +43,17 @@ import org.tizen.dynamicanalyzer.appearance.DesignConstants;
 import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
 import org.tizen.dynamicanalyzer.common.Global;
 import org.tizen.dynamicanalyzer.constant.CommonConstants;
+import org.tizen.dynamicanalyzer.handlers.UIAction;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.nl.WidgetLabels;
 import org.tizen.dynamicanalyzer.project.Project;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
 import org.tizen.dynamicanalyzer.resources.FontResources;
-import org.tizen.dynamicanalyzer.resources.ImageResources;
 import org.tizen.dynamicanalyzer.util.CommonUtil;
 import org.tizen.dynamicanalyzer.util.Logger;
-import org.tizen.dynamicanalyzer.util.WorkbenchUtil;
 import org.tizen.dynamicanalyzer.widgets.button.DACustomButton;
 import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener;
 import org.tizen.dynamicanalyzer.widgets.da.base.DAButton;
-import org.tizen.dynamicanalyzer.widgets.da.base.DADialog;
 import org.tizen.dynamicanalyzer.widgets.da.base.DAMessageBox;
 import org.tizen.dynamicanalyzer.widgets.da.base.DAText;
 
@@ -123,8 +121,7 @@ public class SaveAsDialog extends DAMessageBox {
                                e.gc.setForeground(ColorResources.DIALOG_SUNKEN_1);
                                e.gc.drawLine(rect.x, rect.y, rect.x + rect.width, rect.y);
                                e.gc.setForeground(ColorResources.DIALOG_SUNKEN_2);
-                               e.gc.drawLine(rect.x, rect.y + 1, rect.x + rect.width,
-                                               rect.y + 1);
+                               e.gc.drawLine(rect.x, rect.y + 1, rect.x + rect.width, rect.y + 1);
                        }
                });
 
@@ -168,7 +165,7 @@ public class SaveAsDialog extends DAMessageBox {
 
                return true;
        }
-       
+
        public String getSaveFileName() {
                return saveFileName;
        }
@@ -224,19 +221,14 @@ public class SaveAsDialog extends DAMessageBox {
                } else if (CommonUtil.isLinux()) {
                        splitSourcePath = sourcePath.split("\\/"); //$NON-NLS-1$
                } else {
-                       final Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell();
-                       DADialog dialog = new DADialog(shell, SWT.NONE); // FIXME
-                       dialog.setIcon(ImageResources.DIALOG_WARNING_ICON);
-                       dialog.setMessage(AnalyzerLabels.OS_WARNING);
-                       dialog.open();
+                       UIAction.showWarning(AnalyzerLabels.OS_WARNING);
                        return null;
                }
 
                if (null == splitSourcePath) {
                        return null;
                }
-               String saveFileName = new String(
-                               splitSourcePath[splitSourcePath.length - 1]);
+               String saveFileName = new String(splitSourcePath[splitSourcePath.length - 1]);
                if (null == saveFileName || saveFileName.isEmpty()) {
                        return null;
                }
@@ -246,8 +238,7 @@ public class SaveAsDialog extends DAMessageBox {
        private boolean checkValidFileName(String str) {
                if (str == null
                                || str.contains("\\") //$NON-NLS-1$
-                               || str.contains(CommonConstants.SLASH)
-                               || str.contains(CommonConstants.COLON)
+                               || str.contains(CommonConstants.SLASH) || str.contains(CommonConstants.COLON)
                                || str.contains(CommonConstants.ASTERISK)
                                || str.contains("\\?") || str.contains("\"") //$NON-NLS-1$ //$NON-NLS-2$
                                || str.contains("<") || str.contains(">") //$NON-NLS-1$ //$NON-NLS-2$

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/Toolbar.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/Toolbar.java
index 03dc427..f2e33a7 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/Toolbar.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/Toolbar.java
@@ -57,6 +57,7 @@ import org.tizen.dynamicanalyzer.constant.CommonConstants;
 import org.tizen.dynamicanalyzer.control.ApplistManager;
 import org.tizen.dynamicanalyzer.handlers.CommandAction;
 import org.tizen.dynamicanalyzer.handlers.ReplayManager;
+import org.tizen.dynamicanalyzer.handlers.UIAction;
 import org.tizen.dynamicanalyzer.model.DeviceInfo;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.project.AppInfo;
@@ -82,7 +83,6 @@ import org.tizen.dynamicanalyzer.widgets.button.toggle.DACustomToggleButton;
 import org.tizen.dynamicanalyzer.widgets.combo.DACustomCombo;
 import org.tizen.dynamicanalyzer.widgets.combo.DACustomComboSelectionListener;
 import org.tizen.dynamicanalyzer.widgets.combo.DACustomComboTooltip;
-import org.tizen.dynamicanalyzer.widgets.da.base.DADialog;
 import org.tizen.dynamicanalyzer.widgets.timer.IAlarm;
 import org.tizen.dynamicanalyzer.widgets.timer.TimerClock;
 import org.tizen.sdblib.IDevice;
@@ -90,7 +90,7 @@ import org.tizen.sdblib.service.FileEntry;
 
 public enum Toolbar {
        INSTANCE;
-       
+
        public static final int START_BUTTON = 0;
        public static final int SAVE_BUTTON = 1;
        public static final int OPEN_BUTTON = 2;
@@ -139,7 +139,7 @@ public enum Toolbar {
        public DACustomCombo getAppCombo() {
                return appCombo;
        }
-       
+
        private void addToolbarListeners() {
                deviceCombo.addSelectionListener(new DACustomComboSelectionListener() {
 
@@ -364,10 +364,7 @@ public enum Toolbar {
                                Object result = dialog.open();
                                if (null != result) {
                                        if (!CommandAction.save(dialog.getSaveFileName())) {
-                                               DADialog warninglog = new DADialog(shell, SWT.NONE);
-                                               warninglog.setIcon(ImageResources.DIALOG_WARNING_ICON);
-                                               warninglog.setMessage(AnalyzerLabels.SAVE_FAILED);
-                                               warninglog.open();
+                                               UIAction.showWarning(AnalyzerLabels.SAVE_FAILED);
                                        }
 
                                        button.setButtonEnabled(false);

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/RepalyEditSaveDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/RepalyEditSaveDialog.java
index 1ec9e1f..f5a0249 100755 (executable)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/RepalyEditSaveDialog.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/replayEditor/RepalyEditSaveDialog.java
@@ -46,19 +46,17 @@ import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
 import org.tizen.dynamicanalyzer.common.Global;
 import org.tizen.dynamicanalyzer.common.path.PathManager;
 import org.tizen.dynamicanalyzer.constant.CommonConstants;
+import org.tizen.dynamicanalyzer.handlers.UIAction;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.nl.WidgetLabels;
 import org.tizen.dynamicanalyzer.project.Project;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
-import org.tizen.dynamicanalyzer.resources.ImageResources;
 import org.tizen.dynamicanalyzer.util.CommonUtil;
 import org.tizen.dynamicanalyzer.util.Logger;
-import org.tizen.dynamicanalyzer.util.WorkbenchUtil;
 import org.tizen.dynamicanalyzer.utils.AnalyzerUtil;
 import org.tizen.dynamicanalyzer.widgets.button.DACustomButton;
 import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener;
 import org.tizen.dynamicanalyzer.widgets.da.base.DAButton;
-import org.tizen.dynamicanalyzer.widgets.da.base.DADialog;
 import org.tizen.dynamicanalyzer.widgets.da.base.DAMessageBox;
 
 public class RepalyEditSaveDialog extends DAMessageBox {
@@ -216,11 +214,7 @@ public class RepalyEditSaveDialog extends DAMessageBox {
                } else if (CommonUtil.isLinux()) {
                        splitSourcePath = sourcePath.split("\\/"); //$NON-NLS-1$
                } else {
-                       final Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell();
-                       DADialog dialog = new DADialog(shell, SWT.NONE); // FIXME
-                       dialog.setIcon(ImageResources.DIALOG_WARNING_ICON);
-                       dialog.setMessage(AnalyzerLabels.OS_WARNING);
-                       dialog.open();
+                       UIAction.showWarning(AnalyzerLabels.OS_WARNING);
                        return null;
                }
                if (null == splitSourcePath) {

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java
index fec76bc..a52a0e4 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java
@@ -45,20 +45,18 @@ import org.tizen.dynamicanalyzer.common.AnalyzerManager;
 import org.tizen.dynamicanalyzer.communicator.DACommunicator;
 import org.tizen.dynamicanalyzer.communicator.IDECommunicator;
 import org.tizen.dynamicanalyzer.handlers.CommonAction;
+import org.tizen.dynamicanalyzer.handlers.UIAction;
 import org.tizen.dynamicanalyzer.nl.AnalyzerLabels;
 import org.tizen.dynamicanalyzer.nl.ConfigureLabels;
 import org.tizen.dynamicanalyzer.nl.WidgetLabels;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
 import org.tizen.dynamicanalyzer.resources.FontResources;
-import org.tizen.dynamicanalyzer.resources.ImageResources;
 import org.tizen.dynamicanalyzer.shortcut.ShortCutManager;
 import org.tizen.dynamicanalyzer.ui.toolbar.setting.data.SettingDataManager;
 import org.tizen.dynamicanalyzer.util.Logger;
-import org.tizen.dynamicanalyzer.util.WorkbenchUtil;
 import org.tizen.dynamicanalyzer.widgets.button.DACustomButton;
 import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener;
 import org.tizen.dynamicanalyzer.widgets.da.base.DAButton;
-import org.tizen.dynamicanalyzer.widgets.da.base.DADialog;
 import org.tizen.dynamicanalyzer.widgets.da.base.DAMessageBox;
 import org.tizen.dynamicanalyzer.widgets.da.view.DABaseComposite;
 import org.tizen.dynamicanalyzer.widgets.da.view.DATabComposite;
@@ -68,16 +66,16 @@ public class SettingDialog extends DAMessageBox {
        private DACustomButton okButton = null;
        private DACustomButton cancelButton = null;
        private boolean isApply = false;
-       
+
        private SettingDialogTemplatePage templatesPage = null;
        private SettingDialogOptionPage optionPage = null;
-       
+
        private DATabComposite tabView = null;
        private Composite buttonContentsComp = null;
-       
+
        public SettingDialog(Shell parentShell) {
                super(parentShell);
-               SettingDataManager.getInstance();       // read setting information file
+               SettingDataManager.getInstance(); // read setting information file
        }
 
        private DACustomButtonClickEventListener okButtonListener = new DACustomButtonClickEventListener() {
@@ -88,13 +86,13 @@ public class SettingDialog extends DAMessageBox {
                                isApply = true;
                                doApply();
                                doRun();
-                               shell.close();  // close dialog
+                               shell.close(); // close dialog
                        } else {
                                doWarningMessage();
                        }
                }
        };
-       
+
        private DACustomButtonClickEventListener cancelButtonListener = new DACustomButtonClickEventListener() {
 
                @Override
@@ -103,7 +101,7 @@ public class SettingDialog extends DAMessageBox {
                                isApply = true;
                                doRevert();
                                doRun();
-                               shell.close();  // close dialog
+                               shell.close(); // close dialog
                        } else {
                                doWarningMessage();
                        }
@@ -117,10 +115,10 @@ public class SettingDialog extends DAMessageBox {
                        if (DACommunicator.isRunning() == false) {
                                // add & remove tab view page
                                SettingDialogManager.getInstance().updateTabViewPage();
-                               
+
                                // add & remove (timeline) chart
                                SettingDialogManager.getInstance().updateChartList();
-                               
+
                                // write setting data
                                SettingDataManager.getInstance().applySettingData();
                        }
@@ -141,18 +139,14 @@ public class SettingDialog extends DAMessageBox {
                Composite selectedComposite = tabView.getTopComposite();
                if (!(selectedComposite instanceof SettingDialogBinarySettingsPage)) {
                        if (DACommunicator.isRunning() == false) {
-                               CommonAction.configure();       
+                               CommonAction.configure();
                        }
                }
        }
-       
+
        private void doWarningMessage() {
-               // fail message box
-               Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell();
-               DADialog dialog = new DADialog(shell, SWT.NONE, 550, 153);
-               dialog.setIcon(ImageResources.DIALOG_WARNING_ICON);
-               dialog.setMessage(ConfigureLabels.SETTING_WARNING_MESSAGE_SETTING_INVALID_INPUT_VALUE);
-               dialog.open();
+               UIAction.showWarning(ConfigureLabels.SETTING_WARNING_MESSAGE_SETTING_INVALID_INPUT_VALUE,
+                               550, 153);
        }
 
        protected boolean run() {
@@ -164,7 +158,7 @@ public class SettingDialog extends DAMessageBox {
                shell.setLayout(new FormLayout());
                shell.setText(AnalyzerLabels.SETTING_TITLE);
                shell.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR);
-               
+
                // content composite
                Composite contentsComp = new Composite(shell, SWT.NONE);
                FormLayout compLayout = new FormLayout();
@@ -177,7 +171,7 @@ public class SettingDialog extends DAMessageBox {
                compData.right = new FormAttachment(100, 0);
                compData.bottom = new FormAttachment(100, -49);
                contentsComp.setLayoutData(compData);
-               
+
                // check exist setting file
                if (SettingDataManager.getInstance().isExistSettingFile() == false) {
                        Label label = new Label(contentsComp, SWT.NONE);
@@ -193,14 +187,14 @@ public class SettingDialog extends DAMessageBox {
                                        opened = false;
                                        ShortCutManager.getInstance().setEnabled(!opened);
                                }
-                       });             
+                       });
                        opened = true;
                        ShortCutManager.getInstance().setEnabled(!opened);
-                       
+
                        shell.open();
                        return true;
                }
-               
+
                // tab view
                tabView = new DATabComposite(contentsComp, SWT.DOUBLE_BUFFERED);
                tabView.setBackground(ColorResources.CONFIGURATION_TABLE_COVER_BACKGROUND_COLOR);
@@ -212,32 +206,31 @@ public class SettingDialog extends DAMessageBox {
                compData.bottom = new FormAttachment(100, 0);
                tabView.setLayoutData(compData);
 
-               templatesPage = new SettingDialogTemplatePage(
-                               tabView.getContentComposite(), SWT.NONE);
+               templatesPage = new SettingDialogTemplatePage(tabView.getContentComposite(), SWT.NONE);
                tabView.addView(templatesPage, false);
 
                SettingDialogManager.getInstance().setConfigDlg(this);
 
-               optionPage = new SettingDialogOptionPage(
-                               tabView.getContentComposite(), SWT.NONE);
+               optionPage = new SettingDialogOptionPage(tabView.getContentComposite(), SWT.NONE);
                tabView.addView(optionPage, false);
 
                // check platform SDK (show binary setting page)
                if (AnalyzerManager.isPlatformSDK()) {
                        createBinarySettingPage();
                }
-               
+
                // button composite
                buttonContentsComp = new Composite(shell, SWT.NONE);
                compLayout = new FormLayout();
                buttonContentsComp.setLayout(compLayout);
-               buttonContentsComp.setBackground(ColorResources.CONFIGURATION_BUTTON_COVER_BACKGROUND_COLOR);
+               buttonContentsComp
+                               .setBackground(ColorResources.CONFIGURATION_BUTTON_COVER_BACKGROUND_COLOR);
                compData = new FormData();
                compData.top = new FormAttachment(contentsComp, 0);
                compData.left = new FormAttachment(0, 0);
                compData.right = new FormAttachment(100, 0);
                compData.bottom = new FormAttachment(100, 0);
-               buttonContentsComp.setLayoutData(compData);             
+               buttonContentsComp.setLayoutData(compData);
                buttonContentsComp.addPaintListener(new PaintListener() {
 
                        @Override
@@ -245,9 +238,9 @@ public class SettingDialog extends DAMessageBox {
                                Composite comp = (Composite) e.widget;
                                Rectangle rect = comp.getClientArea();
                                e.gc.setForeground(ColorResources.SETTING_SUNKEN_LINE_1);
-                               e.gc.drawLine(0, 0, rect.width-1, 0);
+                               e.gc.drawLine(0, 0, rect.width - 1, 0);
                                e.gc.setForeground(ColorResources.SETTING_SUNKEN_LINE_2);
-                               e.gc.drawLine(0, 1, rect.width-1, 1);
+                               e.gc.drawLine(0, 1, rect.width - 1, 1);
                        }
                });
 
@@ -264,8 +257,7 @@ public class SettingDialog extends DAMessageBox {
                                templatesPage.updateTotalOverheadRange();
                        }
                });
-               
-       
+
                cancelButton = new DAButton(buttonContentsComp, SWT.NONE);
                cancelButton.addClickListener(cancelButtonListener);
                cancelButton.setText(WidgetLabels.CANCEL);
@@ -276,7 +268,7 @@ public class SettingDialog extends DAMessageBox {
                buttonData.width = 100;
                buttonData.height = 28;
                cancelButton.setLayoutData(buttonData);
-               
+
                okButton = new DAButton(buttonContentsComp, SWT.NONE);
                okButton.addClickListener(okButtonListener);
                okButton.setText(WidgetLabels.OK);
@@ -295,24 +287,22 @@ public class SettingDialog extends DAMessageBox {
                                opened = false;
                                ShortCutManager.getInstance().setEnabled(!opened);
                        }
-                       
-                       
-               });             
-               
+
+               });
+
                opened = true;
                ShortCutManager.getInstance().setEnabled(!opened);
-               
+
                shell.addShellListener(shellListener);
                shell.open();
                return true;
        }
-       
+
        private void createBinarySettingPage() {
                DABaseComposite binarySettings = new SettingDialogBinarySettingsPage(
                                tabView.getContentComposite(), SWT.NONE);
                tabView.addView(binarySettings, false);
 
-               
                // binarySettings tab is selected, the close button will be shown.
                // ok and cancel button is hidden
                binarySettings.addListener(SWT.Show, new Listener() {
@@ -348,7 +338,7 @@ public class SettingDialog extends DAMessageBox {
                        IDECommunicator.getWaitingWelcomeDlg().notifyAll();
                }
        }
-       
+
        private ShellListener shellListener = new ShellListener() {
 
                @Override

diff --git a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogBinarySettingsPage.java b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogBinarySettingsPage.java
index c84017f..276e43f 100644 (file)
--- a/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogBinarySettingsPage.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialogBinarySettingsPage.java
@@ -44,17 +44,16 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Listener;
-import org.eclipse.swt.widgets.Shell;
 import org.tizen.dynamicanalyzer.common.AnalyzerConstants;
+import org.tizen.dynamicanalyzer.common.DAResult;
 import org.tizen.dynamicanalyzer.common.Global;
 import org.tizen.dynamicanalyzer.common.path.PathManager;
 import org.tizen.dynamicanalyzer.communicator.DACommunicator;
 import org.tizen.dynamicanalyzer.constant.CommonConstants;
+import org.tizen.dynamicanalyzer.handlers.UIAction;
 import org.tizen.dynamicanalyzer.model.DeviceInfo;
-import org.tizen.dynamicanalyzer.nl.UserErrorWarningLabels;
 import org.tizen.dynamicanalyzer.resources.ColorResources;
 import org.tizen.dynamicanalyzer.resources.FontResources;
-import org.tizen.dynamicanalyzer.resources.ImageResources;
 import org.tizen.dynamicanalyzer.swap.platform.BinarySettingData;
 import org.tizen.dynamicanalyzer.swap.platform.BinarySettingManager;
 import org.tizen.dynamicanalyzer.swap.platform.ui.BinarySettingProcessor;
@@ -67,11 +66,9 @@ import org.tizen.dynamicanalyzer.ui.common.explorer.FileExplorerDialog;
 import org.tizen.dynamicanalyzer.ui.toolbar.setting.data.SettingDataManager;
 import org.tizen.dynamicanalyzer.util.CommonUtil;
 import org.tizen.dynamicanalyzer.util.Logger;
-import org.tizen.dynamicanalyzer.util.WorkbenchUtil;
 import org.tizen.dynamicanalyzer.widgets.button.DACustomButton;
 import org.tizen.dynamicanalyzer.widgets.button.DACustomButtonClickEventListener;
 import org.tizen.dynamicanalyzer.widgets.da.base.DAButton;
-import org.tizen.dynamicanalyzer.widgets.da.base.DADialog;
 import org.tizen.dynamicanalyzer.widgets.da.base.WarningDialog;
 import org.tizen.dynamicanalyzer.widgets.da.view.DAPageComposite;
 
@@ -103,7 +100,7 @@ public class SettingDialogBinarySettingsPage extends DAPageComposite {
                public void handleClickEvent(DACustomButton button) {
                        DeviceInfo curDev = Global.getCurrentDeviceInfo();
                        if (curDev == null) {
-                               showDeviceWarning();
+                               UIAction.showWarning(DAResult.ERR_NO_DEVICE, 400, 150);
                        } else {
                                DeviceExplorerDialog dialog = new DeviceExplorerDialog(getShell(), true);
                                // dialog.setFilter(".so");
@@ -144,7 +141,7 @@ public class SettingDialogBinarySettingsPage extends DAPageComposite {
                public void handleClickEvent(DACustomButton button) {
                        DeviceInfo curDev = Global.getCurrentDeviceInfo();
                        if (curDev == null) {
-                               showDeviceWarning();
+                               UIAction.showWarning(DAResult.ERR_NO_DEVICE, 400, 150);
                                return;
                        }
 
@@ -237,11 +234,11 @@ public class SettingDialogBinarySettingsPage extends DAPageComposite {
                                        return;
                                }
                        }
-                       
+
                        cleanRow();
                }
        };
-       
+
        private void cleanRow() {
                List<BinarySettingData> binaries = BinarySettingManager.getInstance()
                                .getBinarySettingList();
@@ -493,12 +490,4 @@ public class SettingDialogBinarySettingsPage extends DAPageComposite {
        public String getDebugRootPath() {
                return rootPath;
        }
-
-       private void showDeviceWarning() {
-               final Shell shell = WorkbenchUtil.getWorkbenchWindow().getShell();
-               DADialog dialog = new DADialog(shell, SWT.NONE, 400, 150);
-               dialog.setIcon(ImageResources.DIALOG_WARNING_ICON);
-               dialog.setMessage(UserErrorWarningLabels.ERROR_DEVICE_NOT_FOUND);
-               dialog.open();
-       }
 }