diff options
Diffstat (limited to 'org.eclipse.m2e.core.ui/src')
4 files changed, 39 insertions, 42 deletions
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 7ce8cb54..032af4b1 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 @@ -28,33 +28,26 @@ public class MavenImages { private static final Logger log = LoggerFactory.getLogger(MavenImages.class); // object images - - public static final Image IMG_CLEAR = createImage("clear.gif"); //$NON-NLS-1$ - - public static final Image IMG_CLEAR_DISABLED = createImage("clear_disabled.gif"); //$NON-NLS-1$ - public static final String PATH_JAR = "jar_obj.gif"; //$NON-NLS-1$ public static final String PATH_PROJECT = "project_obj.gif"; //$NON-NLS-1$ - public static final Image IMG_JAR = createImage(PATH_JAR); - public static final String PATH_LOCK = "lock_ovr.gif"; //$NON-NLS-1$ public static final String PATH_VERSION = "jar_version.gif"; //$NON-NLS-1$ - public static final Image IMG_VERSION = createImage(PATH_VERSION); - public static final String PATH_VERSION_SRC = "jar_src_version.gif"; //$NON-NLS-1$ + public static final Image IMG_JAR = createImage(PATH_JAR); + + public static final Image IMG_VERSION = createImage(PATH_VERSION); + 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_M2 = createImage("m2.gif"); - 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$ @@ -63,10 +56,6 @@ public class MavenImages { public static final Image IMG_MAVEN_JAR = createImage("mjar.gif"); //$NON-NLS-1$ - // public static final Image IMG_JAR = createImage("mlabel.gif"); - - //public static final Image IMG_NEW_POM = createImage("new_m2_pom.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$ @@ -90,21 +79,12 @@ public class MavenImages { 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 CLOSE = createDescriptor("close.gif"); //$NON-NLS-1$ - - public static final ImageDescriptor COPY = createDescriptor("copy.gif"); //$NON-NLS-1$ - - public static final ImageDescriptor COLLAPSE_ALL = createDescriptor("collapseall.gif"); //$NON-NLS-1$ - - public static final ImageDescriptor EXPAND_ALL = createDescriptor("expandall.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$ diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenConsoleRemoveAction.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenConsoleRemoveAction.java index f1a9b852..148ceab8 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenConsoleRemoveAction.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/actions/MavenConsoleRemoveAction.java @@ -12,16 +12,18 @@ package org.eclipse.m2e.core.ui.internal.actions; import org.eclipse.jface.action.Action; -import org.eclipse.m2e.core.ui.internal.Messages; +import org.eclipse.ui.ISharedImages; +import org.eclipse.ui.PlatformUI; + import org.eclipse.m2e.core.ui.internal.M2EUIPluginActivator; -import org.eclipse.m2e.core.ui.internal.MavenImages; +import org.eclipse.m2e.core.ui.internal.Messages; public class MavenConsoleRemoveAction extends Action { public MavenConsoleRemoveAction() { setToolTipText(Messages.MavenConsoleRemoveAction_tooltip); - setImageDescriptor(MavenImages.CLOSE); + setImageDescriptor(PlatformUI.getWorkbench().getSharedImages().getImageDescriptor(ISharedImages.IMG_ELCL_REMOVE)); } public void run() { diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/MavenRepositoryView.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/MavenRepositoryView.java index 6db2e5ff..e47b790e 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/MavenRepositoryView.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/views/MavenRepositoryView.java @@ -48,7 +48,9 @@ import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Menu; import org.eclipse.ui.IActionBars; +import org.eclipse.ui.ISharedImages; import org.eclipse.ui.IWorkbenchActionConstants; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.actions.BaseSelectionListenerAction; import org.eclipse.ui.part.DrillDownAdapter; import org.eclipse.ui.part.ViewPart; @@ -80,6 +82,16 @@ import org.eclipse.m2e.core.ui.internal.views.nodes.RepositoryNode; */ public class MavenRepositoryView extends ViewPart { + /** + * + */ + private static final String MENU_OPEN_GRP = "open"; + + /** + * + */ + private static final String MENU_UPDATE_GRP = "update"; + private static final Logger log = LoggerFactory.getLogger(MavenRepositoryView.class); private static final String ENABLE_FULL = Messages.MavenRepositoryView_enable_full; @@ -88,7 +100,7 @@ public class MavenRepositoryView extends ViewPart { private static final String DISABLED_DETAILS = Messages.MavenRepositoryView_details_disabled; private static final String ENABLE_MIN = Messages.MavenRepositoryView_enable_minimum; private static final String ENABLED_MIN = Messages.MavenRepositoryView_minimum_enabled; - private static final String MENU_ID = ".repositoryViewMenu"; + private static final String MENU_ID = ".repositoryViewMenu"; //$NON-NLS-1$ private IndexManager indexManager = MavenPlugin.getIndexManager(); @@ -225,19 +237,18 @@ public class MavenRepositoryView extends ViewPart { return list; } void fillContextMenu(IMenuManager manager) { - manager.add(new Separator("open")); - manager.add(new Separator("update")); - manager.add(new Separator("import")); - manager.prependToGroup("open",copyUrlAction); - manager.prependToGroup("open", openPomAction); + manager.add(new Separator(MENU_OPEN_GRP)); + manager.add(new Separator(MENU_UPDATE_GRP)); + manager.add(new Separator("import")); //$NON-NLS-1$ + manager.prependToGroup(MENU_OPEN_GRP, copyUrlAction); + manager.prependToGroup(MENU_OPEN_GRP, openPomAction); - manager.prependToGroup("update",updateAction); - manager.prependToGroup("update", rebuildAction); + manager.prependToGroup(MENU_UPDATE_GRP, updateAction); + manager.prependToGroup(MENU_UPDATE_GRP, rebuildAction); manager.add(disableAction); manager.add(enableMinAction); manager.add(enableFullAction); -// manager.add(deleteFromLocalAction); manager.add(new Separator()); manager.add(collapseAllAction); manager.add(new Separator()); @@ -260,7 +271,8 @@ public class MavenRepositoryView extends ViewPart { } }; collapseAllAction.setToolTipText(Messages.MavenRepositoryView_btnCollapse_tooltip); - collapseAllAction.setImageDescriptor(MavenImages.COLLAPSE_ALL); + collapseAllAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages() + .getImageDescriptor(ISharedImages.IMG_ELCL_COLLAPSEALL)); reloadSettings = new Action(Messages.MavenRepositoryView_action_reload){ public void run(){ String msg = Messages.MavenRepositoryView_reload_msg; @@ -463,7 +475,8 @@ public class MavenRepositoryView extends ViewPart { } }; copyUrlAction.setToolTipText(Messages.MavenRepositoryView_action_copy_tooltip); - copyUrlAction.setImageDescriptor(MavenImages.COPY); + copyUrlAction.setImageDescriptor(PlatformUI.getWorkbench().getSharedImages() + .getImageDescriptor(ISharedImages.IMG_TOOL_COPY)); // materializeProjectAction = new BaseSelectionListenerAction(Messages.MavenRepositoryView_action_materialize) { // public void run() { diff --git a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java index ae7952b6..4e47032e 100644 --- a/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java +++ b/org.eclipse.m2e.core.ui/src/org/eclipse/m2e/core/ui/internal/wizards/MavenProjectWizardArchetypePage.java @@ -70,6 +70,8 @@ import org.eclipse.swt.widgets.TableColumn; import org.eclipse.swt.widgets.Text; import org.eclipse.swt.widgets.ToolBar; import org.eclipse.swt.widgets.ToolItem; +import org.eclipse.ui.ISharedImages; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.PreferencesUtil; import org.apache.maven.archetype.catalog.Archetype; @@ -85,14 +87,13 @@ import org.eclipse.m2e.core.embedder.ArtifactKey; import org.eclipse.m2e.core.embedder.IMaven; import org.eclipse.m2e.core.internal.MavenPluginActivator; import org.eclipse.m2e.core.internal.archetype.ArchetypeCatalogFactory; -import org.eclipse.m2e.core.internal.archetype.ArchetypeManager; import org.eclipse.m2e.core.internal.archetype.ArchetypeCatalogFactory.NexusIndexerCatalogFactory; +import org.eclipse.m2e.core.internal.archetype.ArchetypeManager; import org.eclipse.m2e.core.internal.index.IMutableIndex; import org.eclipse.m2e.core.internal.index.IndexListener; import org.eclipse.m2e.core.internal.index.IndexManager; import org.eclipse.m2e.core.project.ProjectImportConfiguration; import org.eclipse.m2e.core.repository.IRepository; -import org.eclipse.m2e.core.ui.internal.MavenImages; import org.eclipse.m2e.core.ui.internal.Messages; import org.eclipse.m2e.core.ui.internal.util.M2EUIUtils; @@ -300,8 +301,9 @@ public class MavenProjectWizardArchetypePage extends AbstractMavenWizardPage imp final ToolItem clearToolItem = new ToolItem(toolBar, SWT.PUSH); clearToolItem.setEnabled(false); - clearToolItem.setImage(MavenImages.IMG_CLEAR); - clearToolItem.setDisabledImage(MavenImages.IMG_CLEAR_DISABLED); + clearToolItem.setImage(PlatformUI.getWorkbench().getSharedImages().getImage(ISharedImages.IMG_ELCL_REMOVE)); + clearToolItem.setDisabledImage(PlatformUI.getWorkbench().getSharedImages() + .getImage(ISharedImages.IMG_ELCL_REMOVE_DISABLED)); clearToolItem.addSelectionListener(new SelectionAdapter() { public void widgetSelected(SelectionEvent e) { filterText.setText(""); //$NON-NLS-1$ |