[INST] ADD "IIMProgressMonitor monitor" parameter to UnzipSDK Interface.

Change-Id: I0bdecb0062b7c3de1fa49204b5217ee05952f27d
Signed-off-by: Moonkyu Kang <moonkyu82.kang@samsung.com>

diff --git a/InstallManager_java/src/org/tizen/installmanager/lib/linux/LinuxSDKPackageFormat.java b/InstallManager_java/src/org/tizen/installmanager/lib/linux/LinuxSDKPackageFormat.java
index c4e79c4..727c62d 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/lib/linux/LinuxSDKPackageFormat.java
+++ b/InstallManager_java/src/org/tizen/installmanager/lib/linux/LinuxSDKPackageFormat.java
@@ -80,11 +80,11 @@ public class LinuxSDKPackageFormat extends SDKPackageFormat {
 \r
                if (checkExtension == PackageType.ZIP){\r
 //                     UnzipSDK unzipSdk = new Zip4jSdkUnzip();\r
-//                     return unzipSdk.unzipPackageFile(fileFullPath.getAbsolutePath(), targetDir.getAbsolutePath());\r
+//                     return unzipSdk.unzipPackageFile(fileFullPath.getAbsolutePath(), targetDir.getAbsolutePath(),monitor);\r
 //                     UnzipSDK unzipSdk = new SevenZipSdkUnzip();\r
-//                     return unzipSdk.unzipPackageFile(fileFullPath.getAbsolutePath(), targetDir.getAbsolutePath());\r
+//                     return unzipSdk.unzipPackageFile(fileFullPath.getAbsolutePath(), targetDir.getAbsolutePath(),monitor);\r
                        UnzipSDK unzipSdk = new ApacheSdkUnzip();\r
-                       return unzipSdk.unzipPackageFile(fileFullPath.getAbsolutePath(), targetDir.getAbsolutePath());                  \r
+                       return unzipSdk.unzipPackageFile(fileFullPath.getAbsolutePath(), targetDir.getAbsolutePath(),monitor);                  \r
                        \r
                } else if (checkExtension == PackageType.TAR_GZ) {\r
                        try {\r

diff --git a/InstallManager_java/src/org/tizen/installmanager/util/unzip/ApacheSdkUnzip.java b/InstallManager_java/src/org/tizen/installmanager/util/unzip/ApacheSdkUnzip.java
index 181391c..385d065 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/util/unzip/ApacheSdkUnzip.java
+++ b/InstallManager_java/src/org/tizen/installmanager/util/unzip/ApacheSdkUnzip.java
@@ -14,7 +14,9 @@ import java.util.zip.ZipException;
 import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
 import org.apache.commons.compress.archivers.zip.ZipFile;
 import org.apache.commons.compress.utils.IOUtils;
+import org.tizen.installmanager.lib.IIMProgressMonitor;
 import org.tizen.installmanager.lib.Log;
+import org.tizen.installmanager.util.ISdkConstant;
 /**
  * 
  * @author Moonkyu Kang <moonkyu82.kang@samsung.com>
@@ -25,7 +27,7 @@ public class ApacheSdkUnzip extends UnzipSDK {
        
 
        @Override
-       public long unzipPackageFile(String fileFullPath, String targetFullPath) {
+       public long unzipPackageFile(String fileFullPath, String targetFullPath,IIMProgressMonitor monitor) {
        
                final File sdkTempDirFile = new File(targetFullPath);
                if (!sdkTempDirFile.exists()) {
@@ -75,7 +77,7 @@ public class ApacheSdkUnzip extends UnzipSDK {
                                }
                        }
                }               
-               return SUCCESS;
+               return ISdkConstant.SUCCESS;
        }
        
        private long copyFile(File targetFile,ZipArchiveEntry element,ZipFile zipFile){
@@ -90,11 +92,11 @@ public class ApacheSdkUnzip extends UnzipSDK {
                        }
                } catch (FileNotFoundException e) {
                        e.printStackTrace();
-                       return ERROR;
+                       return ISdkConstant.ERROR;
                } catch (ZipException e) {
-                       return ERROR;
+                       return ISdkConstant.ERROR;
                } catch (IOException e) {
-                       return ERROR;
+                       return ISdkConstant.ERROR;
                }finally{
                        if(inputStream != null){
                                IOUtils.closeQuietly(inputStream);
@@ -103,7 +105,7 @@ public class ApacheSdkUnzip extends UnzipSDK {
                                IOUtils.closeQuietly(fos);
                        }
                }
-               return SUCCESS;
+               return ISdkConstant.SUCCESS;
        }
 
 

diff --git a/InstallManager_java/src/org/tizen/installmanager/util/unzip/SevenZipSdkUnzip.java b/InstallManager_java/src/org/tizen/installmanager/util/unzip/SevenZipSdkUnzip.java
index 58bd60d..8ddf310 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/util/unzip/SevenZipSdkUnzip.java
+++ b/InstallManager_java/src/org/tizen/installmanager/util/unzip/SevenZipSdkUnzip.java
@@ -10,6 +10,9 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
 
+import org.tizen.installmanager.lib.IIMProgressMonitor;
+import org.tizen.installmanager.util.ISdkConstant;
+
 import net.sf.sevenzipjbinding.ExtractAskMode;
 import net.sf.sevenzipjbinding.ExtractOperationResult;
 import net.sf.sevenzipjbinding.IArchiveExtractCallback;
@@ -179,7 +182,7 @@ public class SevenZipSdkUnzip extends UnzipSDK {
        
 
        @Override
-       public long unzipPackageFile(String fileFullPath, String targetFullPath) {
+       public long unzipPackageFile(String fileFullPath, String targetFullPath,IIMProgressMonitor monitor) {
        
                long startTime = System.currentTimeMillis();
                // Target Directory!!!
@@ -208,7 +211,7 @@ public class SevenZipSdkUnzip extends UnzipSDK {
                
                long finishedTime = System.currentTimeMillis();
                System.out.println("extracting time : "+ (finishedTime - startTime));
-               return SUCCESS;
+               return ISdkConstant.SUCCESS;
        }
        
        private String filterToRegex(String string) {

diff --git a/InstallManager_java/src/org/tizen/installmanager/util/unzip/UnzipSDK.java b/InstallManager_java/src/org/tizen/installmanager/util/unzip/UnzipSDK.java
index 0b29260..e8bef02 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/util/unzip/UnzipSDK.java
+++ b/InstallManager_java/src/org/tizen/installmanager/util/unzip/UnzipSDK.java
@@ -1,11 +1,10 @@
 package org.tizen.installmanager.util.unzip;
 
+import org.tizen.installmanager.lib.IIMProgressMonitor;
+
 public abstract class UnzipSDK {
        protected final static int BIG_EDIAN = 1;
-       protected final static int Little_EDIAN = 2;    
-       protected final static int ERROR = -1;
-       protected final static int SUCCESS = 1;
-               
+       protected final static int Little_EDIAN = 2;            
        
        protected short BytesToShort(byte[] Value,int Order)
         {
@@ -35,5 +34,5 @@ public abstract class UnzipSDK {
                return Temp;
        };
        
-       public abstract long unzipPackageFile(String fileFullPath, String targetFullPath);      
+       public abstract long unzipPackageFile(String fileFullPath, String targetFullPath,IIMProgressMonitor monitor);   
 }

diff --git a/InstallManager_java/src/org/tizen/installmanager/util/unzip/Zip4jSdkUnzip.java b/InstallManager_java/src/org/tizen/installmanager/util/unzip/Zip4jSdkUnzip.java
index 2d98b63..dbe5a85 100644 (file)
--- a/InstallManager_java/src/org/tizen/installmanager/util/unzip/Zip4jSdkUnzip.java
+++ b/InstallManager_java/src/org/tizen/installmanager/util/unzip/Zip4jSdkUnzip.java
@@ -2,19 +2,19 @@ package org.tizen.installmanager.util.unzip;
 
 import java.io.File;
 import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-
-import org.tizen.installmanager.lib.Log;
 
 import net.lingala.zip4j.core.ZipFile;
 import net.lingala.zip4j.exception.ZipException;
 import net.lingala.zip4j.model.FileHeader;
 
+import org.tizen.installmanager.lib.IIMProgressMonitor;
+import org.tizen.installmanager.lib.Log;
+import org.tizen.installmanager.util.ISdkConstant;
+
 public class Zip4jSdkUnzip extends UnzipSDK {
 
        @Override
-       public long unzipPackageFile(String fileFullPath, String targetFullPath) {
+       public long unzipPackageFile(String fileFullPath, String targetFullPath,IIMProgressMonitor monitor) {
                try {                   
                        ZipFile zipfile = new ZipFile(fileFullPath);
                        long startTime = System.currentTimeMillis();
@@ -27,13 +27,13 @@ public class Zip4jSdkUnzip extends UnzipSDK {
                                long finishedTime = System.currentTimeMillis();
                                System.out.println("extracting time : "+ (finishedTime - startTime));
                        }else{                                  
-                               return ERROR;
+                               return ISdkConstant.ERROR;
                        }                       
                } catch (ZipException e) {
                        Log.ExceptionLog(e);
-                       return ERROR;
+                       return ISdkConstant.ERROR;
                }
-               return SUCCESS;         
+               return ISdkConstant.SUCCESS;            
        }
 
        private void unzip(String targetFullPath, ZipFile zipfile,