diff options
| author | Michael Valenta | 2003-01-08 20:30:38 +0000 |
|---|---|---|
| committer | Michael Valenta | 2003-01-08 20:30:38 +0000 |
| commit | a5b2863d57ea579967730403023c408307cb7642 (patch) | |
| tree | 67f6b1d0b5bcd0bf877a6f13821e39db1699a430 /bundles/org.eclipse.team.cvs.core | |
| parent | 160c61bd7de448dff3b08298af5c547210ce4a4a (diff) | |
| download | eclipse.platform.team-a5b2863d57ea579967730403023c408307cb7642.tar.gz eclipse.platform.team-a5b2863d57ea579967730403023c408307cb7642.tar.xz eclipse.platform.team-a5b2863d57ea579967730403023c408307cb7642.zip | |
Fixed bug that showed folders containing phatoms as dirty
Diffstat (limited to 'bundles/org.eclipse.team.cvs.core')
2 files changed, 11 insertions, 6 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java index 5226bc514..c642022fa 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/resources/EclipseFolder.java @@ -408,6 +408,8 @@ class EclipseFolder extends EclipseResource implements ICVSFolder { // if (isIgnored()) return false; IContainer container = (IContainer)getIResource(); boolean shared = isCVSFolder(); + // only phantoms that ae shared can be dirty + if (!shared && container.isPhantom()) return false; int count = EclipseSynchronizer.getInstance().getDirtyCount(container); if (count == -1) { if (!exists()) return false; diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/AddDeleteMoveListener.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/AddDeleteMoveListener.java index 61401e0d4..ac07448fb 100644 --- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/AddDeleteMoveListener.java +++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/AddDeleteMoveListener.java @@ -67,12 +67,15 @@ public class AddDeleteMoveListener implements IResourceDeltaVisitor, IResourceCh boolean movedFrom = (delta.getFlags() & IResourceDelta.MOVED_FROM) > 0; switch (delta.getKind()) { case IResourceDelta.ADDED : - if (resource.getType() == IResource.FOLDER) { - handleOrphanedSubtree((IContainer)resource); - handleAddedFolder((IFolder) resource); - } else if (resource.getType() == IResource.FILE) { - handleAddedFile((IFile)resource); - } + // make sure the added resource isn't a phantom + if (resource.exists()) { + if (resource.getType() == IResource.FOLDER) { + handleOrphanedSubtree((IContainer)resource); + handleAddedFolder((IFolder) resource); + } else if (resource.getType() == IResource.FILE) { + handleAddedFile((IFile)resource); + } + } break; case IResourceDelta.REMOVED : if (resource.getType() == IResource.FILE) { |