From dc23183e89fc4840a38de154685a9f85f843171c Mon Sep 17 00:00:00 2001 From: "yonghwan82.jeon" Date: Mon, 12 May 2014 17:05:42 +0900 Subject: [PATCH] NSCREEN: Make nscreenModelManager. Make nscreenModelManger. Change-Id: I83a5eb5d8f5664cff67f2a0a96f69776a0176dd6 Signed-off-by: yonghwan82.jeon --- .../tizen/webuibuilder/model/app/AppManager.java | 259 +-------------------- .../webuibuilder/model/app/AppManagerForHTML.java | 2 +- .../model/app/io/HtmlMetaWriter_ver_1.java | 2 +- .../model/nscreen/NScreenModelController.java | 2 +- .../model/nscreen/NScreenModelManger.java | 189 +++++++++++++++ .../nscreen/descriptors/NScreenDescriptor.java | 192 +++++++++++++++ .../nscreen/descriptors/NscreenDescriptor.java | 30 --- .../ui/editor/PageDesignerForAppXML.java | 4 +- .../ui/editor/PageDesignerForHTML.java | 2 +- .../ui/views/newnscreen/NScreenViewPage.java | 4 +- .../webuibuilder/ui/views/nscreen/NScreenPage.java | 9 +- 11 files changed, 406 insertions(+), 289 deletions(-) create mode 100644 org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/NScreenModelManger.java create mode 100644 org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/descriptors/NScreenDescriptor.java delete mode 100644 org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/descriptors/NscreenDescriptor.java 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 b974551..ec13c49 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/AppManager.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/AppManager.java @@ -29,7 +29,6 @@ import java.io.InputStream; import java.net.MalformedURLException; import java.util.ArrayList; import java.util.Iterator; -import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -47,10 +46,8 @@ 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.Device; -import org.tizen.webuibuilder.model.nscreen.NScreenModel; -import org.tizen.webuibuilder.model.nscreen.NScreenModel.NScreenType; -import org.tizen.webuibuilder.model.nscreen.NScreenModel.Orientation; +import org.tizen.webuibuilder.model.nscreen.NScreenModelManger; +import org.tizen.webuibuilder.model.nscreen.descriptors.NScreenDescriptor; import org.tizen.webuibuilder.model.page.IPageDataSetListener; import org.tizen.webuibuilder.model.page.PageData; import org.tizen.webuibuilder.model.page.PageDataSet; @@ -82,14 +79,15 @@ public class AppManager implements IPageDataSetListener, IAppListener { private PartFactory partFactory = null; private AppFileData appFileData = new AppFileData(); - private List nscreenModels = new ArrayList(); - private List listeners = new ArrayList(); private List removeListeners = new ArrayList(); private boolean processEventFlag = false; private String rootFullPath; + private NScreenModelManger nscreenModelManger; + private NScreenDescriptor nscreenDescriptor; + /** * Constructor. * @@ -101,7 +99,8 @@ public class AppManager implements IPageDataSetListener, IAppListener { this.projectManager = projectManager; this.descriptorManager = descriptorManager; partFactory = new PartFactory(descriptorManager); - this.initializeNscreenModel(); + nscreenModelManger = new NScreenModelManger(); + nscreenDescriptor = new NScreenDescriptor(this); pageDataSet = new PageDataSet(); pageDataSet.addPageListener(this); @@ -869,247 +868,11 @@ public class AppManager implements IPageDataSetListener, IAppListener { return null; } - protected void initializeNscreenModel() { - IFile file = this.projectManager.getProject().getFile("index.meta.xml"); - if (file.exists()) { - // read metafile. - return; - } - - createCommonNscreen(); - createOrientationNscreen(); - createPixelRatioNscreen(); - createDeviceNscreen(); - } - - public NScreenModel createCommonNscreen() { - return addNscreenModel(BuilderConstants.NSCREENCOMMON, NScreenType.COMMON, null, 0, 0, 0, - BuilderConstants.NSCREENCOMMON.toLowerCase()); - } - - public void createOrientationNscreen() { - addNscreenModel(BuilderConstants.NSCREENPORTRAIT, NScreenType.ORIENTATION, - Orientation.PORTRAIT, 0, 0, 0, - BuilderConstants.NSCREENPORTRAIT.toLowerCase()); - addNscreenModel(BuilderConstants.NSCREENLANDSCAPE, NScreenType.ORIENTATION, - Orientation.LANDSCAPE, 0, 0, 0, - BuilderConstants.NSCREENLANDSCAPE.toLowerCase()); - } - - public void createPixelRatioNscreen() { - addNscreenModel("Pixcel Ratio 1.0", NScreenType.PIXELRATIO, null, 1.0, 0, 0, "pixcel_ratio_1_0"); - addNscreenModel("Pixcel Ratio 1.5", NScreenType.PIXELRATIO, null, 1.5, 0, 0, "pixcel_ratio_1_5"); - addNscreenModel("Pixcel Ratio 2.0", NScreenType.PIXELRATIO, null, 2.0, 0, 0, "pixcel_ratio_2_0"); - addNscreenModel("Pixcel Ratio 3.0", NScreenType.PIXELRATIO, null, 3.0, 0, 0, "pixcel_ratio_3_0"); - } - - public void createDeviceNscreen() { - addNscreenModel("Wearable 320x320 (1:1)(P)", NScreenType.RESOLUTION, null, 0, 320, 320, - "wearable_320x320"); - addNscreenModel("Wearable 360x480 (3:4)(P)", NScreenType.RESOLUTION, null, 0, 360, 480, - "wearable_360x480"); - addNscreenModel("Wearable 480x360 (4:3)(L)", NScreenType.RESOLUTION, null, 0, 480, 360, - "wearable_480x360"); - addNscreenModel("Wearable 312x496 (10:16)(P)", NScreenType.RESOLUTION, null, 0, 312, 496, - "wearable_312x496"); - addNscreenModel("Wearable 496x312 (16:10)(L)", NScreenType.RESOLUTION, null, 0, 496, 312, - "wearable_496x312"); - addNscreenModel("Mobile 320x480 (2:3)(P)", NScreenType.RESOLUTION, null, 0, 320, 480, - "mobile_320x480"); - addNscreenModel("Mobile 480x320 (3:2)(L)", NScreenType.RESOLUTION, null, 0, 480, 320, - "mobile_480x320"); - addNscreenModel("Mobile 360x640 (9:16)(P)", NScreenType.RESOLUTION, null, 0, 360, 640, - "mobile_360x640"); - addNscreenModel("Mobile 640x360 (16:9)(L)", NScreenType.RESOLUTION, null, 0, 640, 360, - "mobile_640x360"); - addNscreenModel("Mobile 800x1280 (10:16)(P)", NScreenType.RESOLUTION, null, 0, 800, 1280, - "mobile_800x1280"); - addNscreenModel("Mobile 1280x800 (16:10)(L)", NScreenType.RESOLUTION, null, 0, 1280, 800, - "mobile_1280x800"); - addNscreenModel("TV 1920x1080 (16:9)(P)", NScreenType.RESOLUTION, null, 0, 1920, 1080, - "tv_1920x1080"); - addNscreenModel("TV 1080x1920 (9:16)(L)", NScreenType.RESOLUTION, null, 0, 1080, 1920, - "tv_1080x1920"); - } - - private NScreenModel addNscreenModel(String name, NScreenType type, Orientation orientation, - double devicePixelRatio, int deviceWidth, - int deviceHeight, String fileName) { - if (name == null) { - return null; - } - - if (name.isEmpty()) { - return null; - } - - if (type == null) { - return null; - } - NScreenModel model = new NScreenModel(name, type); - - if (orientation != null) { - model.setOrientation(orientation); - } - - if (devicePixelRatio != 0) { - model.setDevicePixelRatio(devicePixelRatio); - } - - if (deviceWidth != 0) { - model.setDeviceWidth(deviceWidth); - } - - if (deviceHeight != 0) { - model.setDeviceHeight(deviceHeight); - } - - if (fileName != null) { - if (!fileName.isEmpty()) { - model.setFileName(fileName); - } - } - this.addNScreenModel(model); - - return model; - } - - public boolean addNScreenModel(NScreenModel model) { - if (isValidNscreenModel(model)) { - this.nscreenModels.add(model); - return true; - } - return false; - } - - public void removeNScreenModel(NScreenModel model) { - this.nscreenModels.remove(model); - } - - public List getNScreenModels() { - return this.nscreenModels; - } - - public NScreenModel getNScreenModel(String nscreenName) { - NScreenModel model = null; - - if (nscreenName == null) { - return null; - } - - if (nscreenName.isEmpty()) { - return null; - } - - if (nscreenModels.size() == 0) { - return null; - } - - for (int i = 0; i < nscreenModels.size(); i++) { - if (nscreenName.equalsIgnoreCase(this.nscreenModels.get(i).getName())) { - model = this.nscreenModels.get(i); - break; - } - } - - return model; - } - - public NScreenModel getCommonNscreen() { - if (nscreenModels.size() == 0) { - return createCommonNscreen(); - } - return this.getNScreenModel(BuilderConstants.NSCREENCOMMON); - } - - public boolean isValidNscreenModel(NScreenModel model) { - if (getNScreenModel(model.getName()) == null) { - return true; - } - return false; + public NScreenModelManger getNScreenModelManger() { + return this.nscreenModelManger; } - private NScreenModel getNScreenModel(NScreenType type, Object object) { - NScreenModel model = null; - NScreenModel retValue = null; - - if (type == null) { - return null; - } - - if (object == null) { - return null; - } - - // Common - if (type == NScreenType.COMMON) { - return this.getCommonNscreen(); - } - - // Orientation - if (type == NScreenType.ORIENTATION) { - if (!(object instanceof String)) { - return null; - } - - String orientation = (String) object; - - if (NScreenModel.Orientation.PORTRAIT.toString().equalsIgnoreCase(orientation)) { - return getNScreenModel(BuilderConstants.NSCREENPORTRAIT); - } else { - return getNScreenModel(BuilderConstants.NSCREENLANDSCAPE); - } - - } - - if (type == NScreenType.PIXELRATIO) { - if (!(object instanceof Double)) { - return null; - } - double pixelRatio = (double) object; - - for (int i = 0; i < this.nscreenModels.size(); i++) { - model = this.nscreenModels.get(i); - if (model.getType() == type) { - if (model.getDevicePixelRatio() == pixelRatio) { - retValue = model; - break; - } - } - } - } - - return retValue; - } - - public List getNScreenModelsForDevice(Device device) { - List list = new LinkedList(); - - // add Common Model. - list.add(this.getCommonNscreen()); - - // add Orientation - if (device.getOrientation() != null) { - list.add(getNScreenModel(NScreenType.ORIENTATION, device.getOrientation().toString())); - } - - // add pixel ratio - if (device.getDevicePixelRatio() > 0) { - list.add(getNScreenModel(NScreenType.PIXELRATIO, device.getDevicePixelRatio())); - } - - // add Resolution - if ((device.getDeviceWidth() > 0) && (device.getDeviceHeight() > 0)) { - for (int i = 0; i < this.nscreenModels.size(); i++) { - NScreenModel model = this.nscreenModels.get(i); - if (model.getDeviceWidth() == device.getDeviceWidth()) { - if (model.getDeviceHeight() == device.getDeviceHeight()) { - list.add(model); - } - } - } - } - - return list; + public NScreenDescriptor getNScreenDescriptor() { + return this.nscreenDescriptor; } } 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 7a1cc7a..ae15885 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/AppManagerForHTML.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/app/AppManagerForHTML.java @@ -213,7 +213,7 @@ public class AppManagerForHTML extends AppManager { String projectFolder = projectManager.getProject().getLocation().toString(); for (NScreenModel model : nscreenModel) { - addNScreenModel( model ); + getNScreenModelManger().addNScreenModel(model); // for ( String page : model.getEnalbePages() ) { // String cssFileFullPath = projectFolder + IPath.SEPARATOR + page + "." +model.getFileName(); // 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 a5ed78b..9eae691 100644 --- 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 @@ -149,7 +149,7 @@ public class HtmlMetaWriter_ver_1 { // } public static Element writeNScreen(Document doc, Element nscreenElement, AppManager appManager) { - List list = appManager.getNScreenModels(); + List list = appManager.getNScreenModelManger().getNScreenModels(); // Collections.sort(list, new Comparator() { // @Override // public int compare(NScreenModel o1, NScreenModel o2) { diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/NScreenModelController.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/NScreenModelController.java index 817c0a9..f28eff0 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/NScreenModelController.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/NScreenModelController.java @@ -21,7 +21,7 @@ public class NScreenModelController implements IPageDataSetListener { public NScreenModelController(AppManager appManager) { logger.info("Create Class"); this.appManager = appManager; - this.modelList = this.appManager.getNScreenModels(); + this.modelList = this.appManager.getNScreenModelManger().getNScreenModels(); this.addListener(); } diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/NScreenModelManger.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/NScreenModelManger.java new file mode 100644 index 0000000..1f6280d --- /dev/null +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/NScreenModelManger.java @@ -0,0 +1,189 @@ +/* + * 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.nscreen; + +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; + +import org.tizen.webuibuilder.BuilderConstants; +import org.tizen.webuibuilder.model.nscreen.NScreenModel.NScreenType; + + +public class NScreenModelManger { + private List nscreenModels = new ArrayList(); + + public NScreenModelManger() { + } + + public NScreenModel createCommonNscreen() { + NScreenModel model = new NScreenModel(BuilderConstants.NSCREENCOMMON, NScreenType.COMMON); + model.setFileName(BuilderConstants.NSCREENCOMMON.toLowerCase()); + model.setDefaultInMenu(true); + model.setEnableInMenu(false); + model.setLinkInMenu(false); + model.setMoveInMenu(false); + this.addNScreenModel(model); + return model; + } + + public boolean addNScreenModel(NScreenModel model) { + if (isValidNscreenModel(model)) { + this.nscreenModels.add(model); + return true; + } + return false; + } + + public void removeNScreenModel(NScreenModel model) { + this.nscreenModels.remove(model); + } + + public List getNScreenModels() { + return this.nscreenModels; + } + + public NScreenModel getNScreenModel(String nscreenName) { + NScreenModel model = null; + + if (nscreenName == null) { + return null; + } + + if (nscreenName.isEmpty()) { + return null; + } + + if (nscreenModels.size() == 0) { + return null; + } + + for (int i = 0; i < nscreenModels.size(); i++) { + if (nscreenName.equalsIgnoreCase(this.nscreenModels.get(i).getName())) { + model = this.nscreenModels.get(i); + break; + } + } + + return model; + } + + public NScreenModel getCommonNscreen() { + if (nscreenModels.size() == 0) { + return createCommonNscreen(); + } + return this.getNScreenModel(BuilderConstants.NSCREENCOMMON); + } + + public boolean isValidNscreenModel(NScreenModel model) { + if (getNScreenModel(model.getName()) == null) { + return true; + } + return false; + } + + private NScreenModel getNScreenModel(NScreenType type, Object object) { + NScreenModel model = null; + NScreenModel retValue = null; + + if (type == null) { + return null; + } + + if (object == null) { + return null; + } + + // Common + if (type == NScreenType.COMMON) { + return this.getCommonNscreen(); + } + + // Orientation + if (type == NScreenType.ORIENTATION) { + if (!(object instanceof String)) { + return null; + } + + String orientation = (String) object; + + if (NScreenModel.Orientation.PORTRAIT.toString().equalsIgnoreCase(orientation)) { + return getNScreenModel(BuilderConstants.NSCREENPORTRAIT); + } else { + return getNScreenModel(BuilderConstants.NSCREENLANDSCAPE); + } + + } + + if (type == NScreenType.PIXELRATIO) { + if (!(object instanceof Double)) { + return null; + } + double pixelRatio = (Double) object; + + for (int i = 0; i < this.nscreenModels.size(); i++) { + model = this.nscreenModels.get(i); + if (model.getType() == type) { + if (model.getDevicePixelRatio() == pixelRatio) { + retValue = model; + break; + } + } + } + } + + return retValue; + } + + public List getNScreenModelsForDevice(Device device) { + List list = new LinkedList(); + + // add Common Model. + list.add(this.getCommonNscreen()); + + // add Orientation + if (device.getOrientation() != null) { + list.add(getNScreenModel(NScreenType.ORIENTATION, device.getOrientation().toString())); + } + + // add pixel ratio + if (device.getDevicePixelRatio() > 0) { + list.add(getNScreenModel(NScreenType.PIXELRATIO, device.getDevicePixelRatio())); + } + + // add Resolution + if ((device.getDeviceWidth() > 0) && (device.getDeviceHeight() > 0)) { + for (int i = 0; i < this.nscreenModels.size(); i++) { + NScreenModel model = this.nscreenModels.get(i); + if (model.getDeviceWidth() == device.getDeviceWidth()) { + if (model.getDeviceHeight() == device.getDeviceHeight()) { + list.add(model); + } + } + } + } + + return list; + } +} diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/descriptors/NScreenDescriptor.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/descriptors/NScreenDescriptor.java new file mode 100644 index 0000000..506dd4c --- /dev/null +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/descriptors/NScreenDescriptor.java @@ -0,0 +1,192 @@ +/* + * 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.nscreen.descriptors; + +import java.util.List; + +import org.eclipse.core.resources.IFile; +import org.tizen.webuibuilder.BuilderConstants; +import org.tizen.webuibuilder.model.app.AppManager; +import org.tizen.webuibuilder.model.nscreen.NScreenModel; +import org.tizen.webuibuilder.model.nscreen.NScreenModel.NScreenType; +import org.tizen.webuibuilder.model.nscreen.NScreenModel.Orientation; + + +public class NScreenDescriptor { + private AppManager appManger = null; + private List list = null; + + public NScreenDescriptor(AppManager appManger) { + this.appManger = appManger; + this.list = this.appManger.getNScreenModelManger().getNScreenModels(); + load(); + } + + private void load() { + IFile file = appManger.getProjectManager().getProject().getFile("index.meta.xml"); + if (file.exists()) { + // read metafile. + return; + } + + createCommonNscreen(); + createOrientationNscreen(); + createPixelRatioNscreen(); + createDeviceNscreen(); + } + + public void createCommonNscreen() { + addNscreenModel(BuilderConstants.NSCREENCOMMON, NScreenType.COMMON, null, 0, 0, 0, + BuilderConstants.NSCREENCOMMON.toLowerCase()); + } + + public void createOrientationNscreen() { + addNscreenModel(BuilderConstants.NSCREENPORTRAIT, NScreenType.ORIENTATION, + Orientation.PORTRAIT, 0, 0, 0, + BuilderConstants.NSCREENPORTRAIT.toLowerCase()); + addNscreenModel(BuilderConstants.NSCREENLANDSCAPE, NScreenType.ORIENTATION, + Orientation.LANDSCAPE, 0, 0, 0, + BuilderConstants.NSCREENLANDSCAPE.toLowerCase()); + } + + public void createPixelRatioNscreen() { + addNscreenModel("Pixcel Ratio 1.0", NScreenType.PIXELRATIO, null, 1.0, 0, 0, + "pixcel_ratio_1_0"); + addNscreenModel("Pixcel Ratio 1.5", NScreenType.PIXELRATIO, null, 1.5, 0, 0, + "pixcel_ratio_1_5"); + addNscreenModel("Pixcel Ratio 2.0", NScreenType.PIXELRATIO, null, 2.0, 0, 0, + "pixcel_ratio_2_0"); + addNscreenModel("Pixcel Ratio 3.0", NScreenType.PIXELRATIO, null, 3.0, 0, 0, + "pixcel_ratio_3_0"); + } + + public void createDeviceNscreen() { + addNscreenModel("Wearable 320x320 (1:1)", NScreenType.RESOLUTION, null, 0, 320, 320, + "wearable_320x320"); + addNscreenModel("Wearable 360x480 (3:4)", NScreenType.RESOLUTION, null, 0, 360, 480, + "wearable_360x480"); + addNscreenModel("Wearable 480x360 (4:3)", NScreenType.RESOLUTION, null, 0, 480, 360, + "wearable_480x360"); + addNscreenModel("Wearable 312x496 (10:16)", NScreenType.RESOLUTION, null, 0, 312, 496, + "wearable_312x496"); + addNscreenModel("Wearable 496x312 (16:10)", NScreenType.RESOLUTION, null, 0, 496, 312, + "wearable_496x312"); + addNscreenModel("Mobile 320x480 (2:3)", NScreenType.RESOLUTION, null, 0, 320, 480, + "mobile_320x480"); + addNscreenModel("Mobile 480x320 (3:2)", NScreenType.RESOLUTION, null, 0, 480, 320, + "mobile_480x320"); + addNscreenModel("Mobile 360x640 (9:16)", NScreenType.RESOLUTION, null, 0, 360, 640, + "mobile_360x640"); + addNscreenModel("Mobile 640x360 (16:9)", NScreenType.RESOLUTION, null, 0, 640, 360, + "mobile_640x360"); + addNscreenModel("Mobile 800x1280 (10:16)", NScreenType.RESOLUTION, null, 0, 800, 1280, + "mobile_800x1280"); + addNscreenModel("Mobile 1280x800 (16:10)", NScreenType.RESOLUTION, null, 0, 1280, 800, + "mobile_1280x800"); + addNscreenModel("TV 1920x1080 (16:9)", NScreenType.RESOLUTION, null, 0, 1920, 1080, + "tv_1920x1080"); + addNscreenModel("TV 1080x1920 (9:16)", NScreenType.RESOLUTION, null, 0, 1080, 1920, + "tv_1080x1920"); + } + + public void addNscreenModel(String name, NScreenType type, Orientation orientation, + double devicePixelRatio, int deviceWidth, int deviceHeight, + String fileName) { + if (name == null) { + return; + } + + if (name.isEmpty()) { + return; + } + + if (type == null) { + return; + } + NScreenModel model = new NScreenModel(name, type); + + if (orientation != null) { + model.setOrientation(orientation); + } + + if (devicePixelRatio != 0) { + model.setDevicePixelRatio(devicePixelRatio); + } + + if (deviceWidth != 0) { + model.setDeviceWidth(deviceWidth); + } + + if (deviceHeight != 0) { + model.setDeviceHeight(deviceHeight); + } + + if (fileName != null) { + if (!fileName.isEmpty()) { + model.setFileName(fileName); + } + } + this.setMenuFlag(model); + this.list.add(model); + } + + public void setMenuFlag(NScreenModel model) { + if (model == null) { + return; + } + + if (model.getType() == NScreenType.COMMON) { + model.setDefaultInMenu(true); + model.setEnableInMenu(false); + model.setLinkInMenu(false); + model.setMoveInMenu(false); + } + + if (model.getType() == NScreenType.ORIENTATION) { + model.setDefaultInMenu(false); + model.setEnableInMenu(true); + model.setLinkInMenu(false); + model.setMoveInMenu(false); + } + + if (model.getType() == NScreenType.PIXELRATIO) { + model.setDefaultInMenu(false); + model.setEnableInMenu(true); + model.setLinkInMenu(true); + model.setMoveInMenu(false); + } + + if (model.getType() == NScreenType.RESOLUTION) { + model.setDefaultInMenu(false); + model.setEnableInMenu(true); + model.setLinkInMenu(true); + model.setMoveInMenu(true); + } + + if (model.getType() == NScreenType.CUSTOM) { + // noting. + } + } + +} diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/descriptors/NscreenDescriptor.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/descriptors/NscreenDescriptor.java deleted file mode 100644 index 4ecb25a..0000000 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/model/nscreen/descriptors/NscreenDescriptor.java +++ /dev/null @@ -1,30 +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.nscreen.descriptors; - -public class NscreenDescriptor { - - public NscreenDescriptor() { - } - -} 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 7b0166e..1108ef8 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerForAppXML.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerForAppXML.java @@ -165,7 +165,7 @@ public class PageDesignerForAppXML extends PageDesigner { // } } - appManager.addNScreenModel( model ); + appManager.getNScreenModelManger().addNScreenModel( model ); } setCssFileToModel(pageData.getCurrentCssFile()); @@ -199,7 +199,7 @@ public class PageDesignerForAppXML extends PageDesigner { new PageFileData(pageData.getName(), pageData.getVersion(), pageData.getRootPart(), null); - for ( NScreenModel model : appManager.getNScreenModels() ) { + for ( NScreenModel model : appManager.getNScreenModelManger().getNScreenModels() ) { pageFileData.getNscreenModelList().add( model ); } 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 dc38db5..2c32005 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerForHTML.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/editor/PageDesignerForHTML.java @@ -159,7 +159,7 @@ public class PageDesignerForHTML extends PageDesigner implements ITextEditorList } CssFile cssFile = loadCssFile(cssPath); - appManager.getCommonNscreen().setFileName(cssFileName); + appManager.getNScreenModelManger().getCommonNscreen().setFileName(cssFileName); pageData.addCssFile(cssFile); diff --git a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/newnscreen/NScreenViewPage.java b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/newnscreen/NScreenViewPage.java index 3058b94..9787f0e 100644 --- a/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/newnscreen/NScreenViewPage.java +++ b/org.tizen.webuibuilder/src/org/tizen/webuibuilder/ui/views/newnscreen/NScreenViewPage.java @@ -123,7 +123,9 @@ public class NScreenViewPage extends Page { IEditorPart ieditor = window.getActivePage().getActiveEditor(); PageDesigner editor = (PageDesigner) ieditor; - List list = editor.getAppManager().getNScreenModelsForDevice(device); + List list = + editor.getAppManager().getNScreenModelManger() + .getNScreenModelsForDevice(device); String printData = ""; for (int i = 0; i < list.size(); i++) { NScreenModel model = list.get(i); 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 ac0cfbc..914a05f 100644 --- 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 @@ -146,7 +146,8 @@ public class NScreenPage extends Page { } public boolean existNscreen(int width) { - List list = mNScreenPageModel.getAppManager().getNScreenModels(); + List list = + mNScreenPageModel.getAppManager().getNScreenModelManger().getNScreenModels(); for (NScreenModel model : list) { if (model.getWidth() == width) { return true; @@ -176,7 +177,7 @@ public class NScreenPage extends Page { model.setFileName(cssFileName); Command command = - new NScreenAddCommand(mNScreenPageModel.getAppManager().getNScreenModels(), model, + new NScreenAddCommand(mNScreenPageModel.getAppManager().getNScreenModelManger().getNScreenModels(), model, mNScreenList); mNScreenPageModel.getPageDesigner().getCommandStack().execute(command); } @@ -192,7 +193,7 @@ public class NScreenPage extends Page { } public void deleteNScreen(NScreenListItem item) { - List list = mNScreenPageModel.getAppManager().getNScreenModels(); + List list = mNScreenPageModel.getAppManager().getNScreenModelManger().getNScreenModels(); if (list.get(0) == item.getModel()) { showInfomationDialog("can not delete the default screen."); return; @@ -255,7 +256,7 @@ public class NScreenPage extends Page { mNScreenList = new NScreenList(parent, mNScreenPageModel); - List list = mNScreenPageModel.getAppManager().getNScreenModels(); + List list = mNScreenPageModel.getAppManager().getNScreenModelManger().getNScreenModels(); for (int i = 0, size = list.size(); i < size; i++) { NScreenModel nsModel = list.get(i); -- 2.7.4