[INST] Add yes and no buttons to installmanager self update dialog.

Add more logs for installmanager self updating.

Change-Id: Ic81f027085a0c653c93c4ddd0250fe1128d883ac
Signed-off-by: yongsung1.kim <yongsung1.kim@samsung.com>

diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/InstallManagerWindow.java b/InstallManager_java/src/org/tizen/installmanager/ui/InstallManagerWindow.java
index e4ac492..4cc9257 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/ui/InstallManagerWindow.java
+++ b/InstallManager_java/src/org/tizen/installmanager/ui/InstallManagerWindow.java
@@ -198,9 +198,13 @@ public class InstallManagerWindow extends ApplicationWindow {
        private void updateInstallManager(Shell shell) {\r
                if (controller.canInstallManagerUpdate()) {\r
                        String msg = "There is a new installer on the server. \nNew install-manager will be started. \nIt may take a minute...";\r
-                       MessageBoxDlg.showDlg(shell, "InstallManager", msg, DialogType.NOTIFY, false);\r
+                       int ret = MessageBoxDlg.showDlg(shell, "InstallManager", msg, DialogType.NOTIFY_YES, false);\r
                        \r
-                       controller.updateInstallManager();\r
+                       if (ret == MessageBoxDlg.YES) {\r
+                               controller.updateInstallManager();      \r
+                       } else {\r
+                               Log.log("Installmanager was updatable itself but user did not want it.");\r
+                       }\r
                }\r
        }\r
        \r

diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/dialog/LoginDlg.java b/InstallManager_java/src/org/tizen/installmanager/ui/dialog/LoginDlg.java
index a53eaa7..b77169a 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/ui/dialog/LoginDlg.java
+++ b/InstallManager_java/src/org/tizen/installmanager/ui/dialog/LoginDlg.java
@@ -156,7 +156,7 @@ public class LoginDlg extends Dialog {
                        this.close();
                } else {
                        MessageBoxDlg.showDlg(
-                                       this.getShell(), "Input ID/PW", "Please input your ID or Password.", DialogType.NOTIFY, false);
+                                       this.getShell(), "Input ID/PW", "Please input your ID or Password.", DialogType.NOTIFY_OK, false);
                }
        }
 

diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/dialog/MessageBoxDlg.java b/InstallManager_java/src/org/tizen/installmanager/ui/dialog/MessageBoxDlg.java
index ca666b6..fd975f0 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/ui/dialog/MessageBoxDlg.java
+++ b/InstallManager_java/src/org/tizen/installmanager/ui/dialog/MessageBoxDlg.java
@@ -53,7 +53,8 @@ public class MessageBoxDlg {
         */
        public enum DialogType {
                INFO,
-               NOTIFY,
+               NOTIFY_OK,
+               NOTIFY_YES,
                WARNING,
                ERROR,
        }
@@ -74,8 +75,10 @@ public class MessageBoxDlg {
                                        return;
                                } else if (dlgType == DialogType.INFO) {
                                        style = SWT.OK | SWT.ICON_INFORMATION;
-                               } else if (dlgType == DialogType.NOTIFY) {
+                               } else if (dlgType == DialogType.NOTIFY_OK) {
                                        style = SWT.OK | SWT.ICON_INFORMATION;
+                               } else if (dlgType == DialogType.NOTIFY_YES) {
+                                       style = SWT.YES | SWT.NO | SWT.ICON_INFORMATION;
                                } else if (dlgType == DialogType.WARNING) {
                                        style = SWT.YES | SWT.NO | SWT.ICON_WARNING;
                                } else if (dlgType == DialogType.ERROR) {

diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/dialog/ProxySettingsDialog.java b/InstallManager_java/src/org/tizen/installmanager/ui/dialog/ProxySettingsDialog.java
index 940b1d1..4ff6c0a 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/ui/dialog/ProxySettingsDialog.java
+++ b/InstallManager_java/src/org/tizen/installmanager/ui/dialog/ProxySettingsDialog.java
@@ -354,13 +354,13 @@ public class ProxySettingsDialog extends Dialog {
                                Log.ExceptionLog(e);
                                
                                MessageBoxDlg.showDlg(
-                                               this.getShell(), "Proxy settings", "Port number is invalid.", DialogType.NOTIFY, false);
+                                               this.getShell(), "Proxy settings", "Port number is invalid.", DialogType.NOTIFY_OK, false);
                                return;
                        }
                        
                        if (!Downloader.isAvailableURL(proxyHost, port)) {
                                MessageBoxDlg.showDlg(
-                                               this.getShell(), "Proxy settings", "IP address is invalid.", DialogType.NOTIFY, false);
+                                               this.getShell(), "Proxy settings", "IP address is invalid.", DialogType.NOTIFY_OK, false);
                                return;
                        }
                }

diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/page/ViewController.java b/InstallManager_java/src/org/tizen/installmanager/ui/page/ViewController.java
index 1cff45d..f540558 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/ui/page/ViewController.java
+++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/ViewController.java
@@ -805,6 +805,7 @@ public class ViewController {
        }\r
        \r
        public boolean updateInstallManager() {\r
+               Log.log("Installmanager will update itself");\r
                Package pkg = packageManager.getPackageByName(InstallManagerConstants.INSTALLMANAGER_PACKAGE_NAME);\r
 \r
                if (pkg == null) {\r
@@ -909,6 +910,8 @@ public class ViewController {
                File tempIMJarFile = new File(PathUtil.get(\r
                                PathUtil.getTempDir(), "data", "install-manager",\r
                                InstallManagerConstants.INSTALLMANAGERV2_JAR_FILE_NAME));\r
+               \r
+               Log.log("New installmanager will start. => " + tempIMJarFile.getAbsolutePath());\r
 \r
                if (tempIMJarFile.exists()) {\r
                        try {\r