Author: rob.stryker(a)jboss.com Date: 2008-08-04 16:41:45 -0400 (Mon, 04 Aug 2008) New Revision: 9504 Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackages.java trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackagesObjectProvider.java trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/xml/packages.xsd trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/XBUnmarshallTest.java Log: JBIDE-1406 - allowing version id's for the descriptor Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackages.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackages.java 2008-08-04 18:40:06 UTC (rev 9503) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackages.java 2008-08-04 20:41:45 UTC (rev 9504) @@ -25,22 +25,33 @@ public class XbPackages extends XbPackageNodeWithProperties { + private float version; public XbPackages () { super(); } - public XbPackages (XbPackages packages) - { + public XbPackages (XbPackages packages) { super(packages); copyFrom(packages); } - + public void copyFrom (XbPackages node) { + super.copyFrom(node); + this.version = node.version; + } + protected Object clone() throws CloneNotSupportedException { return new XbPackages(this); } - public List getPackages () - { + public List getPackages () { return getChildren(XbPackage.class); } + + public float getVersion() { + return version; + } + + public void setVersion(float version) { + this.version = version; + } } Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackagesObjectProvider.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackagesObjectProvider.java 2008-08-04 18:40:06 UTC (rev 9503) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackagesObjectProvider.java 2008-08-04 20:41:45 UTC (rev 9504) @@ -72,7 +72,11 @@ public Object getAttributeValue(Object object, MarshallingContext context, String namespaceURI, String localName) { - if (object instanceof XbPackage) { + if( object instanceof XbPackages ) { + if("version".equals(localName)) + return ((XbPackages)object).getVersion(); + } + else if (object instanceof XbPackage) { XbPackage pkg = (XbPackage)object; if("id".equals(localName)) return pkg.getId(); Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/xml/packages.xsd =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/xml/packages.xsd 2008-08-04 18:40:06 UTC (rev 9503) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/xml/packages.xsd 2008-08-04 20:41:45 UTC (rev 9504) @@ -34,7 +34,8 @@ <xsd:sequence> <xsd:element maxOccurs="unbounded" minOccurs="0" name="package" type="package-type"/> <xsd:element maxOccurs="1" minOccurs="0" name="properties" type="properties-type"/> - </xsd:sequence> + </xsd:sequence> + <xsd:attribute name="version" type="xsd:float" use="optional"/> </xsd:complexType> <xsd:complexType name="package-type"> Modified: trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/XBUnmarshallTest.java =================================================================== --- trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/XBUnmarshallTest.java 2008-08-04 18:40:06 UTC (rev 9503) +++ trunk/core/tests/org.jboss.ide.eclipse.archives.test/src/org/jboss/ide/eclipse/archives/test/model/XBUnmarshallTest.java 2008-08-04 20:41:45 UTC (rev 9504) @@ -191,6 +191,11 @@ parse("MissingActionType.xml", false, failedMissingRequiredAtt("type")); } + public void testReadPackagesVersion() { + XbPackages packs = parse("ReadVersion.xml", true, failedFalsePositiveRequiredAtt("exploded")); + assertEquals(new Float(packs.getVersion()), new Float(1.2)); + } + /* * Utility