Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2002-04-30 14:38:55 +0000
committerAndre Weinand2002-04-30 14:38:55 +0000
commit398f87f54f784c94878cbc61ff01249e6a8b6b0b (patch)
tree1ec0445b6665bf75902784c6f10183eaa1001673 /bundles/org.eclipse.compare/compare/org/eclipse
parenta01a16f4254a562960ba84c49821ae2fffc97e5a (diff)
downloadeclipse.platform.team-398f87f54f784c94878cbc61ff01249e6a8b6b0b.tar.gz
eclipse.platform.team-398f87f54f784c94878cbc61ff01249e6a8b6b0b.tar.xz
eclipse.platform.team-398f87f54f784c94878cbc61ff01249e6a8b6b0b.zip
added acceleratorsv20020430
bumped plugin version to 1.9.0
Diffstat (limited to 'bundles/org.eclipse.compare/compare/org/eclipse')
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TimeoutContext.java5
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java2
2 files changed, 6 insertions, 1 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TimeoutContext.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TimeoutContext.java
index a84968421..c52da8b58 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TimeoutContext.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/TimeoutContext.java
@@ -192,7 +192,10 @@ public class TimeoutContext {
fSubTaskLabel.setFont(parent.getFont());
// update with values fProgressMonitor
- fTaskLabel.setText(fProgressMonitor.fTask);
+ String s= fProgressMonitor.fTask;
+ if (s == null)
+ s= ""; //$NON-NLS-1$
+ fTaskLabel.setText(s);
if (fProgressMonitor.fMaxWork == IProgressMonitor.UNKNOWN)
fProgressIndicator.beginAnimatedTask();
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java
index aa67f74bf..e238378d1 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/InputPatchPage.java
@@ -114,6 +114,7 @@ import org.eclipse.compare.internal.Utilities;
if (c != null) {
Clipboard clipboard= new Clipboard(c.getDisplay());
Object o= clipboard.getContents(TextTransfer.getInstance());
+ clipboard.dispose();
if (o instanceof String)
reader= new StringReader((String)o);
}
@@ -396,6 +397,7 @@ import org.eclipse.compare.internal.Utilities;
if (c != null) {
Clipboard clipboard= new Clipboard(c.getDisplay());
Object o= clipboard.getContents(TextTransfer.getInstance());
+ clipboard.dispose();
if (o instanceof String) {
String s= ((String) o).trim();
if (s.length() > 0)

Back to the top