[Title] If package server is old SDK, installmanager make sdk data path

text disabled.
[Desc.]
[Issue] redmine #9684

Change-Id: If2d31fe7fd631d5d137f8c9b8045bc70ce7d5caf

diff --git a/InstallManager_java/src/org/tizen/installmanager/core/InstallManager.java b/InstallManager_java/src/org/tizen/installmanager/core/InstallManager.java
index 02ab8cc..d55d52e 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/core/InstallManager.java
+++ b/InstallManager_java/src/org/tizen/installmanager/core/InstallManager.java
@@ -207,7 +207,7 @@ public class InstallManager {
         * InstallManager can be used old SDK installation.
         */
        private void checkNewPackageServer() {
-               if (!packageManager.existsPackage(InstallManagerConstants.INSTALLMANAGER_PACKAGE_NAME)) {
+               if (packageManager.getPackageByName(InstallManagerConstants.INSTALLMANAGER_PACKAGE_NAME) == null) {
                        Config.isNewPackageServer = false;
                        Log.log("PackageServer has old SDK packages.");
                } else {

diff --git a/InstallManager_java/src/org/tizen/installmanager/lib/win/WindowsSDKPackageFormat.java b/InstallManager_java/src/org/tizen/installmanager/lib/win/WindowsSDKPackageFormat.java
index a95d44a..423b561 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/lib/win/WindowsSDKPackageFormat.java
+++ b/InstallManager_java/src/org/tizen/installmanager/lib/win/WindowsSDKPackageFormat.java
@@ -162,12 +162,10 @@ public class WindowsSDKPackageFormat extends SDKPackageFormat{
 //                             }
 
                                if (zipOutput != null) {
-                                       Log.log("zipOutput.close();");
                                        zipOutput.close();
                                }
 
                                if (zipEntry != null) {
-                                       Log.log("zipInStream.closeEntry();");
                                        zipInStream.closeEntry();
                                }
                                zipEntry = zipInStream.getNextEntry();

diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/page/SetInstallDirectoryPage.java b/InstallManager_java/src/org/tizen/installmanager/ui/page/SetInstallDirectoryPage.java
index 5cc94fa..264c1cf 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/ui/page/SetInstallDirectoryPage.java
+++ b/InstallManager_java/src/org/tizen/installmanager/ui/page/SetInstallDirectoryPage.java
@@ -380,6 +380,7 @@ public class SetInstallDirectoryPage extends PageTemplate {
                requiredSpace = requiredSize;
                
                sdkWorkSpaceText.setEnabled(Config.isNewPackageServer);
+               selectDataPathBtn.setEnabled(Config.isNewPackageServer);
                
                InstallManagerWindow.setNextBtnEnabled(checkAvailablePath() && checkDuplicatePath(installDirectoryText.getText(), true));
                setAvailableSpace(installDirectoryText.getText());