VM property: Bug fix - last-created VM property.

- Fix bug : File path split error in Windows OS.

Change-Id: I24289b3a966e269046fc8de2ab8ccdc7849c1f4e
Signed-off-by: minkee.lee <minkee.lee@samsung.com>

diff --git a/common-project/src/org/tizen/emulator/manager/platform/PlatformList.java b/common-project/src/org/tizen/emulator/manager/platform/PlatformList.java
index b39154d..72ed344 100644 (file)
--- a/common-project/src/org/tizen/emulator/manager/platform/PlatformList.java
+++ b/common-project/src/org/tizen/emulator/manager/platform/PlatformList.java
@@ -33,6 +33,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
+import org.tizen.emulator.manager.EmulatorManager;
 import org.tizen.emulator.manager.logging.EMLogger;
 import org.tizen.emulator.manager.resources.FilePathResources;
 import org.tizen.emulator.manager.resources.StringResources;
@@ -236,7 +237,12 @@ public class PlatformList {
                if (files != null) {
                        for (File f : files) {
                                String path = f.getAbsolutePath();
-                               String[] arr =  path.split(File.separator);
+                               String[] arr = null;
+                               if (EmulatorManager.isWin()) {
+                                       arr = path.split("\\\\");
+                               } else {
+                                       arr =  path.split(File.separator);
+                               }
                                String fileName = arr[arr.length-1];
                                if (fileName.startsWith(StringResources.LAST_CREATED_XML_PREFIX)) {
                                        boolean isOld = true;

diff --git a/plugin-project/mobile-plugin/src/org/tizen/emulator/manager/mobile/ui/detail/TNameTextItem.java b/plugin-project/mobile-plugin/src/org/tizen/emulator/manager/mobile/ui/detail/TNameTextItem.java
index 15fedad..a9ce96c 100644 (file)
--- a/plugin-project/mobile-plugin/src/org/tizen/emulator/manager/mobile/ui/detail/TNameTextItem.java
+++ b/plugin-project/mobile-plugin/src/org/tizen/emulator/manager/mobile/ui/detail/TNameTextItem.java
@@ -455,7 +455,12 @@ public class TNameTextItem extends DetailViewItem {
                        return false;
                }
                // Check ".x86"
-               String pathSplit[] = baseImagePath.split(File.separator);
+               String pathSplit[] = null;
+               if (EmulatorManager.isWin()) {
+                       pathSplit = baseImagePath.split("\\\\");
+               } else {
+                       pathSplit = baseImagePath.split(File.separator);
+               }
                String fileSplit[] = pathSplit[pathSplit.length-1].split("\\.");
                String extension = fileSplit[fileSplit.length-1];
                if (!extension.equals("x86")) {

diff --git a/plugin-project/wearable-plugin/src/org/tizen/emulator/manager/wearable/ui/detail/TNameTextItem.java b/plugin-project/wearable-plugin/src/org/tizen/emulator/manager/wearable/ui/detail/TNameTextItem.java
index 4654f6f..3f536b5 100644 (file)
--- a/plugin-project/wearable-plugin/src/org/tizen/emulator/manager/wearable/ui/detail/TNameTextItem.java
+++ b/plugin-project/wearable-plugin/src/org/tizen/emulator/manager/wearable/ui/detail/TNameTextItem.java
@@ -453,7 +453,12 @@ public class TNameTextItem extends DetailViewItem {
                        return false;
                }
                // Check ".x86"
-               String pathSplit[] = baseImagePath.split(File.separator);
+               String pathSplit[] = null;
+               if (EmulatorManager.isWin()) {
+                       pathSplit = baseImagePath.split("\\\\");
+               } else {
+                       pathSplit = baseImagePath.split(File.separator);
+               }
                String fileSplit[] = pathSplit[pathSplit.length-1].split("\\.");
                String extension = fileSplit[fileSplit.length-1];
                if (!extension.equals("x86")) {