Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2002-04-08 11:55:30 -0400
committerMichael Valenta2002-04-08 11:55:30 -0400
commitf8d9abec8475be9b9d548ab066288b9d9d63145f (patch)
tree148e6b5aaf21915a4f02e2061400b39d4c9a7f87
parentb8b98fb906e327bf3afac99f9e69f40f8852d7c5 (diff)
downloadeclipse.platform.team-f8d9abec8475be9b9d548ab066288b9d9d63145f.tar.gz
eclipse.platform.team-f8d9abec8475be9b9d548ab066288b9d9d63145f.tar.xz
eclipse.platform.team-f8d9abec8475be9b9d548ab066288b9d9d63145f.zip
Added code to failed folder deletion status
-rw-r--r--bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java1
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSMoveDeleteHook.java2
2 files changed, 2 insertions, 1 deletions
diff --git a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java
index e603aa42f..a0f6edfcf 100644
--- a/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java
+++ b/bundles/org.eclipse.team.cvs.core/src/org/eclipse/team/internal/ccvs/core/CVSStatus.java
@@ -22,6 +22,7 @@ public class CVSStatus extends Status {
public static final int TAG_ALREADY_EXISTS = -15;
public static final int DELETION_FAILED = -16;
public static final int DOES_NOT_EXIST = -17;
+ public static final int FOLDER_NEEDED_FOR_FILE_DELETIONS = -18;
// Path for resource related status
private IPath path;
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSMoveDeleteHook.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSMoveDeleteHook.java
index e8a119c6b..281da6738 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSMoveDeleteHook.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/CVSMoveDeleteHook.java
@@ -127,7 +127,7 @@ public class CVSMoveDeleteHook implements IMoveDeleteHook {
IFolder destFolder = destination.getFolder(resource.getFullPath().removeFirstSegments(source.getFullPath().segmentCount()));
destFolder.create(false, true, monitor);
}
- tree.failed(new CVSStatus(IStatus.ERROR, 0, Policy.bind("CVSMoveDeleteHook.folderDeletionFailure", resource.getFullPath().toString()))); //$NON-NLS-1$
+ tree.failed(new CVSStatus(IStatus.ERROR, CVSStatus.FOLDER_NEEDED_FOR_FILE_DELETIONS, Policy.bind("CVSMoveDeleteHook.folderDeletionFailure", resource.getFullPath().toString()))); //$NON-NLS-1$
} else if (resource.getType() == IResource.FILE) {
fileFound[0] = true;
IFile destFile = null;

Back to the top