platform icons
authorKonstantin Bulenkov <kb@jetbrains.com>
Wed, 22 Jun 2011 19:16:17 +0000 (23:16 +0400)
committerKonstantin Bulenkov <kb@jetbrains.com>
Wed, 22 Jun 2011 19:16:25 +0000 (23:16 +0400)
124 files changed:
RegExpSupport/src/org/intellij/lang/regexp/RegExpCompletionContributor.java
RegExpSupport/src/org/intellij/lang/regexp/psi/impl/RegExpPropertyImpl.java
java/compiler/impl/src/com/intellij/packaging/impl/elements/LibraryElementType.java
java/compiler/impl/src/com/intellij/packaging/impl/elements/TestModuleOutputElementType.java
java/compiler/impl/src/com/intellij/packaging/impl/ui/LibraryElementPresentation.java
java/compiler/impl/src/com/intellij/packaging/impl/ui/ModuleElementPresentation.java
java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.java
java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectJdksConfigurable.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/RemovePackagingElementAction.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/LibrarySourceItem.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ModuleGroupItem.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraries/impl/LibraryPresentationManagerImpl.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/LibraryRootsComponent.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleGroupConfigurable.java
java/java-impl/src/com/intellij/codeInsight/completion/ImportStaticLookupActionProvider.java
java/java-impl/src/com/intellij/codeInsight/completion/ReferenceExpressionCompletionContributor.java
java/java-impl/src/com/intellij/codeInsight/completion/SameSignatureCallParametersProvider.java
java/java-impl/src/com/intellij/codeInspection/reference/RefPackageImpl.java
java/java-impl/src/com/intellij/ide/JavaFileIconPatcher.java
java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageElementNode.java
java/java-impl/src/com/intellij/ide/projectView/impl/nodes/PackageViewLibrariesNode.java
java/java-impl/src/com/intellij/ide/structureView/impl/java/FieldsFilter.java
java/java-impl/src/com/intellij/ide/structureView/impl/java/PropertiesGrouper.java
java/java-impl/src/com/intellij/ide/structureView/impl/java/PublicElementsFilter.java
java/java-impl/src/com/intellij/ide/util/PackageChooserDialog.java
java/java-impl/src/com/intellij/internal/psiView/PsiViewerCodeFragmentExtension.java
java/java-impl/src/com/intellij/internal/psiView/PsiViewerExpressionExtension.java
java/java-impl/src/com/intellij/internal/psiView/PsiViewerMethodExtension.java
java/java-impl/src/com/intellij/packageDependencies/ui/PackageNode.java
java/java-impl/src/com/intellij/packageDependencies/ui/TreeModelBuilder.java
java/java-impl/src/com/intellij/psi/impl/file/PsiPackageImpl.java
java/java-impl/src/com/intellij/psi/impl/light/LightMethod.java
java/java-impl/src/com/intellij/psi/impl/light/LightMethodBuilder.java
java/java-impl/src/com/intellij/psi/impl/light/LightVariableBase.java
java/java-impl/src/com/intellij/psi/impl/light/LightVariableBuilder.java
java/java-impl/src/com/intellij/psi/impl/source/PsiClassInitializerImpl.java
java/java-impl/src/com/intellij/psi/impl/source/PsiEnumConstantImpl.java
java/java-impl/src/com/intellij/psi/impl/source/PsiFieldImpl.java
java/java-impl/src/com/intellij/psi/impl/source/PsiMethodImpl.java
java/java-impl/src/com/intellij/psi/impl/source/PsiParameterImpl.java
java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiClassObjectAccessExpressionImpl.java
java/java-impl/src/com/intellij/psi/impl/source/tree/java/PsiLocalVariableImpl.java
java/openapi/src/com/intellij/codeInsight/completion/util/PsiTypeCanonicalLookupElement.java
java/openapi/src/com/intellij/util/VisibilityIcons.java
platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java
platform/lang-api/src/com/intellij/openapi/roots/ui/util/OrderEntryCellAppearanceUtils.java
platform/lang-impl/src/com/intellij/codeInspection/reference/RefProjectImpl.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionPackageNode.java
platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java
platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarItem.java
platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java
platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/LibraryGroupNode.java
platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/ModuleGroupNode.java
platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/ModuleListNode.java
platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/PsiDirectoryNode.java
platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java
platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java
platform/lang-impl/src/com/intellij/ide/util/scopeChooser/FlattenPackagesAction.java
platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java
platform/lang-impl/src/com/intellij/packageDependencies/ui/ModuleGroupNode.java
platform/lang-impl/src/com/intellij/psi/impl/file/PsiDirectoryImpl.java
platform/lang-impl/src/com/intellij/util/ui/classpath/SimpleClasspathPanel.java
platform/platform-api/src/com/intellij/openapi/fileChooser/FileChooserDescriptor.java
platform/platform-api/src/com/intellij/openapi/fileTypes/UserFileType.java
platform/platform-api/src/com/intellij/openapi/roots/ui/util/HttpUrlCellAppearance.java
platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java
platform/platform-api/src/com/intellij/openapi/ui/NamedItemsListEditor.java
platform/platform-api/src/com/intellij/openapi/vfs/VirtualFile.java
platform/platform-api/src/com/intellij/ui/components/editors/JBComboBoxTableCellEditorComponent.java
platform/platform-api/src/com/intellij/util/IconUtil.java
platform/platform-impl/src/com/intellij/ide/actions/SwitcherToolWindowsListRenderer.java
platform/platform-impl/src/com/intellij/ide/diff/VirtualFileDiffElement.java
platform/platform-impl/src/com/intellij/internal/statistic/configurable/StatisticsConfigurable.java
platform/platform-impl/src/com/intellij/internal/statistic/tmp/SendStatisticsAction.java
platform/platform-impl/src/com/intellij/openapi/fileChooser/ex/LocalFsFinder.java
platform/usageView/src/com/intellij/usages/ReadWriteAccessUsageInfo2UsageAdapter.java
platform/usageView/src/com/intellij/usages/impl/UsageGroupingRuleProviderImpl.java
platform/usageView/src/com/intellij/usages/impl/rules/UsageScopeGroupingRule.java
platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/actions/RefreshDirDiffAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/UnversionedViewDialog.java
platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
platform/vcs-impl/src/com/intellij/openapi/vcs/impl/ProjectLevelVcsManagerImpl.java
platform/vcs-impl/src/com/intellij/openapi/vcs/update/FileTreeNode.java
platform/vcs-impl/src/com/intellij/openapi/vcs/update/TestContinuationAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateInfoTree.java
plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataGroupVirtualFile.java
plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataLineMarkerProvider.java
plugins/InspectionGadgets/src/com/siyeh/ig/ui/UiUtils.java
plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/config/ui/MethodParameterPanel.java
plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/config/ui/configurables/MethodParameterInjectionConfigurable.java
plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/JavaLanguageInjectionSupport.java
plugins/IntelliLang/java-support/org/intellij/plugins/intelliLang/inject/java/RegExpEnumReference.java
plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java
plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/config/ui/configurables/XmlAttributeInjectionConfigurable.java
plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/config/ui/configurables/XmlTagInjectionConfigurable.java
plugins/IntelliLang/xml-support/org/intellij/plugins/intelliLang/inject/xml/XmlLanguageInjectionSupport.java
plugins/android/src/org/jetbrains/android/actions/NewAndroidComponentDialog.java
plugins/ant/src/com/intellij/lang/ant/config/execution/MessageTreeRenderer.java
plugins/ant/src/com/intellij/lang/ant/config/impl/TargetChooserDialog.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/experts/importToCvs/ImportTree.java
plugins/git4idea/src/git4idea/history/browser/GitLogTreeFileSelectorRenderer.java
plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java
plugins/git4idea/src/git4idea/ui/GitRefspecAddRefsDialog.java
plugins/groovy/src/org/jetbrains/plugins/groovy/griffon/GriffonToolWindowFactory.java
plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/synthetic/GrLightMethodBuilder.java
plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/dom/references/MavenPropertyPsiReference.java
plugins/properties/src/com/intellij/lang/properties/PropertyLookupRenderer.java
plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundlePropertyStructureViewElement.java
plugins/properties/src/com/intellij/lang/properties/psi/impl/PropertyImpl.java
plugins/svn4idea/src/org/jetbrains/idea/svn/config/SvnConfigureProxiesComponent.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/SvnRepositoryTreeCellRenderer.java
plugins/svn4idea/src/org/jetbrains/idea/svn/integrate/IntegratedSelectedOptionsDialog.java
plugins/ui-designer/src/com/intellij/uiDesigner/GuiFormFileType.java
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/NodeLookup.java
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/VariableLookup.java
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/psi/impl/XsltParameterImpl.java
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/psi/impl/XsltVariableImpl.java
plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltDebuggerExtension.java
plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/GeneratedStructureRenderer.java
xml/impl/src/com/intellij/application/options/TagListDialog.java
xml/impl/src/com/intellij/psi/impl/source/xml/SchemaPrefix.java
xml/impl/src/com/intellij/psi/impl/source/xml/XmlTagImpl.java

index 9330f028a553ce3795bbb003b2217bd784928d72..f6f6078d65a99ce0d7010e00f6469c90cc978295 100644 (file)
@@ -22,7 +22,7 @@ import com.intellij.codeInsight.lookup.LookupElementBuilder;
 import com.intellij.codeInsight.lookup.TailTypeDecorator;
 import com.intellij.patterns.ElementPattern;
 import com.intellij.psi.PsiElement;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.ProcessingContext;
 import com.intellij.util.ui.EmptyIcon;
 import org.intellij.lang.regexp.psi.impl.RegExpPropertyImpl;
@@ -37,7 +37,7 @@ import static com.intellij.patterns.PlatformPatterns.psiElement;
  * @author vnikolaenko
  */
 public class RegExpCompletionContributor extends CompletionContributor {
-  private static final Icon emptyIcon = new EmptyIcon(Icons.PROPERTY_ICON.getIconWidth(), Icons.PROPERTY_ICON.getIconHeight());
+  private static final Icon emptyIcon = new EmptyIcon(PlatformIcons.PROPERTY_ICON.getIconWidth(), PlatformIcons.PROPERTY_ICON.getIconHeight());
 
   public RegExpCompletionContributor() {
     {
@@ -104,7 +104,7 @@ public class RegExpCompletionContributor extends CompletionContributor {
                                final ProcessingContext context,
                                @NotNull final CompletionResultSet result) {
       for (String[] stringArray : RegExpPropertyImpl.PROPERTY_NAMES) {
-        addLookupElement(result, "{" + stringArray[0] + "}", stringArray.length > 1 ? stringArray[1]:null, Icons.PROPERTY_ICON);
+        addLookupElement(result, "{" + stringArray[0] + "}", stringArray.length > 1 ? stringArray[1]:null, PlatformIcons.PROPERTY_ICON);
       }
     }
   }
@@ -127,7 +127,7 @@ public class RegExpCompletionContributor extends CompletionContributor {
       }
 
       for (String[] stringArray : RegExpPropertyImpl.PROPERTY_NAMES) {
-        addLookupElement(result, "p{" + stringArray[0] + "}", stringArray.length > 1? stringArray[1]:null, Icons.PROPERTY_ICON);
+        addLookupElement(result, "p{" + stringArray[0] + "}", stringArray.length > 1? stringArray[1]:null, PlatformIcons.PROPERTY_ICON);
       }
     }
   }
index de169fa939a911ea1460c3c27c7848da74035ea0..ed1761f29901ee9c99e8da2092dd2825db4f2545 100644 (file)
@@ -23,14 +23,13 @@ import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiReference;
 import com.intellij.util.ArrayUtil;
-import com.intellij.util.Icons;
 import com.intellij.util.IncorrectOperationException;
-import org.jetbrains.annotations.Nullable;
-import org.jetbrains.annotations.NotNull;
-
+import com.intellij.util.PlatformIcons;
 import org.intellij.lang.regexp.RegExpTT;
 import org.intellij.lang.regexp.psi.RegExpElementVisitor;
 import org.intellij.lang.regexp.psi.RegExpProperty;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.awt.*;
 import java.lang.reflect.Field;
@@ -143,7 +142,7 @@ public class RegExpPropertyImpl extends RegExpElementImpl implements RegExpPrope
             private final String[] myProp;
 
             public MyLookupValue(String[] prop) {
-                super(prop[0], Icons.PROPERTY_ICON);
+                super(prop[0], PlatformIcons.PROPERTY_ICON);
                 myProp = prop;
             }
 
index 33a691563521b00f2b7a7233102633e34573fde1..591c50c036dcb4e01bafd904e240ab5a56c03c06 100644 (file)
@@ -24,7 +24,7 @@ import com.intellij.packaging.artifacts.Artifact;
 import com.intellij.packaging.elements.ComplexPackagingElementType;
 import com.intellij.packaging.elements.CompositePackagingElement;
 import com.intellij.packaging.ui.ArtifactEditorContext;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 
@@ -44,7 +44,7 @@ public class LibraryElementType extends ComplexPackagingElementType<LibraryPacka
 
   @Override
   public Icon getCreateElementIcon() {
-    return Icons.LIBRARY_ICON;
+    return PlatformIcons.LIBRARY_ICON;
   }
 
   @Override
index b8ec5ecab07f19dac85264f46f93c419e7adf373..4ec37440927a03c39d2f953bef4f921a79646cfa 100644 (file)
@@ -24,7 +24,7 @@ import com.intellij.openapi.roots.ModuleRootModel;
 import com.intellij.openapi.roots.SourceFolder;
 import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
 import com.intellij.packaging.ui.ArtifactEditorContext;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -53,7 +53,7 @@ public class TestModuleOutputElementType extends ModuleOutputElementTypeBase<Tes
 
   @Override
   public Icon getCreateElementIcon() {
-    return Icons.TEST_SOURCE_FOLDER;
+    return PlatformIcons.TEST_SOURCE_FOLDER;
   }
 
   protected List<Module> getSuitableModules(ArtifactEditorContext context) {
index ab3fc860ee379a7d802b484a3662eba65560f663..35ec3bfd2de50e0268a5a6e181db979fc5556b2b 100644 (file)
 package com.intellij.packaging.impl.ui;
 
 import com.intellij.ide.projectView.PresentationData;
+import com.intellij.openapi.module.Module;
+import com.intellij.openapi.roots.impl.ModuleLibraryTable;
+import com.intellij.openapi.roots.impl.libraries.LibraryImpl;
 import com.intellij.openapi.roots.libraries.Library;
 import com.intellij.openapi.roots.libraries.LibraryTable;
 import com.intellij.openapi.roots.libraries.LibraryTablePresentation;
-import com.intellij.openapi.roots.impl.ModuleLibraryTable;
-import com.intellij.openapi.roots.impl.libraries.LibraryImpl;
-import com.intellij.openapi.module.Module;
 import com.intellij.packaging.ui.ArtifactEditorContext;
 import com.intellij.packaging.ui.PackagingElementPresentation;
 import com.intellij.packaging.ui.PackagingElementWeights;
 import com.intellij.ui.SimpleTextAttributes;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -64,7 +64,7 @@ public class LibraryElementPresentation extends PackagingElementPresentation {
 
   public void render(@NotNull PresentationData presentationData, SimpleTextAttributes mainAttributes, SimpleTextAttributes commentAttributes) {
     if (myLibrary != null) {
-      presentationData.setIcons(Icons.LIBRARY_ICON);
+      presentationData.setIcons(PlatformIcons.LIBRARY_ICON);
       presentationData.addText(myLibraryName, mainAttributes);
       presentationData.addText(getLibraryTableComment(myLibrary), commentAttributes);
     }
index d01df08ad94927d4d44809ab5a6375dcfc0ec913..9b05f101f6fb41b7830cd829c1cc221650acba82 100644 (file)
@@ -24,7 +24,7 @@ import com.intellij.packaging.ui.ArtifactEditorContext;
 import com.intellij.packaging.ui.PackagingElementWeights;
 import com.intellij.packaging.ui.TreeNodePresentation;
 import com.intellij.ui.SimpleTextAttributes;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -67,7 +67,7 @@ public class ModuleElementPresentation extends TreeNodePresentation {
   public void render(@NotNull PresentationData presentationData, SimpleTextAttributes mainAttributes, SimpleTextAttributes commentAttributes) {
     final Module module = findModule();
     if (myTestOutput) {
-      presentationData.setIcons(Icons.TEST_SOURCE_FOLDER);
+      presentationData.setIcons(PlatformIcons.TEST_SOURCE_FOLDER);
     }
     else if (module != null) {
       presentationData.setOpenIcon(module.getModuleType().getNodeIcon(true));
index f6c59d31ce8ca2068a38218aa21e64c40bb5980d..9dc8c278ae13217c3bc259661151c6c5ff635edd 100644 (file)
@@ -34,8 +34,8 @@ import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.ColoredListCellRenderer;
 import com.intellij.ui.SortedComboBoxModel;
-import com.intellij.util.Icons;
 import com.intellij.util.PathUtil;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.ui.RadioButtonEnumModel;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -319,7 +319,7 @@ public class LibraryOptionsPanel {
         ProjectStructureDialogCellAppearanceUtils.forLibrary(((ExistingLibraryEditor)value).getLibrary(), null).customize(this);
       }
       else if (value instanceof NewLibraryEditor) {
-        setIcon(Icons.LIBRARY_ICON);
+        setIcon(PlatformIcons.LIBRARY_ICON);
         final String name = ((NewLibraryEditor)value).getName();
         append(name != null ? name : "<unnamed>");
       }
index 0f824ce895fbbb36ecd5a7d076af0fd4ec56cb02..80c4754d11bdb8bfb08a78e98c6d06fdb1760c99 100644 (file)
@@ -25,7 +25,7 @@ import com.intellij.openapi.ui.ex.MultiLineLabel;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.ui.components.JBList;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.StringBuilderSpinAllocator;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -178,11 +178,11 @@ abstract class ProjectLayoutPanel<T> extends JPanel {
       return ICON_MODULE;
     }
     if (element instanceof LibraryDescriptor) {
-      return Icons.LIBRARY_ICON;
+      return PlatformIcons.LIBRARY_ICON;
     }
     if (element instanceof File) {
       final File file = (File)element;
-      return file.isDirectory()? Icons.DIRECTORY_CLOSED_ICON : Icons.JAR_ICON;
+      return file.isDirectory()? PlatformIcons.DIRECTORY_CLOSED_ICON : PlatformIcons.JAR_ICON;
     }
     return null;
   }
index fa50511d599372b645c4b07e9cee5b49ba36a311..d92bcca09018b51b56c09891a21263e0615fb729 100644 (file)
@@ -39,7 +39,7 @@ import com.intellij.openapi.ui.Splitter;
 import com.intellij.openapi.util.Conditions;
 import com.intellij.ui.TreeSpeedSearch;
 import com.intellij.util.Consumer;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.containers.Convertor;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.Nullable;
@@ -157,7 +157,7 @@ public class ProjectJdksConfigurable extends MasterDetailsComponent {
   protected ArrayList<AnAction> createActions(final boolean fromPopup) {
     final ArrayList<AnAction> actions = new ArrayList<AnAction>();
     DefaultActionGroup group = new DefaultActionGroup(ProjectBundle.message("add.new.jdk.text"), true);
-    group.getTemplatePresentation().setIcon(Icons.ADD_ICON);
+    group.getTemplatePresentation().setIcon(PlatformIcons.ADD_ICON);
     myProjectJdksModel.createAddActions(group, myTree, new Consumer<Sdk>() {
       public void consume(final Sdk projectJdk) {
         addNode(new MyNode(new JdkConfigurable(((ProjectJdkImpl)projectJdk), myProjectJdksModel, TREE_UPDATER, myHistory, myProject), false), myRoot);
index b84c215c51b25f7c7bb8f4d163795c4ed9c26f69..7672a37006d1039e4879263960e5ff08aeeabedd 100644 (file)
 package com.intellij.openapi.roots.ui.configuration.artifacts.actions;
 
 import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.ProjectBundle;
 import com.intellij.openapi.roots.ui.configuration.artifacts.ArtifactEditorEx;
 import com.intellij.openapi.roots.ui.configuration.artifacts.LayoutTreeSelection;
 import com.intellij.openapi.roots.ui.configuration.artifacts.nodes.PackagingElementNode;
-import com.intellij.packaging.elements.PackagingElement;
-import com.intellij.util.Icons;
-
-import java.util.List;
+import com.intellij.util.PlatformIcons;
 
 /**
  * @author nik
@@ -32,7 +28,7 @@ import java.util.List;
 public class RemovePackagingElementAction extends LayoutTreeActionBase {
 
   public RemovePackagingElementAction(ArtifactEditorEx artifactEditor) {
-    super(ProjectBundle.message("action.name.remove.packaging.element"), ProjectBundle.message("action.description.remove.packaging.elements"), Icons.DELETE_ICON,
+    super(ProjectBundle.message("action.name.remove.packaging.element"), ProjectBundle.message("action.description.remove.packaging.elements"), PlatformIcons.DELETE_ICON,
           artifactEditor);
   }
 
index 9f84cd6522bceda156a3b6c5acccc27100243b35..39dd97669de5fb6fa08c691743a3ea738a61fecc 100644 (file)
@@ -23,11 +23,14 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.packaging.elements.PackagingElement;
 import com.intellij.packaging.elements.PackagingElementFactory;
 import com.intellij.packaging.elements.PackagingElementOutputKind;
-import com.intellij.packaging.ui.*;
-import com.intellij.packaging.impl.ui.LibraryElementPresentation;
 import com.intellij.packaging.impl.elements.LibraryPackagingElement;
+import com.intellij.packaging.impl.ui.LibraryElementPresentation;
+import com.intellij.packaging.ui.ArtifactEditorContext;
+import com.intellij.packaging.ui.PackagingSourceItem;
+import com.intellij.packaging.ui.SourceItemPresentation;
+import com.intellij.packaging.ui.SourceItemWeights;
 import com.intellij.ui.SimpleTextAttributes;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.List;
@@ -105,7 +108,7 @@ public class LibrarySourceItem extends PackagingSourceItem {
                        SimpleTextAttributes commentAttributes) {
       final String name = myLibrary.getName();
       if (name != null) {
-        presentationData.setIcons(Icons.LIBRARY_ICON);
+        presentationData.setIcons(PlatformIcons.LIBRARY_ICON);
         presentationData.addText(name, mainAttributes);
         presentationData.addText(LibraryElementPresentation.getLibraryTableComment(myLibrary), commentAttributes);
       }
index 89528434d7b04c4c1d24b41e3296ebcd5246232c..a6ac2a7f027a289a0705ce94abc8181e22c2a687 100644 (file)
@@ -18,9 +18,12 @@ package com.intellij.openapi.roots.ui.configuration.artifacts.sourceItems;
 import com.intellij.ide.projectView.PresentationData;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.packaging.elements.PackagingElement;
-import com.intellij.packaging.ui.*;
+import com.intellij.packaging.ui.ArtifactEditorContext;
+import com.intellij.packaging.ui.PackagingSourceItem;
+import com.intellij.packaging.ui.SourceItemPresentation;
+import com.intellij.packaging.ui.SourceItemWeights;
 import com.intellij.ui.SimpleTextAttributes;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.Arrays;
@@ -77,8 +80,8 @@ public class ModuleGroupItem extends PackagingSourceItem {
     @Override
     public void render(@NotNull PresentationData presentationData, SimpleTextAttributes mainAttributes,
                        SimpleTextAttributes commentAttributes) {
-      presentationData.setClosedIcon(Icons.CLOSED_MODULE_GROUP_ICON);
-      presentationData.setOpenIcon(Icons.OPENED_MODULE_GROUP_ICON);
+      presentationData.setClosedIcon(PlatformIcons.CLOSED_MODULE_GROUP_ICON);
+      presentationData.setOpenIcon(PlatformIcons.OPENED_MODULE_GROUP_ICON);
       presentationData.addText(myGroupName, mainAttributes);
     }
 
index b7aa1cb9d5aefc25042fc748e3755ff50e749337..462464efd289538e9edf4c1c6658baaffc1b17a3 100644 (file)
@@ -22,7 +22,7 @@ import com.intellij.openapi.roots.libraries.*;
 import com.intellij.openapi.roots.ui.configuration.libraries.LibraryPresentationManager;
 import com.intellij.openapi.roots.ui.configuration.projectRoot.StructureConfigurableContext;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.SmartList;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
@@ -53,7 +53,7 @@ public class LibraryPresentationManagerImpl extends LibraryPresentationManager {
   @Override
   public Icon getNamedLibraryIcon(@NotNull Library library, @Nullable StructureConfigurableContext context) {
     final Icon icon = getCustomIcon(library, context);
-    return icon != null ? icon : Icons.LIBRARY_ICON;
+    return icon != null ? icon : PlatformIcons.LIBRARY_ICON;
   }
 
   @Override
index 435e2ccfcda697968e56b7489ae55272545c7981..0a4b102e5dcf114dd6d7c96ecbeefe5aeebcebe2 100644 (file)
@@ -48,7 +48,7 @@ import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.ui.TreeSpeedSearch;
 import com.intellij.ui.treeStructure.Tree;
 import com.intellij.util.ArrayUtil;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -437,7 +437,7 @@ public class LibraryRootsComponent implements Disposable, LibraryEditorComponent
       }
       if (presentableFile != null && presentableFile.isValid()) {
         if (presentableFile.getFileSystem() instanceof HttpFileSystem) {
-          icon = Icons.WEB_ICON;
+          icon = PlatformIcons.WEB_ICON;
         }
         else {
           if (presentableFile.isDirectory()) {
@@ -445,7 +445,7 @@ public class LibraryRootsComponent implements Disposable, LibraryEditorComponent
               icon = JAR_DIRECTORY_ICON;
             }
             else {
-              icon = Icons.DIRECTORY_CLOSED_ICON;
+              icon = PlatformIcons.DIRECTORY_CLOSED_ICON;
             }
           }
           else {
index 2f802fc85cb556ac2d376c6a4a50ebeb56aac119..a3fe20581f7f500b299c4add96ab5aaacf7a3388 100644 (file)
@@ -27,7 +27,7 @@ import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.project.ProjectBundle;
 import com.intellij.openapi.ui.NamedConfigurable;
 import com.intellij.openapi.ui.PanelWithText;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.Nullable;
 
@@ -57,11 +57,11 @@ public class ModuleGroupConfigurable extends NamedConfigurable<ModuleGroup> {
   }
 
   public Icon getIcon() {
-    return Icons.OPENED_MODULE_GROUP_ICON;
+    return PlatformIcons.OPENED_MODULE_GROUP_ICON;
   }
 
   public Icon getIcon(final boolean open) {
-    return open ? Icons.OPENED_MODULE_GROUP_ICON : Icons.CLOSED_MODULE_GROUP_ICON;
+    return open ? PlatformIcons.OPENED_MODULE_GROUP_ICON : PlatformIcons.CLOSED_MODULE_GROUP_ICON;
   }
 
   @Nullable
index 15bee2a684aa8670bfd8fd347c672323db3ec2df..c303bffe514e1ad39fe3c92678dbd0c72c0f505c 100644 (file)
@@ -5,7 +5,7 @@ import com.intellij.codeInsight.lookup.LookupActionProvider;
 import com.intellij.codeInsight.lookup.LookupElement;
 import com.intellij.codeInsight.lookup.LookupElementAction;
 import com.intellij.util.Consumer;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.ui.EmptyIcon;
 
 import javax.swing.*;
@@ -25,7 +25,7 @@ public class ImportStaticLookupActionProvider implements LookupActionProvider {
       return;
     }
 
-    final Icon checkIcon = Icons.CHECK_ICON;
+    final Icon checkIcon = PlatformIcons.CHECK_ICON;
     final Icon icon = item.willBeImported() ? checkIcon : new EmptyIcon(checkIcon.getIconWidth(), checkIcon.getIconHeight());
     consumer.consume(new LookupElementAction(icon, "Import statically") {
       @Override
index 44416fb5ab67101aa7aaf12b7af6991784bc4b37..7c206fa428ca052aed5366fed7674e851dd10aaf 100644 (file)
@@ -41,8 +41,8 @@ import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.util.PsiUtil;
 import com.intellij.psi.util.TypeConversionUtil;
 import com.intellij.util.Consumer;
-import com.intellij.util.Icons;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -294,7 +294,7 @@ public class ReferenceExpressionCompletionContributor {
     item.setLookupString(StringUtil.isEmpty(qualifierText) ? presentable : prefix);
     item.setPresentableText(presentable);
     item.addLookupStrings(prefix, presentable, "asList(" + prefix + ")");
-    item.setIcon(Icons.METHOD_ICON);
+    item.setIcon(PlatformIcons.METHOD_ICON);
     item.setInsertHandler(new InsertHandler<LookupElement>() {
       public void handleInsert(InsertionContext context, LookupElement item) {
         FeatureUsageTracker.getInstance().triggerFeatureUsed(JavaCompletionFeatures.SECOND_SMART_COMPLETION_ASLIST);
@@ -469,7 +469,7 @@ public class ReferenceExpressionCompletionContributor {
     item.setLookupString(prefix + ".toArray(" + getSpace(callSpace) + expressionString + getSpace(callSpace) + ")");
     item.setPresentableText(prefix + ".toArray(" + presentableString + ")");
     item.addLookupStrings(presentableString);
-    item.setIcon(Icons.METHOD_ICON);
+    item.setIcon(PlatformIcons.METHOD_ICON);
     item.setInsertHandler(new InsertHandler<LookupItem>(){
       public void handleInsert(InsertionContext context, LookupItem item) {
         FeatureUsageTracker.getInstance().triggerFeatureUsed(JavaCompletionFeatures.SECOND_SMART_COMPLETION_TOAR);
index 85bdfb322c40bd36b6940bd69d3cd6f8d915c22c..3705cfa5eb77a0fc2830b3fce33d5b7e8990c282 100644 (file)
@@ -27,7 +27,7 @@ import com.intellij.psi.util.PsiSuperMethodUtil;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.ui.LayeredIcon;
 import com.intellij.util.Function;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.ProcessingContext;
 import org.jetbrains.annotations.NotNull;
 
@@ -69,10 +69,10 @@ class SameSignatureCallParametersProvider extends CompletionProvider<CompletionP
       }
     }, ", ");
 
-    final int w = Icons.PARAMETER_ICON.getIconWidth();
+    final int w = PlatformIcons.PARAMETER_ICON.getIconWidth();
     LayeredIcon icon = new LayeredIcon(2);
-    icon.setIcon(Icons.PARAMETER_ICON, 0, 2*w/5, 0);
-    icon.setIcon(Icons.PARAMETER_ICON, 1);
+    icon.setIcon(PlatformIcons.PARAMETER_ICON, 0, 2*w/5, 0);
+    icon.setIcon(PlatformIcons.PARAMETER_ICON, 1);
 
     final LookupElement element = LookupElementBuilder.create(lookupString).setIcon(icon);
     element.putUserData(JavaCompletionUtil.SUPER_METHOD_PARAMETERS, Boolean.TRUE);
index 604309b7dacc934a23aae837fae032e475c0b4ee..201f93c66de6d33a01b37fd4deafc742013c87c7 100644 (file)
@@ -25,7 +25,7 @@
 package com.intellij.codeInspection.reference;
 
 import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 
 import javax.swing.*;
 
@@ -73,6 +73,6 @@ public class RefPackageImpl extends RefEntityImpl implements RefPackage {
   }
 
   public Icon getIcon(final boolean expanded) {
-    return expanded ? Icons.PACKAGE_OPEN_ICON : Icons.PACKAGE_ICON;
+    return expanded ? PlatformIcons.PACKAGE_OPEN_ICON : PlatformIcons.PACKAGE_ICON;
   }
 }
index 3ab62fe7691e248c807b750430719200407ebe6d..2fd17fe42d0291946f59e9ccbe4276eb4c823679 100644 (file)
@@ -28,7 +28,7 @@ import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
 import com.intellij.ui.LayeredIcon;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 
 import javax.swing.*;
 
@@ -45,7 +45,7 @@ public class JavaFileIconPatcher implements FileIconPatcher {
 
     final ProjectFileIndex fileIndex = ProjectRootManager.getInstance(project).getFileIndex();
     if (fileIndex.isInSource(file) && CompilerManager.getInstance(project).isExcludedFromCompilation(file)) {
-      return new LayeredIcon(icon, Icons.EXCLUDED_FROM_COMPILE_ICON);
+      return new LayeredIcon(icon, PlatformIcons.EXCLUDED_FROM_COMPILE_ICON);
     }
 
     return icon;
@@ -54,7 +54,7 @@ public class JavaFileIconPatcher implements FileIconPatcher {
   private static Icon replaceIcon(VirtualFile file, int flags, Project project, Icon baseIcon) {
     FileType fileType = FileTypeManager.getInstance().getFileTypeByFile(file);
     if (fileType == StdFileTypes.JAVA && !FileIndexUtil.isJavaSourceFile(project, file)) {
-      return Icons.JAVA_OUTSIDE_SOURCE_ICON;
+      return PlatformIcons.JAVA_OUTSIDE_SOURCE_ICON;
     }
 
     PsiFile psiFile = PsiManager.getInstance(project).findFile(file);
index 5e0eeaf891a61bf7eb0667ac2bcbfa651629085d..2f14a68dffab6f39d7590e370286defcf9793cdc 100644 (file)
@@ -31,7 +31,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiPackage;
 import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -133,8 +133,8 @@ public class PackageElementNode extends ProjectViewNode<PackageElement> {
     String name = PackageUtil.getNodeName(getSettings(), aPackage,parentPackage, qName, showFQName(aPackage));
     presentation.setPresentableText(name);
 
-    presentation.setOpenIcon(Icons.PACKAGE_OPEN_ICON);
-    presentation.setClosedIcon(Icons.PACKAGE_ICON);
+    presentation.setOpenIcon(PlatformIcons.PACKAGE_OPEN_ICON);
+    presentation.setClosedIcon(PlatformIcons.PACKAGE_ICON);
 
     for(ProjectViewNodeDecorator decorator: Extensions.getExtensions(ProjectViewNodeDecorator.EP_NAME, myProject)) {
       decorator.decorate(this, presentation);
index 8fdbf10563a618fdb5f1cff6ef98ed29a25ee106..b79bf40475e90fd5f6ffbec79259e9126e877c32 100644 (file)
@@ -28,7 +28,7 @@ import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.vfs.JarFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -84,7 +84,7 @@ public class PackageViewLibrariesNode extends ProjectViewNode<LibrariesElement>{
 
   public void update(final PresentationData presentation) {
     presentation.setPresentableText(IdeBundle.message("node.projectview.libraries"));
-    presentation.setIcons(Icons.LIBRARY_ICON);
+    presentation.setIcons(PlatformIcons.LIBRARY_ICON);
   }
 
   public String getTestPresentation() {
index 106cec387e87669733310e7097119ebdb2b09731..da430a0798e86e3dcf9ddecf5bcbf9dc951e310d 100644 (file)
  */
 package com.intellij.ide.structureView.impl.java;
 
+import com.intellij.ide.IdeBundle;
 import com.intellij.ide.util.treeView.smartTree.ActionPresentation;
 import com.intellij.ide.util.treeView.smartTree.ActionPresentationData;
 import com.intellij.ide.util.treeView.smartTree.Filter;
 import com.intellij.ide.util.treeView.smartTree.TreeElement;
-import com.intellij.ide.IdeBundle;
-import com.intellij.openapi.util.IconLoader;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
@@ -34,7 +33,7 @@ public class FieldsFilter implements Filter{
 
   @NotNull
   public ActionPresentation getPresentation() {
-    return new ActionPresentationData(IdeBundle.message("action.structureview.show.fields"), null, Icons.FIELD_ICON);
+    return new ActionPresentationData(IdeBundle.message("action.structureview.show.fields"), null, PlatformIcons.FIELD_ICON);
   }
 
   @NotNull
index 7507d8a94f8a25fb366467059837cf9c8aecaef2..b948ac948f756907a5e79985f2ec753f73f7223b 100644 (file)
@@ -19,7 +19,7 @@ import com.intellij.ide.IdeBundle;
 import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.ide.util.treeView.smartTree.*;
 import com.intellij.psi.PsiElement;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import gnu.trove.THashMap;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -62,7 +62,7 @@ public class PropertiesGrouper implements Grouper{
 
   @NotNull
   public ActionPresentation getPresentation() {
-    return new ActionPresentationData(IdeBundle.message("action.structureview.show.properties"), null, Icons.PROPERTY_ICON);
+    return new ActionPresentationData(IdeBundle.message("action.structureview.show.properties"), null, PlatformIcons.PROPERTY_ICON);
   }
 
   @NotNull
index c3f02e6d84da47ff172b250d2fc7737c64ad14bd..79ecfac42eb4acf69603f3089926e934017cfa91 100644 (file)
  */
 package com.intellij.ide.structureView.impl.java;
 
+import com.intellij.ide.IdeBundle;
 import com.intellij.ide.util.treeView.smartTree.ActionPresentation;
 import com.intellij.ide.util.treeView.smartTree.ActionPresentationData;
 import com.intellij.ide.util.treeView.smartTree.Filter;
 import com.intellij.ide.util.treeView.smartTree.TreeElement;
-import com.intellij.ide.IdeBundle;
-import com.intellij.openapi.util.IconLoader;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
@@ -39,7 +38,7 @@ public class PublicElementsFilter implements Filter{
 
   @NotNull
   public ActionPresentation getPresentation() {
-    return new ActionPresentationData(IdeBundle.message("action.structureview.show.non.public"), null, Icons.PRIVATE_ICON);
+    return new ActionPresentationData(IdeBundle.message("action.structureview.show.non.public"), null, PlatformIcons.PRIVATE_ICON);
   }
 
   @NotNull
index 6949816e3d3b87a1058b1a3c213ebade15805895..d5de201f330b8835be40ba0e499061bd947c0b15 100644 (file)
@@ -38,8 +38,8 @@ import com.intellij.psi.*;
 import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.ui.TreeSpeedSearch;
 import com.intellij.ui.treeStructure.Tree;
-import com.intellij.util.Icons;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.containers.Convertor;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.util.ui.tree.TreeUtil;
@@ -104,7 +104,7 @@ public class PackageChooserDialog extends PackageChooser {
           boolean hasFocus
         ) {
           super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus);
-          setIcon(expanded ? Icons.PACKAGE_OPEN_ICON : Icons.PACKAGE_ICON);
+          setIcon(expanded ? PlatformIcons.PACKAGE_OPEN_ICON : PlatformIcons.PACKAGE_ICON);
 
           if (value instanceof DefaultMutableTreeNode) {
             DefaultMutableTreeNode node = (DefaultMutableTreeNode)value;
index e3d74c4e647b5755a4bada7e898dc6d80f407445..7d5b9f9b1140999848c1da2ea03078da24db27bc 100644 (file)
@@ -17,7 +17,7 @@ package com.intellij.internal.psiView;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 
 import javax.swing.*;
 
@@ -31,7 +31,7 @@ public class PsiViewerCodeFragmentExtension extends JavaPsiViewerExtension {
   }
 
   public Icon getIcon() {
-    return Icons.CLASS_INITIALIZER;
+    return PlatformIcons.CLASS_INITIALIZER;
   }
 
   public PsiElement createElement(Project project, String text) {
index 8fe937ffa2c683851ec1f8e2340bde080c71a5f9..02b5e10366410ff492a4ae5398c09d7e259ac784 100644 (file)
@@ -17,7 +17,7 @@ package com.intellij.internal.psiView;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 
 import javax.swing.*;
 
@@ -31,7 +31,7 @@ public class PsiViewerExpressionExtension extends JavaPsiViewerExtension {
   }
 
   public Icon getIcon() {
-    return Icons.CLASS_INITIALIZER;
+    return PlatformIcons.CLASS_INITIALIZER;
   }
 
   public PsiElement createElement(Project project, String text) {
index c32db33163016e052b49364da1a975bc9413e675..09b0395cff42b7e11dd227acdfb3e434fc1dba90 100644 (file)
@@ -17,7 +17,7 @@ package com.intellij.internal.psiView;
 
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 
 import javax.swing.*;
 
@@ -31,7 +31,7 @@ public class PsiViewerMethodExtension extends JavaPsiViewerExtension {
   }
 
   public Icon getIcon() {
-    return Icons.METHOD_ICON;
+    return PlatformIcons.METHOD_ICON;
   }
 
   public PsiElement createElement(Project project, String text) {
index 7200e4022730429208152a8ab9d859e54df49935..b1525453ad1bb5bce7fc1c0d1c507733b9fa6994 100644 (file)
@@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiJavaFile;
 import com.intellij.psi.PsiPackage;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 
 import javax.swing.*;
 import java.util.Map;
@@ -101,11 +101,11 @@ public class PackageNode extends PackageDependenciesNode {
   }
 
   public Icon getOpenIcon() {
-    return Icons.PACKAGE_OPEN_ICON;
+    return PlatformIcons.PACKAGE_OPEN_ICON;
   }
 
   public Icon getClosedIcon() {
-    return Icons.PACKAGE_ICON;
+    return PlatformIcons.PACKAGE_ICON;
   }
 
 
index e4ee5a476512a8219d64deacaf7ddf9ee6668354..faec9f2a9b0073d595b0170a3a2f6b1447df8102 100644 (file)
@@ -30,7 +30,7 @@ import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.ui.tree.TreeUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -102,7 +102,7 @@ public class TreeModelBuilder {
     createMaps(ScopeType.TEST);
 
     if (myGroupByScopeType) {
-      mySourceRoot = new GeneralGroupNode(PRODUCTION_NAME, Icons.PACKAGE_OPEN_ICON, Icons.PACKAGE_ICON);
+      mySourceRoot = new GeneralGroupNode(PRODUCTION_NAME, PlatformIcons.PACKAGE_OPEN_ICON, PlatformIcons.PACKAGE_ICON);
       myTestRoot = new GeneralGroupNode(TEST_NAME, TEST_ICON, TEST_ICON);
       myLibsRoot = new GeneralGroupNode(LIBRARY_NAME, LIB_ICON_OPEN, LIB_ICON_CLOSED);
       myRoot.add(mySourceRoot);
index 8ecd4d1698dbe8945ecc482b0313df8a0ace1ee7..9a0e8de527e83a3a81f2b1237a181d27d6b86091 100644 (file)
@@ -52,10 +52,7 @@ import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.*;
 import com.intellij.refactoring.rename.RenameUtil;
 import com.intellij.ui.RowIcon;
-import com.intellij.util.ArrayUtil;
-import com.intellij.util.CommonProcessors;
-import com.intellij.util.Icons;
-import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.*;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -128,7 +125,7 @@ public class PsiPackageImpl extends PsiElementBase implements PsiPackage, Querya
   }
 
   public RowIcon getElementIcon(final int elementFlags) {
-    return createLayeredIcon(Icons.PACKAGE_ICON, elementFlags);
+    return createLayeredIcon(PlatformIcons.PACKAGE_ICON, elementFlags);
   }
 
   public String getName() {
index 50972cd161c6fab5e671d6f11443c2e0ead60c51..325becceb1eec5532c3b9da91b316f1cb898ae2c 100644 (file)
@@ -16,6 +16,7 @@
 package com.intellij.psi.impl.light;
 
 import com.intellij.navigation.ItemPresentation;
+import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.ElementPresentationUtil;
 import com.intellij.psi.impl.PsiClassImplUtil;
@@ -26,9 +27,8 @@ import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.util.MethodSignature;
 import com.intellij.psi.util.MethodSignatureBackedByPsiMethod;
 import com.intellij.ui.RowIcon;
-import com.intellij.util.Icons;
 import com.intellij.util.IncorrectOperationException;
-import com.intellij.openapi.fileTypes.StdFileTypes;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -193,7 +193,7 @@ public class LightMethod extends LightElement implements PsiMethod {
   }
 
   public Icon getElementIcon(final int flags) {
-    Icon methodIcon = hasModifierProperty(PsiModifier.ABSTRACT) ? Icons.ABSTRACT_METHOD_ICON : Icons.METHOD_ICON;
+    Icon methodIcon = hasModifierProperty(PsiModifier.ABSTRACT) ? PlatformIcons.ABSTRACT_METHOD_ICON : PlatformIcons.METHOD_ICON;
     RowIcon baseIcon = createLayeredIcon(methodIcon, ElementPresentationUtil.getFlags(this, false));
     return ElementPresentationUtil.addVisibilityIcon(this, flags, baseIcon);
   }
index c02eeefa7a6973be123d4a772c0b49273d8116a6..87b30ccb1498136f8fbcc09991db0c51f8c1a3ea 100644 (file)
@@ -30,8 +30,8 @@ import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.util.MethodSignature;
 import com.intellij.psi.util.MethodSignatureBackedByPsiMethod;
 import com.intellij.ui.RowIcon;
-import com.intellij.util.Icons;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -275,7 +275,7 @@ public class LightMethodBuilder extends LightElement implements PsiMethod {
 
   public Icon getElementIcon(final int flags) {
     Icon methodIcon = myBaseIcon != null ? myBaseIcon :
-                      hasModifierProperty(PsiModifier.ABSTRACT) ? Icons.ABSTRACT_METHOD_ICON : Icons.METHOD_ICON;
+                      hasModifierProperty(PsiModifier.ABSTRACT) ? PlatformIcons.ABSTRACT_METHOD_ICON : PlatformIcons.METHOD_ICON;
     RowIcon baseIcon = createLayeredIcon(methodIcon, ElementPresentationUtil.getFlags(this, false));
     return ElementPresentationUtil.addVisibilityIcon(this, flags, baseIcon);
   }
index 72845833a00dc58a637aa6ebb78f27af70450e79..1dfd6b24518f6d45f8e65e02e61ee9ce9ed7412c 100644 (file)
 package com.intellij.psi.impl.light;
 
 import com.intellij.lang.Language;
+import com.intellij.openapi.fileTypes.StdFileTypes;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.ElementPresentationUtil;
 import com.intellij.psi.impl.PsiImplUtil;
 import com.intellij.ui.RowIcon;
-import com.intellij.util.Icons;
 import com.intellij.util.IncorrectOperationException;
-import com.intellij.openapi.fileTypes.StdFileTypes;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -128,7 +128,7 @@ public abstract class LightVariableBase extends LightElement implements PsiVaria
   }
 
   public Icon getElementIcon(final int flags) {
-    final RowIcon baseIcon = createLayeredIcon(Icons.VARIABLE_ICON, ElementPresentationUtil.getFlags(this, false));
+    final RowIcon baseIcon = createLayeredIcon(PlatformIcons.VARIABLE_ICON, ElementPresentationUtil.getFlags(this, false));
     return ElementPresentationUtil.addVisibilityIcon(this, flags, baseIcon);
   }
   public PsiType getTypeNoResolve() {
index 023a31d3b5b8a758c239d5f845267c0f43554f96..402528376673c426e52dcdc51fd561358dceba3e 100644 (file)
@@ -5,8 +5,8 @@ import com.intellij.lang.StdLanguages;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.ElementPresentationUtil;
 import com.intellij.ui.RowIcon;
-import com.intellij.util.Icons;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
@@ -19,7 +19,7 @@ public class LightVariableBuilder<T extends LightVariableBuilder> extends LightE
   private final String myName;
   private final PsiType myType;
   private volatile LightModifierList myModifierList;
-  private volatile Icon myBaseIcon = Icons.VARIABLE_ICON;
+  private volatile Icon myBaseIcon = PlatformIcons.VARIABLE_ICON;
 
   public LightVariableBuilder(@NotNull String name, @NotNull String type, @NotNull PsiElement navigationElement) {
     this(name, JavaPsiFacade.getElementFactory(navigationElement.getProject()).createTypeFromText(type, navigationElement), navigationElement);
index 2f9575d3240e55934e38bb36820ccc7676b9b450..b0a200f0f3d75aa516f69ca08dfd61a1361f156e 100644 (file)
@@ -26,7 +26,7 @@ import com.intellij.psi.impl.source.tree.CompositeElement;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.psi.scope.util.PsiScopesUtil;
 import com.intellij.psi.util.PsiTreeUtil;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -83,6 +83,6 @@ public class PsiClassInitializerImpl extends JavaStubPsiElement<PsiClassInitiali
   }
 
   public Icon getElementIcon(int flags) {
-    return createLayeredIcon(Icons.CLASS_INITIALIZER, ElementPresentationUtil.getFlags(this, false));
+    return createLayeredIcon(PlatformIcons.CLASS_INITIALIZER, ElementPresentationUtil.getFlags(this, false));
   }
 }
\ No newline at end of file
index 8faea00dc492695fe0de089da86366dc31d3854a..31b01974b3e2386ab09fff0dc34486aac1d19fae 100644 (file)
@@ -31,8 +31,8 @@ import com.intellij.psi.presentation.java.JavaPresentationUtil;
 import com.intellij.psi.scope.PsiScopeProcessor;
 import com.intellij.ui.RowIcon;
 import com.intellij.util.ArrayUtil;
-import com.intellij.util.Icons;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -194,7 +194,7 @@ public class PsiEnumConstantImpl extends JavaStubPsiElement<PsiFieldStub> implem
   }
 
   public Icon getElementIcon(final int flags) {
-    final RowIcon baseIcon = createLayeredIcon(Icons.FIELD_ICON, ElementPresentationUtil.getFlags(this, false));
+    final RowIcon baseIcon = createLayeredIcon(PlatformIcons.FIELD_ICON, ElementPresentationUtil.getFlags(this, false));
     return ElementPresentationUtil.addVisibilityIcon(this, flags, baseIcon);
   }
 
index 0e526fa76ac22ee7f80b1fa823b23381b3bb7931..a56d610ca9c5dcd4e4d1629f43b9b617dd64783f 100644 (file)
@@ -35,9 +35,9 @@ import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.stubs.IStubElementType;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.ui.RowIcon;
-import com.intellij.util.Icons;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.PatchedSoftReference;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -250,7 +250,7 @@ public class PsiFieldImpl extends JavaStubPsiElement<PsiFieldStub> implements Ps
   }
 
   public Icon getElementIcon(final int flags) {
-    final RowIcon baseIcon = createLayeredIcon(Icons.FIELD_ICON, ElementPresentationUtil.getFlags(this, false));
+    final RowIcon baseIcon = createLayeredIcon(PlatformIcons.FIELD_ICON, ElementPresentationUtil.getFlags(this, false));
     return ElementPresentationUtil.addVisibilityIcon(this, flags, baseIcon);
   }
 
index a91dc8fb3fb386240cc5f39576c93ae940424fa9..cdb824aba62af0203f1cc5bd5af1f4deb12f28f1 100644 (file)
@@ -30,8 +30,8 @@ import com.intellij.psi.impl.java.stubs.PsiMethodStub;
 import com.intellij.psi.impl.source.jsp.jspJava.JspClass;
 import com.intellij.psi.impl.source.tree.ChildRole;
 import com.intellij.psi.impl.source.tree.CompositeElement;
-import com.intellij.psi.impl.source.tree.JavaSharedImplUtil;
 import com.intellij.psi.impl.source.tree.JavaElementType;
+import com.intellij.psi.impl.source.tree.JavaSharedImplUtil;
 import com.intellij.psi.javadoc.PsiDocComment;
 import com.intellij.psi.presentation.java.JavaPresentationUtil;
 import com.intellij.psi.scope.PsiScopeProcessor;
@@ -41,9 +41,9 @@ import com.intellij.psi.util.MethodSignature;
 import com.intellij.psi.util.MethodSignatureBackedByPsiMethod;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.ui.RowIcon;
-import com.intellij.util.Icons;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.PatchedSoftReference;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -323,7 +323,7 @@ public class PsiMethodImpl extends JavaStubPsiElement<PsiMethodStub> implements
   }
 
   public Icon getElementIcon(final int flags) {
-    Icon methodIcon = hasModifierProperty(PsiModifier.ABSTRACT) ? Icons.ABSTRACT_METHOD_ICON : Icons.METHOD_ICON;
+    Icon methodIcon = hasModifierProperty(PsiModifier.ABSTRACT) ? PlatformIcons.ABSTRACT_METHOD_ICON : PlatformIcons.METHOD_ICON;
     RowIcon baseIcon = createLayeredIcon(methodIcon, ElementPresentationUtil.getFlags(this, false));
     return ElementPresentationUtil.addVisibilityIcon(this, flags, baseIcon);
   }
index c881e73df45b7d2873414a0c3f185444f2b393ad..243c50633df10aab4c755d5c343ea0e167d08110 100644 (file)
@@ -32,9 +32,9 @@ import com.intellij.psi.presentation.java.JavaPresentationUtil;
 import com.intellij.psi.search.LocalSearchScope;
 import com.intellij.psi.search.SearchScope;
 import com.intellij.ui.RowIcon;
-import com.intellij.util.Icons;
 import com.intellij.util.IncorrectOperationException;
 import com.intellij.util.PatchedSoftReference;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -228,7 +228,7 @@ public class PsiParameterImpl extends JavaStubPsiElement<PsiParameterStub> imple
   }
 
   public Icon getElementIcon(final int flags) {
-    final RowIcon baseIcon = createLayeredIcon(Icons.PARAMETER_ICON, 0);
+    final RowIcon baseIcon = createLayeredIcon(PlatformIcons.PARAMETER_ICON, 0);
     return ElementPresentationUtil.addVisibilityIcon(this, flags, baseIcon);
   }
   @Override
index 133c5e87bd18514a6d3a1e86124e78f59afcc7f0..73301f65465f79cd1705a0ea04a8234b9094f489 100644 (file)
@@ -21,10 +21,10 @@ import com.intellij.psi.*;
 import com.intellij.psi.impl.PsiImplUtil;
 import com.intellij.psi.impl.source.Constants;
 import com.intellij.psi.impl.source.tree.ChildRole;
-import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.tree.ChildRoleBase;
+import com.intellij.psi.tree.IElementType;
 import com.intellij.ui.RowIcon;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -99,8 +99,8 @@ public class PsiClassObjectAccessExpressionImpl extends ExpressionPsiElement imp
 
   @NotNull
   public Icon getElementIcon(final int flags) {
-    final RowIcon rowIcon = createLayeredIcon(Icons.FIELD_ICON, 0);
-    rowIcon.setIcon(Icons.PUBLIC_ICON, 1);
+    final RowIcon rowIcon = createLayeredIcon(PlatformIcons.FIELD_ICON, 0);
+    rowIcon.setIcon(PlatformIcons.PUBLIC_ICON, 1);
     return rowIcon;
   }
 }
index 0c7f372adab7ad0e3adc21d5dea93f037ec86d27..40b3d896c703e6485133b7b923aaf96b9b133f6e 100644 (file)
@@ -39,10 +39,7 @@ import com.intellij.psi.tree.ChildRoleBase;
 import com.intellij.psi.tree.IElementType;
 import com.intellij.psi.util.PsiUtilBase;
 import com.intellij.ui.RowIcon;
-import com.intellij.util.CharTable;
-import com.intellij.util.Icons;
-import com.intellij.util.IncorrectOperationException;
-import com.intellij.util.Processor;
+import com.intellij.util.*;
 import gnu.trove.THashSet;
 import org.jetbrains.annotations.NotNull;
 
@@ -327,7 +324,7 @@ public class PsiLocalVariableImpl extends CompositePsiElement implements PsiLoca
   }
 
   public Icon getElementIcon(final int flags) {
-    final RowIcon baseIcon = createLayeredIcon(Icons.VARIABLE_ICON, ElementPresentationUtil.getFlags(this, false));
+    final RowIcon baseIcon = createLayeredIcon(PlatformIcons.VARIABLE_ICON, ElementPresentationUtil.getFlags(this, false));
     return ElementPresentationUtil.addVisibilityIcon(this, flags, baseIcon);
   }
   @Override
index fed7f5766ab5b2da2d0d683c91c07e3dfcd85386..bfc304f487ce4282042e8441daa013037dc7aa2f 100644 (file)
@@ -24,7 +24,7 @@ import com.intellij.psi.PsiPrimitiveType;
 import com.intellij.psi.PsiType;
 import com.intellij.psi.util.PsiFormatUtil;
 import com.intellij.psi.util.PsiUtil;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.ui.EmptyIcon;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -35,7 +35,7 @@ import javax.swing.*;
  * @author peter
  */
 public class PsiTypeCanonicalLookupElement extends LookupElement {
-  private static final Icon EMPTY_ICON = new EmptyIcon(Icons.CLASS_ICON.getIconWidth() * 2, Icons.CLASS_ICON.getIconHeight());
+  private static final Icon EMPTY_ICON = new EmptyIcon(PlatformIcons.CLASS_ICON.getIconWidth() * 2, PlatformIcons.CLASS_ICON.getIconHeight());
 
   private final PsiType myType;
   private final String myPresentableText;
index 400ec00c291356dc3cb0c00fb2bb603fabb758f6..1988e63586a81f8297303cb5cd1c55234aa14b2c 100644 (file)
@@ -45,12 +45,12 @@ public class VisibilityIcons {
         setVisibilityIcon(PsiUtil.ACCESS_LEVEL_PACKAGE_LOCAL, baseIcon);
       }
       else {
-        Icon emptyIcon = new EmptyIcon(Icons.PUBLIC_ICON.getIconWidth(), Icons.PUBLIC_ICON.getIconHeight());
+        Icon emptyIcon = new EmptyIcon(PlatformIcons.PUBLIC_ICON.getIconWidth(), PlatformIcons.PUBLIC_ICON.getIconHeight());
         baseIcon.setIcon(emptyIcon, 1);
       }
     }
-    else if (Icons.PUBLIC_ICON != null) {
-        Icon emptyIcon = new EmptyIcon(Icons.PUBLIC_ICON.getIconWidth(), Icons.PUBLIC_ICON.getIconHeight());
+    else if (PlatformIcons.PUBLIC_ICON != null) {
+        Icon emptyIcon = new EmptyIcon(PlatformIcons.PUBLIC_ICON.getIconWidth(), PlatformIcons.PUBLIC_ICON.getIconHeight());
         baseIcon.setIcon(emptyIcon, 1);
       }
   }
@@ -59,20 +59,20 @@ public class VisibilityIcons {
     Icon icon;
     switch (accessLevel) {
       case PsiUtil.ACCESS_LEVEL_PUBLIC:
-        icon = Icons.PUBLIC_ICON;
+        icon = PlatformIcons.PUBLIC_ICON;
         break;
       case PsiUtil.ACCESS_LEVEL_PROTECTED:
-        icon = Icons.PROTECTED_ICON;
+        icon = PlatformIcons.PROTECTED_ICON;
         break;
       case PsiUtil.ACCESS_LEVEL_PACKAGE_LOCAL:
-        icon = Icons.PACKAGE_LOCAL_ICON;
+        icon = PlatformIcons.PACKAGE_LOCAL_ICON;
         break;
       case PsiUtil.ACCESS_LEVEL_PRIVATE:
-        icon = Icons.PRIVATE_ICON;
+        icon = PlatformIcons.PRIVATE_ICON;
         break;
       default:
-        if (Icons.PUBLIC_ICON != null) {
-          icon = new EmptyIcon(Icons.PUBLIC_ICON.getIconWidth(), Icons.PUBLIC_ICON.getIconHeight());
+        if (PlatformIcons.PUBLIC_ICON != null) {
+          icon = new EmptyIcon(PlatformIcons.PUBLIC_ICON.getIconWidth(), PlatformIcons.PUBLIC_ICON.getIconHeight());
         }
         else {
           return;
@@ -80,4 +80,4 @@ public class VisibilityIcons {
     }
     baseIcon.setIcon(icon, 1);
   }
-}
\ No newline at end of file
+}
index 824191a8526971b1086f2d20f152c1575cbd407f..715659469ef0175a796b625ccc438565464f6e62 100644 (file)
@@ -41,6 +41,7 @@ import com.intellij.ui.ListUtil;
 import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.ui.components.JBList;
 import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.containers.HashSet;
 import com.intellij.util.ui.UIUtil;
 import gnu.trove.TIntArrayList;
@@ -432,10 +433,10 @@ public class PathEditor {
         return ICON_INVALID;
       }
       else if (isHttpRoot(file)) {
-        return Icons.WEB_ICON;
+        return PlatformIcons.WEB_ICON;
       }
       else {
-        return isJarFile(file) ? Icons.JAR_ICON : Icons.FILE_ICON;
+        return isJarFile(file) ? PlatformIcons.JAR_ICON : PlatformIcons.FILE_ICON;
       }
     }
     return ICON_EMPTY;
index 749daebca1b605fc3d0aba9f5a60802c3f13acbe..4aa8e4609369db2067ba3b95841989c6e597f277 100644 (file)
@@ -30,15 +30,15 @@ import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.ui.SimpleTextAttributes;
-import com.intellij.util.Icons;
 import com.intellij.util.PathUtil;
+import com.intellij.util.PlatformIcons;
 
 import javax.swing.*;
 import java.awt.*;
 import java.io.File;
 
 public class OrderEntryCellAppearanceUtils {
-  public static final Icon EXCLUDE_FOLDER_ICON = CellAppearanceUtils.excludeIcon(Icons.FOLDER_ICON);
+  public static final Icon EXCLUDE_FOLDER_ICON = CellAppearanceUtils.excludeIcon(PlatformIcons.FOLDER_ICON);
   public static final Icon GENERIC_JDK_ICON = IconLoader.getIcon("/general/jdk.png");
   public static final String NO_JDK = ProjectBundle.message("jdk.missing.item");
 
@@ -86,17 +86,17 @@ public class OrderEntryCellAppearanceUtils {
   public static CellAppearance forLibrary(Library library, final boolean hasInvalidRoots) {
     String name = library.getName();
     if (name != null) {
-      return normalOrRedWaved(name, Icons.LIBRARY_ICON, hasInvalidRoots);
+      return normalOrRedWaved(name, PlatformIcons.LIBRARY_ICON, hasInvalidRoots);
     }
     String[] files = library.getUrls(OrderRootType.CLASSES);
     if (files.length == 0) {
-      return SimpleTextCellAppearance.invalid(ProjectBundle.message("library.empty.library.item"), Icons.LIBRARY_ICON);
+      return SimpleTextCellAppearance.invalid(ProjectBundle.message("library.empty.library.item"), PlatformIcons.LIBRARY_ICON);
     }
     if (files.length == 1) {
       return forVirtualFilePointer(new LightFilePointer(files[0]));
     }
     String url = StringUtil.trimEnd(files[0], JarFileSystem.JAR_SEPARATOR);
-    return SimpleTextCellAppearance.normal(PathUtil.getFileName(url), Icons.LIBRARY_ICON);
+    return SimpleTextCellAppearance.normal(PathUtil.getFileName(url), PlatformIcons.LIBRARY_ICON);
   }
 
   public static CellAppearance normalOrRedWaved(String text, final Icon icon, boolean waved) {
@@ -107,7 +107,7 @@ public class OrderEntryCellAppearanceUtils {
   }
 
   public static Icon sourceFolderIcon(boolean testSource) {
-    return testSource ? Icons.TEST_SOURCE_FOLDER : Icons.SOURCE_FOLDERS_ICON;
+    return testSource ? PlatformIcons.TEST_SOURCE_FOLDER : PlatformIcons.SOURCE_FOLDERS_ICON;
   }
 
   public static ModifiableCellAppearance forJdk(Sdk jdk, boolean isInComboBox, final boolean selected, final boolean showVersion) {
@@ -137,7 +137,7 @@ public class OrderEntryCellAppearanceUtils {
   }
 
   public static SimpleTextCellAppearance forSourceFolder(SourceFolder folder) {
-    return formatRelativePath(folder, Icons.FOLDER_ICON);
+    return formatRelativePath(folder, PlatformIcons.FOLDER_ICON);
   }
 
   public static CellAppearance forExcludeFolder(ExcludeFolder folder) {
index face4faa4b57b9bfc098146715b2c1d7a048dc54..562454679edc71863d4babebec90bbc0ccaf9f0f 100644 (file)
@@ -24,7 +24,7 @@
  */
 package com.intellij.codeInspection.reference;
 
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 
 import javax.swing.*;
 
@@ -38,6 +38,6 @@ public class RefProjectImpl extends RefEntityImpl implements RefProject {
   }
 
   public Icon getIcon(final boolean expanded) {
-    return Icons.PROJECT_ICON;
+    return PlatformIcons.PROJECT_ICON;
   }
 }
index 7672aec5055b6ebcc9c86ed0c0831fa324cc76fa..afc72bdcdfb14c89fd351241a6171ff102f0d7bc 100644 (file)
@@ -16,7 +16,7 @@
 
 package com.intellij.codeInspection.ui;
 
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 
 import javax.swing.*;
 
@@ -34,6 +34,6 @@ public class InspectionPackageNode extends InspectionTreeNode {
   }
 
   public Icon getIcon(boolean expanded) {
-    return expanded ? Icons.PACKAGE_OPEN_ICON : Icons.PACKAGE_ICON;
+    return expanded ? PlatformIcons.PACKAGE_OPEN_ICON : PlatformIcons.PACKAGE_ICON;
   }
 }
index 01bc02c4980e87fd72ce6c266bb4ee0f984c8fb9..47240970e441f2acafb2e0566e337073050c5308 100644 (file)
@@ -58,7 +58,7 @@ import com.intellij.usages.*;
 import com.intellij.usages.impl.*;
 import com.intellij.usages.rules.UsageFilteringRuleProvider;
 import com.intellij.util.ArrayUtil;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.Processor;
 import com.intellij.util.messages.MessageBusConnection;
 import com.intellij.util.ui.Table;
@@ -542,7 +542,7 @@ public class ShowUsagesAction extends AnAction implements PopupAction {
     };
     table.setModel(model);
 
-    table.setRowHeight(Icons.CLASS_ICON.getIconHeight()+2);
+    table.setRowHeight(PlatformIcons.CLASS_ICON.getIconHeight()+2);
     table.setShowGrid(false);
     table.setShowVerticalLines(false);
     table.setShowHorizontalLines(false);
index a92238fc9dc0bfd7d84051188821c5ce00b3cb3a..2d414033436a1830923e71e25ee1f5ded8fec2e3 100644 (file)
@@ -17,7 +17,7 @@ package com.intellij.ide.navigationToolbar;
 
 import com.intellij.ui.SimpleColoredComponent;
 import com.intellij.ui.SimpleTextAttributes;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.ui.EmptyIcon;
 import com.intellij.util.ui.UIUtil;
 
@@ -56,7 +56,7 @@ class NavBarItem extends SimpleColoredComponent {
       myAttributes = presentation.getTextAttributes(object, false);
     } else {
       myText = "Sample";
-      myIcon = Icons.DIRECTORY_OPEN_ICON;
+      myIcon = PlatformIcons.DIRECTORY_OPEN_ICON;
       myAttributes = SimpleTextAttributes.REGULAR_ATTRIBUTES;
     }
 
index 2eeb6d7c65c9ae2011c181d2fa6cc4dc452b968e..cd13f6fc89bae7d1754c3177252b0bc29da2696d 100644 (file)
@@ -85,7 +85,7 @@ import com.intellij.ui.switcher.QuickActionProvider;
 import com.intellij.util.Alarm;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.IJSwingUtilities;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.messages.MessageBusConnection;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.util.ui.tree.TreeUtil;
@@ -699,7 +699,7 @@ public final class ProjectViewImpl extends ProjectView implements PersistentStat
     myActionGroup.removeAll();
     if (ProjectViewDirectoryHelper.getInstance(myProject).supportsFlattenPackages()) {
       myActionGroup.addAction(new PaneOptionAction(myFlattenPackages, IdeBundle.message("action.flatten.packages"),
-                                             IdeBundle.message("action.flatten.packages"), Icons.FLATTEN_PACKAGES_ICON,
+                                             IdeBundle.message("action.flatten.packages"), PlatformIcons.FLATTEN_PACKAGES_ICON,
                                              ourFlattenPackagesDefaults) {
         public void setSelected(AnActionEvent event, boolean flag) {
           final AbstractProjectViewPane viewPane = getCurrentProjectViewPane();
index c60d4519e853ab4e22f8b72ab1352ad77104875f..d30c280f476d6be0ef5e1e685e310bbaa942ca48 100644 (file)
@@ -34,7 +34,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiDirectory;
 import com.intellij.psi.PsiFile;
 import com.intellij.psi.PsiManager;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -115,7 +115,7 @@ public class LibraryGroupNode extends ProjectViewNode<LibraryGroupElement> {
 
   public void update(PresentationData presentation) {
     presentation.setPresentableText(IdeBundle.message("node.projectview.libraries"));
-    presentation.setIcons(Icons.LIBRARY_ICON);
+    presentation.setIcons(PlatformIcons.LIBRARY_ICON);
   }
 
   public boolean canNavigate() {
index d60cbde492a3f43f7e5c68881a65e26e3501ec62..97d0e9acebffae9e63adc0f8f79a3ca4451b5178 100644 (file)
@@ -29,7 +29,7 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiFileSystemItem;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -89,8 +89,8 @@ public abstract class ModuleGroupNode extends ProjectViewNode<ModuleGroup> imple
   public void update(PresentationData presentation) {
     final String[] groupPath = getValue().getGroupPath();
     presentation.setPresentableText(groupPath[groupPath.length-1]);
-    presentation.setOpenIcon(Icons.OPENED_MODULE_GROUP_ICON);
-    presentation.setClosedIcon(Icons.CLOSED_MODULE_GROUP_ICON);
+    presentation.setOpenIcon(PlatformIcons.OPENED_MODULE_GROUP_ICON);
+    presentation.setClosedIcon(PlatformIcons.CLOSED_MODULE_GROUP_ICON);
   }
 
   public String getTestPresentation() {
index 520621f8d06c36a079087e46287b1aa52c299210..f53dacb4dcb9c708b568b879e0191c63e29a2924 100644 (file)
@@ -24,7 +24,7 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
@@ -70,7 +70,7 @@ public class ModuleListNode extends ProjectViewNode<Module> {
 
   public void update(PresentationData presentation) {
     presentation.setPresentableText("Module Dependencies");
-    presentation.setIcons(Icons.CLOSED_MODULE_GROUP_ICON);
+    presentation.setIcons(PlatformIcons.CLOSED_MODULE_GROUP_ICON);
   }
 
   @Override
index 449e8f4cb9fe0622869e3968b01978b15415727f..13303738430401b1268fec95b315ce63c0c156ce 100644 (file)
@@ -43,8 +43,8 @@ import com.intellij.ui.LayeredIcon;
 import com.intellij.ui.RowIcon;
 import com.intellij.ui.SimpleTextAttributes;
 import com.intellij.util.IconUtil;
-import com.intellij.util.Icons;
 import com.intellij.util.PathUtil;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.PlatformUtils;
 import org.jetbrains.annotations.NotNull;
 
@@ -273,7 +273,7 @@ public class PsiDirectoryNode extends BasePsiNode<PsiDirectory> implements Navig
       return originalIcon;
     }
     else {
-      return LayeredIcon.create(originalIcon, Icons.LOCKED_ICON);
+      return LayeredIcon.create(originalIcon, PlatformIcons.LOCKED_ICON);
     }
   }
 
index 96f54dd1aaad9b63cad5fc80ec6d8f7c4796df12..e642ae1f809fb314ed53af1c82ef809ecd168e5d 100644 (file)
@@ -51,8 +51,8 @@ import com.intellij.usageView.UsageInfo;
 import com.intellij.usages.impl.UsagePreviewPanel;
 import com.intellij.util.Consumer;
 import com.intellij.util.EditSourceOnDoubleClickHandler;
-import com.intellij.util.Icons;
 import com.intellij.util.OpenSourceUtil;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.util.ui.tree.TreeUtil;
 import org.jetbrains.annotations.Nullable;
@@ -68,7 +68,7 @@ import java.awt.*;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
-import java.util.*;
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -575,7 +575,7 @@ abstract class TodoPanel extends SimpleToolWindowPanel implements OccurenceNavig
 
   private final class MyShowPackagesAction extends ToggleAction {
     MyShowPackagesAction() {
-      super(IdeBundle.message("action.group.by.packages"), null, Icons.GROUP_BY_PACKAGES);
+      super(IdeBundle.message("action.group.by.packages"), null, PlatformIcons.GROUP_BY_PACKAGES);
     }
 
     public boolean isSelected(AnActionEvent e) {
@@ -605,7 +605,7 @@ abstract class TodoPanel extends SimpleToolWindowPanel implements OccurenceNavig
 
   private final class MyFlattenPackagesAction extends ToggleAction {
     MyFlattenPackagesAction() {
-      super(IdeBundle.message("action.flatten.packages"), null, Icons.FLATTEN_PACKAGES_ICON);
+      super(IdeBundle.message("action.flatten.packages"), null, PlatformIcons.FLATTEN_PACKAGES_ICON);
     }
 
     public void update(AnActionEvent e) {
index e1913f9b3c8c5c2100dbf089723dfe5bb2de6fad..f80c1e82d03a304bc1c4b945f5ccc580a201bb3e 100644 (file)
@@ -31,7 +31,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettings;
 import com.intellij.psi.codeStyle.CodeStyleSettingsManager;
 import com.intellij.ui.*;
 import com.intellij.ui.treeStructure.Tree;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.containers.Convertor;
 import com.intellij.util.containers.FactoryMap;
 import com.intellij.util.containers.HashMap;
@@ -707,7 +707,7 @@ public class MemberChooser<T extends ClassMember> extends DialogWrapper implemen
   }
 
   protected ShowContainersAction getShowContainersAction() {
-    return new ShowContainersAction(IdeBundle.message("action.show.classes"),  Icons.CLASS_ICON);
+    return new ShowContainersAction(IdeBundle.message("action.show.classes"),  PlatformIcons.CLASS_ICON);
   }
 
   protected class ShowContainersAction extends ToggleAction {
index 98eb0329087d614079fa2f3c9debc36dafe6fd52..57218c306f462ae3d3731f65b26601f8ded7dfbb 100644 (file)
@@ -24,14 +24,14 @@ import com.intellij.ide.IdeBundle;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.ToggleAction;
 import com.intellij.packageDependencies.DependencyUISettings;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 
 public final class FlattenPackagesAction extends ToggleAction {
   private final Runnable myUpdate;
 
   public FlattenPackagesAction(Runnable update) {
     super(IdeBundle.message("action.flatten.packages"),
-          IdeBundle.message("action.flatten.packages"), Icons.FLATTEN_PACKAGES_ICON);
+          IdeBundle.message("action.flatten.packages"), PlatformIcons.FLATTEN_PACKAGES_ICON);
     myUpdate = update;
   }
 
@@ -43,4 +43,4 @@ public final class FlattenPackagesAction extends ToggleAction {
     DependencyUISettings.getInstance().UI_FLATTEN_PACKAGES = flag;
     myUpdate.run();
   }
-}
\ No newline at end of file
+}
index 1171bdda8b8cb96bfd920920acd84b0e2aeb7f61..2c4e5cdc8ef0ed29257e5b33fc3bff3c7f834927 100644 (file)
@@ -34,7 +34,7 @@ import com.intellij.openapi.util.IconLoader;
 import com.intellij.packageDependencies.DependencyValidationManager;
 import com.intellij.psi.search.scope.packageSet.*;
 import com.intellij.ui.TreeSpeedSearch;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.containers.Convertor;
 import com.intellij.util.containers.HashSet;
 import com.intellij.util.ui.tree.TreeUtil;
@@ -375,7 +375,7 @@ public class ScopeChooserConfigurable extends MasterDetailsComponent implements
       super(IdeBundle.message("add.scope.popup.title"), true);
       myFromPopup = fromPopup;
       final Presentation presentation = getTemplatePresentation();
-      presentation.setIcon(Icons.ADD_ICON);
+      presentation.setIcon(PlatformIcons.ADD_ICON);
       setShortcutSet(CommonShortcuts.INSERT);
     }
 
@@ -406,7 +406,7 @@ public class ScopeChooserConfigurable extends MasterDetailsComponent implements
       }
       if (myFromPopup) {
         final AnAction action = myChildren[getDefaultIndex()];
-        action.getTemplatePresentation().setIcon(Icons.ADD_ICON);
+        action.getTemplatePresentation().setIcon(PlatformIcons.ADD_ICON);
         return new AnAction[]{action};
       }
       return myChildren;
index a4fcb79befccad3a88fad25093ca81257e3d301d..64a577e3df99e3fc9e071cc8a63ab4033bf0c8c4 100644 (file)
@@ -20,7 +20,7 @@ import com.intellij.analysis.AnalysisScopeBundle;
 import com.intellij.ide.projectView.impl.ModuleGroup;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.psi.PsiFile;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 
 import javax.swing.*;
 import java.util.Set;
@@ -46,11 +46,11 @@ public class ModuleGroupNode extends PackageDependenciesNode {
   }
 
   public Icon getOpenIcon() {
-    return Icons.OPENED_MODULE_GROUP_ICON;
+    return PlatformIcons.OPENED_MODULE_GROUP_ICON;
   }
 
   public Icon getClosedIcon() {
-    return Icons.CLOSED_MODULE_GROUP_ICON;
+    return PlatformIcons.CLOSED_MODULE_GROUP_ICON;
   }
 
   public String toString() {
index 89d87c99aa3f15edd62cf3ed628a0dd426116907..391ec3a8bd2167a84602a90bcb38e4e22297e215 100644 (file)
@@ -47,8 +47,8 @@ import com.intellij.psi.search.PsiElementProcessor;
 import com.intellij.psi.search.PsiFileSystemItemProcessor;
 import com.intellij.psi.util.PsiUtilBase;
 import com.intellij.util.ArrayUtil;
-import com.intellij.util.Icons;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -559,7 +559,7 @@ public class PsiDirectoryImpl extends PsiElementBase implements PsiDirectory, Qu
   }
 
   protected Icon getElementIcon(final int flags) {
-    return Icons.DIRECTORY_CLOSED_ICON;
+    return PlatformIcons.DIRECTORY_CLOSED_ICON;
   }
 
   public void putInfo(Map<String, String> info) {
index 040e462ae38a3a24fba235be080f70fe2fe671ec..3d06a19d9c617eab4751dc78e3f597ab9a950f57 100644 (file)
@@ -32,8 +32,8 @@ import com.intellij.ui.ColoredListCellRenderer;
 import com.intellij.ui.ReorderableListController;
 import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.ui.components.JBList;
-import com.intellij.util.Icons;
 import com.intellij.util.PathUtil;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.containers.ContainerUtil;
 import gnu.trove.THashSet;
 import org.jetbrains.annotations.NotNull;
@@ -86,7 +86,7 @@ public class SimpleClasspathPanel extends JPanel {
         if (value instanceof Library) {
           final Library library = (Library)value;
           if (library.getName() != null && library.getUrls(OrderRootType.CLASSES).length == 0) {
-            SimpleTextCellAppearance.invalid(library.getName(), Icons.LIBRARY_ICON).customize(this);
+            SimpleTextCellAppearance.invalid(library.getName(), PlatformIcons.LIBRARY_ICON).customize(this);
           }
           else {
             OrderEntryCellAppearanceUtils.forLibrary(library).customize(this);
@@ -276,7 +276,7 @@ public class SimpleClasspathPanel extends JPanel {
     protected PopupAction[] createPopupActions() {
       int index = 1;
       final List<PopupAction> actions = new ArrayList<PopupAction>();
-      actions.add(new ChooseAndAddAction(index++, "Jar...", Icons.JAR_ICON) {
+      actions.add(new ChooseAndAddAction(index++, "Jar...", PlatformIcons.JAR_ICON) {
         @NotNull
         protected List<Library> doChoose() {
           final ChooseJarDialog dialog = new ChooseJarDialog(SimpleClasspathPanel.this, getVirtualFiles(), myDisposable);
@@ -284,7 +284,7 @@ public class SimpleClasspathPanel extends JPanel {
           return dialog.getChosenElements();
         }
       });
-      actions.add(new ChooseAndAddAction(index++, "Library...", Icons.LIBRARY_ICON) {
+      actions.add(new ChooseAndAddAction(index++, "Library...", PlatformIcons.LIBRARY_ICON) {
 
         @NotNull
         protected List<Library> doChoose() {
index 17e83681136ae107025e6a9532efa8f8698a2429..7816dcd949f7aa99d2ce0974d0ea1f6e0b9b886a 100644 (file)
@@ -23,7 +23,7 @@ import com.intellij.openapi.vfs.JarFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.UIBundle;
 import com.intellij.util.IconUtil;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
@@ -166,14 +166,14 @@ public class FileChooserDescriptor implements Cloneable{
 
   public Icon getOpenIcon(VirtualFile virtualFile) {
     if (virtualFile.isDirectory()) {
-      return Icons.DIRECTORY_OPEN_ICON;
+      return PlatformIcons.DIRECTORY_OPEN_ICON;
     }
     // deliberately pass project null: isJavaSourceFile() and excluded from compile information is unavailable for template project
     return IconUtil.getIcon(virtualFile, Iconable.ICON_FLAG_READ_STATUS, null);
   }
   public Icon getClosedIcon(VirtualFile virtualFile) {
     if (virtualFile.isDirectory()) {
-      return Icons.DIRECTORY_CLOSED_ICON;
+      return PlatformIcons.DIRECTORY_CLOSED_ICON;
     }
     return IconUtil.getIcon(virtualFile, Iconable.ICON_FLAG_READ_STATUS, null);
   }
index 516755a477df2eecc80cc70ba18a8f7b13889707..75c563ac49515f7f4728ceb305c3f9ae1c0e826a 100644 (file)
@@ -17,7 +17,7 @@ package com.intellij.openapi.fileTypes;
 
 import com.intellij.openapi.options.SettingsEditor;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -25,7 +25,7 @@ import javax.swing.*;
 public abstract class UserFileType <T extends UserFileType> implements FileType, Cloneable {
   @NotNull private String myName = "";
   private String myDescription = "";
-  private Icon myIcon = Icons.CUSTOM_FILE_ICON;
+  private Icon myIcon = PlatformIcons.CUSTOM_FILE_ICON;
 
   public abstract SettingsEditor<T> getEditor();
 
@@ -81,4 +81,4 @@ public abstract class UserFileType <T extends UserFileType> implements FileType,
   public void setIcon(Icon icon) {
     myIcon = icon;
   }
-}
\ No newline at end of file
+}
index 8e28cd78693fe8a271801f9a7f235dd576df341e..87c227c866add6a3b8592ed4a2dc061e866719b9 100644 (file)
@@ -16,7 +16,7 @@
 package com.intellij.openapi.roots.ui.util;
 
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 
 import javax.swing.*;
 
@@ -26,6 +26,6 @@ public class HttpUrlCellAppearance extends ValidFileCellAppearance {
   }
 
   protected Icon getIcon() {
-    return Icons.WEB_ICON;
+    return PlatformIcons.WEB_ICON;
   }
 }
index aad5c5c971b0d01638f5e95f5c7228893e09e34b..0c95fff990690bb9eeb10228e912672688355d3b 100644 (file)
@@ -35,7 +35,7 @@ import com.intellij.ui.*;
 import com.intellij.ui.navigation.History;
 import com.intellij.ui.navigation.Place;
 import com.intellij.ui.treeStructure.Tree;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.containers.HashSet;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.util.ui.tree.TreeUtil;
@@ -748,7 +748,7 @@ public abstract class MasterDetailsComponent implements Configurable, DetailsCom
     private final Condition<Object> myCondition;
 
     public MyDeleteAction(Condition<Object> availableCondition) {
-      super(CommonBundle.message("button.delete"), CommonBundle.message("button.delete"), Icons.DELETE_ICON);
+      super(CommonBundle.message("button.delete"), CommonBundle.message("button.delete"), PlatformIcons.DELETE_ICON);
       registerCustomShortcutSet(CommonShortcuts.DELETE, myTree);
       myCondition = availableCondition;
     }
index aab9abd29fa492459f8aa70b0af481f16ab8d240..cee5f50227b48b603ddca087fdeb41606021b0b3 100644 (file)
@@ -27,7 +27,7 @@ import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.UnnamedConfigurable;
 import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.util.*;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.ui.tree.TreeUtil;
 import gnu.trove.Equality;
 import org.jetbrains.annotations.Nullable;
@@ -299,7 +299,7 @@ public abstract class NamedItemsListEditor<T> extends MasterDetailsComponent {
 
   private class AddAction extends DumbAwareAction {
         public AddAction() {
-            super("Add", "Add", Icons.ADD_ICON);
+            super("Add", "Add", PlatformIcons.ADD_ICON);
             registerCustomShortcutSet(CommonShortcuts.INSERT, myTree);
         }
 
index 0188e72e295c1b1b99cb1a04a83e201bd0a47fb2..e09ca534cac44e035508b68d1a66bbe7b59adeb2 100644 (file)
@@ -27,6 +27,7 @@ import com.intellij.openapi.vfs.encoding.EncodingManager;
 import com.intellij.openapi.vfs.newvfs.BulkFileListener;
 import com.intellij.openapi.vfs.newvfs.events.VFilePropertyChangeEvent;
 import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -261,7 +262,7 @@ public abstract class VirtualFile extends UserDataHolderBase implements Modifica
 
   public Icon getIcon() {
     if (isDirectory() && isInLocalFileSystem()) {
-      return Icons.FOLDER_ICON;
+      return PlatformIcons.FOLDER_ICON;
     }
     return getFileType().getIcon();
   }
index a52a8e8b67be828bd73fb74042039132aa958fe1..84605768b3d52b2bb7fe8ba168421b80b9f9c001 100644 (file)
@@ -21,7 +21,7 @@ import com.intellij.ui.awt.RelativePoint;
 import com.intellij.ui.components.JBLabel;
 import com.intellij.ui.components.JBList;
 import com.intellij.util.Function;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.ui.EmptyIcon;
 
 import javax.swing.*;
@@ -73,8 +73,8 @@ public class JBComboBoxTableCellEditorComponent extends JBLabel {
     private Icon getIcon(boolean selected) {
       final boolean small = "small".equals(JBComboBoxTableCellEditorComponent.this.getClientProperty("JComponent.sizeVariant"));
       return small
-             ? selected ? Icons.CHECK_ICON_SMALL_SELECTED : Icons.CHECK_ICON_SMALL
-             : selected ? Icons.CHECK_ICON_SELECTED : Icons.CHECK_ICON;
+             ? selected ? PlatformIcons.CHECK_ICON_SMALL_SELECTED : PlatformIcons.CHECK_ICON_SMALL
+             : selected ? PlatformIcons.CHECK_ICON_SELECTED : PlatformIcons.CHECK_ICON;
     }
   };
 
index 980cf86c3f1158f93b24f9847fbd64d64f4f1515..7be34053ab777349c97d28a90b654b165a562bbe 100644 (file)
@@ -129,7 +129,7 @@ public class IconUtil {
           }
 
           if ((flags & Iconable.ICON_FLAG_READ_STATUS) != 0 && !file.isWritable()) {
-            icon = new LayeredIcon(icon, Icons.LOCKED_ICON);
+            icon = new LayeredIcon(icon, PlatformIcons.LOCKED_ICON);
           }
 
           Iconable.LastComputedIcon.put(file, icon, flags);
@@ -150,9 +150,9 @@ public class IconUtil {
 
   public static Icon getEmptyIcon(boolean showVisibility) {
     RowIcon baseIcon = new RowIcon(2);
-    baseIcon.setIcon(createEmptyIconLike(Icons.CLASS_ICON_PATH), 0);
+    baseIcon.setIcon(createEmptyIconLike(PlatformIcons.CLASS_ICON_PATH), 0);
     if (showVisibility) {
-      baseIcon.setIcon(createEmptyIconLike(Icons.PUBLIC_ICON_PATH), 1);
+      baseIcon.setIcon(createEmptyIconLike(PlatformIcons.PUBLIC_ICON_PATH), 1);
     }
     return baseIcon;
   }
index 594287d3af162eef6b23e28a1a5552be69b4b26c..c56a31fd792dc3a80cdd0d6edd7802850166443e 100644 (file)
@@ -20,7 +20,7 @@ import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.ui.ColoredListCellRenderer;
 import com.intellij.ui.SimpleTextAttributes;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 
 import javax.swing.*;
 import java.awt.*;
@@ -60,7 +60,7 @@ class SwitcherToolWindowsListRenderer extends ColoredListCellRenderer {
 
     icon = toolWindow.getIcon();
     if (icon == null) {
-      return Icons.UI_FORM_ICON;
+      return PlatformIcons.UI_FORM_ICON;
     }
 
     icon = to16x16(icon);
index c8d9907c785694c9f32757f8c09f3e7e35509b91..ce98d66580bd0eb7d7b74a7aeaa6ae83c865e4c1 100644 (file)
@@ -26,7 +26,7 @@ import com.intellij.openapi.fileEditor.ex.FileEditorProviderManager;
 import com.intellij.openapi.fileTypes.FileTypeManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -102,7 +102,7 @@ public class VirtualFileDiffElement extends DiffElement<VirtualFile> {
 
   @Override
   public Icon getIcon() {
-    return isContainer() ? Icons.FOLDER_ICON : myFile.getIcon();
+    return isContainer() ? PlatformIcons.FOLDER_ICON : myFile.getIcon();
   }
 
   @Override
index ecccce03f888b42869d27d1ced1e409fb9c48b72..4c5f6bcf1be64385ecb6dfd70ba7c16b7ccc6fed 100644 (file)
 package com.intellij.internal.statistic.configurable;
 
 import com.intellij.internal.statistic.persistence.UsageStatisticsPersistenceComponent;
-import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -49,7 +48,7 @@ public class StatisticsConfigurable implements SearchableConfigurable {
 
   @Nullable
   public Icon getIcon() {
-    return Icons.TASK_ICON;
+    return PlatformIcons.TASK_ICON;
   }
 
   @Nullable
index 55bc6091c563048dc76b55bd0db8a6ffbb8d7ab2..8f3775b8d0729d379907d38032bff1952d077a91 100644 (file)
 package com.intellij.internal.statistic.tmp;
 
 import com.intellij.internal.statistic.StatisticsUploadAssistant;
-import com.intellij.internal.statistic.connect.StatisticsHttpClientSender;
 import com.intellij.internal.statistic.connect.RemotelyConfigurableStatisticsService;
 import com.intellij.internal.statistic.connect.StatisticsConnectionService;
+import com.intellij.internal.statistic.connect.StatisticsHttpClientSender;
 import com.intellij.internal.statistic.connect.StatisticsResult;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 
 public class SendStatisticsAction extends AnAction {
 
@@ -37,7 +37,7 @@ public class SendStatisticsAction extends AnAction {
 
         final StatisticsResult result = service.send();
 
-        Messages.showMessageDialog(result.getDescription(), "Result", Icons.CUSTOM_FILE_ICON);
+        Messages.showMessageDialog(result.getDescription(), "Result", PlatformIcons.CUSTOM_FILE_ICON);
     }
   }
 }
index 1697686cc05dfc128d30776c959df75a33a685c7..a43f147e20e5f654f8aaf451a6de6cd53be0fb45 100644 (file)
@@ -20,7 +20,7 @@ import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileManager;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -148,7 +148,7 @@ public class LocalFsFinder implements FileLookup.Finder, FileLookup {
 
     @Nullable
     public Icon getIcon() {
-      return myFile != null ? (myFile.isDirectory() ? Icons.DIRECTORY_CLOSED_ICON : myFile.getIcon()) : null;
+      return myFile != null ? (myFile.isDirectory() ? PlatformIcons.DIRECTORY_CLOSED_ICON : myFile.getIcon()) : null;
     }
 
     public boolean equals(final Object o) {
index fa6fc2e1c612c96a9258dded78a59e1353861674..58bc2e645b28367d9f9227588b27def0cfe84a31 100644 (file)
@@ -17,7 +17,7 @@ package com.intellij.usages;
 
 import com.intellij.ui.ComputableIcon;
 import com.intellij.usageView.UsageInfo;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 
 /**
  * @author Eugene Zhuravlev
@@ -32,13 +32,13 @@ public class ReadWriteAccessUsageInfo2UsageAdapter extends UsageInfo2UsageAdapte
     myAccessedForReading = accessedForReading;
     myAccessedForWriting = accessedForWriting;
     if (myAccessedForReading && myAccessedForWriting) {
-      myIcon = ComputableIcon.create(Icons.VARIABLE_RW_ACCESS);
+      myIcon = ComputableIcon.create(PlatformIcons.VARIABLE_RW_ACCESS);
     }
     else if (myAccessedForWriting) {
-      myIcon = ComputableIcon.create(Icons.VARIABLE_WRITE_ACCESS);           // If icon is changed, don't forget to change UTCompositeUsageNode.getIcon();
+      myIcon = ComputableIcon.create(PlatformIcons.VARIABLE_WRITE_ACCESS);           // If icon is changed, don't forget to change UTCompositeUsageNode.getIcon();
     }
     else if (myAccessedForReading){
-      myIcon = ComputableIcon.create(Icons.VARIABLE_READ_ACCESS);            // If icon is changed, don't forget to change UTCompositeUsageNode.getIcon();
+      myIcon = ComputableIcon.create(PlatformIcons.VARIABLE_READ_ACCESS);            // If icon is changed, don't forget to change UTCompositeUsageNode.getIcon();
     }
   }
 
index 960ac2234acc84127177a76d468567ad49fdcc34..33c61ad38de87891c9335e3867479f81e643ef0f 100644 (file)
@@ -27,7 +27,7 @@ import com.intellij.usages.UsageViewSettings;
 import com.intellij.usages.impl.rules.*;
 import com.intellij.usages.rules.UsageGroupingRule;
 import com.intellij.usages.rules.UsageGroupingRuleProvider;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -151,7 +151,7 @@ public class UsageGroupingRuleProviderImpl implements UsageGroupingRuleProvider
 
   private static class GroupByScopeAction extends RuleAction {
     private GroupByScopeAction(UsageViewImpl view) {
-      super(view, "Group by test/production", Icons.TEST_SOURCE_FOLDER);
+      super(view, "Group by test/production", PlatformIcons.TEST_SOURCE_FOLDER);
     }
     protected boolean getOptionValue() {
       return UsageViewSettings.getInstance().GROUP_BY_SCOPE;
@@ -177,7 +177,7 @@ public class UsageGroupingRuleProviderImpl implements UsageGroupingRuleProvider
 
   private static class GroupByPackageAction extends RuleAction {
     private GroupByPackageAction(UsageViewImpl view) {
-      super(view, UsageViewBundle.message("action.group.by.package"), Icons.GROUP_BY_PACKAGES);
+      super(view, UsageViewBundle.message("action.group.by.package"), PlatformIcons.GROUP_BY_PACKAGES);
     }
     protected boolean getOptionValue() {
       return UsageViewSettings.getInstance().GROUP_BY_PACKAGE;
index 91ff84983d548a7699c2ed445bf813ca3a1b315f..67f99b1f11ac54c10f6b192ecaa0d4e70a02ea09 100644 (file)
@@ -26,7 +26,7 @@ import com.intellij.usages.UsageGroup;
 import com.intellij.usages.UsageView;
 import com.intellij.usages.rules.PsiElementUsage;
 import com.intellij.usages.rules.UsageGroupingRule;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -56,7 +56,7 @@ public class UsageScopeGroupingRule implements UsageGroupingRule {
 
   private static final UsageScopeGroup TEST = new UsageScopeGroup(0) {
     public Icon getIcon(boolean isOpen) {
-      return Icons.TEST_SOURCE_FOLDER;
+      return PlatformIcons.TEST_SOURCE_FOLDER;
     }
 
     @NotNull
@@ -66,7 +66,7 @@ public class UsageScopeGroupingRule implements UsageGroupingRule {
   };
   private static final UsageScopeGroup PRODUCTION = new UsageScopeGroup(1) {
     public Icon getIcon(boolean isOpen) {
-      return Icons.SOURCE_FOLDERS_ICON ;
+      return PlatformIcons.SOURCE_FOLDERS_ICON;
     }
 
     @NotNull
@@ -76,7 +76,7 @@ public class UsageScopeGroupingRule implements UsageGroupingRule {
   };
   private static final UsageScopeGroup LIBRARY = new UsageScopeGroup(2) {
     public Icon getIcon(boolean isOpen) {
-      return Icons.LIBRARY_ICON ;
+      return PlatformIcons.LIBRARY_ICON;
     }
 
     @NotNull
index ec86f28f90b08c217dccb07f691db60cf5861432..255a5d6d62016bd56a3f61479951c5efbc7e8d7b 100644 (file)
@@ -19,14 +19,14 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.KeyboardShortcut;
 import com.intellij.openapi.actionSystem.Shortcut;
 import com.intellij.openapi.diff.impl.dir.DirDiffTableModel;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 
 /**
  * @author Konstantin Bulenkov
  */
 public class RefreshDirDiffAction extends DirDiffAction {
   public RefreshDirDiffAction(DirDiffTableModel model) {
-    super(model, "Refresh", Icons.SYNCHRONIZE_ICON);
+    super(model, "Refresh", PlatformIcons.SYNCHRONIZE_ICON);
   }
 
   @Override
index 28a6dbc418080c15ffb7881c941258fa73b7db0a..1cd5dd336f69bcc0be2fa8d34552f109d51e1444 100644 (file)
@@ -37,7 +37,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.util.EditSourceOnDoubleClickHandler;
 import com.intellij.util.EditSourceOnEnterKeyHandler;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.ui.tree.TreeUtil;
 
 import javax.swing.*;
@@ -222,7 +222,7 @@ public class UnversionedViewDialog extends DialogWrapper {
     public ToggleShowFlattenAction() {
       super(VcsBundle.message("changes.action.show.directories.text"),
             VcsBundle.message("changes.action.show.directories.description"),
-            Icons.DIRECTORY_CLOSED_ICON);
+            PlatformIcons.DIRECTORY_CLOSED_ICON);
       myFlattenState = false;
     }
 
index 1cb6d6b3ddcc4ece2a94baa5e0d3f43ae08ff4da..c1826b25a03fb9299a1cf3e0d04e8e2f67e6a779 100644 (file)
@@ -812,7 +812,7 @@ public class FileHistoryPanelImpl<S extends CommittedChangeList, U extends Chang
 
   private class MyShowAsTreeAction extends ToggleAction implements DumbAware {
     public MyShowAsTreeAction() {
-      super(VcsBundle.message("action.name.show.files.as.tree"), null, Icons.SMALL_VCS_CONFIGURABLE);
+      super(VcsBundle.message("action.name.show.files.as.tree"), null, PlatformIcons.SMALL_VCS_CONFIGURABLE);
     }
 
     public boolean isSelected(AnActionEvent e) {
index 19ef01bc858461f793bcffe2c2a5eb42d9f9ac86..df89ce7f24ca727622cd264a78a94602eef7be0b 100644 (file)
@@ -54,6 +54,7 @@ import com.intellij.ui.content.ContentFactory;
 import com.intellij.ui.content.ContentManager;
 import com.intellij.util.ContentsUtil;
 import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.Processor;
 import com.intellij.util.containers.Convertor;
 import com.intellij.util.messages.MessageBus;
@@ -208,7 +209,7 @@ public class ProjectLevelVcsManagerImpl extends ProjectLevelVcsManagerEx impleme
           ToolWindow toolWindow =
             toolWindowManager.registerToolWindow(ToolWindowId.VCS, true, ToolWindowAnchor.BOTTOM, myProject, true);
           myContentManager = toolWindow.getContentManager();
-          toolWindow.setIcon(Icons.VCS_SMALL_TAB);
+          toolWindow.setIcon(PlatformIcons.VCS_SMALL_TAB);
           toolWindow.installWatcher(myContentManager);
         } else {
           myContentManager = ContentFactory.SERVICE.getInstance().createContentManager(true, myProject);
index da9e31b54a98d72adce99add248338d2670cd27e..32b2d657fa7aa042346a310b0a3147c8d58a4ecc 100644 (file)
@@ -19,15 +19,14 @@ import com.intellij.openapi.fileTypes.FileTypeManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.SimpleTextAttributes;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
+import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.io.File;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
-import java.util.ArrayList;
-
-import org.jetbrains.annotations.NotNull;
 
 /**
  * author: lesya
@@ -43,7 +42,7 @@ public class FileTreeNode extends FileOrDirectoryTreeNode {
 
   public Icon getIcon(boolean expanded) {
     if (myFile.isDirectory()) {
-      return Icons.DIRECTORY_CLOSED_ICON;
+      return PlatformIcons.DIRECTORY_CLOSED_ICON;
     }
     return FileTypeManager.getInstance().getFileTypeByFileName(myFile.getName()).getIcon();
   }
index a78cc7ee93e2882c007931a7c2d6a157de523040..32f35c48530aac7f2f76a1443bfd9effccc29d31 100644 (file)
@@ -18,15 +18,13 @@ package com.intellij.openapi.vcs.update;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.PlatformDataKeys;
-import com.intellij.openapi.application.ApplicationManager;
-import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.progress.PerformInBackgroundOption;
 import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.progress.Task;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Messages;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.continuation.*;
 import org.jetbrains.annotations.NotNull;
 
@@ -37,7 +35,7 @@ import org.jetbrains.annotations.NotNull;
  */
 public class TestContinuationAction extends AnAction {
   public TestContinuationAction() {
-    super("Test Continuation", "Test Continuation", Icons.ADVICE_ICON);
+    super("Test Continuation", "Test Continuation", PlatformIcons.ADVICE_ICON);
   }
 
   @Override
index f1ccd0e535961a31bd03f816ebc2696923e069be..9faf8978aff1952169e2581577f0e63f72f77490 100644 (file)
@@ -41,7 +41,7 @@ import com.intellij.ui.content.ContentManager;
 import com.intellij.ui.treeStructure.Tree;
 import com.intellij.util.EditSourceOnDoubleClickHandler;
 import com.intellij.util.EditSourceOnEnterKeyHandler;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.containers.Convertor;
 import com.intellij.util.ui.tree.TreeUtil;
 import org.jetbrains.annotations.NonNls;
@@ -349,7 +349,7 @@ public class UpdateInfoTree extends PanelWithActionsAndCloseButton implements Di
 
   private class MyGroupByPackagesAction extends ToggleAction implements DumbAware {
     public MyGroupByPackagesAction() {
-      super(VcsBundle.message("action.name.group.by.packages"), null, Icons.GROUP_BY_PACKAGES);
+      super(VcsBundle.message("action.name.group.by.packages"), null, PlatformIcons.GROUP_BY_PACKAGES);
     }
 
     public boolean isSelected(AnActionEvent e) {
index 03657615c7a22e05b4fb8d165e178fba12558578..a79195b00f19c2b409cc176b6203a74f9d7fcddf 100644 (file)
@@ -20,7 +20,7 @@ import com.intellij.openapi.vfs.DeprecatedVirtualFile;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileSystem;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -60,7 +60,7 @@ public class TestDataGroupVirtualFile extends DeprecatedVirtualFile {
 
   @Override
   public Icon getIcon() {
-    return Icons.TEST_SOURCE_FOLDER;
+    return PlatformIcons.TEST_SOURCE_FOLDER;
   }
 
   @NotNull
index 708644a7ee95d11ea82b652f5901036280112c17..4337b4ae59a87e147fdb6e7b2d52ef859c377f44 100644 (file)
@@ -9,7 +9,7 @@ import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -27,7 +27,7 @@ public class TestDataLineMarkerProvider implements LineMarkerProvider {
     }
     final PsiMethod method = (PsiMethod)element;
     if (isTestMethod(method)) {
-      return new LineMarkerInfo<PsiMethod>(method, method.getTextOffset(), Icons.TEST_SOURCE_FOLDER, Pass.UPDATE_ALL, null,
+      return new LineMarkerInfo<PsiMethod>(method, method.getTextOffset(), PlatformIcons.TEST_SOURCE_FOLDER, Pass.UPDATE_ALL, null,
                                            new TestDataNavigationHandler());
     }
     return null;
index e6f2efe99e1499378e8576ca1e3aaaa1523e8b1c..214856f9a1fdf767e6491789ffb6b2184894bbb9 100644 (file)
@@ -25,7 +25,7 @@ import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.util.InheritanceUtil;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.siyeh.InspectionGadgetsBundle;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -95,7 +95,7 @@ public class UiUtils {
                 @NotNull ListTable table, @NotNull String chooserTitle,
                 @NotNull ClassFilter filter) {
             super(InspectionGadgetsBundle.message("button.add"), "",
-                    Icons.ADD_ICON);
+                    PlatformIcons.ADD_ICON);
             this.table = table;
             this.chooserTitle = chooserTitle;
             this.myFilter = filter;
@@ -147,7 +147,7 @@ public class UiUtils {
 
         public AddAction(ListTable table) {
             super(InspectionGadgetsBundle.message("button.add"), "",
-                    Icons.ADD_ICON);
+                    PlatformIcons.ADD_ICON);
             this.table = table;
         }
 
@@ -182,7 +182,7 @@ public class UiUtils {
 
         public RemoveAction(ListTable table) {
             super(InspectionGadgetsBundle.message("button.remove"), "",
-                    Icons.DELETE_ICON);
+                    PlatformIcons.DELETE_ICON);
             this.table = table;
         }
 
index d8ba85ac37c244e53c87133ad84e74bcdb664637..6463242e8ba482b6f69ff157cfeeb3a79c4bf13f 100644 (file)
@@ -33,7 +33,7 @@ import com.intellij.ui.dualView.TreeTableView;
 import com.intellij.ui.treeStructure.treetable.ListTreeTableModelOnColumns;
 import com.intellij.ui.treeStructure.treetable.TreeColumnInfo;
 import com.intellij.util.Function;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.containers.Convertor;
 import com.intellij.util.ui.ColumnInfo;
@@ -100,7 +100,7 @@ public class MethodParameterPanel extends AbstractInjectionPanel<MethodParameter
                                         final boolean hasFocus) {
 
         final Object o = ((DefaultMutableTreeNode)value).getUserObject();
-        setIcon(o instanceof PsiMethod ? Icons.METHOD_ICON : o instanceof PsiParameter ? Icons.PARAMETER_ICON : null);
+        setIcon(o instanceof PsiMethod ? PlatformIcons.METHOD_ICON : o instanceof PsiParameter ? PlatformIcons.PARAMETER_ICON : null);
         final String name;
         if (o instanceof PsiMethod) {
           name = PsiFormatUtil.formatMethod((PsiMethod)o, PsiSubstitutor.EMPTY, PsiFormatUtil.SHOW_NAME | PsiFormatUtil.SHOW_PARAMETERS,
index 229126aba4ab226cad1ef453dea143da6f6a0c12..f227bbb445b29e5a9a8c66c203eaeafa812ee949 100644 (file)
@@ -16,7 +16,7 @@
 package org.intellij.plugins.intelliLang.inject.config.ui.configurables;
 
 import com.intellij.openapi.project.Project;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.intellij.plugins.intelliLang.inject.config.MethodParameterInjection;
 import org.intellij.plugins.intelliLang.inject.config.ui.MethodParameterPanel;
 
@@ -36,6 +36,6 @@ public class MethodParameterInjectionConfigurable extends InjectionConfigurable<
   }
 
   public Icon getIcon() {
-    return Icons.METHOD_ICON;
+    return PlatformIcons.METHOD_ICON;
   }
 }
index 7ea5e31d7b8e34a69e794ad63f6a8686e2be9e3d..c4e566a750b14a9bb50f4c002e6531b62b811be2 100644 (file)
@@ -41,8 +41,8 @@ import com.intellij.psi.util.PsiUtil;
 import com.intellij.ui.SimpleColoredText;
 import com.intellij.ui.SimpleTextAttributes;
 import com.intellij.util.Consumer;
-import com.intellij.util.Icons;
 import com.intellij.util.NullableFunction;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.containers.ContainerUtil;
 import gnu.trove.THashSet;
 import org.intellij.plugins.intelliLang.AdvancedSettingsUI;
@@ -444,7 +444,7 @@ public class JavaLanguageInjectionSupport extends AbstractLanguageInjectionSuppo
   @Override
   public AnAction[] createAddActions(final Project project, final Consumer<BaseInjection> consumer) {
     return new AnAction[] {
-      new AnAction("Java Parameter", null, Icons.PARAMETER_ICON) {
+      new AnAction("Java Parameter", null, PlatformIcons.PARAMETER_ICON) {
         @Override
         public void actionPerformed(final AnActionEvent e) {
           final BaseInjection injection = showInjectionUI(project, new MethodParameterInjection());
index f2c43283e8871621b587dd476bbc54ab6bd57a3d..d0938816e5e1d75def94639afbf04eadc7f44171 100644 (file)
@@ -21,7 +21,7 @@ import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiLiteralExpression;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.Function;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.containers.ContainerUtil;
 import org.intellij.plugins.intelliLang.util.RegExpUtil;
 import org.intellij.plugins.intelliLang.util.StringLiteralReference;
@@ -50,7 +50,7 @@ final class RegExpEnumReference extends StringLiteralReference {
     }
     return ContainerUtil.map2Array(values, new Function<String, Object>() {
       public Object fun(String s) {
-        return LookupElementBuilder.create(s).setIcon(Icons.ENUM_ICON);
+        return LookupElementBuilder.create(s).setIcon(PlatformIcons.ENUM_ICON);
       }
     });
   }
index 8a6ce50ba09cdbd7713aa18914e6c8e742dcd343..39016182f4cfd794e2a1734f2d1666e4eb1bdf98 100644 (file)
@@ -137,7 +137,7 @@ public class InjectionsSettingsUI implements Configurable {
     });
 
     final DefaultActionGroup group = new DefaultActionGroup();
-    final AnAction addAction = new AnAction("Add", "Add", Icons.ADD_ICON) {
+    final AnAction addAction = new AnAction("Add", "Add", PlatformIcons.ADD_ICON) {
       @Override
       public void update(final AnActionEvent e) {
         e.getPresentation().setEnabled(!myAddActions.isEmpty());
@@ -148,7 +148,7 @@ public class InjectionsSettingsUI implements Configurable {
         performAdd(e);
       }
     };
-    final AnAction removeAction = new AnAction("Remove", "Remove", Icons.DELETE_ICON) {
+    final AnAction removeAction = new AnAction("Remove", "Remove", PlatformIcons.DELETE_ICON) {
       @Override
       public void update(final AnActionEvent e) {
         boolean enabled = false;
@@ -167,7 +167,7 @@ public class InjectionsSettingsUI implements Configurable {
       }
     };
 
-    final AnAction editAction = new AnAction("Edit", "Edit", Icons.PROPERTIES_ICON) {
+    final AnAction editAction = new AnAction("Edit", "Edit", PlatformIcons.PROPERTIES_ICON) {
       @Override
       public void update(final AnActionEvent e) {
         final AnAction action = getEditAction();
@@ -180,7 +180,7 @@ public class InjectionsSettingsUI implements Configurable {
         performEditAction(e);
       }
     };
-    final AnAction copyAction = new AnAction("Duplicate", "Duplicate", Icons.DUPLICATE_ICON) {
+    final AnAction copyAction = new AnAction("Duplicate", "Duplicate", PlatformIcons.DUPLICATE_ICON) {
       @Override
       public void update(final AnActionEvent e) {
         final AnAction action = getEditAction();
@@ -207,13 +207,13 @@ public class InjectionsSettingsUI implements Configurable {
     editAction.registerCustomShortcutSet(CommonShortcuts.ENTER, myInjectionsTable);
 
     group.addSeparator();
-    group.add(new AnAction("Enable Selected Injections", "Enable Selected Injections", Icons.SELECT_ALL_ICON) {
+    group.add(new AnAction("Enable Selected Injections", "Enable Selected Injections", PlatformIcons.SELECT_ALL_ICON) {
       @Override
       public void actionPerformed(final AnActionEvent e) {
         performSelectedInjectionsEnabled(true);
       }
     });
-    group.add(new AnAction("Disable Selected Injections", "Disable Selected Injections", Icons.UNSELECT_ALL_ICON) {
+    group.add(new AnAction("Disable Selected Injections", "Disable Selected Injections", PlatformIcons.UNSELECT_ALL_ICON) {
       @Override
       public void actionPerformed(final AnActionEvent e) {
         performSelectedInjectionsEnabled(false);
index f4f5e94914de155de40884a7f54c0061a519f5ff..ba20130484aba8f60d74a792927773489e3d5a9d 100644 (file)
@@ -16,7 +16,7 @@
 package org.intellij.plugins.intelliLang.inject.config.ui.configurables;
 
 import com.intellij.openapi.project.Project;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.intellij.plugins.intelliLang.inject.config.XmlAttributeInjection;
 import org.intellij.plugins.intelliLang.inject.config.ui.XmlAttributePanel;
 
@@ -36,6 +36,6 @@ public class XmlAttributeInjectionConfigurable extends InjectionConfigurable<Xml
   }
 
   public Icon getIcon() {
-    return Icons.ANNOTATION_TYPE_ICON;
+    return PlatformIcons.ANNOTATION_TYPE_ICON;
   }
 }
index 353e10def6fa6159364d666806eb3ee8d5e20992..06b325e3e2fe818acaf63de5e6d0f1bcbb3fe75c 100644 (file)
@@ -16,7 +16,7 @@
 package org.intellij.plugins.intelliLang.inject.config.ui.configurables;
 
 import com.intellij.openapi.project.Project;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.intellij.plugins.intelliLang.inject.config.XmlTagInjection;
 import org.intellij.plugins.intelliLang.inject.config.ui.XmlTagPanel;
 
@@ -36,6 +36,6 @@ public class XmlTagInjectionConfigurable extends InjectionConfigurable<XmlTagInj
   }
 
   public Icon getIcon() {
-    return Icons.XML_TAG_ICON;
+    return PlatformIcons.XML_TAG_ICON;
   }
 }
index e24f47941dca2381a0d6df171751d322b762e1c6..7b9152d0b3163bde326ee6c276c3b5ff802e2420 100644 (file)
@@ -34,7 +34,7 @@ import com.intellij.psi.xml.XmlAttributeValue;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.psi.xml.XmlText;
 import com.intellij.util.Consumer;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.containers.ContainerUtil;
 import org.intellij.plugins.intelliLang.Configuration;
 import org.intellij.plugins.intelliLang.inject.AbstractLanguageInjectionSupport;
@@ -331,14 +331,14 @@ public class XmlLanguageInjectionSupport extends AbstractLanguageInjectionSuppor
   @Override
   public AnAction[] createAddActions(final Project project, final Consumer<BaseInjection> consumer) {
     return new AnAction[] {
-      new AnAction("XML Tag Injection", null, Icons.XML_TAG_ICON) {
+      new AnAction("XML Tag Injection", null, PlatformIcons.XML_TAG_ICON) {
         @Override
         public void actionPerformed(final AnActionEvent e) {
           final BaseInjection newInjection = showInjectionUI(project, new XmlTagInjection());
           if (newInjection != null) consumer.consume(newInjection);
         }
       },
-      new AnAction("XML Attribute Injection", null, Icons.ANNOTATION_TYPE_ICON) {
+      new AnAction("XML Attribute Injection", null, PlatformIcons.ANNOTATION_TYPE_ICON) {
         @Override
         public void actionPerformed(final AnActionEvent e) {
           final BaseInjection injection = showInjectionUI(project, new XmlAttributeInjection());
index 701629831d0cfbf61cedb4e5f2936815d4acd9cf..6c1292f2f488648231ae9addf05eac92f7e2d1bf 100644 (file)
@@ -26,8 +26,8 @@ import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.util.Computable;
 import com.intellij.psi.*;
 import com.intellij.psi.search.searches.ClassInheritorsSearch;
-import com.intellij.util.Icons;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.android.AndroidFileTemplateProvider;
 import org.jetbrains.android.dom.manifest.Action;
 import org.jetbrains.android.dom.manifest.*;
@@ -62,7 +62,7 @@ public class NewAndroidComponentDialog extends DialogWrapper {
     super(module.getProject());
     myKindLabel.setLabelFor(myKindCombo);
     myKindCombo.registerUpDownHint(myNameField);
-    myUpDownHint.setIcon(Icons.UP_DOWN_ARROWS);
+    myUpDownHint.setIcon(PlatformIcons.UP_DOWN_ARROWS);
     myKindCombo.addItem(AndroidBundle.message("android.new.component.dialog.activity.item"), null, AndroidFileTemplateProvider.ACTIVITY);
 
     if (!containsCustomApplicationClass(module)) {
index 532a85ccca1d15bfd32ab6f201f33cbe0dac3045..6e9a7d75d8ad578d9b0112ef75870d7cda0030ba 100644 (file)
@@ -18,7 +18,7 @@ package com.intellij.lang.ant.config.execution;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.rt.ant.execution.AntMain2;
 import com.intellij.ui.MultilineTreeCellRenderer;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 
 import javax.swing.*;
 
@@ -58,10 +58,10 @@ final class MessageTreeRenderer extends MultilineTreeCellRenderer {
         icon = myBuildIcon;
       }
       else if (type == AntBuildMessageView.MessageType.TARGET) {
-        icon = Icons.ANT_TARGET_ICON;
+        icon = PlatformIcons.ANT_TARGET_ICON;
       }
       else if (type == AntBuildMessageView.MessageType.TASK) {
-        icon = Icons.TASK_ICON;
+        icon = PlatformIcons.TASK_ICON;
       }
       else if (type == AntBuildMessageView.MessageType.MESSAGE) {
         if (node.getPriority() == AntMain2.MSG_WARN) {
index 079a48e95f7bd62df89a410ecd2dc44e7b7e36c1..e98a10de8d13b8c135821f2f5250abf3114a560d 100644 (file)
@@ -29,9 +29,12 @@ import com.intellij.lang.ant.config.AntConfiguration;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.util.Comparing;
-import com.intellij.ui.*;
+import com.intellij.ui.ColoredTreeCellRenderer;
+import com.intellij.ui.ScrollPaneFactory;
+import com.intellij.ui.SimpleTextAttributes;
+import com.intellij.ui.TreeSpeedSearch;
 import com.intellij.ui.treeStructure.Tree;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.containers.Convertor;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.util.ui.tree.TreeUtil;
@@ -206,7 +209,7 @@ public class TargetChooserDialog extends DialogWrapper {
           final String antTargetName = antTarget.getName();
           append(antTargetName, SimpleTextAttributes.REGULAR_ATTRIBUTES);
           boolean isMeta = antTarget instanceof MetaTarget;
-          setIcon(isMeta ? Icons.ANT_META_TARGET_ICON : Icons.ANT_TARGET_ICON);
+          setIcon(isMeta ? PlatformIcons.ANT_META_TARGET_ICON : PlatformIcons.ANT_TARGET_ICON);
         }
       }
     }
index 41b05c523eefa82546455a248d75b530cb81cb81..ecc97c6f85847ad0e5c81eabf236fbe1077cf387 100644 (file)
@@ -28,15 +28,15 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.fileChooser.FileElement;
 import com.intellij.openapi.fileChooser.FileSystemTree;
+import com.intellij.openapi.fileTypes.FileTypeManager;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.util.IconLoader;
+import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.openapi.vfs.LocalFileSystem;
-import com.intellij.openapi.fileTypes.FileTypeManager;
-import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.ui.SimpleTextAttributes;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.containers.HashMap;
 import com.intellij.util.containers.HashSet;
 import org.jetbrains.annotations.Nullable;
@@ -101,7 +101,7 @@ public class ImportTree extends NodeRenderer {
   }
 
   public AnAction createExcludeAction() {
-    return new AnAction(CvsBundle.message("import.wizard.exclude.from.import.action.name"), null, Icons.DELETE_ICON) {
+    return new AnAction(CvsBundle.message("import.wizard.exclude.from.import.action.name"), null, PlatformIcons.DELETE_ICON) {
       public void update(AnActionEvent e) {
         VirtualFile[] selectedFiles = myFileSystemTree.getSelectedFiles();
         Presentation presentation = e.getPresentation();
@@ -128,7 +128,7 @@ public class ImportTree extends NodeRenderer {
   }
 
   public AnAction createIncludeAction() {
-    return new AnAction(CvsBundle.message("import.wizard.include.to.import.action.name"), null, Icons.ADD_ICON) {
+    return new AnAction(CvsBundle.message("import.wizard.include.to.import.action.name"), null, PlatformIcons.ADD_ICON) {
       public void update(AnActionEvent e) {
         VirtualFile[] selectedFiles = myFileSystemTree.getSelectedFiles();
         Presentation presentation = e.getPresentation();
index 35716387e8246c29fccfe8d9093f4364a5c0bcdc..8502bfccfaf4a24d949868a836b51a4aa021452c 100644 (file)
@@ -22,7 +22,7 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 
 import javax.swing.*;
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -54,7 +54,7 @@ public class GitLogTreeFileSelectorRenderer extends NodeRenderer {
           final FileElement fileElement = (FileElement)element;
           final VirtualFile file = fileElement.getFile();
           if (myModules.contains(file)) {
-            setIcon(expanded ? Icons.CONTENT_ROOT_ICON_OPEN : Icons.CONTENT_ROOT_ICON_CLOSED);
+            setIcon(expanded ? PlatformIcons.CONTENT_ROOT_ICON_OPEN : PlatformIcons.CONTENT_ROOT_ICON_CLOSED);
           }
         }
       }
@@ -70,8 +70,8 @@ public class GitLogTreeFileSelectorRenderer extends NodeRenderer {
 
       // a hack
       myName = proxiedDescriptor.toString();
-      myOpenIcon = Icons.CONTENT_ROOT_ICON_OPEN;
-      myClosedIcon = Icons.CONTENT_ROOT_ICON_CLOSED;
+      myOpenIcon = PlatformIcons.CONTENT_ROOT_ICON_OPEN;
+      myClosedIcon = PlatformIcons.CONTENT_ROOT_ICON_CLOSED;
       setChildrenSortingStamp(proxiedDescriptor.getChildrenSortingStamp());
       setIndex(proxiedDescriptor.getIndex());
       setUpdateCount(proxiedDescriptor.getUpdateCount());
index 21f6b0282dd7f570aa34fd56e3ccd239f402a311..a3db2df61d5e5e4cb3020060a396c748a85efb9f 100644 (file)
@@ -274,7 +274,7 @@ public class GitLogUI implements Disposable {
     });
 
     /*final JComponent specificDetails = myDetails.create();
-    final Content specificDetailsContent = myUi.createContent("Specific0", specificDetails, "Details", Icons.UNSELECT_ALL_ICON, null);
+    final Content specificDetailsContent = myUi.createContent("Specific0", specificDetails, "Details", PlatformIcons.UNSELECT_ALL_ICON, null);
     myUi.addContent(specificDetailsContent, 0, PlaceInGrid.bottom, false);
     repoContent.setCloseable(false);
     repoContent.setPinned(true);
index c5979ecced6a442ddf3ab3421c4ffabe67942b11..edf6df5c248b1402bbbc1c6955ceef299a394c12 100644 (file)
@@ -24,7 +24,7 @@ import com.intellij.ui.CheckedTreeNode;
 import com.intellij.ui.ColoredTreeCellRenderer;
 import com.intellij.ui.SimpleTextAttributes;
 import com.intellij.ui.treeStructure.Tree;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.ui.UIUtil;
 import com.intellij.util.ui.tree.TreeUtil;
 import git4idea.GitBranch;
@@ -265,7 +265,7 @@ public class GitRefspecAddRefsDialog extends DialogWrapper {
           // category node (render as bold)
           text = (String)userObject;
           attributes = SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES;
-          icon = expanded ? Icons.DIRECTORY_OPEN_ICON : Icons.DIRECTORY_CLOSED_ICON;
+          icon = expanded ? PlatformIcons.DIRECTORY_OPEN_ICON : PlatformIcons.DIRECTORY_CLOSED_ICON;
         }
         else {
           // reference node
index 49be4330ce3c64ce72f5fcef8aa2d1a6e9b74cbb..e2add3e4d2efceb0a1b9a8011ccf841771acc237 100644 (file)
@@ -22,7 +22,7 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiDirectory;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.plugins.groovy.GroovyIcons;
 import org.jetbrains.plugins.groovy.lang.psi.api.statements.typedef.GrTypeDefinition;
 import org.jetbrains.plugins.groovy.mvc.MvcIcons;
@@ -74,14 +74,14 @@ public class GriffonToolWindowFactory extends MvcToolWindowDescriptor {
 
     final PsiDirectory testsUnit = findDirectory(project, root, "test/unit");
     if (testsUnit != null) {
-      result.add(new TestsTopLevelDirectoryNode(module, testsUnit, viewSettings, "Unit Tests", Icons.TEST_SOURCE_FOLDER,
-                                                Icons.TEST_SOURCE_FOLDER));
+      result.add(new TestsTopLevelDirectoryNode(module, testsUnit, viewSettings, "Unit Tests", PlatformIcons.TEST_SOURCE_FOLDER,
+                                                PlatformIcons.TEST_SOURCE_FOLDER));
     }
 
     final PsiDirectory testsIntegration = findDirectory(project, root, "test/integration");
     if (testsIntegration != null) {
-      result.add(new TestsTopLevelDirectoryNode(module, testsIntegration, viewSettings, "Integration Tests", Icons.TEST_SOURCE_FOLDER,
-                                                Icons.TEST_SOURCE_FOLDER));
+      result.add(new TestsTopLevelDirectoryNode(module, testsIntegration, viewSettings, "Integration Tests", PlatformIcons.TEST_SOURCE_FOLDER,
+                                                PlatformIcons.TEST_SOURCE_FOLDER));
     }
   }
 
index 2b021b98021d2576b93a0b744857259541507681..45fb477d1fefd27ce0887140b944c3009f79bfe3 100644 (file)
@@ -30,8 +30,8 @@ import com.intellij.psi.util.MethodSignature;
 import com.intellij.psi.util.MethodSignatureBackedByPsiMethod;
 import com.intellij.ui.RowIcon;
 import com.intellij.util.ArrayUtil;
-import com.intellij.util.Icons;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.plugins.groovy.GroovyFileType;
@@ -332,7 +332,7 @@ public class GrLightMethodBuilder extends LightElement implements GrMethod {
 
   public Icon getElementIcon(final int flags) {
     Icon methodIcon = myBaseIcon != null ? myBaseIcon :
-                      hasModifierProperty(PsiModifier.ABSTRACT) ? Icons.ABSTRACT_METHOD_ICON : Icons.METHOD_ICON;
+                      hasModifierProperty(PsiModifier.ABSTRACT) ? PlatformIcons.ABSTRACT_METHOD_ICON : PlatformIcons.METHOD_ICON;
     RowIcon baseIcon = createLayeredIcon(methodIcon, ElementPresentationUtil.getFlags(this, false));
     return ElementPresentationUtil.addVisibilityIcon(this, flags, baseIcon);
   }
index cd66b92ce3f225a7be4db91555db601070f37654..a10264fb500a250ccc84a05725499a678cc75c83 100644 (file)
@@ -50,6 +50,7 @@ import com.intellij.psi.PsiPackage;
 import com.intellij.psi.search.SearchScope;
 import com.intellij.ui.InsertPathAction;
 import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import gnu.trove.TIntArrayList;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -149,7 +150,7 @@ public class JUnitConfigurable extends SettingsEditor<JUnitConfiguration> {
     final JPanel panel = myPattern.getComponent();
     panel.setLayout(new BorderLayout());
     myPatternTextField = new TextFieldWithBrowseButton();
-    myPatternTextField.setButtonIcon(Icons.ADD_ICON);
+    myPatternTextField.setButtonIcon(PlatformIcons.ADD_ICON);
     panel.add(myPatternTextField, BorderLayout.CENTER);
     final FixedSizeButton editBtn = new FixedSizeButton();
     editBtn.setIcon(IconLoader.getIcon("/actions/showViewer.png"));
index 17356329e2eefd474a2acdce82d8373d45d1c885..b79dd9efac2786695bfe5c916f23d0fb27cde828 100644 (file)
@@ -29,8 +29,8 @@ import com.intellij.psi.xml.XmlTag;
 import com.intellij.psi.xml.XmlTagChild;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.Function;
-import com.intellij.util.Icons;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.xml.DomElement;
 import com.intellij.util.xml.DomUtil;
@@ -284,7 +284,7 @@ public class MavenPropertyPsiReference extends MavenPsiReference {
   }
 
   private static LookupElement createLookupElement(Object element, String name) {
-    return createLookupElement(element, name, Icons.PROPERTY_ICON);
+    return createLookupElement(element, name, PlatformIcons.PROPERTY_ICON);
   }
 
   private static LookupElement createLookupElement(Object element, String name, Icon icon) {
index b55e25bea5fd92c627cdd77c95a82233af7672fd..6784720e020bc1d9e097aca98b6facedb33c2370 100644 (file)
  */
 package com.intellij.lang.properties;
 
-import com.intellij.codeInsight.lookup.LookupItem;
 import com.intellij.codeInsight.lookup.LookupElementPresentation;
+import com.intellij.codeInsight.lookup.LookupItem;
 import com.intellij.codeInsight.lookup.impl.ElementLookupRenderer;
 import com.intellij.lang.properties.psi.PropertiesFile;
 import com.intellij.lang.properties.psi.Property;
 import com.intellij.openapi.editor.colors.EditorColorsManager;
 import com.intellij.openapi.editor.markup.TextAttributes;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 
 /**
  * @author yole
@@ -33,7 +33,7 @@ public class PropertyLookupRenderer implements ElementLookupRenderer<Property> {
   }
 
   public void renderElement(final LookupItem item, final Property property, final LookupElementPresentation presentation) {
-    presentation.setIcon(Icons.PROPERTY_ICON);
+    presentation.setIcon(PlatformIcons.PROPERTY_ICON);
     presentation.setItemText(property.getUnescapedKey());
 
     PropertiesFile propertiesFile = property.getContainingFile();
index 499fe767d35480f52001821d724cb3fe4f02f9dd..07d95184c48782dcfde99e269d1ae94f29aaa4c9 100644 (file)
@@ -28,7 +28,7 @@ import com.intellij.openapi.editor.colors.EditorColorsManager;
 import com.intellij.openapi.editor.colors.TextAttributesKey;
 import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.project.Project;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 
 import javax.swing.*;
 import java.awt.*;
@@ -76,7 +76,7 @@ public class ResourceBundlePropertyStructureViewElement implements StructureView
       }
 
       public Icon getIcon(boolean open) {
-        return Icons.PROPERTY_ICON;
+        return PlatformIcons.PROPERTY_ICON;
       }
 
       public TextAttributesKey getTextAttributesKey() {
@@ -102,4 +102,4 @@ public class ResourceBundlePropertyStructureViewElement implements StructureView
     return false;
   }
 
-}
\ No newline at end of file
+}
index 76e9682d2a78bd91743a5fa8ba494515e8d14030..69b7f90ba48a9dcb6386ae0e75dd65116855e242 100644 (file)
@@ -33,8 +33,8 @@ import com.intellij.psi.TokenType;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.stubs.IStubElementType;
-import com.intellij.util.Icons;
 import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -350,7 +350,7 @@ public class PropertyImpl extends PropertiesStubElementImpl<PropertyStub> implem
   }
 
   public Icon getIcon(int flags) {
-    return Icons.PROPERTY_ICON;
+    return PlatformIcons.PROPERTY_ICON;
   }
 
   public void delete() throws IncorrectOperationException {
index 492b007c3ed79e570b9eef55922122adc0d06d8f..db14522bbf73c57079105aa2df65bbd5c1e292c5 100644 (file)
@@ -24,7 +24,7 @@ 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.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.ui.tree.TreeUtil;
 import org.jetbrains.idea.svn.SvnBundle;
 import org.jetbrains.idea.svn.SvnServerFileManager;
@@ -155,7 +155,7 @@ public class SvnConfigureProxiesComponent extends MasterDetailsComponent {
 
   protected ArrayList<AnAction> createActions(final boolean fromPopup) {
     ArrayList<AnAction> result = new ArrayList<AnAction>();
-    result.add(new AnAction("Add", "Add", Icons.ADD_ICON) {
+    result.add(new AnAction("Add", "Add", PlatformIcons.ADD_ICON) {
         {
             registerCustomShortcutSet(CommonShortcuts.INSERT, myTree);
         }
index 0d596521197d61a1af0061d1ef1a2b908629fcc7..5b2b8dc468a2eb6ac7c9d64c67d4b4aa268f9ec6 100644 (file)
@@ -19,7 +19,7 @@ import com.intellij.CommonBundle;
 import com.intellij.openapi.fileTypes.FileTypeManager;
 import com.intellij.ui.ColoredTreeCellRenderer;
 import com.intellij.ui.SimpleTextAttributes;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.text.DateFormatUtil;
 import org.tmatesoft.svn.core.SVNDirEntry;
 import org.tmatesoft.svn.core.SVNErrorMessage;
@@ -71,9 +71,9 @@ public class SvnRepositoryTreeCellRenderer extends ColoredTreeCellRenderer {
 
   private void setDirectoryIcon(final boolean expanded) {
     if (expanded) {
-      setIcon(Icons.DIRECTORY_OPEN_ICON);
+      setIcon(PlatformIcons.DIRECTORY_OPEN_ICON);
     } else {
-      setIcon(Icons.DIRECTORY_CLOSED_ICON);
+      setIcon(PlatformIcons.DIRECTORY_CLOSED_ICON);
     }
   }
 
index 86aaf3f7c0025fd959f775546b1a6a7c9b9962f7..3e2cd0f72a5cc7ca4ff54b85bfcae0091173946d 100644 (file)
@@ -25,7 +25,7 @@ import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vcs.impl.ExcludedFileIndex;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.idea.svn.*;
@@ -104,7 +104,7 @@ public class IntegratedSelectedOptionsDialog extends DialogWrapper {
     myTargetInfoLabel.setText(SvnBundle.message("action.Subversion.integrate.changes.branch.info.target.label.text", selectedBranchUrl));
 
     final String addText = SvnBundle.message("action.Subversion.integrate.changes.dialog.add.wc.text");
-    final AnAction addAction = new AnAction(addText, addText, Icons.ADD_ICON) {
+    final AnAction addAction = new AnAction(addText, addText, PlatformIcons.ADD_ICON) {
       {
         registerCustomShortcutSet(CommonShortcuts.INSERT, myWorkingCopiesList);
       }
@@ -137,7 +137,7 @@ public class IntegratedSelectedOptionsDialog extends DialogWrapper {
     myGroup.add(addAction);
 
     final String removeText = SvnBundle.message("action.Subversion.integrate.changes.dialog.remove.wc.text");
-    myGroup.add(new AnAction(removeText, removeText, Icons.DELETE_ICON) {
+    myGroup.add(new AnAction(removeText, removeText, PlatformIcons.DELETE_ICON) {
       {
         registerCustomShortcutSet(CommonShortcuts.DELETE, myWorkingCopiesList);
       }
index 9d9693ed5d5580f0cac03390f725cc3848ccd3ae..d57c3234aa601a6d624fcfc8a9ac886df591d1bc 100644 (file)
@@ -19,7 +19,7 @@ import com.intellij.ide.IdeBundle;
 import com.intellij.openapi.fileTypes.FileType;
 import com.intellij.openapi.vfs.CharsetToolkit;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
@@ -48,7 +48,7 @@ public class GuiFormFileType implements FileType {
   }
 
   public Icon getIcon() {
-    return Icons.UI_FORM_ICON;
+    return PlatformIcons.UI_FORM_ICON;
   }
 
   public boolean isBinary() {
index 471958a1fe2773cc1b0732de02589924e9d59b54..4f96ad4ec9ef3e42829102c53d46d6955aa09ab1 100644 (file)
@@ -15,9 +15,9 @@
  */
 package org.intellij.lang.xpath.completion;
 
-import com.intellij.openapi.util.Iconable;
 import com.intellij.openapi.util.IconLoader;
-import com.intellij.util.Icons;
+import com.intellij.openapi.util.Iconable;
+import com.intellij.util.PlatformIcons;
 import org.intellij.lang.xpath.psi.XPathNodeTest;
 
 import javax.swing.*;
@@ -31,6 +31,6 @@ public class NodeLookup extends AbstractLookup implements Lookup, Iconable {
     }
 
     public Icon getIcon(int flags) {
-        return principalType == XPathNodeTest.PrincipalType.ATTRIBUTE ? Icons.ANNOTATION_TYPE_ICON : IconLoader.getIcon("/icons/tag.png");
+        return principalType == XPathNodeTest.PrincipalType.ATTRIBUTE ? PlatformIcons.ANNOTATION_TYPE_ICON : IconLoader.getIcon("/icons/tag.png");
     }
 }
index 7cd4e2344e5cac2c4116f838086f92631cb2193b..c42fc57a3ced57fe4ff39a49fa8c8fd7e30c13fa 100644 (file)
  */
 package org.intellij.lang.xpath.completion;
 
-import com.intellij.openapi.util.Iconable;
 import com.intellij.codeInsight.lookup.LookupValueWithPriority;
-import com.intellij.util.Icons;
+import com.intellij.openapi.util.Iconable;
 import com.intellij.psi.PsiElement;
+import com.intellij.util.PlatformIcons;
 
 import javax.swing.*;
 
@@ -43,7 +43,7 @@ public class VariableLookup extends AbstractLookup implements Lookup, Iconable,
     }
 
     public Icon getIcon(int flags) {
-        return myIcon != null ? myIcon : Icons.VARIABLE_ICON;
+        return myIcon != null ? myIcon : PlatformIcons.VARIABLE_ICON;
     }
 
     public int getPriority() {
index 966a5186539cc5854c79b7708a3b38031b1de3bf..076436782ebb47046e17be76170d3109619a539e 100644 (file)
@@ -20,7 +20,7 @@ import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.xml.XmlFile;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.util.CommonProcessors;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.intellij.lang.xpath.xslt.XsltSupport;
 import org.intellij.lang.xpath.xslt.impl.XsltIncludeIndex;
 import org.intellij.lang.xpath.xslt.psi.XsltElementFactory;
@@ -39,7 +39,7 @@ public class XsltParameterImpl extends XsltVariableImpl implements XsltParameter
 
     @Override
     public Icon getIcon(int i) {
-        return Icons.PARAMETER_ICON;
+        return PlatformIcons.PARAMETER_ICON;
     }
 
     public boolean hasDefault() {
@@ -90,4 +90,4 @@ public class XsltParameterImpl extends XsltVariableImpl implements XsltParameter
     public static XsltParameter getInstance(@NotNull XmlTag target) {
         return XsltElementFactory.getInstance().wrapElement(target, XsltParameter.class);
     }
-}
\ No newline at end of file
+}
index 70b32631a47224be9476480152ead99094d590d8..55eb8eb0a8c4cb640155afbbb2cbc001612b6f1a 100644 (file)
@@ -19,7 +19,7 @@ import com.intellij.psi.search.LocalSearchScope;
 import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.xml.XmlAttribute;
 import com.intellij.psi.xml.XmlTag;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import org.intellij.lang.xpath.psi.XPathElementVisitor;
 import org.intellij.lang.xpath.psi.XPathExpression;
 import org.intellij.lang.xpath.psi.XPathType;
@@ -41,7 +41,7 @@ public class XsltVariableImpl extends XsltElementImpl implements XsltVariable {
 
     @Override
     public Icon getIcon(int i) {
-        return Icons.VARIABLE_ICON;
+        return PlatformIcons.VARIABLE_ICON;
     }
 
     @NotNull
index d434602cc2efb988240f13b3969b1af671da192c..51ef57f5cf2e8cf68ff39c3046d6f9183ca97859 100644 (file)
@@ -37,7 +37,7 @@ import com.intellij.openapi.util.UserDataHolder;
 import com.intellij.openapi.vfs.JarFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiManager;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.util.net.NetUtils;
 import com.intellij.xdebugger.impl.ui.DebuggerSessionTabBase;
 import org.intellij.lang.xpath.xslt.XsltSupport;
@@ -89,7 +89,7 @@ public class XsltDebuggerExtension extends XsltRunnerExtension {
     if (manager instanceof DebuggerSessionTabBase) {
       final DebuggerSessionTabBase mgr = (DebuggerSessionTabBase)manager;
       mgr.addAdditionalTabComponent(new OutputTabComponent(outputConsole), "XSLT-Output", IconLoader.getIcon("/debugger/console.png"));
-      mgr.addAdditionalTabComponent(StructureTabComponent.create(process, outputConsole), "XSLT-Structure", Icons.FLATTEN_PACKAGES_ICON);
+      mgr.addAdditionalTabComponent(StructureTabComponent.create(process, outputConsole), "XSLT-Structure", PlatformIcons.FLATTEN_PACKAGES_ICON);
     } else {
       manager.addAdditionalTabComponent(new OutputTabComponent(outputConsole), "XSLT-Output");
       manager.addAdditionalTabComponent(StructureTabComponent.create(process, outputConsole), "XSLT-Structure");
index ae9f5722cf7088b7e67ac0e31f6b1849e1a4e5a9..c59dce3dd278fa27546907221f4b3c027e1affd3 100644 (file)
@@ -19,7 +19,7 @@ package org.intellij.plugins.xsltDebugger.ui;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.ui.ColoredTreeCellRenderer;
 import com.intellij.ui.SimpleTextAttributes;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.xdebugger.ui.DebuggerIcons;
 import org.intellij.plugins.xsltDebugger.rt.engine.OutputEventQueue;
 
@@ -49,7 +49,7 @@ class GeneratedStructureRenderer extends ColoredTreeCellRenderer {
       final OutputEventQueue.NodeEvent.QName qname = event.getQName();
       switch (event.getType()) {
         case OutputEventQueue.START_ELEMENT:
-          setIcon(Icons.XML_TAG_ICON);
+          setIcon(PlatformIcons.XML_TAG_ICON);
           append(qname.getQName(), SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES);
           if (qname.myURI != null && qname.myURI.length() > 0) {
             append(" {", SimpleTextAttributes.GRAYED_ATTRIBUTES);
@@ -58,7 +58,7 @@ class GeneratedStructureRenderer extends ColoredTreeCellRenderer {
           }
           break;
         case OutputEventQueue.ATTRIBUTE:
-          setIcon(Icons.ANNOTATION_TYPE_ICON);
+          setIcon(PlatformIcons.ANNOTATION_TYPE_ICON);
           append(qname.getQName(), SimpleTextAttributes.REGULAR_BOLD_ATTRIBUTES);
           if (qname.myURI != null && qname.myURI.length() > 0) {
             append(" {" + qname.myURI + "}", SimpleTextAttributes.GRAYED_ATTRIBUTES);
index cedd4fa1dde3e7fa4c9a023a35e854def1412a72..56368a2fe5196933e09037bfe180ba260eb56cda 100644 (file)
@@ -22,7 +22,7 @@ import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.ui.components.JBList;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 
 import javax.swing.*;
 import java.awt.*;
@@ -84,7 +84,7 @@ public class TagListDialog extends DialogWrapper{
   }
 
   private AnAction createDeleteAction() {
-    return new IconWithTextAction(ApplicationBundle.message("action.remove"), null, Icons.DELETE_ICON) {
+    return new IconWithTextAction(ApplicationBundle.message("action.remove"), null, PlatformIcons.DELETE_ICON) {
       public void update(AnActionEvent e) {
         final int selectedIndex = myList.getSelectedIndex();
         if (selectedIndex >= 0) {
@@ -111,7 +111,7 @@ public class TagListDialog extends DialogWrapper{
   }
 
   private AnAction createAddAction() {
-    return new IconWithTextAction(ApplicationBundle.message("action.add"), null, Icons.ADD_ICON){
+    return new IconWithTextAction(ApplicationBundle.message("action.add"), null, PlatformIcons.ADD_ICON){
       public void actionPerformed(AnActionEvent e) {
         final String tagName = Messages.showInputDialog(ApplicationBundle.message("editbox.enter.tag.name"),
                                                         ApplicationBundle.message("title.tag.name"), Messages.getQuestionIcon());
index 9669f8445ca40f4e0853991c60c8de2c09c299d8..5fbc795e6851276e805202b4f69904cd57f14112 100644 (file)
@@ -22,7 +22,7 @@ import com.intellij.psi.impl.RenameableFakePsiElement;
 import com.intellij.psi.search.SearchScope;
 import com.intellij.psi.xml.XmlAttribute;
 import com.intellij.psi.xml.XmlAttributeValue;
-import com.intellij.util.Icons;
+import com.intellij.util.PlatformIcons;
 import com.intellij.xml.XmlExtension;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -57,7 +57,7 @@ public class SchemaPrefix extends RenameableFakePsiElement {
   }
 
   public Icon getIcon() {
-    return Icons.VARIABLE_ICON;
+    return PlatformIcons.VARIABLE_ICON;
   }
 
   @Override
index a16b24febf39d05aa2e7eeccf6715ed3cb99d022..bb9abda2a63b4461276514131dfc7b3a71211fa6 100644 (file)
@@ -49,10 +49,7 @@ import com.intellij.psi.util.CachedValueProvider;
 import com.intellij.psi.util.CachedValuesManager;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.*;
-import com.intellij.util.ArrayUtil;
-import com.intellij.util.CharTable;
-import com.intellij.util.Icons;
-import com.intellij.util.IncorrectOperationException;
+import com.intellij.util.*;
 import com.intellij.util.containers.BidirectionalMap;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.xml.XmlAttributeDescriptor;
@@ -1131,7 +1128,7 @@ public class XmlTagImpl extends XmlElementImpl implements XmlTag {
   }
 
   public Icon getElementIcon(int flags) {
-    return Icons.XML_TAG_ICON;
+    return PlatformIcons.XML_TAG_ICON;
   }
 
   protected class BodyInsertTransaction extends InsertTransaction {