[Title] getAppTmpDirecoty() move to TizenPlatformConstants.

[Type]
[Module]
[Priority]
[Jira#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]

Change-Id: Ife0118e7a1599a6919024d8a241844d4f7822e49

diff --git a/org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java b/org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java
index 5b25011..cf7a8b5 100644 (file)
--- a/org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java
+++ b/org.tizen.common.sdblib/src/org/tizen/sdblib/Device.java
@@ -32,7 +32,6 @@ final class Device implements IDevice {
     final static String EMULATOR = "emulator";
     final static String COMMAND_DEVICE_TYPE = "[ -f /dev/samsung_sdb ] || echo " + EMULATOR;
     public final static String DEFAULT_APP_INSTALL_PATH = "/opt/usr/apps";
-    public final static String TEMPORARY_PKG_DIRECTORY = "tmp";
     public final static String PKG_TOOL_INSTALL_PATH_COMMAND = "pkgcmd -a";
     public final static String PKG_TOOL_INSTALL_PATH_COMMAND_RESULT = "Tizen Application Installation Path:";
 
@@ -192,7 +191,7 @@ final class Device implements IDevice {
     public String syncPackageToDevice(String localFilePath) throws IOException, SdbCommandRejectedException, TimeoutException {
         try {
             String packageFileName = getFileName(localFilePath);
-            String remoteFilePath = String.format("%s/%1$s", getDeveloperDirectoryPath(), packageFileName); //$NON-NLS-1$
+            String remoteFilePath = String.format("/tmp/%1$s", packageFileName); //$NON-NLS-1$
 
             Log.d(packageFileName, String.format("Uploading %1$s onto device '%2$s'", packageFileName, getSerialNumber()));
 
@@ -275,11 +274,6 @@ final class Device implements IDevice {
         }
         return appInstallPath;
     }
-    
-    @Override
-    public String getDeveloperDirectoryPath() {
-        return getAppInstallPath() + "/" + Device.TEMPORARY_PKG_DIRECTORY;
-    }
 
     class AppInstallPathReceiver extends MultiLineReceiver {
         @Override

diff --git a/org.tizen.common.sdblib/src/org/tizen/sdblib/IDevice.java b/org.tizen.common.sdblib/src/org/tizen/sdblib/IDevice.java
index c1b2097..5c77443 100755 (executable)
--- a/org.tizen.common.sdblib/src/org/tizen/sdblib/IDevice.java
+++ b/org.tizen.common.sdblib/src/org/tizen/sdblib/IDevice.java
@@ -282,9 +282,4 @@ public interface IDevice {
      * Returns application's installation path.
      */
     String getAppInstallPath();
-    
-    /**
-     * Returns temporary directory that has a developer permission.
-     */
-    String getDeveloperDirectoryPath();
 }

diff --git a/org.tizen.common/src/org/tizen/common/TizenPlatformConstants.java b/org.tizen.common/src/org/tizen/common/TizenPlatformConstants.java
index e0e6acf..5fba162 100644 (file)
--- a/org.tizen.common/src/org/tizen/common/TizenPlatformConstants.java
+++ b/org.tizen.common/src/org/tizen/common/TizenPlatformConstants.java
@@ -73,9 +73,10 @@ public class TizenPlatformConstants {
     public static final String APP_ICON_INSTALL_PATH;
     
     /**
-     * @deprecated APP_INSTALL_PATH is deprecated. Use {@link IDevice#getDeveloperDirectoryPath()}.
+     * @deprecated TEMPORARY_PKG_PATH is deprecated. Use {@link #getAppTmpDirectory(IDevice)}.
      */
     public static final String TEMPORARY_PKG_PATH;
+    public static final String TEMPORARY_DIR_PATH;
     public static final String PKG_TOOL = "pkgcmd";
     public static final String PKG_TOOL_LIST_COMMAND = PKG_TOOL + " -l  | grep %s";
     public static final String PKG_TOOL_REMOVE_COMMAND = PKG_TOOL + " -q -u -t %s -n %s";
@@ -120,8 +121,9 @@ public class TizenPlatformConstants {
         GDBSERVER_CMD = TizenPlatformConstants.TOOLS_TARGET_PATH + "/gdbserver/gdbserver";
         GDBSERVER_PLATFORM_CMD = TizenPlatformConstants.TOOLS_TARGET_PATH + "/gdbserver-platform/gdbserver";
         APP_INSTALL_PATH = "/opt/usr/apps";
-        APP_ICON_INSTALL_PATH = "shared/res";
         TEMPORARY_PKG_PATH = "/opt/usr/apps/tmp/";
+        APP_ICON_INSTALL_PATH = "shared/res";
+        TEMPORARY_DIR_PATH = "/tmp";
         DEBUG_COREFILE_PATH = "/opt/usr/share/crash/dump";
         DEBUG_COREFILE_EXTENSION = "coredump";
         DEBUG_COREFILE_EXTRACT_COMMAND = "tar -xvf %s -C %s --wildcards --no-anchored '%s'";
@@ -130,4 +132,11 @@ public class TizenPlatformConstants {
         SIGNING_DEFAULT = true;
         SIGNING_BUILD_PACKAGE = true;
     }
+    
+    /**
+     * Returns temporary directory that has a developer permission.
+     */
+    public static String getAppTmpDirectory(IDevice device) {
+        return device.getAppInstallPath() + TEMPORARY_DIR_PATH;
+    }
 }