NEW - bug 359317: clean up icons in context.ui

https://bugs.eclipse.org/bugs/show_bug.cgi?id=359317

6 files changed, 82 insertions, 15 deletions

diff --git a/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/JavaContextLabelProvider.java b/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/JavaContextLabelProvider.java
index 8de72743..3d2e0d9e 100644
--- a/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/JavaContextLabelProvider.java
+++ b/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/JavaContextLabelProvider.java
@@ -23,7 +23,6 @@ import org.eclipse.jface.resource.ImageDescriptor;
 import org.eclipse.mylyn.context.core.IInteractionElement;
 import org.eclipse.mylyn.context.core.IInteractionRelation;
 import org.eclipse.mylyn.internal.context.core.InteractionContextManager;
-import org.eclipse.mylyn.internal.context.ui.ContextUiImages;
 import org.eclipse.mylyn.internal.java.ui.JavaStructureBridge;
 import org.eclipse.mylyn.internal.java.ui.JavaUiBridgePlugin;
 import org.eclipse.mylyn.internal.java.ui.search.AbstractJavaRelationProvider;
@@ -32,6 +31,7 @@ import org.eclipse.mylyn.internal.java.ui.search.JavaImplementorsProvider;
 import org.eclipse.mylyn.internal.java.ui.search.JavaReadAccessProvider;
 import org.eclipse.mylyn.internal.java.ui.search.JavaReferencesProvider;
 import org.eclipse.mylyn.internal.java.ui.search.JavaWriteAccessProvider;
+import org.eclipse.mylyn.internal.provisional.commons.ui.CommonImages;
 import org.eclipse.swt.graphics.Image;
 
 /**
@@ -95,7 +95,7 @@ public class JavaContextLabelProvider extends AppearanceAwareLabelProvider {
 		} else if (object instanceof IInteractionRelation) {
 			ImageDescriptor descriptor = getIconForRelationship(((IInteractionRelation) object).getRelationshipHandle());
 			if (descriptor != null) {
-				return ContextUiImages.getImage(descriptor);
+				return CommonImages.getImage(descriptor);
 			} else {
 				return null;
 			}
@@ -105,17 +105,17 @@ public class JavaContextLabelProvider extends AppearanceAwareLabelProvider {
 
 	private ImageDescriptor getIconForRelationship(String relationshipHandle) {
 		if (relationshipHandle.equals(AbstractJavaRelationProvider.ID_GENERIC)) {
-			return ContextUiImages.EDGE_REFERENCE;
+			return SandboxUiImages.EDGE_REFERENCE;
 		} else if (relationshipHandle.equals(JavaReferencesProvider.ID)) {
-			return ContextUiImages.EDGE_REFERENCE;
+			return SandboxUiImages.EDGE_REFERENCE;
 		} else if (relationshipHandle.equals(JavaImplementorsProvider.ID)) {
-			return ContextUiImages.EDGE_INHERITANCE;
+			return SandboxUiImages.EDGE_INHERITANCE;
 		} else if (relationshipHandle.equals(JUnitReferencesProvider.ID)) {
 			return EDGE_REF_JUNIT;
 		} else if (relationshipHandle.equals(JavaWriteAccessProvider.ID)) {
-			return ContextUiImages.EDGE_ACCESS_WRITE;
+			return SandboxUiImages.EDGE_ACCESS_WRITE;
 		} else if (relationshipHandle.equals(JavaReadAccessProvider.ID)) {
-			return ContextUiImages.EDGE_ACCESS_READ;
+			return SandboxUiImages.EDGE_ACCESS_READ;
 		} else {
 			return null;
 		}
diff --git a/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/SandboxUiImages.java b/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/SandboxUiImages.java
new file mode 100644
index 00000000..f95844ab
--- /dev/null
+++ b/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/SandboxUiImages.java
@@ -0,0 +1,67 @@
+/*******************************************************************************
+ * Copyright (c) 2004, 2010 Tasktop Technologies and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Tasktop Technologies - initial API and implementation
+ *******************************************************************************/
+
+package org.eclipse.mylyn.internal.sandbox.ui;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+
+import org.eclipse.jface.resource.ImageDescriptor;
+
+/**
+ * @author Mik Kersten
+ */
+public class SandboxUiImages {
+
+	private static final String T_ELCL = "elcl16"; //$NON-NLS-1$
+
+	private static final String T_TOOL = "etool16"; //$NON-NLS-1$
+
+	private static final URL baseURL = SandboxUiPlugin.getDefault().getBundle().getEntry("/icons/"); //$NON-NLS-1$
+
+	public static final ImageDescriptor COLOR_PALETTE = create(T_ELCL, "color-palette.gif"); //$NON-NLS-1$
+
+	public static final ImageDescriptor STOP_SEARCH = create(T_ELCL, "stop_all.gif"); //$NON-NLS-1$
+
+	public static final ImageDescriptor QUALIFY_NAMES = create(T_TOOL, "qualify-names.gif"); //$NON-NLS-1$
+
+	public static final ImageDescriptor EDGE_INHERITANCE = create(T_ELCL, "edge-inheritance.gif"); //$NON-NLS-1$
+
+	public static final ImageDescriptor EDGE_REFERENCE = create(T_ELCL, "edge-reference.gif"); //$NON-NLS-1$
+
+	public static final ImageDescriptor EDGE_ACCESS_READ = create(T_ELCL, "edge-read.gif"); //$NON-NLS-1$
+
+	public static final ImageDescriptor EDGE_ACCESS_WRITE = create(T_ELCL, "edge-write.gif"); //$NON-NLS-1$
+
+	private static ImageDescriptor create(String prefix, String name) {
+		return create(prefix, name, baseURL);
+	}
+
+	private static ImageDescriptor create(String prefix, String name, URL baseURL) {
+		try {
+			return ImageDescriptor.createFromURL(makeIconFileURL(prefix, name, baseURL));
+		} catch (MalformedURLException e) {
+			return ImageDescriptor.getMissingImageDescriptor();
+		}
+	}
+
+	private static URL makeIconFileURL(String prefix, String name, URL baseURL) throws MalformedURLException {
+		if (baseURL == null) {
+			throw new MalformedURLException();
+		}
+
+		StringBuffer buffer = new StringBuffer(prefix);
+		buffer.append('/');
+		buffer.append(name);
+		return new URL(baseURL, buffer.toString());
+	}
+
+}
diff --git a/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/actions/ShowQualifiedNamesAction.java b/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/actions/ShowQualifiedNamesAction.java
index 6b89f29c..8d15af12 100644
--- a/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/actions/ShowQualifiedNamesAction.java
+++ b/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/actions/ShowQualifiedNamesAction.java
@@ -13,8 +13,8 @@ package org.eclipse.mylyn.internal.sandbox.ui.actions;
 
 import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
-import org.eclipse.mylyn.internal.context.ui.ContextUiImages;
 import org.eclipse.mylyn.internal.context.ui.ContextUiPlugin;
+import org.eclipse.mylyn.internal.sandbox.ui.SandboxUiImages;
 import org.eclipse.mylyn.internal.sandbox.ui.views.ActiveSearchView;
 
 /**
@@ -35,7 +35,7 @@ public class ShowQualifiedNamesAction extends Action {
 		setId(ID);
 		setText(LABEL);
 		setToolTipText(LABEL);
-		setImageDescriptor(ContextUiImages.QUALIFY_NAMES);
+		setImageDescriptor(SandboxUiImages.QUALIFY_NAMES);
 		update(ContextUiPlugin.getDefault().getPreferenceStore().getBoolean(ID));
 	}
 
diff --git a/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/highlighters/EditHighlightersAction.java b/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/highlighters/EditHighlightersAction.java
index ef1de1d4..2ccd8a64 100644
--- a/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/highlighters/EditHighlightersAction.java
+++ b/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/highlighters/EditHighlightersAction.java
@@ -15,7 +15,7 @@ import org.eclipse.jface.action.Action;
 import org.eclipse.jface.action.IAction;
 import org.eclipse.jface.preference.PreferenceDialog;
 import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.mylyn.internal.context.ui.ContextUiImages;
+import org.eclipse.mylyn.internal.sandbox.ui.SandboxUiImages;
 import org.eclipse.ui.IViewActionDelegate;
 import org.eclipse.ui.IViewPart;
 import org.eclipse.ui.PlatformUI;
@@ -34,7 +34,7 @@ public class EditHighlightersAction extends Action implements IViewActionDelegat
 		setText("Edit Highlighters...");
 		setToolTipText("Edit Highlighters...");
 		setId(ID);
-		setImageDescriptor(ContextUiImages.COLOR_PALETTE);
+		setImageDescriptor(SandboxUiImages.COLOR_PALETTE);
 	}
 
 	@Override
diff --git a/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/views/ActiveSearchView.java b/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/views/ActiveSearchView.java
index 29cb8a3d..b0295ac7 100644
--- a/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/views/ActiveSearchView.java
+++ b/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/views/ActiveSearchView.java
@@ -41,11 +41,11 @@ import org.eclipse.mylyn.internal.context.core.AbstractRelationProvider;
 import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
 import org.eclipse.mylyn.internal.context.core.IRelationsListener;
 import org.eclipse.mylyn.internal.context.ui.ActiveViewSelectionDragAdapter;
-import org.eclipse.mylyn.internal.context.ui.ContextUiImages;
 import org.eclipse.mylyn.internal.context.ui.ContextUiPlugin;
 import org.eclipse.mylyn.internal.context.ui.DoiOrderSorter;
 import org.eclipse.mylyn.internal.context.ui.views.ContextNodeOpenListener;
 import org.eclipse.mylyn.internal.sandbox.ui.DelegatingContextLabelProvider;
+import org.eclipse.mylyn.internal.sandbox.ui.SandboxUiImages;
 import org.eclipse.mylyn.internal.sandbox.ui.actions.LinkActiveSearchWithEditorAction;
 import org.eclipse.mylyn.internal.sandbox.ui.actions.ShowQualifiedNamesAction;
 import org.eclipse.mylyn.internal.sandbox.ui.actions.ToggleRelationshipProviderAction;
@@ -335,7 +335,7 @@ public class ActiveSearchView extends ViewPart {
 		};
 		stopAction.setToolTipText(STOP_JOBS_LABEL);
 		stopAction.setText(STOP_JOBS_LABEL);
-		stopAction.setImageDescriptor(ContextUiImages.STOP_SEARCH);
+		stopAction.setImageDescriptor(SandboxUiImages.STOP_SEARCH);
 		manager.add(stopAction);
 		manager.add(new Separator());
 		manager.add(new LinkActiveSearchWithEditorAction());
diff --git a/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/views/RelatedElementsPopupDialog.java b/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/views/RelatedElementsPopupDialog.java
index 60476955..58dcf22e 100644
--- a/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/views/RelatedElementsPopupDialog.java
+++ b/org.eclipse.mylyn.sandbox.ui/src/org/eclipse/mylyn/internal/sandbox/ui/views/RelatedElementsPopupDialog.java
@@ -43,11 +43,11 @@ import org.eclipse.mylyn.context.core.IInteractionRelation;
 import org.eclipse.mylyn.context.ui.ContextUi;
 import org.eclipse.mylyn.internal.context.core.AbstractRelationProvider;
 import org.eclipse.mylyn.internal.context.core.ContextCorePlugin;
-import org.eclipse.mylyn.internal.context.ui.ContextUiImages;
 import org.eclipse.mylyn.internal.context.ui.ContextUiPlugin;
 import org.eclipse.mylyn.internal.context.ui.DoiOrderSorter;
 import org.eclipse.mylyn.internal.context.ui.views.QuickOutlinePatternAndInterestFilter;
 import org.eclipse.mylyn.internal.sandbox.ui.DelegatingContextLabelProvider;
+import org.eclipse.mylyn.internal.sandbox.ui.SandboxUiImages;
 import org.eclipse.mylyn.internal.sandbox.ui.SandboxUiPlugin;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.DisposeEvent;
@@ -794,7 +794,7 @@ public class RelatedElementsPopupDialog extends PopupDialog implements IInformat
 			setId(ID);
 			setText(LABEL);
 			setToolTipText(LABEL);
-			setImageDescriptor(ContextUiImages.QUALIFY_NAMES);
+			setImageDescriptor(SandboxUiImages.QUALIFY_NAMES);
 			update(ContextUiPlugin.getDefault().getPreferenceStore().getBoolean(ID));
 		}