Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-03-18 12:41:30 -0500
committerMichael Valenta2002-03-18 12:41:30 -0500
commitb8a0a0516f73018ad87500c8a7800b2af93629cf (patch)
tree00cdce37cda5116565d22cbb6ae6443dc09a6568
parentcd7c4cc6ca0d61a65bd86d8bea71ce90be958a5e (diff)
downloadeclipse.platform.team-b8a0a0516f73018ad87500c8a7800b2af93629cf.tar.gz
eclipse.platform.team-b8a0a0516f73018ad87500c8a7800b2af93629cf.tar.xz
eclipse.platform.team-b8a0a0516f73018ad87500c8a7800b2af93629cf.zip
un-backed out .project switch-oversplit-branch-11185
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/util/ProjectDescriptionManager.java44
1 files changed, 22 insertions, 22 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 e06bbfa04..a3e5b426f 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
@@ -137,13 +137,13 @@ public class ProjectDescriptionManager {
IFile descResource = project.getFile(PROJECT_DESCRIPTION_PATH);
if (descResource.exists() && UPDATE_PROJECT_DESCRIPTION_ON_LOAD) {
-// // If a managed .project files exists, don't read the .vcm_meta
-// ICVSFile coreDescResource = CVSWorkspaceRoot.getCVSFileFor(project.getFile(CORE_PROJECT_DESCRIPTION_PATH));
-// if (coreDescResource.exists() && coreDescResource.isManaged()) {
-// createVCMMetaMarker(descResource);
-// Util.logError(".vcm_meta file ignored for project " + project.getName(), null);
-// return;
-// }
+ // If a managed .project files exists, don't read the .vcm_meta
+ ICVSFile coreDescResource = CVSWorkspaceRoot.getCVSFileFor(project.getFile(CORE_PROJECT_DESCRIPTION_PATH));
+ if (coreDescResource.exists() && coreDescResource.isManaged()) {
+ createVCMMetaMarker(descResource);
+ Util.logError(".vcm_meta file ignored for project " + project.getName(), null);
+ return;
+ }
// update project description file (assuming it has changed)
IProjectDescription desc = project.getDescription();
@@ -206,9 +206,9 @@ public class ProjectDescriptionManager {
public static void writeProjectDescriptionIfNecessary(CVSTeamProvider provider, IResource resource, IProgressMonitor monitor) throws CVSException {
if (resource.getType() == IResource.PROJECT || isProjectDescription(resource)) {
IProject project = resource.getProject();
- // if (project.getFile(PROJECT_DESCRIPTION_PATH).exists() /* || ! project.getFile(CORE_PROJECT_DESCRIPTION_PATH).exists() */) {
+ if (project.getFile(PROJECT_DESCRIPTION_PATH).exists() /* || ! project.getFile(CORE_PROJECT_DESCRIPTION_PATH).exists() */) {
writeProjectDescription(project, monitor);
- // }
+ }
}
}
@@ -255,9 +255,9 @@ public class ProjectDescriptionManager {
}
}
} catch (CVSException ex) {
- Util.logError("Cannot update project description", ex); //$NON-NLS-1$
+ Util.logError("Cannot update project description", ex);
} catch (CoreException ex) {
- Util.logError("Cannot update project description", ex); //$NON-NLS-1$
+ Util.logError("Cannot update project description", ex);
}
}
};
@@ -265,17 +265,17 @@ public class ProjectDescriptionManager {
}
protected static IMarker createVCMMetaMarker(IResource resource) {
-// try {
-// IMarker[] markers = resource.findMarkers(VCMMETA_MARKER, false, IResource.DEPTH_ZERO);
-// if (markers.length == 1) {
-// return markers[0];
-// }
-// IMarker marker = resource.createMarker(VCMMETA_MARKER);
-// marker.setAttribute(IMarker.MESSAGE, resource.getName() + " file exists in " + resource.getProject().getName() + " but is no longer required and can be deleted");
-// return marker;
-// } catch (CoreException e) {
-// Util.logError("Error creating deletion marker", e);
-// }
+ try {
+ IMarker[] markers = resource.findMarkers(VCMMETA_MARKER, false, IResource.DEPTH_ZERO);
+ if (markers.length == 1) {
+ return markers[0];
+ }
+ IMarker marker = resource.createMarker(VCMMETA_MARKER);
+ marker.setAttribute(IMarker.MESSAGE, resource.getName() + " file exists in " + resource.getProject().getName() + " but is no longer required and can be deleted");
+ return marker;
+ } catch (CoreException e) {
+ Util.logError("Error creating deletion marker", e);
+ }
return null;
}
} \ No newline at end of file

Back to the top