fixed 105230: [BIDI] need to add $nl$/ to icon paths for reversed icons
diff --git a/bundles/org.eclipse.compare/buildnotes_compare.html b/bundles/org.eclipse.compare/buildnotes_compare.html
index f300b27..7f033c3 100644
--- a/bundles/org.eclipse.compare/buildnotes_compare.html
+++ b/bundles/org.eclipse.compare/buildnotes_compare.html
@@ -12,158 +12,11 @@
Eclipse Platform Build Notes<br>
Compare</h1>
-Eclipse Build Input 3.1RC2 2005
+Eclipse Build Input 3.2 M1 2005
<h2>Problem reports fixed</h2>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=98828">98828</a>: CompareFilter bug filtering folders<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=67888">67888</a>: [accessibility] Go To Next Difference stops working on reuse of editor<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=105230">105230</a>: [BIDI] need to add $nl$/ to icon paths for reversed icons<br>
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input May 12th 2005
-
-<h2>Problem reports fixed</h2>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93561">93561</a>: ResouceMapping changed to Internal<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=91005">91005</a>: reusing compare editor does not update title if filename stays the same<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93810">93810</a>: Method extractPair(String, char, int[]) in Patcher.java fails on single number in range<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93901">93901</a>: Applying patch with one line added inserts new line one line above<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=78653">78653</a>: Eclipse compare support does not appear to use file inspection correctly<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=78652">78652</a>: content type should be bound hierarchically<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93924">93924</a>: Add keywords to preference pages<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=94077">94077</a>: IndexOutOfBounds applying patch<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=91211">91211</a>: Apply patch doesn't work for files with missing line endings<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=92270">92270</a>: compare should use content-based content type matching<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=69920">69920</a>: Compare should show png, bmp, etc. as image<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=94420">94420</a>: [Preferences] Widget is disposed in Compare/Patch<br>
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input April 19th 2005
-
-<h2>Problem reports fixed</h2>
-Converted Compare plug-in folder to jar<br>
-Converted to new NLS scheme<br>
-
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input April 12th 2005
-
-<h2>Problem reports fixed</h2>
-Added MANIFEST.MF<br>
-
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input March 29nd 2005
-
-<h2>Problem reports fixed</h2>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=87750">87750</a>: Java Compare references internal API from platform/compare and JDT/Core<br>
-
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input March 22nd 2005
-
-<h2>Problem reports fixed</h2>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=87434">87434</a>: add a link in Synchronize/Compare to Compare/Patch<br>
-
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input February 8th 2005
-
-<h2>Problem reports fixed</h2>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=84487">84487</a>: Patch to put menu path contributions on ResourceMappings<br>
-
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input January 11th 2005
-
-<h2>Problem reports fixed</h2>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=81853">81853</a>: quote problems in property files (compare)<br>
-
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input January 4th 2005
-
-<h2>Problem reports fixed</h2>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=80387">80387</a>: NPE opening compare editor<br>
-
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input December 7th 2004
-
-<h2>Problem reports fixed</h2>
-Eliminated all compiler warnings<br>
-Removed dependency on core.runtime.compatibility
-
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input November 30th 2004
-
-<h2>Problem reports fixed</h2>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=79414">79414</a>: states with same time stamps may appear in the wrong order<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=79566">79566</a>: NPE when closing JUnit compare view<br>
-
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input November 23rd 2004
-
-<h2>Problem reports fixed</h2>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=47786">47786</a>: Possible leak in TextMergeViewer<br>
-Added translatable attribute to extension point schemas.
-
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input November 16th 2004
-
-<h2>Problem reports fixed</h2>
- <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=78679">78679</a>: Prefs Filtered Members field does not restore defaults<br>
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input November 9th 2004
-
-<h2>Problem reports fixed</h2>
- (partial fix; awaits fix in jdt.ui):
- <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=77599">77599</a>: [5.0] Structure comparing of enums does not work<br>
-
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input November 1st 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>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=74450">74450</a>: AbstractUIPlugin.initializeDefaultPreferences no longer called?<br>
-
-
-<h1><hr WIDTH="100%"></h1>
-Eclipse Build Input August 24th 2004
-
-<h2>Problem reports fixed</h2>
-Eliminated compiler warnings
-
-
-<h1><hr WIDTH="100%"></h1>
-Eclipse Build Input July 27th 2004
-
-<h2>Problem reports fixed</h2>
-Updated version number in plugin.xml and export script to 3.1
</body>
diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
index dbca465..d23b612 100644
--- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
+++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
@@ -515,20 +515,13 @@
}
public static ImageDescriptor getImageDescriptor(String relativePath) {
-
- URL installURL= null;
- if (fgComparePlugin != null)
- installURL= fgComparePlugin.getBundle().getEntry("/"); //$NON-NLS-1$
-
- if (installURL != null) {
- try {
- URL url= new URL(installURL, Utilities.getIconPath(null) + relativePath);
- return ImageDescriptor.createFromURL(url);
- } catch (MalformedURLException e) {
- Assert.isTrue(false);
- }
- }
- return null;
+ if (fgComparePlugin == null)
+ return null;
+ IPath path= Utilities.getIconPath(null).append(relativePath);
+ URL url= Platform.find(fgComparePlugin.getBundle(), path);
+ if (url == null)
+ return null;
+ return ImageDescriptor.createFromURL(url);
}
/**
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 55cb160..5ccb920 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
@@ -31,8 +31,10 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.ui.*;
@@ -47,6 +49,8 @@
*/
public class Utilities {
+ private static final IPath ICONS_PATH= new Path("$nl$/icons/full/"); //$NON-NLS-1$
+
public static void registerAction(IKeyBindingService kbs, IAction a, String id) {
if (kbs != null) {
a.setActionDefinitionId(id);
@@ -186,8 +190,8 @@
return bos.toByteArray();
}
- public static String getIconPath(Display display) {
- return "icons/full/"; //$NON-NLS-1$
+ public static IPath getIconPath(Display display) {
+ return ICONS_PATH;
}
/*
diff --git a/bundles/org.eclipse.compare/old_buildnotes_compare_3_1.html b/bundles/org.eclipse.compare/old_buildnotes_compare_3_1.html
new file mode 100755
index 0000000..f300b27
--- /dev/null
+++ b/bundles/org.eclipse.compare/old_buildnotes_compare_3_1.html
@@ -0,0 +1,170 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <meta name="GENERATOR" content="Mozilla/4.75 [en] (WinNT; U) [Netscape]">
+ <meta name="Author" content="IBM">
+ <title>Eclipse Platform Release Notes - Desktop</title>
+</head>
+<body>
+
+<h1>
+Eclipse Platform Build Notes<br>
+Compare</h1>
+
+Eclipse Build Input 3.1RC2 2005
+
+<h2>Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=98828">98828</a>: CompareFilter bug filtering folders<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=67888">67888</a>: [accessibility] Go To Next Difference stops working on reuse of editor<br>
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input May 12th 2005
+
+<h2>Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93561">93561</a>: ResouceMapping changed to Internal<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=91005">91005</a>: reusing compare editor does not update title if filename stays the same<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93810">93810</a>: Method extractPair(String, char, int[]) in Patcher.java fails on single number in range<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93901">93901</a>: Applying patch with one line added inserts new line one line above<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=78653">78653</a>: Eclipse compare support does not appear to use file inspection correctly<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=78652">78652</a>: content type should be bound hierarchically<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93924">93924</a>: Add keywords to preference pages<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=94077">94077</a>: IndexOutOfBounds applying patch<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=91211">91211</a>: Apply patch doesn't work for files with missing line endings<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=92270">92270</a>: compare should use content-based content type matching<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=69920">69920</a>: Compare should show png, bmp, etc. as image<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=94420">94420</a>: [Preferences] Widget is disposed in Compare/Patch<br>
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input April 19th 2005
+
+<h2>Problem reports fixed</h2>
+Converted Compare plug-in folder to jar<br>
+Converted to new NLS scheme<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input April 12th 2005
+
+<h2>Problem reports fixed</h2>
+Added MANIFEST.MF<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input March 29nd 2005
+
+<h2>Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=87750">87750</a>: Java Compare references internal API from platform/compare and JDT/Core<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input March 22nd 2005
+
+<h2>Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=87434">87434</a>: add a link in Synchronize/Compare to Compare/Patch<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input February 8th 2005
+
+<h2>Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=84487">84487</a>: Patch to put menu path contributions on ResourceMappings<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input January 11th 2005
+
+<h2>Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=81853">81853</a>: quote problems in property files (compare)<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input January 4th 2005
+
+<h2>Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=80387">80387</a>: NPE opening compare editor<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input December 7th 2004
+
+<h2>Problem reports fixed</h2>
+Eliminated all compiler warnings<br>
+Removed dependency on core.runtime.compatibility
+
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input November 30th 2004
+
+<h2>Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=79414">79414</a>: states with same time stamps may appear in the wrong order<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=79566">79566</a>: NPE when closing JUnit compare view<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input November 23rd 2004
+
+<h2>Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=47786">47786</a>: Possible leak in TextMergeViewer<br>
+Added translatable attribute to extension point schemas.
+
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input November 16th 2004
+
+<h2>Problem reports fixed</h2>
+ <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=78679">78679</a>: Prefs Filtered Members field does not restore defaults<br>
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input November 9th 2004
+
+<h2>Problem reports fixed</h2>
+ (partial fix; awaits fix in jdt.ui):
+ <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=77599">77599</a>: [5.0] Structure comparing of enums does not work<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input November 1st 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>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=74450">74450</a>: AbstractUIPlugin.initializeDefaultPreferences no longer called?<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+Eclipse Build Input August 24th 2004
+
+<h2>Problem reports fixed</h2>
+Eliminated compiler warnings
+
+
+<h1><hr WIDTH="100%"></h1>
+Eclipse Build Input July 27th 2004
+
+<h2>Problem reports fixed</h2>
+Updated version number in plugin.xml and export script to 3.1
+
+
+</body>
+</html>
diff --git a/bundles/org.eclipse.compare/plugin.xml b/bundles/org.eclipse.compare/plugin.xml
index 6dbdcce..c0f15be 100644
--- a/bundles/org.eclipse.compare/plugin.xml
+++ b/bundles/org.eclipse.compare/plugin.xml
@@ -78,7 +78,7 @@
point="org.eclipse.ui.editors">
<editor
name="%defaultCompareEditor.name"
- icon="icons/full/eview16/compare_view.gif"
+ icon="$nl$/icons/full/eview16/compare_view.gif"
contributorClass="org.eclipse.compare.internal.CompareEditorContributor"
class="org.eclipse.compare.internal.CompareEditor"
id="org.eclipse.compare.CompareEditor">
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 f300b27..7f033c3 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,158 +12,11 @@
Eclipse Platform Build Notes<br>
Compare</h1>
-Eclipse Build Input 3.1RC2 2005
+Eclipse Build Input 3.2 M1 2005
<h2>Problem reports fixed</h2>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=98828">98828</a>: CompareFilter bug filtering folders<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=67888">67888</a>: [accessibility] Go To Next Difference stops working on reuse of editor<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=105230">105230</a>: [BIDI] need to add $nl$/ to icon paths for reversed icons<br>
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input May 12th 2005
-
-<h2>Problem reports fixed</h2>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93561">93561</a>: ResouceMapping changed to Internal<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=91005">91005</a>: reusing compare editor does not update title if filename stays the same<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93810">93810</a>: Method extractPair(String, char, int[]) in Patcher.java fails on single number in range<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93901">93901</a>: Applying patch with one line added inserts new line one line above<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=78653">78653</a>: Eclipse compare support does not appear to use file inspection correctly<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=78652">78652</a>: content type should be bound hierarchically<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93924">93924</a>: Add keywords to preference pages<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=94077">94077</a>: IndexOutOfBounds applying patch<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=91211">91211</a>: Apply patch doesn't work for files with missing line endings<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=92270">92270</a>: compare should use content-based content type matching<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=69920">69920</a>: Compare should show png, bmp, etc. as image<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=94420">94420</a>: [Preferences] Widget is disposed in Compare/Patch<br>
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input April 19th 2005
-
-<h2>Problem reports fixed</h2>
-Converted Compare plug-in folder to jar<br>
-Converted to new NLS scheme<br>
-
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input April 12th 2005
-
-<h2>Problem reports fixed</h2>
-Added MANIFEST.MF<br>
-
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input March 29nd 2005
-
-<h2>Problem reports fixed</h2>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=87750">87750</a>: Java Compare references internal API from platform/compare and JDT/Core<br>
-
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input March 22nd 2005
-
-<h2>Problem reports fixed</h2>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=87434">87434</a>: add a link in Synchronize/Compare to Compare/Patch<br>
-
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input February 8th 2005
-
-<h2>Problem reports fixed</h2>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=84487">84487</a>: Patch to put menu path contributions on ResourceMappings<br>
-
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input January 11th 2005
-
-<h2>Problem reports fixed</h2>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=81853">81853</a>: quote problems in property files (compare)<br>
-
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input January 4th 2005
-
-<h2>Problem reports fixed</h2>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=80387">80387</a>: NPE opening compare editor<br>
-
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input December 7th 2004
-
-<h2>Problem reports fixed</h2>
-Eliminated all compiler warnings<br>
-Removed dependency on core.runtime.compatibility
-
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input November 30th 2004
-
-<h2>Problem reports fixed</h2>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=79414">79414</a>: states with same time stamps may appear in the wrong order<br>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=79566">79566</a>: NPE when closing JUnit compare view<br>
-
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input November 23rd 2004
-
-<h2>Problem reports fixed</h2>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=47786">47786</a>: Possible leak in TextMergeViewer<br>
-Added translatable attribute to extension point schemas.
-
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input November 16th 2004
-
-<h2>Problem reports fixed</h2>
- <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=78679">78679</a>: Prefs Filtered Members field does not restore defaults<br>
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input November 9th 2004
-
-<h2>Problem reports fixed</h2>
- (partial fix; awaits fix in jdt.ui):
- <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=77599">77599</a>: [5.0] Structure comparing of enums does not work<br>
-
-
-<h1><hr WIDTH="100%"></h1>
-
-Eclipse Build Input November 1st 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>
-<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=74450">74450</a>: AbstractUIPlugin.initializeDefaultPreferences no longer called?<br>
-
-
-<h1><hr WIDTH="100%"></h1>
-Eclipse Build Input August 24th 2004
-
-<h2>Problem reports fixed</h2>
-Eliminated compiler warnings
-
-
-<h1><hr WIDTH="100%"></h1>
-Eclipse Build Input July 27th 2004
-
-<h2>Problem reports fixed</h2>
-Updated version number in plugin.xml and export script to 3.1
</body>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
index dbca465..d23b612 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/CompareUIPlugin.java
@@ -515,20 +515,13 @@
}
public static ImageDescriptor getImageDescriptor(String relativePath) {
-
- URL installURL= null;
- if (fgComparePlugin != null)
- installURL= fgComparePlugin.getBundle().getEntry("/"); //$NON-NLS-1$
-
- if (installURL != null) {
- try {
- URL url= new URL(installURL, Utilities.getIconPath(null) + relativePath);
- return ImageDescriptor.createFromURL(url);
- } catch (MalformedURLException e) {
- Assert.isTrue(false);
- }
- }
- return null;
+ if (fgComparePlugin == null)
+ return null;
+ IPath path= Utilities.getIconPath(null).append(relativePath);
+ URL url= Platform.find(fgComparePlugin.getBundle(), path);
+ if (url == null)
+ return null;
+ return ImageDescriptor.createFromURL(url);
}
/**
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
index 55cb160..5ccb920 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/compare/org/eclipse/compare/internal/Utilities.java
@@ -31,8 +31,10 @@
import org.eclipse.core.resources.IResource;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IAdaptable;
+import org.eclipse.core.runtime.IPath;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.MultiStatus;
+import org.eclipse.core.runtime.Path;
import org.eclipse.core.runtime.Status;
import org.eclipse.ui.*;
@@ -47,6 +49,8 @@
*/
public class Utilities {
+ private static final IPath ICONS_PATH= new Path("$nl$/icons/full/"); //$NON-NLS-1$
+
public static void registerAction(IKeyBindingService kbs, IAction a, String id) {
if (kbs != null) {
a.setActionDefinitionId(id);
@@ -186,8 +190,8 @@
return bos.toByteArray();
}
- public static String getIconPath(Display display) {
- return "icons/full/"; //$NON-NLS-1$
+ public static IPath getIconPath(Display display) {
+ return ICONS_PATH;
}
/*
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/old_buildnotes_compare_3_1.html b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/old_buildnotes_compare_3_1.html
new file mode 100755
index 0000000..f300b27
--- /dev/null
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/old_buildnotes_compare_3_1.html
@@ -0,0 +1,170 @@
+<!doctype html public "-//w3c//dtd html 4.0 transitional//en">
+<html>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+ <meta name="GENERATOR" content="Mozilla/4.75 [en] (WinNT; U) [Netscape]">
+ <meta name="Author" content="IBM">
+ <title>Eclipse Platform Release Notes - Desktop</title>
+</head>
+<body>
+
+<h1>
+Eclipse Platform Build Notes<br>
+Compare</h1>
+
+Eclipse Build Input 3.1RC2 2005
+
+<h2>Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=98828">98828</a>: CompareFilter bug filtering folders<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=67888">67888</a>: [accessibility] Go To Next Difference stops working on reuse of editor<br>
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input May 12th 2005
+
+<h2>Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93561">93561</a>: ResouceMapping changed to Internal<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=91005">91005</a>: reusing compare editor does not update title if filename stays the same<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93810">93810</a>: Method extractPair(String, char, int[]) in Patcher.java fails on single number in range<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93901">93901</a>: Applying patch with one line added inserts new line one line above<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=78653">78653</a>: Eclipse compare support does not appear to use file inspection correctly<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=78652">78652</a>: content type should be bound hierarchically<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=93924">93924</a>: Add keywords to preference pages<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=94077">94077</a>: IndexOutOfBounds applying patch<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=91211">91211</a>: Apply patch doesn't work for files with missing line endings<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=92270">92270</a>: compare should use content-based content type matching<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=69920">69920</a>: Compare should show png, bmp, etc. as image<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=94420">94420</a>: [Preferences] Widget is disposed in Compare/Patch<br>
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input April 19th 2005
+
+<h2>Problem reports fixed</h2>
+Converted Compare plug-in folder to jar<br>
+Converted to new NLS scheme<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input April 12th 2005
+
+<h2>Problem reports fixed</h2>
+Added MANIFEST.MF<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input March 29nd 2005
+
+<h2>Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=87750">87750</a>: Java Compare references internal API from platform/compare and JDT/Core<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input March 22nd 2005
+
+<h2>Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=87434">87434</a>: add a link in Synchronize/Compare to Compare/Patch<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input February 8th 2005
+
+<h2>Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=84487">84487</a>: Patch to put menu path contributions on ResourceMappings<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input January 11th 2005
+
+<h2>Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=81853">81853</a>: quote problems in property files (compare)<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input January 4th 2005
+
+<h2>Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=80387">80387</a>: NPE opening compare editor<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input December 7th 2004
+
+<h2>Problem reports fixed</h2>
+Eliminated all compiler warnings<br>
+Removed dependency on core.runtime.compatibility
+
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input November 30th 2004
+
+<h2>Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=79414">79414</a>: states with same time stamps may appear in the wrong order<br>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=79566">79566</a>: NPE when closing JUnit compare view<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input November 23rd 2004
+
+<h2>Problem reports fixed</h2>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=47786">47786</a>: Possible leak in TextMergeViewer<br>
+Added translatable attribute to extension point schemas.
+
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input November 16th 2004
+
+<h2>Problem reports fixed</h2>
+ <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=78679">78679</a>: Prefs Filtered Members field does not restore defaults<br>
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input November 9th 2004
+
+<h2>Problem reports fixed</h2>
+ (partial fix; awaits fix in jdt.ui):
+ <a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=77599">77599</a>: [5.0] Structure comparing of enums does not work<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+
+Eclipse Build Input November 1st 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>
+<a href="http://dev.eclipse.org/bugs/show_bug.cgi?id=74450">74450</a>: AbstractUIPlugin.initializeDefaultPreferences no longer called?<br>
+
+
+<h1><hr WIDTH="100%"></h1>
+Eclipse Build Input August 24th 2004
+
+<h2>Problem reports fixed</h2>
+Eliminated compiler warnings
+
+
+<h1><hr WIDTH="100%"></h1>
+Eclipse Build Input July 27th 2004
+
+<h2>Problem reports fixed</h2>
+Updated version number in plugin.xml and export script to 3.1
+
+
+</body>
+</html>
diff --git a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml
index 6dbdcce..c0f15be 100644
--- a/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml
+++ b/bundles/org.eclipse.compare/plugins/org.eclipse.compare/plugin.xml
@@ -78,7 +78,7 @@
point="org.eclipse.ui.editors">
<editor
name="%defaultCompareEditor.name"
- icon="icons/full/eview16/compare_view.gif"
+ icon="$nl$/icons/full/eview16/compare_view.gif"
contributorClass="org.eclipse.compare.internal.CompareEditorContributor"
class="org.eclipse.compare.internal.CompareEditor"
id="org.eclipse.compare.CompareEditor">
