[INST] Fix bug that installmanager cannot calculate download time.

Conflicts:

	InstallManager_java/src/org/tizen/installmanager/core/InstallManager.java
	InstallManager_java/src/org/tizen/installmanager/core/Performance.java
	InstallManager_java/src/org/tizen/installmanager/lib/ErrorController.java

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

diff --git a/InstallManager_java/src/org/tizen/installmanager/cli/CliInstall.java b/InstallManager_java/src/org/tizen/installmanager/cli/CliInstall.java
index 359dd85..05ad26f 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/cli/CliInstall.java
+++ b/InstallManager_java/src/org/tizen/installmanager/cli/CliInstall.java
@@ -68,12 +68,14 @@ import org.tizen.installmanager.util.PathUtil;
 public class CliInstall {
        private static final String DISTRIBUTION_INFO = "distribution.info";
        private static final String ESSENTIAL_COMPONENT = "ESSENTIAL-COMPONENT";
+       private static final int NETWORK_RETRY_COUNT = 10;
 
        private static ViewController controller = null;
        
        private static ProxyType proxyType = ProxyType.AUTOMATIC;
        private static String proxyHost = "";
        private static String proxyPort = "";
+
        
        /**
         * Works for command line installation
@@ -558,7 +560,7 @@ public class CliInstall {
        
        private static boolean installPackages(PackageSet installablePackages, String targetDir)
                        throws IMExitException {
-               int repeatCount = installablePackages.size();
+               int repeatCount = NETWORK_RETRY_COUNT;
                for (int i = repeatCount; i > 0; i--) {
                        try {
                                if (InstallManager.getInstance().install(installablePackages, targetDir, null)) {
@@ -568,7 +570,8 @@ public class CliInstall {
                                }
                        } catch (IMNetworkException e) {
                                Log.ExceptionLog(e);
-                               System.out.println("Network error has occured. retry the download => " + repeatCount);
+                               ErrorController.setNetworkRetryCount(NETWORK_RETRY_COUNT - i);
+                               System.out.println("Network error has occured. retry the download => " + (NETWORK_RETRY_COUNT - i));
                                continue;
                        }
                }

diff --git a/InstallManager_java/src/org/tizen/installmanager/core/InstallManager.java b/InstallManager_java/src/org/tizen/installmanager/core/InstallManager.java
index 47bd366..d1025b4 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/core/InstallManager.java
+++ b/InstallManager_java/src/org/tizen/installmanager/core/InstallManager.java
@@ -685,7 +685,7 @@ public class InstallManager {
 \r
                boolean result = false;\r
 \r
-               if (Options.doTest && Performance.getDownloadStartTime() == null) {\r
+               if (Options.doTest && !Performance.existDownloadStartTime()) {\r
                        Performance.setDownloadStartTime();\r
                }\r
 \r

diff --git a/InstallManager_java/src/org/tizen/installmanager/core/Performance.java b/InstallManager_java/src/org/tizen/installmanager/core/Performance.java
index 88606b0..8760a06 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/core/Performance.java
+++ b/InstallManager_java/src/org/tizen/installmanager/core/Performance.java
@@ -7,6 +7,7 @@ import java.io.IOException;
 import java.text.SimpleDateFormat;\r
 import java.util.Date;\r
 \r
+import org.tizen.installmanager.lib.ErrorController;\r
 import org.tizen.installmanager.lib.Log;\r
 import org.tizen.installmanager.util.PathUtil;\r
 \r
@@ -59,6 +60,14 @@ public class Performance {
                downloadStartTime = new Date();\r
        }\r
        \r
+       public static boolean existDownloadStartTime() {\r
+               if (downloadStartTime != null) {\r
+                       return true;\r
+               } else {\r
+                       return false;\r
+               }\r
+       }\r
+       \r
        public static Date getDownloadStartTime() {\r
                return downloadStartTime;\r
        }\r
@@ -197,6 +206,8 @@ public class Performance {
                        out.newLine();\r
                        out.write(getTestCaseXml("DownloadTest", "The download time", getDownloadTime()));\r
                        out.newLine();\r
+                       out.write(getTestCaseXml("DownloadRetry", "Download retry count", ErrorController.getNetworkRetryCount()));\r
+                       out.newLine();\r
                        out.write(getTestCaseXml("InstallTest", "The installation time", getInstallationTime()));\r
                        out.newLine();\r
                        out.write(getTestCaseXml("TotalInstallationTest", "Total installation time", getTotalInstallationTime()));\r
@@ -316,4 +327,4 @@ public class Performance {
                        return (size/1024/seconds);\r
                }\r
        }\r
-}\r
+}

diff --git a/InstallManager_java/src/org/tizen/installmanager/lib/ErrorController.java b/InstallManager_java/src/org/tizen/installmanager/lib/ErrorController.java
index ef15eba..94f8472 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/lib/ErrorController.java
+++ b/InstallManager_java/src/org/tizen/installmanager/lib/ErrorController.java
@@ -219,6 +219,7 @@ public class ErrorController {
        static private InfoCode infoCode = null;\r
 \r
        private static int exitCode = Config.EXITCODE_NORMAL;\r
+       private static int retryCount = 0;\r
 \r
        /**\r
         * Set error code.\r
@@ -321,4 +322,12 @@ public class ErrorController {
        public static int getExitCode() {\r
                return ErrorController.exitCode;\r
        }\r
+       \r
+       public static void setNetworkRetryCount(int cnt) {\r
+               retryCount = cnt;\r
+       }\r
+       \r
+       public static int getNetworkRetryCount(int cnt) {\r
+               return retryCount;\r
+       }\r
 }\r