IDEA-83174 Please merge checkbox icons. [reviewed by Kirill Safonov]

java/openapi/src/com/intellij/codeInsight/NullableNotNullDialog.java

@@ -27,6 +27,7 @@ import com.intellij.psi.PsiClass;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.ui.*;
 import com.intellij.ui.components.JBList;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.ui.EmptyIcon;
 
 import javax.swing.*;
@@ -43,7 +44,7 @@ import java.util.Set;
  * Date: 1/25/11
  */
 public class NullableNotNullDialog extends DialogWrapper {
-  private static final Icon SELECT_ICON = IconLoader.getIcon("/actions/checked.png");
+  private static final Icon SELECT_ICON = PlatformIcons.CHECK_ICON;
   private static final Icon SELECTED_ICON = IconLoader.getIcon("/diff/currentLine.png");
 
   private final Project myProject;

platform/lang-impl/src/com/intellij/ide/bookmarks/Bookmark.java

@@ -34,13 +34,13 @@ import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.fileEditor.OpenFileDescriptor;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiDocumentManager;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
 import com.intellij.ui.LightColors;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -48,7 +48,7 @@ import javax.swing.*;
 import java.awt.*;
 
 public class Bookmark {
-  private static final Icon TICK = IconLoader.getIcon("/gutter/check.png");
+  private static final Icon TICK = PlatformIcons.CHECK_ICON;
 
   private final VirtualFile myFile;
   private final OpenFileDescriptor myTarget;

platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java

@@ -29,6 +29,7 @@ import com.intellij.openapi.ui.ShadowAction;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.ui.*;
 import com.intellij.ui.table.JBTable;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.Nullable;
 
@@ -56,7 +57,7 @@ public class RegistryUi implements Disposable {
 
   private final JPanel myContent = new JPanel();
 
-  private static final Icon RESTART_ICON = IconLoader.getIcon("/gutter/check.png");
+  private static final Icon RESTART_ICON = PlatformIcons.CHECK_ICON;
   private final RestoreDefaultsAction myRestoreDefaultsAction;
   private final MyTableModel myModel;
 

platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java

@@ -55,6 +55,7 @@ import com.intellij.openapi.vcs.VcsDataKeys;
 import com.intellij.pom.Navigatable;
 import com.intellij.ui.awt.RelativePoint;
 import com.intellij.util.BeforeAfter;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.ui.ButtonlessScrollBarUI;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.vcsUtil.VcsUtil;
@@ -578,7 +579,7 @@ public class ChangesFragmentedDiffPanel implements Disposable {
     }
   }
 
-  private final static Icon ourIcon = IconLoader.findIcon("/actions/checked.png");
+  private final static Icon ourIcon = PlatformIcons.CHECK_ICON;
   
   private class PopupAction extends DumbAwareAction {
     private Component myParent;

plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java

@@ -1438,7 +1438,7 @@ public class GitLogUI implements Disposable {
   // todo test action
   private class TestIndexAction extends DumbAwareAction {
     private TestIndexAction() {
-      super("Test Index", "Test Index", IconLoader.getIcon("/actions/checked.png"));
+      super("Test Index", "Test Index", PlatformIcons.CHECK_ICON);
     }
 
     @Override
@@ -1891,7 +1891,7 @@ public class GitLogUI implements Disposable {
 
     public MyTreeSettings() {
       myIcon = IconLoader.getIcon("/general/comboArrow.png");
-      myMarkIcon = IconLoader.findIcon("/actions/checked.png");
+      myMarkIcon = PlatformIcons.CHECK_ICON;
 
       myMultiColorAction = new DumbAwareAction("Multicolour") {
         @Override

plugins/git4idea/src/git4idea/ui/branch/GitBranchPopup.java

@@ -32,6 +32,7 @@ import com.intellij.openapi.util.IconLoader;
 import com.intellij.ui.popup.PopupFactoryImpl;
 import com.intellij.ui.popup.WizardPopup;
 import com.intellij.ui.popup.list.ListPopupImpl;
+import com.intellij.util.PlatformIcons;
 import git4idea.GitUtil;
 import git4idea.GitVcs;
 import git4idea.config.GitVcsSettings;
@@ -271,7 +272,7 @@ class GitBranchPopup  {
       super(GitUIUtil.getShortRepositoryName(repository), true);
       myRepository = repository;
       if (repository.equals(currentRepository)) {
-        getTemplatePresentation().setIcon(IconLoader.getIcon("/actions/checked.png"));
+        getTemplatePresentation().setIcon(PlatformIcons.CHECK_ICON);
       }
     }
 

plugins/ui-designer/ui-designer-new/src/com/intellij/designer/actions/AbstractComboBoxAction.java

@@ -15,11 +15,14 @@
  */
 package com.intellij.designer.actions;
 
-import com.intellij.openapi.actionSystem.*;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.DefaultActionGroup;
+import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.actionSystem.ex.ComboBoxAction;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.ui.popup.ListPopup;
-import com.intellij.openapi.util.IconLoader;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -32,7 +35,7 @@ import java.util.List;
  * @author Alexander Lobas
  */
 public abstract class AbstractComboBoxAction<T> extends ComboBoxAction {
-  private static final Icon CHECKED = IconLoader.getIcon("/actions/check.png");
+  private static final Icon CHECKED = PlatformIcons.CHECK_ICON;
 
   private List<T> myItems = Collections.emptyList();
   private T mySelection;