NSCREEN : Change path for Nscreen model.

Change path for Nscreen model.

Change-Id: I63d86cc70492609536781db2a8806d0ce098ba42
Signed-off-by: yonghwan82.jeon <yonghwan82.jeon@samsung.com>

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/AppManager.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/AppManager.java
index b893cbf..9489abf 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/AppManager.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/AppManager.java
@@ -46,6 +46,7 @@ import org.tizen.webuibuilder.model.css.CssFile;
 import org.tizen.webuibuilder.model.css.io.CssReader;
 import org.tizen.webuibuilder.model.descriptors.DescriptorManager;
 import org.tizen.webuibuilder.model.filedata.AppFileData;
+import org.tizen.webuibuilder.model.nscreen.NScreenModel;
 import org.tizen.webuibuilder.model.page.IPageDataSetListener;
 import org.tizen.webuibuilder.model.page.PageData;
 import org.tizen.webuibuilder.model.page.PageDataSet;
@@ -56,7 +57,6 @@ import org.tizen.webuibuilder.ui.views.databinding.model.BindingData;
 import org.tizen.webuibuilder.ui.views.databinding.model.BindingDataSet;
 import org.tizen.webuibuilder.ui.views.databinding.model.BindingDataSetEvent.BindingDataSetEventType;
 import org.tizen.webuibuilder.ui.views.databinding.model.BindingObject;
-import org.tizen.webuibuilder.ui.views.newnscreen.NScreenModel;
 
 
 public class AppManager implements IPageDataSetListener, IAppListener {

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 06a2c27..d883c0d 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
@@ -54,12 +54,12 @@ import org.tizen.webuibuilder.model.filedata.PageFileData;
 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.nscreen.NScreenModel;
 import org.tizen.webuibuilder.model.page.PageData;
 import org.tizen.webuibuilder.model.page.PageDataForHTML;
 import org.tizen.webuibuilder.model.page.PageDataPaths;
 import org.tizen.webuibuilder.model.project.ProjectManager;
 import org.tizen.webuibuilder.ui.views.databinding.model.BindingData;
-import org.tizen.webuibuilder.ui.views.newnscreen.NScreenModel;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

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 89bc3fa..d6f68a3 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,11 +39,11 @@ 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.file.TizenFileFormatter;
+import org.tizen.webuibuilder.model.nscreen.NScreenModel;
+import org.tizen.webuibuilder.model.nscreen.NScreenModel.Orientation;
+import org.tizen.webuibuilder.model.nscreen.NScreenModel.Scan;
 import org.tizen.webuibuilder.ui.views.databinding.model.BindingData;
 import org.tizen.webuibuilder.ui.views.databinding.model.BindingObject;
-import org.tizen.webuibuilder.ui.views.newnscreen.NScreenModel;
-import org.tizen.webuibuilder.ui.views.newnscreen.NScreenModel.Orientation;
-import org.tizen.webuibuilder.ui.views.newnscreen.NScreenModel.Scan;
 
 
 public class HtmlMetaReader_ver_1 {

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaWriter_ver_1.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaWriter_ver_1.java
index dc3b03f..87e14f4 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaWriter_ver_1.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/io/HtmlMetaWriter_ver_1.java
@@ -41,10 +41,10 @@ import org.tizen.webuibuilder.model.descriptors.PropertyDescriptor;
 import org.tizen.webuibuilder.model.descriptors.TypeDescriptor;
 import org.tizen.webuibuilder.model.filedata.AppFileData;
 import org.tizen.webuibuilder.model.io.file.TizenFileFormatter;
+import org.tizen.webuibuilder.model.nscreen.NScreenModel;
 import org.tizen.webuibuilder.model.page.PageData;
 import org.tizen.webuibuilder.ui.views.databinding.model.BindingData;
 import org.tizen.webuibuilder.ui.views.databinding.model.BindingObject;
-import org.tizen.webuibuilder.ui.views.newnscreen.NScreenModel;
 
 
 public class HtmlMetaWriter_ver_1 {

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/filedata/HtmlMetaFileData.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/filedata/HtmlMetaFileData.java
index 02f5b72..7fd0450 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/filedata/HtmlMetaFileData.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/filedata/HtmlMetaFileData.java
@@ -27,8 +27,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.tizen.webuibuilder.model.Part;
+import org.tizen.webuibuilder.model.nscreen.NScreenModel;
 import org.tizen.webuibuilder.ui.views.databinding.model.BindingData;
-import org.tizen.webuibuilder.ui.views.newnscreen.NScreenModel;
 import org.w3c.dom.Document;
 
 

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/filedata/PageFileData.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/filedata/PageFileData.java
index 9dcfade..54aadbe 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/filedata/PageFileData.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/filedata/PageFileData.java
@@ -27,7 +27,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import org.tizen.webuibuilder.model.Part;
-import org.tizen.webuibuilder.ui.views.newnscreen.NScreenModel;
+import org.tizen.webuibuilder.model.nscreen.NScreenModel;
 import org.w3c.dom.Document;
 
 

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/file/PageReader_ver_2.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/file/PageReader_ver_2.java
index 795572f..7fa2f2f 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/file/PageReader_ver_2.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/file/PageReader_ver_2.java
@@ -30,7 +30,7 @@ import org.tizen.webuibuilder.model.PartFactory;
 import org.tizen.webuibuilder.model.css.CssSelector;
 import org.tizen.webuibuilder.model.filedata.PageFileData;
 import org.tizen.webuibuilder.model.io.ModelDeserializer;
-import org.tizen.webuibuilder.ui.views.newnscreen.NScreenModel;
+import org.tizen.webuibuilder.model.nscreen.NScreenModel;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/file/PageWriter_ver_2.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/file/PageWriter_ver_2.java
index d3ee6b4..1f53741 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/file/PageWriter_ver_2.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/io/file/PageWriter_ver_2.java
@@ -28,7 +28,7 @@ import java.util.List;
 import org.tizen.webuibuilder.model.Part;
 import org.tizen.webuibuilder.model.filedata.PageFileData;
 import org.tizen.webuibuilder.model.io.ModelSerializer;
-import org.tizen.webuibuilder.ui.views.newnscreen.NScreenModel;
+import org.tizen.webuibuilder.model.nscreen.NScreenModel;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/newnscreen/NScreenModel.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/NScreenModel.java
similarity index 98%
rename from org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/newnscreen/NScreenModel.java
rename to org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/NScreenModel.java
index 61ddf96..bc4e646 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/newnscreen/NScreenModel.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/NScreenModel.java
@@ -21,7 +21,7 @@
  */
 
 
-package org.tizen.webuibuilder.ui.views.newnscreen;
+package org.tizen.webuibuilder.model.nscreen;
 
 import java.util.ArrayList;
 
@@ -37,7 +37,7 @@ public class NScreenModel {
     }
 
     public enum NScreenType {
-        COMMON, RATIO, DEVICE, CUSTOM
+        COMMON, ORIENTATION, RATIO, DEVICE, CUSTOM
     }
 
     private String title;

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java
index 2d1f5d3..d2f13a3 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesigner.java
@@ -147,6 +147,7 @@ import org.tizen.webuibuilder.model.css.CssFile;
 import org.tizen.webuibuilder.model.css.CssSelector;
 import org.tizen.webuibuilder.model.css.io.CssReader;
 import org.tizen.webuibuilder.model.descriptors.DescriptorManager;
+import org.tizen.webuibuilder.model.nscreen.NScreenModel;
 import org.tizen.webuibuilder.model.page.IPageDataListener;
 import org.tizen.webuibuilder.model.page.PageData;
 import org.tizen.webuibuilder.model.page.PageDataEvent;
@@ -164,7 +165,6 @@ import org.tizen.webuibuilder.ui.editor.dnd.listener.TemplateTransferDropTargetL
 import org.tizen.webuibuilder.ui.editor.ruler.DesignerRuler;
 import org.tizen.webuibuilder.ui.editor.ruler.DesignerRulerProvider;
 import org.tizen.webuibuilder.ui.editor.texteditor.TextEditor;
-import org.tizen.webuibuilder.ui.views.newnscreen.NScreenModel;
 import org.tizen.webuibuilder.ui.views.properties.PropertiesPage;
 import org.tizen.webuibuilder.ui.views.properties.PropertiesPage.PropertiesMode;
 

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerForAppXML.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerForAppXML.java
index 58a8d97..dcccb0d 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerForAppXML.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerForAppXML.java
@@ -46,11 +46,11 @@ import org.tizen.webuibuilder.model.filedata.PageFileData;
 import org.tizen.webuibuilder.model.io.CodeGenerator;
 import org.tizen.webuibuilder.model.io.file.PageReader;
 import org.tizen.webuibuilder.model.io.file.PageWriter;
+import org.tizen.webuibuilder.model.nscreen.NScreenModel;
 import org.tizen.webuibuilder.model.page.PageDataEvent;
 import org.tizen.webuibuilder.model.project.ProjectManager;
 import org.tizen.webuibuilder.ui.editor.texteditor.TextEditor;
 import org.tizen.webuibuilder.ui.editor.texteditor.TextEditorForAppXML;
-import org.tizen.webuibuilder.ui.views.newnscreen.NScreenModel;
 
 
 public class PageDesignerForAppXML extends PageDesigner {

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 5fd5736..649d42d 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
@@ -49,6 +49,8 @@ import org.tizen.webuibuilder.model.app.AppManagerForHTML;
 import org.tizen.webuibuilder.model.css.CssFile;
 import org.tizen.webuibuilder.model.html.io.HtmlWriter;
 import org.tizen.webuibuilder.model.io.CodeGenerator;
+import org.tizen.webuibuilder.model.nscreen.NScreenModel;
+import org.tizen.webuibuilder.model.nscreen.NScreenModel.NScreenType;
 import org.tizen.webuibuilder.model.page.PageData;
 import org.tizen.webuibuilder.model.page.PageDataForHTML;
 import org.tizen.webuibuilder.model.project.ProjectManager;
@@ -56,8 +58,6 @@ import org.tizen.webuibuilder.ui.editor.texteditor.ITextEditorListener;
 import org.tizen.webuibuilder.ui.editor.texteditor.TextEditor;
 import org.tizen.webuibuilder.ui.editor.texteditor.TextEditorEvent;
 import org.tizen.webuibuilder.ui.editor.texteditor.TextEditorForHTML;
-import org.tizen.webuibuilder.ui.views.newnscreen.NScreenModel;
-import org.tizen.webuibuilder.ui.views.newnscreen.NScreenModel.NScreenType;
 
 
 @SuppressWarnings("deprecation")

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenAddCommand.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenAddCommand.java
index 6bc2aa5..73a991b 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenAddCommand.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenAddCommand.java
@@ -30,7 +30,7 @@ import java.util.List;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.gef.commands.Command;
 import org.tizen.webuibuilder.model.css.CssFile;
-import org.tizen.webuibuilder.ui.views.newnscreen.NScreenModel;
+import org.tizen.webuibuilder.model.nscreen.NScreenModel;
 
 
 /**

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenCustomDialog.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenCustomDialog.java
index 1b252b2..b510ec7 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenCustomDialog.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenCustomDialog.java
@@ -34,7 +34,7 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
-import org.tizen.webuibuilder.ui.views.newnscreen.NScreenModel;
+import org.tizen.webuibuilder.model.nscreen.NScreenModel;
 
 
 /**

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenDeleteCommand.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenDeleteCommand.java
index 3a368d5..65ee445 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenDeleteCommand.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenDeleteCommand.java
@@ -30,7 +30,7 @@ import java.util.List;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.gef.commands.Command;
 import org.tizen.webuibuilder.model.css.CssFile;
-import org.tizen.webuibuilder.ui.views.newnscreen.NScreenModel;
+import org.tizen.webuibuilder.model.nscreen.NScreenModel;
 
 
 /**

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenList.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenList.java
index d91eaa0..7a7b1bb 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenList.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenList.java
@@ -36,7 +36,7 @@ import org.eclipse.swt.layout.FormLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.tizen.webuibuilder.model.css.CssFile;
-import org.tizen.webuibuilder.ui.views.newnscreen.NScreenModel;
+import org.tizen.webuibuilder.model.nscreen.NScreenModel;
 import org.tizen.webuibuilder.ui.views.nscreen.model.NScreenPageModel;
 
 

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenListItem.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenListItem.java
index 1c39288..38afc11 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenListItem.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenListItem.java
@@ -45,9 +45,9 @@ import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.MenuItem;
+import org.tizen.webuibuilder.model.nscreen.NScreenModel;
 import org.tizen.webuibuilder.model.page.IPageDataListener;
 import org.tizen.webuibuilder.model.page.PageDataEvent;
-import org.tizen.webuibuilder.ui.views.newnscreen.NScreenModel;
 
 
 /**

diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenPage.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenPage.java
index 2506ca2..70c24ad 100644 (file)
--- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenPage.java
+++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/nscreen/NScreenPage.java
@@ -34,8 +34,8 @@ import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.IActionBars;
 import org.eclipse.ui.part.Page;
-import org.tizen.webuibuilder.ui.views.newnscreen.NScreenModel;
-import org.tizen.webuibuilder.ui.views.newnscreen.NScreenModel.NScreenType;
+import org.tizen.webuibuilder.model.nscreen.NScreenModel;
+import org.tizen.webuibuilder.model.nscreen.NScreenModel.NScreenType;
 import org.tizen.webuibuilder.ui.views.nscreen.model.NScreenPageModel;