Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Fluegge2010-11-13 16:06:27 +0000
committerMartin Fluegge2010-11-13 16:06:27 +0000
commit1de458e14d3cc89ef59052ba01175e7d20e03497 (patch)
tree36f0bb1eec63e9e6f1f42ebc3325353a3179fa4c /plugins/org.eclipse.net4j.ui/src
parentfde61f3b0bb830b38e16fafa7a3f89e3e54d3235 (diff)
downloadcdo-1de458e14d3cc89ef59052ba01175e7d20e03497.tar.gz
cdo-1de458e14d3cc89ef59052ba01175e7d20e03497.tar.xz
cdo-1de458e14d3cc89ef59052ba01175e7d20e03497.zip
[329632] Create common access mechanism for SharedIcons
https://bugs.eclipse.org/bugs/show_bug.cgi?id=329632
Diffstat (limited to 'plugins/org.eclipse.net4j.ui/src')
-rw-r--r--plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/SharedIcons.java110
-rw-r--r--plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java2
2 files changed, 1 insertions, 111 deletions
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/SharedIcons.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/SharedIcons.java
deleted file mode 100644
index 213915ebfd..0000000000
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/SharedIcons.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * Copyright (c) 2004 - 2010 Eike Stepper (Berlin, Germany) 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:
- * Eike Stepper - initial API and implementation
- */
-package org.eclipse.net4j.internal.ui;
-
-import org.eclipse.net4j.internal.ui.bundle.OM;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-
-/**
- * @author Eike Stepper
- */
-public class SharedIcons
-{
- private static final ImageRegistry REGISTRY = new ImageRegistry(getDisplay());
-
- private static final String ETOOL = "etool16/"; //$NON-NLS-1$
-
- private static final String OBJ = "obj16/"; //$NON-NLS-1$
-
- public static final String OBJ_ACCEPTOR = OBJ + "acceptor"; //$NON-NLS-1$
-
- public static final String OBJ_ADAPTER = OBJ + "adapter"; //$NON-NLS-1$
-
- public static final String OBJ_CHANNEL = OBJ + "channel"; //$NON-NLS-1$
-
- public static final String OBJ_CONNECTOR = OBJ + "connector"; //$NON-NLS-1$
-
- public static final String OBJ_FACTORY = OBJ + "factory"; //$NON-NLS-1$
-
- public static final String OBJ_FOLDER = OBJ + "folder"; //$NON-NLS-1$
-
- public static final String ETOOL_ADD_ACCEPTOR = ETOOL + "add_acceptor"; //$NON-NLS-1$
-
- public static final String ETOOL_ADD_CONNECTOR = ETOOL + "add_connector"; //$NON-NLS-1$
-
- public static final String ETOOL_ADD = ETOOL + "add"; //$NON-NLS-1$
-
- public static final String ETOOL_DELETE = ETOOL + "delete"; //$NON-NLS-1$
-
- public static final String ETOOL_REFRESH = ETOOL + "refresh"; //$NON-NLS-1$
-
- public static Image getImage(String key)
- {
- key = mangleKey(key);
- Image image = REGISTRY.get(key);
- if (image == null)
- {
- createDescriptor(key);
- image = REGISTRY.get(key);
- }
-
- return image;
- }
-
- public static ImageDescriptor getDescriptor(String key)
- {
- key = mangleKey(key);
- ImageDescriptor descriptor = REGISTRY.getDescriptor(key);
- if (descriptor == null)
- {
- descriptor = createDescriptor(key);
- }
-
- return descriptor;
- }
-
- private static ImageDescriptor createDescriptor(String key)
- {
- ImageDescriptor descriptor = AbstractUIPlugin.imageDescriptorFromPlugin(OM.BUNDLE_ID, key);
- if (descriptor != null)
- {
- REGISTRY.put(key, descriptor);
- }
-
- return descriptor;
- }
-
- private static Display getDisplay()
- {
- Display display = Display.getCurrent();
- if (display == null)
- {
- display = Display.getDefault();
- }
-
- if (display == null)
- {
- throw new IllegalStateException("display == null"); //$NON-NLS-1$
- }
-
- return display;
- }
-
- private static String mangleKey(String key)
- {
- return "icons/full/" + key + ".gif"; //$NON-NLS-1$ //$NON-NLS-2$
- }
-}
diff --git a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java
index 7c443f3792..4e0b08a65f 100644
--- a/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java
+++ b/plugins/org.eclipse.net4j.ui/src/org/eclipse/net4j/internal/ui/views/Net4jItemProvider.java
@@ -13,8 +13,8 @@ package org.eclipse.net4j.internal.ui.views;
import org.eclipse.net4j.acceptor.IAcceptor;
import org.eclipse.net4j.channel.IChannel;
import org.eclipse.net4j.connector.IConnector;
-import org.eclipse.net4j.internal.ui.SharedIcons;
import org.eclipse.net4j.internal.ui.messages.Messages;
+import org.eclipse.net4j.ui.internal.icons.SharedIcons;
import org.eclipse.net4j.util.container.IContainer;
import org.eclipse.net4j.util.lifecycle.LifecycleUtil;
import org.eclipse.net4j.util.ui.actions.LongRunningAction;

Back to the top