From a7dda5f86f83326f42de9ff3215b0c32960ce4b8 Mon Sep 17 00:00:00 2001 From: "jihye424.kim" Date: Fri, 7 Aug 2015 15:30:19 +0900 Subject: [PATCH] VMProperty: add platform name attribute - custom vm use product platform of latest version Change-Id: Idb0c8d18b74b60b067b2a02e2dc0d14005d4b27b Signed-off-by: jihye424.kim --- .../manager/vms/xml/AdvancedOptionType.java | 4 +- .../manager/vms/xml/BaseInformationType.java | 39 +++++- .../tizen/emulator/manager/vms/xml/CpuType.java | 6 +- .../tizen/emulator/manager/vms/xml/DeviceType.java | 4 +- .../manager/vms/xml/DiskImageFormatType.java | 8 +- .../emulator/manager/vms/xml/DisplayType.java | 6 +- .../manager/vms/xml/EmulatorConfiguration.java | 4 +- .../manager/vms/xml/ExtendedOptionType.java | 6 +- .../emulator/manager/vms/xml/ObjectFactory.java | 142 ++++++++++----------- .../tizen/emulator/manager/vms/xml/OciType.java | 4 +- .../tizen/emulator/manager/vms/xml/OptionType.java | 8 +- .../tizen/emulator/manager/vms/xml/RamType.java | 6 +- .../tizen/emulator/manager/vms/xml/SkinType.java | 4 +- .../emulator/manager/vms/xml/SubOptionType.java | 8 +- .../tizen/emulator/manager/vms/xml/TouchType.java | 6 +- .../emulator/manager/vms/xml/UsabilityType.java | 84 ++++++------ .../emulator/manager/vms/xml/package-info.java | 4 +- .../tizen/emulator/manager/platform/Profile.java | 27 +++- src/org/tizen/emulator/manager/vms/Creator.java | 1 + src/org/tizen/emulator/manager/vms/VMProperty.java | 16 ++- xsd/em.xsd | 1 + 21 files changed, 222 insertions(+), 166 deletions(-) diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/AdvancedOptionType.java b/jaxb_src/org/tizen/emulator/manager/vms/xml/AdvancedOptionType.java index 3db0c68..3c4d507 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/AdvancedOptionType.java +++ b/jaxb_src/org/tizen/emulator/manager/vms/xml/AdvancedOptionType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.08.08 at 10:35:05 오후 KST +// Generated on: 2015.08.07 at 02:46:44 PM KST // diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/BaseInformationType.java b/jaxb_src/org/tizen/emulator/manager/vms/xml/BaseInformationType.java index 2012002..bd12faf 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/BaseInformationType.java +++ b/jaxb_src/org/tizen/emulator/manager/vms/xml/BaseInformationType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.08.08 at 10:35:05 오후 KST +// Generated on: 2015.08.07 at 02:46:44 PM KST // @@ -36,6 +36,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; * </restriction> * </simpleType> * </element> + * <element name="platform" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="diskImage"> * <complexType> * <complexContent> @@ -72,6 +73,7 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; @XmlType(name = "baseInformationType", propOrder = { "name", "architecture", + "platform", "diskImage" }) public class BaseInformationType { @@ -81,6 +83,7 @@ public class BaseInformationType { @XmlElement(required = true) @XmlJavaTypeAdapter(CollapsedStringAdapter.class) protected String architecture; + protected String platform; @XmlElement(required = true) protected BaseInformationType.DiskImage diskImage; @@ -133,6 +136,30 @@ public class BaseInformationType { } /** + * Gets the value of the platform property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getPlatform() { + return platform; + } + + /** + * Sets the value of the platform property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setPlatform(String value) { + this.platform = value; + } + + /** * Gets the value of the diskImage property. * * @return @@ -203,14 +230,14 @@ public class BaseInformationType { protected DiskImageFormatType currentDiskImage; @XmlElement(required = true) protected DiskImageFormatType swapDiskImage; - @XmlAttribute + @XmlAttribute(name = "profile") protected String profile; - @XmlAttribute(required = true) + @XmlAttribute(name = "type", required = true) @XmlJavaTypeAdapter(CollapsedStringAdapter.class) protected String type; - @XmlAttribute + @XmlAttribute(name = "base") protected String base; - @XmlAttribute + @XmlAttribute(name = "version") protected String version; /** diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/CpuType.java b/jaxb_src/org/tizen/emulator/manager/vms/xml/CpuType.java index 1281333..23e6fa2 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/CpuType.java +++ b/jaxb_src/org/tizen/emulator/manager/vms/xml/CpuType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.08.08 at 10:35:05 오후 KST +// Generated on: 2015.08.07 at 02:46:44 PM KST // @@ -116,7 +116,7 @@ public class CpuType { @XmlValue protected int value; - @XmlAttribute(required = true) + @XmlAttribute(name = "unit", required = true) @XmlJavaTypeAdapter(CollapsedStringAdapter.class) protected String unit; diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/DeviceType.java b/jaxb_src/org/tizen/emulator/manager/vms/xml/DeviceType.java index e72ceb1..189c954 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/DeviceType.java +++ b/jaxb_src/org/tizen/emulator/manager/vms/xml/DeviceType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.08.08 at 10:35:05 오후 KST +// Generated on: 2015.08.07 at 02:46:44 PM KST // diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/DiskImageFormatType.java b/jaxb_src/org/tizen/emulator/manager/vms/xml/DiskImageFormatType.java index ea2b10a..aabe725 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/DiskImageFormatType.java +++ b/jaxb_src/org/tizen/emulator/manager/vms/xml/DiskImageFormatType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.08.08 at 10:35:05 오후 KST +// Generated on: 2015.08.07 at 02:46:44 PM KST // @@ -51,10 +51,10 @@ public class DiskImageFormatType { @XmlValue protected String value; - @XmlAttribute(required = true) + @XmlAttribute(name = "format", required = true) @XmlJavaTypeAdapter(CollapsedStringAdapter.class) protected String format; - @XmlAttribute + @XmlAttribute(name = "version") protected String version; /** diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/DisplayType.java b/jaxb_src/org/tizen/emulator/manager/vms/xml/DisplayType.java index 797279a..31644f7 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/DisplayType.java +++ b/jaxb_src/org/tizen/emulator/manager/vms/xml/DisplayType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.08.08 at 10:35:05 오후 KST +// Generated on: 2015.08.07 at 02:46:44 PM KST // @@ -193,7 +193,7 @@ public class DisplayType { @XmlValue protected int value; - @XmlAttribute(required = true) + @XmlAttribute(name = "unit", required = true) @XmlJavaTypeAdapter(CollapsedStringAdapter.class) protected String unit; diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/EmulatorConfiguration.java b/jaxb_src/org/tizen/emulator/manager/vms/xml/EmulatorConfiguration.java index e05b751..a252515 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/EmulatorConfiguration.java +++ b/jaxb_src/org/tizen/emulator/manager/vms/xml/EmulatorConfiguration.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.08.08 at 10:35:05 오후 KST +// Generated on: 2015.08.07 at 02:46:44 PM KST // diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/ExtendedOptionType.java b/jaxb_src/org/tizen/emulator/manager/vms/xml/ExtendedOptionType.java index 60ff6a1..309a03d 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/ExtendedOptionType.java +++ b/jaxb_src/org/tizen/emulator/manager/vms/xml/ExtendedOptionType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.08.08 at 10:35:05 오후 KST +// Generated on: 2015.08.07 at 02:46:44 PM KST // @@ -40,7 +40,7 @@ public class ExtendedOptionType { @XmlValue protected String value; - @XmlAttribute(required = true) + @XmlAttribute(name = "name", required = true) protected String name; /** diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/ObjectFactory.java b/jaxb_src/org/tizen/emulator/manager/vms/xml/ObjectFactory.java index 7b5435d..a42f502 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/ObjectFactory.java +++ b/jaxb_src/org/tizen/emulator/manager/vms/xml/ObjectFactory.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.08.08 at 10:35:05 오후 KST +// Generated on: 2015.08.07 at 02:46:44 PM KST // @@ -37,187 +37,187 @@ public class ObjectFactory { } /** - * Create an instance of {@link SubOptionType } + * Create an instance of {@link CpuType } * */ - public SubOptionType createSubOptionType() { - return new SubOptionType(); + public CpuType createCpuType() { + return new CpuType(); } /** - * Create an instance of {@link BaseInformationType } + * Create an instance of {@link DisplayType } * */ - public BaseInformationType createBaseInformationType() { - return new BaseInformationType(); + public DisplayType createDisplayType() { + return new DisplayType(); } /** - * Create an instance of {@link CpuType } + * Create an instance of {@link RamType } * */ - public CpuType createCpuType() { - return new CpuType(); + public RamType createRamType() { + return new RamType(); } /** - * Create an instance of {@link CpuType.Value } + * Create an instance of {@link UsabilityType } * */ - public CpuType.Value createCpuTypeValue() { - return new CpuType.Value(); + public UsabilityType createUsabilityType() { + return new UsabilityType(); } /** - * Create an instance of {@link TouchType } + * Create an instance of {@link BaseInformationType } * */ - public TouchType createTouchType() { - return new TouchType(); + public BaseInformationType createBaseInformationType() { + return new BaseInformationType(); } /** - * Create an instance of {@link BaseInformationType.DiskImage } + * Create an instance of {@link EmulatorConfiguration } * */ - public BaseInformationType.DiskImage createBaseInformationTypeDiskImage() { - return new BaseInformationType.DiskImage(); + public EmulatorConfiguration createEmulatorConfiguration() { + return new EmulatorConfiguration(); } /** - * Create an instance of {@link UsabilityType.FileSharing } + * Create an instance of {@link DeviceType } * */ - public UsabilityType.FileSharing createUsabilityTypeFileSharing() { - return new UsabilityType.FileSharing(); + public DeviceType createDeviceType() { + return new DeviceType(); } /** - * Create an instance of {@link DisplayType.SkinPath } + * Create an instance of {@link SkinType } * */ - public DisplayType.SkinPath createDisplayTypeSkinPath() { - return new DisplayType.SkinPath(); + public SkinType createSkinType() { + return new SkinType(); } /** - * Create an instance of {@link RamType.Size } + * Create an instance of {@link OciType } * */ - public RamType.Size createRamTypeSize() { - return new RamType.Size(); + public OciType createOciType() { + return new OciType(); } /** - * Create an instance of {@link DisplayType.Density } + * Create an instance of {@link ExtendedOptionType } * */ - public DisplayType.Density createDisplayTypeDensity() { - return new DisplayType.Density(); + public ExtendedOptionType createExtendedOptionType() { + return new ExtendedOptionType(); } /** - * Create an instance of {@link DeviceType } + * Create an instance of {@link AdvancedOptionType } * */ - public DeviceType createDeviceType() { - return new DeviceType(); + public AdvancedOptionType createAdvancedOptionType() { + return new AdvancedOptionType(); } /** - * Create an instance of {@link OptionType } + * Create an instance of {@link DiskImageFormatType } * */ - public OptionType createOptionType() { - return new OptionType(); + public DiskImageFormatType createDiskImageFormatType() { + return new DiskImageFormatType(); } /** - * Create an instance of {@link OciType } + * Create an instance of {@link TouchType } * */ - public OciType createOciType() { - return new OciType(); + public TouchType createTouchType() { + return new TouchType(); } /** - * Create an instance of {@link DiskImageFormatType } + * Create an instance of {@link SubOptionType } * */ - public DiskImageFormatType createDiskImageFormatType() { - return new DiskImageFormatType(); + public SubOptionType createSubOptionType() { + return new SubOptionType(); } /** - * Create an instance of {@link UsabilityType.Logging } + * Create an instance of {@link OptionType } * */ - public UsabilityType.Logging createUsabilityTypeLogging() { - return new UsabilityType.Logging(); + public OptionType createOptionType() { + return new OptionType(); } /** - * Create an instance of {@link ExtendedOptionType } + * Create an instance of {@link CpuType.Value } * */ - public ExtendedOptionType createExtendedOptionType() { - return new ExtendedOptionType(); + public CpuType.Value createCpuTypeValue() { + return new CpuType.Value(); } /** - * Create an instance of {@link RamType } + * Create an instance of {@link DisplayType.Resolution } * */ - public RamType createRamType() { - return new RamType(); + public DisplayType.Resolution createDisplayTypeResolution() { + return new DisplayType.Resolution(); } /** - * Create an instance of {@link UsabilityType } + * Create an instance of {@link DisplayType.Density } * */ - public UsabilityType createUsabilityType() { - return new UsabilityType(); + public DisplayType.Density createDisplayTypeDensity() { + return new DisplayType.Density(); } /** - * Create an instance of {@link DisplayType } + * Create an instance of {@link DisplayType.SkinPath } * */ - public DisplayType createDisplayType() { - return new DisplayType(); + public DisplayType.SkinPath createDisplayTypeSkinPath() { + return new DisplayType.SkinPath(); } /** - * Create an instance of {@link EmulatorConfiguration } + * Create an instance of {@link RamType.Size } * */ - public EmulatorConfiguration createEmulatorConfiguration() { - return new EmulatorConfiguration(); + public RamType.Size createRamTypeSize() { + return new RamType.Size(); } /** - * Create an instance of {@link SkinType } + * Create an instance of {@link UsabilityType.Logging } * */ - public SkinType createSkinType() { - return new SkinType(); + public UsabilityType.Logging createUsabilityTypeLogging() { + return new UsabilityType.Logging(); } /** - * Create an instance of {@link DisplayType.Resolution } + * Create an instance of {@link UsabilityType.FileSharing } * */ - public DisplayType.Resolution createDisplayTypeResolution() { - return new DisplayType.Resolution(); + public UsabilityType.FileSharing createUsabilityTypeFileSharing() { + return new UsabilityType.FileSharing(); } /** - * Create an instance of {@link AdvancedOptionType } + * Create an instance of {@link BaseInformationType.DiskImage } * */ - public AdvancedOptionType createAdvancedOptionType() { - return new AdvancedOptionType(); + public BaseInformationType.DiskImage createBaseInformationTypeDiskImage() { + return new BaseInformationType.DiskImage(); } } diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/OciType.java b/jaxb_src/org/tizen/emulator/manager/vms/xml/OciType.java index bd6fb8a..b75fb96 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/OciType.java +++ b/jaxb_src/org/tizen/emulator/manager/vms/xml/OciType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.08.08 at 10:35:05 오후 KST +// Generated on: 2015.08.07 at 02:46:44 PM KST // diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/OptionType.java b/jaxb_src/org/tizen/emulator/manager/vms/xml/OptionType.java index cee2a4f..a0a88ce 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/OptionType.java +++ b/jaxb_src/org/tizen/emulator/manager/vms/xml/OptionType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.08.08 at 10:35:05 오후 KST +// Generated on: 2015.08.07 at 02:46:44 PM KST // @@ -44,9 +44,9 @@ import javax.xml.bind.annotation.XmlType; public class OptionType { protected List subOption; - @XmlAttribute(required = true) + @XmlAttribute(name = "name", required = true) protected String name; - @XmlAttribute + @XmlAttribute(name = "value") protected String value; /** diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/RamType.java b/jaxb_src/org/tizen/emulator/manager/vms/xml/RamType.java index cff667c..c288796 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/RamType.java +++ b/jaxb_src/org/tizen/emulator/manager/vms/xml/RamType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.08.08 at 10:35:05 오후 KST +// Generated on: 2015.08.07 at 02:46:44 PM KST // @@ -116,7 +116,7 @@ public class RamType { @XmlValue protected int value; - @XmlAttribute(required = true) + @XmlAttribute(name = "unit", required = true) @XmlJavaTypeAdapter(CollapsedStringAdapter.class) protected String unit; diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/SkinType.java b/jaxb_src/org/tizen/emulator/manager/vms/xml/SkinType.java index 99318e7..a9d3b93 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/SkinType.java +++ b/jaxb_src/org/tizen/emulator/manager/vms/xml/SkinType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.08.08 at 10:35:05 오후 KST +// Generated on: 2015.08.07 at 02:46:44 PM KST // diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/SubOptionType.java b/jaxb_src/org/tizen/emulator/manager/vms/xml/SubOptionType.java index 1c86998..5f14ed5 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/SubOptionType.java +++ b/jaxb_src/org/tizen/emulator/manager/vms/xml/SubOptionType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.08.08 at 10:35:05 오후 KST +// Generated on: 2015.08.07 at 02:46:44 PM KST // @@ -36,9 +36,9 @@ import javax.xml.bind.annotation.XmlType; @XmlType(name = "subOptionType") public class SubOptionType { - @XmlAttribute(required = true) + @XmlAttribute(name = "name", required = true) protected String name; - @XmlAttribute + @XmlAttribute(name = "value") protected String value; /** diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/TouchType.java b/jaxb_src/org/tizen/emulator/manager/vms/xml/TouchType.java index 463d7cd..42fe1f6 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/TouchType.java +++ b/jaxb_src/org/tizen/emulator/manager/vms/xml/TouchType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.08.08 at 10:35:05 오후 KST +// Generated on: 2015.08.07 at 02:46:44 PM KST // @@ -40,7 +40,7 @@ import javax.xml.bind.annotation.XmlType; @XmlType(name = "touchType") public class TouchType { - @XmlAttribute(required = true) + @XmlAttribute(name = "maxTouchPoint", required = true) protected int maxTouchPoint; /** diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/UsabilityType.java b/jaxb_src/org/tizen/emulator/manager/vms/xml/UsabilityType.java index cbb1b6d..0e71c6d 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/UsabilityType.java +++ b/jaxb_src/org/tizen/emulator/manager/vms/xml/UsabilityType.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.08.08 at 10:35:05 오후 KST +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 +// See http://java.sun.com/xml/jaxb +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2015.08.07 at 02:46:44 PM KST // @@ -18,9 +18,9 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; /** *

Java class for usabilityType complex type. - * + * *

The following schema fragment specifies the expected content contained within this class. - * + * * 

  * <complexType name="usabilityType">
  *   <complexContent>
@@ -68,8 +68,8 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  *   </complexContent>
  * </complexType>
  *
- * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "usabilityType", propOrder = { @@ -94,11 +94,11 @@ public class UsabilityType { /** * Gets the value of the logging property. - * + * * @return * possible object is * {@link UsabilityType.Logging } - * + * */ public UsabilityType.Logging getLogging() { return logging; @@ -106,11 +106,11 @@ public class UsabilityType { /** * Sets the value of the logging property. - * + * * @param value * allowed object is * {@link UsabilityType.Logging } - * + * */ public void setLogging(UsabilityType.Logging value) { this.logging = value; @@ -118,11 +118,11 @@ public class UsabilityType { /** * Gets the value of the fileSharing property. - * + * * @return * possible object is * {@link UsabilityType.FileSharing } - * + * */ public UsabilityType.FileSharing getFileSharing() { return fileSharing; @@ -130,11 +130,11 @@ public class UsabilityType { /** * Sets the value of the fileSharing property. - * + * * @param value * allowed object is * {@link UsabilityType.FileSharing } - * + * */ public void setFileSharing(UsabilityType.FileSharing value) { this.fileSharing = value; @@ -142,7 +142,7 @@ public class UsabilityType { /** * Gets the value of the hwVirtualization property. - * + * */ public boolean isHwVirtualization() { return hwVirtualization; @@ -150,7 +150,7 @@ public class UsabilityType { /** * Sets the value of the hwVirtualization property. - * + * */ public void setHwVirtualization(boolean value) { this.hwVirtualization = value; @@ -158,7 +158,7 @@ public class UsabilityType { /** * Gets the value of the hwGLAcceleration property. - * + * */ public boolean isHwGLAcceleration() { return hwGLAcceleration; @@ -166,7 +166,7 @@ public class UsabilityType { /** * Sets the value of the hwGLAcceleration property. - * + * */ public void setHwGLAcceleration(boolean value) { this.hwGLAcceleration = value; @@ -174,7 +174,7 @@ public class UsabilityType { /** * Gets the value of the supportSuspend property. - * + * */ public boolean isSupportSuspend() { return supportSuspend; @@ -182,7 +182,7 @@ public class UsabilityType { /** * Sets the value of the supportSuspend property. - * + * */ public void setSupportSuspend(boolean value) { this.supportSuspend = value; @@ -190,11 +190,11 @@ public class UsabilityType { /** * Gets the value of the advancedOptions property. - * + * * @return * possible object is * {@link String } - * + * */ public String getAdvancedOptions() { return advancedOptions; @@ -202,11 +202,11 @@ public class UsabilityType { /** * Sets the value of the advancedOptions property. - * + * * @param value * allowed object is * {@link String } - * + * */ public void setAdvancedOptions(String value) { this.advancedOptions = value; @@ -215,9 +215,9 @@ public class UsabilityType { /** *

Java class for anonymous complex type. - * + * *

The following schema fragment specifies the expected content contained within this class. - * + * * 

      * <complexType>
      *   <complexContent>
@@ -229,8 +229,8 @@ public class UsabilityType {
      *   </complexContent>
      * </complexType>
      *
- * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { @@ -242,11 +242,11 @@ public class UsabilityType { /** * Gets the value of the path property. - * + * * @return * possible object is * {@link String } - * + * */ public String getPath() { return path; @@ -254,11 +254,11 @@ public class UsabilityType { /** * Sets the value of the path property. - * + * * @param value * allowed object is * {@link String } - * + * */ public void setPath(String value) { this.path = value; @@ -269,9 +269,9 @@ public class UsabilityType { /** *

Java class for anonymous complex type. - * + * *

The following schema fragment specifies the expected content contained within this class. - * + * * 

      * <complexType>
      *   <complexContent>
@@ -294,8 +294,8 @@ public class UsabilityType {
      *   </complexContent>
      * </complexType>
      *
- * - * + * + * */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "", propOrder = { @@ -309,11 +309,11 @@ public class UsabilityType { /** * Gets the value of the level property. - * + * * @return * possible object is * {@link String } - * + * */ public String getLevel() { return level; @@ -321,11 +321,11 @@ public class UsabilityType { /** * Sets the value of the level property. - * + * * @param value * allowed object is * {@link String } - * + * */ public void setLevel(String value) { this.level = value; diff --git a/jaxb_src/org/tizen/emulator/manager/vms/xml/package-info.java b/jaxb_src/org/tizen/emulator/manager/vms/xml/package-info.java index cd71b24..7c31d5c 100644 --- a/jaxb_src/org/tizen/emulator/manager/vms/xml/package-info.java +++ b/jaxb_src/org/tizen/emulator/manager/vms/xml/package-info.java @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 // See http://java.sun.com/xml/jaxb // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2014.08.08 at 10:35:05 오후 KST +// Generated on: 2015.08.07 at 02:46:44 PM KST // @javax.xml.bind.annotation.XmlSchema(namespace = "http://www.tizen.org/em", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) diff --git a/src/org/tizen/emulator/manager/platform/Profile.java b/src/org/tizen/emulator/manager/platform/Profile.java index 2fb7104..0b3b393 100644 --- a/src/org/tizen/emulator/manager/platform/Profile.java +++ b/src/org/tizen/emulator/manager/platform/Profile.java @@ -268,8 +268,31 @@ public class Profile { } public int compareTo(Object o) { - String u = ((PlatformPair) o).prop.getVersion(); - return u.compareTo(this.prop.getVersion()); + Platform p = ((PlatformPair) o).prop; + String u = p.getVersion(); + int order = u.compareTo(this.prop.getVersion()); + if (order == 0) { + if (p.isChildPlatform()) { + if (!this.prop.isChildPlatform()) { + order = 1; + } else { + // product > partner > public + if (this.prop.getName().contains("product")) { + order = -1; + } else if (p.getName().contains("product")) { + order = 1; + } else if (this.prop.getName().contains("partner")) { + order = -1; + } else if (p.getName().contains("partner")) { + order = 1; + } + } + } else if (this.prop.isChildPlatform()) { + order = -1; + } + } + + return order; } } diff --git a/src/org/tizen/emulator/manager/vms/Creator.java b/src/org/tizen/emulator/manager/vms/Creator.java index 552a36a..35eeb2c 100644 --- a/src/org/tizen/emulator/manager/vms/Creator.java +++ b/src/org/tizen/emulator/manager/vms/Creator.java @@ -279,6 +279,7 @@ public class Creator { ec.getBaseInformation().setName(newVM.vmsName); ec.getBaseInformation().setArchitecture(newVM.baseImage.getCpu()); + ec.getBaseInformation().setPlatform(newVM.baseImage.getPlatformName()); ec.getBaseInformation().setDiskImage(factory.createBaseInformationTypeDiskImage()); if (newVM.baseImage.isStandard()) { diff --git a/src/org/tizen/emulator/manager/vms/VMProperty.java b/src/org/tizen/emulator/manager/vms/VMProperty.java index 51f7286..8d39691 100644 --- a/src/org/tizen/emulator/manager/vms/VMProperty.java +++ b/src/org/tizen/emulator/manager/vms/VMProperty.java @@ -246,13 +246,17 @@ public class VMProperty { } public String getImagePlatform() { - String version = getImageVersion(); - String profile = getImageProfile(); - if (version == null || profile == null) { - return ""; //$NON-NLS-1$ + if (configuration != null && configuration.getBaseInformation() != null + && configuration.getBaseInformation().getPlatform() != null) { + return configuration.getBaseInformation().getPlatform(); + } else { + String version = getImageVersion(); + String profile = getImageProfile(); + if (version == null || profile == null) { + return ""; //$NON-NLS-1$ + } + return profile + "-" + version; //$NON-NLS-1$ } - - return profile + "-" + version; //$NON-NLS-1$ } public boolean compareImage(BaseImage image) { diff --git a/xsd/em.xsd b/xsd/em.xsd index 46c344e..f483773 100644 --- a/xsd/em.xsd +++ b/xsd/em.xsd @@ -34,6 +34,7 @@ + -- 2.7.4