Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-01-14 21:59:04 +0000
committerMichael Valenta2002-01-14 21:59:04 +0000
commitd6e88f0ec380a0a17cac0cf33ed26af522164b4b (patch)
tree8f49e423638868c0bc5c785b9ef8c99cc724ac28
parent9bf8bb45246af316de41b70d99c2b01c9153c91c (diff)
downloadeclipse.platform.team-d6e88f0ec380a0a17cac0cf33ed26af522164b4b.tar.gz
eclipse.platform.team-d6e88f0ec380a0a17cac0cf33ed26af522164b4b.tar.xz
eclipse.platform.team-d6e88f0ec380a0a17cac0cf33ed26af522164b4b.zip
Fixed bug in project description loading
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/ProjectDescriptionManager.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/ProjectDescriptionManager.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/ProjectDescriptionManager.java
index 22cf7e806..6ce9fed1d 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/ProjectDescriptionManager.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/ProjectDescriptionManager.java
@@ -194,6 +194,7 @@ public class ProjectDescriptionManager {
continue;
// First, check if the .vcm_meta file for the project is in the delta.
IResourceDelta[] children = delta.getAffectedChildren(IResourceDelta.REMOVED | IResourceDelta.ADDED | IResourceDelta.CHANGED);
+ boolean inSync = false;
for (int j = 0; j < children.length; j++) {
IResourceDelta childDelta = children[j];
IResource childResource = childDelta.getResource();
@@ -201,15 +202,17 @@ public class ProjectDescriptionManager {
switch (childDelta.getKind()) {
case IResourceDelta.REMOVED:
writeProjectDescriptionIfNecessary((CVSTeamProvider)provider, project, Policy.monitorFor(null));
- return; // The file and description are in sync
+ inSync = true;
+ break;
case IResourceDelta.CHANGED:
case IResourceDelta.ADDED:
updateProjectIfNecessary(project, Policy.monitorFor(null));
- return; // The file and description are in sync
+ inSync = true;
+ break;
}
}
// Check if we didn't do anything above and the project description changed.
- if ((delta.getFlags() & IResourceDelta.DESCRIPTION) != 0) {
+ if (! inSync && (delta.getFlags() & IResourceDelta.DESCRIPTION) != 0) {
writeProjectDescriptionIfNecessary((CVSTeamProvider)provider, project, Policy.monitorFor(null));
}
}

Back to the top