Removing a lot of Icon static fields, that refer to other static fields, mostly from...
authorMaxim Shafirov <max@jetbrains.com>
Fri, 24 Aug 2012 11:04:42 +0000 (15:04 +0400)
committerMaxim Shafirov <max@jetbrains.com>
Fri, 24 Aug 2012 11:11:51 +0000 (15:11 +0400)
282 files changed:
java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java
java/compiler/impl/src/com/intellij/packaging/impl/artifacts/InvalidArtifactType.java
java/compiler/impl/src/com/intellij/packaging/impl/artifacts/JarArtifactType.java
java/compiler/impl/src/com/intellij/packaging/impl/artifacts/PlainArtifactType.java
java/compiler/impl/src/com/intellij/packaging/impl/elements/ArtifactElementType.java
java/compiler/impl/src/com/intellij/packaging/impl/elements/ArtifactRootElementImpl.java
java/compiler/impl/src/com/intellij/packaging/impl/elements/DirectoryCopyElementType.java
java/compiler/impl/src/com/intellij/packaging/impl/elements/DirectoryElementType.java
java/compiler/impl/src/com/intellij/packaging/impl/elements/ExtractedDirectoryElementType.java
java/compiler/impl/src/com/intellij/packaging/impl/elements/FileCopyElementType.java
java/compiler/impl/src/com/intellij/packaging/impl/run/ArtifactChooser.java
java/compiler/impl/src/com/intellij/packaging/impl/run/BuildArtifactsBeforeRunTaskProvider.java
java/compiler/impl/src/com/intellij/packaging/impl/ui/ArtifactElementPresentation.java
java/compiler/impl/src/com/intellij/packaging/impl/ui/DirectoryCopyPresentation.java
java/compiler/impl/src/com/intellij/packaging/impl/ui/ExtractedDirectoryPresentation.java
java/compiler/impl/src/com/intellij/packaging/impl/ui/FileCopyPresentation.java
java/debugger/impl/src/com/intellij/debugger/ui/DebuggerSessionTab.java
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/AnyExceptionBreakpointFactory.java
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/ExceptionBreakpoint.java
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/ExceptionBreakpointFactory.java
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpoint.java
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpointFactory.java
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/LineBreakpoint.java
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/LineBreakpointFactory.java
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpointFactory.java
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/WildcardMethodBreakpoint.java
java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeRenderer.java
java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/StackFrameDescriptorImpl.java
java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/ThreadDescriptorImpl.java
java/execution/impl/src/com/intellij/compiler/options/CompileStepBeforeRun.java
java/execution/impl/src/com/intellij/execution/applet/AppletConfigurationType.java
java/execution/impl/src/com/intellij/execution/application/ApplicationConfigurationType.java
java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurationType.java
java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ConfigurationErrorsComponent.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavaContentRootPanel.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/sourceItems/ArtifactsSourceItemsProvider.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/ModuleDependenciesAnalyzer.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/AnnotationsOrderRootTypeUIFactory.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ClassesOrderRootTypeUIFactory.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/ItemElementDescriptor.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocOrderRootTypeUIFactory.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/SourcesOrderRootTypeUIFactory.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FindUsagesInProjectStructureActionBase.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java
java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/RecursiveCallLineMarkerProvider.java
java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DelegateWithDefaultParamValueIntentionAction.java
java/java-impl/src/com/intellij/codeInsight/intention/impl/RunRefactoringAction.java
java/java-impl/src/com/intellij/codeInspection/ui/EntryPointsNode.java
java/java-impl/src/com/intellij/ide/hierarchy/call/CallHierarchyNodeDescriptor.java
java/java-impl/src/com/intellij/ide/hierarchy/method/MethodHierarchyNodeDescriptor.java
java/java-impl/src/com/intellij/ide/hierarchy/type/TypeHierarchyNodeDescriptor.java
java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java
java/java-impl/src/com/intellij/ide/structureView/impl/java/SuperTypeGroup.java
java/java-impl/src/com/intellij/ide/structureView/impl/java/VisibilitySorter.java
java/java-impl/src/com/intellij/ide/util/FQNameCellRenderer.java
java/java-impl/src/com/intellij/internal/StaticIconFieldsAction.java [new file with mode: 0644]
java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java
java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java
java/java-impl/src/com/intellij/packageDependencies/ui/LibraryNode.java
java/java-impl/src/com/intellij/packageDependencies/ui/PackagePatternProvider.java
java/java-impl/src/com/intellij/packageDependencies/ui/TreeModelBuilder.java
java/java-impl/src/com/intellij/psi/impl/beanProperties/BeanProperty.java
java/java-impl/src/com/intellij/psi/impl/beanProperties/BeanPropertyElement.java
java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java
java/java-impl/src/com/intellij/refactoring/ui/MemberSelectionTable.java
java/java-impl/src/com/intellij/unscramble/ThreadDumpPanel.java
java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.java
java/java-psi-impl/src/com/intellij/ide/highlighter/JavaFileType.java
java/java-psi-impl/src/com/intellij/psi/impl/ElementPresentationUtil.java
java/openapi/src/com/intellij/codeInsight/NullableNotNullDialog.java
platform/core-impl/src/com/intellij/openapi/fileTypes/PlainTextFileType.java
platform/lang-api/src/com/intellij/codeInspection/SuppressIntentionAction.java
platform/lang-api/src/com/intellij/execution/configurations/UnknownConfigurationType.java
platform/lang-api/src/com/intellij/execution/executors/DefaultRunExecutor.java
platform/lang-api/src/com/intellij/openapi/projectRoots/impl/UnknownSdkType.java
platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java
platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/DocumentationOrderRootTypeUIFactory.java
platform/lang-api/src/com/intellij/profile/Profile.java
platform/lang-api/src/com/intellij/psi/search/TodoAttributes.java
platform/lang-api/src/com/intellij/psi/search/scope/packageSet/NamedScopeManager.java
platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/ArrangementRemoveConditionAction.java
platform/lang-impl/src/com/intellij/codeInsight/hint/ElementLocationUtil.java
platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java
platform/lang-impl/src/com/intellij/codeInsight/intention/impl/FileLevelIntentionComponent.java
platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionHintComponent.java
platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionListStep.java
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
platform/lang-impl/src/com/intellij/codeInspection/actions/CodeInspectionAction.java
platform/lang-impl/src/com/intellij/codeInspection/ex/DisableInspectionToolAction.java
platform/lang-impl/src/com/intellij/codeInspection/ex/EditInspectionToolsSettingsAction.java
platform/lang-impl/src/com/intellij/codeInspection/ui/ProblemDescriptionNode.java
platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java
platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationPopup.java
platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationsComboBoxAction.java
platform/lang-impl/src/com/intellij/execution/actions/StopAction.java
platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationBeforeRunProvider.java
platform/lang-impl/src/com/intellij/execution/runners/RestartAction.java
platform/lang-impl/src/com/intellij/execution/runners/RunContentBuilder.java
platform/lang-impl/src/com/intellij/execution/ui/CommonProgramParametersPanel.java
platform/lang-impl/src/com/intellij/execution/ui/layout/actions/CloseViewAction.java
platform/lang-impl/src/com/intellij/execution/ui/layout/actions/MinimizeViewAction.java
platform/lang-impl/src/com/intellij/facet/impl/invalid/InvalidFacetType.java
platform/lang-impl/src/com/intellij/find/editorHeaderActions/ToggleMultiline.java
platform/lang-impl/src/com/intellij/ide/commander/TopLevelNode.java
platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyNodeDescriptor.java
platform/lang-impl/src/com/intellij/ide/navigationToolbar/NavBarPresentation.java
platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java
platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewPane.java
platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/NamedLibraryElementNode.java
platform/lang-impl/src/com/intellij/ide/scopeView/EditScopesAction.java
platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewPane.java
platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java
platform/lang-impl/src/com/intellij/ide/todo/configurable/PatternDialog.java
platform/lang-impl/src/com/intellij/ide/todo/configurable/TodoConfigurable.java
platform/lang-impl/src/com/intellij/ide/util/PsiElementModuleRenderer.java
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameFilter.java
platform/lang-impl/src/com/intellij/openapi/module/EmptyModuleType.java
platform/lang-impl/src/com/intellij/openapi/module/WebModuleTypeBase.java
platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java
platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentRootPanel.java
platform/lang-impl/src/com/intellij/openapi/wm/impl/status/TogglePopupHintsPanel.java
platform/lang-impl/src/com/intellij/packageDependencies/DependencyValidationManagerImpl.java
platform/lang-impl/src/com/intellij/packageDependencies/ui/ProjectPatternProvider.java
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java
platform/lang-impl/src/com/intellij/profile/codeInspection/ui/ProfilesComboBox.java
platform/lang-impl/src/com/intellij/refactoring/BaseRefactoringIntentionAction.java
platform/lang-impl/src/com/intellij/refactoring/ui/AbstractMemberSelectionTable.java
platform/lang-impl/src/com/intellij/tools/ToolBeforeRunTaskProvider.java
platform/lang-impl/src/com/intellij/tools/ToolConfigurable.java
platform/lang-impl/src/com/intellij/tools/ToolKeymapExtension.java
platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurablePanel.java
platform/platform-api/src/com/intellij/ide/actions/ContextHelpAction.java
platform/platform-api/src/com/intellij/ide/highlighter/WorkspaceFileType.java
platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java
platform/platform-api/src/com/intellij/openapi/fileTypes/NativeFileType.java
platform/platform-api/src/com/intellij/openapi/keymap/KeymapUtil.java
platform/platform-api/src/com/intellij/openapi/ui/ComboBoxTableRenderer.java
platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
platform/platform-api/src/com/intellij/ui/SearchTextField.java
platform/platform-api/src/com/intellij/ui/components/JBOptionButton.java
platform/platform-api/src/com/intellij/ui/components/labels/LinkLabel.java
platform/platform-api/src/com/intellij/ui/tabs/impl/singleRow/MoreTabsIcon.java
platform/platform-api/src/com/intellij/ui/tabs/impl/singleRow/SingleRowLayoutStrategy.java
platform/platform-api/src/com/intellij/util/ui/AsyncProcessIcon.java
platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroConfigurable.java
platform/platform-impl/src/com/intellij/codeInsight/hint/HintUtil.java
platform/platform-impl/src/com/intellij/diagnostic/IdeFatalErrorsIcon.java
platform/platform-impl/src/com/intellij/diagnostic/IdeMessagePanel.java
platform/platform-impl/src/com/intellij/ide/dnd/Highlighters.java
platform/platform-impl/src/com/intellij/ide/errorTreeView/ErrorViewStructure.java
platform/platform-impl/src/com/intellij/ide/errorTreeView/FixedHotfixGroupElement.java
platform/platform-impl/src/com/intellij/ide/errorTreeView/HotfixGroupElement.java
platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeRenderer.java
platform/platform-impl/src/com/intellij/ide/ui/customization/CustomActionsSchema.java
platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.java
platform/platform-impl/src/com/intellij/notification/impl/IdeNotificationArea.java
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButton.java
platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java
platform/platform-impl/src/com/intellij/openapi/diff/actions/MergeOperations.java
platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/MergeList.java
platform/platform-impl/src/com/intellij/openapi/diff/impl/util/GutterActionRenderer.java
platform/platform-impl/src/com/intellij/openapi/editor/actions/ContentChooser.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java
platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RemoteFilePanel.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTree.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapConfigurable.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListPanel.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/EncodingPanel.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/IdeStatusBarImpl.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ToggleReadOnlyAttributePanel.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/DefaultWelcomeScreen.java
platform/platform-impl/src/com/intellij/ui/BalloonImpl.java
platform/platform-impl/src/com/intellij/ui/ColorPicker.java
platform/platform-impl/src/com/intellij/ui/content/impl/ContentImpl.java
platform/platform-impl/src/com/intellij/ui/content/tabs/PinToolwindowTabAction.java
platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java
platform/platform-impl/src/com/intellij/ui/popup/SpeedSearchPane.java
platform/projectModel-api/src/com/intellij/ide/highlighter/ModuleFileType.java
platform/projectModel-api/src/com/intellij/ide/highlighter/ProjectFileType.java
platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/SMPoolOfTestIcons.java
platform/smRunner/src/com/intellij/execution/testframework/sm/runner/ui/TestsPresentationUtil.java
platform/smRunner/testSrc/com/intellij/execution/testframework/sm/runner/ui/TestsPresentationUtilTest.java
platform/testRunner/src/com/intellij/execution/testframework/ui/TestsProgressAnimator.java
platform/usageView/src/com/intellij/usages/impl/PreviewUsageAction.java
platform/usageView/src/com/intellij/usages/impl/SortMembersAlphabeticallyAction.java
platform/usageView/src/com/intellij/usages/impl/rules/ModuleGroupingRule.java
platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java
platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffIcons.java [deleted file]
platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/actions/DirDiffAction.java
platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/actions/EnableEqual.java
platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/actions/EnableLeft.java
platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/actions/EnableNotEqual.java
platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/actions/EnableRight.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/IncomingChangesIndicator.java
platform/vcs-impl/src/com/intellij/openapi/vcs/update/DirectoryTreeNode.java
platform/xdebugger-api/src/com/intellij/execution/executors/DefaultDebugExecutor.java
platform/xdebugger-api/src/com/intellij/xdebugger/XDebugSession.java
platform/xdebugger-api/src/com/intellij/xdebugger/breakpoints/XBreakpointType.java
platform/xdebugger-api/src/com/intellij/xdebugger/frame/XExecutionStack.java
platform/xdebugger-api/src/com/intellij/xdebugger/frame/XStackFrame.java
platform/xdebugger-api/src/com/intellij/xdebugger/frame/XValueNode.java
platform/xdebugger-api/src/com/intellij/xdebugger/ui/DebuggerIcons.java [deleted file]
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/breakpoints/XBreakpointBase.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/common/AbstractValueHintTreeComponent.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerSessionTabBase.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/tree/nodes/WatchMessageNode.java
platform/xdebugger-impl/testSrc/com/intellij/xdebugger/XDebuggerTestUtil.java
plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataHighlightingPass.java
plugins/android-designer/src/com/intellij/android/designer/inspection/ErrorAnalyzer.java
plugins/android/src/org/jetbrains/android/compiler/artifact/AndroidApplicationArtifactType.java
plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.java
plugins/android/src/org/jetbrains/android/run/testing/AndroidTestRunConfigurationType.java
plugins/ant/src/com/intellij/lang/ant/AntElementRole.java
plugins/ant/src/com/intellij/lang/ant/AntFileType.java
plugins/ant/src/com/intellij/lang/ant/AntIcons.java [deleted file]
plugins/ant/src/com/intellij/lang/ant/config/actions/RunAction.java
plugins/ant/src/com/intellij/lang/ant/config/execution/MessageTreeRenderer.java
plugins/ant/src/com/intellij/lang/ant/config/explorer/AntBuildFileNodeDescriptor.java
plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java
plugins/ant/src/com/intellij/lang/ant/config/explorer/AntTargetNodeDescriptor.java
plugins/ant/src/com/intellij/lang/ant/config/impl/AntBeforeRunTaskProvider.java
plugins/ant/src/com/intellij/lang/ant/config/impl/AntKeymapExtension.java
plugins/ant/src/com/intellij/lang/ant/config/impl/TargetChooserDialog.java
plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntUIUtil.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsListCellRenderer.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsElementFactory.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/AddedFileInfo.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/ui/FileCellRenderer.java [deleted file]
plugins/devkit/src/module/PluginModuleType.java
plugins/devkit/src/run/PluginConfigurationType.java
plugins/git4idea/src/git4idea/history/wholeTree/BasePopupAction.java
plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java
plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradleColorAndFontPreviewPanel.java
plugins/gradle/src/org/jetbrains/plugins/gradle/model/GradleEntityType.java
plugins/gradle/src/org/jetbrains/plugins/gradle/sync/conflict/GradleLibraryDependencyConflictControlFactory.java
plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleIcons.java
plugins/groovy/src/org/jetbrains/plugins/groovy/codeInsight/GroovyLineMarkerProvider.java
plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcConsole.java
plugins/junit/src/com/intellij/execution/junit/JUnit3Framework.java
plugins/junit/src/com/intellij/execution/junit/JUnit4Framework.java
plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationType.java
plugins/junit/src/com/intellij/execution/junit2/ui/TestRenderer.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchPanel.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenRepositoriesConfigurable.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java
plugins/properties/src/com/intellij/lang/properties/PropertiesFileType.java
plugins/properties/src/com/intellij/lang/properties/ResourceBundle.java
plugins/properties/src/com/intellij/lang/properties/editor/ResourceBundleFileStructureViewElement.java
plugins/properties/src/com/intellij/lang/properties/projectView/ResourceBundleNode.java
plugins/properties/src/com/intellij/lang/properties/references/PropertyReferenceBase.java
plugins/properties/src/com/intellij/openapi/options/colors/pages/PropertiesColorsPage.java
plugins/testng/src/com/theoryinpractice/testng/ui/ResultTreeRenderer.java
plugins/ui-designer/src/com/intellij/uiDesigner/quickFixes/QuickFixManager.java
plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java
plugins/ui-designer/ui-designer-new/src/com/intellij/designer/componentTree/QuickFixManager.java
plugins/ui-designer/ui-designer-new/src/com/intellij/designer/designSurface/QuickFixManager.java
plugins/ui-designer/ui-designer-new/src/com/intellij/designer/inspection/AbstractQuickFixManager.java
plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltBreakpointType.java
plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/impl/XsltBreakpointHandler.java
plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/GeneratedStructureRenderer.java
resources/src/idea/JavaActions.xml
xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementsErrorPanel.java
xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNSRenderer.java
xml/impl/src/com/intellij/ide/highlighter/DTDFileType.java
xml/impl/src/com/intellij/ide/highlighter/HtmlFileType.java
xml/impl/src/com/intellij/ide/highlighter/XHtmlFileType.java
xml/impl/src/com/intellij/ide/highlighter/XmlFileType.java
xml/impl/src/com/intellij/xml/util/XmlIconProvider.java
xml/relaxng/src/org/intellij/plugins/relaxNG/model/annotation/OverriddenDefineRenderer.java
xml/relaxng/src/org/intellij/plugins/relaxNG/model/annotation/OverridingDefineRenderer.java

index 182e81f7dd278c337e3725fd055bac5e066784b1..f5b56bf29bd639ae18b76d2a780f26d65706ef4a 100644 (file)
@@ -50,8 +50,6 @@ import com.intellij.psi.*;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
 
-import javax.swing.*;
-
 public class CompilerErrorTreeView extends NewErrorTreeViewPanel {
   public CompilerErrorTreeView(Project project, Runnable rerunAction) {
     super(project, HelpID.COMPILER, true, true, rerunAction);
@@ -81,10 +79,9 @@ public class CompilerErrorTreeView extends NewErrorTreeViewPanel {
   }
 
   private static class CompilerPropertiesAction extends AnAction {
-    private static final Icon ICON_OPTIONS = AllIcons.General.IdeOptions;
 
     public CompilerPropertiesAction() {
-      super(CompilerBundle.message("action.compiler.properties.text"), null, ICON_OPTIONS);
+      super(CompilerBundle.message("action.compiler.properties.text"), null, AllIcons.General.IdeOptions);
     }
 
     public void actionPerformed(AnActionEvent e) {
index c73a727b3801aae3c3303e0e64b84fc2f999aad6..30a0010cb25c70e61f6f2a964d2014b03824fa96 100644 (file)
@@ -29,7 +29,6 @@ import javax.swing.*;
  * @author nik
  */
 public class InvalidArtifactType extends ArtifactType {
-  public static final Icon ICON = AllIcons.FileTypes.Unknown;
 
   public static InvalidArtifactType getInstance() {
     return ServiceManager.getService(InvalidArtifactType.class);
@@ -42,7 +41,7 @@ public class InvalidArtifactType extends ArtifactType {
   @NotNull
   @Override
   public Icon getIcon() {
-    return ICON;
+    return AllIcons.FileTypes.Unknown;
   }
 
   @Override
index 678cd9cb6dd0eb71be382aea314153f21751e89e..19571e49acfec83f4c3d3f25814f1933c6f27188 100644 (file)
  */
 package com.intellij.packaging.impl.artifacts;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.packaging.artifacts.ArtifactTemplate;
 import com.intellij.packaging.artifacts.ArtifactType;
 import com.intellij.packaging.elements.CompositePackagingElement;
 import com.intellij.packaging.elements.PackagingElementOutputKind;
 import com.intellij.packaging.elements.PackagingElementResolvingContext;
 import com.intellij.packaging.impl.elements.ArchivePackagingElement;
-import com.intellij.util.PathUtil;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -43,7 +43,7 @@ public class JarArtifactType extends ArtifactType {
   @NotNull
   @Override
   public Icon getIcon() {
-    return PlainArtifactType.ARTIFACT_ICON;
+    return AllIcons.Nodes.Artifact;
   }
 
   @Override
index 77a7a47019ccce6a0aa3b1ba7e025f47f6151fd8..9337db5cb85198b80363e9bc42c8e65f94eab14f 100644 (file)
@@ -30,7 +30,6 @@ import javax.swing.*;
  * @author nik
  */
 public class PlainArtifactType extends ArtifactType {
-  public static final Icon ARTIFACT_ICON = AllIcons.Nodes.Artifact;
   @NonNls public static final String ID = "plain";
 
   public static PlainArtifactType getInstance() {
@@ -44,7 +43,7 @@ public class PlainArtifactType extends ArtifactType {
   @NotNull
   @Override
   public Icon getIcon() {
-    return ARTIFACT_ICON;
+    return AllIcons.Nodes.Artifact;
   }
 
   @Override
index 2d661ba96f490ab93a814733c0db9af72b783a57..ed599a85bba8cb3bbef9ca098dd417e5539ed7aa 100644 (file)
@@ -15,6 +15,7 @@
  */
 package com.intellij.packaging.impl.elements;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.compiler.CompilerBundle;
 import com.intellij.openapi.project.Project;
 import com.intellij.packaging.artifacts.Artifact;
@@ -23,7 +24,6 @@ import com.intellij.packaging.artifacts.ArtifactPointerManager;
 import com.intellij.packaging.elements.ComplexPackagingElementType;
 import com.intellij.packaging.elements.CompositePackagingElement;
 import com.intellij.packaging.impl.artifacts.ArtifactUtil;
-import com.intellij.packaging.impl.artifacts.PlainArtifactType;
 import com.intellij.packaging.ui.ArtifactEditorContext;
 import com.intellij.util.Processor;
 import org.jetbrains.annotations.NotNull;
@@ -43,7 +43,7 @@ public class ArtifactElementType extends ComplexPackagingElementType<ArtifactPac
 
   @Override
   public Icon getCreateElementIcon() {
-    return PlainArtifactType.ARTIFACT_ICON;
+    return AllIcons.Nodes.Artifact;
   }
 
   @Override
index b39d60f1fadf5b98aaeaf6883579abf49eb3034a..ab8298fbcd39f02d088bd4229847894fb4cbcc81 100644 (file)
 package com.intellij.packaging.impl.elements;
 
 import com.intellij.compiler.ant.Generator;
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.projectView.PresentationData;
 import com.intellij.openapi.compiler.CompilerBundle;
+import com.intellij.packaging.artifacts.ArtifactType;
 import com.intellij.packaging.elements.*;
-import com.intellij.packaging.impl.artifacts.PlainArtifactType;
-import com.intellij.packaging.ui.PackagingElementPresentation;
 import com.intellij.packaging.ui.ArtifactEditorContext;
-import com.intellij.packaging.artifacts.ArtifactType;
+import com.intellij.packaging.ui.PackagingElementPresentation;
 import com.intellij.ui.SimpleTextAttributes;
 import org.jetbrains.annotations.NotNull;
 
@@ -46,7 +46,7 @@ public class ArtifactRootElementImpl extends ArtifactRootElement<Object> {
       @Override
       public void render(@NotNull PresentationData presentationData, SimpleTextAttributes mainAttributes,
                          SimpleTextAttributes commentAttributes) {
-        presentationData.setIcons(PlainArtifactType.ARTIFACT_ICON);
+        presentationData.setIcons(AllIcons.Nodes.Artifact);
         presentationData.addText(getPresentableName(), mainAttributes);
       }
 
index 4db82e0cf7717f0ecfffeeb4edaadb4bdf38a12f..bc7258d3e48431e59d2a3b201080bdfcdec1fbb9 100644 (file)
@@ -35,7 +35,6 @@ import java.util.List;
 * @author nik
 */
 public class DirectoryCopyElementType extends PackagingElementType<DirectoryCopyPackagingElement> {
-  public static final Icon COPY_OF_FOLDER_ICON = AllIcons.Nodes.CopyOfFolder;
 
   DirectoryCopyElementType() {
     super("dir-copy", "Directory Content");
@@ -43,7 +42,7 @@ public class DirectoryCopyElementType extends PackagingElementType<DirectoryCopy
 
   @Override
   public Icon getCreateElementIcon() {
-    return COPY_OF_FOLDER_ICON;
+    return AllIcons.Nodes.CopyOfFolder;
   }
 
   @Override
index 081cda1a0e063ac42944352449cf07b8479b154e..5732fafa0f95132b065d29224cd0afb60bb2cfdc 100644 (file)
@@ -33,7 +33,6 @@ import javax.swing.*;
 * @author nik
 */
 class DirectoryElementType extends CompositePackagingElementType<DirectoryPackagingElement> {
-  private static final Icon ICON = AllIcons.Actions.NewFolder;
 
   DirectoryElementType() {
     super("directory", CompilerBundle.message("element.type.name.directory"));
@@ -41,7 +40,7 @@ class DirectoryElementType extends CompositePackagingElementType<DirectoryPackag
 
   @Override
   public Icon getCreateElementIcon() {
-    return ICON;
+    return AllIcons.Actions.NewFolder;
   }
 
   @NotNull
index 7b36993bba3ea79aee19e4bafd32a668d661802a..8f487f33a7880e365d7a02ff41273e6d8ba0aecf 100644 (file)
@@ -36,7 +36,6 @@ import java.util.List;
 * @author nik
 */
 public class ExtractedDirectoryElementType extends PackagingElementType<ExtractedDirectoryPackagingElement> {
-  public static final Icon EXTRACTED_FOLDER_ICON = AllIcons.Nodes.ExtractedFolder;
 
   ExtractedDirectoryElementType() {
     super("extracted-dir", "Extracted Directory");
@@ -44,7 +43,7 @@ public class ExtractedDirectoryElementType extends PackagingElementType<Extracte
 
   @Override
   public Icon getCreateElementIcon() {
-    return EXTRACTED_FOLDER_ICON;
+    return AllIcons.Nodes.ExtractedFolder;
   }
 
   @Override
index bfdd5766270ae1ac781962e0279d5d155dcd18fa..ee3f52af0c300f4a2a2973220fd5eb588fdf6c34 100644 (file)
@@ -34,7 +34,6 @@ import java.util.List;
 * @author nik
 */
 public class FileCopyElementType extends PackagingElementType<FileCopyPackagingElement> {
-  public static final Icon ICON = AllIcons.FileTypes.Text;
 
   FileCopyElementType() {
     super("file-copy", "File");
@@ -42,7 +41,7 @@ public class FileCopyElementType extends PackagingElementType<FileCopyPackagingE
 
   @Override
   public Icon getCreateElementIcon() {
-    return ICON;
+    return AllIcons.FileTypes.Text;
   }
 
   @Override
index b2ef063f94ae8eb72c8eba3e9e241139fabd9e94..38e093a7e54eecf338b61fc9d488ddafa264f250 100644 (file)
  */
 package com.intellij.packaging.impl.run;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.util.ElementsChooser;
 import com.intellij.packaging.artifacts.Artifact;
 import com.intellij.packaging.artifacts.ArtifactPointer;
-import com.intellij.packaging.impl.artifacts.PlainArtifactType;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -37,7 +37,7 @@ public class ArtifactChooser extends ElementsChooser<ArtifactPointer> {
   };
   private static final ElementProperties INVALID_ARTIFACT_PROPERTIES = new ElementProperties() {
     public Icon getIcon() {
-      return PlainArtifactType.ARTIFACT_ICON;
+      return AllIcons.Nodes.Artifact;
     }
 
     public Color getColor() {
index 1cd45ea468328fd81dec9b46aa678285af2c4866..679ad29d2d605951f2fb01a7d680380f2f2aed43 100644 (file)
@@ -21,6 +21,7 @@ import com.intellij.execution.RunManagerEx;
 import com.intellij.execution.configurations.RunConfiguration;\r
 import com.intellij.execution.impl.ConfigurationSettingsEditorWrapper;\r
 import com.intellij.execution.runners.ExecutionEnvironment;\r
+import com.intellij.icons.AllIcons;\r
 import com.intellij.ide.DataManager;\r
 import com.intellij.openapi.actionSystem.DataContext;\r
 import com.intellij.openapi.application.ApplicationManager;\r
@@ -35,7 +36,6 @@ import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.util.Key;\r
 import com.intellij.openapi.util.Ref;\r
 import com.intellij.packaging.artifacts.*;\r
-import com.intellij.packaging.impl.artifacts.PlainArtifactType;\r
 import com.intellij.packaging.impl.compiler.ArtifactAwareCompiler;\r
 import com.intellij.packaging.impl.compiler.ArtifactCompileScope;\r
 import com.intellij.packaging.impl.compiler.ArtifactsCompiler;\r
@@ -88,7 +88,7 @@ public class BuildArtifactsBeforeRunTaskProvider extends BeforeRunTaskProvider<B
 \r
   @Override\r
   public Icon getIcon() {\r
-    return PlainArtifactType.ARTIFACT_ICON;\r
+    return AllIcons.Nodes.Artifact;\r
   }\r
 \r
   @Override\r
index a013fea361b548322f0f6bef665927fdf0d9b40a..688cdfb393938af489c8d68154f12c683e77efbe 100644 (file)
  */
 package com.intellij.packaging.impl.ui;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.projectView.PresentationData;
 import com.intellij.packaging.artifacts.Artifact;
 import com.intellij.packaging.artifacts.ArtifactPointer;
-import com.intellij.packaging.impl.artifacts.PlainArtifactType;
 import com.intellij.packaging.ui.ArtifactEditorContext;
 import com.intellij.packaging.ui.PackagingElementWeights;
 import com.intellij.packaging.ui.TreeNodePresentation;
@@ -57,7 +57,7 @@ public class ArtifactElementPresentation extends TreeNodePresentation {
 
   public void render(@NotNull PresentationData presentationData, SimpleTextAttributes mainAttributes, SimpleTextAttributes commentAttributes) {
     final Artifact artifact = findArtifact();
-    presentationData.setIcons(artifact != null ? artifact.getArtifactType().getIcon() : PlainArtifactType.ARTIFACT_ICON);
+    presentationData.setIcons(artifact != null ? artifact.getArtifactType().getIcon() : AllIcons.Nodes.Artifact);
     presentationData.addText(getPresentableName(), artifact != null ? mainAttributes : SimpleTextAttributes.ERROR_ATTRIBUTES);
   }
 
index 874a16d7984126f275e17de1acbcf8d289ccea95..882c6dea3bd86092fdd5446e01f620f5785787fc 100644 (file)
  */
 package com.intellij.packaging.impl.ui;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.projectView.PresentationData;
 import com.intellij.openapi.compiler.CompilerBundle;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.packaging.impl.elements.DirectoryCopyElementType;
 import com.intellij.packaging.ui.PackagingElementPresentation;
 import com.intellij.packaging.ui.PackagingElementWeights;
 import com.intellij.ui.SimpleTextAttributes;
@@ -56,7 +56,7 @@ public class DirectoryCopyPresentation extends PackagingElementPresentation {
   }
 
   public void render(@NotNull PresentationData presentationData, SimpleTextAttributes mainAttributes, SimpleTextAttributes commentAttributes) {
-    presentationData.setIcons(DirectoryCopyElementType.COPY_OF_FOLDER_ICON);
+    presentationData.setIcons(AllIcons.Nodes.CopyOfFolder);
     if (myFile == null || !myFile.isDirectory()) {
       mainAttributes = SimpleTextAttributes.ERROR_ATTRIBUTES;
       final VirtualFile parentFile = LocalFileSystem.getInstance().findFileByPath(FileUtil.toSystemIndependentName(mySourcePath));
@@ -72,4 +72,4 @@ public class DirectoryCopyPresentation extends PackagingElementPresentation {
   public int getWeight() {
     return PackagingElementWeights.DIRECTORY_COPY;
   }
-}
\ No newline at end of file
+}
index 6253d8874318374d86f299ae68fd609a6dd27f38..3b138acc0a302977bf629c324e0c833122d710ab 100644 (file)
  */
 package com.intellij.packaging.impl.ui;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.projectView.PresentationData;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.packaging.impl.elements.ExtractedDirectoryElementType;
 import com.intellij.packaging.impl.elements.ExtractedDirectoryPackagingElement;
 import com.intellij.packaging.ui.PackagingElementPresentation;
 import com.intellij.packaging.ui.PackagingElementWeights;
@@ -45,7 +45,7 @@ public class ExtractedDirectoryPresentation extends PackagingElementPresentation
   }
 
   public void render(@NotNull PresentationData presentationData, SimpleTextAttributes mainAttributes, SimpleTextAttributes commentAttributes) {
-    presentationData.setIcons(ExtractedDirectoryElementType.EXTRACTED_FOLDER_ICON);
+    presentationData.setIcons(AllIcons.Nodes.ExtractedFolder);
     final String parentPath = PathUtil.getParentPath(myJarPath);
     if (myFile == null || !myFile.isDirectory()) {
       mainAttributes = SimpleTextAttributes.ERROR_ATTRIBUTES;
@@ -62,4 +62,4 @@ public class ExtractedDirectoryPresentation extends PackagingElementPresentation
   public int getWeight() {
     return PackagingElementWeights.EXTRACTED_DIRECTORY;
   }
-}
\ No newline at end of file
+}
index b5e4af50e436fd40f29d7244e17d5fbf947afeae..88c078836d59cce20a62c22e8030b96683523ae2 100644 (file)
  */
 package com.intellij.packaging.impl.ui;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.presentation.VirtualFilePresentation;
 import com.intellij.ide.projectView.PresentationData;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.packaging.impl.elements.FileCopyElementType;
 import com.intellij.packaging.ui.PackagingElementPresentation;
 import com.intellij.packaging.ui.PackagingElementWeights;
 import com.intellij.ui.SimpleTextAttributes;
@@ -68,7 +68,7 @@ public class FileCopyPresentation extends PackagingElementPresentation {
       presentationData.addText(" (" + mySourcePath + ")", commentAttributes);
     }
     else {
-      presentationData.setIcons(FileCopyElementType.ICON);
+      presentationData.setIcons(AllIcons.FileTypes.Text);
       presentationData.addText(myOutputFileName, SimpleTextAttributes.ERROR_ATTRIBUTES);
       final VirtualFile parentFile = LocalFileSystem.getInstance().findFileByPath(FileUtil.toSystemIndependentName(mySourcePath));
       presentationData.addText("(" + mySourcePath + ")",
index 2fc4c0b6caac163bdfeea67160e759c1e3775d06..52b799d76f27e83aed0bf23647dfc09e86d9502f 100644 (file)
@@ -72,9 +72,6 @@ import java.util.List;
 public class DebuggerSessionTab extends DebuggerSessionTabBase implements Disposable {
   private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.DebuggerSessionTab");
 
-  private static final Icon WATCH_RETURN_VALUES_ICON = AllIcons.Debugger.WatchLastReturnValue;
-  private static final Icon AUTO_VARS_ICONS = AllIcons.Debugger.AutoVariablesMode;
-
   private final VariablesPanel myVariablesPanel;
   private final MainWatchPanel myWatchPanel;
 
@@ -530,7 +527,7 @@ public class DebuggerSessionTab extends DebuggerSessionTabBase implements Dispos
     private static final String myDefaultModeText = "All-Variables Mode";
 
     public AutoVarsSwitchAction() {
-      super("", "", AUTO_VARS_ICONS);
+      super("", "", AllIcons.Debugger.AutoVariablesMode);
       myAutoModeEnabled = DebuggerSettings.getInstance().AUTO_VARIABLES_MODE;
     }
 
index 617ae160efa6f04ddfe67518097cbd70d22922b7..79398de4991eb1e70628b6eb7ddbf583b090124f 100644 (file)
 package com.intellij.debugger.ui.breakpoints;
 
 import com.intellij.debugger.ui.breakpoints.actions.BreakpointPanelAction;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.util.Key;
-import com.intellij.xdebugger.ui.DebuggerIcons;
 import org.jdom.Element;
 import org.jetbrains.annotations.Nullable;
 
@@ -35,11 +35,11 @@ public class AnyExceptionBreakpointFactory extends BreakpointFactory{
   }
 
   public Icon getIcon() {
-    return DebuggerIcons.ENABLED_EXCEPTION_BREAKPOINT_ICON;
+    return AllIcons.Debugger.Db_exception_breakpoint;
   }
 
   public Icon getDisabledIcon() {
-    return DebuggerIcons.DISABLED_EXCEPTION_BREAKPOINT_ICON;
+    return AllIcons.Debugger.Db_disabled_exception_breakpoint;
   }
 
   @Override
index 4556f494889a8d0c380ce017dbab4ab0d330b7dd..c6a19557f4e829fcfa62c12a5b1a9b5b5b064130 100644 (file)
@@ -29,12 +29,18 @@ import com.intellij.debugger.engine.DebuggerManagerThreadImpl;
 import com.intellij.debugger.engine.SuspendContextImpl;
 import com.intellij.debugger.engine.evaluation.EvaluateException;
 import com.intellij.debugger.impl.DebuggerUtilsEx;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.*;
-import com.intellij.psi.*;
+import com.intellij.openapi.util.Computable;
+import com.intellij.openapi.util.InvalidDataException;
+import com.intellij.openapi.util.Key;
+import com.intellij.openapi.util.WriteExternalException;
+import com.intellij.psi.JavaPsiFacade;
+import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiDocumentManager;
+import com.intellij.psi.PsiElement;
 import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.xdebugger.ui.DebuggerIcons;
 import com.sun.jdi.AbsentInformationException;
 import com.sun.jdi.Location;
 import com.sun.jdi.ObjectReference;
@@ -108,9 +114,9 @@ public class ExceptionBreakpoint extends Breakpoint {
   public Icon getIcon() {
     if (!ENABLED) {
       final Breakpoint master = DebuggerManagerEx.getInstanceEx(myProject).getBreakpointManager().findMasterBreakpoint(this);
-      return master == null? DebuggerIcons.DISABLED_EXCEPTION_BREAKPOINT_ICON : DebuggerIcons.DISABLED_DEPENDENT_EXCEPTION_BREAKPOINT_ICON;
+      return master == null? AllIcons.Debugger.Db_disabled_exception_breakpoint : AllIcons.Debugger.Db_dep_exception_breakpoint;
     }
-    return DebuggerIcons.ENABLED_EXCEPTION_BREAKPOINT_ICON;
+    return AllIcons.Debugger.Db_exception_breakpoint;
   }
 
   public void reload() {
@@ -241,4 +247,4 @@ public class ExceptionBreakpoint extends Breakpoint {
     myPackageName = packageName != null? packageName : calcPackageName(packageName);
   }
 
-}
\ No newline at end of file
+}
index 255d3cbef5f1569ac60701235f6a9a094ef1c28f..f1742f00ad89efbb24a719aef3e9bc2537cba62e 100644 (file)
@@ -20,6 +20,7 @@ import com.intellij.debugger.DebuggerManagerEx;
 import com.intellij.debugger.HelpID;
 import com.intellij.debugger.engine.JVMNameUtil;
 import com.intellij.debugger.ui.breakpoints.actions.*;
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.util.TreeClassChooser;
 import com.intellij.ide.util.TreeClassChooserFactory;
 import com.intellij.openapi.project.Project;
@@ -29,11 +30,9 @@ import com.intellij.psi.JavaPsiFacade;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiClassOwner;
 import com.intellij.psi.search.GlobalSearchScope;
-import com.intellij.xdebugger.ui.DebuggerIcons;
 import org.jdom.Element;
 
 import javax.swing.*;
-import java.awt.event.ActionEvent;
 
 /**
  * @author Eugene Zhuravlev
@@ -45,11 +44,11 @@ public class ExceptionBreakpointFactory extends BreakpointFactory {
   }
 
   public Icon getIcon() {
-    return DebuggerIcons.ENABLED_EXCEPTION_BREAKPOINT_ICON;
+    return AllIcons.Debugger.Db_exception_breakpoint;
   }
 
   public Icon getDisabledIcon() {
-    return DebuggerIcons.DISABLED_EXCEPTION_BREAKPOINT_ICON;
+    return AllIcons.Debugger.Db_disabled_exception_breakpoint;
   }
 
   @Override
index 3ea7c83fc72dd58fa6ac2c47345f90bafc7cdc9d..365ae242b36de200c5f716d9fdfcfd53ae00dd26 100644 (file)
@@ -66,18 +66,6 @@ public class FieldBreakpoint extends BreakpointWithHighlighter {
   private boolean myIsStatic;
   private String myFieldName;
 
-  public static Icon ICON = AllIcons.Debugger.Db_field_breakpoint;
-  public static Icon MUTED_ICON = AllIcons.Debugger.Db_muted_field_breakpoint;
-  public static Icon DISABLED_ICON = AllIcons.Debugger.Db_disabled_field_breakpoint;
-  public static Icon DISABLED_DEP_ICON = AllIcons.Debugger.Db_dep_field_breakpoint;
-  public static Icon MUTED_DISABLED_ICON = AllIcons.Debugger.Db_muted_disabled_field_breakpoint;
-  public static Icon MUTED_DISABLED_DEP_ICON = AllIcons.Debugger.Db_muted_dep_field_breakpoint;
-  private static final Icon ourInvalidIcon = AllIcons.Debugger.Db_invalid_field_breakpoint;
-  private static final Icon ourMutedInvalidIcon = AllIcons.Debugger.Db_muted_invalid_field_breakpoint;
-  private static final Icon ourVerifiedIcon = AllIcons.Debugger.Db_verified_field_breakpoint;
-  private static final Icon ourMutedVerifiedIcon = AllIcons.Debugger.Db_muted_verified_field_breakpoint;
-  private static final Icon ourVerifiedWarningIcon = AllIcons.Debugger.Db_field_warning_breakpoint;
-  private static final Icon ourMutedVerifiedWarningIcon = AllIcons.Debugger.Db_muted_field_warning_breakpoint;
   @NonNls public static final Key<FieldBreakpoint> CATEGORY = BreakpointCategory.lookup("field_breakpoints");
 
   protected FieldBreakpoint(Project project) {
@@ -102,31 +90,31 @@ public class FieldBreakpoint extends BreakpointWithHighlighter {
   protected Icon getDisabledIcon(boolean isMuted) {
     final Breakpoint master = DebuggerManagerEx.getInstanceEx(myProject).getBreakpointManager().findMasterBreakpoint(this);
     if (isMuted) {
-      return master == null? MUTED_DISABLED_ICON : MUTED_DISABLED_DEP_ICON;
+      return master == null? AllIcons.Debugger.Db_muted_disabled_field_breakpoint : AllIcons.Debugger.Db_muted_dep_field_breakpoint;
     }
     else {
-      return master == null? DISABLED_ICON : DISABLED_DEP_ICON;
+      return master == null? AllIcons.Debugger.Db_disabled_field_breakpoint : AllIcons.Debugger.Db_dep_field_breakpoint;
     }
   }
 
   @Override
   protected Icon getSetIcon(boolean isMuted) {
-    return isMuted? MUTED_ICON : ICON;
+    return isMuted? AllIcons.Debugger.Db_muted_field_breakpoint : AllIcons.Debugger.Db_field_breakpoint;
   }
 
   @Override
   protected Icon getInvalidIcon(boolean isMuted) {
-    return isMuted? ourMutedInvalidIcon : ourInvalidIcon;
+    return isMuted? AllIcons.Debugger.Db_muted_invalid_field_breakpoint : AllIcons.Debugger.Db_invalid_field_breakpoint;
   }
 
   @Override
   protected Icon getVerifiedIcon(boolean isMuted) {
-    return isMuted? ourMutedVerifiedIcon : ourVerifiedIcon;
+    return isMuted? AllIcons.Debugger.Db_muted_verified_field_breakpoint : AllIcons.Debugger.Db_verified_field_breakpoint;
   }
 
   @Override
   protected Icon getVerifiedWarningsIcon(boolean isMuted) {
-    return isMuted? ourMutedVerifiedWarningIcon : ourVerifiedWarningIcon;
+    return isMuted? AllIcons.Debugger.Db_muted_field_warning_breakpoint : AllIcons.Debugger.Db_field_warning_breakpoint;
   }
 
   @Override
index 738097173c613f6eec3647a5cd87cb5390a775b3..496e0131362159cae65a02f9c976e41732f19f6a 100644 (file)
@@ -20,6 +20,7 @@ import com.intellij.debugger.DebuggerBundle;
 import com.intellij.debugger.DebuggerManagerEx;
 import com.intellij.debugger.HelpID;
 import com.intellij.debugger.ui.breakpoints.actions.*;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
@@ -43,11 +44,11 @@ public class FieldBreakpointFactory extends BreakpointFactory{
   }
 
   public Icon getIcon() {
-    return FieldBreakpoint.ICON;
+    return AllIcons.Debugger.Db_field_breakpoint;
   }
 
   public Icon getDisabledIcon() {
-    return FieldBreakpoint.DISABLED_ICON;
+    return AllIcons.Debugger.Db_disabled_field_breakpoint;
   }
 
   @Override
index 9d0afabb4966e8fd7a099b1e17742bdb20ee80de..de3b91837017228886751baa26af55045784184c 100644 (file)
@@ -51,7 +51,6 @@ import com.intellij.ui.classFilter.ClassFilter;
 import com.intellij.util.Processor;
 import com.intellij.util.StringBuilderSpinAllocator;
 import com.intellij.xdebugger.XDebuggerUtil;
-import com.intellij.xdebugger.ui.DebuggerIcons;
 import com.sun.jdi.*;
 import com.sun.jdi.event.LocatableEvent;
 import com.sun.jdi.request.BreakpointRequest;
@@ -66,13 +65,6 @@ import java.util.List;
 public class LineBreakpoint extends BreakpointWithHighlighter {
   private static final Logger LOG = Logger.getInstance("#com.intellij.debugger.ui.breakpoints.LineBreakpoint");
 
-  // icons
-  public static Icon ICON = DebuggerIcons.ENABLED_BREAKPOINT_ICON;
-  public static final Icon MUTED_ICON = DebuggerIcons.MUTED_BREAKPOINT_ICON;
-  public static final Icon DISABLED_ICON = DebuggerIcons.DISABLED_BREAKPOINT_ICON;
-  public static final Icon MUTED_DISABLED_ICON = DebuggerIcons.MUTED_DISABLED_BREAKPOINT_ICON;
-  private static final Icon ourMutedVerifiedWarningsIcon = AllIcons.Debugger.Db_muted_verified_warning_breakpoint;
-
   private String myMethodName;
   public static final @NonNls Key<LineBreakpoint> CATEGORY = BreakpointCategory.lookup("line_breakpoints");
 
@@ -87,27 +79,27 @@ public class LineBreakpoint extends BreakpointWithHighlighter {
   protected Icon getDisabledIcon(boolean isMuted) {
     final Breakpoint master = DebuggerManagerEx.getInstanceEx(myProject).getBreakpointManager().findMasterBreakpoint(this);
     if (isMuted) {
-      return master == null? MUTED_DISABLED_ICON : DebuggerIcons.MUTED_DISABLED_DEPENDENT_BREAKPOINT_ICON;
+      return master == null? AllIcons.Debugger.Db_muted_disabled_breakpoint : AllIcons.Debugger.Db_muted_dep_line_breakpoint;
     }
     else {
-      return master == null? DISABLED_ICON : DebuggerIcons.DISABLED_DEPENDENT_BREAKPOINT_ICON;
+      return master == null? AllIcons.Debugger.Db_disabled_breakpoint : AllIcons.Debugger.Db_dep_line_breakpoint;
     }
   }
 
   protected Icon getSetIcon(boolean isMuted) {
-    return isMuted? MUTED_ICON : ICON;
+    return isMuted? AllIcons.Debugger.Db_muted_breakpoint : AllIcons.Debugger.Db_set_breakpoint;
   }
 
   protected Icon getInvalidIcon(boolean isMuted) {
-    return isMuted? DebuggerIcons.MUTED_INVALID_BREAKPOINT_ICON : DebuggerIcons.INVALID_BREAKPOINT_ICON;
+    return isMuted? AllIcons.Debugger.Db_muted_invalid_breakpoint : AllIcons.Debugger.Db_invalid_breakpoint;
   }
 
   protected Icon getVerifiedIcon(boolean isMuted) {
-    return isMuted? DebuggerIcons.MUTED_VERIFIED_BREAKPOINT_ICON : DebuggerIcons.VERIFIED_BREAKPOINT_ICON;
+    return isMuted? AllIcons.Debugger.Db_muted_verified_breakpoint : AllIcons.Debugger.Db_verified_breakpoint;
   }
 
   protected Icon getVerifiedWarningsIcon(boolean isMuted) {
-    return isMuted? ourMutedVerifiedWarningsIcon : DebuggerIcons.VERIFIED_WARNING_BREAKPOINT_ICON;
+    return isMuted? AllIcons.Debugger.Db_muted_verified_warning_breakpoint : AllIcons.Debugger.Db_verified_warning_breakpoint;
   }
 
   public Key<LineBreakpoint> getCategory() {
index f3c25029af42745acd6c93c4d697ebe2626eb396..dede7de736de49dc5ef078db712ef6517b3fe595 100644 (file)
@@ -18,6 +18,7 @@ package com.intellij.debugger.ui.breakpoints;
 import com.intellij.debugger.DebuggerBundle;
 import com.intellij.debugger.HelpID;
 import com.intellij.debugger.ui.breakpoints.actions.*;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.util.Key;
@@ -36,11 +37,11 @@ public class LineBreakpointFactory extends BreakpointFactory {
   }
 
   public Icon getIcon() {
-    return LineBreakpoint.ICON;
+    return AllIcons.Debugger.Db_set_breakpoint;
   }
 
   public Icon getDisabledIcon() {
-    return LineBreakpoint.DISABLED_ICON;
+    return AllIcons.Debugger.Db_disabled_breakpoint;
   }
 
   @Override
index d294620ad451cbdf3060e81542d4f1f6207928f9..4cc4eb0ee3c9b4e15fdc6f310eb031c57f50493c 100644 (file)
@@ -69,18 +69,6 @@ public class MethodBreakpoint extends BreakpointWithHighlighter {
   @Nullable private JVMName mySignature;
   private boolean myIsStatic;
 
-  @NotNull public static Icon ICON = AllIcons.Debugger.Db_method_breakpoint;
-  @NotNull public static Icon MUTED_ICON = AllIcons.Debugger.Db_muted_method_breakpoint;
-  @NotNull public static Icon DISABLED_ICON = AllIcons.Debugger.Db_disabled_method_breakpoint;
-  @NotNull public static Icon DISABLED_DEP_ICON = AllIcons.Debugger.Db_dep_method_breakpoint;
-  @NotNull public static Icon MUTED_DISABLED_ICON = AllIcons.Debugger.Db_muted_disabled_method_breakpoint;
-  @NotNull public static Icon MUTED_DISABLED_DEP_ICON = AllIcons.Debugger.Db_muted_dep_method_breakpoint;
-  private static final Icon ourInvalidIcon = AllIcons.Debugger.Db_invalid_method_breakpoint;
-  private static final Icon ourMutedInvalidIcon = AllIcons.Debugger.Db_muted_invalid_method_breakpoint;
-  private static final Icon ourVerifiedIcon = AllIcons.Debugger.Db_verified_method_breakpoint;
-  private static final Icon ourMutedVerifiedIcon = AllIcons.Debugger.Db_muted_verified_method_breakpoint;
-  private static final Icon ourVerifiedWarningIcon = AllIcons.Debugger.Db_method_warning_breakpoint;
-  private static final Icon ourMutedVerifiedWarningIcon = AllIcons.Debugger.Db_muted_method_warning_breakpoint;
   public static final @NonNls Key<MethodBreakpoint> CATEGORY = BreakpointCategory.lookup("method_breakpoints");
 
   protected MethodBreakpoint(@NotNull Project project) {
@@ -230,31 +218,31 @@ public class MethodBreakpoint extends BreakpointWithHighlighter {
   protected Icon getDisabledIcon(boolean isMuted) {
     final Breakpoint master = DebuggerManagerEx.getInstanceEx(myProject).getBreakpointManager().findMasterBreakpoint(this);
     if (isMuted) {
-      return master == null? MUTED_DISABLED_ICON : MUTED_DISABLED_DEP_ICON;
+      return master == null? AllIcons.Debugger.Db_muted_disabled_method_breakpoint : AllIcons.Debugger.Db_muted_dep_method_breakpoint;
     }
     else {
-      return master == null? DISABLED_ICON : DISABLED_DEP_ICON;
+      return master == null? AllIcons.Debugger.Db_disabled_method_breakpoint : AllIcons.Debugger.Db_dep_method_breakpoint;
     }
   }
 
   @NotNull
   protected Icon getSetIcon(boolean isMuted) {
-    return isMuted? MUTED_ICON : ICON;
+    return isMuted? AllIcons.Debugger.Db_muted_method_breakpoint : AllIcons.Debugger.Db_method_breakpoint;
   }
 
   @NotNull
   protected Icon getInvalidIcon(boolean isMuted) {
-    return isMuted? ourMutedInvalidIcon : ourInvalidIcon;
+    return isMuted? AllIcons.Debugger.Db_muted_invalid_method_breakpoint : AllIcons.Debugger.Db_invalid_method_breakpoint;
   }
 
   @NotNull
   protected Icon getVerifiedIcon(boolean isMuted) {
-    return isMuted? ourMutedVerifiedIcon : ourVerifiedIcon;
+    return isMuted? AllIcons.Debugger.Db_muted_verified_method_breakpoint : AllIcons.Debugger.Db_verified_method_breakpoint;
   }
 
   @NotNull
   protected Icon getVerifiedWarningsIcon(boolean isMuted) {
-    return isMuted? ourMutedVerifiedWarningIcon : ourVerifiedWarningIcon;
+    return isMuted? AllIcons.Debugger.Db_muted_method_warning_breakpoint : AllIcons.Debugger.Db_method_warning_breakpoint;
   }
 
   public String getDisplayName() {
index 9dd7c725a1b795a970d82eb27e779e899dc7b9b0..c2ad3dc3f1bece0fc38cfbc3ef05a0fe3f900887 100644 (file)
@@ -19,6 +19,7 @@ import com.intellij.debugger.DebuggerBundle;
 import com.intellij.debugger.DebuggerManagerEx;
 import com.intellij.debugger.HelpID;
 import com.intellij.debugger.ui.breakpoints.actions.*;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.util.Key;
@@ -37,11 +38,11 @@ public class MethodBreakpointFactory extends BreakpointFactory{
   }
 
   public Icon getIcon() {
-    return MethodBreakpoint.ICON;
+    return AllIcons.Debugger.Db_method_breakpoint;
   }
 
   public Icon getDisabledIcon() {
-    return MethodBreakpoint.DISABLED_ICON;
+    return AllIcons.Debugger.Db_disabled_method_breakpoint;
   }
 
   @Override
index 6f814ed69d0ca70880bfcb14fdb454b374a50514..f6c0dc3c3ab28efdc5f2a7e6251196f0fa07e11e 100644 (file)
@@ -23,6 +23,7 @@ import com.intellij.debugger.engine.DebuggerManagerThreadImpl;
 import com.intellij.debugger.engine.evaluation.EvaluateException;
 import com.intellij.debugger.engine.evaluation.EvaluationContextImpl;
 import com.intellij.debugger.engine.requests.RequestManagerImpl;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.InvalidDataException;
@@ -57,9 +58,6 @@ public class WildcardMethodBreakpoint extends Breakpoint {
   private String myClassPattern;
   private String myMethodName;
 
-  public static Icon ICON = MethodBreakpoint.ICON;
-  public static Icon DISABLED_ICON = MethodBreakpoint.DISABLED_ICON;
-  public static Icon DISABLED_DEP_ICON = MethodBreakpoint.DISABLED_DEP_ICON;
   public static final String JDOM_LABEL = "wildcard_breakpoint";
 
   public WildcardMethodBreakpoint(Project project) {
@@ -112,9 +110,9 @@ public class WildcardMethodBreakpoint extends Breakpoint {
   public Icon getIcon() {
     if (!ENABLED) {
       final Breakpoint master = DebuggerManagerEx.getInstanceEx(myProject).getBreakpointManager().findMasterBreakpoint(this);
-      return master == null? DISABLED_ICON : DISABLED_DEP_ICON;
+      return master == null? AllIcons.Debugger.Db_disabled_method_breakpoint : AllIcons.Debugger.Db_dep_method_breakpoint;
     }
-    return ICON;
+    return AllIcons.Debugger.Db_method_breakpoint;
   }
 
   public void reload() {
index 8f9a2f0059dc542852514ed4281179d1057418cd..0241205503e592cb8e6ad38d7248c3671305707c 100644 (file)
@@ -32,18 +32,12 @@ import com.intellij.ui.SimpleTextAttributes;
 import com.intellij.util.PlatformIcons;
 import com.intellij.xdebugger.impl.ui.XDebuggerUIConstants;
 import com.intellij.xdebugger.impl.ui.tree.ValueMarkup;
-import com.intellij.xdebugger.ui.DebuggerIcons;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
 import java.awt.*;
 
 public class DebuggerTreeRenderer extends ColoredTreeCellRenderer {
-  private static final Icon myThreadGroupIcon = AllIcons.Debugger.ThreadGroup;
-  private static final Icon myCurrentThreadGroupIcon = AllIcons.Debugger.ThreadGroupCurrent;
-  private static final Icon myStaticFieldIcon = PlatformIcons.FIELD_ICON;
-
-  private static final Icon myStaticIcon = AllIcons.Nodes.Static;
 
   private static final SimpleTextAttributes DEFAULT_ATTRIBUTES = new SimpleTextAttributes(Font.PLAIN, null);
   private static final SimpleTextAttributes SPECIAL_NODE_ATTRIBUTES = new SimpleTextAttributes(Font.PLAIN, Color.lightGray);
@@ -65,7 +59,7 @@ public class DebuggerTreeRenderer extends ColoredTreeCellRenderer {
   public static Icon getDescriptorIcon(NodeDescriptorImpl descriptor) {
     Icon nodeIcon = null;
     if (descriptor instanceof ThreadGroupDescriptorImpl) {
-      nodeIcon = (((ThreadGroupDescriptorImpl)descriptor).isCurrent() ? myCurrentThreadGroupIcon : myThreadGroupIcon);
+      nodeIcon = (((ThreadGroupDescriptorImpl)descriptor).isCurrent() ? AllIcons.Debugger.ThreadGroupCurrent : AllIcons.Debugger.ThreadGroup);
     }
     else if (descriptor instanceof ThreadDescriptorImpl) {
       ThreadDescriptorImpl threadDescriptor = (ThreadDescriptorImpl)descriptor;
@@ -78,20 +72,20 @@ public class DebuggerTreeRenderer extends ColoredTreeCellRenderer {
     else if (descriptor instanceof ValueDescriptorImpl) {
       final ValueDescriptorImpl valueDescriptor = (ValueDescriptorImpl)descriptor;
       if (valueDescriptor instanceof FieldDescriptorImpl && ((FieldDescriptorImpl)valueDescriptor).isStatic()) {
-        nodeIcon = myStaticFieldIcon;
+        nodeIcon = PlatformIcons.FIELD_ICON;
       }
       else if (valueDescriptor.isArray()) {
-        nodeIcon = DebuggerIcons.ARRAY_VALUE_ICON;
+        nodeIcon = AllIcons.Debugger.Db_array;
       }
       else if (valueDescriptor.isPrimitive()) {
-        nodeIcon = DebuggerIcons.PRIMITIVE_VALUE_ICON;
+        nodeIcon = AllIcons.Debugger.Db_primitive;
       }
       else {
         if (valueDescriptor instanceof WatchItemDescriptor) {
-          nodeIcon = DebuggerIcons.WATCHED_VALUE_ICON;
+          nodeIcon = AllIcons.Debugger.Watch;
         }
         else {
-          nodeIcon = DebuggerIcons.VALUE_ICON;
+          nodeIcon = AllIcons.Debugger.Value;
         }
       }
       final Icon valueIcon = valueDescriptor.getValueIcon();
@@ -115,7 +109,7 @@ public class DebuggerTreeRenderer extends ColoredTreeCellRenderer {
       }
     }
     else if (descriptor instanceof StaticDescriptorImpl) {
-      nodeIcon = myStaticIcon;
+      nodeIcon = AllIcons.Nodes.Static;
     }
 
     return nodeIcon;
index 6176f938aabb2267bf89d5867369ce7797656389..41a5384ae19b68539ba652a8befd5b489d4d645d 100644 (file)
@@ -35,7 +35,6 @@ import com.intellij.psi.PsiFile;
 import com.intellij.ui.FileColorManager;
 import com.intellij.util.StringBuilderSpinAllocator;
 import com.intellij.xdebugger.impl.ui.tree.ValueMarkup;
-import com.intellij.xdebugger.ui.DebuggerIcons;
 import com.sun.jdi.*;
 import org.jetbrains.annotations.Nullable;
 
@@ -57,8 +56,7 @@ public class StackFrameDescriptorImpl extends NodeDescriptorImpl implements Stac
   private ObjectReference myThisObject;
   private Color myBackgroundColor;
 
-  private static final Icon myObsoleteFrameIcon = AllIcons.Debugger.Db_obsolete;
-  private Icon myIcon = DebuggerIcons.STACK_FRAME_ICON;
+  private Icon myIcon = AllIcons.Debugger.StackFrame;
 
   public StackFrameDescriptorImpl(StackFrameProxyImpl frame, final MethodsTracker tracker) {
     myFrame = frame;
@@ -245,12 +243,12 @@ public class StackFrameDescriptorImpl extends NodeDescriptorImpl implements Stac
   private Icon calcIcon() {
     try {
       if(myFrame.isObsolete()) {
-        return myObsoleteFrameIcon;
+        return AllIcons.Debugger.Db_obsolete;
       }
     }
     catch (EvaluateException e) {
     }
-    return DebuggerIcons.STACK_FRAME_ICON;
+    return AllIcons.Debugger.StackFrame;
   }
 
   public Icon getIcon() {
index 1279a75a08dd4b13ff6684a68701bf00866b8434..dd505620ea56a645c7263b37e1cd3fab1859cdce 100644 (file)
@@ -28,7 +28,6 @@ import com.intellij.debugger.jdi.ThreadReferenceProxyImpl;
 import com.intellij.debugger.ui.tree.ThreadDescriptor;
 import com.intellij.debugger.ui.tree.render.DescriptorLabelListener;
 import com.intellij.icons.AllIcons;
-import com.intellij.xdebugger.ui.DebuggerIcons;
 import com.sun.jdi.ObjectCollectedException;
 import com.sun.jdi.ThreadReference;
 
@@ -45,11 +44,6 @@ public class ThreadDescriptorImpl extends NodeDescriptorImpl implements ThreadDe
   private boolean            myIsAtBreakpoint;
   private SuspendContextImpl mySuspendContext;
 
-  private static final Icon myRunningThreadIcon = AllIcons.Debugger.ThreadRunning;
-  private static final Icon myCurrentThreadIcon = AllIcons.Debugger.ThreadCurrent;
-  private static final Icon myThreadAtBreakpointIcon = AllIcons.Debugger.ThreadAtBreakpoint;
-  private static final Icon myFrozenThreadIcon = AllIcons.Debugger.ThreadFrozen;
-
   public ThreadDescriptorImpl(ThreadReferenceProxyImpl thread) {
     myThread = thread;
   }
@@ -157,17 +151,17 @@ public class ThreadDescriptorImpl extends NodeDescriptorImpl implements ThreadDe
 
   public Icon getIcon() {
     if(isCurrent()) {
-      return myCurrentThreadIcon;
+      return AllIcons.Debugger.ThreadCurrent;
     }
     if(isFrozen()) {
-      return myFrozenThreadIcon;
+      return AllIcons.Debugger.ThreadFrozen;
     }
     if(isAtBreakpoint()) {
-      return myThreadAtBreakpointIcon;
+      return AllIcons.Debugger.ThreadAtBreakpoint;
     }
     if(isSuspended()) {
-      return DebuggerIcons.SUSPENDED_THREAD_ICON;
+      return AllIcons.Debugger.ThreadSuspended;
     }
-    return myRunningThreadIcon;
+    return AllIcons.Debugger.ThreadRunning;
   }
 }
index 3784fdd4f7194e0c2c74f5c69b289a52a1fe3890..ddbc3709a11f3afc19625fd14654747f9161ba01 100644 (file)
@@ -52,8 +52,6 @@ public class CompileStepBeforeRun extends BeforeRunTaskProvider<CompileStepBefor
 \r
   @NonNls protected static final String MAKE_PROJECT_ON_RUN_KEY = "makeProjectOnRun";\r
 \r
-  private static final Icon ICON = AllIcons.Actions.Compile;\r
-\r
   private final Project myProject;\r
 \r
   public CompileStepBeforeRun(@NotNull final Project project) {\r
@@ -76,12 +74,12 @@ public class CompileStepBeforeRun extends BeforeRunTaskProvider<CompileStepBefor
 \r
   @Override\r
   public Icon getIcon() {\r
-    return ICON;\r
+    return AllIcons.Actions.Compile;\r
   }\r
 \r
   @Override\r
   public Icon getTaskIcon(MakeBeforeRunTask task) {\r
-    return ICON;\r
+    return AllIcons.Actions.Compile;\r
   }\r
 \r
   public MakeBeforeRunTask createTask(RunConfiguration runConfiguration) {\r
index d6a50af6aa3287d282546be7e4ce1b2fee7de97d..16431f362e7e30d7b81eef12e2312a3377574160 100644 (file)
@@ -31,7 +31,6 @@ import javax.swing.*;
 
 public class AppletConfigurationType implements ConfigurationType {
   private final ConfigurationFactory myFactory;
-  private static final Icon ICON = AllIcons.RunConfigurations.Applet;
 
   /**reflection*/
   AppletConfigurationType() {
@@ -56,7 +55,7 @@ public class AppletConfigurationType implements ConfigurationType {
   }
 
   public Icon getIcon() {
-    return ICON;
+    return AllIcons.RunConfigurations.Applet;
   }
 
   public ConfigurationFactory[] getConfigurationFactories() {
index 19afcf50e2bdfef6b2371b1fceb7906512eb6e23..0fe02e04d5292456b92d090e66cb74e86f7b26fc 100644 (file)
@@ -37,7 +37,6 @@ import javax.swing.*;
 
 public class ApplicationConfigurationType implements ConfigurationType {
   private final ConfigurationFactory myFactory;
-  private static final Icon ICON = AllIcons.RunConfigurations.Application;
 
 
   /**reflection*/
@@ -63,7 +62,7 @@ public class ApplicationConfigurationType implements ConfigurationType {
   }
 
   public Icon getIcon() {
-    return ICON;
+    return AllIcons.RunConfigurations.Application;
   }
 
   public ConfigurationFactory[] getConfigurationFactories() {
index 70b551a0cbe4b07fb3b587844d0e485689647ea2..4e366606700f73d5bf8e437baa261233b0c30f1a 100644 (file)
@@ -35,7 +35,6 @@ import javax.swing.*;
 
 public class RemoteConfigurationType implements ConfigurationType {
   private final ConfigurationFactory myFactory;
-  private static final Icon ICON = AllIcons.RunConfigurations.Remote;
 
   /**reflection*/
   public RemoteConfigurationType() {
@@ -56,7 +55,7 @@ public class RemoteConfigurationType implements ConfigurationType {
   }
 
   public Icon getIcon() {
-    return ICON;
+    return AllIcons.RunConfigurations.Remote;
   }
 
   public ConfigurationFactory[] getConfigurationFactories() {
index 61eb70dc9232b5bb526ebbc76beeaf85809e3597..389e9a2b8f72ffe6e21ecb263e478cf583efa148 100644 (file)
@@ -52,11 +52,7 @@ import java.util.List;
  *         Date: Jul 16, 2007
  */
 abstract class ProjectLayoutPanel<T> extends JPanel {
-  private static final Icon ICON_MODULE = AllIcons.Nodes.ModuleClosed;
-  private static final Icon RENAME_ICON = IconUtil.getEditIcon();
-  private static final Icon MERGE_ICON = AllIcons.Modules.Merge;
-  private static final Icon SPLIT_ICON = AllIcons.Modules.Split;
-  
+
   private final ElementsChooser<T> myEntriesChooser;
   private final JList myDependenciesList;
   private final ModuleInsight myInsight;
@@ -333,7 +329,7 @@ abstract class ProjectLayoutPanel<T> extends JPanel {
 
   private class MergeAction extends AnAction {
     private MergeAction() {
-      super("Merge", "", MERGE_ICON); // todo
+      super("Merge", "", AllIcons.Modules.Merge); // todo
     }
 
     public void actionPerformed(final AnActionEvent e) {
@@ -378,7 +374,7 @@ abstract class ProjectLayoutPanel<T> extends JPanel {
 
   private class SplitAction extends AnAction {
     private SplitAction() {
-      super("Split", "", SPLIT_ICON); // todo
+      super("Split", "", AllIcons.Modules.Split); // todo
     }
 
     public void actionPerformed(final AnActionEvent e) {
@@ -415,7 +411,7 @@ abstract class ProjectLayoutPanel<T> extends JPanel {
 
   private class RenameAction extends AnAction {
     private RenameAction() {
-      super("Rename", "", RENAME_ICON); // todo
+      super("Rename", "", IconUtil.getEditIcon()); // todo
     }
 
     public void actionPerformed(final AnActionEvent e) {
index 521414f5cce3a7e2068810e13bca86130639ecc2..cac74a5c766a43cc8149ca52ed66d153de5f1539 100644 (file)
@@ -56,12 +56,6 @@ public class ConfigurationErrorsComponent extends JPanel implements Disposable,
   private static final boolean ONE_LINE = true;
   private static final boolean MULTI_LINE = false;
 
-  private static final Icon EXPAND = AllIcons.Actions.Expandall;
-  private static final Icon COLLAPSE = AllIcons.Actions.Collapseall;
-  private static final Icon FIX = AllIcons.Actions.QuickfixBulb;
-  private static final Icon IGNORE = AllIcons.Actions.Cancel;
-  private static final Icon NAVIGATE = AllIcons.General.AutoscrollToSource;
-
   @NonNls private static final String FIX_ACTION_NAME = "FIX";
   @NonNls private static final String NAVIGATE_ACTION_NAME = "NAVIGATE";
 
@@ -288,7 +282,7 @@ public class ConfigurationErrorsComponent extends JPanel implements Disposable,
       final JPanel result = new JPanel();
       result.setBorder(BorderFactory.createEmptyBorder(5, 0, 0, 0));
       result.setLayout(new BorderLayout());
-      result.add(new ToolbarAlikeButton(COLLAPSE) {
+      result.add(new ToolbarAlikeButton(AllIcons.Actions.Collapseall) {
         {
           setToolTipText("Collapse");
         }
@@ -412,14 +406,14 @@ public class ConfigurationErrorsComponent extends JPanel implements Disposable,
       myFixGroup.setOpaque(false);
       myFixGroup.setLayout(new BoxLayout(myFixGroup, BoxLayout.Y_AXIS));
 
-      myFixGroup.add(new ToolbarAlikeButton(FIX, FIX_ACTION_NAME) {});
+      myFixGroup.add(new ToolbarAlikeButton(AllIcons.Actions.QuickfixBulb, FIX_ACTION_NAME) {});
       myFixGroup.add(Box.createHorizontalStrut(3));
       buttons.add(myFixGroup);
 
-      buttons.add(new ToolbarAlikeButton(NAVIGATE, NAVIGATE_ACTION_NAME) {});
+      buttons.add(new ToolbarAlikeButton(AllIcons.General.AutoscrollToSource, NAVIGATE_ACTION_NAME) {});
       buttons.add(Box.createHorizontalStrut(3));
 
-      buttons.add(new ToolbarAlikeButton(IGNORE, "IGNORE") {});
+      buttons.add(new ToolbarAlikeButton(AllIcons.Actions.Cancel, "IGNORE") {});
 
       myFakeTextPane = new JTextPane();
       myText.setBorder(BorderFactory.createEmptyBorder(3, 3, 3, 3));
@@ -599,7 +593,7 @@ public class ConfigurationErrorsComponent extends JPanel implements Disposable,
       buttonsPanel.setLayout(new BoxLayout(buttonsPanel, BoxLayout.X_AXIS));
 
       if (configurationError.canBeFixed()) {
-        buttonsPanel.add(new ToolbarAlikeButton(FIX) {
+        buttonsPanel.add(new ToolbarAlikeButton(AllIcons.Actions.QuickfixBulb) {
           {
             setToolTipText("Fix error");
           }
@@ -622,7 +616,7 @@ public class ConfigurationErrorsComponent extends JPanel implements Disposable,
         buttonsPanel.add(Box.createHorizontalStrut(3));
       }
 
-      buttonsPanel.add(new ToolbarAlikeButton(NAVIGATE) {
+      buttonsPanel.add(new ToolbarAlikeButton(AllIcons.General.AutoscrollToSource) {
         {
           setToolTipText("Navigate to error");
         }
@@ -638,7 +632,7 @@ public class ConfigurationErrorsComponent extends JPanel implements Disposable,
 
       buttonsPanel.add(Box.createHorizontalStrut(3));
 
-      buttonsPanel.add(new ToolbarAlikeButton(IGNORE) {
+      buttonsPanel.add(new ToolbarAlikeButton(AllIcons.Actions.Cancel) {
         {
           setToolTipText("Ignore error");
         }
index 20703fd2e3f2099e01a9859f0142185bedb3ef86..eee2ada90154ef69ce581b4f0248e84bd7e3a3a7 100644 (file)
@@ -27,8 +27,6 @@ import javax.swing.*;
 import java.awt.*;
 
 public abstract class JavaContentRootPanel extends ContentRootPanel {
-  private static final Icon ADD_PREFIX_ICON = AllIcons.Modules.SetPackagePrefix;
-  private static final Icon ADD_PREFIX_ROLLOVER_ICON = AllIcons.Modules.SetPackagePrefixRollover;
 
   public JavaContentRootPanel(ActionCallback callback) {
     super(callback, true, true);
@@ -43,7 +41,8 @@ public abstract class JavaContentRootPanel extends ContentRootPanel {
   }
 
   private JComponent createAddPrefixComponent(final SourceFolder folder) {
-    final IconActionComponent iconComponent = new IconActionComponent(ADD_PREFIX_ICON, ADD_PREFIX_ROLLOVER_ICON,
+    final IconActionComponent iconComponent = new IconActionComponent(AllIcons.Modules.SetPackagePrefix,
+                                                                      AllIcons.Modules.SetPackagePrefixRollover,
                                                                       ProjectBundle.message("module.paths.package.prefix.tooltip"), new Runnable() {
       public void run() {
         final String message = ProjectBundle.message("module.paths.package.prefix.prompt",
index e654773f78540662106bde3dac4df53df1e8e4c6..27a26ead67f6090f561c0c1ae0be8600f3a900f6 100644 (file)
@@ -61,8 +61,6 @@ public class ProjectConfigurable extends ProjectStructureElementConfigurable<Pro
 
   private final Project myProject;
 
-  private static final Icon PROJECT_ICON = AllIcons.Nodes.Project;
-
   private LanguageLevelCombo myLanguageLevelCombo;
   private ProjectJdkConfigurable myProjectJdkConfigurable;
 
@@ -246,7 +244,7 @@ public class ProjectConfigurable extends ProjectStructureElementConfigurable<Pro
   }
 
   public Icon getIcon(boolean open) {
-    return PROJECT_ICON;
+    return AllIcons.Nodes.Project;
   }
 
   @Nullable
index 42869e1134de403df33e70285384b472dbe13a7e..9f84124972b041f48d4953bb826526777e8ae207 100644 (file)
  */
 package com.intellij.openapi.roots.ui.configuration.artifacts.sourceItems;
 
-import com.intellij.packaging.ui.*;
+import com.intellij.icons.AllIcons;
+import com.intellij.ide.projectView.PresentationData;
 import com.intellij.packaging.artifacts.Artifact;
 import com.intellij.packaging.elements.PackagingElement;
-import com.intellij.packaging.impl.artifacts.PlainArtifactType;
 import com.intellij.packaging.impl.elements.ArtifactElementType;
-import com.intellij.ide.projectView.PresentationData;
+import com.intellij.packaging.ui.*;
 import com.intellij.ui.SimpleTextAttributes;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
 import java.util.Collection;
-import java.util.List;
 import java.util.Collections;
-import java.util.ArrayList;
+import java.util.List;
 
 /**
  * @author nik
@@ -84,7 +84,7 @@ public class ArtifactsSourceItemsProvider extends PackagingSourceItemsProvider {
       @Override
       public void render(@NotNull PresentationData presentationData, SimpleTextAttributes mainAttributes,
                          SimpleTextAttributes commentAttributes) {
-        presentationData.setIcons(PlainArtifactType.ARTIFACT_ICON);
+        presentationData.setIcons(AllIcons.Nodes.Artifact);
         presentationData.addText("Artifacts", mainAttributes);
       }
 
index debb11c4a217470055c57d9390bf9c14c23d6393..db04fded04319f6bfbf65157e7b2222c923baf6c 100644 (file)
@@ -433,10 +433,6 @@ public class ModuleDependenciesAnalyzer {
    */
   public static class UrlExplanation extends Explanation {
     /**
-     * Missing file ICON
-     */
-    public static final Icon MISSING_ICON = AllIcons.Compiler.Error;
-    /**
      * The URL in the path
      */
     private final String myUrl;
@@ -465,7 +461,7 @@ public class ModuleDependenciesAnalyzer {
     @Nullable
     public Icon getIcon() {
       VirtualFile file = getLocalFile();
-      return file == null ? MISSING_ICON : VirtualFilePresentation.getIcon(file);
+      return file == null ? AllIcons.Compiler.Error : VirtualFilePresentation.getIcon(file);
     }
 
     /**
index fddca7a4c2f66f7704682d64beef484553cd5653..d519a4505f71adafb52408fd2005166e12dc1772 100644 (file)
@@ -31,11 +31,10 @@ import com.intellij.openapi.roots.ui.OrderRootTypeUIFactory;
 import javax.swing.*;
 
 public class AnnotationsOrderRootTypeUIFactory implements OrderRootTypeUIFactory {
-  private static final Icon ICON = AllIcons.Modules.Annotation;
 
   @Override
   public Icon getIcon() {
-    return ICON;
+    return AllIcons.Modules.Annotation;
   }
 
   @Override
index 4b6b266f8d0a6bf3bb38458e16a5ca3655d0b781..b6bb631358b21ed9656d52df9b0e56aeba00e3a3 100644 (file)
@@ -31,7 +31,6 @@ import com.intellij.openapi.roots.ui.OrderRootTypeUIFactory;
 import javax.swing.*;
 
 public class ClassesOrderRootTypeUIFactory implements OrderRootTypeUIFactory {
-  private static final Icon ICON = AllIcons.Nodes.CompiledClassesFolder;
 
   public SdkPathEditor createPathEditor(Sdk sdk) {
     return new SdkPathEditor(ProjectBundle.message("sdk.configure.classpath.tab"), OrderRootType.CLASSES, new FileChooserDescriptor(true, true, true, false, true, true));
@@ -39,7 +38,7 @@ public class ClassesOrderRootTypeUIFactory implements OrderRootTypeUIFactory {
 
   @Override
   public Icon getIcon() {
-    return ICON;
+    return AllIcons.Nodes.CompiledClassesFolder;
   }
 
   @Override
index b0cfcf15fcb9e9938472f72dd9d48da5cf1f38e1..aa8ecbba619a19043e8e685a4bff7c4364577eea 100644 (file)
@@ -30,8 +30,6 @@ import java.awt.*;
 import java.io.File;
 
 class ItemElementDescriptor extends NodeDescriptor<ItemElement> {
-  private static final Icon INVALID_ITEM_ICON = AllIcons.Nodes.PpInvalid;
-  private static final Icon JAR_DIRECTORY_ICON = AllIcons.Nodes.JarDirectory;
   private final ItemElement myElement;
 
     public ItemElementDescriptor(NodeDescriptor parentDescriptor, ItemElement element) {
@@ -70,7 +68,7 @@ class ItemElementDescriptor extends NodeDescriptor<ItemElement> {
         else {
           if (presentableFile.isDirectory()) {
             if (isJarDirectory) {
-              icon = JAR_DIRECTORY_ICON;
+              icon = AllIcons.Nodes.JarDirectory;
             }
             else {
               icon = PlatformIcons.DIRECTORY_CLOSED_ICON;
@@ -82,11 +80,11 @@ class ItemElementDescriptor extends NodeDescriptor<ItemElement> {
         }
       }
       else {
-        icon = INVALID_ITEM_ICON;
+        icon = AllIcons.Nodes.PpInvalid;
       }
     }
     else {
-      icon = INVALID_ITEM_ICON;
+      icon = AllIcons.Nodes.PpInvalid;
     }
     return icon;
   }
index 5961de40005ec11d6a970bb22d444e52c8b855dc..7e9ec0b6d3283aa169d419378f658eae0848a7a6 100644 (file)
@@ -41,7 +41,6 @@ import com.intellij.util.IconUtil;
 import javax.swing.*;
 
 public class JavadocOrderRootTypeUIFactory implements OrderRootTypeUIFactory {
-  private static final Icon ICON = AllIcons.Nodes.JavaDocFolder;
 
   public SdkPathEditor createPathEditor(Sdk sdk) {
     return new JavadocPathsEditor(sdk);
@@ -49,7 +48,7 @@ public class JavadocOrderRootTypeUIFactory implements OrderRootTypeUIFactory {
 
   @Override
   public Icon getIcon() {
-    return ICON;
+    return AllIcons.Nodes.JavaDocFolder;
   }
 
   @Override
index baaf303d405175739a5cbf93cd46b82eb6963e0d..cf50f68ba13dc35a8a14a12377395c332cdcfc61 100644 (file)
@@ -34,7 +34,6 @@ import javax.swing.*;
 import java.awt.*;
 
 public class SourcesOrderRootTypeUIFactory implements OrderRootTypeUIFactory {
-  private static final Icon ICON = AllIcons.Nodes.SourceFolder;
 
   public SdkPathEditor createPathEditor(Sdk sdk) {
     return new SdkPathEditor(ProjectBundle.message("sdk.configure.sourcepath.tab"), OrderRootType.SOURCES, new FileChooserDescriptor(true, true, true, false, true, true)) {
@@ -47,7 +46,7 @@ public class SourcesOrderRootTypeUIFactory implements OrderRootTypeUIFactory {
 
   @Override
   public Icon getIcon() {
-    return ICON;
+    return AllIcons.Nodes.SourceFolder;
   }
 
   @Override
index 37557f9857202052d2026cb365a70195e062903d..0898ac87fefc2c362e751ff29832d49c4260eb62 100644 (file)
@@ -43,12 +43,11 @@ import java.util.Comparator;
  * @author nik
  */
 public abstract class FindUsagesInProjectStructureActionBase extends AnAction implements DumbAware {
-  private static final Icon FIND_ICON = AllIcons.Actions.Find;
   private final JComponent myParentComponent;
   private final Project myProject;
 
   public FindUsagesInProjectStructureActionBase(JComponent parentComponent, Project project) {
-    super(ProjectBundle.message("find.usages.action.text"), ProjectBundle.message("find.usages.action.text"), FIND_ICON);
+    super(ProjectBundle.message("find.usages.action.text"), ProjectBundle.message("find.usages.action.text"), AllIcons.Actions.Find);
     registerCustomShortcutSet(ActionManager.getInstance().getAction(IdeActions.ACTION_FIND_USAGES).getShortcutSet(), parentComponent);
     myParentComponent = parentComponent;
     myProject = project;
index 40837d333a15c242206b925914a6d84158df03d5..d234aba6c38066134bc00539c5323c1aee9efc47 100644 (file)
@@ -84,7 +84,6 @@ import java.util.List;
  * Date: 02-Jun-2006
  */
 public class ModuleStructureConfigurable extends BaseStructureConfigurable implements Place.Navigator {
-  private static final Icon COMPACT_EMPTY_MIDDLE_PACKAGES_ICON = AllIcons.ObjectBrowser.CompactEmptyPackages;
   private static final Comparator<MyNode> NODE_COMPARATOR = new Comparator<MyNode>() {
     public int compare(final MyNode o1, final MyNode o2) {
       final NamedConfigurable configurable1 = o1.getConfigurable();
@@ -686,7 +685,7 @@ public class ModuleStructureConfigurable extends BaseStructureConfigurable imple
   private class MyGroupAction extends ToggleAction implements DumbAware {
 
     public MyGroupAction() {
-      super("", "", COMPACT_EMPTY_MIDDLE_PACKAGES_ICON);
+      super("", "", AllIcons.ObjectBrowser.CompactEmptyPackages);
     }
 
     public void update(final AnActionEvent e) {
index baed7bd93348cc18798ebc442bcd0ce37217dc36..2be52b53b2ef0d1e6d3decf92e449457b3dcef02 100644 (file)
@@ -29,7 +29,10 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.Result;
 import com.intellij.openapi.command.CommandProcessor;
 import com.intellij.openapi.command.WriteCommandAction;
-import com.intellij.openapi.command.undo.*;
+import com.intellij.openapi.command.undo.BasicUndoableAction;
+import com.intellij.openapi.command.undo.UndoManager;
+import com.intellij.openapi.command.undo.UndoUtil;
+import com.intellij.openapi.command.undo.UnexpectedUndoException;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.Editor;
@@ -83,7 +86,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class ExternalAnnotationsManagerImpl extends BaseExternalAnnotationsManager {
-  @NotNull public static final Icon ICON = AllIcons.Modules.Annotation;
   private static final Logger LOG = Logger.getInstance("#" + ExternalAnnotationsManagerImpl.class.getName());
 
   @NotNull private volatile ThreeState myHasAnyAnnotationsRoots = ThreeState.UNSURE;
@@ -243,7 +245,7 @@ public class ExternalAnnotationsManagerImpl extends BaseExternalAnnotationsManag
 
         @Override
         public Icon getIconFor(final VirtualFile aValue) {
-          return ICON;
+          return AllIcons.Modules.Annotation;
         }
       }).showInBestPositionFor(DataManager.getInstance().getDataContext());
     }
index 4ab59906589d1c41234ca4e521f361a80374edb2..57510cfc8f5c24d1efbf3baf781e01cd2464f05c 100644 (file)
@@ -55,13 +55,6 @@ import java.util.List;
 import java.util.Set;
 
 public class JavaLineMarkerProvider implements LineMarkerProvider, DumbAware {
-  protected static final Icon OVERRIDING_METHOD_ICON = AllIcons.Gutter.OverridingMethod;
-  protected static final Icon IMPLEMENTING_METHOD_ICON = AllIcons.Gutter.ImplementingMethod;
-
-  protected static final Icon OVERRIDEN_METHOD_MARKER_RENDERER = AllIcons.Gutter.OverridenMethod;
-  protected static final Icon IMPLEMENTED_METHOD_MARKER_RENDERER = AllIcons.Gutter.ImplementedMethod;
-  private static final Icon IMPLEMENTED_INTERFACE_MARKER_RENDERER = IMPLEMENTED_METHOD_MARKER_RENDERER;
-  private static final Icon SUBCLASSED_CLASS_MARKER_RENDERER = OVERRIDEN_METHOD_MARKER_RENDERER;
 
   protected final DaemonCodeAnalyzerSettings myDaemonSettings;
   protected final EditorColorsManager myColorsManager;
@@ -88,7 +81,7 @@ public class JavaLineMarkerProvider implements LineMarkerProvider, DumbAware {
         boolean overrides =
           method.hasModifierProperty(PsiModifier.ABSTRACT) == superSignature.getMethod().hasModifierProperty(PsiModifier.ABSTRACT);
 
-        final Icon icon = overrides ? OVERRIDING_METHOD_ICON : IMPLEMENTING_METHOD_ICON;
+        final Icon icon = overrides ? AllIcons.Gutter.OverridingMethod : AllIcons.Gutter.ImplementingMethod;
         final MarkerType type = MarkerType.OVERRIDING_METHOD;
         return new ArrowUpLineMarkerInfo(element, icon, type);
       }
@@ -187,7 +180,7 @@ public class JavaLineMarkerProvider implements LineMarkerProvider, DumbAware {
 
     PsiClass inheritor = ClassInheritorsSearch.search(aClass, false).findFirst();
     if (inheritor != null) {
-      final Icon icon = aClass.isInterface() ? IMPLEMENTED_INTERFACE_MARKER_RENDERER : SUBCLASSED_CLASS_MARKER_RENDERER;
+      final Icon icon = aClass.isInterface() ? AllIcons.Gutter.ImplementedMethod : AllIcons.Gutter.OverridenMethod;
       PsiElement range = aClass.getNameIdentifier();
       if (range == null) range = aClass;
       MarkerType type = MarkerType.SUBCLASSED_CLASS;
@@ -230,7 +223,7 @@ public class JavaLineMarkerProvider implements LineMarkerProvider, DumbAware {
       ProgressManager.checkCanceled();
       boolean overrides = !method.hasModifierProperty(PsiModifier.ABSTRACT);
 
-      final Icon icon = overrides ? OVERRIDEN_METHOD_MARKER_RENDERER : IMPLEMENTED_METHOD_MARKER_RENDERER;
+      final Icon icon = overrides ? AllIcons.Gutter.OverridenMethod : AllIcons.Gutter.ImplementedMethod;
       PsiElement range;
       if (method.isPhysical()) {
         range = method.getNameIdentifier();
index 6695a48e86ecfd77a2a6da6771509fb4112ccdc5..8b66dce9a64e7af7440bfc6c646ea1d7a5aaefc2 100644 (file)
@@ -28,7 +28,6 @@ import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.util.FunctionUtil;
 import org.jetbrains.annotations.NotNull;
 
-import javax.swing.*;
 import java.util.Collection;
 import java.util.HashSet;
 import java.util.List;
@@ -38,7 +37,6 @@ import java.util.Set;
  * @author Danila Ponomarenko
  */
 public class RecursiveCallLineMarkerProvider implements LineMarkerProvider, DumbAware {
-  private static final Icon RECURSIVE_METHOD_ICON = AllIcons.Gutter.RecursiveMethod;
 
   @Override
   public LineMarkerInfo getLineMarkerInfo(@NotNull PsiElement element) {
@@ -81,7 +79,7 @@ public class RecursiveCallLineMarkerProvider implements LineMarkerProvider, Dumb
     private RecursiveMethodCallMarkerInfo(@NotNull PsiMethodCallExpression methodCall) {
       super(methodCall,
             methodCall.getTextRange(),
-            RECURSIVE_METHOD_ICON,
+            AllIcons.Gutter.RecursiveMethod,
             Pass.UPDATE_OVERRIDEN_MARKERS,
             FunctionUtil.<PsiMethodCallExpression, String>constant("Recursive call"),
             null,
index f2efdd8be3dc6a788dd46c354dfe85367155da85..78cc4d2c80bc0c82cc6218cacff8f0264f764456 100644 (file)
@@ -47,7 +47,6 @@ import java.util.HashSet;
  * User: anna
  */
 public class DelegateWithDefaultParamValueIntentionAction extends PsiElementBaseIntentionAction implements Iconable, LowPriorityAction {
-   public static final Icon REFACTORING_BULB = AllIcons.Actions.RefactoringBulb;
   @Override
   public boolean isAvailable(@NotNull Project project, Editor editor, @NotNull PsiElement element) {
     final PsiParameter parameter = PsiTreeUtil.getParentOfType(element, PsiParameter.class);
@@ -67,7 +66,7 @@ public class DelegateWithDefaultParamValueIntentionAction extends PsiElementBase
 
   @Override
   public Icon getIcon(int flags) {
-    return REFACTORING_BULB;
+    return AllIcons.Actions.RefactoringBulb;
   }
 
   private static PsiMethod generateMethodPrototype(PsiMethod method, PsiParameter... params) {
index fb664dfbd516f8c24d6367d6b8d5efdb3a2e3815..dedd0b1214d8bb15ab08f7a0486870ded4c5c038 100644 (file)
@@ -15,6 +15,7 @@
  */
 package com.intellij.codeInsight.intention.impl;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
@@ -67,6 +68,6 @@ public class RunRefactoringAction extends BaseRefactoringIntentionAction {
 
   @Override
   public Icon getIcon(@IconFlags int flags) {
-    return REFACTORING_BULB;
+    return AllIcons.Actions.RefactoringBulb;
   }
 }
index 524307ed1653176637b5e903e9f9de5a797eccba..10c2c6008768308a6d510ed95b7fc8d4ac47871f 100644 (file)
@@ -25,13 +25,12 @@ import javax.swing.*;
  * @author max
  */
 public class EntryPointsNode extends InspectionNode {
-  private static final Icon ENTRY_POINTS = AllIcons.Nodes.EntryPoints;
   public EntryPointsNode(UnusedDeclarationInspection tool) {
     super(new DummyEntryPointsTool(tool));
     getTool().updateContent();
   }
 
   public Icon getIcon(boolean expanded) {
-    return ENTRY_POINTS;
+    return AllIcons.Nodes.EntryPoints;
   }
 }
index 6a65678a8d3a6256770eff630187cc86a63bda30..4530012a8c3b3849a233af41a2b1a84bc6cefd02 100644 (file)
@@ -16,6 +16,7 @@
 package com.intellij.ide.hierarchy.call;
 
 import com.intellij.codeInsight.highlighting.HighlightManager;
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.hierarchy.HierarchyNodeDescriptor;
 import com.intellij.ide.hierarchy.JavaHierarchyUtil;
@@ -112,7 +113,7 @@ public final class CallHierarchyNodeDescriptor extends HierarchyNodeDescriptor i
     if (changes && myIsBase) {
       final LayeredIcon icon = new LayeredIcon(2);
       icon.setIcon(myOpenIcon, 0);
-      icon.setIcon(BASE_POINTER_ICON, 1, -BASE_POINTER_ICON.getIconWidth() / 2, 0);
+      icon.setIcon(AllIcons.Hierarchy.Base, 1, -AllIcons.Hierarchy.Base.getIconWidth() / 2, 0);
       myOpenIcon = icon;
     }
     myClosedIcon = myOpenIcon;
index b712328b5921105b73608a8acf8349ba41927274..200548e43d3a8342d5c712f252dc3f59a2eced7d 100644 (file)
@@ -36,9 +36,6 @@ import javax.swing.*;
 import java.awt.*;
 
 public final class MethodHierarchyNodeDescriptor extends HierarchyNodeDescriptor {
-  private static final Icon METHOD_DEFINED_ICON = AllIcons.Hierarchy.MethodDefined;
-  private static final Icon METHOD_NOT_DEFINED_ICON = AllIcons.Hierarchy.MethodNotDefined;
-  private static final Icon SHOULD_DEFINE_METHOD_ICON = AllIcons.Hierarchy.ShouldDefineMethod;
 
   private Icon myRawIcon;
   private Icon myStateIcon;
@@ -115,7 +112,7 @@ public final class MethodHierarchyNodeDescriptor extends HierarchyNodeDescriptor
       if (myIsBase) {
         final LayeredIcon icon = new LayeredIcon(2);
         icon.setIcon(myOpenIcon, 0);
-        icon.setIcon(BASE_POINTER_ICON, 1, -BASE_POINTER_ICON.getIconWidth() / 2, 0);
+        icon.setIcon(AllIcons.Hierarchy.Base, 1, -AllIcons.Hierarchy.Base.getIconWidth() / 2, 0);
         myOpenIcon = icon;
       }
 
@@ -152,11 +149,11 @@ public final class MethodHierarchyNodeDescriptor extends HierarchyNodeDescriptor
       if (method.hasModifierProperty(PsiModifier.ABSTRACT)) {
         return null;
       }
-      return METHOD_DEFINED_ICON;
+      return AllIcons.Hierarchy.MethodDefined;
     }
 
     if (myTreeStructure.isSuperClassForBaseClass(psiClass)) {
-      return METHOD_NOT_DEFINED_ICON;
+      return AllIcons.Hierarchy.MethodNotDefined;
     }
 
     final boolean isAbstractClass = psiClass.hasModifierProperty(PsiModifier.ABSTRACT);
@@ -167,10 +164,10 @@ public final class MethodHierarchyNodeDescriptor extends HierarchyNodeDescriptor
     final boolean hasBaseImplementation = baseClassMethod != null && !baseClassMethod.hasModifierProperty(PsiModifier.ABSTRACT);
 
     if (hasBaseImplementation || isAbstractClass) {
-      return METHOD_NOT_DEFINED_ICON;
+      return AllIcons.Hierarchy.MethodNotDefined;
     }
     else {
-      return SHOULD_DEFINE_METHOD_ICON;
+      return AllIcons.Hierarchy.ShouldDefineMethod;
     }
   }
 }
index 1da15d2ba2e181c9617d3feb6ec0d5a42de80316..748796d1bcb1a789346ee16fb72e140847047673 100644 (file)
@@ -15,6 +15,7 @@
  */
 package com.intellij.ide.hierarchy.type;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.hierarchy.HierarchyNodeDescriptor;
 import com.intellij.ide.hierarchy.JavaHierarchyUtil;
@@ -56,7 +57,7 @@ public final class TypeHierarchyNodeDescriptor extends HierarchyNodeDescriptor {
     if (changes && myIsBase) {
       final LayeredIcon icon = new LayeredIcon(2);
       icon.setIcon(myOpenIcon, 0);
-      icon.setIcon(BASE_POINTER_ICON, 1, -BASE_POINTER_ICON.getIconWidth() / 2, 0);
+      icon.setIcon(AllIcons.Hierarchy.Base, 1, -AllIcons.Hierarchy.Base.getIconWidth() / 2, 0);
       myOpenIcon = icon;
       myClosedIcon = myOpenIcon;
     }
index 93c2fb084d8d438d633521c40a37861ffcabbb95..8e0d9b815b3e4ae5a394c31d480491cf04898c64 100644 (file)
@@ -60,7 +60,6 @@ import java.util.*;
 
 public final class PackageViewPane extends AbstractProjectViewPSIPane {
   @NonNls public static final String ID = "PackagesPane";
-  public static final Icon ICON = AllIcons.General.PackagesTab;
   private MyDeletePSIElementProvider myDeletePSIElementProvider = new MyDeletePSIElementProvider();
 
   public PackageViewPane(Project project) {
@@ -72,7 +71,7 @@ public final class PackageViewPane extends AbstractProjectViewPSIPane {
   }
 
   public Icon getIcon() {
-    return ICON;
+    return AllIcons.General.PackagesTab;
   }
 
   @NotNull
index 716e00450bbd6ca0a505480a271cef94f6b2e976..ee713b880078aaf73965e11eb6399b8f49346c47 100644 (file)
@@ -35,9 +35,6 @@ public class SuperTypeGroup implements Group, ItemPresentation, AccessLevelProvi
   private final SmartPsiElementPointer mySuperClassPointer;
   private final OwnershipType myOverrides;
   private final Collection<TreeElement> myChildren = new ArrayList<TreeElement>();
-  private static final Icon OVERRIDING_ICON = AllIcons.General.OverridingMethod;
-  private static final Icon IMPLEMENTING_ICON = AllIcons.General.ImplementingMethod;
-  private static final Icon INHERITED_ICON = AllIcons.General.InheritedMethod;
 
   public static enum OwnershipType {
     IMPLEMENTS,
@@ -66,11 +63,11 @@ public class SuperTypeGroup implements Group, ItemPresentation, AccessLevelProvi
   public Icon getIcon(boolean open) {
     switch (myOverrides) {
       case IMPLEMENTS:
-        return IMPLEMENTING_ICON;
+        return AllIcons.General.ImplementingMethod;
       case INHERITS:
-        return INHERITED_ICON;
+        return AllIcons.General.InheritedMethod;
       case OVERRIDES:
-        return OVERRIDING_ICON;
+        return AllIcons.General.OverridingMethod;
     }
 
     return null; // Can't be
index 9b630b8fb82489aedff47a0b669cac5ebec52ef6..e5ce3310187f503d9827c59cb8da6c0a6c2605a9 100644 (file)
@@ -29,7 +29,6 @@ public class VisibilitySorter implements Sorter{
 
   public static final Sorter INSTANCE = new VisibilitySorter();
 
-  private static final Icon ICON = AllIcons.ObjectBrowser.VisibilitySort;
   private static final ActionPresentation PRESENTATION = new ActionPresentation() {
     public String getText() {
       return IdeBundle.message("action.structureview.sort.by.visibility");
@@ -40,7 +39,7 @@ public class VisibilitySorter implements Sorter{
     }
 
     public Icon getIcon() {
-      return ICON;
+      return AllIcons.ObjectBrowser.VisibilitySort;
     }
   };
   @NonNls public static final String ID = "VISIBILITY_SORTER";
index 6cffaa929563d7561a3ee2c66990383eb2f1fc9c..168dfad08fe9c3290d367d7999f1164de4ca5692 100644 (file)
@@ -29,7 +29,6 @@ import java.awt.*;
 public class FQNameCellRenderer extends SimpleColoredComponent implements ListCellRenderer{
   private final Font FONT;
   private static final Logger LOG = Logger.getInstance("#com.intellij.ide.util.FQNameCellRenderer");
-  private static final Icon ourStaticThingIcon = AllIcons.Nodes.Static;
 
   public FQNameCellRenderer() {
     EditorColorsScheme scheme = EditorColorsManager.getInstance().getGlobalScheme();
@@ -64,7 +63,7 @@ public class FQNameCellRenderer extends SimpleColoredComponent implements ListCe
       LOG.assertTrue(value instanceof String);
       String qName = (String)value;
       append(qName, SimpleTextAttributes.REGULAR_ATTRIBUTES);
-      setIcon(ourStaticThingIcon);
+      setIcon(AllIcons.Nodes.Static);
     }
 
     setFont(FONT);
diff --git a/java/java-impl/src/com/intellij/internal/StaticIconFieldsAction.java b/java/java-impl/src/com/intellij/internal/StaticIconFieldsAction.java
new file mode 100644 (file)
index 0000000..6627fa9
--- /dev/null
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2000-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/*
+ * @author max
+ */
+package com.intellij.internal;
+
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.LangDataKeys;
+import com.intellij.openapi.project.Project;
+import com.intellij.psi.*;
+import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.psi.search.searches.ReferencesSearch;
+import com.intellij.usageView.UsageInfo;
+import com.intellij.usages.*;
+import com.intellij.util.Processor;
+
+public class StaticIconFieldsAction extends AnAction {
+  @Override
+  public void actionPerformed(AnActionEvent e) {
+    final Project project = LangDataKeys.PROJECT.getData(e.getDataContext());
+
+    PsiClass allIcons =
+      JavaPsiFacade.getInstance(project).findClass("com.intellij.icons.AllIcons", GlobalSearchScope.allScope(project));
+
+    final UsageViewPresentation presentation = new UsageViewPresentation();
+    presentation.setTabName("Statics");
+    presentation.setTabText("Statitcs");
+    final UsageView view = UsageViewManager.getInstance(project).showUsages(UsageTarget.EMPTY_ARRAY, new Usage[0], presentation);
+
+
+    ReferencesSearch.search(allIcons).forEach(new Processor<PsiReference>() {
+      @Override
+      public boolean process(PsiReference reference) {
+        PsiElement elt = reference.getElement();
+
+        while (elt instanceof PsiExpression) elt = elt.getParent();
+
+        if (elt instanceof PsiField) {
+          UsageInfo info = new UsageInfo(elt, false);
+          view.appendUsage(new UsageInfo2UsageAdapter(info));
+        }
+
+        return true;
+      }
+    });
+  }
+}
+
index 051743e72187e3830c4cc8a7eaf9ae03d305d6c9..26f8693fa7cb03ef5a373fc39aca331ba1b0e318 100644 (file)
@@ -91,30 +91,16 @@ public class JavaModuleType extends ModuleType<JavaModuleBuilder> {
     return ArrayUtil.mergeArrays(wizardSteps, super.createWizardSteps(wizardContext, moduleBuilder, modulesProvider));
   }
 
-  private static class IconHolder {
-    private static final Icon JAVA_MODULE_ICON = AllIcons.Modules.Types.JavaModule;
-  }
-
   private static Icon getJavaModuleIcon() {
-
-    return IconHolder.JAVA_MODULE_ICON;
-  }
-
-  private static class JavaModuleOpenIconHolder {
-    private static final Icon JAVA_MODULE_NODE_ICON_OPEN = AllIcons.Nodes.ModuleOpen;
+    return AllIcons.Modules.Types.JavaModule;
   }
 
   private static Icon getJavaModuleNodeIconOpen() {
-    return JavaModuleOpenIconHolder.JAVA_MODULE_NODE_ICON_OPEN;
-  }
-
-  private static class JavaModuleClosedIconHolder {
-    private static final Icon JAVA_MODULE_NODE_ICON_CLOSED = AllIcons.Nodes.ModuleClosed;
+    return AllIcons.Nodes.ModuleOpen;
   }
 
   private static Icon getJavaModuleNodeIconClosed() {
-
-    return JavaModuleClosedIconHolder.JAVA_MODULE_NODE_ICON_CLOSED;
+    return AllIcons.Nodes.ModuleClosed;
   }
 
   private static class WizardIconHolder {
index c4f18de6a09ce83da93c65707d05f0c133b06868..717cafc315278ec2267f8d68527e9bde328cd654 100644 (file)
@@ -46,9 +46,6 @@ public class JavaSdkImpl extends JavaSdk {
   // do not use javaw.exe for Windows because of issues with encoding
   @NonNls private static final String VM_EXE_NAME = "java";
   @NonNls private final Pattern myVersionStringPattern = Pattern.compile("^(.*)java version \"([1234567890_.]*)\"(.*)$");
-  public static final Icon ICON = AllIcons.Nodes.PpJdkClosed;
-  private static final Icon JDK_ICON_EXPANDED = AllIcons.Nodes.PpJdkOpen;
-  private static final Icon ADD_ICON = AllIcons.General.AddJdk;
   @NonNls private static final String JAVA_VERSION_PREFIX = "java version ";
   @NonNls private static final String OPENJDK_VERSION_PREFIX = "openjdk version ";
   private static final Map<JavaSdkVersion, String[]> VERSION_STRINGS = new EnumMap<JavaSdkVersion, String[]>(JavaSdkVersion.class);
@@ -76,7 +73,7 @@ public class JavaSdkImpl extends JavaSdk {
 
   @Override
   public Icon getIcon() {
-    return ICON;
+    return AllIcons.Nodes.PpJdkClosed;
   }
 
   @NotNull
@@ -87,12 +84,12 @@ public class JavaSdkImpl extends JavaSdk {
 
   @Override
   public Icon getIconForExpandedTreeNode() {
-    return JDK_ICON_EXPANDED;
+    return AllIcons.Nodes.PpJdkOpen;
   }
 
   @Override
   public Icon getIconForAddAction() {
-    return ADD_ICON;
+    return AllIcons.General.AddJdk;
   }
 
   @Nullable
index cdbbf5656beb53b25de263942f4ca7c620e7e87f..d963b41c9ec5f050c70b3fccdf0498fe43f32311 100644 (file)
@@ -25,10 +25,6 @@ import javax.swing.*;
 import java.util.Set;
 
 public class LibraryNode extends PackageDependenciesNode {
-  private static final Icon LIB_ICON_OPEN = AllIcons.Nodes.PpLibOpen;
-  private static final Icon LIB_ICON_CLOSED = AllIcons.Nodes.PpLibClosed;
-  private static final Icon JDK_ICON_OPEN = AllIcons.Nodes.PpJdkOpen;
-  private static final Icon JDK_ICON_CLOSED = AllIcons.Nodes.PpJdkClosed;
 
   private final OrderEntry myLibraryOrJdk;
 
@@ -73,10 +69,10 @@ public class LibraryNode extends PackageDependenciesNode {
   }
 
   public Icon getOpenIcon() {
-    return myLibraryOrJdk instanceof JdkOrderEntry ? JDK_ICON_OPEN : LIB_ICON_OPEN;
+    return myLibraryOrJdk instanceof JdkOrderEntry ? AllIcons.Nodes.PpJdkOpen : AllIcons.Nodes.PpLibOpen;
   }
 
   public Icon getClosedIcon() {
-    return myLibraryOrJdk instanceof JdkOrderEntry ? JDK_ICON_CLOSED : LIB_ICON_CLOSED;
+    return myLibraryOrJdk instanceof JdkOrderEntry ? AllIcons.Nodes.PpJdkClosed : AllIcons.Nodes.PpLibClosed;
   }
 }
index ee08aadbe295957c0b6139ff75a273809297ab6a..c619d2b8e56fde39584edf69c49da952be8e4723 100644 (file)
@@ -45,7 +45,6 @@ import java.util.Set;
 public class PackagePatternProvider extends PatternDialectProvider {
   @NonNls public static final String PACKAGES = "package";
   private static final Logger LOG = Logger.getInstance("#" + PackagePatternProvider.class.getName());
-   public static final Icon ICON = AllIcons.General.PackagesTab;
 
   @Nullable
   private static GeneralGroupNode getGroupParent(PackageDependenciesNode node) {
@@ -117,7 +116,7 @@ public class PackagePatternProvider extends PatternDialectProvider {
   }
 
   public Icon getIcon() {
-    return ICON;
+    return AllIcons.General.PackagesTab;
   }
 
   public TreeModel createTreeModel(final Project project, final Marker marker) {
index e11d03a93de4232ac6d6a20c07896be9e54ae08e..501bef9634dd3f9a639f672ac45988d30dba9670 100644 (file)
@@ -39,7 +39,6 @@ import com.intellij.util.ui.tree.TreeUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -80,9 +79,6 @@ public class TreeModelBuilder {
   private GeneralGroupNode myTestRoot = null;
   private GeneralGroupNode myLibsRoot = null;
 
-  private static final Icon LIB_ICON_OPEN = AllIcons.Nodes.PpLibOpen;
-  private static final Icon LIB_ICON_CLOSED = AllIcons.Nodes.PpLibClosed;
-  private static final Icon TEST_ICON = AllIcons.Nodes.TestSourceFolder;
   public static final String PRODUCTION_NAME = AnalysisScopeBundle.message("package.dependencies.production.node.text");
   public static final String TEST_NAME = AnalysisScopeBundle.message("package.dependencies.test.node.text");
   public static final String LIBRARY_NAME = AnalysisScopeBundle.message("package.dependencies.library.node.text");
@@ -107,8 +103,8 @@ public class TreeModelBuilder {
 
     if (myGroupByScopeType) {
       mySourceRoot = new GeneralGroupNode(PRODUCTION_NAME, PlatformIcons.PACKAGE_OPEN_ICON, PlatformIcons.PACKAGE_ICON, project);
-      myTestRoot = new GeneralGroupNode(TEST_NAME, TEST_ICON, TEST_ICON, project);
-      myLibsRoot = new GeneralGroupNode(LIBRARY_NAME, LIB_ICON_OPEN, LIB_ICON_CLOSED, project);
+      myTestRoot = new GeneralGroupNode(TEST_NAME, AllIcons.Nodes.TestSourceFolder, AllIcons.Nodes.TestSourceFolder, project);
+      myLibsRoot = new GeneralGroupNode(LIBRARY_NAME, AllIcons.Nodes.PpLibOpen, AllIcons.Nodes.PpLibClosed, project);
       myRoot.add(mySourceRoot);
       myRoot.add(myTestRoot);
       myRoot.add(myLibsRoot);
@@ -422,7 +418,8 @@ public class TreeModelBuilder {
     if (!myShowIndividualLibs) {
       if (myGroupByScopeType) return getRootNode(ScopeType.LIB);
       if (myAllLibsNode == null) {
-        myAllLibsNode = new GeneralGroupNode(AnalysisScopeBundle.message("dependencies.libraries.node.text"), LIB_ICON_OPEN, LIB_ICON_CLOSED,
+        myAllLibsNode = new GeneralGroupNode(AnalysisScopeBundle.message("dependencies.libraries.node.text"), AllIcons.Nodes.PpLibOpen,
+                                             AllIcons.Nodes.PpLibClosed,
                                              myProject);
         getRootNode(ScopeType.LIB).add(myAllLibsNode);
       }
index 3c5fd4d6e88e54c86caa789a2046da1dd6957651..fabc1b62360224e6108ffd19b6dc4da193cb7092 100644 (file)
@@ -34,8 +34,6 @@ import javax.swing.*;
 @Presentation(icon = "AllIcons.Nodes.Property")
 public class BeanProperty {
 
-  public static final Icon ICON = AllIcons.Nodes.Property;
-
   private final PsiMethod myMethod;
 
   protected BeanProperty(@NotNull PsiMethod method) {
@@ -100,7 +98,7 @@ public class BeanProperty {
 
   @Nullable
   public Icon getIcon(int flags) {
-    return ICON;
+    return AllIcons.Nodes.Property;
   }
 
   @Nullable
index 58ea54cab3b7acba718fc5b98a236d96a153fe32..87d1b6d6cc12686a9a0fa05b4a4f865f7c2b3797 100644 (file)
  */
 package com.intellij.psi.impl.beanProperties;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiManager;
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiType;
-import com.intellij.psi.util.PropertyUtil;
 import com.intellij.psi.impl.FakePsiElement;
 import com.intellij.psi.meta.PsiMetaData;
 import com.intellij.psi.meta.PsiMetaOwner;
 import com.intellij.psi.meta.PsiPresentableMetaData;
+import com.intellij.psi.util.PropertyUtil;
 import com.intellij.util.ArrayUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -95,7 +96,7 @@ public class BeanPropertyElement extends FakePsiElement implements PsiMetaOwner,
   @Override
   @Nullable
   public Icon getIcon(boolean flags) {
-    return BeanProperty.ICON;
+    return AllIcons.Nodes.Property;
   }
 
   @Override
index 0d6d2b145f0be6e3f6df6c9243e1ee4311ed9760..1d76e668a8c6a725a35cb7de9e4bf4cd4a60fbf4 100644 (file)
@@ -625,10 +625,6 @@ public String getAccessorsVisibility() {
     }
   }
 
-  private static final Icon OVERRIDING_METHOD_ICON = AllIcons.General.OverridingMethod;
-  private static final Icon IMPLEMENTING_METHOD_ICON = AllIcons.General.ImplementingMethod;
-  private static final Icon EMPTY_OVERRIDE_ICON = EmptyIcon.ICON_16;
-
   private class MyTableRenderer extends DefaultTableCellRenderer {
     public Component getTableCellRendererComponent(JTable table, final Object value,
                                                    boolean isSelected, boolean hasFocus, final int row,
@@ -652,7 +648,7 @@ public String getAccessorsVisibility() {
         case SETTER_COLUMN:
           {
             Icon methodIcon = IconUtil.getEmptyIcon(true);
-            Icon overrideIcon = EMPTY_OVERRIDE_ICON;
+            Icon overrideIcon = EmptyIcon.ICON_16;
 
             PsiMethod prototype = modelColumn == GETTER_COLUMN ? myGetterPrototypes[row] : mySetterPrototypes[row];
             if (prototype != null) {
@@ -667,9 +663,9 @@ public String getAccessorsVisibility() {
               PsiMethod[] superMethods = prototype.findSuperMethods(myClass);
               if (superMethods.length > 0) {
                 if (!superMethods[0].hasModifierProperty(PsiModifier.ABSTRACT)) {
-                  overrideIcon = OVERRIDING_METHOD_ICON;
+                  overrideIcon = AllIcons.General.OverridingMethod;
                 } else {
-                  overrideIcon = IMPLEMENTING_METHOD_ICON;
+                  overrideIcon = AllIcons.General.ImplementingMethod;
                 }
               }
             } else {
index 5065ec3c25140b182e12ff4aabfe201232ae9235..58c93bd9287b86d46181d681072e48672255242e 100644 (file)
@@ -24,6 +24,7 @@
  */
 package com.intellij.refactoring.ui;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.psi.PsiMember;
 import com.intellij.psi.PsiMethod;
 import com.intellij.psi.PsiModifier;
@@ -103,10 +104,10 @@ public class MemberSelectionTable extends AbstractMemberSelectionTable<PsiMember
     Icon overrideIcon = MemberSelectionTable.EMPTY_OVERRIDE_ICON;
     if (member instanceof PsiMethod) {
       if (Boolean.TRUE.equals(memberInfo.getOverrides())) {
-        overrideIcon = MemberSelectionTable.OVERRIDING_METHOD_ICON;
+        overrideIcon = AllIcons.General.OverridingMethod;
       }
       else if (Boolean.FALSE.equals(memberInfo.getOverrides())) {
-        overrideIcon = MemberSelectionTable.IMPLEMENTING_METHOD_ICON;
+        overrideIcon = AllIcons.General.ImplementingMethod;
       }
       else {
         overrideIcon = MemberSelectionTable.EMPTY_OVERRIDE_ICON;
index a951f559aa489ff0e4a46da0a5d435e48ba39c91..677c964b763f24d8e5ab8ed4b29f81907841f020 100644 (file)
@@ -43,26 +43,20 @@ import java.util.Collections;
 import java.util.Comparator;
 import java.util.List;
 
+import static com.intellij.icons.AllIcons.Debugger.ThreadStates.*;
+
 /**
  * @author Jeka
  * @author Konstantin Bulenkov
  */
 public class ThreadDumpPanel extends JPanel {
-  private static final Icon DAEMON = AllIcons.Debugger.ThreadStates.Daemon_sign;
-  private static final Icon PAUSE_ICON = AllIcons.Debugger.ThreadStates.Paused;
-  private static final Icon PAUSE_ICON_DAEMON = new LayeredIcon(PAUSE_ICON, DAEMON);
-  private static final Icon LOCKED_ICON = AllIcons.Debugger.ThreadStates.Locked;
-  private static final Icon LOCKED_ICON_DAEMON = new LayeredIcon(LOCKED_ICON, DAEMON);
-  private static final Icon RUNNING_ICON = AllIcons.Debugger.ThreadStates.Running;
-  private static final Icon RUNNING_ICON_DAEMON = new LayeredIcon(RUNNING_ICON, DAEMON);
-  private static final Icon SOCKET_ICON = AllIcons.Debugger.ThreadStates.Socket;
-  private static final Icon SOCKET_ICON_DAEMON = new LayeredIcon(SOCKET_ICON, DAEMON);
-  private static final Icon IDLE_ICON = AllIcons.Debugger.ThreadStates.Idle;
-  private static final Icon IDLE_ICON_DAEMON = new LayeredIcon(IDLE_ICON, DAEMON);
-  private static final Icon EDT_BUSY_ICON = AllIcons.Debugger.ThreadStates.EdtBusy;
-  private static final Icon EDT_BUSY_ICON_DAEMON = new LayeredIcon(EDT_BUSY_ICON, DAEMON);
-  private static final Icon IO_ICON = AllIcons.Debugger.ThreadStates.IO;
-  private static final Icon IO_ICON_DAEMON = new LayeredIcon(IO_ICON, DAEMON);
+  private static final Icon PAUSE_ICON_DAEMON = new LayeredIcon(Paused, Daemon_sign);
+  private static final Icon LOCKED_ICON_DAEMON = new LayeredIcon(Locked, Daemon_sign);
+  private static final Icon RUNNING_ICON_DAEMON = new LayeredIcon(Running, Daemon_sign);
+  private static final Icon SOCKET_ICON_DAEMON = new LayeredIcon(Socket, Daemon_sign);
+  private static final Icon IDLE_ICON_DAEMON = new LayeredIcon(Idle, Daemon_sign);
+  private static final Icon EDT_BUSY_ICON_DAEMON = new LayeredIcon(EdtBusy, Daemon_sign);
+  private static final Icon IO_ICON_DAEMON = new LayeredIcon(IO, Daemon_sign);
   private final JBList myThreadList;
 
   public ThreadDumpPanel(Project project, final ConsoleView consoleView, final DefaultActionGroup toolbarActions, final List<ThreadState> threadDump) {
@@ -105,24 +99,24 @@ public class ThreadDumpPanel extends JPanel {
   private static Icon getThreadStateIcon(final ThreadState threadState) {
     final boolean daemon = threadState.isDaemon();
     if (threadState.isSleeping()) {
-      return daemon ? PAUSE_ICON_DAEMON : PAUSE_ICON;
+      return daemon ? PAUSE_ICON_DAEMON : Paused;
     }
     if (threadState.isWaiting()) {
-      return daemon ? LOCKED_ICON_DAEMON : LOCKED_ICON;
+      return daemon ? LOCKED_ICON_DAEMON : Locked;
     }
     if (threadState.getOperation() == ThreadOperation.Socket) {
-      return daemon ? SOCKET_ICON_DAEMON : SOCKET_ICON;
+      return daemon ? SOCKET_ICON_DAEMON : Socket;
     }
     if (threadState.getOperation() == ThreadOperation.IO) {
-      return daemon ? IO_ICON_DAEMON : IO_ICON;
+      return daemon ? IO_ICON_DAEMON : IO;
     }
     if (threadState.isEDT()) {
       if ("idle".equals(threadState.getThreadStateDetail())) {
-        return daemon ? IDLE_ICON_DAEMON : IDLE_ICON;
+        return daemon ? IDLE_ICON_DAEMON : Idle;
       }
-      return daemon ? EDT_BUSY_ICON_DAEMON : EDT_BUSY_ICON;
+      return daemon ? EDT_BUSY_ICON_DAEMON : EdtBusy;
     }
-    return daemon ? RUNNING_ICON_DAEMON : RUNNING_ICON;
+    return daemon ? RUNNING_ICON_DAEMON : Running;
   }
 
   private static enum StateCode {RUN, RUN_IO, RUN_SOCKET, PAUSED, LOCKED, EDT, IDLE}
@@ -207,8 +201,6 @@ public class ThreadDumpPanel extends JPanel {
       }
     };
     private Comparator<ThreadState> COMPARATOR = BY_TYPE;
-    private final Icon typeIcon = AllIcons.ObjectBrowser.SortByType;
-    private final Icon nameIcon = AllIcons.Icons.Inspector.SortByName;
     private static final String TYPE_LABEL = "Sort threads by type";
     private static final String NAME_LABEL = "Sort threads by name";
     public SortThreadsAction() {
@@ -239,7 +231,7 @@ public class ThreadDumpPanel extends JPanel {
 
     @Override
     public void update(AnActionEvent e) {
-      e.getPresentation().setIcon(COMPARATOR == BY_TYPE ? typeIcon : nameIcon);
+      e.getPresentation().setIcon(COMPARATOR == BY_TYPE ? AllIcons.ObjectBrowser.SortByType : AllIcons.Icons.Inspector.SortByName);
       e.getPresentation().setText(COMPARATOR == BY_TYPE ? TYPE_LABEL : NAME_LABEL);
     }
   }
index 7eb33dcf1ccc6a64aa8a5fe349ce9f6ccb50b9e4..f1c634f31ffb6863d52baac1d582adad3b082299 100644 (file)
@@ -19,7 +19,6 @@ import com.intellij.execution.ui.ConsoleView;
 import com.intellij.execution.ui.RunContentDescriptor;
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
-import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.openapi.actionSystem.DefaultActionGroup;
 import com.intellij.openapi.extensions.Extensions;
@@ -39,6 +38,7 @@ import com.intellij.openapi.vcs.ProjectLevelVcsManager;
 import com.intellij.openapi.vcs.configurable.VcsContentAnnotationConfigurable;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.GuiUtils;
+import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.ui.TextFieldWithHistory;
 import com.intellij.util.ArrayUtil;
 import com.intellij.util.Consumer;
@@ -71,9 +71,6 @@ public class UnscrambleDialog extends DialogWrapper {
       return state.isDeadlocked();
     }
   };
-  private static final Icon THREAD_DUMP_ICON = AllIcons.Debugger.ThreadStates.Threaddump;
-  private static final Icon DEADLOCK_ICON = AllIcons.Debugger.KillProcess;
-  private static final Icon EXCEPTION_ICON = AllIcons.Debugger.ThreadStates.Exception;
 
   private final Project myProject;
   private JPanel myEditorPanel;
@@ -394,18 +391,18 @@ public class UnscrambleDialog extends DialogWrapper {
     String message = IdeBundle.message("unscramble.unscrambled.stacktrace.tab");
     if (!threadDump.isEmpty()) {
       message = IdeBundle.message("unscramble.unscrambled.threaddump.tab");
-      icon = THREAD_DUMP_ICON;
+      icon = AllIcons.Debugger.ThreadStates.Threaddump;
     }
     else {
       String name = getExceptionName(unscrambledTrace);
       if (name != null) {
         message = name;
-        icon = EXCEPTION_ICON;
+        icon = AllIcons.Debugger.ThreadStates.Exception;
       }
     }
     if (ContainerUtil.find(threadDump, DEADLOCK_CONDITION) != null) {
       message = IdeBundle.message("unscramble.unscrambled.deadlock.tab");
-      icon = DEADLOCK_ICON;
+      icon = AllIcons.Debugger.KillProcess;
     }
     return AnalyzeStacktraceUtil.addConsole(project, threadDump.size() > 1 ? new AnalyzeStacktraceUtil.ConsoleFactory() {
       public JComponent createConsoleComponent(ConsoleView consoleView, DefaultActionGroup toolbarActions) {
index e48525b725c461657af07a7e4559f9e745eda3d0..a265bf263d47996e8b18a04b61340586cda529f8 100644 (file)
@@ -27,7 +27,6 @@ import javax.swing.*;
 public class JavaFileType extends LanguageFileType {
   @NonNls public static final String DEFAULT_EXTENSION = "java";
   @NonNls public static final String DOT_DEFAULT_EXTENSION = ".java";
-  private static final Icon ICON = AllIcons.FileTypes.Java;
   public static final JavaFileType INSTANCE = new JavaFileType();
 
   private JavaFileType() {
@@ -54,7 +53,7 @@ public class JavaFileType extends LanguageFileType {
 
   @Override
   public Icon getIcon() {
-    return ICON;
+    return AllIcons.FileTypes.Java;
   }
 
   @Override
index d1917a8bdcdbeae77503c04477db2261babdb749..517bd7e18b9c63f61e39cd648949786fa97526e3 100644 (file)
@@ -34,12 +34,6 @@ import gnu.trove.TIntObjectHashMap;
 import javax.swing.*;
 
 public class ElementPresentationUtil implements PlatformIcons {
-  private static final Icon STATIC_MARK_ICON = AllIcons.Nodes.StaticMark;
-  private static final Icon FINAL_MARK_ICON = AllIcons.Nodes.FinalMark;
-  public static final Icon JUNIT_TEST_MARK = AllIcons.Nodes.JunitTestMark;
-  private static final Icon RUNNABLE_MARK = AllIcons.Nodes.RunnableMark;
-
-
   private ElementPresentationUtil() {
   }
 
@@ -69,8 +63,6 @@ public class ElementPresentationUtil implements PlatformIcons {
     return ElementBase.createLayeredIcon(element, baseIcon, getFlags(element, isLocked));
   }
 
-  private static final Icon ABSTRACT_EXCEPTION_CLASS_ICON = AllIcons.Nodes.AbstractException;
-
   private static final int CLASS_KIND_INTERFACE     = 10;
   private static final int CLASS_KIND_ANNOTATION    = 20;
   public static final int CLASS_KIND_CLASS         = 30;
@@ -168,7 +160,7 @@ public class ElementPresentationUtil implements PlatformIcons {
     BASE_ICON.put(CLASS_KIND_ENUM, ENUM_ICON);
     BASE_ICON.put(CLASS_KIND_ENUM | FLAGS_ABSTRACT, ENUM_ICON);
     BASE_ICON.put(CLASS_KIND_EXCEPTION, EXCEPTION_CLASS_ICON);
-    BASE_ICON.put(CLASS_KIND_EXCEPTION | FLAGS_ABSTRACT, ABSTRACT_EXCEPTION_CLASS_ICON);
+    BASE_ICON.put(CLASS_KIND_EXCEPTION | FLAGS_ABSTRACT, AllIcons.Nodes.AbstractException);
     BASE_ICON.put(CLASS_KIND_INTERFACE, INTERFACE_ICON);
     BASE_ICON.put(CLASS_KIND_INTERFACE | FLAGS_ABSTRACT, INTERFACE_ICON);
     BASE_ICON.put(CLASS_KIND_JUNIT_TEST, CLASS_ICON);
@@ -231,10 +223,10 @@ public class ElementPresentationUtil implements PlatformIcons {
 
 
   static {
-    ElementBase.registerIconLayer(FLAGS_STATIC, STATIC_MARK_ICON);
-    ElementBase.registerIconLayer(FLAGS_FINAL, FINAL_MARK_ICON);
-    ElementBase.registerIconLayer(FLAGS_JUNIT_TEST, JUNIT_TEST_MARK);
-    ElementBase.registerIconLayer(FLAGS_RUNNABLE, RUNNABLE_MARK);
+    ElementBase.registerIconLayer(FLAGS_STATIC, AllIcons.Nodes.StaticMark);
+    ElementBase.registerIconLayer(FLAGS_FINAL, AllIcons.Nodes.FinalMark);
+    ElementBase.registerIconLayer(FLAGS_JUNIT_TEST, AllIcons.Nodes.JunitTestMark);
+    ElementBase.registerIconLayer(FLAGS_RUNNABLE, AllIcons.Nodes.RunnableMark);
   }
 
   public static Icon addVisibilityIcon(final PsiModifierListOwner element, final int flags, final RowIcon baseIcon) {
index be97392947d0786c6064bb76efa498a3b5462670..a091f391147c95a5c72236ef7d76f511d4b77e5d 100644 (file)
@@ -27,7 +27,6 @@ import com.intellij.psi.PsiClass;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.ui.*;
 import com.intellij.ui.components.JBList;
-import com.intellij.util.PlatformIcons;
 import com.intellij.util.ui.EmptyIcon;
 
 import javax.swing.*;
@@ -44,8 +43,6 @@ import java.util.Set;
  * Date: 1/25/11
  */
 public class NullableNotNullDialog extends DialogWrapper {
-  private static final Icon SELECT_ICON = PlatformIcons.CHECK_ICON;
-  private static final Icon SELECTED_ICON = AllIcons.Diff.CurrentLine;
 
   private final Project myProject;
   private AnnotationsPanel myNullablePanel;
@@ -103,7 +100,7 @@ public class NullableNotNullDialog extends DialogWrapper {
         protected void customizeCellRenderer(JList list, Object value, int index, boolean selected, boolean hasFocus) {
           append((String)value, SimpleTextAttributes.REGULAR_ATTRIBUTES);
           if (value.equals(myDefaultAnnotation)) {
-            setIcon(SELECTED_ICON);
+            setIcon(AllIcons.Diff.CurrentLine);
           } else {
             setIcon(EmptyIcon.ICON_16);
           }
@@ -114,7 +111,7 @@ public class NullableNotNullDialog extends DialogWrapper {
       });
 
       final AnActionButton selectButton =
-        new AnActionButton("Select annotation used for code generation", SELECT_ICON) {
+        new AnActionButton("Select annotation used for code generation", AllIcons.Actions.Checked) {
           @Override
           public void actionPerformed(AnActionEvent e) {
             final String selectedValue = (String)myList.getSelectedValue();
index abc3163e6b2dad52649217b66127a81a72a9e268..eb8a87654e5a4ca733890b5a38fc4a183caa24d4 100644 (file)
@@ -22,7 +22,6 @@ import javax.swing.*;
 
 public class PlainTextFileType extends LanguageFileType {
   public static final PlainTextFileType INSTANCE = new PlainTextFileType();
-  private static final Icon ICON = AllIcons.FileTypes.Text;
 
   private PlainTextFileType() {
     super(PlainTextLanguage.INSTANCE);
@@ -48,6 +47,6 @@ public class PlainTextFileType extends LanguageFileType {
 
   @Override
   public Icon getIcon() {
-    return ICON;
+    return AllIcons.FileTypes.Text;
   }
 }
index a5b517458c890eff425303ba41ef3136d80079cc..79e7339a1b5080b58ab8f604f7edcd8e51aa839e 100644 (file)
@@ -27,9 +27,8 @@ import com.intellij.openapi.util.Iconable;
 import javax.swing.*;
 
 public abstract class SuppressIntentionAction extends PsiElementBaseIntentionAction implements Iconable {
-  private static final Icon ICON = AllIcons.General.InspectionsOff;
 
   public Icon getIcon(int flags) {
-    return ICON;
+    return AllIcons.General.InspectionsOff;
   }
 }
index ba5b0511dc9cfe5656f20155a457a5cbeff50c82..95c74e3cd1b3295408b9011e4372a113cf2656ad 100644 (file)
@@ -29,7 +29,6 @@ public class UnknownConfigurationType implements ConfigurationType {
 
   public static final UnknownConfigurationType INSTANCE = new UnknownConfigurationType();
 
-  private static final Icon ICON = AllIcons.RunConfigurations.Unknown;
   public static final String NAME = "Unknown";
 
   public String getDisplayName() {
@@ -41,7 +40,7 @@ public class UnknownConfigurationType implements ConfigurationType {
   }
 
   public Icon getIcon() {
-    return ICON;
+    return AllIcons.RunConfigurations.Unknown;
   }
 
   @NotNull
index 78d829f05048f945407e60cae88932303d27957b..4f7a50e79c1b67e485124332a004e96be89e7567 100644 (file)
@@ -33,10 +33,6 @@ import javax.swing.*;
 public class DefaultRunExecutor extends Executor {
   @NonNls public static final String EXECUTOR_ID = ToolWindowId.RUN;
 
-  private static final Icon ICON = AllIcons.Actions.Execute;
-  private static final Icon TOOLWINDOW_ICON = AllIcons.Toolwindows.ToolWindowRun;
-  private static final Icon DISABLED_ICON = AllIcons.Process.DisabledRun;
-
   @NotNull
   public String getStartActionText() {
     return ExecutionBundle.message("default.runner.start.action.text");
@@ -47,16 +43,16 @@ public class DefaultRunExecutor extends Executor {
   }
 
   public Icon getToolWindowIcon() {
-    return TOOLWINDOW_ICON;
+    return AllIcons.Toolwindows.ToolWindowRun;
   }
 
   @NotNull
   public Icon getIcon() {
-    return ICON;
+    return AllIcons.Actions.Execute;
   }
 
   public Icon getDisabledIcon() {
-    return DISABLED_ICON;
+    return AllIcons.Process.DisabledRun;
   }
 
   public String getDescription() {
index ace8598bc8d73091775210a679f1834eedee6ca7..e79e89b0bcc44fd4fb7ade9a438e2fc44feab55f 100644 (file)
@@ -30,8 +30,6 @@ import java.util.Map;
  *         Date: Dec 11, 2004
  */
 public class UnknownSdkType extends SdkType{
-  public static final Icon ICON = AllIcons.Nodes.UnknownJdkClosed;
-  private static final Icon JDK_ICON_EXPANDED = AllIcons.Nodes.UnknownJdkOpen;
   private static final Map<String, UnknownSdkType> ourTypeNameToInstanceMap = new HashMap<String, UnknownSdkType>();
 
   /**
@@ -90,10 +88,10 @@ public class UnknownSdkType extends SdkType{
   }
 
   public Icon getIcon() {
-    return ICON;
+    return AllIcons.Nodes.UnknownJdkClosed;
   }
 
   public Icon getIconForExpandedTreeNode() {
-    return JDK_ICON_EXPANDED;
+    return AllIcons.Nodes.UnknownJdkOpen;
   }
 }
index d120e3c0fd068d80adf2f470f505522dc1bf2cd9..dcc496eb16df7fa5b860de1c7661cd61bceb43f0 100644 (file)
@@ -55,8 +55,6 @@ public class PathEditor {
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.projectRoots.ui.PathEditor");
 
   public static final Color INVALID_COLOR = new Color(210, 0, 0);
-  private static final Icon ICON_INVALID = AllIcons.Nodes.PpInvalid;
-  private static final Icon ICON_EMPTY = AllIcons.Nodes.EmptyNode;
 
   protected JPanel myPanel;
   private JBList myList;
@@ -346,7 +344,7 @@ public class PathEditor {
     if (projectRoot instanceof VirtualFile) {
       final VirtualFile file = (VirtualFile)projectRoot;
       if (!file.isValid()) {
-        return ICON_INVALID;
+        return AllIcons.Nodes.PpInvalid;
       }
       else if (isHttpRoot(file)) {
         return PlatformIcons.WEB_ICON;
@@ -355,7 +353,7 @@ public class PathEditor {
         return isJarFile(file) ? PlatformIcons.JAR_ICON : PlatformIcons.FILE_ICON;
       }
     }
-    return ICON_EMPTY;
+    return AllIcons.Nodes.EmptyNode;
   }
 
   private static boolean isHttpRoot(VirtualFile virtualFileOrProjectRoot) {
index aa0cf2b1da1b9092a67114b9f5eeec5f3542050e..2eb829bdf3dd85e24191dded968290c773bcb243 100644 (file)
@@ -28,8 +28,6 @@ import javax.swing.*;
  * @author Rustam Vishnyakov
  */
 public class DocumentationOrderRootTypeUIFactory implements OrderRootTypeUIFactory {
-  
-  private static final Icon ICON = AllIcons.Nodes.JavaDocFolder;
 
   @Override
   @Nullable
@@ -39,7 +37,7 @@ public class DocumentationOrderRootTypeUIFactory implements OrderRootTypeUIFacto
 
   @Override
   public Icon getIcon() {
-    return ICON;
+    return AllIcons.Nodes.JavaDocFolder;
   }
 
   @Override
index 08e4584d58d9bb0b7d5e9878ad4811171a68ae0d..b9cbe69647a0182acfc50b2f98cfef16121c8dad 100644 (file)
  */
 package com.intellij.profile;
 
-import com.intellij.icons.AllIcons;
 import com.intellij.openapi.options.Scheme;
 import com.intellij.openapi.util.JDOMExternalizable;
 import org.jetbrains.annotations.NotNull;
 
-import javax.swing.*;
-
 /**
  * User: anna
  * Date: 20-Nov-2005
  */
 public interface Profile extends JDOMExternalizable, Comparable, Scheme {
-  Icon LOCAL_PROFILE = AllIcons.General.ApplicationSettings;
-  Icon PROJECT_PROFILE = AllIcons.General.ProjectSettings;
 
   void copyFrom(@NotNull Profile profile);
 
index 2033877484484d2b57ddbc2c3679bdafdf7957e8..6ccf963b8d240d5411dbffefe1aa3b7b83d6fe9e 100644 (file)
@@ -31,9 +31,6 @@ import javax.swing.*;
  * @author Vladimir Kondratyev
  */
 public class TodoAttributes implements JDOMExternalizable, Cloneable {
-  public static final Icon DEFAULT_ICON = AllIcons.General.TodoDefault;
-  public static final Icon QUESTION_ICON = AllIcons.General.TodoQuestion;
-  public static final Icon IMPORTANT_ICON = AllIcons.General.TodoImportant;
 
   private Icon myIcon;
   private TextAttributes myTextAttributes = new TextAttributes();
@@ -75,7 +72,7 @@ public class TodoAttributes implements JDOMExternalizable, Cloneable {
 
   public static TodoAttributes createDefault() {
     final TextAttributes textAttributes = getDefaultColorSchemeTextAttributes().clone();
-    return new TodoAttributes(DEFAULT_ICON, textAttributes);
+    return new TodoAttributes(AllIcons.General.TodoDefault, textAttributes);
   }
 
   private static TextAttributes getDefaultColorSchemeTextAttributes() {
@@ -86,13 +83,13 @@ public class TodoAttributes implements JDOMExternalizable, Cloneable {
     String icon = element.getAttributeValue(ATTRIBUTE_ICON,ICON_DEFAULT);
 
     if (ICON_DEFAULT.equals(icon)){
-      myIcon = DEFAULT_ICON;
+      myIcon = AllIcons.General.TodoDefault;
     }
     else if (ICON_QUESTION.equals(icon)){
-      myIcon = QUESTION_ICON;
+      myIcon = AllIcons.General.TodoQuestion;
     }
     else if (ICON_IMPORTANT.equals(icon)){
-      myIcon = IMPORTANT_ICON;
+      myIcon = AllIcons.General.TodoImportant;
     }
     else{
       throw new InvalidDataException(icon);
@@ -113,13 +110,13 @@ public class TodoAttributes implements JDOMExternalizable, Cloneable {
 
   public void writeExternal(Element element) throws WriteExternalException {
     String icon;
-    if (myIcon == DEFAULT_ICON){
+    if (myIcon == AllIcons.General.TodoDefault){
       icon = ICON_DEFAULT;
     }
-    else if (myIcon == QUESTION_ICON){
+    else if (myIcon == AllIcons.General.TodoQuestion){
       icon = ICON_QUESTION;
     }
-    else if (myIcon == IMPORTANT_ICON){
+    else if (myIcon == AllIcons.General.TodoImportant){
       icon = ICON_IMPORTANT;
     }
     else{
index 5206ddab6a4d5226410ff51f69faad3feff67b21..4b4693f92ec42648e6c98cd9c00fceb75710f9c0 100644 (file)
@@ -33,7 +33,6 @@ import javax.swing.*;
     )}
 )
 public class NamedScopeManager extends NamedScopesHolder {
-  private static final Icon LOCAL_SCOPES = AllIcons.Ide.LocalScope;
 
   public NamedScopeManager(final Project project) {
     super(project);
@@ -48,6 +47,6 @@ public class NamedScopeManager extends NamedScopesHolder {
   }
 
   public Icon getIcon() {
-    return LOCAL_SCOPES;
+    return AllIcons.Ide.LocalScope;
   }
 }
index f1f797c2cf0310301721414faf568f433a2d221e..6c0842ebf2bf49ae3b634961f0b78d7f795840b3 100644 (file)
@@ -19,20 +19,15 @@ import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 
-import javax.swing.*;
-
 /**
  * @author Denis Zhdanov
  * @since 8/23/12 11:41 AM
  */
 public class ArrangementRemoveConditionAction extends AnAction {
 
-  private static final Icon ICON       = AllIcons.Actions.CloseNew;
-  private static final Icon HOVER_ICON = AllIcons.Actions.CloseNewHovered;
-
   public ArrangementRemoveConditionAction() {
-    getTemplatePresentation().setIcon(ICON);
-    getTemplatePresentation().setHoveredIcon(HOVER_ICON);
+    getTemplatePresentation().setIcon(AllIcons.Actions.CloseNew);
+    getTemplatePresentation().setHoveredIcon(AllIcons.Actions.CloseNewHovered);
   }
 
   @Override
index 70a0a47f6f4b317eda78e69acd856d697242ea8a..3f7398ab86ae4f24cdd5b57e65ca9cb7823ef356 100644 (file)
@@ -28,7 +28,6 @@ import javax.swing.*;
 import java.util.List;
 
 public class ElementLocationUtil {
-  public static final Icon LIB_ICON_CLOSED = AllIcons.Nodes.PpLibClosed;//TODO: Move to a more proper place
 
   private ElementLocationUtil() {
   }
@@ -66,7 +65,7 @@ public class ElementLocationUtil {
 
         if (entry != null) {
           label.setText(entry.getPresentableName());
-          label.setIcon(LIB_ICON_CLOSED);
+          label.setIcon(AllIcons.Nodes.PpLibClosed);
         }
       }
     }
index 09ea7c0ca581420e89cca32dd5542ce867839d68..b7c7316ede74fa1529840dad7a49c56f2c76a71f 100644 (file)
@@ -18,7 +18,6 @@ package com.intellij.codeInsight.hint;
 import com.intellij.codeInsight.CodeInsightBundle;
 import com.intellij.icons.AllIcons;
 import com.intellij.ide.highlighter.HighlighterFactory;
-import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.navigation.NavigationItem;
 import com.intellij.openapi.actionSystem.*;
@@ -43,6 +42,7 @@ import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiUtilBase;
 import com.intellij.ui.IdeBorderFactory;
+import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.ui.SideBorder;
 import com.intellij.ui.components.JBScrollPane;
 import com.intellij.usageView.UsageInfo;
@@ -69,7 +69,6 @@ import java.util.Set;
 public class ImplementationViewComponent extends JPanel {
   @NonNls private static final String TEXT_PAGE_KEY = "Text";
   @NonNls private static final String BINARY_PAGE_KEY = "Binary";
-  private static final Icon FIND_ICON = AllIcons.Actions.Find;
 
   private PsiElement[] myElements;
   private int myIndex;
@@ -583,7 +582,7 @@ public class ImplementationViewComponent extends JPanel {
     private static final String ACTION_NAME = "Show in usage view";
 
     public ShowFindUsagesAction() {
-      super(ACTION_NAME, ACTION_NAME, FIND_ICON);
+      super(ACTION_NAME, ACTION_NAME, AllIcons.Actions.Find);
     }
 
     @Override
index d59e083557db8324ad8314b4c4820bbcc4f2abed..dced3c36d7ee5bf71c03c31f89a44e8f6dcc592b 100644 (file)
@@ -33,7 +33,6 @@ import com.intellij.ui.ClickListener;
 import com.intellij.ui.EditorNotificationPanel;
 import com.intellij.ui.LightColors;
 
-import javax.swing.*;
 import java.awt.*;
 import java.awt.event.MouseEvent;
 import java.util.List;
@@ -42,9 +41,6 @@ import java.util.List;
  * @author max
  */
 public class FileLevelIntentionComponent extends EditorNotificationPanel {
-  private static final Icon ourIntentionIcon = AllIcons.Actions.IntentionBulb;
-  private static final Icon ourQuickFixIcon = AllIcons.Actions.QuickfixBulb;
-
   private final Project myProject;
 
   public FileLevelIntentionComponent(final String description,
@@ -73,7 +69,7 @@ public class FileLevelIntentionComponent extends EditorNotificationPanel {
     }
 
     myLabel.setText(description);
-    myLabel.setIcon(SeverityRegistrar.getInstance(project).compare(severity, HighlightSeverity.ERROR) >= 0 ? ourQuickFixIcon : ourIntentionIcon);
+    myLabel.setIcon(SeverityRegistrar.getInstance(project).compare(severity, HighlightSeverity.ERROR) >= 0 ? AllIcons.Actions.QuickfixBulb : AllIcons.Actions.IntentionBulb);
     setBackground(getColor(severity));
 
     new ClickListener() {
index 02e142e96bbef6fef071eeb976134faa6d02cb36..abdc8fdb6b0692515e97c4a987657c75f34f0305 100644 (file)
@@ -79,14 +79,7 @@ import java.util.List;
 public class IntentionHintComponent extends JPanel implements Disposable, ScrollAwareHint {
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.intention.impl.IntentionHintComponent.ListPopupRunnable");
 
-  static final Icon ourIntentionIcon = AllIcons.Actions.RealIntentionBulb;
-  static final Icon ourBulbIcon = AllIcons.Actions.IntentionBulb;
-  static final Icon ourQuickFixIcon = AllIcons.Actions.QuickfixBulb;
-  static final Icon ourRefactoringBulbIcon = AllIcons.Actions.RefactoringBulb;
-  static final Icon ourIntentionOffIcon = AllIcons.Actions.RealIntentionOffBulb;
-  static final Icon ourQuickFixOffIcon = AllIcons.Actions.QuickfixOffBulb;
-  static final Icon ourArrowIcon = AllIcons.General.ArrowDown;
-  static final Icon ourInactiveArrowIcon = new EmptyIcon(ourArrowIcon.getIconWidth(), ourArrowIcon.getIconHeight());
+  static final Icon ourInactiveArrowIcon = new EmptyIcon(AllIcons.General.ArrowDown.getIconWidth(), AllIcons.General.ArrowDown.getIconHeight());
   
   private static final int NORMAL_BORDER_SIZE = 6;
   private static final int SMALL_BORDER_SIZE = 4;
@@ -264,17 +257,18 @@ public class IntentionHintComponent extends JPanel implements Disposable, Scroll
         }
       }
 
-      realPoint = new Point(- (ourIntentionIcon.getIconWidth() / 2) - 4, - (ourIntentionIcon.getIconHeight() / 2));
+      realPoint = new Point(- (AllIcons.Actions.RealIntentionBulb.getIconWidth() / 2) - 4, - (AllIcons.Actions.RealIntentionBulb
+                                                                                                .getIconHeight() / 2));
     } else {
       // try to place bulb on the same line
       final int borderHeight = NORMAL_BORDER_SIZE;
 
-      int yShift = -(NORMAL_BORDER_SIZE + ourIntentionIcon.getIconHeight());
+      int yShift = -(NORMAL_BORDER_SIZE + AllIcons.Actions.RealIntentionBulb.getIconHeight());
       if (canPlaceBulbOnTheSameLine(editor)) {
-        yShift = -(borderHeight + ((ourIntentionIcon.getIconHeight() - editor.getLineHeight())/2) + 3);
+        yShift = -(borderHeight + ((AllIcons.Actions.RealIntentionBulb.getIconHeight() - editor.getLineHeight())/2) + 3);
       }
 
-      final int xShift = ourIntentionIcon.getIconWidth();
+      final int xShift = AllIcons.Actions.RealIntentionBulb.getIconWidth();
 
       Rectangle visibleArea = editor.getScrollingModel().getVisibleArea();
       realPoint = new Point(Math.max(0,visibleArea.x - xShift), position.y + yShift);
@@ -293,7 +287,7 @@ public class IntentionHintComponent extends JPanel implements Disposable, Scroll
     final int firstNonSpaceColumnOnTheLine = EditorActionUtil.findFirstNonSpaceColumnOnTheLine(editor, line);
     if (firstNonSpaceColumnOnTheLine == -1) return false;
     final Point point = editor.visualPositionToXY(new VisualPosition(line, firstNonSpaceColumnOnTheLine));
-    return point.x > (ourIntentionIcon.getIconWidth() + (editor.isOneLineMode() ? SMALL_BORDER_SIZE : NORMAL_BORDER_SIZE) * 2);
+    return point.x > (AllIcons.Actions.RealIntentionBulb.getIconWidth() + (editor.isOneLineMode() ? SMALL_BORDER_SIZE : NORMAL_BORDER_SIZE) * 2);
   }
                                                                  
   private IntentionHintComponent(@NotNull Project project,
@@ -326,11 +320,11 @@ public class IntentionHintComponent extends JPanel implements Disposable, Scroll
       }
     }
 
-    Icon smartTagIcon = showRefactoringsBulb ? ourRefactoringBulbIcon : showFix ? ourQuickFixIcon : ourBulbIcon;
+    Icon smartTagIcon = showRefactoringsBulb ? AllIcons.Actions.RefactoringBulb : showFix ? AllIcons.Actions.QuickfixBulb : AllIcons.Actions.IntentionBulb;
 
     myHighlightedIcon = new RowIcon(2);
     myHighlightedIcon.setIcon(smartTagIcon, 0);
-    myHighlightedIcon.setIcon(ourArrowIcon, 1);
+    myHighlightedIcon.setIcon(AllIcons.General.ArrowDown, 1);
 
     myInactiveIcon = new RowIcon(2);
     myInactiveIcon.setIcon(smartTagIcon, 0);
index 87ff08ea9a159c4b7c2b29c82f9a3b22cdedd902..fc35e11f886f626113f44748ab39c0e39d99f480 100644 (file)
@@ -28,6 +28,7 @@ import com.intellij.codeInsight.intention.impl.config.IntentionManagerSettings;
 import com.intellij.codeInspection.IntentionWrapper;
 import com.intellij.codeInspection.LocalQuickFix;
 import com.intellij.codeInspection.ex.QuickFixWrapper;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Editor;
@@ -356,12 +357,12 @@ class IntentionListStep implements ListPopupStep<IntentionActionWithTextCaching>
     }
 
     if (mySettings.isShowLightBulb(action)) {
-      return myCachedErrorFixes.contains(value) ? IntentionHintComponent.ourQuickFixIcon
-             : myCachedInspectionFixes.contains(value) ? IntentionHintComponent.ourBulbIcon :
-               IntentionHintComponent.ourIntentionIcon;
+      return myCachedErrorFixes.contains(value) ? AllIcons.Actions.QuickfixBulb
+             : myCachedInspectionFixes.contains(value) ? AllIcons.Actions.IntentionBulb :
+               AllIcons.Actions.RealIntentionBulb;
     }
     else {
-      return myCachedErrorFixes.contains(value) ? IntentionHintComponent.ourQuickFixOffIcon : IntentionHintComponent.ourIntentionOffIcon;
+      return myCachedErrorFixes.contains(value) ? AllIcons.Actions.QuickfixOffBulb : AllIcons.Actions.RealIntentionOffBulb;
     }
   }
 
index d83a10f7698b2a3816103d720943d38cdfec2efa..6c77d1e516cd6cf744828ed6b955cbed78802ec0 100644 (file)
@@ -90,9 +90,6 @@ import java.util.List;
 public class LookupImpl extends LightweightHint implements LookupEx, Disposable {
   private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.lookup.impl.LookupImpl");
 
-  private static final Icon relevanceSortIcon = AllIcons.Ide.LookupRelevance;
-  private static final Icon lexiSortIcon = AllIcons.Ide.LookupAlphanumeric;
-
   private final LookupOffsets myOffsets;
   private final Project myProject;
   private final Editor myEditor;
@@ -201,7 +198,7 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
 
     myAdComponent = new Advertiser();
     JComponent adComponent = myAdComponent.getAdComponent();
-    adComponent.setBorder(new EmptyBorder(0, 1, 1, 2 + relevanceSortIcon.getIconWidth()));
+    adComponent.setBorder(new EmptyBorder(0, 1, 1, 2 + AllIcons.Ide.LookupRelevance.getIconWidth()));
     myLayeredPane.mainPanel.add(adComponent, BorderLayout.SOUTH);
     getComponent().setBorder(new BegPopupMenuBorder());
 
@@ -258,7 +255,7 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
 
   private void updateSorting() {
     final boolean lexi = UISettings.getInstance().SORT_LOOKUP_ELEMENTS_LEXICOGRAPHICALLY;
-    mySortingLabel.setIcon(lexi ? lexiSortIcon : relevanceSortIcon);
+    mySortingLabel.setIcon(lexi ? AllIcons.Ide.LookupAlphanumeric : AllIcons.Ide.LookupRelevance);
     mySortingLabel.setToolTipText(lexi ? "Click to sort variants by relevance" : "Click to sort variants alphabetically");
 
     resort(false);
@@ -1367,7 +1364,8 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable
 
     private void layoutStatusIcons() {
       int adHeight = myAdComponent.getAdComponent().getPreferredSize().height;
-      Dimension buttonSize = adHeight > 0 || !mySortingLabel.isVisible() ? new Dimension(0, 0) : new Dimension(relevanceSortIcon.getIconWidth(), relevanceSortIcon.getIconHeight());
+      Dimension buttonSize = adHeight > 0 || !mySortingLabel.isVisible() ? new Dimension(0, 0) : new Dimension(
+        AllIcons.Ide.LookupRelevance.getIconWidth(), AllIcons.Ide.LookupRelevance.getIconHeight());
       myScrollBarIncreaseButton.setPreferredSize(buttonSize);
       myScrollBarIncreaseButton.setMinimumSize(buttonSize);
       myScrollBarIncreaseButton.setMaximumSize(buttonSize);
index 63d6ee958051d6ba2363d3ad054ff0f3a90d0cd5..6fddee9ae2e2a3d40b10e05f3cc08369472bbd56 100644 (file)
@@ -24,7 +24,7 @@ import com.intellij.codeInspection.InspectionProfile;
 import com.intellij.codeInspection.InspectionsBundle;
 import com.intellij.codeInspection.ex.GlobalInspectionContextImpl;
 import com.intellij.codeInspection.ex.InspectionManagerEx;
-import com.intellij.ui.ListCellRendererWrapper;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.options.ex.SingleConfigurableEditor;
 import com.intellij.openapi.project.Project;
@@ -35,6 +35,7 @@ import com.intellij.profile.codeInspection.InspectionProjectProfileManager;
 import com.intellij.profile.codeInspection.ui.ErrorsConfigurable;
 import com.intellij.profile.codeInspection.ui.IDEInspectionToolsConfigurable;
 import com.intellij.ui.ComboboxWithBrowseButton;
+import com.intellij.ui.ListCellRendererWrapper;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
@@ -96,7 +97,7 @@ public class CodeInspectionAction extends BaseAnalysisAction {
         if (value instanceof Profile) {
           final Profile profile = (Profile)value;
           setText(profile.getName());
-          setIcon(profile.isLocal() ? Profile.LOCAL_PROFILE : Profile.PROJECT_PROFILE);
+          setIcon(profile.isLocal() ? AllIcons.General.ApplicationSettings : AllIcons.General.ProjectSettings);
         }
       }
     });
index df111cddda4fcfa23474a717c2d072d6b241ca90..e1eecae61fd8fc3f4050472ddcab9065fe5d14b4 100644 (file)
@@ -40,7 +40,6 @@ import java.io.IOException;
 public class DisableInspectionToolAction implements IntentionAction, Iconable {
   private final String myToolId;
   public static final String NAME = InspectionsBundle.message("disable.inspection.action.name");
-  private static final Icon ICON = AllIcons.Actions.Cancel;
 
   public DisableInspectionToolAction(LocalInspectionTool tool) {
     myToolId = tool.getShortName();
@@ -83,6 +82,6 @@ public class DisableInspectionToolAction implements IntentionAction, Iconable {
   }
 
   public Icon getIcon(int flags) {
-    return ICON;
+    return AllIcons.Actions.Cancel;
   }
 }
index a3fdefaf428d1ebba03cab2e1396ef8cb502fa86..ae61a13a2b171e56f18a20b06cc0a8d1467a99dd 100644 (file)
@@ -43,7 +43,6 @@ import javax.swing.*;
  */
 public class EditInspectionToolsSettingsAction implements IntentionAction, Iconable, HighPriorityAction {
   private final String myShortName;
-  private static final Icon ICON = AllIcons.General.IdeOptions;
 
   public EditInspectionToolsSettingsAction(@NotNull LocalInspectionTool tool) {
     myShortName = tool.getShortName();
@@ -114,6 +113,6 @@ public class EditInspectionToolsSettingsAction implements IntentionAction, Icona
   }
 
   public Icon getIcon(int flags) {
-    return ICON;
+    return AllIcons.General.IdeOptions;
   }
 }
index 4c5437ccab0c9eeb39d405cf0a57802e8948604a..1119bb650e23b173eb974a44bd4165efed445087 100644 (file)
@@ -38,9 +38,6 @@ import javax.swing.*;
  * @author max
  */
 public class ProblemDescriptionNode extends InspectionTreeNode {
-  private static final Icon INFO = AllIcons.Compiler.Information;
-  private static final Icon ERROR = AllIcons.Compiler.Error;
-  private static final Icon WARNING = AllIcons.Compiler.Warning;
   protected RefEntity myElement;
   private final CommonProblemDescriptor myDescriptor;
   protected final DescriptorProviderInspection myTool;
@@ -73,10 +70,10 @@ public class ProblemDescriptionNode extends InspectionTreeNode {
   public Icon getIcon(boolean expanded) {
     if (myDescriptor instanceof ProblemDescriptorImpl) {
       ProblemHighlightType problemHighlightType = ((ProblemDescriptorImpl)myDescriptor).getHighlightType();
-      if (problemHighlightType == ProblemHighlightType.ERROR) return ERROR;
-      if (problemHighlightType == ProblemHighlightType.GENERIC_ERROR_OR_WARNING) return WARNING;
+      if (problemHighlightType == ProblemHighlightType.ERROR) return AllIcons.Compiler.Error;
+      if (problemHighlightType == ProblemHighlightType.GENERIC_ERROR_OR_WARNING) return AllIcons.Compiler.Warning;
     }
-    return INFO;
+    return AllIcons.Compiler.Information;
   }
 
   public int getProblemCount() {
index a00945025e8add15e20abe157f6536094cf24775..207ca4aadcf6e77c183d272f91761b1f172207bc 100644 (file)
@@ -42,7 +42,6 @@ import javax.swing.*;
  */\r
 public class ProgramRunnerUtil {\r
   private static final Logger LOG = Logger.getInstance("#com.intellij.execution.ProgramRunnerUtil");\r
-  private static final Icon INVALID_CONFIGURATION = AllIcons.RunConfigurations.InvalidConfigurationLayer;\r
 \r
   private ProgramRunnerUtil() {\r
   }\r
@@ -130,7 +129,7 @@ public class ProgramRunnerUtil {
 \r
     final Icon configurationIcon = isTemporary ? IconLoader.getTransparentIcon(icon, 0.3f) : icon;\r
     if (invalid) {\r
-      return LayeredIcon.create(configurationIcon, INVALID_CONFIGURATION);\r
+      return LayeredIcon.create(configurationIcon, AllIcons.RunConfigurations.InvalidConfigurationLayer);\r
     }\r
 \r
     return configurationIcon;\r
index 6ed1abc0aa11405c85f66f3ecde58ae34b908b9a..c849ce9ec657ff01239475ba6813588e2c85ba33 100644 (file)
@@ -53,8 +53,6 @@ import java.util.*;
 import java.util.List;
 
 public class ChooseRunConfigurationPopup {
-  private static final Icon EDIT_ICON = AllIcons.Actions.EditSource;
-  private static final Icon SAVE_ICON = AllIcons.RunConfigurations.SaveTempConfig;
 
   private final Project myProject;
   @NotNull private final String myAddKey;
@@ -510,7 +508,7 @@ public class ChooseRunConfigurationPopup {
       final ItemWrapper edit = new ItemWrapper(null) {
         @Override
         public Icon getIcon() {
-          return EDIT_ICON;
+          return AllIcons.Actions.EditSource;
         }
 
         @Override
@@ -789,7 +787,7 @@ public class ChooseRunConfigurationPopup {
         }
       }
 
-      result.add(new ActionWrapper("Edit...", EDIT_ICON, true) {
+      result.add(new ActionWrapper("Edit...", AllIcons.Actions.EditSource, true) {
         @Override
         public void perform() {
           final RunManagerEx manager = RunManagerEx.getInstanceEx(project);
@@ -799,7 +797,7 @@ public class ChooseRunConfigurationPopup {
       });
 
       if (RunManager.getInstance(project).isTemporary(settings.getConfiguration()) || dynamic) {
-        result.add(new ActionWrapper("Save configuration", SAVE_ICON) {
+        result.add(new ActionWrapper("Save configuration", AllIcons.RunConfigurations.SaveTempConfig) {
           @Override
           public void perform() {
             final RunManagerEx manager = RunManagerEx.getInstanceEx(project);
index 2496c1a8e9819c657359f3720c063d403db89fdf..1e4568f31ad39110ec74d55833bc628bf123b988 100644 (file)
@@ -199,11 +199,10 @@ public class RunConfigurationsComboBoxAction extends ComboBoxAction implements D
   }\r
 \r
   private static class SaveTemporaryAction extends AnAction {\r
-    private static final Icon ICON = AllIcons.RunConfigurations.SaveTempConfig;\r
 \r
     public SaveTemporaryAction() {\r
       Presentation presentation = getTemplatePresentation();\r
-      presentation.setIcon(ICON);\r
+      presentation.setIcon(AllIcons.RunConfigurations.SaveTempConfig);\r
     }\r
 \r
     public void actionPerformed(final AnActionEvent e) {\r
index 1c9dbe0faddc5ed54c009156d00c4721af1959b7..a2b31898012c792f0ae283d6b042b15588fec3fe 100644 (file)
@@ -40,7 +40,6 @@ import java.util.Collections;
 import java.util.List;
 
 public class StopAction extends DumbAwareAction implements AnAction.TransparentUpdate {
-  public static final Icon KILL_PROCESS_ICON = AllIcons.Debugger.KillProcess;
 
   public void actionPerformed(final AnActionEvent e) {
     final DataContext dataContext = e.getDataContext();
@@ -132,7 +131,7 @@ public class StopAction extends DumbAwareAction implements AnAction.TransparentU
         }
         else if (processHandler instanceof KillableProcess && ((KillableProcess)processHandler).canKillProcess()) {
           enable = true;
-          icon = KILL_PROCESS_ICON;
+          icon = AllIcons.Debugger.KillProcess;
           description = "Kill process";
         }
       }
index 5f52e7ef03bfeafdb1cf145720579062dadd5a21..1a29ad53192f12de5d7f9e7422e953e3a429123c 100644 (file)
@@ -56,7 +56,6 @@ import java.util.List;
  */\r
 public class RunConfigurationBeforeRunProvider\r
 extends BeforeRunTaskProvider<RunConfigurationBeforeRunProvider.RunConfigurableBeforeRunTask> {\r
-  private static final Icon ICON = AllIcons.Actions.Execute;\r
 \r
   public static final Key<RunConfigurableBeforeRunTask> ID = Key.create("RunConfigurationTask");\r
 \r
@@ -75,7 +74,7 @@ extends BeforeRunTaskProvider<RunConfigurationBeforeRunProvider.RunConfigurableB
 \r
   @Override\r
   public Icon getIcon() {\r
-    return ICON;\r
+    return AllIcons.Actions.Execute;\r
   }\r
 \r
   @Override\r
index d7d789eecafdadbc265b00a3b469b88b9d9cfea2..2762cb9a2059115428b1b3c0352d7c5c8fec8127 100644 (file)
@@ -34,7 +34,6 @@ import javax.swing.*;
  * @author dyoma
  */
 public class RestartAction extends AnAction implements DumbAware, AnAction.TransparentUpdate {
-  private static final Icon STOP_AND_START_ICON = AllIcons.Actions.Restart;
 
   private ProcessHandler myProcessHandler;
   private final ProgramRunner myRunner;
@@ -108,7 +107,7 @@ public class RestartAction extends AnAction implements DumbAware, AnAction.Trans
     boolean isStarting = ExecutorRegistry.getInstance().isStarting(myEnvironment.getProject(), myExecutor.getId(), myRunner.getRunnerId());
 
     presentation.setText(ExecutionBundle.message("rerun.configuration.action.name", name));
-    presentation.setIcon(isRunning ? STOP_AND_START_ICON : myIcon);
+    presentation.setIcon(isRunning ? AllIcons.Actions.Restart : myIcon);
     presentation.setEnabled(!isStarting && !isTerminating);
   }
 
index d2ad383ff78f68df8db0d43906c3424224f5dd3f..cbffafe10fdafd7d24ee273d680a6d707dbe7048 100644 (file)
@@ -52,14 +52,13 @@ import java.util.Map;
  * @author dyoma
  */
 public class RunContentBuilder implements LogConsoleManager, Disposable  {
-  private static final Icon DEFAULT_RERUN_ICON = AllIcons.Actions.RefreshUsages;
   @NonNls private static final String JAVA_RUNNER = "JavaRunner";
   
   private final ProgramRunner myRunner;
   private final Project myProject;
   private final CompositeDisposable myDisposeables = new CompositeDisposable();
   private final ArrayList<AnAction> myRunnerActions = new ArrayList<AnAction>();
-  private final Icon myRerunIcon = DEFAULT_RERUN_ICON;
+  private final Icon myRerunIcon = AllIcons.Actions.RefreshUsages;
   private final boolean myReuseProhibited = false;
   private ExecutionResult myExecutionResult;
 
index be2f995a02403909cca4d8c0b0f179b85f3a8028..f057643100e7ce2250db8df5a6c9c3053699d2a7 100644 (file)
@@ -46,7 +46,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 public class CommonProgramParametersPanel extends JPanel implements PanelWithAnchor {
-  private static final Icon ICON = AllIcons.RunConfigurations.Variables;
 
   private LabeledComponent<RawCommandLineEditor> myProgramParametersComponent;
   private LabeledComponent<JPanel> myWorkingDirectoryComponent;
@@ -92,7 +91,7 @@ public class CommonProgramParametersPanel extends JPanel implements PanelWithAnc
     panel.add(myWorkingDirectoryField, BorderLayout.CENTER);
 
     final FixedSizeButton button = new FixedSizeButton(myWorkingDirectoryField);
-    button.setIcon(ICON);
+    button.setIcon(AllIcons.RunConfigurations.Variables);
     button.addActionListener(new ActionListener() {
       public void actionPerformed(ActionEvent e) {
         final List<String> macros = new ArrayList<String>(PathMacros.getInstance().getUserMacroNames());
index 5f6260f7aa1e982827a2d811069ba4b242874691..473efeaa0196f1074f73b1e7ddcd3620c5599cfa 100644 (file)
@@ -22,16 +22,12 @@ import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.ui.content.Content;
 
-import javax.swing.*;
-
 public class CloseViewAction extends BaseViewAction {
-  private static final Icon ICON = AllIcons.Actions.CloseNew;
-  private static final Icon HOVERED_ICON = AllIcons.Actions.CloseNewHovered;
 
   protected void update(final AnActionEvent e, final ViewContext context, final Content[] content) {
     setEnabled(e, isEnabled(content));
-    e.getPresentation().setIcon(ICON);
-    e.getPresentation().setHoveredIcon(HOVERED_ICON);
+    e.getPresentation().setIcon(AllIcons.Actions.CloseNew);
+    e.getPresentation().setHoveredIcon(AllIcons.Actions.CloseNewHovered);
   }
 
   protected void actionPerformed(final AnActionEvent e, final ViewContext context, final Content[] content) {
index 259d6add087147303338ca45ddd4179a60f6810d..4c66678a11ecb85cadbb05ca87a9fc787ef58181 100644 (file)
@@ -23,15 +23,11 @@ import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.ui.content.Content;
 
-import javax.swing.*;
-
 public class MinimizeViewAction extends BaseViewAction {
-  private static final Icon ICON = AllIcons.Actions.Move_to_button;
-  private static final Icon ICON_TOP = AllIcons.Actions.Move_to_button_top;
 
   protected void update(final AnActionEvent e, final ViewContext context, final Content[] content) {
     setEnabled(e, isEnabled(context, content, e.getPlace()));
-    e.getPresentation().setIcon(ViewContext.TAB_TOOLBAR_PLACE.equals(e.getPlace()) ? ICON_TOP : ICON);
+    e.getPresentation().setIcon(ViewContext.TAB_TOOLBAR_PLACE.equals(e.getPlace()) ? AllIcons.Actions.Move_to_button_top : AllIcons.Actions.Move_to_button);
   }
 
   protected void actionPerformed(final AnActionEvent e, final ViewContext context, final Content[] content) {
index 262247ea3bac2ba1f6fd49e8056e4ba00b00c857..906070ced69d040236d13fddf18b7b2687c762d3 100644 (file)
@@ -35,7 +35,6 @@ import javax.swing.*;
  */
 public class InvalidFacetType extends FacetType<InvalidFacet, InvalidFacetConfiguration> {
   public static final FacetTypeId<InvalidFacet> TYPE_ID = new FacetTypeId<InvalidFacet>("invalid");
-  public static final Icon ICON = AllIcons.FileTypes.Unknown;
 
   public static InvalidFacetType getInstance() {
     return ServiceManager.getService(InvalidFacetType.class);
@@ -75,6 +74,6 @@ public class InvalidFacetType extends FacetType<InvalidFacet, InvalidFacetConfig
 
   @Override
   public Icon getIcon() {
-    return ICON;
+    return AllIcons.FileTypes.Unknown;
   }
 }
index 87b1b1b7e9871876d881565e727003b3083ec9c6..337bf086aff2aaa85ea7208f2a73a3483fa2b173 100644 (file)
@@ -5,15 +5,12 @@ import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.ToggleAction;
 
-import javax.swing.*;
-
 
 public class ToggleMultiline extends ToggleAction {
   private EditorSearchComponent myEditorSearchComponent;
-  private static final Icon ICON = AllIcons.Actions.ShowViewer;
 
   public ToggleMultiline(EditorSearchComponent editorSearchComponent) {
-    super("Multiline", "Toggle Multiline Mode", ICON);
+    super("Multiline", "Toggle Multiline Mode", AllIcons.Actions.ShowViewer);
     myEditorSearchComponent = editorSearchComponent;
   }
 
index 1e8469c5affb6fba2f4197d8d8c5bc753c0fd130..92bbdbe751e187938272cb3edbd3575c3afb71aa 100644 (file)
@@ -21,7 +21,6 @@ import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 
-import javax.swing.*;
 import java.util.Collection;
 import java.util.Collections;
 
@@ -30,12 +29,11 @@ import java.util.Collections;
  *         Date: Jun 23, 2005
  */
 public class TopLevelNode extends AbstractTreeNode {
-  private static final Icon ourUpLevelIcon = AllIcons.Nodes.UpLevel;
 
   public TopLevelNode(Project project, Object value) {
     super(project, value);
     myName = "[ .. ]";
-    myOpenIcon = myClosedIcon = ourUpLevelIcon;
+    myOpenIcon = myClosedIcon = AllIcons.Nodes.UpLevel;
   }
 
   @NotNull
index 8e8d3229df155bcc0eebb808d714d8f3297954d4..2175a0823a160d4b73e77775178f145b6c461c8f 100644 (file)
@@ -16,7 +16,6 @@
 
 package com.intellij.ide.hierarchy;
 
-import com.intellij.icons.AllIcons;
 import com.intellij.ide.util.treeView.NodeDescriptor;
 import com.intellij.ide.util.treeView.SmartElementDescriptor;
 import com.intellij.openapi.editor.markup.TextAttributes;
@@ -28,10 +27,7 @@ import com.intellij.usageView.UsageTreeColors;
 import com.intellij.usageView.UsageTreeColorsScheme;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
-
 public abstract class HierarchyNodeDescriptor extends SmartElementDescriptor {
-  protected static final Icon BASE_POINTER_ICON = AllIcons.Hierarchy.Base;
   protected CompositeAppearance myHighlightedText;
   private Object[] myCachedChildren = null;
   protected final boolean myIsBase;
index 615292c63b18f547b471504cdd145b21308caf27..19383fe74ae7893336e2715f2f49ac5485ce8dc4 100644 (file)
@@ -55,7 +55,6 @@ import java.awt.*;
  */
 public class NavBarPresentation {
   private static final SimpleTextAttributes WOLFED = new SimpleTextAttributes(null, null, Color.red, SimpleTextAttributes.STYLE_WAVED);
-  private static final Icon PROJECT_ICON = AllIcons.Nodes.Project;
 
   private final Project myProject;
 
@@ -66,7 +65,7 @@ public class NavBarPresentation {
   @Nullable
   public static Icon getIcon(final Object object, final boolean open) {
     if (!NavBarModel.isValid(object)) return null;
-    if (object instanceof Project) return PROJECT_ICON;
+    if (object instanceof Project) return AllIcons.Nodes.Project;
     if (object instanceof Module) return ModuleType.get(((Module)object)).getNodeIcon(false);
     try {
       if (object instanceof PsiElement) {
index 2616baa914fb849fe1c7d220dbc62b70a9cdb8be..b53dc99b3bef379106f0d67744ade3b4bc6f6ef6 100644 (file)
@@ -185,7 +185,6 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo
   private final FileEditorManager myFileEditorManager;
   private final MyPanel myDataProvider;
   private final SplitterProportionsData splitterProportions = new SplitterProportionsDataImpl();
-  private static final Icon BULLET_ICON = AllIcons.General.Bullet;
   private final MessageBusConnection myConnection;
   private final Map<String, Element> myUninitializedPaneState = new HashMap<String, Element>();
   private final Map<String, SelectInTarget> mySelectInTargets = new HashMap<String, SelectInTarget>();
@@ -422,7 +421,7 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo
       content.putUserData(SUB_ID_KEY, subId);
       content.putUserData(ToolWindow.SHOW_CONTENT_ICON, Boolean.TRUE);
       content.setIcon(newPane.getIcon());
-      content.setPopupIcon(subId != null ? BULLET_ICON : newPane.getIcon());
+      content.setPopupIcon(subId != null ? AllIcons.General.Bullet : newPane.getIcon());
       content.setPreferredFocusedComponent(new Computable<JComponent>() {
         public JComponent compute() {
           final AbstractProjectViewPane current = getCurrentProjectViewPane();
index f1e90af90e4f42de801d722b93df0b41929db817..27990f69210bcc52b1094578f7ffe4190e6da2c1 100644 (file)
@@ -40,7 +40,6 @@ import javax.swing.tree.DefaultTreeModel;
 
 public class ProjectViewPane extends AbstractProjectViewPSIPane {
   @NonNls public static final String ID = "ProjectPane";
-  private static final Icon ICON = AllIcons.General.ProjectTab;
 
   public ProjectViewPane(Project project) {
     super(project);
@@ -56,7 +55,7 @@ public class ProjectViewPane extends AbstractProjectViewPSIPane {
   }
 
   public Icon getIcon() {
-    return ICON;
+    return AllIcons.General.ProjectTab;
   }
 
 
index 0238a3b191a879da34ea6d72318eaa1c76200fa3..0a6ffb12612665a5fb1be5506a20b6326bb9bd0b 100644 (file)
@@ -40,10 +40,6 @@ import java.util.Collection;
 import java.util.List;
 
 public class NamedLibraryElementNode extends ProjectViewNode<NamedLibraryElement> implements NavigatableWithText {
-  private static final Icon GENERIC_JDK_ICON = AllIcons.General.Jdk;
-  private static final Icon LIB_ICON_OPEN = AllIcons.Nodes.PpLibOpen;
-  private static final Icon LIB_ICON_CLOSED = AllIcons.Nodes.PpLibClosed;
-
   public NamedLibraryElementNode(Project project, NamedLibraryElement value, ViewSettings viewSettings) {
     super(project, value, viewSettings);
   }
@@ -62,7 +58,7 @@ public class NamedLibraryElementNode extends ProjectViewNode<NamedLibraryElement
   private static Icon getJdkIcon(JdkOrderEntry entry, boolean isExpanded) {
     final Sdk sdk = entry.getJdk();
     if (sdk == null) {
-      return GENERIC_JDK_ICON;
+      return AllIcons.General.Jdk;
     }
     final SdkType sdkType = (SdkType) sdk.getSdkType();
     return isExpanded ? sdkType.getIconForExpandedTreeNode() : sdkType.getIcon();
@@ -96,8 +92,8 @@ public class NamedLibraryElementNode extends ProjectViewNode<NamedLibraryElement
   public void update(PresentationData presentation) {
     presentation.setPresentableText(getValue().getName());
     final OrderEntry orderEntry = getValue().getOrderEntry();
-    presentation.setOpenIcon(orderEntry instanceof JdkOrderEntry ? getJdkIcon((JdkOrderEntry)orderEntry, true) : LIB_ICON_OPEN);
-    presentation.setClosedIcon(orderEntry instanceof JdkOrderEntry ? getJdkIcon((JdkOrderEntry)orderEntry, false) : LIB_ICON_CLOSED);
+    presentation.setOpenIcon(orderEntry instanceof JdkOrderEntry ? getJdkIcon((JdkOrderEntry)orderEntry, true) : AllIcons.Nodes.PpLibOpen);
+    presentation.setClosedIcon(orderEntry instanceof JdkOrderEntry ? getJdkIcon((JdkOrderEntry)orderEntry, false) : AllIcons.Nodes.PpLibClosed);
     if (orderEntry instanceof JdkOrderEntry) {
       final JdkOrderEntry jdkOrderEntry = (JdkOrderEntry)orderEntry;
       final Sdk projectJdk = jdkOrderEntry.getJdk();
index 90c8cdf038d9fc4f6ea6be4362e068faf5bd2d8e..9d1d5379ab1f5040aa15943f4a4bced0fcd6cfed 100644 (file)
@@ -16,6 +16,7 @@
 
 package com.intellij.ide.scopeView;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.projectView.ProjectView;
 import com.intellij.ide.util.scopeChooser.ScopeChooserConfigurable;
 import com.intellij.openapi.actionSystem.AnAction;
@@ -35,7 +36,7 @@ public class EditScopesAction extends AnAction implements DumbAware {
   private static final Logger LOG = Logger.getInstance("com.intellij.ide.scopeView.EditScopesAction");
 
   public EditScopesAction() {
-    getTemplatePresentation().setIcon(ScopeViewPane.ICON);
+    getTemplatePresentation().setIcon(AllIcons.Ide.LocalScope);
   }
 
   public void actionPerformed(AnActionEvent e) {
index 14ed50860350ad7222b01ec2994c52a54e08e143..23ccbeb48f10cbbe186d95bb727423a1fb0b52a5 100644 (file)
@@ -61,7 +61,6 @@ public class ScopeViewPane extends AbstractProjectViewPane {
   private final DependencyValidationManager myDependencyValidationManager;
   private final NamedScopeManager myNamedScopeManager;
   private final NamedScopesHolder.ScopeListener myScopeListener;
-  public static final Icon ICON = AllIcons.Ide.LocalScope;
 
   public ScopeViewPane(final Project project, ProjectView projectView, DependencyValidationManager dependencyValidationManager, NamedScopeManager namedScopeManager) {
     super(project);
@@ -100,7 +99,7 @@ public class ScopeViewPane extends AbstractProjectViewPane {
   }
 
   public Icon getIcon() {
-    return ICON;
+    return AllIcons.Ide.LocalScope;
   }
 
   @NotNull
index a1a084f2a4099a0e2d5bb2731c72ac08e1bbec76..6d4a45afb819cec751a2ea7fca5a7f3ce7e349b2 100644 (file)
@@ -70,7 +70,6 @@ import java.util.List;
  */
 abstract class TodoPanel extends SimpleToolWindowPanel implements OccurenceNavigator, DataProvider, Disposable {
   private static final Logger LOG = Logger.getInstance("#com.intellij.ide.todo.TodoPanel");
-  private static final Icon PREVIEW_ICON = AllIcons.Actions.Preview;
 
   protected Project myProject;
   private final TodoPanelSettings mySettings;
@@ -641,7 +640,7 @@ abstract class TodoPanel extends SimpleToolWindowPanel implements OccurenceNavig
   private final class MyPreviewAction extends ToggleAction {
 
     MyPreviewAction() {
-      super("Preview Usages", null, PREVIEW_ICON);
+      super("Preview Usages", null, AllIcons.Actions.Preview);
     }
 
     public void update(AnActionEvent e) {
index 7e3ac9cd3afa03102d1e532758cbcd4d0b0abe07..973195d3cb018f2d12d77f87c41e38cc3e049bdb 100644 (file)
@@ -19,18 +19,19 @@ package com.intellij.ide.todo.configurable;
 import com.intellij.application.options.colors.ColorAndFontDescription;
 import com.intellij.application.options.colors.ColorAndFontDescriptionPanel;
 import com.intellij.application.options.colors.TextAttributesDescription;
-import com.intellij.openapi.editor.colors.EditorColorsScheme;
+import com.intellij.icons.AllIcons;
+import com.intellij.ide.IdeBundle;
 import com.intellij.openapi.editor.colors.EditorColorsManager;
+import com.intellij.openapi.editor.colors.EditorColorsScheme;
 import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.psi.search.TodoAttributes;
 import com.intellij.psi.search.TodoPattern;
-import com.intellij.ide.IdeBundle;
 
 import javax.swing.*;
 import java.awt.*;
-import java.awt.event.ActionListener;
 import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
 
 /**
  * @author Vladimir Kondratyev
@@ -51,7 +52,7 @@ class PatternDialog extends DialogWrapper{
     final TodoAttributes attrs = pattern.getAttributes();
     myPattern=pattern;
     myIconComboBox=new JComboBox(
-      new Icon[]{TodoAttributes.DEFAULT_ICON,TodoAttributes.QUESTION_ICON,TodoAttributes.IMPORTANT_ICON}
+      new Icon[]{AllIcons.General.TodoDefault, AllIcons.General.TodoQuestion, AllIcons.General.TodoImportant}
     );
     myIconComboBox.setSelectedItem(attrs.getIcon());
     myIconComboBox.setRenderer(new TodoTypeListCellRenderer());
index 5c3582130f636bd7a67ceafe856885b1d061bd9a..45163380248e4abe882c8f7fd3455712093c3565 100644 (file)
@@ -16,6 +16,7 @@
 
 package com.intellij.ide.todo.configurable;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.todo.TodoConfiguration;
 import com.intellij.ide.todo.TodoFilter;
@@ -24,7 +25,6 @@ import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.ui.DialogWrapper;
-import com.intellij.psi.search.TodoAttributes;
 import com.intellij.psi.search.TodoPattern;
 import com.intellij.ui.*;
 import com.intellij.ui.table.JBTable;
@@ -142,7 +142,7 @@ public class TodoConfigurable extends BaseConfigurable implements SearchableConf
 
         // Column "Icon"
         JComboBox todoTypeCombo =
-          new JComboBox(new Icon[]{TodoAttributes.DEFAULT_ICON, TodoAttributes.QUESTION_ICON, TodoAttributes.IMPORTANT_ICON});
+          new JComboBox(new Icon[]{AllIcons.General.TodoDefault, AllIcons.General.TodoQuestion, AllIcons.General.TodoImportant});
         todoTypeCombo.setRenderer(new TodoTypeListCellRenderer());
         TableColumn typeColumn = myPatternsTable.getColumnModel().getColumn(0);
         DefaultCellEditor todoTypeEditor = new DefaultCellEditor(todoTypeCombo);
index f9070b63b4342cbcc778107dc405543832c31623..f0845edad741b0ec4b2019effa4896076a48f598 100644 (file)
@@ -32,9 +32,6 @@ import java.awt.*;
 import java.io.File;
 
 public class PsiElementModuleRenderer extends DefaultListCellRenderer{
-  private static final Icon TEST_ICON = AllIcons.Nodes.TestSourceFolder;
-  private static final Icon LIB_ICON = AllIcons.Nodes.PpLibClosed;
-
   private String myText;
 
   public Component getListCellRendererComponent(
@@ -103,7 +100,7 @@ public class PsiElementModuleRenderer extends DefaultListCellRenderer{
     }
     myText = module.getName();
     if (inTestSource) {
-      setIcon(TEST_ICON);
+      setIcon(AllIcons.Nodes.TestSourceFolder);
     }
     else {
       setIcon(ModuleType.get(module).getNodeIcon(false));
@@ -111,7 +108,7 @@ public class PsiElementModuleRenderer extends DefaultListCellRenderer{
   }
 
   private void showLibraryLocation(ProjectFileIndex fileIndex, VirtualFile vFile) {
-    setIcon(LIB_ICON);
+    setIcon(AllIcons.Nodes.PpLibClosed);
     for (OrderEntry order : fileIndex.getOrderEntriesForFile(vFile)) {
       if (order instanceof LibraryOrderEntry || order instanceof JdkOrderEntry) {
         myText = getPresentableName(order, vFile);
index cdef6c5b77f40a18095737f5a520b4d66685af0f..c0a99e9044cd6108aae57f3a3d2d2293b9c292e4 100644 (file)
@@ -53,7 +53,10 @@ import com.intellij.psi.codeStyle.NameUtil;
 import com.intellij.psi.statistics.StatisticsInfo;
 import com.intellij.psi.statistics.StatisticsManager;
 import com.intellij.psi.util.PsiUtilCore;
-import com.intellij.ui.*;
+import com.intellij.ui.ClickListener;
+import com.intellij.ui.DocumentAdapter;
+import com.intellij.ui.ListScrollingUtil;
+import com.intellij.ui.ScrollPaneFactory;
 import com.intellij.ui.components.JBList;
 import com.intellij.ui.popup.PopupOwner;
 import com.intellij.ui.popup.PopupPositionManager;
@@ -1563,11 +1566,10 @@ public abstract class ChooseByNameBase {
   }
 
   private static final String ACTION_NAME = "Show All in View";
-  private static final Icon FIND_ICON = AllIcons.Actions.Find;
 
   private abstract class ShowFindUsagesAction extends AnAction {
     public ShowFindUsagesAction() {
-      super(ACTION_NAME, ACTION_NAME, FIND_ICON);
+      super(ACTION_NAME, ACTION_NAME, AllIcons.Actions.Find);
     }
 
     @Override
index 692f21a034f3334016f8f0a9837e23f444d0e3bd..d3792da5b66751f48fa92174bebb3992d6a8beba 100644 (file)
@@ -41,10 +41,6 @@ import java.util.List;
  */
 public abstract class ChooseByNameFilter<T> {
   /**
-   * an icon to use
-   */
-  private static final Icon FILTER_ICON = AllIcons.Icons.Inspector.UseFilter;
-  /**
    * a parent popup
    */
   private final ChooseByNamePopup myParentPopup;
@@ -83,7 +79,7 @@ public abstract class ChooseByNameFilter<T> {
                             @NotNull Project project) {
     myParentPopup = popup;
     DefaultActionGroup actionGroup = new DefaultActionGroup("go.to.file.filter", false);
-    ToggleAction action = new ToggleAction("Filter", "Filter files by type", FILTER_ICON) {
+    ToggleAction action = new ToggleAction("Filter", "Filter files by type", AllIcons.Icons.Inspector.UseFilter) {
       public boolean isSelected(final AnActionEvent e) {
         return myPopup != null;
       }
index d7571adffad4aaa352e26efd573147b4700d4d48..e6e90f12271d31db0a534c1902e9765e95bad95d 100644 (file)
@@ -23,7 +23,6 @@ import org.jetbrains.annotations.NonNls;
 import javax.swing.*;
 
 public class EmptyModuleType extends ModuleType<EmptyModuleBuilder> {
-  private static final Icon ICON = AllIcons.Modules.Types.EmptyProjectType;
   @NonNls public static final String EMPTY_MODULE = "EMPTY_MODULE";
   //private static final EmptyModuleType ourInstance = new EmptyModuleType();
 
@@ -53,7 +52,7 @@ public class EmptyModuleType extends ModuleType<EmptyModuleBuilder> {
   }
 
   public Icon getBigIcon() {
-    return ICON;
+    return AllIcons.Modules.Types.EmptyProjectType;
   }
 
   public Icon getNodeIcon(boolean isOpened) {
index b3e7326b3e345878eedab9a48bd72f44941bf2b6..b15e42fdd644f60c27847f654724b59277b1751f 100644 (file)
@@ -28,10 +28,6 @@ import javax.swing.*;
 public abstract class WebModuleTypeBase<T extends ModuleBuilder> extends ModuleType<T> {
   @NonNls public static final String WEB_MODULE = "WEB_MODULE";
 
-  private static final Icon MODULE_ICON = AllIcons.Modules.Types.WebModule;
-  private static final Icon MODULE_NODE_ICON_OPEN = AllIcons.Nodes.ModuleOpen;
-  private static final Icon MODULE_NODE_ICON_CLOSED = AllIcons.Nodes.ModuleClosed;
-
   public WebModuleTypeBase() {
     super(WEB_MODULE);
   }
@@ -45,10 +41,10 @@ public abstract class WebModuleTypeBase<T extends ModuleBuilder> extends ModuleT
   }
 
   public Icon getBigIcon() {
-    return MODULE_ICON;
+    return AllIcons.Modules.Types.WebModule;
   }
 
   public Icon getNodeIcon(final boolean isOpened) {
-    return isOpened ? MODULE_NODE_ICON_OPEN : MODULE_NODE_ICON_CLOSED;
+    return isOpened ? AllIcons.Nodes.ModuleOpen : AllIcons.Nodes.ModuleClosed;
   }
 }
index 8f13118d4bbf40439a65ce43b7410b42ea6c690a..a3c5fc53f9adb1314906a514f6d89e255dd00a13 100644 (file)
@@ -64,9 +64,7 @@ import java.util.Map;
 public class CommonContentEntriesEditor extends ModuleElementsEditor {
   private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.ui.configuration.ContentEntriesEditor");
   public static final String NAME = ProjectBundle.message("module.paths.title");
-  public static final Icon ICON = AllIcons.Modules.Sources;
   private static final Color BACKGROUND_COLOR = UIUtil.getListBackground();
-  private static final Icon ADD_CONTENT_ENTRY_ICON = AllIcons.Modules.AddContentEntry;
 
   protected ContentEntryTreeEditor myRootTreeEditor;
   private MyContentEntryEditorListener myContentEntryEditorListener;
@@ -369,7 +367,7 @@ public class CommonContentEntriesEditor extends ModuleElementsEditor {
 
     public AddContentEntryAction() {
       super(ProjectBundle.message("module.paths.add.content.action"),
-            ProjectBundle.message("module.paths.add.content.action.description"), ADD_CONTENT_ENTRY_ICON);
+            ProjectBundle.message("module.paths.add.content.action.description"), AllIcons.Modules.AddContentEntry);
       myDescriptor = new FileChooserDescriptor(false, true, true, false, true, true) {
         public void validateSelectedFiles(VirtualFile[] files) throws Exception {
           validateContentEntriesCandidates(files);
index a68a824d59d2a21311440385ce31000a6233da32..7feab5bc7049f1aec282d42ab7c72e03fd1d2beb 100644 (file)
@@ -61,11 +61,6 @@ public abstract class ContentRootPanel extends JPanel {
   private static final Color CONTENT_COLOR = Color.WHITE;
   private static final Color UNSELECTED_TEXT_COLOR = new Color(0x333333);
 
-  private static final Icon DELETE_ROOT_ICON = AllIcons.Modules.DeleteContentRoot;
-  private static final Icon DELETE_ROOT_ROLLOVER_ICON = AllIcons.Modules.DeleteContentRootRollover;
-  private static final Icon DELETE_FOLDER_ICON = AllIcons.Modules.DeleteContentFolder;
-  private static final Icon DELETE_FOLDER_ROLLOVER_ICON = AllIcons.Modules.DeleteContentFolderRollover;
-
   protected final ActionCallback myCallback;
   private JComponent myHeader;
   private JComponent myBottom;
@@ -154,7 +149,8 @@ public abstract class ContentRootPanel extends JPanel {
     if (getContentEntry().getFile() == null) {
       headerLabel.setForeground(Color.RED);
     }
-    final IconActionComponent deleteIconComponent = new IconActionComponent(DELETE_ROOT_ICON, DELETE_ROOT_ROLLOVER_ICON,
+    final IconActionComponent deleteIconComponent = new IconActionComponent(AllIcons.Modules.DeleteContentRoot,
+                                                                            AllIcons.Modules.DeleteContentRootRollover,
                                                                             ProjectBundle.message("module.paths.remove.content.tooltip"), new Runnable() {
       public void run() {
         myCallback.deleteContentEntry();
@@ -261,7 +257,7 @@ public abstract class ContentRootPanel extends JPanel {
     else {
       tooltipText = ProjectBundle.message("module.paths.remove.tooltip");
     }
-    return new IconActionComponent(DELETE_FOLDER_ICON, DELETE_FOLDER_ROLLOVER_ICON, tooltipText, new Runnable() {
+    return new IconActionComponent(AllIcons.Modules.DeleteContentFolder, AllIcons.Modules.DeleteContentFolderRollover, tooltipText, new Runnable() {
       public void run() {
         myCallback.deleteContentFolder(getContentEntry(), folder);
       }
index 0c3a969ed442a442aab9c4b415cee8aea97e86fd..ca01774fdd6bad7bb1d5725329501ae22b4b431c 100644 (file)
@@ -41,17 +41,13 @@ import java.awt.*;
 import java.awt.event.MouseEvent;
 
 public class TogglePopupHintsPanel extends EditorBasedWidget implements StatusBarWidget.Multiframe, StatusBarWidget.IconPresentation {
-  private static final Icon INSPECTIONS_ICON = AllIcons.Ide.HectorOn;
-  private static final Icon INSPECTIONS_OFF_ICON = AllIcons.Ide.HectorOff;
-  private static final Icon SYNTAX_ONLY_ICON = AllIcons.Ide.HectorSyntax;
-  private static final Icon EMPTY_ICON = AllIcons.Ide.HectorNo;
 
   private Icon myCurrentIcon;
   private String myToolTipText;
 
   public TogglePopupHintsPanel(@NotNull final Project project) {
     super(project);
-    myCurrentIcon = EMPTY_ICON;
+    myCurrentIcon = AllIcons.Ide.HectorNo;
     myConnection.subscribe(PowerSaveMode.TOPIC, new PowerSaveMode.Listener() {
       @Override
       public void powerSaveStateChanged() {
@@ -111,7 +107,7 @@ public class TogglePopupHintsPanel extends EditorBasedWidget implements StatusBa
   }
 
   public void clear() {
-    myCurrentIcon = EMPTY_ICON;
+    myCurrentIcon = AllIcons.Ide.HectorNo;
     myToolTipText = null;
     myStatusBar.updateWidget(ID());
   }
@@ -123,27 +119,27 @@ public class TogglePopupHintsPanel extends EditorBasedWidget implements StatusBa
   private void updateStatus(PsiFile file) {
     if (isStateChangeable(file)) {
       if (PowerSaveMode.isEnabled()) {
-        myCurrentIcon = EMPTY_ICON;
+        myCurrentIcon = AllIcons.Ide.HectorNo;
         myToolTipText = "Code analysis is disabled in power save mode. ";
       }
       else if (HighlightLevelUtil.shouldInspect(file)) {
-        myCurrentIcon = INSPECTIONS_ICON;
+        myCurrentIcon = AllIcons.Ide.HectorOn;
         myToolTipText = "Current inspection profile: " +
                         InspectionProjectProfileManager.getInstance(file.getProject()).getInspectionProfile().getName() +
                         ". ";
       }
       else if (HighlightLevelUtil.shouldHighlight(file)) {
-        myCurrentIcon = SYNTAX_ONLY_ICON;
+        myCurrentIcon = AllIcons.Ide.HectorSyntax;
         myToolTipText = "Highlighting level is: Syntax. ";
       }
       else {
-        myCurrentIcon = INSPECTIONS_OFF_ICON;
+        myCurrentIcon = AllIcons.Ide.HectorOff;
         myToolTipText = "Inspections are off. ";
       }
       myToolTipText += UIBundle.message("popup.hints.panel.click.to.configure.highlighting.tooltip.text");
     }
     else {
-      myCurrentIcon = EMPTY_ICON;
+      myCurrentIcon = AllIcons.Ide.HectorNo;
       myToolTipText = null;
     }
 
index 8b2df14ab754101273dc1f5dd832ceefb1dec9ca..c78b25f331667f29733a14e3eca9783c5c29f50f 100644 (file)
@@ -58,8 +58,6 @@ public class DependencyValidationManagerImpl extends DependencyValidationManager
   @NonNls private static final String VALUE = "value";
 
 
-  private static final Icon SHARED_SCOPES = AllIcons.Ide.SharedScope;
-
   private final Map<String, PackageSet> myUnnamedScopes = new HashMap<String, PackageSet>();
 
   public DependencyValidationManagerImpl(final Project project) {
@@ -177,7 +175,7 @@ public class DependencyValidationManagerImpl extends DependencyValidationManager
   }
 
   public Icon getIcon() {
-    return SHARED_SCOPES;
+    return AllIcons.Ide.SharedScope;
   }
 
   @Override
index 9191a1ee0fb1e13e7007828a0ffe853ebe609cad..4b8dae44223622b8a33f6da013353a01b6ee1e93 100644 (file)
@@ -46,8 +46,6 @@ public class ProjectPatternProvider extends PatternDialectProvider {
 
   @NonNls public static final String FILE = "file";
 
-  private static final Icon COMPACT_EMPTY_MIDDLE_PACKAGES_ICON = AllIcons.ObjectBrowser.CompactEmptyPackages;
-  private static final Icon ICON = AllIcons.General.ProjectTab;
   private static final Logger LOG = Logger.getInstance("#" + ProjectPatternProvider.class.getName());
 
 
@@ -117,7 +115,7 @@ public class ProjectPatternProvider extends PatternDialectProvider {
   }
 
   public Icon getIcon() {
-    return ICON;
+    return AllIcons.General.ProjectTab;
   }
 
   private static final class CompactEmptyMiddlePackagesAction extends ToggleAction {
@@ -125,7 +123,7 @@ public class ProjectPatternProvider extends PatternDialectProvider {
 
     CompactEmptyMiddlePackagesAction(Runnable update) {
       super(IdeBundle.message("action.compact.empty.middle.packages"),
-            IdeBundle.message("action.compact.empty.middle.packages"), COMPACT_EMPTY_MIDDLE_PACKAGES_ICON);
+            IdeBundle.message("action.compact.empty.middle.packages"), AllIcons.ObjectBrowser.CompactEmptyPackages);
       myUpdate = update;
     }
 
index 3957cca985f7f8fc6a2afebe9e2a5ce740e3eecf..4246006de8c58f37d6b5ed2630a58493cf6b5d48 100644 (file)
@@ -27,7 +27,7 @@ import com.intellij.codeInsight.daemon.impl.SeverityRegistrar;
 import com.intellij.codeInspection.ModifiableModel;
 import com.intellij.codeInspection.ex.InspectionProfileImpl;
 import com.intellij.codeInspection.ex.InspectionToolRegistrar;
-import com.intellij.ui.ListCellRendererWrapper;
+import com.intellij.icons.AllIcons;
 import com.intellij.lang.annotation.HighlightSeverity;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.colors.CodeInsightColors;
@@ -52,6 +52,7 @@ import com.intellij.profile.Profile;
 import com.intellij.profile.ProfileManager;
 import com.intellij.profile.codeInspection.InspectionProfileManager;
 import com.intellij.profile.codeInspection.InspectionProjectProfileManager;
+import com.intellij.ui.ListCellRendererWrapper;
 import com.intellij.ui.components.JBScrollPane;
 import com.intellij.util.Alarm;
 import com.intellij.util.SystemProperties;
@@ -281,7 +282,7 @@ public abstract class InspectionToolsConfigurable extends BaseConfigurable imple
         final String profileName = value.getName();
         setText(profileName);
         final SingleInspectionProfilePanel panel = getProfilePanel(value);
-        setIcon(panel != null && panel.isProfileShared() ? Profile.PROJECT_PROFILE : Profile.LOCAL_PROFILE);
+        setIcon(panel != null && panel.isProfileShared() ? AllIcons.General.ProjectSettings : AllIcons.General.ApplicationSettings);
       }
     });
     myProfiles.addActionListener(new ActionListener() {
index 8fc1eb906b1b7c994d649f825c11f97551c15164..da31f799b7cc41f9e90aba8b6f89ffceddee3d13 100644 (file)
@@ -20,6 +20,7 @@ import com.intellij.codeInspection.InspectionsBundle;
 import com.intellij.codeInspection.ModifiableModel;
 import com.intellij.codeInspection.ex.InspectionProfileImpl;
 import com.intellij.codeInspection.ex.InspectionToolRegistrar;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.util.Condition;
@@ -61,7 +62,7 @@ public class ProfilesComboBox extends JComboBox {
         if (value instanceof Profile) {
           final Profile profile = (Profile)value;
           setText(profile.getName());
-          setIcon(profile.isLocal() ? Profile.LOCAL_PROFILE : Profile.PROJECT_PROFILE);
+          setIcon(profile.isLocal() ? AllIcons.General.ApplicationSettings : AllIcons.General.ProjectSettings);
         }
         else if (value instanceof String) {
           setText((String)value);
index a39fecc749dbcc9c3aa355283d59cb45b42bf063..bd5443d61b056cdba74a0d57c98d178ea6cf1a15 100644 (file)
@@ -12,10 +12,9 @@ import javax.swing.*;
  * Date: 11/11/11
  */
 public abstract class BaseRefactoringIntentionAction extends PsiElementBaseIntentionAction implements Iconable, HighPriorityAction {
-  public static final Icon REFACTORING_BULB = AllIcons.Actions.RefactoringBulb;
 
   @Override
   public Icon getIcon(int flags) {
-    return REFACTORING_BULB;
+    return AllIcons.Actions.RefactoringBulb;
   }
 }
index e2016ddb2280ea13beb60c19d8ca68f4f6d467e8..c470967c1a669e0252968c53820f2e2fbcbf1020 100644 (file)
@@ -16,7 +16,6 @@
 
 package com.intellij.refactoring.ui;
 
-import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.DataKey;
 import com.intellij.openapi.actionSystem.DataSink;
 import com.intellij.openapi.actionSystem.LangDataKeys;
@@ -49,8 +48,6 @@ public abstract class AbstractMemberSelectionTable<T extends PsiElement, M exten
   protected static final int CHECKED_COLUMN = 0;
   protected static final int DISPLAY_NAME_COLUMN = 1;
   protected static final int ABSTRACT_COLUMN = 2;
-  protected static final Icon OVERRIDING_METHOD_ICON = AllIcons.General.OverridingMethod;
-  protected static final Icon IMPLEMENTING_METHOD_ICON = AllIcons.General.ImplementingMethod;
   protected static final Icon EMPTY_OVERRIDE_ICON = EmptyIcon.ICON_16;
   protected static final String DISPLAY_NAME_COLUMN_HEADER = RefactoringBundle.message("member.column");
   protected static final int OVERRIDE_ICON_POSITION = 2;
index 28a7f1940e58bf3443372773d1b12338155cd79e..0154f63f2c0006776e423c44a1f20acd2324b589 100644 (file)
@@ -27,7 +27,6 @@ import com.intellij.openapi.util.text.StringUtil;
 import javax.swing.*;
 
 public class ToolBeforeRunTaskProvider extends BeforeRunTaskProvider<ToolBeforeRunTask> {
-  private static final Icon ICON = AllIcons.General.ExternalToolsSmall;
   static final Key<ToolBeforeRunTask> ID = Key.create("ToolBeforeRunTask");
   private static final Logger LOG = Logger.getInstance("#" + ToolBeforeRunTaskProvider.class.getName());
 
@@ -60,7 +59,7 @@ public class ToolBeforeRunTaskProvider extends BeforeRunTaskProvider<ToolBeforeR
 
   @Override
   public Icon getIcon() {
-    return ICON;
+    return AllIcons.General.ExternalToolsSmall;
   }
 
   @Override
index d950780b8956db654f99842ec8aeabb13e7d0897..be80da017d24ad43b768c9c8f8a5e1384f63fbde 100644 (file)
@@ -16,7 +16,6 @@
 
 package com.intellij.tools;
 
-import com.intellij.icons.AllIcons;
 import com.intellij.openapi.options.Configurable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
@@ -27,7 +26,6 @@ import javax.swing.*;
 import java.io.IOException;
 
 public class ToolConfigurable implements SearchableConfigurable, Configurable.NoScroll {
-  private static final Icon ourIcon = AllIcons.General.ExternalTools;
   private ToolsPanel myPanel;
 
   public String getDisplayName() {
index 51d570f710906b536316b000b4208892b6556b6e..c3362e44fcf34220b8de609b68bd2ab6a87687a1 100644 (file)
@@ -27,18 +27,16 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Condition;
 import com.intellij.util.containers.HashMap;
 
-import javax.swing.*;
 import java.util.Arrays;
 
 public class ToolKeymapExtension implements KeymapExtension {
-  private static final Icon TOOLS_ICON = AllIcons.Nodes.KeymapTools;
-  private static final Icon TOOLS_OPEN_ICON = AllIcons.Nodes.KeymapToolsOpen;
 
   public KeymapGroup createGroup(final Condition<AnAction> filtered, final Project project) {
     final ActionManagerEx actionManager = ActionManagerEx.getInstanceEx();
     String[] ids = actionManager.getActionIds(Tool.ACTION_ID_PREFIX);
     Arrays.sort(ids);
-    Group group = new Group(KeyMapBundle.message("actions.tree.external.tools.group"), TOOLS_ICON, TOOLS_OPEN_ICON);
+    Group group = new Group(KeyMapBundle.message("actions.tree.external.tools.group"), AllIcons.Nodes.KeymapTools,
+                            AllIcons.Nodes.KeymapToolsOpen);
 
     ToolManager toolManager = ToolManager.getInstance();
 
index 44a5003178374e7456f1ff845c1e6eefd2c277c5..5a93da2b8db5dc528049ad95b39e664b3a52a6a9 100644 (file)
@@ -46,10 +46,6 @@ public class FileColorsConfigurablePanel extends JPanel implements Disposable {
   private final FileColorSettingsTable myLocalTable;
   private final FileColorSettingsTable mySharedTable;
 
-  private static final Icon SHARE = AllIcons.Actions.Share;
-  private static final Icon UNSHARE = AllIcons.Actions.Unshare;
-
-
   public FileColorsConfigurablePanel(@NotNull final FileColorManagerImpl manager) {
     setLayout(new BorderLayout());
     myManager = manager;
@@ -92,7 +88,7 @@ public class FileColorsConfigurablePanel extends JPanel implements Disposable {
     };
 
     final JPanel panel = ToolbarDecorator.createDecorator(myLocalTable)
-      .addExtraAction(new AnActionButton("Share", SHARE) {
+      .addExtraAction(new AnActionButton("Share", AllIcons.Actions.Share) {
         @Override
         public void actionPerformed(AnActionEvent e) {
           share();
@@ -127,7 +123,7 @@ public class FileColorsConfigurablePanel extends JPanel implements Disposable {
     final JPanel sharedPanel = new JPanel(new BorderLayout());
     sharedPanel.setBorder(IdeBorderFactory.createTitledBorder("Shared colors", false));
     final JPanel shared = ToolbarDecorator.createDecorator(mySharedTable)
-      .addExtraAction(new AnActionButton("Unshare", UNSHARE) {
+      .addExtraAction(new AnActionButton("Unshare", AllIcons.Actions.Unshare) {
         @Override
         public void actionPerformed(AnActionEvent e) {
           unshare();
index ce8afcf58a29a684567f4b77407bceee26278f6d..b453bb2e174cbfa9cc59fe1df10cce657eee7bd9 100644 (file)
@@ -24,10 +24,7 @@ import com.intellij.openapi.project.DumbAware;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.Nullable;
 
-import javax.swing.*;
-
 public class ContextHelpAction extends AnAction implements DumbAware {
-  private static final Icon myIcon= AllIcons.Actions.Help;
   private final String myHelpID;
 
   public ContextHelpAction() {
@@ -63,7 +60,7 @@ public class ContextHelpAction extends AnAction implements DumbAware {
       presentation.setEnabled(getHelpId(dataContext) != null);
     }
     else {
-      presentation.setIcon(myIcon);
+      presentation.setIcon(AllIcons.Actions.Help);
       presentation.setText(CommonBundle.getHelpButtonText());
     }
   }