Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Valenta2003-06-18 11:17:06 -0400
committerMichael Valenta2003-06-18 11:17:06 -0400
commit596a58de14a7f0b1800093ed0a1b6a6d39311b38 (patch)
tree97709f30159c9ee84214ed5b6b8dc5a0f22fc577
parented7b40ed32063ff7bff8d955414b9f09a58efa96 (diff)
downloadeclipse.platform.team-596a58de14a7f0b1800093ed0a1b6a6d39311b38.tar.gz
eclipse.platform.team-596a58de14a7f0b1800093ed0a1b6a6d39311b38.tar.xz
eclipse.platform.team-596a58de14a7f0b1800093ed0a1b6a6d39311b38.zip
31339: [CVS UI] cannot cancel 'create patch'
-rw-r--r--bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileOperation.java13
1 files changed, 9 insertions, 4 deletions
diff --git a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileOperation.java b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileOperation.java
index 8d7fcedfe..d74ba4323 100644
--- a/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileOperation.java
+++ b/bundles/org.eclipse.team.cvs.ui/src/org/eclipse/team/internal/ccvs/ui/wizards/GenerateDiffFileOperation.java
@@ -33,6 +33,7 @@ import org.eclipse.team.core.TeamException;
import org.eclipse.team.internal.ccvs.core.CVSProviderPlugin;
import org.eclipse.team.internal.ccvs.core.CVSTeamProvider;
import org.eclipse.team.internal.ccvs.core.client.Command.LocalOption;
+import org.eclipse.team.internal.ccvs.ui.CVSUIPlugin;
import org.eclipse.team.internal.ccvs.ui.Policy;
/**
@@ -101,10 +102,14 @@ public class GenerateDiffFileOperation implements IRunnableWithProgress {
//check for empty diff and report
if (emptyDiff) {
- MessageDialog.openInformation(
- shell,
- Policy.bind("GenerateCVSDiff.noDiffsFoundTitle"), //$NON-NLS-1$
- Policy.bind("GenerateCVSDiff.noDiffsFoundMsg")); //$NON-NLS-1$
+ CVSUIPlugin.openDialog(shell, new CVSUIPlugin.IOpenableInShell() {
+ public void open(Shell shell) {
+ MessageDialog.openInformation(
+ shell,
+ Policy.bind("GenerateCVSDiff.noDiffsFoundTitle"), //$NON-NLS-1$
+ Policy.bind("GenerateCVSDiff.noDiffsFoundMsg")); //$NON-NLS-1$
+ }
+ }, CVSUIPlugin.PERFORM_SYNC_EXEC);
}
} catch (TeamException e) {
throw new InvocationTargetException(e);

Back to the top