[jboss-cvs] jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal ...
Marshall Culpepper
mculpepper at jboss.com
Wed Dec 6 12:02:56 EST 2006
User: mculpepper
Date: 06/12/06 12:02:56
Modified: core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal
PackageFolderImpl.java PackageImpl.java
PackageNodeImpl.java PackageBuildDelegate.java
Log:
changed the model hierarchy so node working copy's have no reference to add/remove child, and removed addFolder etc from the working copy classes (they should've been removed a long time ago). also made wrote lots of javadoc where there was none before
Revision Changes Path
1.3 +6 -5 jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageFolderImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PackageFolderImpl.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageFolderImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- PackageFolderImpl.java 8 Nov 2006 19:54:41 -0000 1.2
+++ PackageFolderImpl.java 6 Dec 2006 17:02:56 -0000 1.3
@@ -29,6 +29,7 @@
import org.jboss.ide.eclipse.packages.core.model.IPackageFolder;
import org.jboss.ide.eclipse.packages.core.model.IPackageFolderWorkingCopy;
import org.jboss.ide.eclipse.packages.core.model.IPackageNode;
+import org.jboss.ide.eclipse.packages.core.model.IPackageNodeBase;
import org.jboss.ide.eclipse.packages.core.model.IPackageNodeWorkingCopy;
import org.jboss.ide.eclipse.packages.core.model.internal.xb.XbFolder;
@@ -36,7 +37,7 @@
* A PackageFolderImpl.
*
* @author <a href="marshall at jboss.org">Marshall Culpepper</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class PackageFolderImpl extends PackageNodeImpl implements
IPackageFolder, IPackageFolderWorkingCopy {
@@ -56,20 +57,20 @@
}
public IPackageFileSet[] getFileSets() {
- IPackageNode nodes[] = getChildren(TYPE_PACKAGE_FILESET);
+ IPackageNodeBase nodes[] = getChildren(TYPE_PACKAGE_FILESET);
IPackageFileSet filesets[] = new IPackageFileSet[nodes.length];
System.arraycopy(nodes, 0, filesets, 0, nodes.length);
return filesets;
}
public IPackageFolder[] getFolders() {
- IPackageNode nodes[] = getChildren(TYPE_PACKAGE_FOLDER);
+ IPackageNodeBase nodes[] = getChildren(TYPE_PACKAGE_FOLDER);
IPackageFolder folders[] = new IPackageFolder[nodes.length];
System.arraycopy(nodes, 0, folders, 0, nodes.length);
return folders;
}
public IPackage[] getPackages() {
- IPackageNode nodes[] = getChildren(TYPE_PACKAGE);
+ IPackageNodeBase nodes[] = getChildren(TYPE_PACKAGE);
IPackage pkgs[] = new IPackage[nodes.length];
System.arraycopy(nodes, 0, pkgs, 0, nodes.length);
return pkgs;
@@ -136,7 +137,7 @@
public IPath getPackageRelativePath() {
String path = new String(getName());
- IPackageNode parent = getParent(), save = null;
+ IPackageNodeBase parent = getParent(), save = null;
while (true) {
if (parent.getNodeType() == IPackageNode.TYPE_PACKAGE)
path = ((IPackage)parent).getName() + "/" + path;
1.5 +6 -5 jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PackageImpl.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PackageImpl.java 20 Nov 2006 21:06:03 -0000 1.4
+++ PackageImpl.java 6 Dec 2006 17:02:56 -0000 1.5
@@ -35,6 +35,7 @@
import org.jboss.ide.eclipse.packages.core.model.IPackageFileSet;
import org.jboss.ide.eclipse.packages.core.model.IPackageFolder;
import org.jboss.ide.eclipse.packages.core.model.IPackageNode;
+import org.jboss.ide.eclipse.packages.core.model.IPackageNodeBase;
import org.jboss.ide.eclipse.packages.core.model.IPackageNodeWorkingCopy;
import org.jboss.ide.eclipse.packages.core.model.IPackageWorkingCopy;
import org.jboss.ide.eclipse.packages.core.model.internal.xb.XbPackage;
@@ -45,7 +46,7 @@
* A Package.
*
* @author <a href="marshall at jboss.org">Marshall Culpepper</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class PackageImpl extends PackageNodeImpl implements IPackage, IPackageWorkingCopy {
@@ -89,14 +90,14 @@
}
public IPackageFileSet[] getFileSets() {
- IPackageNode nodes[] = getChildren(TYPE_PACKAGE_FILESET);
+ IPackageNodeBase nodes[] = getChildren(TYPE_PACKAGE_FILESET);
IPackageFileSet filesets[] = new IPackageFileSet[nodes.length];
System.arraycopy(nodes, 0, filesets, 0, nodes.length);
return filesets;
}
public IPackageFolder[] getFolders() {
- IPackageNode nodes[] = getChildren(TYPE_PACKAGE_FOLDER);
+ IPackageNodeBase nodes[] = getChildren(TYPE_PACKAGE_FOLDER);
IPackageFolder folders[] = new IPackageFolder[nodes.length];
System.arraycopy(nodes, 0, folders, 0, nodes.length);
return folders;
@@ -107,7 +108,7 @@
}
public IPackage[] getPackages() {
- IPackageNode nodes[] = getChildren(TYPE_PACKAGE);
+ IPackageNodeBase nodes[] = getChildren(TYPE_PACKAGE);
IPackage pkgs[] = new IPackage[nodes.length];
System.arraycopy(nodes, 0, pkgs, 0, nodes.length);
return pkgs;
@@ -239,7 +240,7 @@
String path = new String(getName());
- IPackageNode parent = getParent(), save = null;
+ IPackageNodeBase parent = getParent(), save = null;
while (true) {
if (parent.getNodeType() == IPackageNode.TYPE_PACKAGE)
path = ((IPackage)parent).getName() + "/" + path;
1.3 +6 -5 jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageNodeImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PackageNodeImpl.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageNodeImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- PackageNodeImpl.java 8 Nov 2006 19:54:41 -0000 1.2
+++ PackageNodeImpl.java 6 Dec 2006 17:02:56 -0000 1.3
@@ -29,6 +29,7 @@
import org.eclipse.core.resources.IProject;
import org.eclipse.core.runtime.Assert;
import org.jboss.ide.eclipse.packages.core.model.IPackageNode;
+import org.jboss.ide.eclipse.packages.core.model.IPackageNodeBase;
import org.jboss.ide.eclipse.packages.core.model.IPackageNodeVisitor;
import org.jboss.ide.eclipse.packages.core.model.IPackageNodeWorkingCopy;
import org.jboss.ide.eclipse.packages.core.model.internal.xb.XbFileSet;
@@ -99,12 +100,12 @@
return children;
}
- public IPackageNode[] getAllChildren ()
+ public IPackageNodeBase[] getAllChildren ()
{
return nodesToChildren(nodeDelegate.getAllChildren());
}
- public IPackageNode[] getChildren(int type) {
+ public IPackageNodeBase[] getChildren(int type) {
return nodesToChildren(nodeDelegate.getChildren(intTypeToNodeType(type)));
}
@@ -112,13 +113,13 @@
return nodeDelegate.hasChildren();
}
- public boolean hasChild (IPackageNode child)
+ public boolean hasChild (IPackageNodeBase child)
{
PackageNodeImpl childImpl = (PackageNodeImpl)child;
return nodeDelegate.getAllChildren().contains(childImpl.nodeDelegate);
}
- public IPackageNode getParent() {
+ public IPackageNodeBase getParent() {
XbPackageNode parent = nodeDelegate.getParent();
if (parent != null)
return PackagesModel.instance().getPackageNodeImpl(parent);
@@ -147,7 +148,7 @@
}
public boolean accept(IPackageNodeVisitor visitor, boolean depthFirst) {
- IPackageNode children[] = getAllChildren();
+ IPackageNodeBase children[] = getAllChildren();
boolean keepGoing = true;
if (!depthFirst)
1.6 +3 -2 jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageBuildDelegate.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PackageBuildDelegate.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackageBuildDelegate.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- PackageBuildDelegate.java 28 Nov 2006 19:54:29 -0000 1.5
+++ PackageBuildDelegate.java 6 Dec 2006 17:02:56 -0000 1.6
@@ -50,6 +50,7 @@
import org.jboss.ide.eclipse.packages.core.model.IPackageFileSet;
import org.jboss.ide.eclipse.packages.core.model.IPackageFolder;
import org.jboss.ide.eclipse.packages.core.model.IPackageNode;
+import org.jboss.ide.eclipse.packages.core.model.IPackageNodeBase;
import org.jboss.ide.eclipse.packages.core.model.IPackageNodeVisitor;
import org.jboss.ide.eclipse.packages.core.model.IPackagesBuildListener;
import org.jboss.ide.eclipse.packages.core.model.IPackagesModelListener;
@@ -456,7 +457,7 @@
{
// Is this right?? Is the parent guarenteed to be a package?
for( int i = 0; i < filesets.length; i++ ) {
- IPackageNode n = filesets[i].getParent();
+ IPackageNodeBase n = filesets[i].getParent();
if( n instanceof IPackage )
packagesBeingChanged.add(n);
}
@@ -481,7 +482,7 @@
{
ArrayList parents = new ArrayList();
- IPackageNode parent = fileset.getParent();
+ IPackageNodeBase parent = fileset.getParent();
while (parent != null)
{
parents.add(0, parent);
More information about the jboss-cvs-commits
mailing list