diff options
author | Wim Jongman | 2018-05-21 18:01:29 +0000 |
---|---|---|
committer | Wim Jongman | 2018-05-21 18:01:29 +0000 |
commit | 27a67c51418f533eaa785e3c83ccc200edb88c4d (patch) | |
tree | 1f09bcae5597ed1a9e3003d95ff45e77b1ff4cac | |
parent | 22cef14145400b4f47d47c0f74e6f33a8dab1719 (diff) | |
download | eclipse.platform.ua-27a67c51418f533eaa785e3c83ccc200edb88c4d.tar.gz eclipse.platform.ua-27a67c51418f533eaa785e3c83ccc200edb88c4d.tar.xz eclipse.platform.ua-27a67c51418f533eaa785e3c83ccc200edb88c4d.zip |
Bug 534920: [Tips] Make sure tips can run on NeonI20180522-0800
Fixed
Change-Id: I517e58b39e500912c22d822756b1fe78c1d45538
Signed-off-by: Wim Jongman <wim.jongman@remainsoftware.com>
-rw-r--r-- | org.eclipse.tips.core/META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | org.eclipse.tips.examples/META-INF/MANIFEST.MF | 2 | ||||
-rw-r--r-- | org.eclipse.tips.ide/META-INF/MANIFEST.MF | 8 | ||||
-rw-r--r-- | org.eclipse.tips.json/META-INF/MANIFEST.MF | 4 | ||||
-rw-r--r-- | org.eclipse.tips.tests/META-INF/MANIFEST.MF | 4 | ||||
-rw-r--r-- | org.eclipse.tips.ui/META-INF/MANIFEST.MF | 4 | ||||
-rw-r--r-- | org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/util/ResourceManager.java | 56 |
7 files changed, 44 insertions, 36 deletions
diff --git a/org.eclipse.tips.core/META-INF/MANIFEST.MF b/org.eclipse.tips.core/META-INF/MANIFEST.MF index e769edbb4..bdb9f6b50 100644 --- a/org.eclipse.tips.core/META-INF/MANIFEST.MF +++ b/org.eclipse.tips.core/META-INF/MANIFEST.MF @@ -7,5 +7,5 @@ Bundle-Vendor: %Bundle-Vendor Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.tips.core, org.eclipse.tips.core.internal;x-internal:=true -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.13.0" +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0" Automatic-Module-Name: org.eclipse.tips.core diff --git a/org.eclipse.tips.examples/META-INF/MANIFEST.MF b/org.eclipse.tips.examples/META-INF/MANIFEST.MF index 7dd6c1b4d..b1e19a610 100644 --- a/org.eclipse.tips.examples/META-INF/MANIFEST.MF +++ b/org.eclipse.tips.examples/META-INF/MANIFEST.MF @@ -5,7 +5,7 @@ Bundle-SymbolicName: org.eclipse.tips.examples;singleton:=true Bundle-Version: 0.1.0.qualifier Bundle-Vendor: Eclipse Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.13.0", +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0", org.eclipse.tips.core;bundle-version="0.1.0", org.eclipse.tips.json;bundle-version="0.1.0", org.eclipse.swt, diff --git a/org.eclipse.tips.ide/META-INF/MANIFEST.MF b/org.eclipse.tips.ide/META-INF/MANIFEST.MF index 8a40c4301..d0887fdde 100644 --- a/org.eclipse.tips.ide/META-INF/MANIFEST.MF +++ b/org.eclipse.tips.ide/META-INF/MANIFEST.MF @@ -4,10 +4,10 @@ Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.tips.ide;singleton:=true Bundle-Version: 0.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.ui;bundle-version="3.109.0", - org.eclipse.core.runtime;bundle-version="3.13.0", - org.eclipse.core.expressions;bundle-version="3.6.0", - org.eclipse.e4.ui.workbench;bundle-version="1.5.1", +Require-Bundle: org.eclipse.ui;bundle-version="3.108.0", + org.eclipse.core.runtime;bundle-version="3.12.0", + org.eclipse.core.expressions;bundle-version="3.5.0", + org.eclipse.e4.ui.workbench;bundle-version="1.4.0", org.eclipse.tips.core;bundle-version="0.1.0", org.eclipse.tips.ui;bundle-version="0.1.0", org.eclipse.tips.json diff --git a/org.eclipse.tips.json/META-INF/MANIFEST.MF b/org.eclipse.tips.json/META-INF/MANIFEST.MF index b29575c6e..1f18a204f 100644 --- a/org.eclipse.tips.json/META-INF/MANIFEST.MF +++ b/org.eclipse.tips.json/META-INF/MANIFEST.MF @@ -4,8 +4,8 @@ Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.tips.json;singleton:=true Bundle-Version: 0.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.13.0", - org.eclipse.jface;bundle-version="3.13.1", +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0", + org.eclipse.jface;bundle-version="3.12.0", org.eclipse.tips.core;bundle-version="0.1.0" Export-Package: org.eclipse.tips.json, org.eclipse.tips.json.internal;x-internal:=true diff --git a/org.eclipse.tips.tests/META-INF/MANIFEST.MF b/org.eclipse.tips.tests/META-INF/MANIFEST.MF index 7df8e332e..6374bdb27 100644 --- a/org.eclipse.tips.tests/META-INF/MANIFEST.MF +++ b/org.eclipse.tips.tests/META-INF/MANIFEST.MF @@ -8,9 +8,9 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Require-Bundle: org.junit;bundle-version="4.12.0", org.eclipse.tips.examples;bundle-version="0.1.0", org.eclipse.tips.ide;bundle-version="0.1.0", - org.eclipse.core.runtime;bundle-version="3.13.0", + org.eclipse.core.runtime;bundle-version="3.12.0", org.eclipse.swt, - org.eclipse.jface;bundle-version="3.13.2", + org.eclipse.jface;bundle-version="3.12.0", org.eclipse.tips.core;bundle-version="0.1.0", org.eclipse.tips.ui;bundle-version="0.1.0", org.eclipse.tips.json;bundle-version="0.1.0" diff --git a/org.eclipse.tips.ui/META-INF/MANIFEST.MF b/org.eclipse.tips.ui/META-INF/MANIFEST.MF index a1e3037c2..dd8005e9b 100644 --- a/org.eclipse.tips.ui/META-INF/MANIFEST.MF +++ b/org.eclipse.tips.ui/META-INF/MANIFEST.MF @@ -4,8 +4,8 @@ Bundle-Name: %Bundle-Name Bundle-SymbolicName: org.eclipse.tips.ui;singleton:=true Bundle-Version: 0.1.0.qualifier Bundle-RequiredExecutionEnvironment: JavaSE-1.8 -Require-Bundle: org.eclipse.core.runtime;bundle-version="3.13.0", - org.eclipse.jface;bundle-version="3.13.1", +Require-Bundle: org.eclipse.core.runtime;bundle-version="3.12.0", + org.eclipse.jface;bundle-version="3.12.0", org.eclipse.tips.core;bundle-version="0.1.0" Export-Package: org.eclipse.tips.ui, org.eclipse.tips.ui.internal, diff --git a/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/util/ResourceManager.java b/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/util/ResourceManager.java index e20fe6204..b27dd6300 100644 --- a/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/util/ResourceManager.java +++ b/org.eclipse.tips.ui/src/org/eclipse/tips/ui/internal/util/ResourceManager.java @@ -51,25 +51,29 @@ public class ResourceManager extends SWTResourceManager { private static Map<ImageDescriptor, Image> m_descriptorImageMap = new HashMap<>(); /** - * Returns an {@link ImageDescriptor} stored in the file at the specified path - * relative to the specified class. + * Returns an {@link ImageDescriptor} stored in the file at the specified + * path relative to the specified class. * * @param clazz - * the {@link Class} relative to which to find the image descriptor. + * the {@link Class} relative to which to find the image + * descriptor. * @param path * the path to the image file. - * @return the {@link ImageDescriptor} stored in the file at the specified path. + * @return the {@link ImageDescriptor} stored in the file at the specified + * path. */ public static ImageDescriptor getImageDescriptor(Class<?> clazz, String path) { return ImageDescriptor.createFromFile(clazz, path); } /** - * Returns an {@link ImageDescriptor} stored in the file at the specified path. + * Returns an {@link ImageDescriptor} stored in the file at the specified + * path. * * @param path * the path to the image file. - * @return the {@link ImageDescriptor} stored in the file at the specified path. + * @return the {@link ImageDescriptor} stored in the file at the specified + * path. */ public static ImageDescriptor getImageDescriptor(String path) { try { @@ -105,7 +109,8 @@ public class ResourceManager extends SWTResourceManager { private static Map<Image, Map<Image, Image>>[] m_decoratedImageMap = new Map[LAST_CORNER_KEY]; /** - * Returns an {@link Image} composed of a base image decorated by another image. + * Returns an {@link Image} composed of a base image decorated by another + * image. * * @param baseImage * the base {@link Image} that should be decorated. @@ -118,7 +123,8 @@ public class ResourceManager extends SWTResourceManager { } /** - * Returns an {@link Image} composed of a base image decorated by another image. + * Returns an {@link Image} composed of a base image decorated by another + * image. * * @param baseImage * the base {@link Image} that should be decorated. @@ -151,16 +157,15 @@ public class ResourceManager extends SWTResourceManager { CompositeImageDescriptor compositImageDesc = new CompositeImageDescriptor() { @Override protected void drawCompositeImage(int width, int height) { - drawImage(createCachedImageDataProvider(baseImage), 0, 0); + drawImage(baseImage.getImageData(), 0, 0); if (corner == TOP_LEFT) { - drawImage(createCachedImageDataProvider(decorator), 0, 0); + drawImage(decorator.getImageData(), 0, 0); } else if (corner == TOP_RIGHT) { - drawImage(createCachedImageDataProvider(decorator), bib.width - dib.width, 0); + drawImage(decorator.getImageData(), bib.width - dib.width, 0); } else if (corner == BOTTOM_LEFT) { - drawImage(createCachedImageDataProvider(decorator), 0, bib.height - dib.height); + drawImage(decorator.getImageData(), 0, bib.height - dib.height); } else if (corner == BOTTOM_RIGHT) { - drawImage(createCachedImageDataProvider(decorator), bib.width - dib.width, - bib.height - dib.height); + drawImage(decorator.getImageData(), bib.width - dib.width, bib.height - dib.height); } } @@ -227,8 +232,8 @@ public class ResourceManager extends SWTResourceManager { } /** - * Instance of {@link PluginResourceProvider}, used by WindowBuilder at design - * time. + * Instance of {@link PluginResourceProvider}, used by WindowBuilder at + * design time. */ private static PluginResourceProvider m_designTimePluginResourceProvider = null; @@ -257,7 +262,8 @@ public class ResourceManager extends SWTResourceManager { } /** - * Returns an {@link Image} based on a {@link Bundle} and resource entry path. + * Returns an {@link Image} based on a {@link Bundle} and resource entry + * path. * * @param symbolicName * the symbolic name of the {@link Bundle}. @@ -308,9 +314,11 @@ public class ResourceManager extends SWTResourceManager { * the plugin {@link Object} containing the image. * @param name * the path to th eimage within the plugin. - * @return the {@link ImageDescriptor} stored in the file at the specified path. + * @return the {@link ImageDescriptor} stored in the file at the specified + * path. * - * @deprecated Use {@link #getPluginImageDescriptor(String, String)} instead. + * @deprecated Use {@link #getPluginImageDescriptor(String, String)} + * instead. */ @Deprecated public static ImageDescriptor getPluginImageDescriptor(Object plugin, String name) { @@ -335,8 +343,8 @@ public class ResourceManager extends SWTResourceManager { * the symbolic name of the {@link Bundle}. * @param path * the path of the resource entry. - * @return the {@link ImageDescriptor} based on a {@link Bundle} and resource - * entry path. + * @return the {@link ImageDescriptor} based on a {@link Bundle} and + * resource entry path. */ public static ImageDescriptor getPluginImageDescriptor(String symbolicName, String path) { try { @@ -423,9 +431,9 @@ public class ResourceManager extends SWTResourceManager { // //////////////////////////////////////////////////////////////////////////// /** - * Dispose of cached objects and their underlying OS resources. This should only - * be called when the cached objects are no longer needed (e.g. on application - * shutdown). + * Dispose of cached objects and their underlying OS resources. This should + * only be called when the cached objects are no longer needed (e.g. on + * application shutdown). */ public static void dispose() { disposeColors(); |