Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2005-02-25 09:01:18 -0500
committerMichael Valenta2005-02-25 09:01:18 -0500
commitb89ac44381c91cdc19864a22118cc2b33f060984 (patch)
treec6872af3dc7648390b398f293d6086f6526c6dcd
parent1b0a3c390e83bcaf56cba9760ac9188def705784 (diff)
downloadeclipse.platform.team-branch_20050222_bug86159.tar.gz
eclipse.platform.team-branch_20050222_bug86159.tar.xz
eclipse.platform.team-branch_20050222_bug86159.zip
Bug 86584 commit from package view skips deleted filesbranch_20050222_bug86159
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CommitAction.java7
1 files changed, 5 insertions, 2 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CommitAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CommitAction.java
index ccd6e2006..7cf70bccf 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CommitAction.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/CommitAction.java
@@ -13,7 +13,6 @@ package org.eclipse.team.internal.ccvs.ui.actions;
import java.lang.reflect.InvocationTargetException;
import java.util.*;
-import org.eclipse.core.resources.IContainer;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.mapping.ResourceMapping;
import org.eclipse.core.resources.mapping.ResourceTraversal;
@@ -85,7 +84,7 @@ public class CommitAction extends WorkspaceTraversalAction {
for (int k = 0; k < resources.length; k++) {
IResource resource = resources[k];
if (resource.getType() != IResource.FILE) {
- collectShallowFiles(((IContainer)resource).members(), roots);
+ collectShallowFiles(getMembers(resource), roots);
}
}
}
@@ -94,6 +93,10 @@ public class CommitAction extends WorkspaceTraversalAction {
return (IResource[]) roots.toArray(new IResource[roots.size()]);
}
+ private IResource[] getMembers(IResource resource) throws CoreException {
+ return getWorkspaceSubscriber().members(resource);
+ }
+
private void collectShallowFiles(IResource[] resources, List roots) {
for (int k = 0; k < resources.length; k++) {
IResource resource = resources[k];

Back to the top