[jboss-cvs] jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/xb ...
Marshall Culpepper
mculpepper at jboss.com
Wed Nov 8 14:54:41 EST 2006
User: mculpepper
Date: 06/11/08 14:54:41
Modified: core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/xb
XbFileSet.java XbFolder.java XbPackage.java
XbPackageNodeWithProperties.java XbPackageNode.java
Log:
made a ton of bug fixes, re-modeled the working copy API to actually make sense (thanks rob!).. we're approaching a working implementation
Revision Changes Path
1.2 +5 -1 jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/xb/XbFileSet.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: XbFileSet.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/xb/XbFileSet.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- XbFileSet.java 6 Nov 2006 21:35:27 -0000 1.1
+++ XbFileSet.java 8 Nov 2006 19:54:41 -0000 1.2
@@ -35,7 +35,11 @@
public XbFileSet (XbFileSet fileset)
{
super(fileset);
+ copyFrom(fileset);
+ }
+ public void copyFrom (XbFileSet fileset)
+ {
this.dir = fileset.dir == null ? null : new String(fileset.dir);
this.file = fileset.file == null ? null : new String(fileset.file);
this.toFile = fileset.toFile == null ? null : new String(fileset.toFile);
1.2 +5 -1 jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/xb/XbFolder.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: XbFolder.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/xb/XbFolder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- XbFolder.java 6 Nov 2006 21:35:27 -0000 1.1
+++ XbFolder.java 8 Nov 2006 19:54:41 -0000 1.2
@@ -35,7 +35,11 @@
public XbFolder (XbFolder folder)
{
super(folder);
+ copyFrom(folder);
+ }
+ public void copyFrom (XbFolder folder)
+ {
this.name = folder.name == null ? null : new String(folder.name);
}
1.2 +5 -1 jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/xb/XbPackage.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: XbPackage.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/xb/XbPackage.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- XbPackage.java 6 Nov 2006 21:35:27 -0000 1.1
+++ XbPackage.java 8 Nov 2006 19:54:41 -0000 1.2
@@ -37,7 +37,11 @@
public XbPackage (XbPackage pkg)
{
super(pkg);
+ copyFrom (pkg);
+ }
+ public void copyFrom (XbPackage pkg)
+ {
this.ref = pkg.ref == null ? null : new String(pkg.ref);
this.name = pkg.name == null ? null: new String(pkg.name);
this.packageType = pkg.packageType == null ? null : new String(pkg.packageType);
1.2 +16 -0 jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/xb/XbPackageNodeWithProperties.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: XbPackageNodeWithProperties.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/xb/XbPackageNodeWithProperties.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- XbPackageNodeWithProperties.java 6 Nov 2006 21:35:27 -0000 1.1
+++ XbPackageNodeWithProperties.java 8 Nov 2006 19:54:41 -0000 1.2
@@ -21,6 +21,9 @@
*/
package org.jboss.ide.eclipse.packages.core.model.internal.xb;
+import java.util.Iterator;
+import java.util.Properties;
+
public abstract class XbPackageNodeWithProperties extends XbPackageNode {
protected XbProperties properties;
@@ -35,6 +38,19 @@
super(node);
}
+ public void copyFrom (XbPackageNodeWithProperties node)
+ {
+ properties.getProperties().clear();
+
+ Properties props = node.getProperties().getProperties();
+ for (Iterator iter = props.keySet().iterator(); iter.hasNext(); )
+ {
+ String key = (String) iter.next();
+
+ properties.getProperties().setProperty(key, (String) props.get(key));
+ }
+ }
+
public XbProperties getProperties ()
{
return properties;
1.2 +1 -1 jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/xb/XbPackageNode.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: XbPackageNode.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/xb/XbPackageNode.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- XbPackageNode.java 6 Nov 2006 21:35:27 -0000 1.1
+++ XbPackageNode.java 8 Nov 2006 19:54:41 -0000 1.2
@@ -38,7 +38,7 @@
public XbPackageNode(XbPackageNode node)
{
- children = new Hashtable(node.children);
+// children = new Hashtable(node.children);
}
public void addChild (Object object)
More information about the jboss-cvs-commits
mailing list