diff options
-rw-r--r-- | org.eclipse.m2e.core.ui/icons/java_obj.gif | bin | 573 -> 0 bytes | |||
-rw-r--r-- | org.eclipse.m2e.core.ui/icons/java_src_obj.gif | bin | 589 -> 0 bytes | |||
-rw-r--r-- | org.eclipse.m2e.core.ui/icons/mjar.gif | bin | 258 -> 0 bytes | |||
-rw-r--r-- | org.eclipse.m2e.core.ui/icons/new_m2_pom.gif | bin | 254 -> 0 bytes | |||
-rw-r--r-- | org.eclipse.m2e.core.ui/icons/open_pom.gif | bin | 234 -> 0 bytes | |||
-rw-r--r-- | org.eclipse.m2e.core.ui/icons/update_source_folders.gif | bin | 251 -> 0 bytes | |||
-rw-r--r-- | org.eclipse.m2e.core.ui/icons/web.gif | bin | 996 -> 0 bytes | |||
-rw-r--r-- | org.eclipse.m2e.core.ui/plugin.xml | 65 | ||||
-rw-r--r-- | org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/MavenImages.java | 69 |
9 files changed, 27 insertions, 107 deletions
diff --git a/org.eclipse.m2e.core.ui/icons/java_obj.gif b/org.eclipse.m2e.core.ui/icons/java_obj.gif Binary files differdeleted file mode 100644 index 9a1797d2..00000000 --- a/org.eclipse.m2e.core.ui/icons/java_obj.gif +++ /dev/null diff --git a/org.eclipse.m2e.core.ui/icons/java_src_obj.gif b/org.eclipse.m2e.core.ui/icons/java_src_obj.gif Binary files differdeleted file mode 100644 index 307954d2..00000000 --- a/org.eclipse.m2e.core.ui/icons/java_src_obj.gif +++ /dev/null diff --git a/org.eclipse.m2e.core.ui/icons/mjar.gif b/org.eclipse.m2e.core.ui/icons/mjar.gif Binary files differdeleted file mode 100644 index d6b14677..00000000 --- a/org.eclipse.m2e.core.ui/icons/mjar.gif +++ /dev/null diff --git a/org.eclipse.m2e.core.ui/icons/new_m2_pom.gif b/org.eclipse.m2e.core.ui/icons/new_m2_pom.gif Binary files differdeleted file mode 100644 index 05bab80d..00000000 --- a/org.eclipse.m2e.core.ui/icons/new_m2_pom.gif +++ /dev/null diff --git a/org.eclipse.m2e.core.ui/icons/open_pom.gif b/org.eclipse.m2e.core.ui/icons/open_pom.gif Binary files differdeleted file mode 100644 index e74037b4..00000000 --- a/org.eclipse.m2e.core.ui/icons/open_pom.gif +++ /dev/null diff --git a/org.eclipse.m2e.core.ui/icons/update_source_folders.gif b/org.eclipse.m2e.core.ui/icons/update_source_folders.gif Binary files differdeleted file mode 100644 index 75663483..00000000 --- a/org.eclipse.m2e.core.ui/icons/update_source_folders.gif +++ /dev/null diff --git a/org.eclipse.m2e.core.ui/icons/web.gif b/org.eclipse.m2e.core.ui/icons/web.gif Binary files differdeleted file mode 100644 index 09f609d6..00000000 --- a/org.eclipse.m2e.core.ui/icons/web.gif +++ /dev/null diff --git a/org.eclipse.m2e.core.ui/plugin.xml b/org.eclipse.m2e.core.ui/plugin.xml index d0fa4aee..64138262 100644 --- a/org.eclipse.m2e.core.ui/plugin.xml +++ b/org.eclipse.m2e.core.ui/plugin.xml @@ -310,22 +310,6 @@ label="%openpomaction.label4" enablesFor="1"/> </objectContribution> - - <!-- doesn't seem to work as I would expect to. - objectContribution id="org.eclipse.m2e.core.ui.repositoryViewMenu" - objectClass="org.eclipse.m2e.core.ui.internal.views.nodes.IMavenRepositoryNode" - > - <menu - id="org.eclipse.m2e.core.ui.repositoryViewMenu" - label="%m2.popup.project.label"> - <groupMarker name="open"/> - <separator name="org.eclipse.m2e.core.separator1"/> - <groupMarker name="update"/> - <separator name="org.eclipse.m2e.core.separator2"/> - <groupMarker name="additions"/> - </menu> - </objectContribution--> - </extension> <extension point="org.eclipse.ui.popupMenus"> @@ -500,54 +484,6 @@ </consolePageParticipant> </extension> - <!-- we should not contribute to the main menu anything maven specific. - extension point="org.eclipse.ui.actionSets"> - <actionSet id="org.eclipse.m2e.core.ui.navigation" - label="%actionSet.navigation.label" visible="true"> - <action - class="org.eclipse.m2e.core.ui.internal.actions.OpenPomAction:artifact" - definitionId="org.eclipse.m2e.core.ui.command.openPom" - icon="icons/open_pom.gif" - id="org.eclipse.m2e.core.ui.open.pom" - label="%action.openpom.label" - menubarPath="navigate/open.ext" - style="push" - tooltip="%action.openpom.tooltip"/> - <action - class="org.eclipse.m2e.core.ui.internal.actions.RefreshMavenModelsAction" - icon="icons/update_dependencies.gif" - id="org.eclipse.m2e.core.ui.internal.actions.RefreshModels" - label="%action.updatedeps.label" - menubarPath="project/additions" - tooltip="%action.updatedeps.tooltip"> - </action> - </actionSet> - - <actionSet - id="org.eclipse.m2e.core.actions.maven" - label="%actionSet.maven.label" - visible="true"> - <action - class="org.eclipse.m2e.core.ui.internal.actions.AddDependencyAction" - definitionId="org.eclipse.m2e.core.ui.command.addDependency" - icon="icons/open_pom.gif" - id="org.eclipse.m2e.core.actions.add.dependency" - label="%action.adddep.label" - menubarPath="navigate/open.ext" - style="push" - tooltip="%action.adddep.tooltip"> - </action> - <action - class="org.eclipse.m2e.core.ui.internal.actions.AddPluginAction" - definitionId="org.eclipse.m2e.core.ui.command.addPlugin" - id="org.eclipse.m2e.core.actions.add.plugin" - label="%action.addplugin.label" - style="push" - tooltip="%action.add.plugin.tooltip"> - </action> - </actionSet> - </extension--> - <extension point="org.eclipse.ui.views"> <category id="org.eclipse.m2e.core.views.repositories" name="%category.maven.name"/> @@ -614,5 +550,4 @@ file="helpContext.xml"> </contexts> </extension> - </plugin> diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/MavenImages.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/MavenImages.java index 032af4b1..150a54b9 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/MavenImages.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/MavenImages.java @@ -27,6 +27,29 @@ import org.eclipse.ui.plugin.AbstractUIPlugin; public class MavenImages { private static final Logger log = LoggerFactory.getLogger(MavenImages.class); + // descriptors + public static final ImageDescriptor M2 = createDescriptor("m2.gif"); //$NON-NLS-1$ + + public static final ImageDescriptor DEBUG = createDescriptor("debug.gif"); //$NON-NLS-1$ + + public static final ImageDescriptor ADD_INDEX = createDescriptor("add_index.gif"); //$NON-NLS-1$ + + public static final ImageDescriptor NEW_POM = createDescriptor("new_m2_pom.gif"); //$NON-NLS-1$ + + public static final ImageDescriptor REFRESH = createDescriptor("refresh.gif"); //$NON-NLS-1$ + + public static final ImageDescriptor UPD_INDEX = createDescriptor("update_index.gif"); //$NON-NLS-1$ + + public static final ImageDescriptor REBUILD_INDEX = createDescriptor("rebuild_index.gif"); //$NON-NLS-1$ + + public static final ImageDescriptor POM = createDescriptor("pom_obj.gif"); //$NON-NLS-1$ + + public static final ImageDescriptor SHOW_CONSOLE_ERR = createDescriptor("stderr.gif"); //$NON-NLS-1$ + + public static final ImageDescriptor SHOW_CONSOLE_OUT = createDescriptor("stdout.gif"); //$NON-NLS-1$ + + public static final ImageDescriptor MAVEN_OVERLAY = createDescriptor("mlabel.gif"); //$NON-NLS-1$ + // object images public static final String PATH_JAR = "jar_obj.gif"; //$NON-NLS-1$ @@ -44,66 +67,28 @@ public class MavenImages { public static final Image IMG_VERSION_SRC = createImage(PATH_VERSION_SRC); - public static final Image IMG_JAVA = createImage("java_obj.gif"); //$NON-NLS-1$ - - public static final Image IMG_JAVA_SRC = createImage("java_src_obj.gif"); //$NON-NLS-1$ - public static final Image IMG_LAUNCH_MAIN = createImage("main_tab.gif"); //$NON-NLS-1$ public static final Image IMG_INDEX = createImage("maven_index.gif"); //$NON-NLS-1$ public static final Image IMG_INDEXES = createImage("maven_indexes.gif"); //$NON-NLS-1$ - public static final Image IMG_MAVEN_JAR = createImage("mjar.gif"); //$NON-NLS-1$ - - public static final Image IMG_NEW_PROJECT = createImage("new_m2_project.gif"); //$NON-NLS-1$ - - public static final Image IMG_OPEN_POM = createImage("open_pom.gif"); //$NON-NLS-1$ - public static final Image IMG_PASSED = createImage("passed.png"); //$NON-NLS-1$ - public static final Image IMG_POM = createImage("pom_obj.gif"); //$NON-NLS-1$ - - public static final Image IMG_UPD_DEPENDENCIES = createImage("update_dependencies.gif"); //$NON-NLS-1$ - - public static final Image IMG_UPD_SOURCES = createImage("update_source_folders.gif"); //$NON-NLS-1$ - - public static final Image IMG_WEB = createImage("web.gif"); //$NON-NLS-1$ + public static final Image IMG_POM = POM.createImage(); public static final Image IMG_ERROR = createImage("error_st_obj.gif"); //$NON-NLS-1$ // wizard images - public static final ImageDescriptor WIZ_IMPORT_WIZ = createDescriptor("import_project.png"); //$NON-NLS-1$ public static final ImageDescriptor WIZ_NEW_PROJECT = createDescriptor("new_m2_project_wizard.gif"); //$NON-NLS-1$ - // descriptors - public static final ImageDescriptor M2 = createDescriptor("m2.gif"); //$NON-NLS-1$ - - public static final ImageDescriptor DEBUG = createDescriptor("debug.gif"); //$NON-NLS-1$ - - public static final ImageDescriptor ADD_INDEX = createDescriptor("add_index.gif"); //$NON-NLS-1$ - - public static final ImageDescriptor NEW_POM = createDescriptor("new_m2_pom.gif"); //$NON-NLS-1$ - - public static final ImageDescriptor REFRESH = createDescriptor("refresh.gif"); //$NON-NLS-1$ - - public static final ImageDescriptor UPD_INDEX = createDescriptor("update_index.gif"); //$NON-NLS-1$ - - public static final ImageDescriptor REBUILD_INDEX = createDescriptor("rebuild_index.gif"); //$NON-NLS-1$ - - public static final ImageDescriptor POM = createDescriptor("pom_obj.gif"); //$NON-NLS-1$ - - public static final ImageDescriptor IMPORT_PROJECT = createDescriptor("import_m2_project.gif"); //$NON-NLS-1$ - - public static final ImageDescriptor SHOW_CONSOLE_ERR = createDescriptor("stderr.gif"); //$NON-NLS-1$ + public static final String MVN_PROJECT = "project-mlabel.gif"; //$NON-NLS-1$ - public static final ImageDescriptor SHOW_CONSOLE_OUT = createDescriptor("stdout.gif"); //$NON-NLS-1$ + static { - public static final ImageDescriptor MAVEN_OVERLAY = createDescriptor("mlabel.gif"); //$NON-NLS-1$ - - public static final String MVN_PROJECT = "project-mlabel.gif"; //$NON-NLS-1$ + } private static ImageDescriptor createDescriptor(String key) { try { |