[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
Fri Feb 9 18:10:25 EST 2007
User: mculpepper
Date: 07/02/09 18:10:25
Modified: core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal
PackageNodeImpl.java PackagesModel.java
Log:
moved parent node detach check to PackageNodeImpl, and added the check to any methods that look for the detached state (addChild, addRef, removeChild)
Revision Changes Path
1.6 +12 -3 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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- PackageNodeImpl.java 9 Feb 2007 19:08:05 -0000 1.5
+++ PackageNodeImpl.java 9 Feb 2007 23:10:22 -0000 1.6
@@ -192,7 +192,7 @@
addChildImpl(impl);
- if (!detached)
+ if (!detached && !areAnyParentsDetached())
{
PackagesModel.instance().saveModel(node.getProject(), null);
PackagesModel.instance().fireNodeAdded(node);
@@ -206,7 +206,7 @@
children.add(refImpl);
refImpl.setParent(this);
- if (!detached)
+ if (!detached && !areAnyParentsDetached())
{
PackagesModel.instance().saveModel(getProject(), null);
}
@@ -231,7 +231,7 @@
if (children.contains(node))
children.remove(node);
- if (!detached)
+ if (!detached && !areAnyParentsDetached())
{
PackagesModel.instance().saveModel(node.getProject(), null);
PackagesModel.instance().fireNodeRemoved(node);
@@ -250,6 +250,15 @@
return detached;
}
+ public boolean areAnyParentsDetached ()
+ {
+ for (IPackageNode parent = getParent(); parent != null; parent = parent.getParent() )
+ {
+ if (! ((PackageNodeImpl)parent).isDetached()) return false;
+ }
+ return true;
+ }
+
public void setDetached(boolean detached) {
this.detached = detached;
}
1.14 +1 -10 jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackagesModel.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PackagesModel.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/core/plugins/org.jboss.ide.eclipse.packages.core/src/main/org/jboss/ide/eclipse/packages/core/model/internal/PackagesModel.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- PackagesModel.java 9 Feb 2007 22:59:21 -0000 1.13
+++ PackagesModel.java 9 Feb 2007 23:10:22 -0000 1.14
@@ -633,20 +633,11 @@
return filesetImpl;
}
- private boolean areAnyNodeParentsDetached (IPackageNode node)
- {
- for (IPackageNode parent = node.getParent(); parent != null; parent = parent.getParent() )
- {
- if (! ((PackageNodeImpl)parent).isDetached()) return false;
- }
- return true;
- }
-
public void attach (IPackageNode nodeToAttach, IProgressMonitor monitor)
{
PackageNodeImpl node = (PackageNodeImpl) nodeToAttach;
- if (node.isDetached() && areAnyNodeParentsDetached(node))
+ if (node.isDetached() && node.areAnyParentsDetached())
{
node.setDetached(false);
More information about the jboss-cvs-commits
mailing list