diff --git a/platform/core-api/src/com/intellij/util/PlatformIcons.java b/platform/core-api/src/com/intellij/util/PlatformIcons.java index 4ecc302b5998..e6e5f8a52441 100644 --- a/platform/core-api/src/com/intellij/util/PlatformIcons.java +++ b/platform/core-api/src/com/intellij/util/PlatformIcons.java @@ -76,6 +76,7 @@ public interface PlatformIcons { Icon GROUP_BY_PACKAGES = IconLoader.getIcon("/toolbar/folders.png"); Icon ADD_ICON = IconLoader.getIcon("/actions/include.png"); Icon DELETE_ICON = IconLoader.getIcon("/actions/exclude.png"); + Icon COPY_ICON = IconLoader.getIcon("/actions/copy.png"); Icon MOVE_UP_ICON = IconLoader.getIcon("/actions/moveUp.png"); Icon MOVE_DOWN_ICON = IconLoader.getIcon("/actions/moveDown.png"); Icon EDIT = IconLoader.getIcon("/actions/edit.png"); diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java index 86e3abbc55d1..cc1d294854fe 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java @@ -38,6 +38,7 @@ import com.intellij.openapi.wm.IdeFocusManager; import com.intellij.ui.*; import com.intellij.ui.treeStructure.Tree; import com.intellij.util.ArrayUtil; +import com.intellij.util.PlatformIcons; import com.intellij.util.config.StorageAccessors; import com.intellij.util.containers.HashMap; import com.intellij.util.ui.UIUtil; @@ -67,7 +68,6 @@ class RunConfigurable extends BaseConfigurable { @NonNls private static final String GENERAL_ADD_ICON_PATH = "/general/add.png"; private static final Icon ADD_ICON = IconLoader.getIcon(GENERAL_ADD_ICON_PATH); private static final Icon REMOVE_ICON = IconLoader.getIcon("/general/remove.png"); - private static final Icon COPY_ICON = IconLoader.getIcon("/actions/copy.png"); private static final Icon SAVE_ICON = IconLoader.getIcon("/runConfigurations/saveTempConfig.png"); @NonNls private static final String EDIT_DEFAULTS_ICON_PATH = "/general/ideOptions.png"; private static final Icon EDIT_DEFAULTS_ICON = IconLoader.getIcon(EDIT_DEFAULTS_ICON_PATH); @@ -968,7 +968,7 @@ class RunConfigurable extends BaseConfigurable { public MyCopyAction() { super(ExecutionBundle.message("copy.configuration.action.name"), ExecutionBundle.message("copy.configuration.action.name"), - COPY_ICON); + PlatformIcons.COPY_ICON); final AnAction action = ActionManager.getInstance().getAction(IdeActions.ACTION_EDITOR_DUPLICATE); registerCustomShortcutSet(action.getShortcutSet(), myTree); diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/AllFileTemplatesConfigurable.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/AllFileTemplatesConfigurable.java index 8a96f66f9fe9..7f84b41e94e0 100644 --- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/AllFileTemplatesConfigurable.java +++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/AllFileTemplatesConfigurable.java @@ -35,6 +35,7 @@ import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TabbedPaneWrapper; import com.intellij.util.ArrayUtil; import com.intellij.util.Function; +import com.intellij.util.PlatformIcons; import com.intellij.util.containers.ContainerUtil; import gnu.trove.THashSet; import org.jetbrains.annotations.NotNull; @@ -256,7 +257,7 @@ public class AllFileTemplatesConfigurable implements SearchableConfigurable { e.getPresentation().setEnabled(!(myCurrentTab == myCodeTemplatesList || myCurrentTab == myJ2eeTemplatesList)); } }; - AnAction cloneAction = new AnAction(IdeBundle.message("action.copy.template"), null, IconLoader.getIcon("/actions/copy.png")) { + AnAction cloneAction = new AnAction(IdeBundle.message("action.copy.template"), null, PlatformIcons.COPY_ICON) { public void actionPerformed(AnActionEvent e) { onClone(); } diff --git a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/DisposerDebugger.java b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/DisposerDebugger.java index acb297915f46..25f57f6edb47 100644 --- a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/DisposerDebugger.java +++ b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/DisposerDebugger.java @@ -42,6 +42,7 @@ import com.intellij.ui.tabs.TabsListener; import com.intellij.ui.tabs.impl.JBTabsImpl; import com.intellij.ui.treeStructure.Tree; import com.intellij.ui.treeStructure.filtered.FilteringTreeBuilder; +import com.intellij.util.PlatformIcons; import com.intellij.util.ui.UIUtil; import com.intellij.util.ui.update.MergingUpdateQueue; import gnu.trove.THashSet; @@ -196,7 +197,7 @@ public class DisposerDebugger implements UiDebuggerExtension, Disposable { private class CopyAllocationAction extends AnAction { public CopyAllocationAction() { - super("Copy", "Copy allocation to clipboard", IconLoader.getIcon("/actions/copy.png")); + super("Copy", "Copy allocation to clipboard", PlatformIcons.COPY_ICON); } @Override diff --git a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java index f42ee6c2fd80..99593fdbfc57 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java @@ -60,7 +60,7 @@ import java.util.List; */ public abstract class MasterDetailsComponent implements Configurable, DetailsComponent.Facade, MasterDetails { protected static final Logger LOG = Logger.getInstance("#com.intellij.openapi.ui.MasterDetailsComponent"); - protected static final Icon COPY_ICON = IconLoader.getIcon("/actions/copy.png"); + protected static final Icon COPY_ICON = PlatformIcons.COPY_ICON; protected NamedConfigurable myCurrentConfigurable; private final Splitter mySplitter = new Splitter(false, .2f); diff --git a/platform/platform-api/src/com/intellij/ui/ReorderableListController.java b/platform/platform-api/src/com/intellij/ui/ReorderableListController.java index cd31cbff9236..55fbf13a1f29 100644 --- a/platform/platform-api/src/com/intellij/ui/ReorderableListController.java +++ b/platform/platform-api/src/com/intellij/ui/ReorderableListController.java @@ -20,6 +20,7 @@ import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.Factory; import com.intellij.openapi.util.IconLoader; +import com.intellij.util.PlatformIcons; import com.intellij.util.containers.Convertor; import org.jetbrains.annotations.Nullable; @@ -32,7 +33,6 @@ import java.util.*; public abstract class ReorderableListController { private final JList myList; private static final Icon REMOVE_ICON = IconLoader.getIcon("/general/remove.png"); - private static final Icon COPY_ICON = IconLoader.getIcon("/actions/copy.png"); protected ReorderableListController(final JList list) { myList = list; @@ -352,7 +352,7 @@ public abstract class ReorderableListController { } public Icon getActionIcon() { - return COPY_ICON; + return PlatformIcons.COPY_ICON; } public String getActionName() { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/CopyLineStatusRangeAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/CopyLineStatusRangeAction.java index b26db069df84..83dc7ebd8b21 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/CopyLineStatusRangeAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/CopyLineStatusRangeAction.java @@ -17,8 +17,8 @@ package com.intellij.openapi.vcs.ex; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.ide.CopyPasteManager; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.VcsBundle; +import com.intellij.util.PlatformIcons; import java.awt.datatransfer.StringSelection; @@ -27,7 +27,7 @@ import java.awt.datatransfer.StringSelection; */ public class CopyLineStatusRangeAction extends BaseLineStatusRangeAction { CopyLineStatusRangeAction(final LineStatusTracker lineStatusTracker, final Range range) { - super(VcsBundle.message("action.name.copy.old.text"), IconLoader.getIcon("/actions/copy.png"), lineStatusTracker, range); + super(VcsBundle.message("action.name.copy.old.text"), PlatformIcons.COPY_ICON, lineStatusTracker, range); } public boolean isEnabled() { diff --git a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProfilesPanel.java b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProfilesPanel.java index bba6041e9306..a6288737e8b1 100644 --- a/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProfilesPanel.java +++ b/plugins/copyright/src/com/maddyhome/idea/copyright/ui/CopyrightProfilesPanel.java @@ -34,7 +34,6 @@ import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.ui.popup.PopupStep; import com.intellij.openapi.ui.popup.util.BaseListPopupStep; import com.intellij.openapi.util.Conditions; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.PlatformIcons; @@ -53,9 +52,8 @@ import java.util.*; import java.util.concurrent.atomic.AtomicBoolean; public class CopyrightProfilesPanel extends MasterDetailsComponent implements SearchableConfigurable{ - private static final Icon COPY_ICON = IconLoader.getIcon("/actions/copy.png"); - private final Project myProject; + private final Project myProject; private final CopyrightManager myManager; private final AtomicBoolean myInitialized = new AtomicBoolean(false); @@ -161,7 +159,7 @@ public class CopyrightProfilesPanel extends MasterDetailsComponent implements Se }); result.add(new MyDeleteAction(Conditions.alwaysTrue())); - result.add(new AnAction("Copy", "Copy", COPY_ICON) { + result.add(new AnAction("Copy", "Copy", PlatformIcons.COPY_ICON) { { registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_D, KeyEvent.CTRL_MASK)), myTree); } diff --git a/plugins/git4idea/src/git4idea/history/GitCopyHistoryRevisionNumberAction.java b/plugins/git4idea/src/git4idea/history/GitCopyHistoryRevisionNumberAction.java index 96236ea4d5d9..ee9020b92c73 100644 --- a/plugins/git4idea/src/git4idea/history/GitCopyHistoryRevisionNumberAction.java +++ b/plugins/git4idea/src/git4idea/history/GitCopyHistoryRevisionNumberAction.java @@ -19,9 +19,9 @@ import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.ide.CopyPasteManager; import com.intellij.openapi.project.DumbAware; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.VcsDataKeys; import com.intellij.openapi.vcs.history.VcsFileRevision; +import com.intellij.util.PlatformIcons; import git4idea.i18n.GitBundle; import java.awt.datatransfer.StringSelection; @@ -37,7 +37,7 @@ public class GitCopyHistoryRevisionNumberAction extends AnAction implements Dumb public GitCopyHistoryRevisionNumberAction() { super(GitBundle.getString("history.copy.revsion.number"), GitBundle.getString("history.copy.revsion.number"), - IconLoader.getIcon("/actions/copy.png")); + PlatformIcons.COPY_ICON); } /** diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java index 8c09d862523c..a4e656230610 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java @@ -22,7 +22,6 @@ import com.intellij.openapi.actionSystem.CustomShortcutSet; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.ui.MasterDetailsComponent; import com.intellij.openapi.util.Condition; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Ref; import com.intellij.util.PlatformIcons; import com.intellij.util.ui.tree.TreeUtil; @@ -36,7 +35,6 @@ import java.awt.event.KeyEvent; import java.util.*; public class SvnConfigureProxiesComponent extends MasterDetailsComponent { - private static final Icon COPY_ICON = IconLoader.getIcon("/actions/copy.png"); private final SvnServerFileManager myManager; private final CompositeRunnable myTreeUpdaterValidator; @@ -193,7 +191,7 @@ public class SvnConfigureProxiesComponent extends MasterDetailsComponent { } }); - result.add(new AnAction("Copy", "Copy", COPY_ICON) { + result.add(new AnAction("Copy", "Copy", PlatformIcons.COPY_ICON) { { registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_D, KeyEvent.CTRL_MASK)), myTree); } diff --git a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ShowXPathAction.java b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ShowXPathAction.java index d6d1f4fcd836..72653f27b429 100644 --- a/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ShowXPathAction.java +++ b/plugins/xpath/xpath-view/src/org/intellij/plugins/xpathView/ShowXPathAction.java @@ -26,7 +26,6 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.markup.RangeHighlighter; import com.intellij.openapi.ide.CopyPasteManager; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; @@ -37,6 +36,7 @@ import com.intellij.ui.HintHint; import com.intellij.ui.InplaceButton; import com.intellij.ui.LightweightHint; import com.intellij.ui.components.panels.NonOpaquePanel; +import com.intellij.util.PlatformIcons; import org.intellij.plugins.xpathView.support.XPathSupport; import org.intellij.plugins.xpathView.util.HighlighterUtil; @@ -116,7 +116,7 @@ public class ShowXPathAction extends XPathAction { p.add(label, BorderLayout.CENTER); - InplaceButton copy = new InplaceButton(ActionsBundle.message("action.EditorCopy.text"), IconLoader.getIcon("/actions/copy.png"), new ActionListener() { + InplaceButton copy = new InplaceButton(ActionsBundle.message("action.EditorCopy.text"), PlatformIcons.COPY_ICON, new ActionListener() { @Override public void actionPerformed(ActionEvent e) { CopyPasteManager.getInstance().setContents(new StringSelection(path));