Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2004-06-07 02:11:00 +0000
committerMichael Valenta2004-06-07 02:11:00 +0000
commitab5da0dcade152100f68bbec305ef287f9bc0600 (patch)
treeb8b64e9a5a04b65534449203fca9cfc10bc1aeb3 /bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs
parent9cf54962ec7ecf213d0660fa172fd166c032f469 (diff)
downloadeclipse.platform.team-ab5da0dcade152100f68bbec305ef287f9bc0600.tar.gz
eclipse.platform.team-ab5da0dcade152100f68bbec305ef287f9bc0600.tar.xz
eclipse.platform.team-ab5da0dcade152100f68bbec305ef287f9bc0600.zip
Bug 65882 Canceling CVS Edit command returns OK status from validateEdit
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs')
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java
index 6a2b790f1..3b2ef9a6b 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/FileModificationValidator.java
@@ -134,7 +134,8 @@ public class FileModificationValidator implements ICVSFileModificationValidator
} catch (InvocationTargetException e) {
return getStatus(e);
} catch (InterruptedException e) {
- // Fallthrough to return OK
+ // Must return an error to indicate that it is not OK to edit the files
+ return new Status(IStatus.ERROR, CVSUIPlugin.ID, 0, Policy.bind("FileModificationValidator.vetoMessage"), null); //$NON-NLS-1$;
}
return OK;

Back to the top