Author: rob.stryker(a)jboss.com Date: 2008-02-22 19:59:33 -0500 (Fri, 22 Feb 2008) New Revision: 6551 Added: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbAction.java Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbFileSet.java trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbFolder.java trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackage.java 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 Log: JBIDE-476 Adding actions to schema and base xb impl Added: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbAction.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbAction.java (rev 0) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbAction.java 2008-02-23 00:59:33 UTC (rev 6551) @@ -0,0 +1,36 @@ +package org.jboss.ide.eclipse.archives.core.model.internal.xb; + +public class XbAction extends XbPackageNodeWithProperties { + private String time, type; + + public XbAction() { + super(); + } + + public XbAction(XbAction action) { + super(action); + copyFrom(action); + } + + public void copyFrom (XbAction node) { + super.copyFrom(node); + this.time = node.time == null ? null : new String(node.time); + this.type = node.type == null ? null : new String(node.type); + } + + public String getTime() { + return time; + } + + public void setTime(String time) { + this.time = time; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } +} Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbFileSet.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbFileSet.java 2008-02-22 23:58:09 UTC (rev 6550) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbFileSet.java 2008-02-23 00:59:33 UTC (rev 6551) @@ -30,7 +30,6 @@ public XbFileSet () { super(); - inWorkspace = true; } public XbFileSet (XbFileSet fileset) @@ -41,6 +40,7 @@ public void copyFrom (XbFileSet fileset) { + super.copyFrom(fileset); this.dir = fileset.dir == null ? null : new String(fileset.dir); this.includes = fileset.includes == null ? null : new String(fileset.includes); this.excludes = fileset.excludes == null ? null : new String(fileset.excludes); Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbFolder.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbFolder.java 2008-02-22 23:58:09 UTC (rev 6550) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbFolder.java 2008-02-23 00:59:33 UTC (rev 6551) @@ -40,6 +40,7 @@ public void copyFrom (XbFolder folder) { + super.copyFrom(folder); this.name = folder.name == null ? null : new String(folder.name); } Modified: trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackage.java =================================================================== --- trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackage.java 2008-02-22 23:58:09 UTC (rev 6550) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackage.java 2008-02-23 00:59:33 UTC (rev 6551) @@ -42,6 +42,7 @@ public void copyFrom (XbPackage pkg) { + super.copyFrom(pkg); this.name = pkg.name == null ? null: new String(pkg.name); this.packageType = pkg.packageType == null ? null : new String(pkg.packageType); this.toDir = pkg.toDir == null ? null : new String(pkg.toDir); @@ -53,6 +54,10 @@ return new XbPackage(this); } + public List getActions() { + return getChildren(XbAction.class); + } + public List getPackages () { return getChildren(XbPackage.class); 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-02-22 23:58:09 UTC (rev 6550) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackages.java 2008-02-23 00:59:33 UTC (rev 6551) @@ -32,6 +32,7 @@ public XbPackages (XbPackages packages) { super(packages); + copyFrom(packages); } protected Object clone() throws CloneNotSupportedException { 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-02-22 23:58:09 UTC (rev 6550) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/main/org/jboss/ide/eclipse/archives/core/model/internal/xb/XbPackagesObjectProvider.java 2008-02-23 00:59:33 UTC (rev 6551) @@ -38,26 +38,24 @@ protected Object getNodeChildren(XbPackageNode node, String name) { - if ("package".equals(name)) - { + if ("package".equals(name)) { return node.getChildren(XbPackage.class); - } - else if ("folder".equals(name)) - { + } + else if ("folder".equals(name)) { return node.getChildren(XbFolder.class); } - else if ("fileset".equals(name)) - { + else if ("fileset".equals(name)) { return node.getChildren(XbFileSet.class); } - else if ("properties".equals(name) && node instanceof XbPackageNodeWithProperties) - { + else if ("properties".equals(name) && node instanceof XbPackageNodeWithProperties) { return ((XbPackageNodeWithProperties)node).getProperties(); } - else if ("property".equals(name) && node instanceof XbProperties) - { + else if ("property".equals(name) && node instanceof XbProperties) { return ((XbProperties)node).getProperties().getPropertyElements(); } + else if( "buildAction".equals(name) && node instanceof XbPackage) { + return ((XbPackage)node).getActions(); + } return null; } @@ -77,9 +75,9 @@ if (object instanceof XbPackage) { XbPackage pkg = (XbPackage)object; - if("id".equals(localName)) { + if("id".equals(localName)) return pkg.getId(); - } else if ("type".equals(localName)) + else if ("type".equals(localName)) return pkg.getPackageType(); else if ("name".equals(localName)) return pkg.getName(); 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-02-22 23:58:09 UTC (rev 6550) +++ trunk/core/plugins/org.jboss.ide.eclipse.archives.core/src/xml/packages.xsd 2008-02-23 00:59:33 UTC (rev 6551) @@ -46,7 +46,9 @@ </xsd:appinfo> </xsd:annotation> - <xsd:sequence> + <xsd:sequence> + <xsd:element maxOccurs="unbounded" minOccurs="0" + name="buildAction" type="build-action-type" /> <xsd:element maxOccurs="unbounded" minOccurs="0" name="package" type="package-type" /> <xsd:element maxOccurs="unbounded" minOccurs="0" @@ -102,6 +104,24 @@ <xsd:attribute name="name" type="xsd:string" use="required"/> <xsd:attribute name="value" type="xsd:string" use="required"/> </xsd:complexType> + + + <xsd:complexType name="build-action-type"> + <xsd:annotation> + <xsd:appinfo> + <jbxb:class impl="org.jboss.ide.eclipse.archives.core.model.internal.xb.XbAction"/> + <jbxb:addMethod name="addChild"/> + </xsd:appinfo> + </xsd:annotation> + + <xsd:sequence> + <xsd:element maxOccurs="1" minOccurs="0" name="properties" type="properties-type"/> + </xsd:sequence> + + <xsd:attribute name="time" type="xsd:string" use="required"/> + <xsd:attribute name="type" type="xsd:string" use="required"/> + </xsd:complexType> + <xsd:complexType name="folder-type"> <xsd:annotation> @@ -136,7 +156,8 @@ <xsd:attribute name="dir" type="xsd:string" use="required"/> <xsd:attribute name="includes" type="xsd:string" use="required"/> <xsd:attribute name="excludes" type="xsd:string" use="optional"/> - <xsd:attribute name="inWorkspace" type="xsd:boolean" use="optional" default="true"/> + <xsd:attribute name="inWorkspace" type="xsd:boolean" use="optional" default="true"/> + <xsd:attribute name="flatten" type="xsd:boolean" use="optional" default="false"/> </xsd:complexType> </xsd:schema>