ui template: ignore template version2

- old ui need not template version2
-- new ui use template version2

Change-Id: I1a98c944632c93aa19b9a7eebff739364ba70614
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>

diff --git a/src/org/tizen/emulator/manager/template/ITemplate.java b/src/org/tizen/emulator/manager/template/ITemplate.java
index 16cb3b0..1ed2406 100644 (file)
--- a/src/org/tizen/emulator/manager/template/ITemplate.java
+++ b/src/org/tizen/emulator/manager/template/ITemplate.java
@@ -43,4 +43,5 @@ public interface ITemplate {
        public Class<?> getXMLObjectType();
        public void setXMLObject(Object obj);
        public Object getXMLObject();
+       public boolean isValidTemplate();
 }

diff --git a/src/org/tizen/emulator/manager/template/Template1.java b/src/org/tizen/emulator/manager/template/Template1.java
index 29f3287..59fffb0 100644 (file)
--- a/src/org/tizen/emulator/manager/template/Template1.java
+++ b/src/org/tizen/emulator/manager/template/Template1.java
@@ -106,5 +106,16 @@ public class Template1 implements ITemplate {
                return template;
        }
 
+       @Override
+       public boolean isValidTemplate() {
 
+               if (template.getImage() == null) {
+                       return false;
+               }
+               if (template.getPropertyList() == null) {
+                       return false;
+               }
+
+               return true;
+       }
 }

diff --git a/src/org/tizen/emulator/manager/template/Template2.java b/src/org/tizen/emulator/manager/template/Template2.java
index 2b7b92b..8800e54 100644 (file)
--- a/src/org/tizen/emulator/manager/template/Template2.java
+++ b/src/org/tizen/emulator/manager/template/Template2.java
@@ -96,4 +96,8 @@ public class Template2 implements ITemplate {
                return template;
        }
 
+       @Override
+       public boolean isValidTemplate() {
+               return false;
+       }
 }

diff --git a/src/org/tizen/emulator/manager/template/TemplateLoader.java b/src/org/tizen/emulator/manager/template/TemplateLoader.java
index dbaa365..19dbd49 100644 (file)
--- a/src/org/tizen/emulator/manager/template/TemplateLoader.java
+++ b/src/org/tizen/emulator/manager/template/TemplateLoader.java
@@ -56,9 +56,6 @@ public class TemplateLoader {
        private static Map<Class<?>, JAXBContext> contextMap = new HashMap<Class<?>, JAXBContext>();
 
        public static void load(Platform platform) {
-               if (loadTemplateV2(platform)) {
-                       return;
-               }
                loadTemplateV1(platform);
        }
 
@@ -83,23 +80,6 @@ public class TemplateLoader {
                return true;
        }
 
-       private static boolean loadTemplateV2(Platform platform) {
-               File templateDir = new File(platform.getPlatformPath() + File.separator
-                               + FilePathResources.getPlatformTemplate2Path());
-               if (!templateExist(templateDir)) {
-                       return false;
-               }
-
-               loadToPlatform(templateDir, Template2.class, platform);
-
-               // Actually, custom itemTemplate is not needed in new UI.
-               if (platform.getItemTemplateList().size() > 0) {
-                       platform.setCustomItemTemplate(platform.getItemTemplateList().get(0));
-               }
-               return true;
-       }
-
-
        private static boolean templateExist(File template) {
                if (template == null || !template.exists() || !template.isDirectory()) {
                        return false;
@@ -143,6 +123,14 @@ public class TemplateLoader {
 
        }
 
+       private static boolean isValidTemplate(ITemplate template) {
+               if (template == null) {
+                       return false;
+               }
+
+               return template.isValidTemplate();
+       }
+
        // Load template list and default template to platform
        private static void loadToPlatform(File templateDir, Class<?> type, Platform platform) {
                for (File f : templateDir.listFiles()) {
@@ -158,6 +146,9 @@ public class TemplateLoader {
                                        Object xmlObj = loadTemplate(f, template.getXMLObjectType());
                                        if (xmlObj != null) {
                                                template.setXMLObject(xmlObj);
+                                               if (!isValidTemplate(template)) {
+                                                       continue;
+                                               }
                                                platform.getItemTemplateList().add(template);
 
                                                // setting default item list
@@ -166,7 +157,6 @@ public class TemplateLoader {
                                                }
                                        }
                                }
-
                        } else { // property file
                                EmulatorVMList vmList = EmulatorVMList.getInstance();
                                VMProperty defaultProperty = vmList.parseXML(f);