UIB : merge FileReader to TizenFileFormatter

Signed-off-by: gyeongmin.ju <gyeongmin.ju@samsung.com>
Change-Id: I08407953b51f652a5ae45ae3a14a4ebaee62852d

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/AppManagerForHTML.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/AppManagerForHTML.java
index d496f4c..3835ddf 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/AppManagerForHTML.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/AppManagerForHTML.java
@@ -51,8 +51,8 @@ import org.tizen.webuibuilder.model.css.CssFile;
 import org.tizen.webuibuilder.model.descriptors.DescriptorManager;
 import org.tizen.webuibuilder.model.filedata.HtmlMetaFileData;
 import org.tizen.webuibuilder.model.filedata.PageFileData;
-import org.tizen.webuibuilder.model.html.HtmlReader;
-import org.tizen.webuibuilder.model.html.HtmlWriter;
+import org.tizen.webuibuilder.model.html.io.HtmlReader;
+import org.tizen.webuibuilder.model.html.io.HtmlWriter;
 import org.tizen.webuibuilder.model.io.CodeGenerator;
 import org.tizen.webuibuilder.model.page.PageData;
 import org.tizen.webuibuilder.model.page.PageDataForHTML;

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/AppMetaReader_ver_2.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/AppMetaReader_ver_2.java
index ee0c798..c1147f5 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/AppMetaReader_ver_2.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/AppMetaReader_ver_2.java
@@ -39,7 +39,7 @@ import org.tizen.webuibuilder.model.app.Meta;
 import org.tizen.webuibuilder.model.app.Page;
 import org.tizen.webuibuilder.model.app.Stylesheet;
 import org.tizen.webuibuilder.model.filedata.AppFileData;
-import org.tizen.webuibuilder.model.io.FileReader;
+import org.tizen.webuibuilder.model.io.TizenFileFormatter;
 import org.tizen.webuibuilder.ui.views.databinding.model.BindingData;
 import org.tizen.webuibuilder.ui.views.databinding.model.BindingObject;
 
@@ -48,7 +48,7 @@ public class AppMetaReader_ver_2 {
     public static AppFileData parse(Element root) {
         AppFileData descriptor = null;
 
-        FileReader fileReader = new FileReader(root);
+        TizenFileFormatter fileReader = new TizenFileFormatter(root);
         if (!fileReader.isValidate()) {
             return null;
         }

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaReader_ver_1.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaReader_ver_1.java
index e720e6c..fcfa129 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaReader_ver_1.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaReader_ver_1.java
@@ -39,7 +39,7 @@ import org.tizen.webuibuilder.model.PartFactory;
 import org.tizen.webuibuilder.model.app.AppManager;
 import org.tizen.webuibuilder.model.css.CssSelector;
 import org.tizen.webuibuilder.model.filedata.HtmlMetaFileData;
-import org.tizen.webuibuilder.model.io.FileReader;
+import org.tizen.webuibuilder.model.io.TizenFileFormatter;
 import org.tizen.webuibuilder.ui.views.databinding.model.BindingData;
 import org.tizen.webuibuilder.ui.views.databinding.model.BindingObject;
 import org.tizen.webuibuilder.ui.views.nscreen.model.NScreenModel;
@@ -55,7 +55,7 @@ public class HtmlMetaReader_ver_1 {
 
         Element root = doc.getDocumentElement();
 
-        FileReader fileReader = new FileReader(root);
+        TizenFileFormatter fileReader = new TizenFileFormatter(root);
         if (!fileReader.isValidate()) {
             return null;
         }

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/html/HtmlReader.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/html/io/HtmlReader.java
similarity index 99%
rename from org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/html/HtmlReader.java
rename to org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/html/io/HtmlReader.java
index 6a124a2..2819648 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/html/HtmlReader.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/html/io/HtmlReader.java
@@ -21,7 +21,7 @@
  */
 
 
-package org.tizen.webuibuilder.model.html;
+package org.tizen.webuibuilder.model.html.io;
 
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/html/HtmlWriter.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/html/io/HtmlWriter.java
similarity index 99%
rename from org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/html/HtmlWriter.java
rename to org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/html/io/HtmlWriter.java
index 8b255bc..24aae0d 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/html/HtmlWriter.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/html/io/HtmlWriter.java
@@ -21,7 +21,7 @@
  */
 
 
-package org.tizen.webuibuilder.model.html;
+package org.tizen.webuibuilder.model.html.io;
 
 import java.io.FileWriter;
 import java.io.IOException;

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/FileReader.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/FileReader.java
deleted file mode 100644 (file)
index 4b7353a..0000000
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/FileReader.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * UI Builder
- *
- * Copyright (c) 2000 - 2014 Samsung Electronics Co., Ltd. All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Contributors:
- * - S-Core Co., Ltd
- *
- */
-
-
-package org.tizen.webuibuilder.model.io;
-
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
-
-public class FileReader {
-
-    private static final String ELEMENT_TIZEN_FILE = "tizenFile"; //$NON-NLS-1$
-    private static final String ELEMENT_FILE_INFO = "fileInfo"; //$NON-NLS-1$
-    private static final String ELEMENT_TYPE = "type"; //$NON-NLS-1$
-    private static final String ELEMENT_VERSION = "version"; //$NON-NLS-1$
-    private static final String ELEMENT_DESC = "desc"; //$NON-NLS-1$
-
-    private boolean validate = false;
-    private String type = null;
-    private String version = null;
-    private String desc = null;
-
-    public FileReader(Element rootElem) {
-       validate = parse(rootElem);
-    }
-
-    private boolean parse(Element rootElem) {
-        if (!rootElem.getNodeName().equals(ELEMENT_TIZEN_FILE)) {
-            return false;
-        }
-
-        NodeList fileInfos = rootElem.getElementsByTagName(ELEMENT_FILE_INFO);
-        if(fileInfos.getLength() != 1) {
-               return false;
-        }
-        
-        NodeList fileInfo = fileInfos.item(0).getChildNodes();
-        for (int i = 0; i < fileInfo.getLength(); i++) {
-               Node fileInfoItem = fileInfo.item(i);
-               if(fileInfoItem instanceof Element){
-                       Element elem = (Element)fileInfoItem;
-                       if(elem.getNodeName().equals(ELEMENT_TYPE)){
-                               type = new String(elem.getTextContent());
-                       } else if(elem.getNodeName().equals(ELEMENT_VERSION)){
-                       version = new String(elem.getTextContent());
-               } else if(elem.getNodeName().equals(ELEMENT_DESC)){
-                       desc = new String(elem.getTextContent());
-               }
-               }
-        }
-
-        if (type == null || type.isEmpty()) {
-            return false;
-        }
-        if (version == null || version.isEmpty()) {
-            return false;
-        }
-
-        return true;
-    }
-    
-    public boolean isValidate() {
-        return validate;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public String getDesc() {
-        return desc;
-    }
-}

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/PageReader_ver_2.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/PageReader_ver_2.java
index b2c5578..89681d5 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/PageReader_ver_2.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/PageReader_ver_2.java
@@ -61,7 +61,7 @@ public class PageReader_ver_2 {
 
         Element root = doc.getDocumentElement();
 
-        FileReader fileReader = new FileReader(root);
+        TizenFileFormatter fileReader = new TizenFileFormatter(root);
         if (!fileReader.isValidate()) {
             return null;
         }

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/TizenFileFormatter.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/TizenFileFormatter.java
index 9750406..41a22a2 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/TizenFileFormatter.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/TizenFileFormatter.java
@@ -29,6 +29,8 @@ import javax.xml.parsers.ParserConfigurationException;
 
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 
 
 public class TizenFileFormatter {
@@ -39,6 +41,7 @@ public class TizenFileFormatter {
     private static final String ELEMENT_VERSION = "version"; //$NON-NLS-1$
     private static final String ELEMENT_DESC = "desc"; //$NON-NLS-1$
 
+    private boolean validate = false;
     private String type = null;
     private String version = null;
     private String desc = null;
@@ -49,6 +52,10 @@ public class TizenFileFormatter {
         this.desc = desc;
     }
 
+    public TizenFileFormatter(Element rootElem) {
+       validate = parse(rootElem);
+    }
+
     public Document GenerateFileFormat() {
        DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
        DocumentBuilder docBuilder = null;
@@ -82,4 +89,55 @@ public class TizenFileFormatter {
         
         return doc;
     }
+    
+    private boolean parse(Element rootElem) {
+        if (!rootElem.getNodeName().equals(ELEMENT_TIZEN_FILE)) {
+            return false;
+        }
+
+        NodeList fileInfos = rootElem.getElementsByTagName(ELEMENT_FILE_INFO);
+        if(fileInfos.getLength() != 1) {
+               return false;
+        }
+        
+        NodeList fileInfo = fileInfos.item(0).getChildNodes();
+        for (int i = 0; i < fileInfo.getLength(); i++) {
+               Node fileInfoItem = fileInfo.item(i);
+               if(fileInfoItem instanceof Element){
+                       Element elem = (Element)fileInfoItem;
+                       if(elem.getNodeName().equals(ELEMENT_TYPE)){
+                               type = new String(elem.getTextContent());
+                       } else if(elem.getNodeName().equals(ELEMENT_VERSION)){
+                       version = new String(elem.getTextContent());
+               } else if(elem.getNodeName().equals(ELEMENT_DESC)){
+                       desc = new String(elem.getTextContent());
+               }
+               }
+        }
+
+        if (type == null || type.isEmpty()) {
+            return false;
+        }
+        if (version == null || version.isEmpty()) {
+            return false;
+        }
+
+        return true;
+    }
+    
+    public boolean isValidate() {
+        return validate;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public String getDesc() {
+        return desc;
+    }    
 }

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/project/io/ProjectReader_ver_2.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/project/io/ProjectReader_ver_2.java
index b8b1897..fde9422 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/project/io/ProjectReader_ver_2.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/project/io/ProjectReader_ver_2.java
@@ -37,14 +37,14 @@ import org.tizen.webuibuilder.model.app.Meta;
 import org.tizen.webuibuilder.model.app.Page;
 import org.tizen.webuibuilder.model.app.Stylesheet;
 import org.tizen.webuibuilder.model.filedata.AppFileData;
-import org.tizen.webuibuilder.model.io.FileReader;
+import org.tizen.webuibuilder.model.io.TizenFileFormatter;
 
 
 public class ProjectReader_ver_2 {
     public static AppFileData parse(Element root) {
         AppFileData descriptor = null;
 
-        FileReader fileReader = new FileReader(root);
+        TizenFileFormatter fileReader = new TizenFileFormatter(root);
         if (!fileReader.isValidate()) {
             return null;
         }

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/tool/ToolConfig.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/tool/ToolConfig.java
index 4acd27c..1430150 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/tool/ToolConfig.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/tool/ToolConfig.java
@@ -11,7 +11,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tizen.webuibuilder.BuilderConstants;
 import org.tizen.webuibuilder.model.PartFactory;
-import org.tizen.webuibuilder.model.io.FileReader;
+import org.tizen.webuibuilder.model.io.TizenFileFormatter;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
@@ -47,7 +47,7 @@ public class ToolConfig {
 
                if (doc != null && doc.getDocumentElement() != null) {
                        Element root = doc.getDocumentElement();
-                       FileReader fileReader = new FileReader(root);
+                       TizenFileFormatter fileReader = new TizenFileFormatter(root);
                        if (!fileReader.isValidate()) {
                                return;
                        }

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerForHTML.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerForHTML.java
index ea91082..088c561 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerForHTML.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerForHTML.java
@@ -47,7 +47,7 @@ import org.tizen.webuibuilder.animator.model.part.AnimatorPartFactory;
 import org.tizen.webuibuilder.gef.viewer.HoverBrowserViewer;
 import org.tizen.webuibuilder.model.app.AppManagerForHTML;
 import org.tizen.webuibuilder.model.css.CssFile;
-import org.tizen.webuibuilder.model.html.HtmlWriter;
+import org.tizen.webuibuilder.model.html.io.HtmlWriter;
 import org.tizen.webuibuilder.model.io.CodeGenerator;
 import org.tizen.webuibuilder.model.page.PageData;
 import org.tizen.webuibuilder.model.page.PageDataForHTML;

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/texteditor/TextEditorForHTML.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/texteditor/TextEditorForHTML.java
index 0ecd8ea..73ad6c6 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/texteditor/TextEditorForHTML.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/texteditor/TextEditorForHTML.java
@@ -28,7 +28,7 @@ import org.eclipse.ui.IEditorSite;
 import org.tizen.webuibuilder.BuilderConstants;
 import org.tizen.webuibuilder.model.app.AppManager;
 import org.tizen.webuibuilder.model.app.AppManagerForHTML;
-import org.tizen.webuibuilder.model.html.HtmlWriter;
+import org.tizen.webuibuilder.model.html.io.HtmlWriter;
 import org.tizen.webuibuilder.model.page.IPageDataSetListener;
 import org.tizen.webuibuilder.model.page.PageDataSetEvent;
 import org.tizen.webuibuilder.ui.editor.texteditor.TextEditorEvent.TextEditorEventType;