diff options
author | Michael Valenta | 2005-11-23 16:07:26 +0000 |
---|---|---|
committer | Michael Valenta | 2005-11-23 16:07:26 +0000 |
commit | 11380cc328f06fd4185eaabb9a7cf4dc2d6c45d6 (patch) | |
tree | 1de61193f4fdb321330248635ce71fcdaa5b3bc3 | |
parent | 4042a8d11847f5e6b6616bf18ddb82e8d71a6c5c (diff) | |
download | eclipse.platform.team-branch_20051104_COmmonNavigator.tar.gz eclipse.platform.team-branch_20051104_COmmonNavigator.tar.xz eclipse.platform.team-branch_20051104_COmmonNavigator.zip |
Added back promptbranch_20051104_COmmonNavigator
-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(); } |