Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2012-09-17 05:43:05 +0000
committerEike Stepper2012-09-17 05:43:05 +0000
commit8a13b0ae3e7520ded8593acd0e128ae5f952d937 (patch)
treeeefac5fc5da54a47d022855bd4d75c31fa9ce0ea /plugins
parente581b5b240b414ebf6e41cb53ffe1b50cb0d38c6 (diff)
downloadcdo-8a13b0ae3e7520ded8593acd0e128ae5f952d937.tar.gz
cdo-8a13b0ae3e7520ded8593acd0e128ae5f952d937.tar.xz
cdo-8a13b0ae3e7520ded8593acd0e128ae5f952d937.zip
UI overhaul: actions, menus, labels, icons
Diffstat (limited to 'plugins')
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/internal/ui/FileSystemUIProvider.java25
-rw-r--r--plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/TransferLabelProvider.java8
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOBinaryResource.gifbin370 -> 586 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOResource.gifbin373 -> 360 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOResourceFolder.gifbin585 -> 352 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOTextResource.gifbin366 -> 572 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOBinaryResource.gifbin350 -> 369 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOFileResource.gifbin338 -> 536 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOResource.gifbin354 -> 346 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOResourceFolder.gifbin356 -> 925 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOTextResource.gifbin345 -> 561 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOBinaryResource.gifbin0 -> 370 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOResource.gifbin0 -> 373 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOResourceFolder.gifbin0 -> 585 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOTextResource.gifbin0 -> 366 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/NewCDOBinaryResource.gifbin370 -> 586 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/NewCDOResource.gifbin373 -> 360 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/NewCDOResourceFolder.gifbin585 -> 352 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/NewCDOTextResource.gifbin366 -> 572 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOBinaryResource.gifbin350 -> 369 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOFileResource.gifbin338 -> 536 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOModelFile.gifbin346 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOResource.gifbin354 -> 346 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOResourceFolder.gifbin356 -> 925 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOTextResource.gifbin345 -> 561 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/_folder.gifbin325 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/file.gifbin561 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/folder.gifbin925 -> 0 bytes
-rw-r--r--plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/shared/SharedIcons.java25
-rw-r--r--plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java4
30 files changed, 41 insertions, 21 deletions
diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/internal/ui/FileSystemUIProvider.java b/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/internal/ui/FileSystemUIProvider.java
index 740c6af167..24372b0fc0 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/internal/ui/FileSystemUIProvider.java
+++ b/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/internal/ui/FileSystemUIProvider.java
@@ -14,13 +14,17 @@ import org.eclipse.emf.cdo.spi.transfer.FileSystemTransferSystem;
import org.eclipse.emf.cdo.transfer.CDOTransferElement;
import org.eclipse.emf.cdo.transfer.CDOTransferSystem;
import org.eclipse.emf.cdo.transfer.spi.ui.TransferUIProvider;
+import org.eclipse.emf.cdo.ui.shared.SharedIcons;
import org.eclipse.net4j.util.factory.ProductCreationException;
import org.eclipse.jface.viewers.ILabelProvider;
+import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.swt.dnd.FileTransfer;
import org.eclipse.swt.dnd.Transfer;
+import org.eclipse.swt.graphics.Image;
+import java.io.File;
import java.util.List;
/**
@@ -34,8 +38,25 @@ public class FileSystemUIProvider implements TransferUIProvider
public ILabelProvider createLabelProvider(CDOTransferSystem system)
{
- // Return null to fall back to default labels
- return null;
+ return new LabelProvider()
+ {
+ @Override
+ public Image getImage(Object element)
+ {
+ if (element instanceof File)
+ {
+ File file = (File)element;
+ if (file.isDirectory())
+ {
+ return SharedIcons.getImage(SharedIcons.OBJ_RESOURCE_FOLDER);
+ }
+
+ return SharedIcons.getImage(SharedIcons.OBJ_FILE_RESOURCE);
+ }
+
+ return super.getImage(element);
+ }
+ };
}
public void addSupportedTransfers(List<Transfer> transfers)
diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/TransferLabelProvider.java b/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/TransferLabelProvider.java
index 3591102e28..7f6cac830c 100644
--- a/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/TransferLabelProvider.java
+++ b/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/TransferLabelProvider.java
@@ -60,8 +60,12 @@ public class TransferLabelProvider extends LabelProvider implements ITableLabelP
@Override
public void dispose()
{
- sourceSystemLabelProvider.dispose();
- sourceSystemLabelProvider = null;
+ if (sourceSystemLabelProvider != null)
+ {
+ sourceSystemLabelProvider.dispose();
+ sourceSystemLabelProvider = null;
+ }
+
super.dispose();
}
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOBinaryResource.gif b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOBinaryResource.gif
index 0b47c128eb..f161cec785 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOBinaryResource.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOBinaryResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOResource.gif b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOResource.gif
index 094452ca19..2bd1c182c8 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOResource.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOResourceFolder.gif b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOResourceFolder.gif
index 138d0e9853..6fb9345b2a 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOResourceFolder.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOResourceFolder.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOTextResource.gif b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOTextResource.gif
index 31d8ff5d8f..53f8abe70c 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOTextResource.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/elcl16/NewCDOTextResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOBinaryResource.gif b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOBinaryResource.gif
index 463c38f026..0079039288 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOBinaryResource.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOBinaryResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOFileResource.gif b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOFileResource.gif
index 755b5bbad6..b5e86d2163 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOFileResource.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOFileResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOResource.gif b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOResource.gif
index 6968b7a7ba..d5cfa16f12 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOResource.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOResourceFolder.gif b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOResourceFolder.gif
index 3988005b7c..152ce470c5 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOResourceFolder.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOResourceFolder.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOTextResource.gif b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOTextResource.gif
index 560f25470f..061161ae1c 100644
--- a/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOTextResource.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.ide/icons/full/obj16/CDOTextResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOBinaryResource.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOBinaryResource.gif
new file mode 100644
index 0000000000..0b47c128eb
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOBinaryResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOResource.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOResource.gif
new file mode 100644
index 0000000000..094452ca19
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOResourceFolder.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOResourceFolder.gif
new file mode 100644
index 0000000000..138d0e9853
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOResourceFolder.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOTextResource.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOTextResource.gif
new file mode 100644
index 0000000000..31d8ff5d8f
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons.sample/NewCDOTextResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/NewCDOBinaryResource.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/NewCDOBinaryResource.gif
index 0b47c128eb..f161cec785 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/NewCDOBinaryResource.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/NewCDOBinaryResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/NewCDOResource.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/NewCDOResource.gif
index 094452ca19..2bd1c182c8 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/NewCDOResource.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/NewCDOResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/NewCDOResourceFolder.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/NewCDOResourceFolder.gif
index 138d0e9853..6fb9345b2a 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/NewCDOResourceFolder.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/NewCDOResourceFolder.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/NewCDOTextResource.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/NewCDOTextResource.gif
index 31d8ff5d8f..53f8abe70c 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/NewCDOTextResource.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/etool16/NewCDOTextResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOBinaryResource.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOBinaryResource.gif
index 463c38f026..0079039288 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOBinaryResource.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOBinaryResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOFileResource.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOFileResource.gif
index 755b5bbad6..b5e86d2163 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOFileResource.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOFileResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOModelFile.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOModelFile.gif
deleted file mode 100644
index d5cfa16f12..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOModelFile.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOResource.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOResource.gif
index 6968b7a7ba..d5cfa16f12 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOResource.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOResourceFolder.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOResourceFolder.gif
index 3988005b7c..152ce470c5 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOResourceFolder.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOResourceFolder.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOTextResource.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOTextResource.gif
index 560f25470f..061161ae1c 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOTextResource.gif
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/CDOTextResource.gif
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/_folder.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/_folder.gif
deleted file mode 100644
index 513329b428..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/_folder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/file.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/file.gif
deleted file mode 100644
index 061161ae1c..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/file.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/folder.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/folder.gif
deleted file mode 100644
index 152ce470c5..0000000000
--- a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/folder.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/shared/SharedIcons.java b/plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/shared/SharedIcons.java
index aaa87908fe..a86741fab5 100644
--- a/plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/shared/SharedIcons.java
+++ b/plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/shared/SharedIcons.java
@@ -32,12 +32,6 @@ public class SharedIcons
private static final String ETOOL = "etool16/"; //$NON-NLS-1$
- private static final String OBJ = "obj16/"; //$NON-NLS-1$
-
- private static final String VIEW = "view16/"; //$NON-NLS-1$
-
- private static final String WIZBAN = "wizban/"; //$NON-NLS-1$
-
public static final String ETOOL_OPEN_SESSION = ETOOL + "open_session" + IMAGE_FORMAT_GIF; //$NON-NLS-1$
public static final String ETOOL_OPEN_EDITOR = ETOOL + "open_editor" + IMAGE_FORMAT_GIF; //$NON-NLS-1$
@@ -99,6 +93,8 @@ public class SharedIcons
*/
public static final String ETOOL_EXPORT = ETOOL + "export" + IMAGE_FORMAT_GIF; //$NON-NLS-1$
+ private static final String OBJ = "obj16/"; //$NON-NLS-1$
+
public static final String OBJ_SESSION = OBJ + "cdo_session" + IMAGE_FORMAT_GIF; //$NON-NLS-1$
public static final String OBJ_SESSION_SYNCING = OBJ + "cdo_session_syncing" + IMAGE_FORMAT_GIF; //$NON-NLS-1$
@@ -120,6 +116,11 @@ public class SharedIcons
/**
* @since 4.1
*/
+ public static final String OBJ_FILE_RESOURCE = OBJ + "CDOFileResource" + IMAGE_FORMAT_GIF; //$NON-NLS-1$
+
+ /**
+ * @since 4.1
+ */
public static final String OBJ_TEXT_RESOURCE = OBJ + "CDOTextResource" + IMAGE_FORMAT_GIF; //$NON-NLS-1$
/**
@@ -145,18 +146,12 @@ public class SharedIcons
public static final String OBJ_BRANCH = OBJ + "branch.png"; //$NON-NLS-1$
- /**
- * @since 4.1
- */
- public static final String OBJ_FOLDER = OBJ + "folder.gif"; //$NON-NLS-1$
-
- /**
- * @since 4.1
- */
- public static final String OBJ_FILE = OBJ + "file.gif"; //$NON-NLS-1$
+ private static final String VIEW = "view16/"; //$NON-NLS-1$
public static final String VIEW_SESSIONS = VIEW + "cdo_sessions" + IMAGE_FORMAT_GIF; //$NON-NLS-1$
+ private static final String WIZBAN = "wizban/"; //$NON-NLS-1$
+
public static final String WIZBAN_PACKAGE_MANAGER = WIZBAN + "PackageManager" + IMAGE_FORMAT_GIF; //$NON-NLS-1$
public static final String WIZBAN_PROTOCOL_PROBLEM = WIZBAN + "ProtocolProblem" + IMAGE_FORMAT_GIF; //$NON-NLS-1$
diff --git a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java
index d521edbe5c..61d033d57d 100644
--- a/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java
+++ b/plugins/org.eclipse.emf.cdo.ui/src/org/eclipse/emf/cdo/ui/CDOItemProvider.java
@@ -27,13 +27,13 @@ import org.eclipse.emf.cdo.internal.ui.actions.CloseSessionAction;
import org.eclipse.emf.cdo.internal.ui.actions.CloseViewAction;
import org.eclipse.emf.cdo.internal.ui.actions.CommitTransactionAction;
import org.eclipse.emf.cdo.internal.ui.actions.CreateBranchAction;
-import org.eclipse.emf.cdo.internal.ui.actions.NewResourceNodeAction;
import org.eclipse.emf.cdo.internal.ui.actions.DisableViewDurabilityAction;
import org.eclipse.emf.cdo.internal.ui.actions.EnableViewDurabilityAction;
import org.eclipse.emf.cdo.internal.ui.actions.ExportResourceAction;
import org.eclipse.emf.cdo.internal.ui.actions.ImportResourceAction;
import org.eclipse.emf.cdo.internal.ui.actions.LoadResourceAction;
import org.eclipse.emf.cdo.internal.ui.actions.ManagePackagesAction;
+import org.eclipse.emf.cdo.internal.ui.actions.NewResourceNodeAction;
import org.eclipse.emf.cdo.internal.ui.actions.OpenAuditAction;
import org.eclipse.emf.cdo.internal.ui.actions.OpenDurableViewAction;
import org.eclipse.emf.cdo.internal.ui.actions.OpenTransactionAction;
@@ -264,7 +264,7 @@ public class CDOItemProvider extends ContainerItemProvider<IContainer<Object>>
if (obj instanceof CDOResourceFolder)
{
- return SharedIcons.getImage(SharedIcons.OBJ_FOLDER);
+ return SharedIcons.getImage(SharedIcons.OBJ_RESOURCE_FOLDER);
}
if (obj instanceof CDOResourceLeaf)

Back to the top