Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/org.eclipse.net4j.ui')
-rw-r--r--plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF3
-rw-r--r--plugins/org.eclipse.net4j.ui/build.properties1
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/.cvsignore1
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/H.gifbin101 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/call_hierarchy.gifbin209 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/full/.cvsignore1
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/full/etool16/.cvsignore1
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/full/etool16/add.gifbin318 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/full/etool16/add_acceptor.gifbin381 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/full/etool16/add_connector.gifbin223 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/full/etool16/delete.gifbin351 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/full/etool16/refresh.gifbin330 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/full/obj16/.cvsignore1
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/full/obj16/acceptor.gifbin376 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/full/obj16/adapter.gifbin196 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/full/obj16/channel.gifbin198 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/full/obj16/connector.gifbin202 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/full/obj16/factory.gifbin211 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/full/obj16/folder.gifbin219 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/full/view16/.cvsignore1
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/full/view16/acceptors.gifbin376 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/full/view16/connectors.gifbin202 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/full/view16/server_explorer.gifbin359 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/p2pconn_obj.gifbin141 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/plus.gifbin171 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui/icons/sample.gifbin983 -> 0 bytes
-rw-r--r--plugins/org.eclipse.net4j.ui/plugin.xml4
-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
29 files changed, 5 insertions, 120 deletions
diff --git a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
index 3e2af8b2e7..9062127dda 100644
--- a/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.ui/META-INF/MANIFEST.MF
@@ -11,7 +11,8 @@ Bundle-RequiredExecutionEnvironment: J2SE-1.5
Bundle-ClassPath: .
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
org.eclipse.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport
+ org.eclipse.net4j.util.ui;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
+ org.eclipse.net4j.ui.shared;bundle-version="[4.0.0,5.0.0)"
Export-Package: org.eclipse.net4j.internal.ui;version="4.0.0";x-friends:="org.eclipse.net4j.ui.defs",
org.eclipse.net4j.internal.ui.bundle;version="4.0.0";x-internal:=true,
org.eclipse.net4j.internal.ui.container;version="4.0.0",
diff --git a/plugins/org.eclipse.net4j.ui/build.properties b/plugins/org.eclipse.net4j.ui/build.properties
index 6fb61dea7c..df5a3d5e02 100644
--- a/plugins/org.eclipse.net4j.ui/build.properties
+++ b/plugins/org.eclipse.net4j.ui/build.properties
@@ -16,7 +16,6 @@ bin.includes = META-INF/,\
.options,\
about.html,\
copyright.txt,\
- icons/,\
plugin.properties,\
plugin.xml,\
about.ini,\
diff --git a/plugins/org.eclipse.net4j.ui/icons/.cvsignore b/plugins/org.eclipse.net4j.ui/icons/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.ui/icons/H.gif b/plugins/org.eclipse.net4j.ui/icons/H.gif
deleted file mode 100644
index 5d86350a54..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/H.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/call_hierarchy.gif b/plugins/org.eclipse.net4j.ui/icons/call_hierarchy.gif
deleted file mode 100644
index 7c7dca802e..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/call_hierarchy.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/.cvsignore b/plugins/org.eclipse.net4j.ui/icons/full/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/etool16/.cvsignore b/plugins/org.eclipse.net4j.ui/icons/full/etool16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/etool16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/etool16/add.gif b/plugins/org.eclipse.net4j.ui/icons/full/etool16/add.gif
deleted file mode 100644
index 252d7ebcb8..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/etool16/add.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/etool16/add_acceptor.gif b/plugins/org.eclipse.net4j.ui/icons/full/etool16/add_acceptor.gif
deleted file mode 100644
index 5af19b1240..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/etool16/add_acceptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/etool16/add_connector.gif b/plugins/org.eclipse.net4j.ui/icons/full/etool16/add_connector.gif
deleted file mode 100644
index 8fbb69bae8..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/etool16/add_connector.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/etool16/delete.gif b/plugins/org.eclipse.net4j.ui/icons/full/etool16/delete.gif
deleted file mode 100644
index b6922ac11c..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/etool16/delete.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/etool16/refresh.gif b/plugins/org.eclipse.net4j.ui/icons/full/etool16/refresh.gif
deleted file mode 100644
index e3831471a6..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/etool16/refresh.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/obj16/.cvsignore b/plugins/org.eclipse.net4j.ui/icons/full/obj16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/obj16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/obj16/acceptor.gif b/plugins/org.eclipse.net4j.ui/icons/full/obj16/acceptor.gif
deleted file mode 100644
index a830867191..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/obj16/acceptor.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/obj16/adapter.gif b/plugins/org.eclipse.net4j.ui/icons/full/obj16/adapter.gif
deleted file mode 100644
index e8c1e6ff7e..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/obj16/adapter.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/obj16/channel.gif b/plugins/org.eclipse.net4j.ui/icons/full/obj16/channel.gif
deleted file mode 100644
index df67abd507..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/obj16/channel.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/obj16/connector.gif b/plugins/org.eclipse.net4j.ui/icons/full/obj16/connector.gif
deleted file mode 100644
index 3b3ad7c16e..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/obj16/connector.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/obj16/factory.gif b/plugins/org.eclipse.net4j.ui/icons/full/obj16/factory.gif
deleted file mode 100644
index 955d5e87a5..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/obj16/factory.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/obj16/folder.gif b/plugins/org.eclipse.net4j.ui/icons/full/obj16/folder.gif
deleted file mode 100644
index 42e027c933..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/obj16/folder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/view16/.cvsignore b/plugins/org.eclipse.net4j.ui/icons/full/view16/.cvsignore
deleted file mode 100644
index 085e8baf0c..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/view16/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Thumbs.db
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/view16/acceptors.gif b/plugins/org.eclipse.net4j.ui/icons/full/view16/acceptors.gif
deleted file mode 100644
index a830867191..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/view16/acceptors.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/view16/connectors.gif b/plugins/org.eclipse.net4j.ui/icons/full/view16/connectors.gif
deleted file mode 100644
index 3b3ad7c16e..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/view16/connectors.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/full/view16/server_explorer.gif b/plugins/org.eclipse.net4j.ui/icons/full/view16/server_explorer.gif
deleted file mode 100644
index 7ef3c2c80b..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/full/view16/server_explorer.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/p2pconn_obj.gif b/plugins/org.eclipse.net4j.ui/icons/p2pconn_obj.gif
deleted file mode 100644
index 405fda6480..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/p2pconn_obj.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/plus.gif b/plugins/org.eclipse.net4j.ui/icons/plus.gif
deleted file mode 100644
index 571b553ecd..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/plus.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/icons/sample.gif b/plugins/org.eclipse.net4j.ui/icons/sample.gif
deleted file mode 100644
index 34fb3c9d8c..0000000000
--- a/plugins/org.eclipse.net4j.ui/icons/sample.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.net4j.ui/plugin.xml b/plugins/org.eclipse.net4j.ui/plugin.xml
index bbe835119e..482afee800 100644
--- a/plugins/org.eclipse.net4j.ui/plugin.xml
+++ b/plugins/org.eclipse.net4j.ui/plugin.xml
@@ -22,14 +22,14 @@
<view
category="org.eclipse.net4j"
class="org.eclipse.net4j.internal.ui.views.AcceptorsView"
- icon="icons/full/view16/acceptors.gif"
+ icon="platform:/plugin/org.eclipse.net4j.ui.shared/icons/full/view16/acceptors.gif"
id="org.eclipse.net4j.AcceptorsView"
name="%view.name">
</view>
<view
category="org.eclipse.net4j"
class="org.eclipse.net4j.internal.ui.views.ConnectorsView"
- icon="icons/full/view16/connectors.gif"
+ icon="platform:/plugin/org.eclipse.net4j.ui.shared/icons/full/view16/connectors.gif"
id="org.eclipse.net4j.ConnectorsView"
name="%view.name.0">
</view>
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