From: jihye kim Date: Wed, 24 Jul 2013 05:20:29 +0000 (+0900) Subject: [Title] emulator-manager: make mobile plugin and seperate project emulator-maanger... X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f30f81fef86e9898834d728f04961a53bc9aa8a7;p=sdk%2Femulator%2Femulator-manager.git [Title] emulator-manager: make mobile plugin and seperate project emulator-maanger and mobile-plugin [Desc.] seperate project emulator-manager and mobile-plugin and make mobile plugin [Issue] N/A Signed-off-by: jihye kim --- diff --git a/.gitignore b/.gitignore index f8ac2f3..b69d546 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,13 @@ -bin -lib -build +emulator-manager/bin +mobile-plugin/bin +emulator-manager/lib +mobile-plugin/lib +emulator-manager/build +mobile-plugin/build emulator-manager.jar emulator-manager.exe -about.properties +emulator-manager/emulator-manager.jar +emulator-manager/emulator-manager.exe +emulator-manager/about.properties +emulator-manager/em-plugins +mobile-plugin/mobile-plugin.jar diff --git a/.classpath b/emulator-manager/.classpath similarity index 100% rename from .classpath rename to emulator-manager/.classpath diff --git a/.project b/emulator-manager/.project similarity index 100% rename from .project rename to emulator-manager/.project diff --git a/build.xml b/emulator-manager/build.xml similarity index 94% rename from build.xml rename to emulator-manager/build.xml index 50ab5c1..3128478 100644 --- a/build.xml +++ b/emulator-manager/build.xml @@ -9,6 +9,11 @@ + + + + + diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/BaseInformationType.java b/emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/BaseInformationType.java similarity index 92% rename from jaxb_src/org/tizen/emulator/manager/vms/xml/BaseInformationType.java rename to emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/BaseInformationType.java index 55e0e94..3bdafac 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/BaseInformationType.java +++ b/emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/BaseInformationType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.07.17 at 07:23:49 PM KST +// Generated on: 2013.07.22 at 03:22:38 PM KST // @@ -45,6 +45,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; * <element name="currentDiskImage" type="{http://www.tizen.org/em}diskImageFormatType"/> * <element name="swapDiskImage" type="{http://www.tizen.org/em}diskImageFormatType"/> * </sequence> + * <attribute name="profile" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="type" use="required"> * <simpleType> * <restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN"> @@ -170,6 +171,7 @@ public class BaseInformationType { * <element name="currentDiskImage" type="{http://www.tizen.org/em}diskImageFormatType"/> * <element name="swapDiskImage" type="{http://www.tizen.org/em}diskImageFormatType"/> * </sequence> + * <attribute name="profile" type="{http://www.w3.org/2001/XMLSchema}string" /> * <attribute name="type" use="required"> * <simpleType> * <restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN"> @@ -201,6 +203,8 @@ public class BaseInformationType { protected DiskImageFormatType currentDiskImage; @XmlElement(required = true) protected DiskImageFormatType swapDiskImage; + @XmlAttribute + protected String profile; @XmlAttribute(required = true) @XmlJavaTypeAdapter(CollapsedStringAdapter.class) protected String type; @@ -282,6 +286,30 @@ public class BaseInformationType { } /** + * Gets the value of the profile property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getProfile() { + return profile; + } + + /** + * Sets the value of the profile property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setProfile(String value) { + this.profile = value; + } + + /** * Gets the value of the type property. * * @return diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/DeviceType.java b/emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/DeviceType.java similarity index 98% rename from jaxb_src/org/tizen/emulator/manager/vms/xml/DeviceType.java rename to emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/DeviceType.java index 2337b2c..051e650 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/DeviceType.java +++ b/emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/DeviceType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.07.17 at 07:23:49 PM KST +// Generated on: 2013.07.22 at 03:22:38 PM KST // diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/DiskImageFormatType.java b/emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/DiskImageFormatType.java similarity index 98% rename from jaxb_src/org/tizen/emulator/manager/vms/xml/DiskImageFormatType.java rename to emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/DiskImageFormatType.java index 3f58407..79c24ac 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/DiskImageFormatType.java +++ b/emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/DiskImageFormatType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.07.17 at 07:23:49 PM KST +// Generated on: 2013.07.22 at 03:22:38 PM KST // diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/DisplayType.java b/emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/DisplayType.java similarity index 99% rename from jaxb_src/org/tizen/emulator/manager/vms/xml/DisplayType.java rename to emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/DisplayType.java index b38ca8d..fc21a55 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/DisplayType.java +++ b/emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/DisplayType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.07.17 at 07:23:49 PM KST +// Generated on: 2013.07.22 at 03:22:38 PM KST // diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/EmulatorConfiguration.java b/emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/EmulatorConfiguration.java similarity index 98% rename from jaxb_src/org/tizen/emulator/manager/vms/xml/EmulatorConfiguration.java rename to emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/EmulatorConfiguration.java index 3d89e0a..0b4a281 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/EmulatorConfiguration.java +++ b/emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/EmulatorConfiguration.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.07.17 at 07:23:49 PM KST +// Generated on: 2013.07.22 at 03:22:38 PM KST // diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/ObjectFactory.java b/emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/ObjectFactory.java similarity index 98% rename from jaxb_src/org/tizen/emulator/manager/vms/xml/ObjectFactory.java rename to emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/ObjectFactory.java index 058b51c..fb6b082 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/ObjectFactory.java +++ b/emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/ObjectFactory.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.07.17 at 07:23:49 PM KST +// Generated on: 2013.07.22 at 03:22:38 PM KST // @@ -37,75 +37,75 @@ public class ObjectFactory { } /** - * Create an instance of {@link EmulatorConfiguration } + * Create an instance of {@link UsabilityType.FileSharing } * */ - public EmulatorConfiguration createEmulatorConfiguration() { - return new EmulatorConfiguration(); + public UsabilityType.FileSharing createUsabilityTypeFileSharing() { + return new UsabilityType.FileSharing(); } /** - * Create an instance of {@link BaseInformationType } + * Create an instance of {@link RamType } * */ - public BaseInformationType createBaseInformationType() { - return new BaseInformationType(); + public RamType createRamType() { + return new RamType(); } /** - * Create an instance of {@link TouchType } + * Create an instance of {@link DisplayType } * */ - public TouchType createTouchType() { - return new TouchType(); + public DisplayType createDisplayType() { + return new DisplayType(); } /** - * Create an instance of {@link DisplayType.Resolution } + * Create an instance of {@link SkinType } * */ - public DisplayType.Resolution createDisplayTypeResolution() { - return new DisplayType.Resolution(); + public SkinType createSkinType() { + return new SkinType(); } /** - * Create an instance of {@link DisplayType.Density } + * Create an instance of {@link EmulatorConfiguration } * */ - public DisplayType.Density createDisplayTypeDensity() { - return new DisplayType.Density(); + public EmulatorConfiguration createEmulatorConfiguration() { + return new EmulatorConfiguration(); } /** - * Create an instance of {@link SkinType } + * Create an instance of {@link DisplayType.Density } * */ - public SkinType createSkinType() { - return new SkinType(); + public DisplayType.Density createDisplayTypeDensity() { + return new DisplayType.Density(); } /** - * Create an instance of {@link DeviceType } + * Create an instance of {@link DisplayType.SkinPath } * */ - public DeviceType createDeviceType() { - return new DeviceType(); + public DisplayType.SkinPath createDisplayTypeSkinPath() { + return new DisplayType.SkinPath(); } /** - * Create an instance of {@link UsabilityType.FileSharing } + * Create an instance of {@link DisplayType.Resolution } * */ - public UsabilityType.FileSharing createUsabilityTypeFileSharing() { - return new UsabilityType.FileSharing(); + public DisplayType.Resolution createDisplayTypeResolution() { + return new DisplayType.Resolution(); } /** - * Create an instance of {@link UsabilityType } + * Create an instance of {@link TouchType } * */ - public UsabilityType createUsabilityType() { - return new UsabilityType(); + public TouchType createTouchType() { + return new TouchType(); } /** @@ -117,51 +117,51 @@ public class ObjectFactory { } /** - * Create an instance of {@link RamType.Size } + * Create an instance of {@link DiskImageFormatType } * */ - public RamType.Size createRamTypeSize() { - return new RamType.Size(); + public DiskImageFormatType createDiskImageFormatType() { + return new DiskImageFormatType(); } /** - * Create an instance of {@link RamType } + * Create an instance of {@link BaseInformationType.DiskImage } * */ - public RamType createRamType() { - return new RamType(); + public BaseInformationType.DiskImage createBaseInformationTypeDiskImage() { + return new BaseInformationType.DiskImage(); } /** - * Create an instance of {@link BaseInformationType.DiskImage } + * Create an instance of {@link UsabilityType } * */ - public BaseInformationType.DiskImage createBaseInformationTypeDiskImage() { - return new BaseInformationType.DiskImage(); + public UsabilityType createUsabilityType() { + return new UsabilityType(); } /** - * Create an instance of {@link DisplayType } + * Create an instance of {@link DeviceType } * */ - public DisplayType createDisplayType() { - return new DisplayType(); + public DeviceType createDeviceType() { + return new DeviceType(); } /** - * Create an instance of {@link DiskImageFormatType } + * Create an instance of {@link BaseInformationType } * */ - public DiskImageFormatType createDiskImageFormatType() { - return new DiskImageFormatType(); + public BaseInformationType createBaseInformationType() { + return new BaseInformationType(); } /** - * Create an instance of {@link DisplayType.SkinPath } + * Create an instance of {@link RamType.Size } * */ - public DisplayType.SkinPath createDisplayTypeSkinPath() { - return new DisplayType.SkinPath(); + public RamType.Size createRamTypeSize() { + return new RamType.Size(); } } diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/RamType.java b/emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/RamType.java similarity index 98% rename from jaxb_src/org/tizen/emulator/manager/vms/xml/RamType.java rename to emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/RamType.java index 957fcb0..fef37ba 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/RamType.java +++ b/emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/RamType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.07.17 at 07:23:49 PM KST +// Generated on: 2013.07.22 at 03:22:38 PM KST // diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/SkinType.java b/emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/SkinType.java similarity index 97% rename from jaxb_src/org/tizen/emulator/manager/vms/xml/SkinType.java rename to emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/SkinType.java index 92a2b5a..b945924 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/SkinType.java +++ b/emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/SkinType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.07.17 at 07:23:49 PM KST +// Generated on: 2013.07.22 at 03:22:38 PM KST // diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/TouchType.java b/emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/TouchType.java similarity index 97% rename from jaxb_src/org/tizen/emulator/manager/vms/xml/TouchType.java rename to emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/TouchType.java index 782122f..0ccb035 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/TouchType.java +++ b/emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/TouchType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.07.17 at 07:23:49 PM KST +// Generated on: 2013.07.22 at 03:22:38 PM KST // diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/UsabilityType.java b/emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/UsabilityType.java similarity index 99% rename from jaxb_src/org/tizen/emulator/manager/vms/xml/UsabilityType.java rename to emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/UsabilityType.java index 8d91c76..c5b3c0d 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/UsabilityType.java +++ b/emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/UsabilityType.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.07.17 at 07:23:49 PM KST +// Generated on: 2013.07.22 at 03:22:38 PM KST // diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/package-info.java b/emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/package-info.java similarity index 90% rename from jaxb_src/org/tizen/emulator/manager/vms/xml/package-info.java rename to emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/package-info.java index 10b3586..1cac1e0 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/package-info.java +++ b/emulator-manager/jaxb_src/org/tizen/emulator/manager/vms/xml/package-info.java @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2012.07.17 at 07:23:49 PM KST +// Generated on: 2013.07.22 at 03:22:38 PM KST // @javax.xml.bind.annotation.XmlSchema(namespace = "http://www.tizen.org/em", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) diff --git a/resource/res/about.png b/emulator-manager/resource/res/about.png similarity index 100% rename from resource/res/about.png rename to emulator-manager/resource/res/about.png diff --git a/resource/res/aboutSDK.png b/emulator-manager/resource/res/aboutSDK.png similarity index 100% rename from resource/res/aboutSDK.png rename to emulator-manager/resource/res/aboutSDK.png diff --git a/resource/res/add_new_hover.gif b/emulator-manager/resource/res/add_new_hover.gif similarity index 100% rename from resource/res/add_new_hover.gif rename to emulator-manager/resource/res/add_new_hover.gif diff --git a/resource/res/add_new_nml.gif b/emulator-manager/resource/res/add_new_nml.gif similarity index 100% rename from resource/res/add_new_nml.gif rename to emulator-manager/resource/res/add_new_nml.gif diff --git a/resource/res/add_new_pushed.gif b/emulator-manager/resource/res/add_new_pushed.gif similarity index 100% rename from resource/res/add_new_pushed.gif rename to emulator-manager/resource/res/add_new_pushed.gif diff --git a/resource/res/arm.png b/emulator-manager/resource/res/arm.png similarity index 100% rename from resource/res/arm.png rename to emulator-manager/resource/res/arm.png diff --git a/resource/res/arrow_down.gif b/emulator-manager/resource/res/arrow_down.gif similarity index 100% rename from resource/res/arrow_down.gif rename to emulator-manager/resource/res/arrow_down.gif diff --git a/resource/res/arrow_up.gif b/emulator-manager/resource/res/arrow_up.gif similarity index 100% rename from resource/res/arrow_up.gif rename to emulator-manager/resource/res/arrow_up.gif diff --git a/resource/res/background.gif b/emulator-manager/resource/res/background.gif similarity index 100% rename from resource/res/background.gif rename to emulator-manager/resource/res/background.gif diff --git a/resource/res/button_file_dis.gif b/emulator-manager/resource/res/button_file_dis.gif similarity index 100% rename from resource/res/button_file_dis.gif rename to emulator-manager/resource/res/button_file_dis.gif diff --git a/resource/res/button_file_hover.gif b/emulator-manager/resource/res/button_file_hover.gif similarity index 100% rename from resource/res/button_file_hover.gif rename to emulator-manager/resource/res/button_file_hover.gif diff --git a/resource/res/button_file_nml.gif b/emulator-manager/resource/res/button_file_nml.gif similarity index 100% rename from resource/res/button_file_nml.gif rename to emulator-manager/resource/res/button_file_nml.gif diff --git a/resource/res/button_file_pushed.gif b/emulator-manager/resource/res/button_file_pushed.gif similarity index 100% rename from resource/res/button_file_pushed.gif rename to emulator-manager/resource/res/button_file_pushed.gif diff --git a/resource/res/button_hover_left.gif b/emulator-manager/resource/res/button_hover_left.gif similarity index 100% rename from resource/res/button_hover_left.gif rename to emulator-manager/resource/res/button_hover_left.gif diff --git a/resource/res/button_hover_middle.gif b/emulator-manager/resource/res/button_hover_middle.gif similarity index 100% rename from resource/res/button_hover_middle.gif rename to emulator-manager/resource/res/button_hover_middle.gif diff --git a/resource/res/button_hover_right.gif b/emulator-manager/resource/res/button_hover_right.gif similarity index 100% rename from resource/res/button_hover_right.gif rename to emulator-manager/resource/res/button_hover_right.gif diff --git a/resource/res/button_launch_hover.gif b/emulator-manager/resource/res/button_launch_hover.gif similarity index 100% rename from resource/res/button_launch_hover.gif rename to emulator-manager/resource/res/button_launch_hover.gif diff --git a/resource/res/button_launch_nml.gif b/emulator-manager/resource/res/button_launch_nml.gif similarity index 100% rename from resource/res/button_launch_nml.gif rename to emulator-manager/resource/res/button_launch_nml.gif diff --git a/resource/res/button_launch_pushed.gif b/emulator-manager/resource/res/button_launch_pushed.gif similarity index 100% rename from resource/res/button_launch_pushed.gif rename to emulator-manager/resource/res/button_launch_pushed.gif diff --git a/resource/res/button_nml_left.gif b/emulator-manager/resource/res/button_nml_left.gif similarity index 100% rename from resource/res/button_nml_left.gif rename to emulator-manager/resource/res/button_nml_left.gif diff --git a/resource/res/button_nml_middle.gif b/emulator-manager/resource/res/button_nml_middle.gif similarity index 100% rename from resource/res/button_nml_middle.gif rename to emulator-manager/resource/res/button_nml_middle.gif diff --git a/resource/res/button_nml_right.gif b/emulator-manager/resource/res/button_nml_right.gif similarity index 100% rename from resource/res/button_nml_right.gif rename to emulator-manager/resource/res/button_nml_right.gif diff --git a/resource/res/button_off_hover.gif b/emulator-manager/resource/res/button_off_hover.gif similarity index 100% rename from resource/res/button_off_hover.gif rename to emulator-manager/resource/res/button_off_hover.gif diff --git a/resource/res/button_off_nml.gif b/emulator-manager/resource/res/button_off_nml.gif similarity index 100% rename from resource/res/button_off_nml.gif rename to emulator-manager/resource/res/button_off_nml.gif diff --git a/resource/res/button_off_pushed.gif b/emulator-manager/resource/res/button_off_pushed.gif similarity index 100% rename from resource/res/button_off_pushed.gif rename to emulator-manager/resource/res/button_off_pushed.gif diff --git a/resource/res/button_on_hover.gif b/emulator-manager/resource/res/button_on_hover.gif similarity index 100% rename from resource/res/button_on_hover.gif rename to emulator-manager/resource/res/button_on_hover.gif diff --git a/resource/res/button_on_nml.gif b/emulator-manager/resource/res/button_on_nml.gif similarity index 100% rename from resource/res/button_on_nml.gif rename to emulator-manager/resource/res/button_on_nml.gif diff --git a/resource/res/button_on_pushed.gif b/emulator-manager/resource/res/button_on_pushed.gif similarity index 100% rename from resource/res/button_on_pushed.gif rename to emulator-manager/resource/res/button_on_pushed.gif diff --git a/resource/res/button_pushed_left.gif b/emulator-manager/resource/res/button_pushed_left.gif similarity index 100% rename from resource/res/button_pushed_left.gif rename to emulator-manager/resource/res/button_pushed_left.gif diff --git a/resource/res/button_pushed_middle.gif b/emulator-manager/resource/res/button_pushed_middle.gif similarity index 100% rename from resource/res/button_pushed_middle.gif rename to emulator-manager/resource/res/button_pushed_middle.gif diff --git a/resource/res/button_pushed_right.gif b/emulator-manager/resource/res/button_pushed_right.gif similarity index 100% rename from resource/res/button_pushed_right.gif rename to emulator-manager/resource/res/button_pushed_right.gif diff --git a/resource/res/cancel.png b/emulator-manager/resource/res/cancel.png similarity index 100% rename from resource/res/cancel.png rename to emulator-manager/resource/res/cancel.png diff --git a/resource/res/clone.png b/emulator-manager/resource/res/clone.png similarity index 100% rename from resource/res/clone.png rename to emulator-manager/resource/res/clone.png diff --git a/resource/res/confirm.png b/emulator-manager/resource/res/confirm.png similarity index 100% rename from resource/res/confirm.png rename to emulator-manager/resource/res/confirm.png diff --git a/resource/res/create.png b/emulator-manager/resource/res/create.png similarity index 100% rename from resource/res/create.png rename to emulator-manager/resource/res/create.png diff --git a/resource/res/create_new_hover.gif b/emulator-manager/resource/res/create_new_hover.gif similarity index 100% rename from resource/res/create_new_hover.gif rename to emulator-manager/resource/res/create_new_hover.gif diff --git a/resource/res/create_new_nml.gif b/emulator-manager/resource/res/create_new_nml.gif similarity index 100% rename from resource/res/create_new_nml.gif rename to emulator-manager/resource/res/create_new_nml.gif diff --git a/resource/res/create_new_pushed.gif b/emulator-manager/resource/res/create_new_pushed.gif similarity index 100% rename from resource/res/create_new_pushed.gif rename to emulator-manager/resource/res/create_new_pushed.gif diff --git a/resource/res/createimage.png b/emulator-manager/resource/res/createimage.png similarity index 100% rename from resource/res/createimage.png rename to emulator-manager/resource/res/createimage.png diff --git a/resource/res/delete.png b/emulator-manager/resource/res/delete.png similarity index 100% rename from resource/res/delete.png rename to emulator-manager/resource/res/delete.png diff --git a/resource/res/detail_category_left.gif b/emulator-manager/resource/res/detail_category_left.gif similarity index 100% rename from resource/res/detail_category_left.gif rename to emulator-manager/resource/res/detail_category_left.gif diff --git a/resource/res/detail_category_middle.gif b/emulator-manager/resource/res/detail_category_middle.gif similarity index 100% rename from resource/res/detail_category_middle.gif rename to emulator-manager/resource/res/detail_category_middle.gif diff --git a/resource/res/detail_category_right.gif b/emulator-manager/resource/res/detail_category_right.gif similarity index 100% rename from resource/res/detail_category_right.gif rename to emulator-manager/resource/res/detail_category_right.gif diff --git a/resource/res/detail_list_bottom.gif b/emulator-manager/resource/res/detail_list_bottom.gif similarity index 100% rename from resource/res/detail_list_bottom.gif rename to emulator-manager/resource/res/detail_list_bottom.gif diff --git a/resource/res/detail_list_item.gif b/emulator-manager/resource/res/detail_list_item.gif similarity index 100% rename from resource/res/detail_list_item.gif rename to emulator-manager/resource/res/detail_list_item.gif diff --git a/resource/res/detail_list_middle.gif b/emulator-manager/resource/res/detail_list_middle.gif similarity index 100% rename from resource/res/detail_list_middle.gif rename to emulator-manager/resource/res/detail_list_middle.gif diff --git a/resource/res/detail_list_top.gif b/emulator-manager/resource/res/detail_list_top.gif similarity index 100% rename from resource/res/detail_list_top.gif rename to emulator-manager/resource/res/detail_list_top.gif diff --git a/resource/res/details.png b/emulator-manager/resource/res/details.png similarity index 100% rename from resource/res/details.png rename to emulator-manager/resource/res/details.png diff --git a/resource/res/dropdown_arrow.gif b/emulator-manager/resource/res/dropdown_arrow.gif similarity index 100% rename from resource/res/dropdown_arrow.gif rename to emulator-manager/resource/res/dropdown_arrow.gif diff --git a/resource/res/dropdown_disable.png b/emulator-manager/resource/res/dropdown_disable.png similarity index 100% rename from resource/res/dropdown_disable.png rename to emulator-manager/resource/res/dropdown_disable.png diff --git a/resource/res/dropdown_down.png b/emulator-manager/resource/res/dropdown_down.png similarity index 100% rename from resource/res/dropdown_down.png rename to emulator-manager/resource/res/dropdown_down.png diff --git a/resource/res/dropdown_hover.png b/emulator-manager/resource/res/dropdown_hover.png similarity index 100% rename from resource/res/dropdown_hover.png rename to emulator-manager/resource/res/dropdown_hover.png diff --git a/resource/res/dropdown_normal.png b/emulator-manager/resource/res/dropdown_normal.png similarity index 100% rename from resource/res/dropdown_normal.png rename to emulator-manager/resource/res/dropdown_normal.png diff --git a/resource/res/dropdown_push.png b/emulator-manager/resource/res/dropdown_push.png similarity index 100% rename from resource/res/dropdown_push.png rename to emulator-manager/resource/res/dropdown_push.png diff --git a/resource/res/dropdown_up.png b/emulator-manager/resource/res/dropdown_up.png similarity index 100% rename from resource/res/dropdown_up.png rename to emulator-manager/resource/res/dropdown_up.png diff --git a/resource/res/em.icns b/emulator-manager/resource/res/em.icns similarity index 100% rename from resource/res/em.icns rename to emulator-manager/resource/res/em.icns diff --git a/resource/res/em.ico b/emulator-manager/resource/res/em.ico similarity index 100% rename from resource/res/em.ico rename to emulator-manager/resource/res/em.ico diff --git a/resource/res/emulator_list_image_hover.gif b/emulator-manager/resource/res/emulator_list_image_hover.gif similarity index 100% rename from resource/res/emulator_list_image_hover.gif rename to emulator-manager/resource/res/emulator_list_image_hover.gif diff --git a/resource/res/emulator_list_image_new_ani.gif b/emulator-manager/resource/res/emulator_list_image_new_ani.gif similarity index 100% rename from resource/res/emulator_list_image_new_ani.gif rename to emulator-manager/resource/res/emulator_list_image_new_ani.gif diff --git a/resource/res/emulator_list_image_nml.gif b/emulator-manager/resource/res/emulator_list_image_nml.gif similarity index 100% rename from resource/res/emulator_list_image_nml.gif rename to emulator-manager/resource/res/emulator_list_image_nml.gif diff --git a/resource/res/emulator_list_selected.gif b/emulator-manager/resource/res/emulator_list_selected.gif similarity index 100% rename from resource/res/emulator_list_selected.gif rename to emulator-manager/resource/res/emulator_list_selected.gif diff --git a/resource/res/emulator_manager_001.jpg b/emulator-manager/resource/res/emulator_manager_001.jpg similarity index 100% rename from resource/res/emulator_manager_001.jpg rename to emulator-manager/resource/res/emulator_manager_001.jpg diff --git a/resource/res/folder.png b/emulator-manager/resource/res/folder.png similarity index 100% rename from resource/res/folder.png rename to emulator-manager/resource/res/folder.png diff --git a/resource/res/info_icon_hover.gif b/emulator-manager/resource/res/info_icon_hover.gif similarity index 100% rename from resource/res/info_icon_hover.gif rename to emulator-manager/resource/res/info_icon_hover.gif diff --git a/resource/res/info_icon_nml.gif b/emulator-manager/resource/res/info_icon_nml.gif similarity index 100% rename from resource/res/info_icon_nml.gif rename to emulator-manager/resource/res/info_icon_nml.gif diff --git a/resource/res/info_icon_pushed.gif b/emulator-manager/resource/res/info_icon_pushed.gif similarity index 100% rename from resource/res/info_icon_pushed.gif rename to emulator-manager/resource/res/info_icon_pushed.gif diff --git a/resource/res/inputbox_off_left.gif b/emulator-manager/resource/res/inputbox_off_left.gif similarity index 100% rename from resource/res/inputbox_off_left.gif rename to emulator-manager/resource/res/inputbox_off_left.gif diff --git a/resource/res/inputbox_off_middle.gif b/emulator-manager/resource/res/inputbox_off_middle.gif similarity index 100% rename from resource/res/inputbox_off_middle.gif rename to emulator-manager/resource/res/inputbox_off_middle.gif diff --git a/resource/res/inputbox_off_right.gif b/emulator-manager/resource/res/inputbox_off_right.gif similarity index 100% rename from resource/res/inputbox_off_right.gif rename to emulator-manager/resource/res/inputbox_off_right.gif diff --git a/resource/res/inputbox_on_left.gif b/emulator-manager/resource/res/inputbox_on_left.gif similarity index 100% rename from resource/res/inputbox_on_left.gif rename to emulator-manager/resource/res/inputbox_on_left.gif diff --git a/resource/res/inputbox_on_middle.gif b/emulator-manager/resource/res/inputbox_on_middle.gif similarity index 100% rename from resource/res/inputbox_on_middle.gif rename to emulator-manager/resource/res/inputbox_on_middle.gif diff --git a/resource/res/inputbox_on_right.gif b/emulator-manager/resource/res/inputbox_on_right.gif similarity index 100% rename from resource/res/inputbox_on_right.gif rename to emulator-manager/resource/res/inputbox_on_right.gif diff --git a/resource/res/launch.png b/emulator-manager/resource/res/launch.png similarity index 100% rename from resource/res/launch.png rename to emulator-manager/resource/res/launch.png diff --git a/resource/res/modify.png b/emulator-manager/resource/res/modify.png similarity index 100% rename from resource/res/modify.png rename to emulator-manager/resource/res/modify.png diff --git a/resource/res/modify_cancel_hover.gif b/emulator-manager/resource/res/modify_cancel_hover.gif similarity index 100% rename from resource/res/modify_cancel_hover.gif rename to emulator-manager/resource/res/modify_cancel_hover.gif diff --git a/resource/res/modify_cancel_nml.gif b/emulator-manager/resource/res/modify_cancel_nml.gif similarity index 100% rename from resource/res/modify_cancel_nml.gif rename to emulator-manager/resource/res/modify_cancel_nml.gif diff --git a/resource/res/modify_cancel_pushed.gif b/emulator-manager/resource/res/modify_cancel_pushed.gif similarity index 100% rename from resource/res/modify_cancel_pushed.gif rename to emulator-manager/resource/res/modify_cancel_pushed.gif diff --git a/resource/res/modify_hover.gif b/emulator-manager/resource/res/modify_hover.gif similarity index 100% rename from resource/res/modify_hover.gif rename to emulator-manager/resource/res/modify_hover.gif diff --git a/resource/res/modify_nml.gif b/emulator-manager/resource/res/modify_nml.gif similarity index 100% rename from resource/res/modify_nml.gif rename to emulator-manager/resource/res/modify_nml.gif diff --git a/resource/res/modify_pushed.gif b/emulator-manager/resource/res/modify_pushed.gif similarity index 100% rename from resource/res/modify_pushed.gif rename to emulator-manager/resource/res/modify_pushed.gif diff --git a/resource/res/radio_off.png b/emulator-manager/resource/res/radio_off.png similarity index 100% rename from resource/res/radio_off.png rename to emulator-manager/resource/res/radio_off.png diff --git a/resource/res/radio_on.png b/emulator-manager/resource/res/radio_on.png similarity index 100% rename from resource/res/radio_on.png rename to emulator-manager/resource/res/radio_on.png diff --git a/resource/res/refresh.png b/emulator-manager/resource/res/refresh.png similarity index 100% rename from resource/res/refresh.png rename to emulator-manager/resource/res/refresh.png diff --git a/resource/res/reset.png b/emulator-manager/resource/res/reset.png similarity index 100% rename from resource/res/reset.png rename to emulator-manager/resource/res/reset.png diff --git a/resource/res/reset_icon_hover.gif b/emulator-manager/resource/res/reset_icon_hover.gif similarity index 100% rename from resource/res/reset_icon_hover.gif rename to emulator-manager/resource/res/reset_icon_hover.gif diff --git a/resource/res/reset_icon_nml.gif b/emulator-manager/resource/res/reset_icon_nml.gif similarity index 100% rename from resource/res/reset_icon_nml.gif rename to emulator-manager/resource/res/reset_icon_nml.gif diff --git a/resource/res/reset_icon_pushed.gif b/emulator-manager/resource/res/reset_icon_pushed.gif similarity index 100% rename from resource/res/reset_icon_pushed.gif rename to emulator-manager/resource/res/reset_icon_pushed.gif diff --git a/resource/res/scrollbar_back.gif b/emulator-manager/resource/res/scrollbar_back.gif similarity index 100% rename from resource/res/scrollbar_back.gif rename to emulator-manager/resource/res/scrollbar_back.gif diff --git a/resource/res/tab_selected_left.gif b/emulator-manager/resource/res/tab_selected_left.gif similarity index 100% rename from resource/res/tab_selected_left.gif rename to emulator-manager/resource/res/tab_selected_left.gif diff --git a/resource/res/tab_selected_middle.gif b/emulator-manager/resource/res/tab_selected_middle.gif similarity index 100% rename from resource/res/tab_selected_middle.gif rename to emulator-manager/resource/res/tab_selected_middle.gif diff --git a/resource/res/tab_selected_right.gif b/emulator-manager/resource/res/tab_selected_right.gif similarity index 100% rename from resource/res/tab_selected_right.gif rename to emulator-manager/resource/res/tab_selected_right.gif diff --git a/resource/res/tab_unselected_left.gif b/emulator-manager/resource/res/tab_unselected_left.gif similarity index 100% rename from resource/res/tab_unselected_left.gif rename to emulator-manager/resource/res/tab_unselected_left.gif diff --git a/resource/res/tab_unselected_left_hover.gif b/emulator-manager/resource/res/tab_unselected_left_hover.gif similarity index 100% rename from resource/res/tab_unselected_left_hover.gif rename to emulator-manager/resource/res/tab_unselected_left_hover.gif diff --git a/resource/res/tab_unselected_middle.gif b/emulator-manager/resource/res/tab_unselected_middle.gif similarity index 100% rename from resource/res/tab_unselected_middle.gif rename to emulator-manager/resource/res/tab_unselected_middle.gif diff --git a/resource/res/tab_unselected_middle_hover.gif b/emulator-manager/resource/res/tab_unselected_middle_hover.gif similarity index 100% rename from resource/res/tab_unselected_middle_hover.gif rename to emulator-manager/resource/res/tab_unselected_middle_hover.gif diff --git a/resource/res/tab_unselected_right.gif b/emulator-manager/resource/res/tab_unselected_right.gif similarity index 100% rename from resource/res/tab_unselected_right.gif rename to emulator-manager/resource/res/tab_unselected_right.gif diff --git a/resource/res/tab_unselected_right_hover.gif b/emulator-manager/resource/res/tab_unselected_right_hover.gif similarity index 100% rename from resource/res/tab_unselected_right_hover.gif rename to emulator-manager/resource/res/tab_unselected_right_hover.gif diff --git a/resource/res/x86.png b/emulator-manager/resource/res/x86.png similarity index 100% rename from resource/res/x86.png rename to emulator-manager/resource/res/x86.png diff --git a/src/org/tizen/emulator/manager/EmulatorManager.java b/emulator-manager/src/org/tizen/emulator/manager/EmulatorManager.java similarity index 99% rename from src/org/tizen/emulator/manager/EmulatorManager.java rename to emulator-manager/src/org/tizen/emulator/manager/EmulatorManager.java index dca747f..f735d27 100755 --- a/src/org/tizen/emulator/manager/EmulatorManager.java +++ b/emulator-manager/src/org/tizen/emulator/manager/EmulatorManager.java @@ -48,6 +48,7 @@ import org.tizen.emulator.manager.platform.BaseImage; import org.tizen.emulator.manager.platform.CustomPlatform; import org.tizen.emulator.manager.platform.Platform; import org.tizen.emulator.manager.platform.TotalPlatform; +import org.tizen.emulator.manager.plugin.EMPluginList; import org.tizen.emulator.manager.resources.FilePathResources; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.tool.About; @@ -316,6 +317,7 @@ public class EmulatorManager { //EmulatorVMs.getInstance().loadProperties(); EmulatorManager.makePlatformList(); + EMPluginList.loadPlugins(); if (isConsoleMode) { EmulatorManager.startConsoleProcessor(); diff --git a/src/org/tizen/emulator/manager/console/Action.java b/emulator-manager/src/org/tizen/emulator/manager/console/Action.java similarity index 100% rename from src/org/tizen/emulator/manager/console/Action.java rename to emulator-manager/src/org/tizen/emulator/manager/console/Action.java diff --git a/src/org/tizen/emulator/manager/console/ActionList.java b/emulator-manager/src/org/tizen/emulator/manager/console/ActionList.java similarity index 100% rename from src/org/tizen/emulator/manager/console/ActionList.java rename to emulator-manager/src/org/tizen/emulator/manager/console/ActionList.java diff --git a/src/org/tizen/emulator/manager/console/CommandLineParser.java b/emulator-manager/src/org/tizen/emulator/manager/console/CommandLineParser.java similarity index 100% rename from src/org/tizen/emulator/manager/console/CommandLineParser.java rename to emulator-manager/src/org/tizen/emulator/manager/console/CommandLineParser.java diff --git a/src/org/tizen/emulator/manager/console/ConsoleCreateVM.java b/emulator-manager/src/org/tizen/emulator/manager/console/ConsoleCreateVM.java similarity index 100% rename from src/org/tizen/emulator/manager/console/ConsoleCreateVM.java rename to emulator-manager/src/org/tizen/emulator/manager/console/ConsoleCreateVM.java diff --git a/src/org/tizen/emulator/manager/console/ConsoleException.java b/emulator-manager/src/org/tizen/emulator/manager/console/ConsoleException.java similarity index 100% rename from src/org/tizen/emulator/manager/console/ConsoleException.java rename to emulator-manager/src/org/tizen/emulator/manager/console/ConsoleException.java diff --git a/src/org/tizen/emulator/manager/console/ConsoleModifyVM.java b/emulator-manager/src/org/tizen/emulator/manager/console/ConsoleModifyVM.java similarity index 100% rename from src/org/tizen/emulator/manager/console/ConsoleModifyVM.java rename to emulator-manager/src/org/tizen/emulator/manager/console/ConsoleModifyVM.java diff --git a/src/org/tizen/emulator/manager/console/ConsoleProcessor.java b/emulator-manager/src/org/tizen/emulator/manager/console/ConsoleProcessor.java similarity index 100% rename from src/org/tizen/emulator/manager/console/ConsoleProcessor.java rename to emulator-manager/src/org/tizen/emulator/manager/console/ConsoleProcessor.java diff --git a/src/org/tizen/emulator/manager/logging/EMLogger.java b/emulator-manager/src/org/tizen/emulator/manager/logging/EMLogger.java similarity index 100% rename from src/org/tizen/emulator/manager/logging/EMLogger.java rename to emulator-manager/src/org/tizen/emulator/manager/logging/EMLogger.java diff --git a/src/org/tizen/emulator/manager/platform/BaseImage.java b/emulator-manager/src/org/tizen/emulator/manager/platform/BaseImage.java similarity index 99% rename from src/org/tizen/emulator/manager/platform/BaseImage.java rename to emulator-manager/src/org/tizen/emulator/manager/platform/BaseImage.java index e1f0357..046c197 100644 --- a/src/org/tizen/emulator/manager/platform/BaseImage.java +++ b/emulator-manager/src/org/tizen/emulator/manager/platform/BaseImage.java @@ -81,7 +81,7 @@ public class BaseImage { throw new IOException("Image name is null. This image can not add."); } version = prop.getProperty(StringResources.IMAGE_VERSION, platform.getName()); - domain = prop.getProperty(StringResources.PRODUCT_DOMAIN, "Phone"); + domain = prop.getProperty(StringResources.PRODUCT_DOMAIN, "phone").toLowerCase(); cpu = prop.getProperty(StringResources.TARGET_CPU, "x86"); cpu = cpu.toLowerCase(); } else { diff --git a/src/org/tizen/emulator/manager/platform/CustomBaseImage.java b/emulator-manager/src/org/tizen/emulator/manager/platform/CustomBaseImage.java similarity index 97% rename from src/org/tizen/emulator/manager/platform/CustomBaseImage.java rename to emulator-manager/src/org/tizen/emulator/manager/platform/CustomBaseImage.java index 9091f67..88ae96b 100644 --- a/src/org/tizen/emulator/manager/platform/CustomBaseImage.java +++ b/emulator-manager/src/org/tizen/emulator/manager/platform/CustomBaseImage.java @@ -39,5 +39,7 @@ public class CustomBaseImage extends BaseImage { this.name = name; this.cpu = cpu; + // TODO + this.domain = "phone"; } } diff --git a/src/org/tizen/emulator/manager/platform/CustomPlatform.java b/emulator-manager/src/org/tizen/emulator/manager/platform/CustomPlatform.java similarity index 97% rename from src/org/tizen/emulator/manager/platform/CustomPlatform.java rename to emulator-manager/src/org/tizen/emulator/manager/platform/CustomPlatform.java index dd5230a..94d5425 100644 --- a/src/org/tizen/emulator/manager/platform/CustomPlatform.java +++ b/emulator-manager/src/org/tizen/emulator/manager/platform/CustomPlatform.java @@ -46,6 +46,8 @@ public class CustomPlatform extends Platform { if (EmulatorManager.getManagerMode() == ManagerModeType.INHOUSE_MODE) { imageList.add(new CustomBaseImage(this, "arm", "arm")); } + // TODO + this.profile = imageList.get(0).getDomain(); } catch (IOException e) { // TODO } diff --git a/src/org/tizen/emulator/manager/platform/Platform.java b/emulator-manager/src/org/tizen/emulator/manager/platform/Platform.java similarity index 98% rename from src/org/tizen/emulator/manager/platform/Platform.java rename to emulator-manager/src/org/tizen/emulator/manager/platform/Platform.java index 7045f1a..da4a49b 100644 --- a/src/org/tizen/emulator/manager/platform/Platform.java +++ b/emulator-manager/src/org/tizen/emulator/manager/platform/Platform.java @@ -40,6 +40,7 @@ import org.tizen.emulator.manager.resources.StringResources; public class Platform { protected String platformName = null; protected String platformPath = null; + protected String profile = null; //protected String version = null; protected static int id = 1; @@ -133,6 +134,8 @@ public class Platform { for (BaseImage i : imageList) { if (i.getCpu().equals("x86")) { i.setID(id++); + // TODO + profile = i.getDomain(); break; } } @@ -151,6 +154,10 @@ public class Platform { return platformName; } + public String getProfile() { + return profile; + } + public void clearVMs() { for (BaseImage base : imageList) { base.clearVMsList(); diff --git a/src/org/tizen/emulator/manager/platform/Skin.java b/emulator-manager/src/org/tizen/emulator/manager/platform/Skin.java similarity index 100% rename from src/org/tizen/emulator/manager/platform/Skin.java rename to emulator-manager/src/org/tizen/emulator/manager/platform/Skin.java diff --git a/src/org/tizen/emulator/manager/platform/SkinList.java b/emulator-manager/src/org/tizen/emulator/manager/platform/SkinList.java similarity index 100% rename from src/org/tizen/emulator/manager/platform/SkinList.java rename to emulator-manager/src/org/tizen/emulator/manager/platform/SkinList.java diff --git a/src/org/tizen/emulator/manager/platform/TotalPlatform.java b/emulator-manager/src/org/tizen/emulator/manager/platform/TotalPlatform.java similarity index 100% rename from src/org/tizen/emulator/manager/platform/TotalPlatform.java rename to emulator-manager/src/org/tizen/emulator/manager/platform/TotalPlatform.java diff --git a/emulator-manager/src/org/tizen/emulator/manager/plugin/EMPluginList.java b/emulator-manager/src/org/tizen/emulator/manager/plugin/EMPluginList.java new file mode 100644 index 0000000..2413c72 --- /dev/null +++ b/emulator-manager/src/org/tizen/emulator/manager/plugin/EMPluginList.java @@ -0,0 +1,65 @@ +package org.tizen.emulator.manager.plugin; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.jar.Attributes; +import java.util.jar.JarFile; + +import org.tizen.emulator.manager.logging.EMLogger; + +public class EMPluginList { + private static ArrayList exList = new ArrayList(); + static public ArrayList getExtensionList() { + return exList; + } + + static public Extension getExtension(String point) { + for (Extension p : exList) { + if (p.getPoint().equals(point)) { + return p; + } + } + return null; + } + + private static boolean init = false; + static private void initialize() { + init = true; + for (String point : PluginStringResources.getPointList()) { + exList.add(new Extension(point)); + } + } + + static public void loadPlugins() { + if (!init) { + initialize(); + } + File plugins = new File(PluginStringResources.PluginDir); + if (plugins.exists() && plugins.isDirectory()) { + for (File plugin : plugins.listFiles()) { + JarFile jarFile = null; + if (plugin.isFile()) { + try { + jarFile = new JarFile(plugin.getAbsolutePath()); + } catch (IOException e) { + EMLogger.addStaticLog("Faile to load plugin jar file: " + e.getMessage()); + continue; + } + Attributes attr = null; + try { + attr = jarFile.getManifest().getMainAttributes(); + } catch (IOException e) { + EMLogger.addStaticLog("Faile to load Manifest file: " + e.getMessage()); + } + if (attr != null) { + for (Extension ex : exList) { + ex.add(attr, plugin); + EMLogger.addStaticLog("Success to add plugin: " + plugin.getName()); + } + } + } + } + } + } +} diff --git a/emulator-manager/src/org/tizen/emulator/manager/plugin/Extension.java b/emulator-manager/src/org/tizen/emulator/manager/plugin/Extension.java new file mode 100644 index 0000000..d74577d --- /dev/null +++ b/emulator-manager/src/org/tizen/emulator/manager/plugin/Extension.java @@ -0,0 +1,41 @@ +package org.tizen.emulator.manager.plugin; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.jar.Attributes; + +import org.tizen.emulator.manager.logging.EMLogger; + +public class Extension { + private String point; + private ArrayList itemList; + + public Extension(String point) { + this.point = point; + itemList = new ArrayList(); + } + + public void add(ExtensionItem item) { + itemList.add(item); + } + + public void add(Attributes attr, File jarFile) { + ExtensionItem item = null; + try { + item = new ExtensionItem(this, attr, jarFile); + } catch (IOException e) { + EMLogger.getLogger().warning("Fail to create Extension item: " + e.getMessage()); + return; + } + itemList.add(item); + } + + public ArrayList getItemList() { + return itemList; + } + + public String getPoint() { + return point; + } +} diff --git a/emulator-manager/src/org/tizen/emulator/manager/plugin/ExtensionItem.java b/emulator-manager/src/org/tizen/emulator/manager/plugin/ExtensionItem.java new file mode 100644 index 0000000..e5c37c3 --- /dev/null +++ b/emulator-manager/src/org/tizen/emulator/manager/plugin/ExtensionItem.java @@ -0,0 +1,87 @@ +package org.tizen.emulator.manager.plugin; + +import java.io.File; +import java.io.IOException; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLClassLoader; +import java.util.jar.Attributes; + +import org.tizen.emulator.manager.logging.EMLogger; + +public class ExtensionItem { + private Extension extension; + private String version; + private String profile; + private String pointClass; + private File jarFile; + + public ExtensionItem(Extension ex, Attributes attr) throws IOException { + this(ex, attr, null); + } + + public ExtensionItem(Extension ex, Attributes attr, File jarFile) throws IOException { + this.extension = ex; + pointClass = attr.getValue(extension.getPoint()); + if (pointClass == null) { + throw new IOException("Not found " + extension.getPoint() + " attribute."); + } + version = attr.getValue(PluginStringResources.PlatformVersion); + profile = attr.getValue(PluginStringResources.PlatformProfile); + if (profile == null) { + throw new IOException("Not found " + "Platform-Profile" + " attribute."); + } + this.jarFile = jarFile; + } + + public String getVersion() { + return version; + } + + public String getProfile() { + return profile; + } + + public String getPointClass() { + return pointClass; + } + + public void setJar(File jar) { + jarFile = jar; + } + + public Object createClass() { + URL url = null; + try { + url = jarFile.toURI().toURL(); + } catch (MalformedURLException e) { + EMLogger.getLogger().warning("Fail to load url from jar file: " + e.getMessage()); + } + + if (url != null) { + URLClassLoader loader = null; + loader = URLClassLoader.newInstance(new URL[]{url}); + if (loader == null) { + EMLogger.getLogger().warning("URLClassLoader is null"); + return null; + } + @SuppressWarnings("rawtypes") + Class classToLoad = null; + + try { + classToLoad = Class.forName(pointClass, true, loader); + } catch (ClassNotFoundException e) { + EMLogger.getLogger().warning("Fail to load point class jar file: " + e.getMessage()); + } + + try { + return classToLoad.newInstance(); + } catch (InstantiationException e) { + EMLogger.getLogger().warning("Fail to create new instance from class: " + e.getMessage()); + } catch (IllegalAccessException e) { + EMLogger.getLogger().warning("Fail to create new instance from class: " + e.getMessage()); + } + } + return null; + } +} diff --git a/emulator-manager/src/org/tizen/emulator/manager/plugin/PluginStringResources.java b/emulator-manager/src/org/tizen/emulator/manager/plugin/PluginStringResources.java new file mode 100644 index 0000000..564997d --- /dev/null +++ b/emulator-manager/src/org/tizen/emulator/manager/plugin/PluginStringResources.java @@ -0,0 +1,22 @@ +package org.tizen.emulator.manager.plugin; + +import java.util.ArrayList; + +public class PluginStringResources { + // extension point + // org.tizen.emulator.manager.ui.detail.IItemListFactory + public final static String ItemFactory = "Item-Factory"; + + public final static String PlatformVersion = "Platform-Version"; + public final static String PlatformProfile = "Platform-Profile"; + + private static ArrayList pointList = new ArrayList(); + static { + pointList.add(ItemFactory); + } + public static ArrayList getPointList() { + return pointList; + } + + public final static String PluginDir = "em-plugins"; +} diff --git a/src/org/tizen/emulator/manager/resources/ColorResources.java b/emulator-manager/src/org/tizen/emulator/manager/resources/ColorResources.java similarity index 100% rename from src/org/tizen/emulator/manager/resources/ColorResources.java rename to emulator-manager/src/org/tizen/emulator/manager/resources/ColorResources.java diff --git a/src/org/tizen/emulator/manager/resources/FilePathResources.java b/emulator-manager/src/org/tizen/emulator/manager/resources/FilePathResources.java similarity index 100% rename from src/org/tizen/emulator/manager/resources/FilePathResources.java rename to emulator-manager/src/org/tizen/emulator/manager/resources/FilePathResources.java diff --git a/src/org/tizen/emulator/manager/resources/FontResources.java b/emulator-manager/src/org/tizen/emulator/manager/resources/FontResources.java similarity index 100% rename from src/org/tizen/emulator/manager/resources/FontResources.java rename to emulator-manager/src/org/tizen/emulator/manager/resources/FontResources.java diff --git a/src/org/tizen/emulator/manager/resources/ImageResources.java b/emulator-manager/src/org/tizen/emulator/manager/resources/ImageResources.java similarity index 100% rename from src/org/tizen/emulator/manager/resources/ImageResources.java rename to emulator-manager/src/org/tizen/emulator/manager/resources/ImageResources.java diff --git a/src/org/tizen/emulator/manager/resources/PatchImageResources.java b/emulator-manager/src/org/tizen/emulator/manager/resources/PatchImageResources.java similarity index 100% rename from src/org/tizen/emulator/manager/resources/PatchImageResources.java rename to emulator-manager/src/org/tizen/emulator/manager/resources/PatchImageResources.java diff --git a/src/org/tizen/emulator/manager/resources/StringResources.java b/emulator-manager/src/org/tizen/emulator/manager/resources/StringResources.java similarity index 100% rename from src/org/tizen/emulator/manager/resources/StringResources.java rename to emulator-manager/src/org/tizen/emulator/manager/resources/StringResources.java diff --git a/src/org/tizen/emulator/manager/tool/About.java b/emulator-manager/src/org/tizen/emulator/manager/tool/About.java similarity index 100% rename from src/org/tizen/emulator/manager/tool/About.java rename to emulator-manager/src/org/tizen/emulator/manager/tool/About.java diff --git a/src/org/tizen/emulator/manager/tool/CheckSDCard.java b/emulator-manager/src/org/tizen/emulator/manager/tool/CheckSDCard.java similarity index 100% rename from src/org/tizen/emulator/manager/tool/CheckSDCard.java rename to emulator-manager/src/org/tizen/emulator/manager/tool/CheckSDCard.java diff --git a/src/org/tizen/emulator/manager/tool/CheckVirtualization.java b/emulator-manager/src/org/tizen/emulator/manager/tool/CheckVirtualization.java similarity index 100% rename from src/org/tizen/emulator/manager/tool/CheckVirtualization.java rename to emulator-manager/src/org/tizen/emulator/manager/tool/CheckVirtualization.java diff --git a/src/org/tizen/emulator/manager/tool/PortHelper.java b/emulator-manager/src/org/tizen/emulator/manager/tool/PortHelper.java similarity index 100% rename from src/org/tizen/emulator/manager/tool/PortHelper.java rename to emulator-manager/src/org/tizen/emulator/manager/tool/PortHelper.java diff --git a/src/org/tizen/emulator/manager/tool/SelectTemplate.java b/emulator-manager/src/org/tizen/emulator/manager/tool/SelectTemplate.java similarity index 100% rename from src/org/tizen/emulator/manager/tool/SelectTemplate.java rename to emulator-manager/src/org/tizen/emulator/manager/tool/SelectTemplate.java diff --git a/src/org/tizen/emulator/manager/tool/SelectWorkspace.java b/emulator-manager/src/org/tizen/emulator/manager/tool/SelectWorkspace.java similarity index 100% rename from src/org/tizen/emulator/manager/tool/SelectWorkspace.java rename to emulator-manager/src/org/tizen/emulator/manager/tool/SelectWorkspace.java diff --git a/src/org/tizen/emulator/manager/ui/MainDialog.java b/emulator-manager/src/org/tizen/emulator/manager/ui/MainDialog.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/MainDialog.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/MainDialog.java diff --git a/src/org/tizen/emulator/manager/ui/MenuHandling.java b/emulator-manager/src/org/tizen/emulator/manager/ui/MenuHandling.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/MenuHandling.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/MenuHandling.java diff --git a/src/org/tizen/emulator/manager/ui/StatusBar.java b/emulator-manager/src/org/tizen/emulator/manager/ui/StatusBar.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/StatusBar.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/StatusBar.java diff --git a/src/org/tizen/emulator/manager/ui/VMsDetailView.java b/emulator-manager/src/org/tizen/emulator/manager/ui/VMsDetailView.java similarity index 99% rename from src/org/tizen/emulator/manager/ui/VMsDetailView.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/VMsDetailView.java index ebbc829..420fdf0 100644 --- a/src/org/tizen/emulator/manager/ui/VMsDetailView.java +++ b/emulator-manager/src/org/tizen/emulator/manager/ui/VMsDetailView.java @@ -33,6 +33,7 @@ import org.eclipse.swt.SWT; import org.eclipse.swt.custom.StackLayout; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.widgets.Composite; + import org.tizen.emulator.manager.resources.ColorResources; import org.tizen.emulator.manager.ui.detail.PInfoViewPage; import org.tizen.emulator.manager.ui.detail.PEmptyViewPage; diff --git a/src/org/tizen/emulator/manager/ui/VMsListView.java b/emulator-manager/src/org/tizen/emulator/manager/ui/VMsListView.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/VMsListView.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/VMsListView.java diff --git a/src/org/tizen/emulator/manager/ui/VMsMainView.java b/emulator-manager/src/org/tizen/emulator/manager/ui/VMsMainView.java similarity index 99% rename from src/org/tizen/emulator/manager/ui/VMsMainView.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/VMsMainView.java index eed3e64..253cc11 100644 --- a/src/org/tizen/emulator/manager/ui/VMsMainView.java +++ b/emulator-manager/src/org/tizen/emulator/manager/ui/VMsMainView.java @@ -158,6 +158,7 @@ public class VMsMainView { this.currentPlatform = platform; listView.drawPlatform(platform, index, isRefresh); + } public void setPlatform(Platform platform) { @@ -282,10 +283,12 @@ public class VMsMainView { } public void drawCreateVM(BaseImage image, boolean setFocus) { + /* if (isCreateMode) { setSetFocus(setFocus); return; } + */ isCreateMode = true; setSetFocus(setFocus); diff --git a/src/org/tizen/emulator/manager/ui/detail/DetailViewItem.java b/emulator-manager/src/org/tizen/emulator/manager/ui/detail/DetailViewItem.java similarity index 88% rename from src/org/tizen/emulator/manager/ui/detail/DetailViewItem.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/detail/DetailViewItem.java index 1c10a39..158ef48 100644 --- a/src/org/tizen/emulator/manager/ui/detail/DetailViewItem.java +++ b/emulator-manager/src/org/tizen/emulator/manager/ui/detail/DetailViewItem.java @@ -50,34 +50,8 @@ import org.tizen.emulator.manager.resources.ColorResources; import org.tizen.emulator.manager.resources.FontResources; import org.tizen.emulator.manager.resources.ImageResources; import org.tizen.emulator.manager.ui.widgets.ImageButton; -import org.tizen.emulator.manager.vms.VMPropertyValue; - -class DetailItemList { - private static ArrayList list = null; - public static ArrayList getItemList() { - //if (list == null) { - makeList(); - //} - return list; - } - - private static void makeList() { - list = new ArrayList(); - - list.add(new TNameTextItem()); - list.add(new TDisplayItem()); - list.add(new TRAMItem()); - list.add(new TTouchPointItem()); - list.add(new TFileShareItem()); - list.add(new THWSupportItem()); - //list.add(new TTouchPointItem()); - //list.add(new TTouchPointItem()); - //list.add(new THWSupportItem()); - //list.add(new TDisplayItem()); - } -} -public abstract class DetailViewItem { +public abstract class DetailViewItem implements IInfoViewItem, IModifyViewItem { protected Composite comp = null; protected DetailViewItem upperItem = null; protected DetailViewItem downItem = null; @@ -91,17 +65,6 @@ public abstract class DetailViewItem { protected DetailViewItem item; - // for modify - private DetailViewItemChangeListener listener; - - public DetailViewItemChangeListener getListener() { - return listener; - } - - public void setListener(DetailViewItemChangeListener listener) { - this.listener = listener; - } - public DetailViewItem() { this.item = this; } @@ -110,8 +73,14 @@ public abstract class DetailViewItem { return item; } - public void setDownItem(DetailViewItem down) { - this.downItem = down; + @Override + public void initItem(Composite parent, IInfoViewItem upperItem) { + initItem(parent, (DetailViewItem) upperItem); + } + + @Override + public void initItem(Composite parent, IModifyViewItem upperItem) { + initItem(parent, (DetailViewItem) upperItem); } protected ArrayList compList = new ArrayList(); @@ -138,7 +107,7 @@ public abstract class DetailViewItem { protected static int ITEM_RIGHT_GAP = 0; private static Image image = null; - public void initItem(Composite parent, DetailViewItem upperItem) { + private void initItem(Composite parent, DetailViewItem upperItem) { this.upperItem = upperItem; Composite up; if (upperItem != null) { @@ -194,6 +163,10 @@ public abstract class DetailViewItem { initTitle(true); } + private void setDownItem(DetailViewItem down) { + this.downItem = down; + } + private static int ARROW_BUTTON_WIDTH = 7; private static int ARROW_BUTTON_HEIGHT = 7; protected void initTitle(boolean supportMinMode) { @@ -285,7 +258,8 @@ public abstract class DetailViewItem { FormData data = new FormData(); data.height = 0; compList.get(i).setLayoutData(data); - compList.get(i).getParent().layout(true, false); + compList.get(i).layout(true, false); + compList.get(i).getParent().layout(); } if (downItem != null) { @@ -313,6 +287,7 @@ public abstract class DetailViewItem { data.height = ITEM_HEIGHT; compList.get(i).setLayoutData(data); compList.get(i).getParent().layout(true, false); + compList.get(i).getParent().getParent().layout(); } if (downItem != null) { downItem.changeUpComposite(compList.get(count-1)); @@ -342,14 +317,17 @@ public abstract class DetailViewItem { gc.drawText(text, x + offset , y, true); } + @Override public ArrayList getCompositeList() { return compList; } + @Override public Composite getTopComposite() { return compList.get(0); } + @Override public Composite getBottomComposite() { return compList.get(compList.size()-1); } @@ -370,14 +348,17 @@ public abstract class DetailViewItem { comp.getParent().layout(true, true); } + @Override public boolean isCreateMode() { return isCreateMode; } + @Override public void setCreateMode(boolean isCreateMode) { this.isCreateMode = isCreateMode; } + @Override public int getCount() { if (isMinMode) { return 1; @@ -386,19 +367,22 @@ public abstract class DetailViewItem { } } + // for modify + private DetailViewItemChangeListener listener; + + protected DetailViewItemChangeListener getListener() { + return listener; + } + + @Override + public void setListener(DetailViewItemChangeListener listener) { + this.listener = listener; + } + + @Override public void close() { titleLabel.dispose(); closeItem(); } - - protected abstract void init(); - public abstract void setValue(VMPropertyValue value); - public abstract void drawDetail(); - public abstract void drawModify(); - // for min mode - public abstract void settingStatus(boolean isRefresh); - public abstract boolean settingDetailItem(VMPropertyValue value); - public abstract boolean settingModifyItem(VMPropertyValue value); - public abstract void closeItem(); } diff --git a/src/org/tizen/emulator/manager/ui/detail/DetailViewItemChangeListener.java b/emulator-manager/src/org/tizen/emulator/manager/ui/detail/DetailViewItemChangeListener.java similarity index 96% rename from src/org/tizen/emulator/manager/ui/detail/DetailViewItemChangeListener.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/detail/DetailViewItemChangeListener.java index 1894edb..92ada59 100644 --- a/src/org/tizen/emulator/manager/ui/detail/DetailViewItemChangeListener.java +++ b/emulator-manager/src/org/tizen/emulator/manager/ui/detail/DetailViewItemChangeListener.java @@ -37,5 +37,5 @@ enum State { public interface DetailViewItemChangeListener { public void ChangeValue(DetailViewItem item); public void ChangeValue(boolean isChange); - public void ChangeState(State state); + public void ChangeState(ItemChangeState state); } diff --git a/emulator-manager/src/org/tizen/emulator/manager/ui/detail/DetailViewItemList.java b/emulator-manager/src/org/tizen/emulator/manager/ui/detail/DetailViewItemList.java new file mode 100644 index 0000000..45f730a --- /dev/null +++ b/emulator-manager/src/org/tizen/emulator/manager/ui/detail/DetailViewItemList.java @@ -0,0 +1,75 @@ +package org.tizen.emulator.manager.ui.detail; + +import java.util.ArrayList; + +import org.eclipse.swt.SWT; +import org.eclipse.swt.layout.FormLayout; +import org.eclipse.swt.widgets.Composite; +import org.tizen.emulator.manager.plugin.ExtensionItem; + +public class DetailViewItemList { + private ExtensionItem item = null; + private DetailViewPage viewPage = null; + private Composite infoComp = null; + private Composite modifyComp = null; + private ArrayList infoList = null; + private ArrayList modifyList = null; + + public DetailViewItemList(ExtensionItem item, DetailViewPage page) { + this.item = item; + this.viewPage = page; + } + + public String getProfile() { + return item.getProfile(); + } + + public ArrayList getInfoItemList() { + if (infoList == null) { + infoComp = new Composite(viewPage.getItemListComposite(), SWT.NONE); + infoComp.setLayout(new FormLayout()); + IItemListFactory f = (IItemListFactory)(item.createClass()); + infoList = f.getInfoItemList(); + IInfoViewItem item = null; + DetailViewItem up = null; + for (int i = 0; i < infoList.size(); i++) { + item = infoList.get(i); + item.initItem(infoComp, up); + item.drawDetail(); + up = (DetailViewItem) item; + } + infoComp.layout(true, true); + } + return infoList; + } + + public ArrayList getModifyItemList() { + if (modifyList == null) { + modifyComp = new Composite(viewPage.getItemListComposite(), SWT.NONE); + modifyComp.setLayout(new FormLayout()); + IItemListFactory f = (IItemListFactory)(item.createClass()); + modifyList = f.getModifyItemList(); + + IModifyViewItem item = null; + DetailViewItem up = null; + for (int i = 0; i < modifyList.size(); i++) { + item = modifyList.get(i); + item.initItem(modifyComp, up); + item.drawModify(); + item.setListener((PModifyViewPage)viewPage); + up = (DetailViewItem) item; + } + + modifyComp.layout(true, true); + } + return modifyList; + } + + public Composite getInfoComposite() { + return infoComp; + } + + public Composite getModifyComposite() { + return modifyComp; + } +} diff --git a/src/org/tizen/emulator/manager/ui/detail/DetailViewPage.java b/emulator-manager/src/org/tizen/emulator/manager/ui/detail/DetailViewPage.java similarity index 87% rename from src/org/tizen/emulator/manager/ui/detail/DetailViewPage.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/detail/DetailViewPage.java index e7178e6..5d75bc0 100644 --- a/src/org/tizen/emulator/manager/ui/detail/DetailViewPage.java +++ b/emulator-manager/src/org/tizen/emulator/manager/ui/detail/DetailViewPage.java @@ -30,6 +30,7 @@ package org.tizen.emulator.manager.ui.detail; import org.eclipse.swt.SWT; +import org.eclipse.swt.custom.StackLayout; import org.eclipse.swt.graphics.Font; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.graphics.Point; @@ -38,6 +39,7 @@ import org.eclipse.swt.layout.FormData; import org.eclipse.swt.layout.FormLayout; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; + import org.tizen.emulator.manager.resources.ColorResources; import org.tizen.emulator.manager.resources.FontResources; import org.tizen.emulator.manager.resources.ImageResources; @@ -76,6 +78,7 @@ public abstract class DetailViewPage { public abstract int checkItemCount(); + protected final StackLayout stackLayout = new StackLayout(); public DetailViewPage(VMsDetailView parent, int style) { this.parent = parent; view = new Composite((Composite)parent.getComposite(), style); @@ -95,11 +98,11 @@ public abstract class DetailViewPage { scrolledList.setBackground(ColorResources.DETAIL_VIEW_PAGE_COLOR.getColor()); itemList.setBackground(ColorResources.DETAIL_VIEW_PAGE_COLOR.getColor()); itemListBack.setLayout(new FormLayout()); - itemList.setLayout(new FormLayout()); + itemList.setLayout(stackLayout); // settingItemList(); // - scrolledList.setContent(itemList); + //scrolledList.setContent(itemList); FormData data = new FormData(); data.left = new FormAttachment(0, 10); @@ -129,6 +132,10 @@ public abstract class DetailViewPage { return view; } + public Composite getItemListComposite() { + return itemList; + } + protected ImageButton topButton = null; private static int TOP_BUTTON_WIDTH = 21; private static int TOP_BUTTON_HEIGHT = 21; @@ -166,10 +173,10 @@ public abstract class DetailViewPage { public void settingItemList() { Image image = PatchImageResources.getDetailListView(checkItemCountwithSize()); Image image2 = PatchImageResources.getDetailListView2(checkItemCountwithSize()); - Image image3 = PatchImageResources.getDetailListView2(checkItemCount()); + itemListBack.setBackgroundImage(image); scrolledList.setBackgroundImage(image2); - itemList.setBackgroundImage(image3); + //itemList.setBackgroundImage(image3); FormData data = new FormData(); data.left = new FormAttachment(0, 10); @@ -188,10 +195,17 @@ public abstract class DetailViewPage { scrolledList.setSize(data.width, data.height); scrolledList.setLayoutData(data); - itemListSize.x = image3.getImageData().width; - itemListSize.y = image3.getImageData().height; - itemList.setSize(itemListSize); - + int count = checkItemCount(); + if (count != 0) { + Image image3 = PatchImageResources.getDetailListView2(count); + itemListSize.x = image3.getImageData().width; + itemListSize.y = image3.getImageData().height; + if (stackLayout.topControl != null) { + stackLayout.topControl.setBackgroundImage(image3); + stackLayout.topControl.setSize(itemListSize); + } + //itemList.setSize(itemListSize); + } itemListBack.layout(true, false); } @@ -199,12 +213,24 @@ public abstract class DetailViewPage { settingItemList(); } - protected abstract void drawInitView(); + public abstract void drawInitView(); public abstract void reset(); public abstract void setFocus(boolean setFocus); public abstract void drawPropertyView(VMPropertyValue propertyValue, boolean isCreate); + public void setItemListSize(int width, int height) { + itemListSize.x = width; + itemListSize.y = height; + } + public Point getItemListSize() { return itemListSize; } + + public void setStackTop(Composite comp) { + stackLayout.topControl = comp; + scrolledList.setContent(comp); + itemList.layout(true, false); + scrolledList.layout(); + } } diff --git a/emulator-manager/src/org/tizen/emulator/manager/ui/detail/IInfoViewItem.java b/emulator-manager/src/org/tizen/emulator/manager/ui/detail/IInfoViewItem.java new file mode 100644 index 0000000..952d335 --- /dev/null +++ b/emulator-manager/src/org/tizen/emulator/manager/ui/detail/IInfoViewItem.java @@ -0,0 +1,11 @@ +package org.tizen.emulator.manager.ui.detail; + +import org.eclipse.swt.widgets.Composite; +import org.tizen.emulator.manager.vms.VMPropertyValue; + +public interface IInfoViewItem extends IViewItem { + public void initItem(Composite parent, IInfoViewItem upperItem); + + public abstract void drawDetail(); + public abstract boolean settingDetailItem(VMPropertyValue value); +} diff --git a/emulator-manager/src/org/tizen/emulator/manager/ui/detail/IItemListFactory.java b/emulator-manager/src/org/tizen/emulator/manager/ui/detail/IItemListFactory.java new file mode 100644 index 0000000..c536437 --- /dev/null +++ b/emulator-manager/src/org/tizen/emulator/manager/ui/detail/IItemListFactory.java @@ -0,0 +1,8 @@ +package org.tizen.emulator.manager.ui.detail; + +import java.util.ArrayList; + +public interface IItemListFactory { + public ArrayList getInfoItemList(); + public ArrayList getModifyItemList(); +} diff --git a/emulator-manager/src/org/tizen/emulator/manager/ui/detail/IModifyViewItem.java b/emulator-manager/src/org/tizen/emulator/manager/ui/detail/IModifyViewItem.java new file mode 100644 index 0000000..2339ac8 --- /dev/null +++ b/emulator-manager/src/org/tizen/emulator/manager/ui/detail/IModifyViewItem.java @@ -0,0 +1,16 @@ +package org.tizen.emulator.manager.ui.detail; + +import org.eclipse.swt.widgets.Composite; +import org.tizen.emulator.manager.vms.VMPropertyValue; + +public interface IModifyViewItem extends IViewItem{ + public void initItem(Composite parent, IModifyViewItem upperItem); + public void setListener(DetailViewItemChangeListener listener); + public boolean isCreateMode(); + public void setCreateMode(boolean isCreateMode); + + public abstract void setValue(VMPropertyValue value); + public abstract void drawModify(); + public abstract boolean settingModifyItem(VMPropertyValue value); + +} diff --git a/emulator-manager/src/org/tizen/emulator/manager/ui/detail/IViewItem.java b/emulator-manager/src/org/tizen/emulator/manager/ui/detail/IViewItem.java new file mode 100644 index 0000000..de05165 --- /dev/null +++ b/emulator-manager/src/org/tizen/emulator/manager/ui/detail/IViewItem.java @@ -0,0 +1,17 @@ +package org.tizen.emulator.manager.ui.detail; + +import java.util.ArrayList; + +import org.eclipse.swt.widgets.Composite; + +public interface IViewItem { + public int getCount(); + public void close(); + public ArrayList getCompositeList(); + public Composite getTopComposite(); + public Composite getBottomComposite(); + + public abstract void init(); + public abstract void settingStatus(boolean isRefresh); + public abstract void closeItem(); +} diff --git a/emulator-manager/src/org/tizen/emulator/manager/ui/detail/ItemChangeState.java b/emulator-manager/src/org/tizen/emulator/manager/ui/detail/ItemChangeState.java new file mode 100644 index 0000000..2d3b519 --- /dev/null +++ b/emulator-manager/src/org/tizen/emulator/manager/ui/detail/ItemChangeState.java @@ -0,0 +1,5 @@ +package org.tizen.emulator.manager.ui.detail; + +public enum ItemChangeState { + CREATE, MODIFY, CANCEL; +} diff --git a/src/org/tizen/emulator/manager/ui/detail/PEmptyViewPage.java b/emulator-manager/src/org/tizen/emulator/manager/ui/detail/PEmptyViewPage.java similarity index 89% rename from src/org/tizen/emulator/manager/ui/detail/PEmptyViewPage.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/detail/PEmptyViewPage.java index 2cd7925..b37e56e 100644 --- a/src/org/tizen/emulator/manager/ui/detail/PEmptyViewPage.java +++ b/emulator-manager/src/org/tizen/emulator/manager/ui/detail/PEmptyViewPage.java @@ -32,7 +32,9 @@ package org.tizen.emulator.manager.ui.detail; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; +import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Label; + import org.tizen.emulator.manager.resources.ColorResources; import org.tizen.emulator.manager.resources.FontResources; import org.tizen.emulator.manager.ui.VMsDetailView; @@ -45,10 +47,12 @@ public class PEmptyViewPage extends DetailViewPage { super(parent, style); } + private Composite comp; @Override - protected void drawInitView() { + public void drawInitView() { + comp = new Composite(itemList, SWT.NONE); // write message - title = new Label(itemList, SWT.NONE); + title = new Label(comp, SWT.NONE); title.setBackground(ColorResources.DETAIL_MIDDLE_COLOR.getColor()); title.setForeground(ColorResources.DETAIL_ENABLE_FONT_COLOR.getColor()); title.setFont(FontResources.DETAIL_LABEL_FONT.getFont()); @@ -63,7 +67,12 @@ public class PEmptyViewPage extends DetailViewPage { data = new FormData(); data.width = this.getItemListSize().x; data.height = this.getItemListSize().y; - itemList.setLayoutData(data); + comp.setLayoutData(data); + comp.layout(true, false); + + stackLayout.topControl = comp; + scrolledList.setContent(comp); + itemList.layout(); } public void drawEmptyDetailVM() { diff --git a/src/org/tizen/emulator/manager/ui/detail/PInfoViewPage.java b/emulator-manager/src/org/tizen/emulator/manager/ui/detail/PInfoViewPage.java similarity index 82% rename from src/org/tizen/emulator/manager/ui/detail/PInfoViewPage.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/detail/PInfoViewPage.java index 92fe5bc..5def9e4 100644 --- a/src/org/tizen/emulator/manager/ui/detail/PInfoViewPage.java +++ b/emulator-manager/src/org/tizen/emulator/manager/ui/detail/PInfoViewPage.java @@ -37,6 +37,11 @@ import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; + +import org.tizen.emulator.manager.plugin.EMPluginList; +import org.tizen.emulator.manager.plugin.ExtensionItem; +import org.tizen.emulator.manager.plugin.Extension; +import org.tizen.emulator.manager.plugin.PluginStringResources; import org.tizen.emulator.manager.resources.ImageResources; import org.tizen.emulator.manager.resources.PatchImageResources; import org.tizen.emulator.manager.resources.StringResources; @@ -53,7 +58,7 @@ public class PInfoViewPage extends DetailViewPage { private ImageButton modifyButton; @Override - protected void drawInitView() { + public void drawInitView() { modifyButton = new ImageButton(itemListTop, SWT.PUSH); modifyButton.setImages(ImageResources.MODIFY_BUTTON_NOMAL.getImage(), ImageResources.MODIFY_BUTTON_HOVER.getImage(), @@ -74,23 +79,28 @@ public class PInfoViewPage extends DetailViewPage { modifyButton.setToolTipText("modify property of vm"); topButton = modifyButton; - - makeDetailView(); makeButton(); + makeDetailView(); } - private ArrayList list; + private ArrayList list; private void makeDetailView() { - list = DetailItemList.getItemList(); - DetailViewItem item = null; + list = new ArrayList(); + Extension point = EMPluginList.getExtension(PluginStringResources.ItemFactory); + for (ExtensionItem item : point.getItemList()) { + list.add(new DetailViewItemList(item, this)); + } +/* + IInfoViewItem item = null; DetailViewItem up = null; for (int i = 0; i < list.size(); i++) { item = list.get(i); item.initItem(itemList, up); item.drawDetail(); - up = item; + up = (DetailViewItem) item; } itemList.layout(true, true); + */ } private ImageButton exportButton; @@ -185,39 +195,30 @@ public class PInfoViewPage extends DetailViewPage { @Override public void drawPropertyView(VMPropertyValue propertyValue, boolean isCreate) { assert propertyValue == null; - - for (DetailViewItem item : list) { - item.settingDetailItem(propertyValue); + for (DetailViewItemList item : list) { + if (item.getProfile().equals(propertyValue.profile)) { + for (IInfoViewItem i : item.getInfoItemList()) { + i.settingDetailItem(propertyValue); + } + setStackTop(item.getInfoComposite()); + break; + } } } -/* - @Override - public void resize(int height) { - Image image = PatchImageResources.getDetailListView2(checkItemCount()); - itemList.setBackgroundImage(image); - itemList.setBackground(ColorResources.DETAIL_VIEW_PAGE_COLOR.getColor()); - FormData data = new FormData(); - data.left = new FormAttachment(0, 0); - data.top = new FormAttachment(0, 0); - data.bottom = new FormAttachment(100, -4); - data.height = image.getImageData().height; - data.width = image.getImageData().width; - itemList.setSize(data.width, data.height); - itemList.setLayoutData(data); - itemList.redraw(); - } - */ @Override public int checkItemCount() { - if (list == null) { + if (list == null || list.isEmpty()) { return checkItemCountwithSize(); } - DetailViewItem item = null; int count = 0; - for (int i = 0; i < list.size(); i++) { - item = list.get(i); - count += item.getCount(); + for (DetailViewItemList item : list) { + if (stackLayout.topControl == item.getInfoComposite()) { + for (IInfoViewItem i : item.getInfoItemList()) { + count += i.getCount(); + } + break; + } } return count; } @@ -225,9 +226,16 @@ public class PInfoViewPage extends DetailViewPage { @Override public void reset() { scrolledList.setOrigin(0, 0); + for (DetailViewItemList item : list) { + for (IInfoViewItem i : item.getInfoItemList()) { + i.settingStatus(true); + } + } + /* for (int i = 0; i < list.size(); i++) { list.get(i).settingStatus(true); } + */ } @Override diff --git a/src/org/tizen/emulator/manager/ui/detail/PModifyViewPage.java b/emulator-manager/src/org/tizen/emulator/manager/ui/detail/PModifyViewPage.java similarity index 77% rename from src/org/tizen/emulator/manager/ui/detail/PModifyViewPage.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/detail/PModifyViewPage.java index 8b66da9..89571f8 100644 --- a/src/org/tizen/emulator/manager/ui/detail/PModifyViewPage.java +++ b/emulator-manager/src/org/tizen/emulator/manager/ui/detail/PModifyViewPage.java @@ -38,6 +38,10 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.tizen.emulator.manager.logging.EMLogger; +import org.tizen.emulator.manager.plugin.EMPluginList; +import org.tizen.emulator.manager.plugin.ExtensionItem; +import org.tizen.emulator.manager.plugin.Extension; +import org.tizen.emulator.manager.plugin.PluginStringResources; import org.tizen.emulator.manager.resources.ImageResources; import org.tizen.emulator.manager.resources.PatchImageResources; import org.tizen.emulator.manager.resources.StringResources; @@ -58,9 +62,8 @@ public class PModifyViewPage extends DetailViewPage private ImageButton cancelButton; private boolean isCreateMode = false; - @Override - protected void drawInitView() { + public void drawInitView() { cancelButton = new ImageButton(itemListTop, SWT.PUSH); cancelButton.setImages(ImageResources.CANCEL_BUTTON_NOMAL.getImage(), ImageResources.CANCEL_BUTTON_HOVER.getImage(), @@ -82,10 +85,8 @@ public class PModifyViewPage extends DetailViewPage cancelButton.setToolTipText("cancel modification of vm"); topButton = cancelButton; - - makeModifyView(); makeButton(); - + makeModifyView(); } protected void cancelModify() { @@ -97,20 +98,26 @@ public class PModifyViewPage extends DetailViewPage } } - private ArrayList list; + private ArrayList list; private void makeModifyView() { - list = DetailItemList.getItemList(); - DetailViewItem item = null; + list = new ArrayList(); + Extension point = EMPluginList.getExtension(PluginStringResources.ItemFactory); + for (ExtensionItem item : point.getItemList()) { + list.add(new DetailViewItemList(item, this)); + } + /* + IModifyViewItem item = null; DetailViewItem up = null; for (int i = 0; i < list.size(); i++) { item = list.get(i); item.initItem(itemList, up); item.drawModify(); item.setListener(this); - up = item; + up = (DetailViewItem) item; } itemList.layout(true, true); + */ } private static int CONFIRM_BUTTON_WIDTH = 303; @@ -148,9 +155,15 @@ public class PModifyViewPage extends DetailViewPage } private void modifyVMProperty() { - for (DetailViewItem item : list) { - item.setValue(newValue); + for (DetailViewItemList item : list) { + if (stackLayout.topControl == item.getModifyComposite()) { + for (IModifyViewItem i : item.getModifyItemList()) { + i.setValue(newValue); + } + break; + } } + // dpi check if (newValue.dpi < VMProperty.MIN_DPI || newValue.dpi > VMProperty.MAX_DPI) { @@ -186,9 +199,16 @@ public class PModifyViewPage extends DetailViewPage isCreateMode = isCreate; oldValue = propertyValue; newValue = oldValue.clone(); - for (DetailViewItem item : list) { - item.setCreateMode(isCreate); - item.settingModifyItem(propertyValue); + + for (DetailViewItemList item : list) { + if (item.getProfile().equals(propertyValue.profile)) { + for (IModifyViewItem i : item.getModifyItemList()) { + i.setCreateMode(isCreate); + i.settingModifyItem(propertyValue); + } + setStackTop(item.getModifyComposite()); + break; + } } } @@ -209,26 +229,29 @@ public class PModifyViewPage extends DetailViewPage } @Override - public void ChangeState(State state) { - if (state == State.CREATE) { + public void ChangeState(ItemChangeState state) { + if (state == ItemChangeState.CREATE) { if (confirmButton.isEnabled()) { modifyVMProperty(); } - } else if (state == State.CANCEL) { + } else if (state == ItemChangeState.CANCEL) { cancelModify(); } } @Override public int checkItemCount() { - if (list == null) { + if (list == null || list.isEmpty()) { return checkItemCountwithSize(); } - DetailViewItem item = null; int count = 0; - for (int i = 0; i < list.size(); i++) { - item = list.get(i); - count += item.getCount(); + for (DetailViewItemList item : list) { + if (stackLayout.topControl == item.getModifyComposite()) { + for (IModifyViewItem i : item.getModifyItemList()) { + count += i.getCount(); + } + break; + } } return count; } @@ -236,15 +259,19 @@ public class PModifyViewPage extends DetailViewPage @Override public void reset() { scrolledList.setOrigin(0, 0); - for (int i = 0; i < list.size(); i++) { - list.get(i).settingStatus(true); + for (DetailViewItemList item : list) { + for (IModifyViewItem i : item.getModifyItemList()) { + i.settingStatus(true); + } } } @Override public void setFocus(boolean setFocus) { - for (int i = 0; i < list.size(); i++) { - list.get(i).settingStatus(false); + for (DetailViewItemList item : list) { + for (IModifyViewItem i : item.getModifyItemList()) { + i.settingStatus(false); + } } } } diff --git a/src/org/tizen/emulator/manager/ui/dialog/AboutDialog.java b/emulator-manager/src/org/tizen/emulator/manager/ui/dialog/AboutDialog.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/dialog/AboutDialog.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/dialog/AboutDialog.java diff --git a/src/org/tizen/emulator/manager/ui/dialog/CloneDialog.java b/emulator-manager/src/org/tizen/emulator/manager/ui/dialog/CloneDialog.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/dialog/CloneDialog.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/dialog/CloneDialog.java diff --git a/src/org/tizen/emulator/manager/ui/dialog/MessageDialog.java b/emulator-manager/src/org/tizen/emulator/manager/ui/dialog/MessageDialog.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/dialog/MessageDialog.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/dialog/MessageDialog.java diff --git a/src/org/tizen/emulator/manager/ui/dialog/SelectWorkspaceDialog.java b/emulator-manager/src/org/tizen/emulator/manager/ui/dialog/SelectWorkspaceDialog.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/dialog/SelectWorkspaceDialog.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/dialog/SelectWorkspaceDialog.java diff --git a/src/org/tizen/emulator/manager/ui/list/AbstractListView.java b/emulator-manager/src/org/tizen/emulator/manager/ui/list/AbstractListView.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/list/AbstractListView.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/list/AbstractListView.java diff --git a/src/org/tizen/emulator/manager/ui/list/ColumnContentHelper.java b/emulator-manager/src/org/tizen/emulator/manager/ui/list/ColumnContentHelper.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/list/ColumnContentHelper.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/list/ColumnContentHelper.java diff --git a/src/org/tizen/emulator/manager/ui/list/ColumnSortListner.java b/emulator-manager/src/org/tizen/emulator/manager/ui/list/ColumnSortListner.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/list/ColumnSortListner.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/list/ColumnSortListner.java diff --git a/src/org/tizen/emulator/manager/ui/list/ExtendTreeListView.java b/emulator-manager/src/org/tizen/emulator/manager/ui/list/ExtendTreeListView.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/list/ExtendTreeListView.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/list/ExtendTreeListView.java diff --git a/src/org/tizen/emulator/manager/ui/list/ItemListVew.java b/emulator-manager/src/org/tizen/emulator/manager/ui/list/ItemListVew.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/list/ItemListVew.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/list/ItemListVew.java diff --git a/src/org/tizen/emulator/manager/ui/list/RowItem.java b/emulator-manager/src/org/tizen/emulator/manager/ui/list/RowItem.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/list/RowItem.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/list/RowItem.java diff --git a/src/org/tizen/emulator/manager/ui/list/TreeListView.java b/emulator-manager/src/org/tizen/emulator/manager/ui/list/TreeListView.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/list/TreeListView.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/list/TreeListView.java diff --git a/src/org/tizen/emulator/manager/ui/list/VMButtonFactory.java b/emulator-manager/src/org/tizen/emulator/manager/ui/list/VMButtonFactory.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/list/VMButtonFactory.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/list/VMButtonFactory.java diff --git a/src/org/tizen/emulator/manager/ui/tabfolder/PlatformTabFolder.java b/emulator-manager/src/org/tizen/emulator/manager/ui/tabfolder/PlatformTabFolder.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/tabfolder/PlatformTabFolder.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/tabfolder/PlatformTabFolder.java diff --git a/src/org/tizen/emulator/manager/ui/tabfolder/PlatformTabItem.java b/emulator-manager/src/org/tizen/emulator/manager/ui/tabfolder/PlatformTabItem.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/tabfolder/PlatformTabItem.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/tabfolder/PlatformTabItem.java diff --git a/src/org/tizen/emulator/manager/ui/widgets/CustomScrollBar.java b/emulator-manager/src/org/tizen/emulator/manager/ui/widgets/CustomScrollBar.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/widgets/CustomScrollBar.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/widgets/CustomScrollBar.java diff --git a/src/org/tizen/emulator/manager/ui/widgets/CustomScrolledComposite.java b/emulator-manager/src/org/tizen/emulator/manager/ui/widgets/CustomScrolledComposite.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/widgets/CustomScrolledComposite.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/widgets/CustomScrolledComposite.java diff --git a/src/org/tizen/emulator/manager/ui/widgets/ImageButton.java b/emulator-manager/src/org/tizen/emulator/manager/ui/widgets/ImageButton.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/widgets/ImageButton.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/widgets/ImageButton.java diff --git a/src/org/tizen/emulator/manager/ui/widgets/ImageCombo.java b/emulator-manager/src/org/tizen/emulator/manager/ui/widgets/ImageCombo.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/widgets/ImageCombo.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/widgets/ImageCombo.java diff --git a/src/org/tizen/emulator/manager/ui/widgets/ImageComboPopup.java b/emulator-manager/src/org/tizen/emulator/manager/ui/widgets/ImageComboPopup.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/widgets/ImageComboPopup.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/widgets/ImageComboPopup.java diff --git a/src/org/tizen/emulator/manager/ui/widgets/ImageLabel.java b/emulator-manager/src/org/tizen/emulator/manager/ui/widgets/ImageLabel.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/widgets/ImageLabel.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/widgets/ImageLabel.java diff --git a/src/org/tizen/emulator/manager/ui/widgets/ScrollbarScrolledListener.java b/emulator-manager/src/org/tizen/emulator/manager/ui/widgets/ScrollbarScrolledListener.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/widgets/ScrollbarScrolledListener.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/widgets/ScrollbarScrolledListener.java diff --git a/src/org/tizen/emulator/manager/ui/widgets/VMButton.java b/emulator-manager/src/org/tizen/emulator/manager/ui/widgets/VMButton.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/widgets/VMButton.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/widgets/VMButton.java diff --git a/src/org/tizen/emulator/manager/ui/widgets/WSTATE.java b/emulator-manager/src/org/tizen/emulator/manager/ui/widgets/WSTATE.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/widgets/WSTATE.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/widgets/WSTATE.java diff --git a/src/org/tizen/emulator/manager/ui/widgets/WidgetHelper.java b/emulator-manager/src/org/tizen/emulator/manager/ui/widgets/WidgetHelper.java similarity index 100% rename from src/org/tizen/emulator/manager/ui/widgets/WidgetHelper.java rename to emulator-manager/src/org/tizen/emulator/manager/ui/widgets/WidgetHelper.java diff --git a/src/org/tizen/emulator/manager/vms/CheckingRunningEmulator.java b/emulator-manager/src/org/tizen/emulator/manager/vms/CheckingRunningEmulator.java similarity index 100% rename from src/org/tizen/emulator/manager/vms/CheckingRunningEmulator.java rename to emulator-manager/src/org/tizen/emulator/manager/vms/CheckingRunningEmulator.java diff --git a/src/org/tizen/emulator/manager/vms/Creator.java b/emulator-manager/src/org/tizen/emulator/manager/vms/Creator.java similarity index 99% rename from src/org/tizen/emulator/manager/vms/Creator.java rename to emulator-manager/src/org/tizen/emulator/manager/vms/Creator.java index e262d18..816de05 100644 --- a/src/org/tizen/emulator/manager/vms/Creator.java +++ b/emulator-manager/src/org/tizen/emulator/manager/vms/Creator.java @@ -245,6 +245,7 @@ public class Creator { } // + ec.getBaseInformation().getDiskImage().setProfile(newVM.profile); ec.getBaseInformation().getDiskImage().setBaseDiskImage(factory.createDiskImageFormatType()); ec.getBaseInformation().getDiskImage().setCurrentDiskImage(factory.createDiskImageFormatType()); // TODO : diff --git a/src/org/tizen/emulator/manager/vms/EmulatorVMList.java b/emulator-manager/src/org/tizen/emulator/manager/vms/EmulatorVMList.java similarity index 100% rename from src/org/tizen/emulator/manager/vms/EmulatorVMList.java rename to emulator-manager/src/org/tizen/emulator/manager/vms/EmulatorVMList.java diff --git a/src/org/tizen/emulator/manager/vms/HelperClass.java b/emulator-manager/src/org/tizen/emulator/manager/vms/HelperClass.java similarity index 100% rename from src/org/tizen/emulator/manager/vms/HelperClass.java rename to emulator-manager/src/org/tizen/emulator/manager/vms/HelperClass.java diff --git a/src/org/tizen/emulator/manager/vms/Launcher.java b/emulator-manager/src/org/tizen/emulator/manager/vms/Launcher.java similarity index 100% rename from src/org/tizen/emulator/manager/vms/Launcher.java rename to emulator-manager/src/org/tizen/emulator/manager/vms/Launcher.java diff --git a/src/org/tizen/emulator/manager/vms/Modifier.java b/emulator-manager/src/org/tizen/emulator/manager/vms/Modifier.java similarity index 100% rename from src/org/tizen/emulator/manager/vms/Modifier.java rename to emulator-manager/src/org/tizen/emulator/manager/vms/Modifier.java diff --git a/src/org/tizen/emulator/manager/vms/MonitoringEmulator.java b/emulator-manager/src/org/tizen/emulator/manager/vms/MonitoringEmulator.java similarity index 100% rename from src/org/tizen/emulator/manager/vms/MonitoringEmulator.java rename to emulator-manager/src/org/tizen/emulator/manager/vms/MonitoringEmulator.java diff --git a/src/org/tizen/emulator/manager/vms/QemuImgProc.java b/emulator-manager/src/org/tizen/emulator/manager/vms/QemuImgProc.java similarity index 100% rename from src/org/tizen/emulator/manager/vms/QemuImgProc.java rename to emulator-manager/src/org/tizen/emulator/manager/vms/QemuImgProc.java diff --git a/src/org/tizen/emulator/manager/vms/RAM_SIZE.java b/emulator-manager/src/org/tizen/emulator/manager/vms/RAM_SIZE.java similarity index 100% rename from src/org/tizen/emulator/manager/vms/RAM_SIZE.java rename to emulator-manager/src/org/tizen/emulator/manager/vms/RAM_SIZE.java diff --git a/src/org/tizen/emulator/manager/vms/RESOLUTION.java b/emulator-manager/src/org/tizen/emulator/manager/vms/RESOLUTION.java similarity index 100% rename from src/org/tizen/emulator/manager/vms/RESOLUTION.java rename to emulator-manager/src/org/tizen/emulator/manager/vms/RESOLUTION.java diff --git a/src/org/tizen/emulator/manager/vms/SKIN_BUTTON_TYPE.java b/emulator-manager/src/org/tizen/emulator/manager/vms/SKIN_BUTTON_TYPE.java similarity index 100% rename from src/org/tizen/emulator/manager/vms/SKIN_BUTTON_TYPE.java rename to emulator-manager/src/org/tizen/emulator/manager/vms/SKIN_BUTTON_TYPE.java diff --git a/src/org/tizen/emulator/manager/vms/SKIN_TYPE.java b/emulator-manager/src/org/tizen/emulator/manager/vms/SKIN_TYPE.java similarity index 100% rename from src/org/tizen/emulator/manager/vms/SKIN_TYPE.java rename to emulator-manager/src/org/tizen/emulator/manager/vms/SKIN_TYPE.java diff --git a/src/org/tizen/emulator/manager/vms/VMCreatorException.java b/emulator-manager/src/org/tizen/emulator/manager/vms/VMCreatorException.java similarity index 100% rename from src/org/tizen/emulator/manager/vms/VMCreatorException.java rename to emulator-manager/src/org/tizen/emulator/manager/vms/VMCreatorException.java diff --git a/src/org/tizen/emulator/manager/vms/VMProperty.java b/emulator-manager/src/org/tizen/emulator/manager/vms/VMProperty.java similarity index 100% rename from src/org/tizen/emulator/manager/vms/VMProperty.java rename to emulator-manager/src/org/tizen/emulator/manager/vms/VMProperty.java diff --git a/src/org/tizen/emulator/manager/vms/VMPropertyValue.java b/emulator-manager/src/org/tizen/emulator/manager/vms/VMPropertyValue.java similarity index 96% rename from src/org/tizen/emulator/manager/vms/VMPropertyValue.java rename to emulator-manager/src/org/tizen/emulator/manager/vms/VMPropertyValue.java index 14962a7..520ffd4 100644 --- a/src/org/tizen/emulator/manager/vms/VMPropertyValue.java +++ b/emulator-manager/src/org/tizen/emulator/manager/vms/VMPropertyValue.java @@ -54,6 +54,7 @@ public class VMPropertyValue implements Cloneable { public String vmsName; public String archType; + public String profile; public String version; // BaseImage version(=platform) public String baseName; // BaseImage name public boolean isStandard; @@ -93,6 +94,7 @@ public class VMPropertyValue implements Cloneable { } else { isStandard = true; archType = image.getCpu(); + profile = image.getDomain(); version = image.getVersion(); baseName = image.getName(); baseImagePath = image.getPath(); @@ -108,6 +110,13 @@ public class VMPropertyValue implements Cloneable { vmsName = property.getName(); archType = property.getArch().toString(); + // TODO + if (property.getConfiguration().getBaseInformation().getDiskImage().getProfile() != null) { + profile = property.getConfiguration().getBaseInformation().getDiskImage().getProfile(); + } else { + profile = "phone"; + } + version = property.getConfiguration().getBaseInformation().getDiskImage().getVersion(); baseName = property.getConfiguration().getBaseInformation().getDiskImage().getBase(); isStandard = property.getConfiguration().getBaseInformation().getDiskImage().getType() @@ -128,6 +137,7 @@ public class VMPropertyValue implements Cloneable { dest.vmsName = this.vmsName; dest.archType = this.archType; + dest.profile = this.profile; dest.version = this.version; dest.baseName = this.baseName; dest.isStandard = this.isStandard; @@ -325,6 +335,8 @@ public class VMPropertyValue implements Cloneable { baseImagePath = ""; baseImagePathName = isStandard ? (archType.equals("x86") ? "( emulimg-2.0.x86 )" : "( emulimg-2.0.arm )") : StringResources.None; + // TODO + profile = "phone"; settingConfigure(template); } diff --git a/src/org/tizen/emulator/manager/vms/VMWorker.java b/emulator-manager/src/org/tizen/emulator/manager/vms/VMWorker.java similarity index 100% rename from src/org/tizen/emulator/manager/vms/VMWorker.java rename to emulator-manager/src/org/tizen/emulator/manager/vms/VMWorker.java diff --git a/src/org/tizen/emulator/manager/vms/VMWorkerException.java b/emulator-manager/src/org/tizen/emulator/manager/vms/VMWorkerException.java similarity index 100% rename from src/org/tizen/emulator/manager/vms/VMWorkerException.java rename to emulator-manager/src/org/tizen/emulator/manager/vms/VMWorkerException.java diff --git a/supplement/emulator-manager-mac-app.sh b/emulator-manager/supplement/emulator-manager-mac-app.sh similarity index 100% rename from supplement/emulator-manager-mac-app.sh rename to emulator-manager/supplement/emulator-manager-mac-app.sh diff --git a/supplement/emulator-manager-mac.sh b/emulator-manager/supplement/emulator-manager-mac.sh similarity index 100% rename from supplement/emulator-manager-mac.sh rename to emulator-manager/supplement/emulator-manager-mac.sh diff --git a/supplement/emulator-manager.c b/emulator-manager/supplement/emulator-manager.c similarity index 100% rename from supplement/emulator-manager.c rename to emulator-manager/supplement/emulator-manager.c diff --git a/supplement/emulator-manager.sh b/emulator-manager/supplement/emulator-manager.sh similarity index 100% rename from supplement/emulator-manager.sh rename to emulator-manager/supplement/emulator-manager.sh diff --git a/supplement/info-mac-app.plist b/emulator-manager/supplement/info-mac-app.plist similarity index 100% rename from supplement/info-mac-app.plist rename to emulator-manager/supplement/info-mac-app.plist diff --git a/xsd/em.xml b/emulator-manager/xsd/em.xml similarity index 82% rename from xsd/em.xml rename to emulator-manager/xsd/em.xml index be3ba82..98c1993 100644 --- a/xsd/em.xml +++ b/emulator-manager/xsd/em.xml @@ -1,5 +1,5 @@ - + name x86 diff --git a/xsd/em.xsd b/emulator-manager/xsd/em.xsd similarity index 98% rename from xsd/em.xsd rename to emulator-manager/xsd/em.xsd index ee74c75..f1d30b1 100644 --- a/xsd/em.xsd +++ b/emulator-manager/xsd/em.xsd @@ -38,6 +38,7 @@ + diff --git a/mobile-plugin/.classpath b/mobile-plugin/.classpath new file mode 100644 index 0000000..3b8e13c --- /dev/null +++ b/mobile-plugin/.classpath @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/mobile-plugin/.project b/mobile-plugin/.project new file mode 100644 index 0000000..9f30fd3 --- /dev/null +++ b/mobile-plugin/.project @@ -0,0 +1,17 @@ + + + mobile-plugin + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/mobile-plugin/build.xml b/mobile-plugin/build.xml new file mode 100644 index 0000000..bdf59c1 --- /dev/null +++ b/mobile-plugin/build.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/mobile-plugin/src/org/tizen/emulator/manager/ui/detail/mobile/ItemListFactory.java b/mobile-plugin/src/org/tizen/emulator/manager/ui/detail/mobile/ItemListFactory.java new file mode 100644 index 0000000..08973ca --- /dev/null +++ b/mobile-plugin/src/org/tizen/emulator/manager/ui/detail/mobile/ItemListFactory.java @@ -0,0 +1,52 @@ +package org.tizen.emulator.manager.ui.detail.mobile; + +import java.util.ArrayList; + +import org.tizen.emulator.manager.ui.detail.IInfoViewItem; +import org.tizen.emulator.manager.ui.detail.IItemListFactory; +import org.tizen.emulator.manager.ui.detail.IModifyViewItem; + +public class ItemListFactory implements IItemListFactory { + private static ArrayList infoList = null; + private static ArrayList modifyList = null; + + @ Override + public ArrayList getInfoItemList() { + // if (infoList == null) { + makeInfoList(); + // } + + return infoList; + } + + @ Override + public ArrayList getModifyItemList() { + // if (modifyList == null) { + makeModifyList(); + // } + + return modifyList; + } + + private static void makeInfoList() { + infoList = new ArrayList(); + + infoList.add(new TNameTextItem()); + infoList.add(new TDisplayItem()); + infoList.add(new TRAMItem()); + infoList.add(new TTouchPointItem()); + infoList.add(new TFileShareItem()); + infoList.add(new THWSupportItem()); + } + + private static void makeModifyList() { + modifyList = new ArrayList(); + + modifyList.add(new TNameTextItem()); + modifyList.add(new TDisplayItem()); + modifyList.add(new TRAMItem()); + modifyList.add(new TTouchPointItem()); + modifyList.add(new TFileShareItem()); + modifyList.add(new THWSupportItem()); + } +} diff --git a/src/org/tizen/emulator/manager/ui/detail/TDisplayItem.java b/mobile-plugin/src/org/tizen/emulator/manager/ui/detail/mobile/TDisplayItem.java similarity index 98% rename from src/org/tizen/emulator/manager/ui/detail/TDisplayItem.java rename to mobile-plugin/src/org/tizen/emulator/manager/ui/detail/mobile/TDisplayItem.java index d8b6ea9..deb681a 100644 --- a/src/org/tizen/emulator/manager/ui/detail/TDisplayItem.java +++ b/mobile-plugin/src/org/tizen/emulator/manager/ui/detail/mobile/TDisplayItem.java @@ -27,8 +27,7 @@ * */ -package org.tizen.emulator.manager.ui.detail; - +package org.tizen.emulator.manager.ui.detail.mobile; import java.util.ArrayList; import org.eclipse.swt.SWT; @@ -52,6 +51,8 @@ import org.tizen.emulator.manager.resources.ColorResources; import org.tizen.emulator.manager.resources.FontResources; import org.tizen.emulator.manager.resources.ImageResources; import org.tizen.emulator.manager.resources.PatchImageResources; +import org.tizen.emulator.manager.ui.detail.DetailViewItem; +import org.tizen.emulator.manager.ui.detail.ItemChangeState; import org.tizen.emulator.manager.ui.widgets.ImageCombo; import org.tizen.emulator.manager.ui.widgets.ImageLabel; import org.tizen.emulator.manager.ui.widgets.WSTATE; @@ -297,10 +298,10 @@ public class TDisplayItem extends DetailViewItem { case SWT.CR: case SWT.KEYPAD_CR: ///TODO - getListener().ChangeState(State.CREATE); + getListener().ChangeState(ItemChangeState.CREATE); break; case SWT.ESC: - getListener().ChangeState(State.CANCEL); + getListener().ChangeState(ItemChangeState.CANCEL); break; default: // TODO diff --git a/src/org/tizen/emulator/manager/ui/detail/TFileShareItem.java b/mobile-plugin/src/org/tizen/emulator/manager/ui/detail/mobile/TFileShareItem.java similarity index 98% rename from src/org/tizen/emulator/manager/ui/detail/TFileShareItem.java rename to mobile-plugin/src/org/tizen/emulator/manager/ui/detail/mobile/TFileShareItem.java index 3cdb9a5..2ac746b 100644 --- a/src/org/tizen/emulator/manager/ui/detail/TFileShareItem.java +++ b/mobile-plugin/src/org/tizen/emulator/manager/ui/detail/mobile/TFileShareItem.java @@ -27,7 +27,7 @@ * */ -package org.tizen.emulator.manager.ui.detail; +package org.tizen.emulator.manager.ui.detail.mobile; import java.io.File; @@ -46,6 +46,7 @@ import org.tizen.emulator.manager.resources.ImageResources; import org.tizen.emulator.manager.resources.PatchImageResources; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.ui.MainDialog; +import org.tizen.emulator.manager.ui.detail.DetailViewItem; import org.tizen.emulator.manager.ui.widgets.ImageButton; import org.tizen.emulator.manager.ui.widgets.ImageLabel; import org.tizen.emulator.manager.vms.VMPropertyValue; @@ -60,7 +61,7 @@ public class TFileShareItem extends DetailViewItem { private DirectoryDialog sharedFD; @Override - protected void init() { + public void init() { title = "File Sharing"; count = 2; } diff --git a/src/org/tizen/emulator/manager/ui/detail/THWSupportItem.java b/mobile-plugin/src/org/tizen/emulator/manager/ui/detail/mobile/THWSupportItem.java similarity index 98% rename from src/org/tizen/emulator/manager/ui/detail/THWSupportItem.java rename to mobile-plugin/src/org/tizen/emulator/manager/ui/detail/mobile/THWSupportItem.java index 2861042..9da78d1 100644 --- a/src/org/tizen/emulator/manager/ui/detail/THWSupportItem.java +++ b/mobile-plugin/src/org/tizen/emulator/manager/ui/detail/mobile/THWSupportItem.java @@ -27,7 +27,7 @@ * */ -package org.tizen.emulator.manager.ui.detail; +package org.tizen.emulator.manager.ui.detail.mobile; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; @@ -41,6 +41,7 @@ import org.tizen.emulator.manager.resources.ImageResources; import org.tizen.emulator.manager.resources.PatchImageResources; import org.tizen.emulator.manager.resources.StringResources; import org.tizen.emulator.manager.tool.CheckVirtualization; +import org.tizen.emulator.manager.ui.detail.DetailViewItem; import org.tizen.emulator.manager.ui.widgets.ImageButton; import org.tizen.emulator.manager.ui.widgets.ImageLabel; import org.tizen.emulator.manager.vms.VMPropertyValue; @@ -52,7 +53,7 @@ public class THWSupportItem extends DetailViewItem { private boolean newGPUSupport; @Override - protected void init() { + public void init() { title = "HW Support"; count = 2; } diff --git a/src/org/tizen/emulator/manager/ui/detail/TNameTextItem.java b/mobile-plugin/src/org/tizen/emulator/manager/ui/detail/mobile/TNameTextItem.java similarity index 97% rename from src/org/tizen/emulator/manager/ui/detail/TNameTextItem.java rename to mobile-plugin/src/org/tizen/emulator/manager/ui/detail/mobile/TNameTextItem.java index a43fdc0..3aad9b3 100644 --- a/src/org/tizen/emulator/manager/ui/detail/TNameTextItem.java +++ b/mobile-plugin/src/org/tizen/emulator/manager/ui/detail/mobile/TNameTextItem.java @@ -27,7 +27,7 @@ * */ -package org.tizen.emulator.manager.ui.detail; +package org.tizen.emulator.manager.ui.detail.mobile; import java.io.File; @@ -56,6 +56,8 @@ import org.tizen.emulator.manager.resources.PatchImageResources; import org.tizen.emulator.manager.ui.MainDialog; import org.tizen.emulator.manager.ui.MenuHandling; import org.tizen.emulator.manager.ui.VMsMainView; +import org.tizen.emulator.manager.ui.detail.DetailViewItem; +import org.tizen.emulator.manager.ui.detail.ItemChangeState; import org.tizen.emulator.manager.ui.dialog.MessageDialog; import org.tizen.emulator.manager.ui.widgets.ImageButton; import org.tizen.emulator.manager.ui.widgets.ImageLabel; @@ -232,10 +234,10 @@ public class TNameTextItem extends DetailViewItem { case SWT.CR: case SWT.KEYPAD_CR: ///TODO - getListener().ChangeState(State.CREATE); + getListener().ChangeState(ItemChangeState.CREATE); break; case SWT.ESC: - getListener().ChangeState(State.CANCEL); + getListener().ChangeState(ItemChangeState.CANCEL); break; default: // TODO diff --git a/src/org/tizen/emulator/manager/ui/detail/TRAMItem.java b/mobile-plugin/src/org/tizen/emulator/manager/ui/detail/mobile/TRAMItem.java similarity index 97% rename from src/org/tizen/emulator/manager/ui/detail/TRAMItem.java rename to mobile-plugin/src/org/tizen/emulator/manager/ui/detail/mobile/TRAMItem.java index 365dbfa..861a222 100644 --- a/src/org/tizen/emulator/manager/ui/detail/TRAMItem.java +++ b/mobile-plugin/src/org/tizen/emulator/manager/ui/detail/mobile/TRAMItem.java @@ -27,7 +27,7 @@ * */ -package org.tizen.emulator.manager.ui.detail; +package org.tizen.emulator.manager.ui.detail.mobile; import org.eclipse.swt.SWT; import org.eclipse.swt.events.SelectionEvent; @@ -40,6 +40,7 @@ import org.tizen.emulator.manager.resources.ColorResources; import org.tizen.emulator.manager.resources.FontResources; import org.tizen.emulator.manager.resources.ImageResources; import org.tizen.emulator.manager.resources.PatchImageResources; +import org.tizen.emulator.manager.ui.detail.DetailViewItem; import org.tizen.emulator.manager.ui.widgets.ImageCombo; import org.tizen.emulator.manager.ui.widgets.ImageLabel; import org.tizen.emulator.manager.ui.widgets.WSTATE; @@ -50,7 +51,7 @@ public class TRAMItem extends DetailViewItem { private int newSize; @Override - protected void init() { + public void init() { title = "RAM Size"; count = 1; } diff --git a/src/org/tizen/emulator/manager/ui/detail/TTouchPointItem.java b/mobile-plugin/src/org/tizen/emulator/manager/ui/detail/mobile/TTouchPointItem.java similarity index 95% rename from src/org/tizen/emulator/manager/ui/detail/TTouchPointItem.java rename to mobile-plugin/src/org/tizen/emulator/manager/ui/detail/mobile/TTouchPointItem.java index 0a12c14..3da5e80 100644 --- a/src/org/tizen/emulator/manager/ui/detail/TTouchPointItem.java +++ b/mobile-plugin/src/org/tizen/emulator/manager/ui/detail/mobile/TTouchPointItem.java @@ -27,19 +27,20 @@ * */ -package org.tizen.emulator.manager.ui.detail; +package org.tizen.emulator.manager.ui.detail.mobile; import org.eclipse.swt.SWT; import org.eclipse.swt.layout.FormAttachment; import org.eclipse.swt.layout.FormData; import org.tizen.emulator.manager.resources.PatchImageResources; +import org.tizen.emulator.manager.ui.detail.DetailViewItem; import org.tizen.emulator.manager.ui.widgets.ImageLabel; import org.tizen.emulator.manager.vms.VMPropertyValue; public class TTouchPointItem extends DetailViewItem { private int touchPointValue; @Override - protected void init() { + public void init() { title = "Max Touch Point"; count = 1; } diff --git a/src/org/tizen/emulator/manager/ui/detail/VMResources.java b/mobile-plugin/src/org/tizen/emulator/manager/ui/detail/mobile/VMResources.java similarity index 98% rename from src/org/tizen/emulator/manager/ui/detail/VMResources.java rename to mobile-plugin/src/org/tizen/emulator/manager/ui/detail/mobile/VMResources.java index 77f4edc..d8faf2b 100644 --- a/src/org/tizen/emulator/manager/ui/detail/VMResources.java +++ b/mobile-plugin/src/org/tizen/emulator/manager/ui/detail/mobile/VMResources.java @@ -28,7 +28,7 @@ * */ -package org.tizen.emulator.manager.ui.detail; +package org.tizen.emulator.manager.ui.detail.mobile; import java.util.ArrayList; @@ -46,6 +46,7 @@ class StringArrayResource public StringArrayResource() { list = new ArrayList(); + list.clear(); } public void add(int index, String element) diff --git a/standard.xml b/template/standard.xml similarity index 100% rename from standard.xml rename to template/standard.xml diff --git a/test/tizen_vms/arm/test1/test1.xml b/test/tizen_vms/arm/test1/test1.xml deleted file mode 100644 index 2215293..0000000 --- a/test/tizen_vms/arm/test1/test1.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - test1 - ARM - - baseDiskImage - currentDiskImage - - - - - NONE - - - path - - true - - - - - 480 - 800 - - 2070 - - - - - - 512 - - - diff --git a/test/tizen_vms/arm/test2/test2.xml b/test/tizen_vms/arm/test2/test2.xml deleted file mode 100644 index 14fb33c..0000000 --- a/test/tizen_vms/arm/test2/test2.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - test2 - ARM - - baseDiskImage - currentDiskImage - - - - - NONE - - - true - - - - - 720 - 1280 - - 2070 - - - - - - 512 - - - diff --git a/test/tizen_vms/x86/test1/test1.xml b/test/tizen_vms/x86/test1/test1.xml deleted file mode 100644 index 34f758d..0000000 --- a/test/tizen_vms/x86/test1/test1.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - test1 - x86 - - baseDiskImage - currentDiskImage - - - - - NONE - - - true - - - - - 480 - 800 - - 2070 - - - - - - 512 - - - diff --git a/test/tizen_vms/x86/test2/test2.xml b/test/tizen_vms/x86/test2/test2.xml deleted file mode 100644 index d30cbac..0000000 --- a/test/tizen_vms/x86/test2/test2.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - test2 - x86 - - baseDiskImage - currentDiskImage - - - - - NONE - - - path - - true - - - - - 480 - 800 - - 207 - - emul_480x800 - - - - - - - 512 - - - diff --git a/test/tizen_vms/x86/test3/test3.xml b/test/tizen_vms/x86/test3/test3.xml deleted file mode 100644 index ebeb450..0000000 --- a/test/tizen_vms/x86/test3/test3.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - test3 - x86 - - baseDiskImage - currentDiskImage - - - - - NONE - - - path - - true - - - - - 600 - 1024 - - 224 - - emul_600x1024 - - - - - - - 512 - - - diff --git a/test/tizen_vms/x86/test4/test4.xml b/test/tizen_vms/x86/test4/test4.xml deleted file mode 100644 index 7eb5a8e..0000000 --- a/test/tizen_vms/x86/test4/test4.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - test4 - x86 - - baseDiskImage - currentDiskImage - - - - - NONE - - - true - - - - - 720 - 1280 - - 2070 - - - - - - 512 - - -