sdcard: sdcard image is renamed

Change-Id: Iec919c04904cfd4362fa7804c9d3dcea9da65b4d
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --git a/src/org/tizen/emulator/manager/job/CheckSDCard.java b/src/org/tizen/emulator/manager/job/CheckSDCard.java
index c3a4263..8c4a0f8 100644 (file)
--- a/src/org/tizen/emulator/manager/job/CheckSDCard.java
+++ b/src/org/tizen/emulator/manager/job/CheckSDCard.java
@@ -35,7 +35,6 @@ import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
-import java.nio.file.attribute.BasicFileAttributes;
 import java.util.logging.Level;
 
 import org.tizen.emulator.manager.logging.EMLogger;
@@ -61,21 +60,10 @@ public class CheckSDCard implements Job {
                        }
 
                        try {
-                               if (Files.exists(target)) {
-                                       BasicFileAttributes sourceAttr = Files.readAttributes(source, BasicFileAttributes.class);
-                                       BasicFileAttributes targetAttr = Files.readAttributes(target, BasicFileAttributes.class);
-
-                                       // copy sdcard images if only new sdcard images are provided.
-                                       if (sourceAttr.lastModifiedTime().compareTo(targetAttr.lastModifiedTime()) <= 0) {
-                                               continue;
-                                       }
-
-                                       // FIXME: if newer images are exist,
-                                       // we should warn to user before replace legacy images.
-                                       EMLogger.getLogger().log(Level.INFO, "Newer SDCARD image is provided: " + source.getFileName());
+                               if (!Files.exists(target)) {
+                                       Files.copy(source, target, StandardCopyOption.COPY_ATTRIBUTES, StandardCopyOption.REPLACE_EXISTING);
                                }
 
-                               Files.copy(source, target, StandardCopyOption.COPY_ATTRIBUTES, StandardCopyOption.REPLACE_EXISTING);
                        } catch (IOException e) {
                                EMLogger.getLogger().log(Level.SEVERE, "Failed to create SDCARD image !!!"
                                                + StringResources.NEW_LINE + e.getMessage());

diff --git a/src/org/tizen/emulator/manager/resources/StringResources.java b/src/org/tizen/emulator/manager/resources/StringResources.java
index 2f6edbe..6ce5d66 100644 (file)
--- a/src/org/tizen/emulator/manager/resources/StringResources.java
+++ b/src/org/tizen/emulator/manager/resources/StringResources.java
@@ -71,7 +71,7 @@ public class StringResources {
        public static final String X86 = "X86";
        public static final String x86 = "x86";
        public static final String ARM = "ARM";
-       
+
        //About Dialog
        public static final String UNDEFINED = "undefined";
        public static final String ABOUT_PROP_FILENAME = "about.properties";
@@ -104,7 +104,7 @@ public class StringResources {
        public static final String SKIN_SHAPE = "skin.shape";
        // SD card
        public static final String SD_CARD_DIR = "sdcard";
-       public static final String[] SD_CARD = {"sdcard_ext4_4G.img", "sdcard_ext4_8G.img", "sdcard_ext4_16G.img","sdcard_ext4_32G.img"};
+       public static final String[] SD_CARD = {"sdcard_4G.img", "sdcard_8G.img", "sdcard_16G.img","sdcard_32G.img"};
 
        public static final String SWAP_IMAGE_DIR = "swap";
        public static final String SWAP_IMAGE = "swap.img";