Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2004-10-26 12:27:54 +0000
committerAndre Weinand2004-10-26 12:27:54 +0000
commit74ed64249ecaa65e1071f9d355e4e0e2b6862bfb (patch)
tree1a14ce80776991f941adde15c7b85ac62daa42d6
parent20cdc8137bc52d449a6865a163884a54e9397e09 (diff)
downloadeclipse.platform.team-74ed64249ecaa65e1071f9d355e4e0e2b6862bfb.tar.gz
eclipse.platform.team-74ed64249ecaa65e1071f9d355e4e0e2b6862bfb.tar.xz
eclipse.platform.team-74ed64249ecaa65e1071f9d355e4e0e2b6862bfb.zip
fixed #65981: empty compare viewer has no focus
-rw-r--r--bundles/org.eclipse.compare/buildnotes_compare.html8
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerPane.java6
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html8
-rw-r--r--bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerPane.java6
4 files changed, 24 insertions, 4 deletions
diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html
index bd11f125c..96831f0e5 100644
--- a/bundles/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/buildnotes_compare.html
@@ -12,6 +12,14 @@
Eclipse Platform Build Notes<br>
Compare</h1>
+Eclipse Build Input November 2nd 2004
+
+<h2>Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=65981">65981</a>: empty compare viewer has no focus<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
Eclipse Build Input September 21th 2004
<h2>Problem reports fixed</h2>
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerPane.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerPane.java
index 5246ae1c4..54f6b00dc 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerPane.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerPane.java
@@ -85,7 +85,8 @@ public class CompareViewerPane extends ViewForm {
*/
public void setText(String label) {
CLabel cl= (CLabel) getTopLeft();
- cl.setText(label);
+ if (cl != null)
+ cl.setText(label);
}
/**
@@ -96,7 +97,8 @@ public class CompareViewerPane extends ViewForm {
*/
public void setImage(Image image) {
CLabel cl= (CLabel) getTopLeft();
- cl.setImage(image);
+ if (cl != null)
+ cl.setImage(image);
}
/**
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
index bd11f125c..96831f0e5 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/buildnotes_compare.html
@@ -12,6 +12,14 @@
Eclipse Platform Build Notes<br>
Compare</h1>
+Eclipse Build Input November 2nd 2004
+
+<h2>Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=65981">65981</a>: empty compare viewer has no focus<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
Eclipse Build Input September 21th 2004
<h2>Problem reports fixed</h2>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerPane.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerPane.java
index 5246ae1c4..54f6b00dc 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerPane.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/CompareViewerPane.java
@@ -85,7 +85,8 @@ public class CompareViewerPane extends ViewForm {
*/
public void setText(String label) {
CLabel cl= (CLabel) getTopLeft();
- cl.setText(label);
+ if (cl != null)
+ cl.setText(label);
}
/**
@@ -96,7 +97,8 @@ public class CompareViewerPane extends ViewForm {
*/
public void setImage(Image image) {
CLabel cl= (CLabel) getTopLeft();
- cl.setImage(image);
+ if (cl != null)
+ cl.setImage(image);
}
/**

Back to the top