diff --git a/java/debugger/impl/src/com/intellij/debugger/DefaultDebugUIEnvironment.java b/java/debugger/impl/src/com/intellij/debugger/DefaultDebugUIEnvironment.java index 66614159b271..7d420dcaf53d 100644 --- a/java/debugger/impl/src/com/intellij/debugger/DefaultDebugUIEnvironment.java +++ b/java/debugger/impl/src/com/intellij/debugger/DefaultDebugUIEnvironment.java @@ -33,6 +33,7 @@ import com.intellij.ide.actions.ContextHelpAction; import com.intellij.openapi.actionSystem.Constraints; import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.project.Project; +import com.intellij.xdebugger.impl.ui.XDebugSessionTab; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -109,7 +110,7 @@ public class DefaultDebugUIEnvironment implements DebugUIEnvironment { RestartAction restartAction = new RestartAction(myExecutor, myRunner, processHandler, - AllIcons.Actions.StartDebugger, + RestartAction.RERUN_DEBUGGER_ICON, content, myExecutionEnvironment); actionGroup.add(restartAction, Constraints.FIRST); diff --git a/java/java-impl/src/com/intellij/cyclicDependencies/ui/CyclicDependenciesPanel.java b/java/java-impl/src/com/intellij/cyclicDependencies/ui/CyclicDependenciesPanel.java index 3e28808e6dff..2acdf7191278 100644 --- a/java/java-impl/src/com/intellij/cyclicDependencies/ui/CyclicDependenciesPanel.java +++ b/java/java-impl/src/com/intellij/cyclicDependencies/ui/CyclicDependenciesPanel.java @@ -504,7 +504,7 @@ public class CyclicDependenciesPanel extends JPanel implements Disposable, DataP private class RerunAction extends AnAction { public RerunAction(JComponent comp) { - super(CommonBundle.message("action.rerun"), AnalysisScopeBundle.message("action.rerun.dependency"), AllIcons.Actions.RefreshUsages); + super(CommonBundle.message("action.rerun"), AnalysisScopeBundle.message("action.rerun.dependency"), AllIcons.Actions.Rerun); registerCustomShortcutSet(CommonShortcuts.getRerun(), comp); } diff --git a/platform/icons/src/actions/refreshUsages.png b/platform/icons/src/actions/rerun.png similarity index 100% rename from platform/icons/src/actions/refreshUsages.png rename to platform/icons/src/actions/rerun.png diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java index 661aa25c4160..9ea69c982713 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java @@ -824,7 +824,7 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren private class RerunAction extends AnAction { public RerunAction(JComponent comp) { super(InspectionsBundle.message("inspection.action.rerun"), InspectionsBundle.message("inspection.action.rerun"), - AllIcons.Actions.RefreshUsages); + AllIcons.Actions.Rerun); registerCustomShortcutSet(CommonShortcuts.getRerun(), comp); } diff --git a/platform/lang-impl/src/com/intellij/execution/runners/RestartAction.java b/platform/lang-impl/src/com/intellij/execution/runners/RestartAction.java index b066f21d6066..a0605c6b8e21 100644 --- a/platform/lang-impl/src/com/intellij/execution/runners/RestartAction.java +++ b/platform/lang-impl/src/com/intellij/execution/runners/RestartAction.java @@ -41,6 +41,8 @@ import java.util.List; * @author dyoma */ public class RestartAction extends FakeRerunAction implements DumbAware, AnAction.TransparentUpdate, Disposable { + public static final Icon RERUN_ICON = AllIcons.Actions.Rerun; + public static final Icon RERUN_DEBUGGER_ICON = AllIcons.Actions.Rerun; private ProcessHandler myProcessHandler; private final ProgramRunner myRunner; diff --git a/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java b/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java index 25544f99f683..ebd27337a92c 100644 --- a/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java +++ b/platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java @@ -167,7 +167,8 @@ public class RunContentBuilder extends LogConsoleManagerBase { private ActionGroup createActionToolbar(final RunContentDescriptor contentDescriptor, final JComponent component) { final DefaultActionGroup actionGroup = new DefaultActionGroup(); - final RestartAction restartAction = new RestartAction(myExecutor, myRunner, getProcessHandler(), AllIcons.Actions.RefreshUsages, contentDescriptor, getEnvironment()); + final RestartAction restartAction = new RestartAction(myExecutor, myRunner, getProcessHandler(), + RestartAction.RERUN_ICON, contentDescriptor, getEnvironment()); restartAction.registerShortcut(component); actionGroup.add(restartAction); contentDescriptor.setRestarter(new Runnable() { diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java index 81b5d3e45ca8..c3e88646ab23 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java @@ -690,7 +690,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide private class RerunAction extends AnAction { public RerunAction(JComponent comp) { - super(CommonBundle.message("action.rerun"), AnalysisScopeBundle.message("action.rerun.dependency"), AllIcons.Actions.RefreshUsages); + super(CommonBundle.message("action.rerun"), AnalysisScopeBundle.message("action.rerun.dependency"), AllIcons.Actions.Rerun); registerCustomShortcutSet(CommonShortcuts.getRerun(), comp); } diff --git a/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeViewPanel.java b/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeViewPanel.java index e56ef4eb132c..bddb81d266ca 100644 --- a/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeViewPanel.java +++ b/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeViewPanel.java @@ -559,7 +559,7 @@ public class NewErrorTreeViewPanel extends JPanel implements DataProvider, Occur private final AnAction myCloseAction; public RerunAction(@NotNull Runnable rerunAction, @NotNull AnAction closeAction) { - super(IdeBundle.message("action.refresh"), null, AllIcons.Actions.RefreshUsages); + super(IdeBundle.message("action.refresh"), null, AllIcons.Actions.Rerun); myRerunAction = rerunAction; myCloseAction = closeAction; } diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java index 65b3af5bcb3a..b7510034f5a4 100644 --- a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java +++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java @@ -716,7 +716,7 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra private class ReRunAction extends AnAction implements DumbAware { private ReRunAction() { - super(UsageViewBundle.message("action.rerun"), UsageViewBundle.message("action.description.rerun"), AllIcons.Actions.RefreshUsages); + super(UsageViewBundle.message("action.rerun"), UsageViewBundle.message("action.description.rerun"), AllIcons.Actions.Rerun); registerCustomShortcutSet(CommonShortcuts.getRerun(), myRootPanel); } diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index 6c353ddbbe07..9f5c48eed164 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -114,8 +114,8 @@ public class AllIcons { public static final Icon Redo = IconLoader.getIcon("/actions/redo.png"); // 16x16 public static final Icon RefactoringBulb = IconLoader.getIcon("/actions/refactoringBulb.png"); // 16x16 public static final Icon Refresh = IconLoader.getIcon("/actions/refresh.png"); // 16x16 - public static final Icon RefreshUsages = IconLoader.getIcon("/actions/refreshUsages.png"); // 16x16 public static final Icon Replace = IconLoader.getIcon("/actions/replace.png"); // 16x16 + public static final Icon Rerun = IconLoader.getIcon("/actions/rerun.png"); // 16x16 public static final Icon Reset_to_default = IconLoader.getIcon("/actions/reset-to-default.png"); // 16x16 public static final Icon Reset = IconLoader.getIcon("/actions/reset.png"); // 16x16 public static final Icon Restart = IconLoader.getIcon("/actions/restart.png"); // 16x16 diff --git a/platform/util/src/com/intellij/openapi/util/IconLoader.java b/platform/util/src/com/intellij/openapi/util/IconLoader.java index 2b633cc649cf..78b77561c82f 100644 --- a/platform/util/src/com/intellij/openapi/util/IconLoader.java +++ b/platform/util/src/com/intellij/openapi/util/IconLoader.java @@ -65,6 +65,7 @@ public final class IconLoader { ourDeprecatedIconsReplacements.put("/vcs/refresh.png", "AllIcons.Actions.Refresh"); ourDeprecatedIconsReplacements.put("/actions/sync.png", "AllIcons.Actions.Refresh"); + ourDeprecatedIconsReplacements.put("/actions/refreshUsages.png", "AllIcons.Actions.Rerun"); ourDeprecatedIconsReplacements.put("/compiler/error.png", "AllIcons.General.Error"); ourDeprecatedIconsReplacements.put("/compiler/hideWarnings.png", "AllIcons.General.HideWarnings"); diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/actions/SynchronizeDiff.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/actions/SynchronizeDiff.java index d97af0478639..3ebb06099f2b 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/actions/SynchronizeDiff.java +++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/actions/SynchronizeDiff.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.diff.impl.dir.actions; +import com.intellij.icons.AllIcons; import com.intellij.ide.diff.BackgroundOperatingDiffElement; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CustomShortcutSet; @@ -37,7 +38,7 @@ public class SynchronizeDiff extends DirDiffAction { public SynchronizeDiff(DirDiffTableModel model, boolean selectedOnly) { super(model, selectedOnly ? "Synchronize Selected" : "Synchronize All", - IconLoader.getIcon(selectedOnly ? "/actions/resume.png" : "/actions/refreshUsages.png")); + selectedOnly ? AllIcons.Actions.Resume : AllIcons.Actions.Rerun); mySelectedOnly = selectedOnly; } diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java index cd59dd49aaac..f1bc76f7b52f 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebugSessionTab.java @@ -149,8 +149,7 @@ public class XDebugSessionTab extends DebuggerSessionTabBase { final Executor executor = DefaultDebugExecutor.getDebugExecutorInstance(); if (runner != null && env != null) { RestartAction restartAction = new RestartAction(executor, runner, myRunContentDescriptor.getProcessHandler(), - AllIcons.Actions.StartDebugger, - myRunContentDescriptor, env); + RestartAction.RERUN_DEBUGGER_ICON, myRunContentDescriptor, env); leftToolbar.add(restartAction); restartAction.registerShortcut(myUi.getComponent()); } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/RunAction.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/RunAction.java index f376e9bb58e9..6332cab27a32 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/RunAction.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/RunAction.java @@ -31,7 +31,7 @@ public final class RunAction extends AnAction { private final AntBuildMessageView myAntBuildMessageView; public RunAction(AntBuildMessageView antBuildMessageView) { - super(AntBundle.message("rerun.ant.action.name"), null, AllIcons.Actions.RefreshUsages); + super(AntBundle.message("rerun.ant.action.name"), null, AllIcons.Actions.Rerun); myAntBuildMessageView = antBuildMessageView; }