[Title] [INST] Cannot find package list file.

[Desc.] Using SDK image case, the installmanager cannot find package
list file because it found the package list file in current working
directory. But now, the installmanager can find a package list file in
SDK image extracting directory.
[Issue]

Change-Id: I2f85aa231ee7b4724ff8a48cecdc07f81af90f68

diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/dialog/ConfigurationDialog.java b/InstallManager_java/src/org/tizen/installmanager/ui/dialog/ConfigurationDialog.java
index 7263e8d..c7574e5 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/ui/dialog/ConfigurationDialog.java
+++ b/InstallManager_java/src/org/tizen/installmanager/ui/dialog/ConfigurationDialog.java
@@ -865,15 +865,12 @@ public class ConfigurationDialog extends Dialog {
        private UNZIP_RESULT unzipSDKImageFile(final File imageFile) {
                Log.log("Start to unzip SDK Image File. => " + imageFile.getName());            
 
-               String sdkTempDir = PathUtil.getCurrentDir();
-               
-               final File sdkTempDirFile = new File(sdkTempDir);
-               if (!sdkTempDirFile.exists()) {
-                       sdkTempDirFile.mkdirs();
-               }
+               String sdkImageName = PathUtil.getFileNameWithOutExtension(imageFile.getAbsolutePath());
+       String sdkImageParent = PathUtil.getParentDirectory(imageFile.getAbsolutePath());
+       String sdkTempDir = PathUtil.get(sdkImageParent, sdkImageName);
                
                UNZIP_RESULT unzipResult = null;
-               UnzipImageDialog barDialog = new UnzipImageDialog(getShell(), imageFile);
+               UnzipImageDialog barDialog = new UnzipImageDialog(getShell(), imageFile, sdkTempDir);
                int result = barDialog.open();
                if (result == 0 || result == 1) {
                        unzipResult = barDialog.getUnzipResult();                       

diff --git a/InstallManager_java/src/org/tizen/installmanager/ui/dialog/UnzipImageDialog.java b/InstallManager_java/src/org/tizen/installmanager/ui/dialog/UnzipImageDialog.java
index 916c2b1..5142607 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/ui/dialog/UnzipImageDialog.java
+++ b/InstallManager_java/src/org/tizen/installmanager/ui/dialog/UnzipImageDialog.java
@@ -67,6 +67,7 @@ public class UnzipImageDialog extends Dialog {
        private int totalWork;
     private UNZIP_RESULT result;
     private UnzipImageThread uiThread;
+    private String sdkTempDir = null;
 
        private File imageFile = null; // SDK Image File
     final static int BUF_SIZE = 65536;
@@ -74,12 +75,13 @@ public class UnzipImageDialog extends Dialog {
     
     public enum UNZIP_RESULT {FAIL, ERROR, SUCCESS};
 
-       protected UnzipImageDialog(Shell parent, File file) {
+       protected UnzipImageDialog(Shell parent, File file, String targetTemp) {
                super(parent);
                setShellStyle(SWT.None | SWT.DIALOG_TRIM | SWT.APPLICATION_MODAL);
                imageFile = file;
                parent.getShell().setImage(PathUtil.getImageFromResource("/res/icons/SDK_icon.png"));
                totalWork = getEntryCount(file);
+               sdkTempDir = targetTemp;
        }
        
        @Override
@@ -241,11 +243,6 @@ public class UnzipImageDialog extends Dialog {
      * @throws Exception
      */
     private long unzipImageFile(Composite composite) {
-       String sdkImageName = PathUtil.getFileNameWithOutExtension(imageFile.getAbsolutePath());
-       String sdkImageParent = PathUtil.getParentDirectory(imageFile.getAbsolutePath());
-       String sdkTempDir = PathUtil.get(sdkImageParent, sdkImageName);
-
-               
                final File sdkTempDirFile = new File(sdkTempDir);
                if (!sdkTempDirFile.exists()) {
                        sdkTempDirFile.mkdirs();