diff options
author | Eike Stepper | 2015-02-22 08:25:54 +0000 |
---|---|---|
committer | Eike Stepper | 2015-02-22 11:50:21 +0000 |
commit | 0ab73bbb566e009d4f31655eefd3e505f8d0b47d (patch) | |
tree | 2b8b9cfbf78afde9643dba4a5a80f85fa0d07993 /plugins/org.eclipse.emf.cdo.ui.shared | |
parent | c727d78b1eeb220f1d521e64c34079f95ffd1544 (diff) | |
download | cdo-0ab73bbb566e009d4f31655eefd3e505f8d0b47d.tar.gz cdo-0ab73bbb566e009d4f31655eefd3e505f8d0b47d.tar.xz cdo-0ab73bbb566e009d4f31655eefd3e505f8d0b47d.zip |
[458349] Consolidate UI
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=458349
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.ui.shared')
-rw-r--r-- | plugins/org.eclipse.emf.cdo.ui.shared/META-INF/MANIFEST.MF | 6 | ||||
-rw-r--r-- | plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/branchpoint.gif | bin | 0 -> 365 bytes | |||
-rw-r--r-- | plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/commit.gif | bin | 0 -> 3191 bytes | |||
-rw-r--r-- | plugins/org.eclipse.emf.cdo.ui.shared/src/org/eclipse/emf/cdo/ui/shared/SharedIcons.java | 17 |
4 files changed, 20 insertions, 3 deletions
diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.ui.shared/META-INF/MANIFEST.MF index a6b4dbdaf1..ed7e6114d2 100644 --- a/plugins/org.eclipse.emf.cdo.ui.shared/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.ui.shared/META-INF/MANIFEST.MF @@ -2,15 +2,15 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.ui.shared;singleton:=true -Bundle-Version: 4.2.100.qualifier +Bundle-Version: 4.3.0.qualifier Bundle-Activator: org.eclipse.emf.cdo.ui.internal.shared.bundle.OM$Activator Bundle-Vendor: %providerName Bundle-ClassPath: . Bundle-Localization: plugin Bundle-ActivationPolicy: lazy Bundle-RequiredExecutionEnvironment: J2SE-1.5 -Export-Package: org.eclipse.emf.cdo.ui.shared;version="4.2.100", - org.eclipse.emf.cdo.ui.internal.shared.bundle;version="4.2.100";x-internal:=true +Export-Package: org.eclipse.emf.cdo.ui.shared;version="4.3.0", + org.eclipse.emf.cdo.ui.internal.shared.bundle;version="4.3.0";x-internal:=true Require-Bundle: org.eclipse.ui;bundle-version="[3.5.0,4.0.0)", org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.net4j.util;bundle-version="[3.1.0,4.0.0)" diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/branchpoint.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/branchpoint.gif Binary files differnew file mode 100644 index 0000000000..d5e623a718 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/obj16/branchpoint.gif diff --git a/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/commit.gif b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/commit.gif Binary files differnew file mode 100644 index 0000000000..02b227ad71 --- /dev/null +++ b/plugins/org.eclipse.emf.cdo.ui.shared/icons/full/wizban/commit.gif 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 611d17e1d0..5a78a2e843 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 @@ -145,6 +145,11 @@ public class SharedIcons public static final String OBJ_REPO = OBJ + "repo.gif"; //$NON-NLS-1$ + /** + * @since 4.3 + */ + public static final String OBJ_BRANCH_POINT = OBJ + "branchpoint.gif"; //$NON-NLS-1$ + public static final String OBJ_BRANCH = OBJ + "branch.gif"; //$NON-NLS-1$ /** @@ -197,10 +202,22 @@ public class SharedIcons public static final String WIZBAN_IMPORT = WIZBAN + "import_wiz" + IMAGE_FORMAT_PNG; //$NON-NLS-1$ /** + * @since 4.3 + */ + public static final String WIZBAN_EXPORT = WIZBAN + "export_wiz" + IMAGE_FORMAT_PNG; //$NON-NLS-1$ + + /** * @since 4.1 + * @deprecated as of 4.2 use {@link #WIZBAN_EXPORT}. */ + @Deprecated public static final String WIZBAN_EXPOR = WIZBAN + "export_wiz" + IMAGE_FORMAT_PNG; //$NON-NLS-1$ + /** + * @since 4.3 + */ + public static final String WIZBAN_COMMIT = WIZBAN + "commit" + IMAGE_FORMAT_GIF; //$NON-NLS-1$ + public static Image getImage(String key) { key = mangleKey(key); |