Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndre Weinand2004-04-06 08:55:26 -0400
committerAndre Weinand2004-04-06 08:55:26 -0400
commite88dcc2ea4d3d5843433ed06451a953d0f33fc76 (patch)
tree9eb6dd6bafa901daa7a036da124df7e917754c73 /bundles/org.eclipse.compare/compare
parent53f9aac29d9677858d4e272ff2da78053f70d825 (diff)
downloadeclipse.platform.team-e88dcc2ea4d3d5843433ed06451a953d0f33fc76.tar.gz
eclipse.platform.team-e88dcc2ea4d3d5843433ed06451a953d0f33fc76.tar.xz
eclipse.platform.team-e88dcc2ea4d3d5843433ed06451a953d0f33fc76.zip
new icons for 3.0
Diffstat (limited to 'bundles/org.eclipse.compare/compare')
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java2
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java10
2 files changed, 4 insertions, 8 deletions
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
index 180fbb89e..cbbbb4785 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/CompareEditorInput.java
@@ -98,7 +98,7 @@ public abstract class CompareEditorInput implements IEditorInput, IPropertyChang
*/
public static final String DIRTY_STATE= "DIRTY_STATE"; //$NON-NLS-1$
- private static final String COMPARE_EDITOR_IMAGE_NAME= "cview16/compare_view.gif"; //$NON-NLS-1$
+ private static final String COMPARE_EDITOR_IMAGE_NAME= "eview16/compare_view.gif"; //$NON-NLS-1$
private static Image fgTitleImage;
private Splitter fComposite;
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
index 183c566ed..d99e9204b 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
@@ -212,17 +212,14 @@ public class Utilities {
String relPath= getString(bundle, imageKey, null);
if (relPath != null && relPath.trim().length() > 0) {
- String cPath;
String dPath;
String ePath;
if (relPath.indexOf("/") >= 0) { //$NON-NLS-1$
String path= relPath.substring(1);
- cPath= 'c' + path;
dPath= 'd' + path;
ePath= 'e' + path;
} else {
- cPath= "clcl16/" + relPath; //$NON-NLS-1$
dPath= "dlcl16/" + relPath; //$NON-NLS-1$
ePath= "elcl16/" + relPath; //$NON-NLS-1$
}
@@ -230,12 +227,11 @@ public class Utilities {
ImageDescriptor id= CompareUIPlugin.getImageDescriptor(dPath); // we set the disabled image first (see PR 1GDDE87)
if (id != null)
a.setDisabledImageDescriptor(id);
- id= CompareUIPlugin.getImageDescriptor(cPath);
- if (id != null)
- a.setHoverImageDescriptor(id);
id= CompareUIPlugin.getImageDescriptor(ePath);
- if (id != null)
+ if (id != null) {
a.setImageDescriptor(id);
+ a.setHoverImageDescriptor(id);
+ }
}
}

Back to the top