diff options
Diffstat (limited to 'bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceTraversalAction.java')
-rw-r--r-- | bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceTraversalAction.java | 28 |
1 files changed, 15 insertions, 13 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceTraversalAction.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceTraversalAction.java index b049d446a..3c33dce7f 100644 --- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceTraversalAction.java +++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/actions/WorkspaceTraversalAction.java @@ -17,11 +17,13 @@ import org.eclipse.core.resources.IResource; import org.eclipse.core.resources.mapping.*; import org.eclipse.core.runtime.*; import org.eclipse.jface.operation.IRunnableWithProgress; +import org.eclipse.jface.window.Window; import org.eclipse.team.core.RepositoryProvider; import org.eclipse.team.core.subscribers.Subscriber; import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin; import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin; import org.eclipse.team.internal.core.subscribers.SubscriberResourceMappingContext; +import org.eclipse.team.internal.ui.dialogs.AdditionalMappingsDialog; import org.eclipse.team.ui.mapping.IResourceMappingScope; import org.eclipse.team.ui.operations.ScopeGenerator; import org.eclipse.ui.PlatformUI; @@ -55,19 +57,19 @@ public abstract class WorkspaceTraversalAction extends WorkspaceAction { } private ResourceMapping[] showAllMappings(final IResourceMappingScope scope) { -// final boolean[] canceled = new boolean[] { false }; -// getShell().getDisplay().syncExec(new Runnable() { -// public void run() { -// AdditionalMappingsDialog dialog = new AdditionalMappingsDialog(getShell(), "Participating Elements", scope, null); -// int result = dialog.open(); -// canceled[0] = result != Window.OK; -// } -// -// }); -// -// if (canceled[0]) { -// return new ResourceMapping[0]; -// } + final boolean[] canceled = new boolean[] { false }; + getShell().getDisplay().syncExec(new Runnable() { + public void run() { + AdditionalMappingsDialog dialog = new AdditionalMappingsDialog(getShell(), "Participating Elements", scope, null); + int result = dialog.open(); + canceled[0] = result != Window.OK; + } + + }); + + if (canceled[0]) { + return new ResourceMapping[0]; + } return scope.getMappings(); } |