Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabian Miehe2014-11-03 13:35:15 +0000
committerLars Vogel2014-11-03 19:25:24 +0000
commit8eec9e22b9122d8efed427d44540c7792204fd08 (patch)
tree02501aa483d662f6bb076cd7af50834bad5fafda
parent9c12412e5362e72c9a3559d8a7055e2d181459a1 (diff)
downloadeclipse.platform.ui-8eec9e22b9122d8efed427d44540c7792204fd08.tar.gz
eclipse.platform.ui-8eec9e22b9122d8efed427d44540c7792204fd08.tar.xz
eclipse.platform.ui-8eec9e22b9122d8efed427d44540c7792204fd08.zip
Bug 440366 Make FilteredTree available for Eclipse 4 RCP application
Change-Id: Ibcce333e5b6b8c00a5961e754f86cb942652ba99 Signed-off-by: Fabian Miehe <fabian.miehe@cassidian.com>
-rw-r--r--bundles/org.eclipse.e4.ui.dialogs/META-INF/MANIFEST.MF3
-rw-r--r--bundles/org.eclipse.e4.ui.dialogs/build.properties3
-rw-r--r--bundles/org.eclipse.e4.ui.dialogs/src/org/eclipse/e4/ui/dialogs/filteredtree/FilteredTree.java4
3 files changed, 6 insertions, 4 deletions
diff --git a/bundles/org.eclipse.e4.ui.dialogs/META-INF/MANIFEST.MF b/bundles/org.eclipse.e4.ui.dialogs/META-INF/MANIFEST.MF
index d0fc3394afb..41763ef574d 100644
--- a/bundles/org.eclipse.e4.ui.dialogs/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.e4.ui.dialogs/META-INF/MANIFEST.MF
@@ -5,7 +5,8 @@ Bundle-SymbolicName: org.eclipse.e4.ui.dialogs
Bundle-Version: 1.0.0.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: %providerName
-Export-Package: org.eclipse.e4.ui.dialogs;x-internal:=true
+Export-Package: org.eclipse.e4.ui.dialogs;x-internal:=true,
+ org.eclipse.e4.ui.dialogs.filteredtree;x-internal:=true
Require-Bundle: org.eclipse.jface;bundle-version="3.11.0",
com.ibm.icu,
org.eclipse.core.runtime;bundle-version="3.10.0"
diff --git a/bundles/org.eclipse.e4.ui.dialogs/build.properties b/bundles/org.eclipse.e4.ui.dialogs/build.properties
index b67aba1a416..e84c2f4f63b 100644
--- a/bundles/org.eclipse.e4.ui.dialogs/build.properties
+++ b/bundles/org.eclipse.e4.ui.dialogs/build.properties
@@ -3,4 +3,5 @@ output.. = bin/
bin.includes = META-INF/,\
.,\
plugin.properties,\
- about.html
+ about.html,\
+ icons/
diff --git a/bundles/org.eclipse.e4.ui.dialogs/src/org/eclipse/e4/ui/dialogs/filteredtree/FilteredTree.java b/bundles/org.eclipse.e4.ui.dialogs/src/org/eclipse/e4/ui/dialogs/filteredtree/FilteredTree.java
index 7c2dd738e97..d74ddcc7dcc 100644
--- a/bundles/org.eclipse.e4.ui.dialogs/src/org/eclipse/e4/ui/dialogs/filteredtree/FilteredTree.java
+++ b/bundles/org.eclipse.e4.ui.dialogs/src/org/eclipse/e4/ui/dialogs/filteredtree/FilteredTree.java
@@ -176,14 +176,14 @@ public class FilteredTree extends Composite {
*/
static {
Bundle bundle = FrameworkUtil.getBundle(FilteredTree.class);
- IPath enabledPath = new Path("$nl$/icons/full/etool16/clear_co.gif");
+ IPath enabledPath = new Path("$nl$/icons/full/etool16/clear_co.png");
URL enabledURL = FileLocator.find(bundle, enabledPath, null);
ImageDescriptor enabledDesc = ImageDescriptor.createFromURL(enabledURL);
if (enabledDesc != null) {
JFaceResources.getImageRegistry().put(CLEAR_ICON, enabledDesc);
}
- IPath disabledPath = new Path("$nl$/icons/full/etool16/clear_co.gif");
+ IPath disabledPath = new Path("$nl$/icons/full/dtool16/clear_co.png");
URL disabledURL = FileLocator.find(bundle, disabledPath, null);
ImageDescriptor disabledDesc = ImageDescriptor
.createFromURL(disabledURL);

Back to the top