From 36e50950b43cb20d802bab074cc4c49f2babcf5e Mon Sep 17 00:00:00 2001 From: Jeff Johnston Date: Tue, 26 May 2015 17:16:50 -0400 Subject: [PATCH] Fix for bug 468408 - Change to use the launcher plugin instead of the internal Activator from org.eclipse.linuxtools.docker.ui Change-Id: I55c5ee8a70714a76543b6deb029003c9d8a7862c (cherry picked from commit e51f7256e5d4dd395088c14f8e0a0339c397447f) --- .../docker/launcher/SWTImagesFactory.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/SWTImagesFactory.java b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/SWTImagesFactory.java index a43123c22f9..9702eaeeebf 100644 --- a/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/SWTImagesFactory.java +++ b/launch/org.eclipse.cdt.docker.launcher/src/org/eclipse/cdt/internal/docker/launcher/SWTImagesFactory.java @@ -13,15 +13,16 @@ package org.eclipse.cdt.internal.docker.launcher; import java.net.MalformedURLException; import java.net.URL; +import org.eclipse.cdt.docker.launcher.DockerLaunchUIPlugin; import org.eclipse.jface.action.IAction; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.resource.ImageRegistry; -import org.eclipse.linuxtools.docker.ui.Activator; import org.eclipse.swt.graphics.Image; public class SWTImagesFactory { // The plug-in registry - private static ImageRegistry imageRegistry = Activator.getDefault() + private static ImageRegistry imageRegistry = DockerLaunchUIPlugin + .getDefault() .getImageRegistry(); // Sub-directory (under the package containing this class) where 16 color @@ -30,13 +31,16 @@ public class SWTImagesFactory { static { try { - fgIconBaseURL = new URL(Activator.getDefault().getBundle() + fgIconBaseURL = new URL( + DockerLaunchUIPlugin.getDefault().getBundle() .getEntry("/"), "icons/"); //$NON-NLS-1$ //$NON-NLS-2$ } catch (MalformedURLException e) { - Activator.log(e); + DockerLaunchUIPlugin.log(e); } } - private static final String NAME_PREFIX = Activator.PLUGIN_ID + '.'; + + private static final String NAME_PREFIX = DockerLaunchUIPlugin.PLUGIN_ID + + '.'; private static final int NAME_PREFIX_LENGTH = NAME_PREFIX.length(); public static final String IMG_DOCKER_SMALL = NAME_PREFIX + "docker_small.gif"; //$NON-NLS-1$ @@ -69,7 +73,7 @@ public class SWTImagesFactory { try { return new URL(fgIconBaseURL, buffer.toString()); } catch (MalformedURLException e) { - Activator.log(e); + DockerLaunchUIPlugin.log(e); return null; } }