Unified access to icons.jar resources
authorMaxim Shafirov <max@jetbrains.com>
Wed, 30 May 2012 14:29:53 +0000 (18:29 +0400)
committerMaxim Shafirov <max@jetbrains.com>
Wed, 30 May 2012 14:41:47 +0000 (18:41 +0400)
497 files changed:
RegExpSupport/src/org/intellij/lang/regexp/RegExpFileType.java
java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java
java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsPanel.java
java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java
java/compiler/impl/src/com/intellij/packaging/impl/artifacts/InvalidArtifactType.java
java/compiler/impl/src/com/intellij/packaging/impl/artifacts/PlainArtifactType.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/elements/ProductionModuleOutputElementType.java
java/debugger/impl/src/com/intellij/debugger/ui/DebuggerSessionTab.java
java/debugger/impl/src/com/intellij/debugger/ui/FramesPanel.java
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpoint.java
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/LineBreakpoint.java
java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.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/impl/DefaultJavaProgramRunner.java
java/execution/impl/src/com/intellij/execution/remote/RemoteConfigurationType.java
java/idea-ui/src/com/intellij/facet/impl/ui/libraries/LibraryOptionsPanel.java
java/idea-ui/src/com/intellij/ide/palette/impl/PaletteManager.java
java/idea-ui/src/com/intellij/ide/util/importProject/ProjectLayoutPanel.java
java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectCreateModeStep.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/AnnotationsEditor.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/BuildElementsEditor.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.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/JavadocEditor.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectStructureConfigurable.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactEditorImpl.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/ArtifactErrorPanel.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/InvalidArtifactConfigurable.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/artifacts/actions/SortElementsToggleAction.java
java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/dependencyAnalysis/AnalyzeDependenciesComponent.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/FacetStructureConfigurable.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/daemon/impl/quickfix/RunRefactoringIntention.java
java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java
java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java
java/java-impl/src/com/intellij/codeInspection/ui/EntryPointsNode.java
java/java-impl/src/com/intellij/cyclicDependencies/ui/CyclicDependenciesPanel.java
java/java-impl/src/com/intellij/ide/hierarchy/method/MethodHierarchyNodeDescriptor.java
java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java
java/java-impl/src/com/intellij/ide/structureView/impl/java/InheritedMembersFilter.java
java/java-impl/src/com/intellij/ide/structureView/impl/java/JavaInheritedMembersNodeProvider.java
java/java-impl/src/com/intellij/ide/structureView/impl/java/SuperTypeGroup.java
java/java-impl/src/com/intellij/ide/structureView/impl/java/SuperTypesGrouper.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/ide/util/PackageChooserDialog.java
java/java-impl/src/com/intellij/ide/util/scopeChooser/GroupByScopeTypeAction.java
java/java-impl/src/com/intellij/internal/UsedIconsListingAction.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/refactoring/encapsulateFields/EncapsulateFieldsDialog.java
java/java-impl/src/com/intellij/slicer/CanItBeNullAction.java
java/java-impl/src/com/intellij/slicer/SlicePanel.java
java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.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/JavaClassFileType.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-api/src/com/intellij/ide/highlighter/ArchiveFileType.java
platform/core-api/src/com/intellij/openapi/fileTypes/UnknownFileType.java
platform/core-api/src/com/intellij/psi/impl/ElementBase.java
platform/core-api/src/com/intellij/util/PlatformIcons.java
platform/core-impl/src/com/intellij/openapi/fileTypes/PlainTextFileType.java
platform/icons/src/general/tab_white_left.png [deleted file]
platform/icons/src/general/tab_white_right.png [deleted file]
platform/lang-api/src/com/intellij/codeInspection/SuppressIntentionAction.java
platform/lang-api/src/com/intellij/execution/DefaultExecutionResult.java
platform/lang-api/src/com/intellij/execution/configurations/CommandLineState.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/execution/ui/actions/CloseAction.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/analysis/AnalysisUIOptions.java
platform/lang-impl/src/com/intellij/application/options/CodeCompletionOptions.java
platform/lang-impl/src/com/intellij/application/options/CodeStyleSchemesConfigurable.java
platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.java
platform/lang-impl/src/com/intellij/application/options/colors/ColorAndFontOptions.java
platform/lang-impl/src/com/intellij/application/options/editor/EditorOptions.java
platform/lang-impl/src/com/intellij/codeInsight/daemon/impl/TrafficLightRenderer.java
platform/lang-impl/src/com/intellij/codeInsight/documentation/DockablePopupManager.java
platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.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/config/IntentionSettingsConfigurable.java
platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java
platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplatesConfigurable.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/ex/InspectionManagerEx.java
platform/lang-impl/src/com/intellij/codeInspection/ex/QuickFixAction.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionNode.java
platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java
platform/lang-impl/src/com/intellij/codeInspection/ui/ProblemDescriptionNode.java
platform/lang-impl/src/com/intellij/codeInspection/ui/actions/ExportHTMLAction.java
platform/lang-impl/src/com/intellij/codeInspection/ui/actions/InspectionsOptionsToolbarAction.java
platform/lang-impl/src/com/intellij/codeInspection/ui/actions/InvokeQuickFixAction.java
platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java
platform/lang-impl/src/com/intellij/execution/RunContentExecutor.java
platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java
platform/lang-impl/src/com/intellij/execution/actions/EditRunConfigurationsAction.java
platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationAction.java
platform/lang-impl/src/com/intellij/execution/actions/StopAction.java
platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java
platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java
platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationBeforeRunProvider.java
platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java
platform/lang-impl/src/com/intellij/execution/runners/AbstractConsoleRunnerWithHistory.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/InvalidFacetEditor.java
platform/lang-impl/src/com/intellij/facet/impl/invalid/InvalidFacetType.java
platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java
platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java
platform/lang-impl/src/com/intellij/find/editorHeaderActions/FindAllAction.java
platform/lang-impl/src/com/intellij/find/editorHeaderActions/ShowHistoryAction.java
platform/lang-impl/src/com/intellij/find/editorHeaderActions/ToggleMultiline.java
platform/lang-impl/src/com/intellij/ide/actions/CreateFileAction.java
platform/lang-impl/src/com/intellij/ide/bookmarks/actions/DeleteBookmarkAction.java
platform/lang-impl/src/com/intellij/ide/bookmarks/actions/EditBookmarkDescriptionAction.java
platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkDownAction.java
platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkUpAction.java
platform/lang-impl/src/com/intellij/ide/commander/TopLevelNode.java
platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesListNode.java
platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesProjectViewPane.java
platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java
platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddAllOpenFilesToNewFavoritesListAction.java
platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToNewFavoritesListAction.java
platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesAutoScrollToSourceAction.java
platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesCompactEmptyMiddlePackagesAction.java
platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesFlattenPackagesAction.java
platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesShowMembersAction.java
platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/RenameFavoritesListAction.java
platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/AllFileTemplatesConfigurable.java
platform/lang-impl/src/com/intellij/ide/hierarchy/CallHierarchyBrowserBase.java
platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java
platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java
platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyNodeDescriptor.java
platform/lang-impl/src/com/intellij/ide/hierarchy/MethodHierarchyBrowserBase.java
platform/lang-impl/src/com/intellij/ide/hierarchy/ViewClassHierarchyAction.java
platform/lang-impl/src/com/intellij/ide/hierarchy/ViewSubtypesHierarchyAction.java
platform/lang-impl/src/com/intellij/ide/hierarchy/ViewSupertypesHierarchyAction.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/ShowModulesAction.java
platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/NamedLibraryElementNode.java
platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewPane.java
platform/lang-impl/src/com/intellij/ide/todo/SetTodoFilterAction.java
platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java
platform/lang-impl/src/com/intellij/ide/todo/configurable/TodoConfigurable.java
platform/lang-impl/src/com/intellij/ide/util/DirectoryChooser.java
platform/lang-impl/src/com/intellij/ide/util/MemberChooser.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/ide/util/scopeChooser/ScopeChooserConfigurable.java
platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeEditorPanel.java
platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ShowFilesAction.java
platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ShowModuleGroupsAction.java
platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ShowModulesAction.java
platform/lang-impl/src/com/intellij/moduleDependencies/DependenciesAnalyzeManager.java
platform/lang-impl/src/com/intellij/moduleDependencies/ModulesDependenciesPanel.java
platform/lang-impl/src/com/intellij/openapi/file/exclude/EnforcedPlainTextFileTypeFactory.java
platform/lang-impl/src/com/intellij/openapi/fileEditor/impl/http/JumpFromRemoteFileToLocalAction.java
platform/lang-impl/src/com/intellij/openapi/fileTypes/impl/FileTypeConfigurable.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/ContentEntryTreeEditor.java
platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentRootPanel.java
platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/IconSet.java
platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java
platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.java
platform/lang-impl/src/com/intellij/openapi/wm/impl/status/TogglePopupHintsPanel.java
platform/lang-impl/src/com/intellij/packageDependencies/DependenciesToolWindow.java
platform/lang-impl/src/com/intellij/packageDependencies/DependencyValidationManagerImpl.java
platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.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/SingleInspectionProfilePanel.java
platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataLanguageConfigurable.java
platform/lang-impl/src/com/intellij/refactoring/RefactoringBaseIntention.java
platform/lang-impl/src/com/intellij/refactoring/ui/AbstractMemberSelectionTable.java
platform/lang-impl/src/com/intellij/testIntegration/GotoTestOrCodeHandler.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/ColorLineMarkerProvider.java
platform/lang-impl/src/com/intellij/ui/debugger/extensions/ActionTracer.java
platform/lang-impl/src/com/intellij/ui/debugger/extensions/DisposerDebugger.java
platform/lang-impl/src/com/intellij/ui/debugger/extensions/FocusDebugger.java
platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java
platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurablePanel.java
platform/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java
platform/lvcs-impl/src/com/intellij/history/integration/ui/views/HistoryDialog.java
platform/platform-api/src/com/intellij/ide/actions/CloseTabToolbarAction.java
platform/platform-api/src/com/intellij/ide/actions/ContextHelpAction.java
platform/platform-api/src/com/intellij/ide/actions/QuickSwitchSchemeAction.java
platform/platform-api/src/com/intellij/ide/highlighter/WorkspaceFileType.java
platform/platform-api/src/com/intellij/ide/util/treeView/smartTree/Sorter.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/Banner.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/openapi/ui/FixedSizeButton.java
platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java
platform/platform-api/src/com/intellij/openapi/ui/popup/util/MinimizeButton.java
platform/platform-api/src/com/intellij/ui/AutoScrollFromSourceHandler.java
platform/platform-api/src/com/intellij/ui/AutoScrollToSourceHandler.java
platform/platform-api/src/com/intellij/ui/RawCommandLineEditor.java
platform/platform-api/src/com/intellij/ui/ReorderableListController.java
platform/platform-api/src/com/intellij/ui/SearchTextField.java
platform/platform-api/src/com/intellij/ui/components/JBComboBoxLabel.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/dualView/DualView.java
platform/platform-api/src/com/intellij/ui/tabs/TabInfo.java
platform/platform-api/src/com/intellij/ui/tabs/impl/singleRow/MoreTabsIcon.java
platform/platform-api/src/com/intellij/ui/treeStructure/actions/CollapseAllAction.java
platform/platform-api/src/com/intellij/ui/treeStructure/actions/ExpandAllAction.java
platform/platform-api/src/com/intellij/util/Icons.java
platform/platform-api/src/com/intellij/util/ui/AsyncProcessIcon.java
platform/platform-impl/src/com/intellij/application/options/ExportSchemeAction.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/ide/BrowserSettings.java
platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java
platform/platform-impl/src/com/intellij/ide/actionMacro/ActionMacroManager.java
platform/platform-impl/src/com/intellij/ide/actionMacro/actions/StartStopMacroRecordingAction.java
platform/platform-impl/src/com/intellij/ide/actions/CloseAction.java
platform/platform-impl/src/com/intellij/ide/actions/ToolWindowsGroup.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/errorTreeView/NewErrorTreeViewPanel.java
platform/platform-impl/src/com/intellij/ide/plugins/ActionInstallPlugin.java
platform/platform-impl/src/com/intellij/ide/plugins/ActionUninstallPlugin.java
platform/platform-impl/src/com/intellij/ide/plugins/AvailablePluginColumnInfo.java
platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsTableModel.java
platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerColumnInfo.java
platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java
platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java
platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java
platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java
platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.java
platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationConfigurable.java
platform/platform-impl/src/com/intellij/ide/util/TipPanel.java
platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java
platform/platform-impl/src/com/intellij/notification/EventLog.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/impl/incrementalMerge/ui/ApplyNonConflicts.java
platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/MergePanel2.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/editor/actions/ScrollToTheEndToolbarAction.java
platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java
platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/NewFileAction.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/RefreshRemoteFileAction.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/ChooseActionsDialog.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapConfigurable.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java
platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListPanel.java
platform/platform-impl/src/com/intellij/openapi/options/ex/ControlPanelSettingsEditor.java
platform/platform-impl/src/com/intellij/openapi/options/newEditor/ShowSearchFieldAction.java
platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressBar.java
platform/platform-impl/src/com/intellij/openapi/ui/impl/ShadowBorderPainter.java
platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ComboIcon.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/content/MoreIcon.java
platform/platform-impl/src/com/intellij/openapi/wm/impl/content/PushedTabBackground.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/InlineProgressIndicator.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/AppIcon.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/HideableTitledPanel.java
platform/platform-impl/src/com/intellij/ui/SplitterWithSecondHideable.java
platform/platform-impl/src/com/intellij/ui/content/impl/ContentImpl.java
platform/platform-impl/src/com/intellij/ui/content/impl/MessageViewImpl.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/PopupIcons.java
platform/platform-impl/src/com/intellij/ui/popup/SpeedSearchPane.java
platform/platform-impl/src/com/intellij/ui/popup/tree/TreePopupImpl.java
platform/platform-tests/testSrc/com/intellij/ui/tabs/impl/JBTabsDemo.java
platform/projectModel-api/src/com/intellij/ide/highlighter/ModuleFileType.java
platform/projectModel-api/src/com/intellij/ide/highlighter/ProjectFileType.java
platform/testRunner/src/com/intellij/execution/testframework/PoolOfTestIcons.java
platform/testRunner/src/com/intellij/execution/testframework/ToolbarPanel.java
platform/testRunner/src/com/intellij/execution/testframework/actions/ScrollToTestSourceAction.java
platform/testRunner/src/com/intellij/execution/testframework/autotest/ToggleAutoTestAction.java
platform/usageView/src/com/intellij/usages/impl/ImportUsageFilteringRuleProvider.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/UsageFilteringRuleProviderImpl.java
platform/usageView/src/com/intellij/usages/impl/UsageGroupingRuleProviderImpl.java
platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java
platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java
platform/usageView/src/com/intellij/usages/impl/rules/ModuleGroupingRule.java
platform/util/src/com/intellij/icons/AllIcons.java [new file with mode: 0644]
platform/util/src/com/intellij/util/ui/UIUtil.java
platform/util/src/com/intellij/util/ui/tree/MacTreeUI.java
platform/vcs-api/src/com/intellij/openapi/vcs/annotate/ShowAllAffectedGenericAction.java
platform/vcs-api/src/com/intellij/openapi/vcs/ui/SearchFieldAction.java
platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java
platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffIcons.java
platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffOperation.java
platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowDiffFromAnnotation.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/actions/CreatePatchFromChangesAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/IgnoredSettingsAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/MoveChangesToAnotherListAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/OpenRepositoryVersionAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RevertSelectedChangesAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackDialogAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/SetDefaultChangeListAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ShowDiffAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ShowDiffWithLocalAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/IncomingChangesIndicator.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictNotificationPanel.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/PatchFileType.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentManager.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/EditSourceInCommitAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/MultipleChangeListBrowser.java
platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java
platform/vcs-impl/src/com/intellij/openapi/vcs/ex/RollbackLineStatusRangeAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/ex/ShowLineStatusRangeDiffAction.java
platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java
platform/vcs-impl/src/com/intellij/openapi/vcs/update/DirectoryTreeNode.java
platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateInfoTree.java
platform/xdebugger-api/src/com/intellij/execution/executors/DefaultDebugExecutor.java
platform/xdebugger-api/src/com/intellij/xdebugger/ui/DebuggerIcons.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/common/AbstractValueHintTreeComponent.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/DebuggerConfigurable.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerColorsPage.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerSessionTabBase.java
platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerUIConstants.java
plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataHighlightingPass.java
plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/ResetTelemetryAction.java
plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/UpdateTelemetryViewAction.java
plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java
plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.java
plugins/ant/src/com/intellij/lang/ant/AntFileType.java
plugins/ant/src/com/intellij/lang/ant/AntIcons.java
plugins/ant/src/com/intellij/lang/ant/config/actions/AntBuildFilePropertiesAction.java
plugins/ant/src/com/intellij/lang/ant/config/actions/ChangeViewAction.java
plugins/ant/src/com/intellij/lang/ant/config/actions/PauseOutputAction.java
plugins/ant/src/com/intellij/lang/ant/config/actions/RunAction.java
plugins/ant/src/com/intellij/lang/ant/config/actions/StopAction.java
plugins/ant/src/com/intellij/lang/ant/config/actions/VerboseAction.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/impl/AllJarsUnderDirEntry.java
plugins/ant/src/com/intellij/lang/ant/config/impl/AntKeymapExtension.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/cvsBrowser/LoadingNode.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/ui/BrowserPanel.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/AddedFileInfo.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddMultipleFilesOptionsDialog.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/ui/FileCellRenderer.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindow.java
plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindowComponent.java
plugins/devkit/src/DevKitFileTemplatesFactory.java
plugins/devkit/src/actions/NewActionDialog.java
plugins/devkit/src/build/PluginModuleBuildConfEditor.java
plugins/devkit/src/module/PluginModuleType.java
plugins/devkit/src/run/PluginConfigurationType.java
plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/SelectEclipseImportedProjectsStep.java
plugins/git4idea/src/git4idea/history/wholeTree/BasePopupAction.java
plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java
plugins/git4idea/src/git4idea/push/GitManualPushToBranch.java
plugins/git4idea/src/git4idea/ui/branch/GitCompareBranchesDialog.java
plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleIcons.java
plugins/groovy/src/org/jetbrains/plugins/groovy/doc/actions/GroovyDocReducePackageAction.java
plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcConsole.java
plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcIcons.java
plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/projectView/MvcProjectViewPane.java
plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationType.java
plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenResumeAction.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/utils/MavenIcons.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenSettings.java
plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/RepositoryAttachDialog.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/structureView/GroupByWordPrefixes.java
plugins/properties/src/com/intellij/lang/properties/structureView/PropertiesFileStructureViewModel.java
plugins/properties/src/com/intellij/lang/properties/structureView/PropertiesPrefixGroup.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopyDialog.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PagedListWithActions.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java
plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java
plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/CopyDialog.java
plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/PagedListWithActions.java
plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java
plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java
plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java
plugins/svn4ideaOld/src/org/jetbrains/idea/svn/history/RootsAndBranches.java
plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java
plugins/ui-designer/src/com/intellij/uiDesigner/GuiDesignerConfigurable.java
plugins/ui-designer/src/com/intellij/uiDesigner/clientProperties/ConfigureClientPropertiesDialog.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/DesignerToolWindowManager.java
plugins/ui-designer/ui-designer-new/src/com/intellij/designer/inspection/AbstractQuickFixManager.java
plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/RestoreDefault.java
plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/ShowJavadoc.java
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/AxisLookup.java
plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java
plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltDebuggerExtension.java
plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/actions/OpenOutputAction.java
resources/src/idea/JavaActions.xml
xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementsErrorPanel.java
xml/dom-impl/src/com/intellij/util/xml/tree/actions/DeleteDomElement.java
xml/dom-impl/src/com/intellij/util/xml/tree/actions/DomElementsToggleAction.java
xml/dom-openapi/src/com/intellij/util/xml/ui/ErrorableTableCellRenderer.java
xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNSRenderer.java
xml/impl/src/com/intellij/ide/browsers/BrowsersConfiguration.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/javaee/ExternalResourceConfigurable.java
xml/impl/src/com/intellij/xml/util/XmlIconProvider.java
xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RncFileType.java
xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncDefineImpl.java
xml/relaxng/src/org/intellij/plugins/relaxNG/convert/AdvancedDtdOptions.java
xml/relaxng/src/org/intellij/plugins/relaxNG/model/annotation/OverriddenDefineRenderer.java
xml/relaxng/src/org/intellij/plugins/relaxNG/model/annotation/OverridingDefineRenderer.java
xml/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/impl/RngDefineMetaData.java

index 0cc8f8ba045c8f6dfbc446f02be8e0bbe8848cdf..7706c35acd102eccf03e3521dbdae35fc1ac2f05 100644 (file)
@@ -15,6 +15,7 @@
  */
 package org.intellij.lang.regexp;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.fileTypes.LanguageFileType;
 import com.intellij.openapi.util.IconLoader;
 import com.intellij.ui.LayeredIcon;
@@ -33,7 +34,7 @@ public class RegExpFileType extends LanguageFileType {
         super(RegExpLanguage.INSTANCE);
 
         myIcon = new LayeredIcon(2);
-        ((LayeredIcon)myIcon).setIcon(IconLoader.getIcon("/fileTypes/text.png"), 0);
+        ((LayeredIcon)myIcon).setIcon(AllIcons.FileTypes.Text, 0);
         ((LayeredIcon)myIcon).setIcon(IconLoader.getIcon("regexp-filetype-icon.png"), 1);
 
 //        myIcon = LayeredIcon.create(
index 9824924fdc4de27e0e04ecfb7ca7d289a9017b53..16df24ec340d4dd879b300581437035d5a37f2e8 100644 (file)
@@ -20,6 +20,7 @@ import com.intellij.codeInsight.daemon.impl.actions.SuppressForClassFix;
 import com.intellij.compiler.*;
 import com.intellij.compiler.options.CompilerConfigurable;
 import com.intellij.compiler.server.BuildManager;
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.errorTreeView.*;
 import com.intellij.ide.util.treeView.NodeDescriptor;
 import com.intellij.openapi.actionSystem.*;
@@ -38,7 +39,6 @@ import com.intellij.openapi.projectRoots.JavaSdk;
 import com.intellij.openapi.projectRoots.JavaSdkVersion;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.roots.ModuleRootManager;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vcs.FileStatusManager;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -79,7 +79,7 @@ public class CompilerErrorTreeView extends NewErrorTreeViewPanel {
   }
 
   private static class CompilerPropertiesAction extends AnAction {
-    private static final Icon ICON_OPTIONS = IconLoader.getIcon("/general/ideOptions.png");
+    private static final Icon ICON_OPTIONS = AllIcons.General.IdeOptions;
 
     public CompilerPropertiesAction() {
       super(CompilerBundle.message("action.compiler.properties.text"), null, ICON_OPTIONS);
index dc5f2329b41d88648e3b780ce17630c38207ab28..aeea296ce1924d97137af93a713eb6220aa11db4 100644 (file)
@@ -16,6 +16,7 @@
 package com.intellij.compiler.options;
 
 import com.intellij.compiler.ProcessorConfigProfile;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.ActionManager;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.ShortcutSet;
@@ -72,7 +73,7 @@ public class AnnotationProcessorsPanel extends JPanel {
     myTree = new Tree(new MyTreeModel());
     myTree.setRootVisible(false);
     final JPanel treePanel =
-      ToolbarDecorator.createDecorator(myTree).addExtraAction(new AnActionButton("Move to", IconLoader.getIcon("/actions/nextfile.png")) {
+      ToolbarDecorator.createDecorator(myTree).addExtraAction(new AnActionButton("Move to", AllIcons.Actions.Nextfile) {
         @Override
         public void actionPerformed(AnActionEvent e) {
           final MyModuleNode node = (MyModuleNode)myTree.getSelectionPath().getLastPathComponent();
@@ -361,8 +362,6 @@ public class AnnotationProcessorsPanel extends JPanel {
   }
 
   private static class MyCellRenderer extends ColoredTreeCellRenderer {
-    private static final Icon MODULE_ICON = IconLoader.getIcon("/nodes/ModuleClosed.png");
-
     @Override
     public void customizeCellRenderer(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, boolean hasFocus) {
       if (value instanceof ProfileNode) {
@@ -370,7 +369,7 @@ public class AnnotationProcessorsPanel extends JPanel {
       }
       else if (value instanceof MyModuleNode) {
         final Module module = (Module)((MyModuleNode)value).getUserObject();
-        setIcon(MODULE_ICON);
+        setIcon(AllIcons.Nodes.ModuleClosed);
         append(module.getName());
       }
     }
index c0411cb544d5386a59effa54a28df5d7769f1139..136cbe8fc5b70d9c2c5fe7d514e488176d449160 100644 (file)
@@ -21,6 +21,7 @@ import com.intellij.compiler.CompilerConfigurationImpl;
 import com.intellij.compiler.CompilerSettingsFactory;
 import com.intellij.compiler.impl.rmiCompiler.RmicConfiguration;
 import com.intellij.compiler.server.BuildManager;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.compiler.CompilerBundle;
 import com.intellij.openapi.compiler.options.ExcludedEntriesConfigurable;
 import com.intellij.openapi.diagnostic.Logger;
@@ -31,7 +32,6 @@ import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.options.SearchableConfigurable;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vcs.FileStatusManager;
 import org.jetbrains.annotations.Nls;
 import org.jetbrains.annotations.NotNull;
@@ -47,7 +47,7 @@ public class CompilerConfigurable implements SearchableConfigurable.Parent, Conf
   private static final Logger LOG = Logger.getInstance("#com.intellij.compiler.options.CompilerConfigurable");
 
   private final Project myProject;
-  private static final Icon ICON = IconLoader.getIcon("/general/configurableCompiler.png");
+  private static final Icon ICON = AllIcons.General.ConfigurableCompiler;
   private final CompilerUIConfigurable myCompilerUIConfigurable;
   private Configurable[] myKids;
 
index ef483f9b54e4101701d13c289e820b7605feab8d..c73a727b3801aae3c3303e0e64b84fc2f999aad6 100644 (file)
@@ -15,8 +15,8 @@
  */
 package com.intellij.packaging.impl.artifacts;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.components.ServiceManager;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.packaging.artifacts.ArtifactType;
 import com.intellij.packaging.elements.CompositePackagingElement;
 import com.intellij.packaging.elements.PackagingElementFactory;
@@ -29,7 +29,7 @@ import javax.swing.*;
  * @author nik
  */
 public class InvalidArtifactType extends ArtifactType {
-  public static final Icon ICON = IconLoader.getIcon("/fileTypes/unknown.png");
+  public static final Icon ICON = AllIcons.FileTypes.Unknown;
 
   public static InvalidArtifactType getInstance() {
     return ServiceManager.getService(InvalidArtifactType.class);
index b720824c04f3e5e3f0d8d0ff7dfc48ca8d3ba30d..77a7a47019ccce6a0aa3b1ba7e025f47f6151fd8 100644 (file)
@@ -15,8 +15,8 @@
  */
 package com.intellij.packaging.impl.artifacts;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.compiler.CompilerBundle;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.packaging.artifacts.ArtifactType;
 import com.intellij.packaging.elements.CompositePackagingElement;
 import com.intellij.packaging.elements.PackagingElementOutputKind;
@@ -30,7 +30,7 @@ import javax.swing.*;
  * @author nik
  */
 public class PlainArtifactType extends ArtifactType {
-  public static final Icon ARTIFACT_ICON = IconLoader.getIcon("/nodes/artifact.png");
+  public static final Icon ARTIFACT_ICON = AllIcons.Nodes.Artifact;
   @NonNls public static final String ID = "plain";
 
   public static PlainArtifactType getInstance() {
index 1c709ea2d8c0f0393897f8be04b24d442b65d955..4db82e0cf7717f0ecfffeeb4edaadb4bdf38a12f 100644 (file)
  */
 package com.intellij.packaging.impl.elements;
 
-import com.intellij.openapi.fileChooser.*;
+import com.intellij.icons.AllIcons;
+import com.intellij.openapi.fileChooser.FileChooser;
+import com.intellij.openapi.fileChooser.FileChooserDescriptor;
+import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.packaging.artifacts.Artifact;
 import com.intellij.packaging.elements.CompositePackagingElement;
@@ -33,7 +35,7 @@ import java.util.List;
 * @author nik
 */
 public class DirectoryCopyElementType extends PackagingElementType<DirectoryCopyPackagingElement> {
-  public static final Icon COPY_OF_FOLDER_ICON = IconLoader.getIcon("/nodes/copyOfFolder.png");
+  public static final Icon COPY_OF_FOLDER_ICON = AllIcons.Nodes.CopyOfFolder;
 
   DirectoryCopyElementType() {
     super("dir-copy", "Directory Content");
index b133880138268edfe7a877a39bd88d96a84a578f..081cda1a0e063ac42944352449cf07b8479b154e 100644 (file)
  */
 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.openapi.ui.Messages;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.packaging.elements.CompositePackagingElement;
 import com.intellij.packaging.elements.CompositePackagingElementType;
 import com.intellij.packaging.impl.artifacts.ArtifactUtil;
@@ -33,7 +33,7 @@ import javax.swing.*;
 * @author nik
 */
 class DirectoryElementType extends CompositePackagingElementType<DirectoryPackagingElement> {
-  private static final Icon ICON = IconLoader.getIcon("/actions/newFolder.png");
+  private static final Icon ICON = AllIcons.Actions.NewFolder;
 
   DirectoryElementType() {
     super("directory", CompilerBundle.message("element.type.name.directory"));
index 833efd590b94ce535c815a5ec9e2d7c9b81edf5d..7b36993bba3ea79aee19e4bafd32a668d661802a 100644 (file)
  */
 package com.intellij.packaging.impl.elements;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.fileChooser.FileChooser;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.packaging.artifacts.Artifact;
 import com.intellij.packaging.elements.CompositePackagingElement;
@@ -36,7 +36,7 @@ import java.util.List;
 * @author nik
 */
 public class ExtractedDirectoryElementType extends PackagingElementType<ExtractedDirectoryPackagingElement> {
-  public static final Icon EXTRACTED_FOLDER_ICON = IconLoader.getIcon("/nodes/extractedFolder.png");
+  public static final Icon EXTRACTED_FOLDER_ICON = AllIcons.Nodes.ExtractedFolder;
 
   ExtractedDirectoryElementType() {
     super("extracted-dir", "Extracted Directory");
index b793db96bf1c637bd8ee6faf9c1005a0f1ea71f3..bfdd5766270ae1ac781962e0279d5d155dcd18fa 100644 (file)
  */
 package com.intellij.packaging.impl.elements;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.fileChooser.FileChooser;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.packaging.artifacts.Artifact;
 import com.intellij.packaging.elements.CompositePackagingElement;
@@ -34,7 +34,7 @@ import java.util.List;
 * @author nik
 */
 public class FileCopyElementType extends PackagingElementType<FileCopyPackagingElement> {
-  public static final Icon ICON = IconLoader.getIcon("/fileTypes/text.png");
+  public static final Icon ICON = AllIcons.FileTypes.Text;
 
   FileCopyElementType() {
     super("file-copy", "File");
index 9545b365961eb99a6aa0181f8b683c9ba42a7d79..3565c05aaa48006d24f29ce67f777874dd5a0853 100644 (file)
  */
 package com.intellij.packaging.impl.elements;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.compiler.CompilerBundle;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModulePointer;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ui.configuration.ModulesProvider;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.packaging.ui.ArtifactEditorContext;
 import org.jetbrains.annotations.NotNull;
 
@@ -49,7 +49,7 @@ public class ProductionModuleOutputElementType extends ModuleOutputElementTypeBa
 
   @Override
   public Icon getCreateElementIcon() {
-    return IconLoader.getIcon("/nodes/ModuleOpen.png");
+    return AllIcons.Nodes.ModuleOpen;
   }
 
   protected List<Module> getSuitableModules(ArtifactEditorContext context) {
index fa8035a41846f43c702b87aeb41984bae5b9beae..251434eedaf85115e94138cf7f9301ffb6c918ee 100644 (file)
@@ -45,6 +45,7 @@ import com.intellij.execution.ui.ExecutionConsoleEx;
 import com.intellij.execution.ui.RunContentDescriptor;
 import com.intellij.execution.ui.actions.CloseAction;
 import com.intellij.execution.ui.layout.PlaceInGrid;
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.actions.ContextHelpAction;
 import com.intellij.idea.ActionsBundle;
 import com.intellij.openapi.Disposable;
@@ -53,7 +54,6 @@ import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.ui.content.AlertIcon;
 import com.intellij.ui.content.Content;
 import com.intellij.ui.content.ContentManagerAdapter;
@@ -74,8 +74,8 @@ 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 = IconLoader.getIcon("/debugger/watchLastReturnValue.png");
-  private static final Icon AUTO_VARS_ICONS = IconLoader.getIcon("/debugger/autoVariablesMode.png");
+  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;
@@ -146,7 +146,7 @@ public class DebuggerSessionTab extends DebuggerSessionTabBase implements Dispos
     myFramesPanel = new FramesPanel(getProject(), getContextManager());
 
 
-    final AlertIcon breakpointAlert = new AlertIcon(IconLoader.getIcon("/debugger/breakpointAlert.png"));
+    final AlertIcon breakpointAlert = new AlertIcon(AllIcons.Debugger.BreakpointAlert);
 
     // watches
     Content watches = myUi.createContent(DebuggerContentInfo.WATCHES_CONTENT, myWatchPanel, XDebuggerBundle.message("debugger.session.tab.watches.title"),
index a1737263be1231c660e062cadc54d46a3ce4c437..dd6cf3705b681e522430c94cb47fef808978bfc3 100644 (file)
@@ -41,6 +41,7 @@ import com.intellij.debugger.ui.impl.watch.MethodsTracker;
 import com.intellij.debugger.ui.impl.watch.StackFrameDescriptorImpl;
 import com.intellij.debugger.ui.impl.watch.ThreadDescriptorImpl;
 import com.intellij.debugger.ui.tree.render.DescriptorLabelListener;
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.CommonActionsManager;
 import com.intellij.ide.OccurenceNavigator;
 import com.intellij.openapi.Disposable;
@@ -50,7 +51,6 @@ import com.intellij.openapi.application.ModalityState;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.ComboBoxWithWidePopup;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.ui.CaptionPanel;
 import com.intellij.ui.PopupHandler;
 import com.intellij.ui.ScrollPaneFactory;
@@ -76,7 +76,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
 
 public class FramesPanel extends UpdatableDebuggerView {
-  private static final Icon FILTER_STACK_FRAMES_ICON = IconLoader.getIcon("/debugger/class_filter.png");
+  private static final Icon FILTER_STACK_FRAMES_ICON = AllIcons.Debugger.Class_filter;
 
   private final JComboBox myThreadsCombo;
   private final FramesList myFramesList;
index 0d94431301fd79e0331d8aecf82b2b6752da6c99..3ea7c83fc72dd58fa6ac2c47345f90bafc7cdc9d 100644 (file)
@@ -29,12 +29,16 @@ import com.intellij.debugger.engine.evaluation.EvaluateException;
 import com.intellij.debugger.engine.jdi.VirtualMachineProxy;
 import com.intellij.debugger.engine.requests.RequestManagerImpl;
 import com.intellij.debugger.impl.PositionUtil;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.markup.RangeHighlighter;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.*;
+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.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.psi.*;
@@ -62,18 +66,18 @@ public class FieldBreakpoint extends BreakpointWithHighlighter {
   private boolean myIsStatic;
   private String myFieldName;
 
-  public static Icon ICON = IconLoader.getIcon("/debugger/db_field_breakpoint.png");
-  public static Icon MUTED_ICON = IconLoader.getIcon("/debugger/db_muted_field_breakpoint.png");
-  public static Icon DISABLED_ICON = IconLoader.getIcon("/debugger/db_disabled_field_breakpoint.png");
-  public static Icon DISABLED_DEP_ICON = IconLoader.getIcon("/debugger/db_dep_field_breakpoint.png");
-  public static Icon MUTED_DISABLED_ICON = IconLoader.getIcon("/debugger/db_muted_disabled_field_breakpoint.png");
-  public static Icon MUTED_DISABLED_DEP_ICON = IconLoader.getIcon("/debugger/db_muted_dep_field_breakpoint.png");
-  private static final Icon ourInvalidIcon = IconLoader.getIcon("/debugger/db_invalid_field_breakpoint.png");
-  private static final Icon ourMutedInvalidIcon = IconLoader.getIcon("/debugger/db_muted_invalid_field_breakpoint.png");
-  private static final Icon ourVerifiedIcon = IconLoader.getIcon("/debugger/db_verified_field_breakpoint.png");
-  private static final Icon ourMutedVerifiedIcon = IconLoader.getIcon("/debugger/db_muted_verified_field_breakpoint.png");
-  private static final Icon ourVerifiedWarningIcon = IconLoader.getIcon("/debugger/db_field_warning_breakpoint.png");
-  private static final Icon ourMutedVerifiedWarningIcon = IconLoader.getIcon("/debugger/db_muted_field_warning_breakpoint.png");
+  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) {
index e3586870ec1e0ccf0ae228358b0c910f7e9b90cd..9d0afabb4966e8fd7a099b1e17742bdb20ee80de 100644 (file)
@@ -30,6 +30,7 @@ import com.intellij.debugger.engine.evaluation.EvaluationContextImpl;
 import com.intellij.debugger.impl.DebuggerUtilsEx;
 import com.intellij.debugger.impl.PositionUtil;
 import com.intellij.debugger.jdi.StackFrameProxyImpl;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Document;
@@ -39,7 +40,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
 import com.intellij.openapi.util.Computable;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -71,7 +71,7 @@ public class LineBreakpoint extends BreakpointWithHighlighter {
   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 = IconLoader.getIcon("/debugger/db_muted_verified_warning_breakpoint.png");
+  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");
index ae6e5d89b54de6467df5050d45484c749a3bb000..d294620ad451cbdf3060e81542d4f1f6207928f9 100644 (file)
@@ -31,13 +31,13 @@ import com.intellij.debugger.engine.evaluation.EvaluationContextImpl;
 import com.intellij.debugger.engine.requests.RequestManagerImpl;
 import com.intellij.debugger.impl.DebuggerUtilsEx;
 import com.intellij.debugger.impl.PositionUtil;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.Document;
 import com.intellij.openapi.editor.markup.RangeHighlighter;
 import com.intellij.openapi.project.IndexNotReadyException;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Computable;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Key;
 import com.intellij.psi.*;
 import com.intellij.util.StringBuilderSpinAllocator;
@@ -69,18 +69,18 @@ public class MethodBreakpoint extends BreakpointWithHighlighter {
   @Nullable private JVMName mySignature;
   private boolean myIsStatic;
 
-  @NotNull public static Icon ICON = IconLoader.getIcon("/debugger/db_method_breakpoint.png");
-  @NotNull public static Icon MUTED_ICON = IconLoader.getIcon("/debugger/db_muted_method_breakpoint.png");
-  @NotNull public static Icon DISABLED_ICON = IconLoader.getIcon("/debugger/db_disabled_method_breakpoint.png");
-  @NotNull public static Icon DISABLED_DEP_ICON = IconLoader.getIcon("/debugger/db_dep_method_breakpoint.png");
-  @NotNull public static Icon MUTED_DISABLED_ICON = IconLoader.getIcon("/debugger/db_muted_disabled_method_breakpoint.png");
-  @NotNull public static Icon MUTED_DISABLED_DEP_ICON = IconLoader.getIcon("/debugger/db_muted_dep_method_breakpoint.png");
-  private static final Icon ourInvalidIcon = IconLoader.getIcon("/debugger/db_invalid_method_breakpoint.png");
-  private static final Icon ourMutedInvalidIcon = IconLoader.getIcon("/debugger/db_muted_invalid_method_breakpoint.png");
-  private static final Icon ourVerifiedIcon = IconLoader.getIcon("/debugger/db_verified_method_breakpoint.png");
-  private static final Icon ourMutedVerifiedIcon = IconLoader.getIcon("/debugger/db_muted_verified_method_breakpoint.png");
-  private static final Icon ourVerifiedWarningIcon = IconLoader.getIcon("/debugger/db_method_warning_breakpoint.png");
-  private static final Icon ourMutedVerifiedWarningIcon = IconLoader.getIcon("/debugger/db_muted_method_warning_breakpoint.png");
+  @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) {
index f64ab3b15152eb25bf26355810cfa5311790eee3..6864ab88c5196364ba8996d6b7ad5d5a0f631a38 100644 (file)
@@ -20,7 +20,7 @@ import com.intellij.debugger.impl.DebuggerContextImpl;
 import com.intellij.debugger.impl.DebuggerUtilsEx;
 import com.intellij.debugger.ui.impl.watch.*;
 import com.intellij.debugger.ui.tree.ValueDescriptor;
-import com.intellij.openapi.util.IconLoader;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.ColoredTreeCellRenderer;
 import com.intellij.ui.RowIcon;
@@ -36,11 +36,11 @@ import javax.swing.*;
 import java.awt.*;
 
 public class DebuggerTreeRenderer extends ColoredTreeCellRenderer {
-  private static final Icon myThreadGroupIcon = IconLoader.getIcon("/debugger/threadGroup.png");
-  private static final Icon myCurrentThreadGroupIcon = IconLoader.getIcon("/debugger/threadGroupCurrent.png");
+  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 = IconLoader.getIcon("/nodes/static.png");
+  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);
index 5ed274b7aa35a8b298830031c646b2468c2d33d0..6176f938aabb2267bf89d5867369ce7797656389 100644 (file)
@@ -25,16 +25,16 @@ import com.intellij.debugger.engine.evaluation.EvaluationContextImpl;
 import com.intellij.debugger.jdi.StackFrameProxyImpl;
 import com.intellij.debugger.settings.ThreadsViewSettings;
 import com.intellij.debugger.ui.tree.StackFrameDescriptor;
-import com.intellij.xdebugger.impl.ui.tree.ValueMarkup;
 import com.intellij.debugger.ui.tree.render.DescriptorLabelListener;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vfs.VirtualFile;
 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,7 +57,7 @@ public class StackFrameDescriptorImpl extends NodeDescriptorImpl implements Stac
   private ObjectReference myThisObject;
   private Color myBackgroundColor;
 
-  private static final Icon myObsoleteFrameIcon = IconLoader.getIcon("/debugger/db_obsolete.png");
+  private static final Icon myObsoleteFrameIcon = AllIcons.Debugger.Db_obsolete;
   private Icon myIcon = DebuggerIcons.STACK_FRAME_ICON;
 
   public StackFrameDescriptorImpl(StackFrameProxyImpl frame, final MethodsTracker tracker) {
@@ -256,4 +256,4 @@ public class StackFrameDescriptorImpl extends NodeDescriptorImpl implements Stac
   public Icon getIcon() {
     return myIcon;
   }
-}
\ No newline at end of file
+}
index a35cc7e08e62781c9483b093c7439cd7cf67f633..1279a75a08dd4b13ff6684a68701bf00866b8434 100644 (file)
@@ -27,7 +27,7 @@ import com.intellij.debugger.jdi.ThreadGroupReferenceProxyImpl;
 import com.intellij.debugger.jdi.ThreadReferenceProxyImpl;
 import com.intellij.debugger.ui.tree.ThreadDescriptor;
 import com.intellij.debugger.ui.tree.render.DescriptorLabelListener;
-import com.intellij.openapi.util.IconLoader;
+import com.intellij.icons.AllIcons;
 import com.intellij.xdebugger.ui.DebuggerIcons;
 import com.sun.jdi.ObjectCollectedException;
 import com.sun.jdi.ThreadReference;
@@ -45,10 +45,10 @@ public class ThreadDescriptorImpl extends NodeDescriptorImpl implements ThreadDe
   private boolean            myIsAtBreakpoint;
   private SuspendContextImpl mySuspendContext;
 
-  private static final Icon myRunningThreadIcon = IconLoader.getIcon("/debugger/threadRunning.png");
-  private static final Icon myCurrentThreadIcon = IconLoader.getIcon("/debugger/threadCurrent.png");
-  private static final Icon myThreadAtBreakpointIcon = IconLoader.getIcon("/debugger/threadAtBreakpoint.png");
-  private static final Icon myFrozenThreadIcon = IconLoader.getIcon("/debugger/threadFrozen.png");
+  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;
@@ -170,4 +170,4 @@ public class ThreadDescriptorImpl extends NodeDescriptorImpl implements ThreadDe
     }
     return myRunningThreadIcon;
   }
-}
\ No newline at end of file
+}
index b4b7d42c9cfeb12d7b99a82aae0835426e8af166..784d69332a3cd1f1bf581f1c5de612ec89f5e265 100644 (file)
@@ -22,6 +22,7 @@ import com.intellij.execution.configurations.RunConfiguration;
 import com.intellij.execution.configurations.RunConfigurationBase;
 import com.intellij.execution.configurations.RunProfileWithCompileBeforeLaunchOption;
 import com.intellij.execution.remote.RemoteConfiguration;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.DataContext;
 import com.intellij.openapi.compiler.CompileContext;
 import com.intellij.openapi.compiler.CompileScope;
@@ -30,7 +31,6 @@ import com.intellij.openapi.compiler.CompilerManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.Ref;
 import com.intellij.util.concurrency.Semaphore;
@@ -51,7 +51,7 @@ public class CompileStepBeforeRun extends BeforeRunTaskProvider<CompileStepBefor
 
   @NonNls protected static final String MAKE_PROJECT_ON_RUN_KEY = "makeProjectOnRun";
 
-  private static final Icon ICON = IconLoader.getIcon("/actions/compile.png");
+  private static final Icon ICON = AllIcons.Actions.Compile;
 
   private final Project myProject;
 
index 86dba55114ba159614d8a94c3d29a5445c9e3284..d6a50af6aa3287d282546be7e4ce1b2fee7de97d 100644 (file)
@@ -21,9 +21,9 @@ import com.intellij.execution.configurations.ConfigurationFactory;
 import com.intellij.execution.configurations.ConfigurationType;
 import com.intellij.execution.configurations.ModuleBasedConfiguration;
 import com.intellij.execution.configurations.RunConfiguration;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 
@@ -31,7 +31,7 @@ import javax.swing.*;
 
 public class AppletConfigurationType implements ConfigurationType {
   private final ConfigurationFactory myFactory;
-  private static final Icon ICON = IconLoader.getIcon("/runConfigurations/applet.png");
+  private static final Icon ICON = AllIcons.RunConfigurations.Applet;
 
   /**reflection*/
   AppletConfigurationType() {
index 032d56d85e1e2d307f34613b58cb887d75ff3c02..19afcf50e2bdfef6b2371b1fceb7906512eb6e23 100644 (file)
@@ -21,9 +21,9 @@ import com.intellij.execution.configurations.ConfigurationFactory;
 import com.intellij.execution.configurations.ConfigurationType;
 import com.intellij.execution.configurations.ModuleBasedConfiguration;
 import com.intellij.execution.configurations.RunConfiguration;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiJavaFile;
@@ -37,7 +37,7 @@ import javax.swing.*;
 
 public class ApplicationConfigurationType implements ConfigurationType {
   private final ConfigurationFactory myFactory;
-  private static final Icon ICON = IconLoader.getIcon("/runConfigurations/application.png");
+  private static final Icon ICON = AllIcons.RunConfigurations.Application;
 
 
   /**reflection*/
index 9e3cb8cf6632f3f354048663f3fadbbd7c8da224..697a51bbd103fc3da522d27530e963ebb4f3912a 100644 (file)
@@ -27,6 +27,7 @@ import com.intellij.execution.process.ProcessHandler;
 import com.intellij.execution.runners.*;
 import com.intellij.execution.ui.ExecutionConsole;
 import com.intellij.execution.ui.RunContentDescriptor;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CustomShortcutSet;
@@ -34,7 +35,6 @@ import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.fileEditor.FileDocumentManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.IconLoader;
 import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
@@ -154,7 +154,7 @@ public class DefaultJavaProgramRunner extends JavaPatchableProgramRunner {
 
   protected static class ControlBreakAction extends LauncherBasedAction {
     public ControlBreakAction(final ProcessHandler processHandler) {
-      super(ExecutionBundle.message("run.configuration.dump.threads.action.name"), null, IconLoader.getIcon("/actions/dump.png"),
+      super(ExecutionBundle.message("run.configuration.dump.threads.action.name"), null, AllIcons.Actions.Dump,
             processHandler);
       setShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_CANCEL, InputEvent.CTRL_DOWN_MASK)));
     }
@@ -175,7 +175,7 @@ public class DefaultJavaProgramRunner extends JavaPatchableProgramRunner {
 
   protected static class SoftExitAction extends LauncherBasedAction {
     public SoftExitAction(final ProcessHandler processHandler) {
-      super(ExecutionBundle.message("run.configuration.exit.action.name"), null, IconLoader.getIcon("/actions/exit.png"), processHandler);
+      super(ExecutionBundle.message("run.configuration.exit.action.name"), null, AllIcons.Actions.Exit, processHandler);
     }
 
     @Override
index ea31331c7f92c563f518a6c58802b35f114f28cb..70b551a0cbe4b07fb3b587844d0e485689647ea2 100644 (file)
@@ -24,9 +24,9 @@ import com.intellij.execution.ExecutionBundle;
 import com.intellij.execution.configurations.ConfigurationFactory;
 import com.intellij.execution.configurations.ConfigurationType;
 import com.intellij.execution.configurations.RunConfiguration;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -35,7 +35,7 @@ import javax.swing.*;
 
 public class RemoteConfigurationType implements ConfigurationType {
   private final ConfigurationFactory myFactory;
-  private static final Icon ICON = IconLoader.getIcon("/runConfigurations/remote.png");
+  private static final Icon ICON = AllIcons.RunConfigurations.Remote;
 
   /**reflection*/
   public RemoteConfigurationType() {
@@ -78,4 +78,4 @@ public class RemoteConfigurationType implements ConfigurationType {
     return ContainerUtil.findInstance(Extensions.getExtensions(CONFIGURATION_TYPE_EP), RemoteConfigurationType.class);
   }
 
-}
\ No newline at end of file
+}
index 9fc4c0f4c5add007dde2f2698395a341610dcccf..320aa81ba078efc484d247cdd42bd72ef0153f3b 100644 (file)
@@ -19,6 +19,7 @@ import com.intellij.framework.library.DownloadableLibraryDescription;
 import com.intellij.framework.library.DownloadableLibraryType;
 import com.intellij.framework.library.FrameworkLibraryVersion;
 import com.intellij.framework.library.FrameworkLibraryVersionFilter;
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.util.frameworkSupport.OldCustomLibraryDescription;
 import com.intellij.openapi.Disposable;
@@ -39,7 +40,6 @@ import com.intellij.openapi.roots.ui.configuration.libraryEditor.LibraryEditor;
 import com.intellij.openapi.roots.ui.configuration.libraryEditor.NewLibraryEditor;
 import com.intellij.openapi.roots.ui.configuration.projectRoot.LibrariesContainer;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.LocalFileSystem;
@@ -346,7 +346,7 @@ public class LibraryOptionsPanel implements Disposable {
       case USE_LIBRARY:
         final Object item = myExistingLibraryComboBox.getSelectedItem();
         if (item == null) {
-          myMessageLabel.setIcon(IconLoader.getIcon("/runConfigurations/configurationWarning.png"));
+          myMessageLabel.setIcon(AllIcons.RunConfigurations.ConfigurationWarning);
           message = "<b>Error:</b> library is not specified";
           myConfigureButton.setVisible(false);
         }
index 2d63d95f8d17782e9a76174f72ebf2e95f757a90..b3c8af6564d89e878c27fdacecbf0c97c3e48bae 100644 (file)
@@ -16,6 +16,7 @@
 
 package com.intellij.ide.palette.impl;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.palette.PaletteDragEventListener;
 import com.intellij.ide.palette.PaletteItem;
@@ -26,7 +27,6 @@ import com.intellij.openapi.fileEditor.FileEditorManagerEvent;
 import com.intellij.openapi.fileEditor.FileEditorManagerListener;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.startup.StartupManager;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowAnchor;
@@ -71,7 +71,7 @@ public class PaletteManager implements ProjectComponent {
                                ToolWindowAnchor.RIGHT,
                                myProject,
                                true);
-          myPaletteToolWindow.setIcon(IconLoader.getIcon("/general/toolWindowPalette.png"));
+          myPaletteToolWindow.setIcon(AllIcons.General.ToolWindowPalette);
           setContent();
           final MyFileEditorManagerListener myListener = new MyFileEditorManagerListener();
           myFileEditorManager.addFileEditorManagerListener(myListener, myProject);
index 62143df791102b4f07ffbeea7d2b4b15102a57bf..61eb70dc9232b5bb526ebbc76beeaf85809e3597 100644 (file)
@@ -15,6 +15,7 @@
  */
 package com.intellij.ide.util.importProject;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.util.ElementsChooser;
 import com.intellij.ide.util.projectWizard.importSources.DetectedProjectRoot;
 import com.intellij.openapi.actionSystem.*;
@@ -23,7 +24,6 @@ import com.intellij.openapi.ui.InputValidator;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.ui.Splitter;
 import com.intellij.openapi.ui.ex.MultiLineLabel;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.ui.DocumentAdapter;
 import com.intellij.ui.IdeBorderFactory;
@@ -52,10 +52,10 @@ import java.util.List;
  *         Date: Jul 16, 2007
  */
 abstract class ProjectLayoutPanel<T> extends JPanel {
-  private static final Icon ICON_MODULE = IconLoader.getIcon("/nodes/ModuleClosed.png");
+  private static final Icon ICON_MODULE = AllIcons.Nodes.ModuleClosed;
   private static final Icon RENAME_ICON = IconUtil.getEditIcon();
-  private static final Icon MERGE_ICON = IconLoader.getIcon("/modules/merge.png");
-  private static final Icon SPLIT_ICON = IconLoader.getIcon("/modules/split.png");
+  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;
index cd13249fd07627804586c585525a6246996b4bba..c507c78e8063e6323b848c712ed358d889cb682a 100644 (file)
@@ -20,6 +20,7 @@
  */
 package com.intellij.ide.util.newProjectWizard;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.util.newProjectWizard.modes.CreateFromScratchMode;
 import com.intellij.ide.util.newProjectWizard.modes.CreateFromSourcesMode;
 import com.intellij.ide.util.newProjectWizard.modes.WizardMode;
@@ -28,7 +29,6 @@ import com.intellij.ide.util.projectWizard.WizardContext;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.util.ui.UIUtil;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
@@ -116,7 +116,7 @@ public class ProjectCreateModeStep extends ModuleWizardStep {
     gc.fill = GridBagConstraints.BOTH;
     myWholePanel.add(Box.createVerticalBox(), gc);
     final JLabel note = new JLabel(
-      "<html>" + buf.toString() + "</html>", IconLoader.getIcon("/nodes/warningIntroduction.png"),
+      "<html>" + buf.toString() + "</html>", AllIcons.Nodes.WarningIntroduction,
       SwingConstants.LEFT
     );
     note.setVisible(buf.length() > 0);
index 095957693162a9d71a99107b57e1546777669d08..0ec251b3393676a5ddb10c8aef7e119020ebe07a 100644 (file)
  */
 package com.intellij.openapi.roots.ui.configuration;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.fileChooser.FileChooser;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
 import com.intellij.openapi.project.ProjectBundle;
 import com.intellij.openapi.roots.AnnotationOrderRootType;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.*;
 import com.intellij.ui.components.JBLabel;
@@ -44,7 +44,7 @@ public class AnnotationsEditor extends ModuleElementsEditor {
   private JTable myTable;
 
   public static final String NAME = ProjectBundle.message("project.roots.external.annotations.tab.title");
-  public static final Icon ICON = IconLoader.getIcon("/modules/annotation.png");
+  public static final Icon ICON = AllIcons.Modules.Annotation;
 
   public AnnotationsEditor(final ModuleConfigurationState state) {
     super(state);
index 3d8c45224ebfa9928fdb23654f458b0a62d7fa84..6de8a78ec9ef4592e324dea65ce44a1efdaee7fa 100644 (file)
  */
 package com.intellij.openapi.roots.ui.configuration;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.util.BrowseFilesListener;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
 import com.intellij.openapi.fileChooser.FileChooserFactory;
 import com.intellij.openapi.project.ProjectBundle;
 import com.intellij.openapi.roots.CompilerModuleExtension;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.VfsUtil;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -48,7 +48,7 @@ import java.awt.event.ActionListener;
 import java.io.IOException;
 
 public class BuildElementsEditor extends ModuleElementsEditor {
-  private static final Icon ICON = IconLoader.getIcon("/modules/output.png");
+  private static final Icon ICON = AllIcons.Modules.Output;
   private JRadioButton myInheritCompilerOutput;
   @SuppressWarnings({"FieldCanBeLocal"})
   private JRadioButton myPerModuleCompilerOutput;
index 6062955987153cc87d07c1c0dfa7bcb88c05d5c8..402317101fa6ff1ca47f8b7adfe4f6aab96521b9 100644 (file)
@@ -16,6 +16,7 @@
 package com.intellij.openapi.roots.ui.configuration;
 
 import com.intellij.ProjectTopics;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.project.ProjectBundle;
@@ -28,7 +29,6 @@ import com.intellij.openapi.roots.impl.storage.ClasspathStorage;
 import com.intellij.openapi.roots.impl.storage.ClasspathStorageProvider;
 import com.intellij.openapi.roots.ui.configuration.classpath.ClasspathPanelImpl;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.ui.OrderPanelListener;
 import org.jetbrains.annotations.NotNull;
 
@@ -45,7 +45,7 @@ import java.util.Map;
  */
 public class ClasspathEditor extends ModuleElementsEditor implements ModuleRootListener {
   public static final String NAME = ProjectBundle.message("modules.classpath.title");
-  public static final Icon ICON = IconLoader.getIcon("/modules/classpath.png");
+  public static final Icon ICON = AllIcons.Modules.Classpath;
 
   private ClasspathPanelImpl myPanel;
 
index 47021b9899ad0879f58960cfcc014d205aebc974..521414f5cce3a7e2068810e13bca86130639ecc2 100644 (file)
  */
 package com.intellij.openapi.roots.ui.configuration;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.project.Project;
+import com.intellij.openapi.ui.GraphicsConfig;
 import com.intellij.openapi.ui.MessageType;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.IconLoader;
-import com.intellij.openapi.ui.GraphicsConfig;
 import com.intellij.ui.awt.RelativePoint;
 import com.intellij.ui.components.JBList;
 import com.intellij.ui.components.JBScrollPane;
@@ -56,11 +56,11 @@ 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 = IconLoader.getIcon("/actions/expandall.png");
-  private static final Icon COLLAPSE = IconLoader.getIcon("/actions/collapseall.png");
-  private static final Icon FIX = IconLoader.findIcon("/actions/quickfixBulb.png");
-  private static final Icon IGNORE = IconLoader.findIcon("/actions/cancel.png");
-  private static final Icon NAVIGATE = IconLoader.findIcon("/general/autoscrollToSource.png");
+  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";
index 5935e6571742171fc36feb8bd0ee45e272a02df0..20703fd2e3f2099e01a9859f0142185bedb3ef86 100644 (file)
  */
 package com.intellij.openapi.roots.ui.configuration;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.project.ProjectBundle;
 import com.intellij.openapi.roots.ContentFolder;
 import com.intellij.openapi.roots.SourceFolder;
 import com.intellij.openapi.ui.Messages;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.ui.roots.IconActionComponent;
 import org.jetbrains.annotations.Nullable;
 
@@ -27,8 +27,8 @@ import javax.swing.*;
 import java.awt.*;
 
 public abstract class JavaContentRootPanel extends ContentRootPanel {
-  private static final Icon ADD_PREFIX_ICON = IconLoader.getIcon("/modules/setPackagePrefix.png");
-  private static final Icon ADD_PREFIX_ROLLOVER_ICON = IconLoader.getIcon("/modules/setPackagePrefixRollover.png");
+  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);
index e2b13dde6e5a66372de6f282f3ac0ab0a6139e47..e88a023751abc154c63a92789c285aeb1b6d1fd0 100644 (file)
@@ -15,6 +15,7 @@
  */
 package com.intellij.openapi.roots.ui.configuration;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.fileChooser.FileChooser;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
@@ -22,7 +23,6 @@ import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
 import com.intellij.openapi.project.ProjectBundle;
 import com.intellij.openapi.projectRoots.ui.Util;
 import com.intellij.openapi.roots.JavadocOrderRootType;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.*;
 import com.intellij.ui.components.JBLabel;
@@ -47,7 +47,7 @@ public class JavadocEditor extends ModuleElementsEditor {
   private JTable myTable;
 
   public static final String NAME = ProjectBundle.message("module.javadoc.title");
-  public static final Icon ICON = IconLoader.getIcon("/modules/javadoc.png");
+  public static final Icon ICON = AllIcons.Modules.Javadoc;
 
   public JavadocEditor(ModuleConfigurationState state) {
     super(state);
@@ -199,4 +199,4 @@ public class JavadocEditor extends ModuleElementsEditor {
       addRow(new Object[]{item});
     }
   }
-}
\ No newline at end of file
+}
index 12ec4001e269413f27b1b6ac3cd602bab868448a..12a9d25524a145d063f778d766184ba8d12334cd 100644 (file)
@@ -16,6 +16,7 @@
 
 package com.intellij.openapi.roots.ui.configuration;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.util.BrowseFilesListener;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.StorageScheme;
@@ -37,7 +38,6 @@ import com.intellij.openapi.roots.ui.configuration.projectRoot.daemon.ProjectStr
 import com.intellij.openapi.ui.DetailsComponent;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.EmptyRunnable;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VfsUtil;
@@ -61,7 +61,7 @@ public class ProjectConfigurable extends ProjectStructureElementConfigurable<Pro
 
   private final Project myProject;
 
-  private static final Icon PROJECT_ICON = IconLoader.getIcon("/nodes/project.png");
+  private static final Icon PROJECT_ICON = AllIcons.Nodes.Project;
 
   private LanguageLevelCombo myLanguageLevelCombo;
   private ProjectJdkConfigurable myProjectJdkConfigurable;
index 6933ecdf998f8036e35e64f8cfb1c5a0f88f8f6c..4c87af623545b85756d446cb76ec5f5376605ec6 100644 (file)
@@ -16,6 +16,7 @@
 package com.intellij.openapi.roots.ui.configuration;
 
 import com.intellij.facet.Facet;
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.components.ServiceManager;
@@ -40,7 +41,6 @@ import com.intellij.openapi.ui.MasterDetailsComponent;
 import com.intellij.openapi.ui.Splitter;
 import com.intellij.openapi.util.ActionCallback;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.wm.ex.IdeFocusTraversalPolicy;
 import com.intellij.packaging.artifacts.Artifact;
 import com.intellij.ui.components.panels.Wrapper;
@@ -159,7 +159,7 @@ public class ProjectStructureConfigurable extends BaseConfigurable implements Se
 
   @Nullable
   public Icon getIcon() {
-    return IconLoader.getIcon("/modules/modules.png");
+    return AllIcons.Modules.Modules;
   }
 
   @Nullable
index e8db5ac2578d8177ee400b363fe4eaf2116a7e57..1db9c471e84756fd6fcf69a9fd645bb6a9a3eefc 100644 (file)
@@ -17,6 +17,7 @@ package com.intellij.openapi.roots.ui.configuration.artifacts;
 
 import com.intellij.codeInsight.hint.HintManager;
 import com.intellij.codeInsight.hint.HintUtil;
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.CommonActionsManager;
 import com.intellij.ide.DataManager;
 import com.intellij.ide.DefaultTreeExpander;
@@ -37,7 +38,6 @@ import com.intellij.openapi.ui.Splitter;
 import com.intellij.openapi.ui.TextFieldWithBrowseButton;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -205,7 +205,7 @@ public class ArtifactEditorImpl implements ArtifactEditorEx {
     final JPanel labelPanel = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
     labelPanel.add(new JLabel("Available Elements"));
     final HyperlinkLabel link = new HyperlinkLabel("");
-    link.setIcon(IconLoader.getIcon("/general/help.png"));
+    link.setIcon(AllIcons.General.Help);
     link.setUseIconAsLink(true);
     link.addHyperlinkListener(new HyperlinkListener() {
       public void hyperlinkUpdate(HyperlinkEvent e) {
index 2c309f36d95812e1854d15b894b7c1457f5892e2..6137a7d5d4b06957b1e308a4d10d93515f6d7d3d 100644 (file)
  */
 package com.intellij.openapi.roots.ui.configuration.artifacts;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.roots.ui.configuration.projectRoot.daemon.ConfigurationErrorQuickFix;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.ui.popup.PopupStep;
 import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.ui.update.Activatable;
 import com.intellij.util.ui.update.UiNotifyConnector;
@@ -41,7 +41,7 @@ public class ArtifactErrorPanel {
   private String myErrorText;
 
   public ArtifactErrorPanel(final ArtifactEditorImpl artifactEditor) {
-    myErrorLabel.setIcon(IconLoader.getIcon("/runConfigurations/configurationWarning.png"));
+    myErrorLabel.setIcon(AllIcons.RunConfigurations.ConfigurationWarning);
     new UiNotifyConnector(myMainPanel, new Activatable.Adapter() {
       @Override
       public void showNotify() {
index 2f4cd52613d44d31b4b5ceb0b48bfe6df9a039ea..3e90ded5df4756e4c866cbc0419e52097cb602f8 100644 (file)
@@ -15,9 +15,9 @@
  */
 package com.intellij.openapi.roots.ui.configuration.artifacts;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.ui.ex.MultiLineLabel;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.packaging.impl.artifacts.InvalidArtifact;
 
 import javax.swing.*;
@@ -68,7 +68,7 @@ public class InvalidArtifactConfigurable extends ArtifactConfigurableBase {
     private JLabel myIconLabel;
 
     private InvalidArtifactComponent(String errorMessage) {
-      myIconLabel.setIcon(IconLoader.getIcon("/runConfigurations/configurationWarning.png"));
+      myIconLabel.setIcon(AllIcons.RunConfigurations.ConfigurationWarning);
       myDescriptionLabel.setText(errorMessage);
     }
   }
index a4a66735f51c05c54d91c954351e3d0d11a8be63..c5dd2a7e132064bd1264f855f8759a42cbf51207 100644 (file)
  */
 package com.intellij.openapi.roots.ui.configuration.artifacts.actions;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.ToggleAction;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.roots.ui.configuration.artifacts.LayoutTreeComponent;
-import com.intellij.openapi.util.IconLoader;
 
 /**
  * @author nik
@@ -28,7 +28,7 @@ public class SortElementsToggleAction extends ToggleAction implements DumbAware
   private final LayoutTreeComponent myLayoutTreeComponent;
 
   public SortElementsToggleAction(final LayoutTreeComponent layoutTreeComponent) {
-    super("Sort Elements by Names and Types", "Sort Elements by Names and Types", IconLoader.getIcon("/objectBrowser/sorted.png"));
+    super("Sort Elements by Names and Types", "Sort Elements by Names and Types", AllIcons.ObjectBrowser.Sorted);
     myLayoutTreeComponent = layoutTreeComponent;
   }
 
index 25949c8c8366e9a0c5f7c6b1191abb79024608c6..4a3d12e91763ec9481002a5b03b0687bcc3c86be 100644 (file)
@@ -16,6 +16,7 @@
 package com.intellij.openapi.roots.ui.configuration.dependencyAnalysis;
 
 import com.intellij.ProjectTopics;
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.DataManager;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.actionSystem.ex.ComboBoxAction;
@@ -23,13 +24,15 @@ import com.intellij.openapi.module.Module;
 import com.intellij.openapi.module.ModuleType;
 import com.intellij.openapi.options.ConfigurationException;
 import com.intellij.openapi.project.DumbAwareAction;
-import com.intellij.openapi.roots.*;
+import com.intellij.openapi.roots.ModuleRootAdapter;
+import com.intellij.openapi.roots.ModuleRootEvent;
+import com.intellij.openapi.roots.ModuleSourceOrderEntry;
+import com.intellij.openapi.roots.OrderEntry;
 import com.intellij.openapi.roots.ui.CellAppearanceEx;
 import com.intellij.openapi.roots.ui.OrderEntryAppearanceService;
 import com.intellij.openapi.roots.ui.configuration.ProjectStructureConfigurable;
 import com.intellij.openapi.ui.MasterDetailsComponent;
 import com.intellij.openapi.ui.NamedConfigurable;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.*;
@@ -680,7 +683,7 @@ public class AnalyzeDependenciesComponent extends MasterDetailsComponent {
      * The constructor
      */
     public SdkFilterAction() {
-      super("Include SDK", "If selected, the SDK classes are included", IconLoader.findIcon("/general/jdk.png"));
+      super("Include SDK", "If selected, the SDK classes are included", AllIcons.General.Jdk);
     }
 
     /**
@@ -709,7 +712,7 @@ public class AnalyzeDependenciesComponent extends MasterDetailsComponent {
      * The constructor
      */
     public UrlModeAction() {
-      super("Use URL mode", "If selected, the URLs are displayed, otherwise order entries", IconLoader.findIcon("/nodes/ppFile.png"));
+      super("Use URL mode", "If selected, the URLs are displayed, otherwise order entries", AllIcons.Nodes.PpFile);
     }
 
     /**
index 2f6943e30d663b0293c483ad92477a96455e2311..debb11c4a217470055c57d9390bf9c14c23d6393 100644 (file)
  */
 package com.intellij.openapi.roots.ui.configuration.dependencyAnalysis;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.presentation.VirtualFilePresentation;
 import com.intellij.openapi.module.Module;
 import com.intellij.openapi.roots.*;
 import com.intellij.openapi.roots.ui.CellAppearanceEx;
 import com.intellij.openapi.roots.ui.OrderEntryAppearanceService;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.openapi.vfs.VirtualFileManager;
 import com.intellij.util.PathUtil;
@@ -435,7 +435,7 @@ public class ModuleDependenciesAnalyzer {
     /**
      * Missing file ICON
      */
-    public static final Icon MISSING_ICON = IconLoader.findIcon("/compiler/error.png");
+    public static final Icon MISSING_ICON = AllIcons.Compiler.Error;
     /**
      * The URL in the path
      */
index df0f20baf636b7b5336f689de59e214908b8cbed..fddca7a4c2f66f7704682d64beef484553cd5653 100644 (file)
  */
 package com.intellij.openapi.roots.ui.configuration.libraryEditor;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
 import com.intellij.openapi.project.ProjectBundle;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.ui.SdkPathEditor;
 import com.intellij.openapi.roots.AnnotationOrderRootType;
 import com.intellij.openapi.roots.ui.OrderRootTypeUIFactory;
-import com.intellij.openapi.util.IconLoader;
 
 import javax.swing.*;
 
 public class AnnotationsOrderRootTypeUIFactory implements OrderRootTypeUIFactory {
-  private static final Icon ICON = IconLoader.getIcon("/modules/annotation.png");
+  private static final Icon ICON = AllIcons.Modules.Annotation;
 
   @Override
   public Icon getIcon() {
index 8ec292373297cab311b8fc1759b327ddf680641f..4b6b266f8d0a6bf3bb38458e16a5ca3655d0b781 100644 (file)
  */
 package com.intellij.openapi.roots.ui.configuration.libraryEditor;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
 import com.intellij.openapi.project.ProjectBundle;
 import com.intellij.openapi.projectRoots.Sdk;
 import com.intellij.openapi.projectRoots.ui.SdkPathEditor;
 import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.ui.OrderRootTypeUIFactory;
-import com.intellij.openapi.util.IconLoader;
 
 import javax.swing.*;
 
 public class ClassesOrderRootTypeUIFactory implements OrderRootTypeUIFactory {
-  private static final Icon ICON = IconLoader.getIcon("/nodes/compiledClassesFolder.png");
+  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));
index 280e69bf4360ff5a011f1b6bd57aa8e4d8e810d7..b0cfcf15fcb9e9938472f72dd9d48da5cf1f38e1 100644 (file)
@@ -15,9 +15,9 @@
  */
 package com.intellij.openapi.roots.ui.configuration.libraryEditor;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.IconUtilEx;
 import com.intellij.ide.util.treeView.NodeDescriptor;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vfs.JarFileSystem;
 import com.intellij.openapi.vfs.LocalFileSystem;
 import com.intellij.openapi.vfs.VirtualFile;
@@ -30,8 +30,8 @@ import java.awt.*;
 import java.io.File;
 
 class ItemElementDescriptor extends NodeDescriptor<ItemElement> {
-  private static final Icon INVALID_ITEM_ICON = IconLoader.getIcon("/nodes/ppInvalid.png");
-  private static final Icon JAR_DIRECTORY_ICON = IconLoader.getIcon("/nodes/jarDirectory.png");
+  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) {
index a3ded8524382cd5a5540bd947be96a71c661fc97..5961de40005ec11d6a970bb22d444e52c8b855dc 100644 (file)
@@ -20,6 +20,7 @@
  */
 package com.intellij.openapi.roots.ui.configuration.libraryEditor;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CustomShortcutSet;
 import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory;
@@ -30,7 +31,6 @@ import com.intellij.openapi.projectRoots.ui.SdkPathEditor;
 import com.intellij.openapi.projectRoots.ui.Util;
 import com.intellij.openapi.roots.JavadocOrderRootType;
 import com.intellij.openapi.roots.ui.OrderRootTypeUIFactory;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.ui.AnActionButton;
@@ -41,7 +41,7 @@ import com.intellij.util.IconUtil;
 import javax.swing.*;
 
 public class JavadocOrderRootTypeUIFactory implements OrderRootTypeUIFactory {
-  private static final Icon ICON = IconLoader.getIcon("/nodes/javaDocFolder.png");
+  private static final Icon ICON = AllIcons.Nodes.JavaDocFolder;
 
   public SdkPathEditor createPathEditor(Sdk sdk) {
     return new JavadocPathsEditor(sdk);
index 4edc0f1a2ee898977b0434df60ec7160fb4ee3c3..baaf303d405175739a5cbf93cd46b82eb6963e0d 100644 (file)
@@ -20,6 +20,7 @@
  */
 package com.intellij.openapi.roots.ui.configuration.libraryEditor;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.fileChooser.FileChooserDescriptor;
 import com.intellij.openapi.project.ProjectBundle;
 import com.intellij.openapi.projectRoots.Sdk;
@@ -27,14 +28,13 @@ import com.intellij.openapi.projectRoots.ui.SdkPathEditor;
 import com.intellij.openapi.roots.OrderRootType;
 import com.intellij.openapi.roots.ui.OrderRootTypeUIFactory;
 import com.intellij.openapi.roots.ui.configuration.PathUIUtils;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vfs.VirtualFile;
 
 import javax.swing.*;
 import java.awt.*;
 
 public class SourcesOrderRootTypeUIFactory implements OrderRootTypeUIFactory {
-  private static final Icon ICON = IconLoader.getIcon("/nodes/sourceFolder.png");
+  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)) {
index 4e80e946cc114498993b94e67e08f6fdf3e7d376..adcf1bc9eeacebd44b29ac70f60131a5f9b56e45 100644 (file)
@@ -21,6 +21,7 @@ import com.intellij.facet.impl.invalid.InvalidFacetType;
 import com.intellij.facet.impl.ui.facetType.FacetTypeEditor;
 import com.intellij.facet.ui.FacetEditor;
 import com.intellij.facet.ui.MultipleFacetSettingsEditor;
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.DataManager;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.components.ServiceManager;
@@ -35,7 +36,6 @@ import com.intellij.openapi.roots.ui.configuration.projectRoot.daemon.FacetProje
 import com.intellij.openapi.roots.ui.configuration.projectRoot.daemon.ProjectStructureElement;
 import com.intellij.openapi.ui.DetailsComponent;
 import com.intellij.openapi.ui.NamedConfigurable;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.ui.treeStructure.filtered.FilteringTreeBuilder;
 import com.intellij.util.ui.tree.TreeUtil;
 import org.jetbrains.annotations.NonNls;
@@ -54,7 +54,7 @@ import java.util.List;
  * @author nik
  */
 public class FacetStructureConfigurable extends BaseStructureConfigurable {
-  private static final Icon ICON = IconLoader.getIcon("/modules/modules.png");//todo[nik] use facets icon
+  private static final Icon ICON = AllIcons.Modules.Modules;//todo[nik] use facets icon
   private final ModuleManager myModuleManager;
   private final Map<FacetType<?, ?>, FacetTypeEditor> myFacetTypeEditors = new HashMap<FacetType<?,?>, FacetTypeEditor>();
   private MultipleFacetSettingsEditor myCurrentMultipleSettingsEditor;
index e69a0b88cc1152a16c071c78f61603fccdee0c24..37557f9857202052d2026cb365a70195e062903d 100644 (file)
@@ -16,6 +16,7 @@
 package com.intellij.openapi.roots.ui.configuration.projectRoot;
 
 import com.intellij.find.FindBundle;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.ActionManager;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
@@ -29,7 +30,6 @@ import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.ui.popup.PopupStep;
 import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.ui.awt.RelativePoint;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -43,7 +43,7 @@ import java.util.Comparator;
  * @author nik
  */
 public abstract class FindUsagesInProjectStructureActionBase extends AnAction implements DumbAware {
-  private static final Icon FIND_ICON = IconLoader.getIcon("/actions/find.png");
+  private static final Icon FIND_ICON = AllIcons.Actions.Find;
   private final JComponent myParentComponent;
   private final Project myProject;
 
index b275bcb665445295bc7e36d2ea889e37642d68c1..21fcacd3767de8c92c3c39fcad70ec26e620ca20 100644 (file)
@@ -20,6 +20,7 @@ import com.intellij.CommonBundle;
 import com.intellij.facet.Facet;
 import com.intellij.facet.impl.ProjectFacetsConfigurator;
 import com.intellij.facet.impl.ui.actions.AddFacetToModuleAction;
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.highlighter.ModuleFileType;
 import com.intellij.ide.projectView.impl.ModuleGroup;
@@ -51,7 +52,6 @@ import com.intellij.openapi.roots.ui.configuration.projectRoot.daemon.ProjectStr
 import com.intellij.openapi.ui.*;
 import com.intellij.openapi.util.ActionCallback;
 import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.NullableComputable;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
@@ -84,8 +84,8 @@ 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 = IconLoader.getIcon("/objectBrowser/compactEmptyPackages.png");
-  private static final Icon ICON = IconLoader.getIcon("/modules/modules.png");
+  private static final Icon COMPACT_EMPTY_MIDDLE_PACKAGES_ICON = AllIcons.ObjectBrowser.CompactEmptyPackages;
+  private static final Icon ICON = AllIcons.Modules.Modules;
   private static final Comparator<MyNode> NODE_COMPARATOR = new Comparator<MyNode>() {
     public int compare(final MyNode o1, final MyNode o2) {
       final NamedConfigurable configurable1 = o1.getConfigurable();
@@ -930,7 +930,7 @@ public class ModuleStructureConfigurable extends BaseStructureConfigurable imple
 
   private class AddModuleAction extends AnAction implements DumbAware {
     public AddModuleAction() {
-      super(ProjectBundle.message("add.new.module.text.full"), null, IconLoader.getIcon("/actions/modul.png"));
+      super(ProjectBundle.message("add.new.module.text.full"), null, AllIcons.Actions.Modul);
     }
 
     public void actionPerformed(final AnActionEvent e) {
index 1b183c36d6de85b06af6835cddfe916e80b84c10..8ab78f932376d765cac6dbfc5b90b0a630f8689a 100644 (file)
@@ -23,6 +23,7 @@ package com.intellij.codeInsight;
 import com.intellij.CommonBundle;
 import com.intellij.ProjectTopics;
 import com.intellij.codeInsight.highlighting.HighlightManager;
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.DataManager;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.application.Result;
@@ -53,7 +54,6 @@ import com.intellij.openapi.ui.popup.JBPopupFactory;
 import com.intellij.openapi.ui.popup.PopupStep;
 import com.intellij.openapi.ui.popup.util.BaseListPopupStep;
 import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.*;
@@ -82,7 +82,7 @@ import java.util.List;
 import java.util.concurrent.ConcurrentMap;
 
 public class ExternalAnnotationsManagerImpl extends ExternalAnnotationsManager {
-  @NotNull public static final Icon ICON = IconLoader.getIcon("/modules/annotation.png");
+  @NotNull public static final Icon ICON = AllIcons.Modules.Annotation;
   private static final Logger LOG = Logger.getInstance("#" + ExternalAnnotationsManagerImpl.class.getName());
 
   @NotNull private final ConcurrentMap<String, List<XmlFile>> myExternalAnnotations = new ConcurrentWeakValueHashMap<String, List<XmlFile>>();
index 770606bfd37291ae2e1162fcfa2056d970cb3295..bf7305100d6f30e4894601e54cd3a9ecd460f633 100644 (file)
@@ -20,6 +20,7 @@ import com.intellij.codeInsight.daemon.DaemonCodeAnalyzerSettings;
 import com.intellij.codeInsight.daemon.LineMarkerInfo;
 import com.intellij.codeInsight.daemon.LineMarkerProvider;
 import com.intellij.codeInsight.daemon.MergeableLineMarkerInfo;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.editor.colors.CodeInsightColors;
 import com.intellij.openapi.editor.colors.EditorColorsManager;
@@ -30,7 +31,6 @@ import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.DumbService;
 import com.intellij.openapi.project.IndexNotReadyException;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Pair;
 import com.intellij.psi.*;
 import com.intellij.psi.search.searches.AllOverridingMethodsSearch;
@@ -52,11 +52,11 @@ import java.util.List;
 import java.util.Set;
 
 public class JavaLineMarkerProvider implements LineMarkerProvider, DumbAware {
-  protected static final Icon OVERRIDING_METHOD_ICON = IconLoader.getIcon("/gutter/overridingMethod.png");
-  protected static final Icon IMPLEMENTING_METHOD_ICON = IconLoader.getIcon("/gutter/implementingMethod.png");
+  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 = IconLoader.getIcon("/gutter/overridenMethod.png");
-  protected static final Icon IMPLEMENTED_METHOD_MARKER_RENDERER = IconLoader.getIcon("/gutter/implementedMethod.png");
+  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;
 
index cbc4dc935246dbc2b7f7ffce6a86a6675e778bac..ce5130a9aff9d42aacedb6e33db3a0e751418934 100644 (file)
@@ -18,9 +18,9 @@ package com.intellij.codeInsight.daemon.impl;
 import com.intellij.codeHighlighting.Pass;
 import com.intellij.codeInsight.daemon.LineMarkerInfo;
 import com.intellij.codeInsight.daemon.LineMarkerProvider;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.editor.markup.GutterIconRenderer;
 import com.intellij.openapi.project.DumbAware;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.TextRange;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PsiTreeUtil;
@@ -37,7 +37,7 @@ import java.util.Set;
  * @author Danila Ponomarenko
  */
 public class RecursiveCallLineMarkerProvider implements LineMarkerProvider, DumbAware {
-  private static final Icon RECURSIVE_METHOD_ICON = IconLoader.getIcon("/gutter/recursiveMethod.png");
+  private static final Icon RECURSIVE_METHOD_ICON = AllIcons.Gutter.RecursiveMethod;
 
   @Override
   public LineMarkerInfo getLineMarkerInfo(@NotNull PsiElement element) {
index 4348764edd35d39d507801bf7e493a33947c1d2e..984cee5c4f7d38563f7bf6f79d4ec2ee19ba468c 100644 (file)
@@ -20,11 +20,11 @@ import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction;
 import com.intellij.codeInsight.template.Template;
 import com.intellij.codeInsight.template.TemplateBuilderImpl;
 import com.intellij.codeInsight.template.impl.TextExpression;
+import com.intellij.icons.AllIcons;
 import com.intellij.lang.StdLanguages;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.editor.RangeMarker;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Iconable;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
@@ -43,7 +43,7 @@ import java.util.HashSet;
  * User: anna
  */
 public class DelegateWithDefaultParamValueIntentionAction extends PsiElementBaseIntentionAction implements Iconable, LowPriorityAction {
-   public static final Icon REFACTORING_BULB = IconLoader.getIcon("/actions/refactoringBulb.png");
+   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);
index f35ecc3bf0519c537e6318efb34d7b0daa6c1329..f053a18527b74b3894f8ca28d86742b3a8e44e9c 100644 (file)
@@ -17,9 +17,9 @@ package com.intellij.codeInsight.daemon.impl.quickfix;
 
 import com.intellij.codeInsight.intention.IntentionAction;
 import com.intellij.codeInsight.intention.LowPriorityAction;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Iconable;
 import com.intellij.psi.PsiFile;
 import com.intellij.refactoring.RefactoringActionHandler;
@@ -33,7 +33,7 @@ import javax.swing.*;
  * Date: 9/5/11
  */
 public class RunRefactoringIntention implements IntentionAction, Iconable, LowPriorityAction {
-  public static final Icon REFACTORING_BULB = IconLoader.getIcon("/actions/refactoringBulb.png");
+  public static final Icon REFACTORING_BULB = AllIcons.Actions.RefactoringBulb;
   private final RefactoringActionHandler myHandler;
   private final String myCommandName;
 
index 3a4b690af4e533cd60dae1e2e76e77f1aa5abb18..8047c2579ffe1d240aca0815a7c1eb6cb6092ffa 100644 (file)
@@ -22,6 +22,7 @@ import com.intellij.codeInsight.MethodImplementor;
 import com.intellij.codeInsight.intention.AddAnnotationFix;
 import com.intellij.featureStatistics.FeatureUsageTracker;
 import com.intellij.featureStatistics.ProductivityFeatureNames;
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.fileTemplates.FileTemplate;
 import com.intellij.ide.fileTemplates.FileTemplateManager;
 import com.intellij.ide.fileTemplates.FileTemplateUtil;
@@ -48,7 +49,6 @@ import com.intellij.openapi.module.ModuleUtil;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.Messages;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Ref;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.psi.*;
@@ -569,7 +569,8 @@ public class OverrideImplementUtil {
         super.fillToolbarActions(group);
         if (toImplement) return;
 
-        final ToggleAction mergeAction = new ToggleAction("Show methods to implement", "Show methods to implement", IconLoader.getIcon("/general/show_to_implement.png")) {
+        final ToggleAction mergeAction = new ToggleAction("Show methods to implement", "Show methods to implement",
+                                                          AllIcons.General.Show_to_implement) {
           @Override
           public boolean isSelected(AnActionEvent e) {
             return merge.get().booleanValue();
index 0ca78f5850da1a5eadb7fcbf776b17a91f5698a0..99e73041652cde096ed2dd3e2af0edc512a4a284 100644 (file)
@@ -39,6 +39,7 @@ import com.intellij.codeInspection.ui.EntryPointsNode;
 import com.intellij.codeInspection.ui.InspectionNode;
 import com.intellij.codeInspection.ui.InspectionTreeNode;
 import com.intellij.codeInspection.util.RefFilter;
+import com.intellij.icons.AllIcons;
 import com.intellij.lang.annotation.HighlightSeverity;
 import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
@@ -48,7 +49,10 @@ import com.intellij.openapi.extensions.ExtensionPoint;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.*;
+import com.intellij.openapi.util.InvalidDataException;
+import com.intellij.openapi.util.SystemInfo;
+import com.intellij.openapi.util.TextRange;
+import com.intellij.openapi.util.WriteExternalException;
 import com.intellij.psi.*;
 import com.intellij.psi.impl.PsiClassImplUtil;
 import com.intellij.psi.search.GlobalSearchScope;
@@ -735,7 +739,7 @@ public class UnusedDeclarationInspection extends FilteringInspectionTool {
 
   private class PermanentDeleteAction extends QuickFixAction {
     private PermanentDeleteAction() {
-      super(DELETE_QUICK_FIX, IconLoader.getIcon("/actions/cancel.png"), KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), UnusedDeclarationInspection.this);
+      super(DELETE_QUICK_FIX, AllIcons.Actions.Cancel, KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), UnusedDeclarationInspection.this);
     }
 
     protected boolean applyFix(final RefElement[] refElements) {
index 9fb69df6b7c6206cf130ccc6ea0ffa102f1af764..524307ed1653176637b5e903e9f9de5a797eccba 100644 (file)
@@ -15,9 +15,9 @@
  */
 package com.intellij.codeInspection.ui;
 
-import com.intellij.codeInspection.deadCode.UnusedDeclarationInspection;
 import com.intellij.codeInspection.deadCode.DummyEntryPointsTool;
-import com.intellij.openapi.util.IconLoader;
+import com.intellij.codeInspection.deadCode.UnusedDeclarationInspection;
+import com.intellij.icons.AllIcons;
 
 import javax.swing.*;
 
@@ -25,7 +25,7 @@ import javax.swing.*;
  * @author max
  */
 public class EntryPointsNode extends InspectionNode {
-  private static final Icon ENTRY_POINTS = IconLoader.getIcon("/nodes/entryPoints.png");
+  private static final Icon ENTRY_POINTS = AllIcons.Nodes.EntryPoints;
   public EntryPointsNode(UnusedDeclarationInspection tool) {
     super(new DummyEntryPointsTool(tool));
     getTool().updateContent();
index bda8c6b684fcee0c0264eab404bae813edfbfb4a..793e1e6000222c05d7a918665371fa72b642de08 100644 (file)
@@ -19,6 +19,7 @@ import com.intellij.CommonBundle;
 import com.intellij.analysis.AnalysisScopeBundle;
 import com.intellij.cyclicDependencies.CyclicDependenciesBuilder;
 import com.intellij.cyclicDependencies.actions.CyclicDependenciesHandler;
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.actions.ContextHelpAction;
 import com.intellij.openapi.Disposable;
 import com.intellij.openapi.actionSystem.*;
@@ -26,7 +27,6 @@ import com.intellij.openapi.project.DumbAware;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Splitter;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.packageDependencies.DependenciesToolWindow;
 import com.intellij.packageDependencies.DependencyUISettings;
@@ -443,7 +443,8 @@ public class CyclicDependenciesPanel extends JPanel implements Disposable, DataP
 
   private final class CloseAction extends AnAction implements DumbAware {
     public CloseAction() {
-      super(CommonBundle.message("action.close"), AnalysisScopeBundle.message("action.close.dependency.description"), IconLoader.getIcon("/actions/cancel.png"));
+      super(CommonBundle.message("action.close"), AnalysisScopeBundle.message("action.close.dependency.description"),
+            AllIcons.Actions.Cancel);
     }
 
     public void actionPerformed(AnActionEvent e) {
@@ -455,7 +456,8 @@ public class CyclicDependenciesPanel extends JPanel implements Disposable, DataP
 
   private final class ShowFilesAction extends ToggleAction {
     ShowFilesAction() {
-      super(AnalysisScopeBundle.message("action.show.files"), AnalysisScopeBundle.message("action.show.files.description"), IconLoader.getIcon("/fileTypes/java.png"));
+      super(AnalysisScopeBundle.message("action.show.files"), AnalysisScopeBundle.message("action.show.files.description"),
+            AllIcons.FileTypes.Java);
     }
 
     public boolean isSelected(AnActionEvent event) {
@@ -473,7 +475,7 @@ public class CyclicDependenciesPanel extends JPanel implements Disposable, DataP
     @NonNls public static final String SHOW_PACKAGES_FROM_CYCLES_ONLY = "Hide packages without cyclic dependencies";
 
     HideOutOfCyclePackagesAction() {
-      super(SHOW_PACKAGES_FROM_CYCLES_ONLY, SHOW_PACKAGES_FROM_CYCLES_ONLY, IconLoader.getIcon("/ant/filter.png"));
+      super(SHOW_PACKAGES_FROM_CYCLES_ONLY, SHOW_PACKAGES_FROM_CYCLES_ONLY, AllIcons.Ant.Filter);
     }
 
     @Override
@@ -491,7 +493,8 @@ public class CyclicDependenciesPanel extends JPanel implements Disposable, DataP
 
   private final class GroupByScopeTypeAction extends ToggleAction {
     GroupByScopeTypeAction() {
-      super(AnalysisScopeBundle.message("action.group.by.scope.type"), AnalysisScopeBundle.message("action.group.by.scope.type.description"), IconLoader.getIcon("/nodes/testSourceFolder.png"));
+      super(AnalysisScopeBundle.message("action.group.by.scope.type"), AnalysisScopeBundle.message("action.group.by.scope.type.description"),
+            AllIcons.Nodes.TestSourceFolder);
     }
 
     public boolean isSelected(AnActionEvent event) {
@@ -507,7 +510,7 @@ public class CyclicDependenciesPanel extends JPanel implements Disposable, DataP
 
   private class RerunAction extends AnAction {
     public RerunAction(JComponent comp) {
-      super(CommonBundle.message("action.rerun"), AnalysisScopeBundle.message("action.rerun.dependency"), IconLoader.getIcon("/actions/refreshUsages.png"));
+      super(CommonBundle.message("action.rerun"), AnalysisScopeBundle.message("action.rerun.dependency"), AllIcons.Actions.RefreshUsages);
       registerCustomShortcutSet(CommonShortcuts.getRerun(), comp);
     }
 
index feebc4a265f73ffb82a70a4090860dc0415431f5..b712328b5921105b73608a8acf8349ba41927274 100644 (file)
@@ -15,6 +15,7 @@
  */
 package com.intellij.ide.hierarchy.method;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.hierarchy.HierarchyNodeDescriptor;
 import com.intellij.ide.hierarchy.JavaHierarchyUtil;
@@ -22,7 +23,6 @@ import com.intellij.openapi.editor.markup.TextAttributes;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ui.util.CompositeAppearance;
 import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Iconable;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiElement;
@@ -36,9 +36,9 @@ import javax.swing.*;
 import java.awt.*;
 
 public final class MethodHierarchyNodeDescriptor extends HierarchyNodeDescriptor {
-  private static final Icon METHOD_DEFINED_ICON = IconLoader.getIcon("/hierarchy/methodDefined.png");
-  private static final Icon METHOD_NOT_DEFINED_ICON = IconLoader.getIcon("/hierarchy/methodNotDefined.png");
-  private static final Icon SHOULD_DEFINE_METHOD_ICON = IconLoader.getIcon("/hierarchy/shouldDefineMethod.png");
+  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;
index 770ae99bdf1b8983bbef98a75b0db5d6b8733cc3..93c2fb084d8d438d633521c40a37861ffcabbb95 100644 (file)
@@ -21,6 +21,7 @@ package com.intellij.ide.projectView.impl;
 
 import com.intellij.history.LocalHistory;
 import com.intellij.history.LocalHistoryAction;
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.DeleteProvider;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.SelectInTarget;
@@ -41,7 +42,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.OrderEntry;
 import com.intellij.openapi.roots.ProjectFileIndex;
 import com.intellij.openapi.roots.ProjectRootManager;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.JavaDirectoryService;
 import com.intellij.psi.PsiDirectory;
@@ -60,7 +60,7 @@ import java.util.*;
 
 public final class PackageViewPane extends AbstractProjectViewPSIPane {
   @NonNls public static final String ID = "PackagesPane";
-  public static final Icon ICON = IconLoader.getIcon("/general/packagesTab.png");
+  public static final Icon ICON = AllIcons.General.PackagesTab;
   private MyDeletePSIElementProvider myDeletePSIElementProvider = new MyDeletePSIElementProvider();
 
   public PackageViewPane(Project project) {
@@ -150,7 +150,8 @@ public final class PackageViewPane extends AbstractProjectViewPSIPane {
 
   private final class ShowLibraryContentsAction extends ToggleAction {
     private ShowLibraryContentsAction() {
-      super(IdeBundle.message("action.show.libraries.contents"), IdeBundle.message("action.show.hide.library.contents"), IconLoader.getIcon("/objectBrowser/showLibraryContents.png"));
+      super(IdeBundle.message("action.show.libraries.contents"), IdeBundle.message("action.show.hide.library.contents"),
+            AllIcons.ObjectBrowser.ShowLibraryContents);
     }
 
     public boolean isSelected(AnActionEvent event) {
index 566f15d23d68cf78eb114891502e627f9ae06e17..b176cc00325de58055f9a433bb8fdbe815607a44 100644 (file)
  */
 package com.intellij.ide.structureView.impl.java;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.util.FileStructureFilter;
 import com.intellij.ide.util.treeView.smartTree.ActionPresentation;
 import com.intellij.ide.util.treeView.smartTree.ActionPresentationData;
 import com.intellij.ide.util.treeView.smartTree.TreeElement;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.actionSystem.Shortcut;
 import com.intellij.openapi.keymap.KeymapManager;
 import org.jetbrains.annotations.NonNls;
@@ -40,7 +40,7 @@ public class InheritedMembersFilter implements FileStructureFilter {
 
   @NotNull
   public ActionPresentation getPresentation() {
-    return new ActionPresentationData(IdeBundle.message("action.structureview.show.inherited"), null, IconLoader.getIcon("/hierarchy/supertypes.png"));
+    return new ActionPresentationData(IdeBundle.message("action.structureview.show.inherited"), null, AllIcons.Hierarchy.Supertypes);
   }
 
   @NotNull
index ffcabf941e979dc7149227deebba90177a9e085e..7ad89f99559f0e3c3041102caab478dbbf3594fc 100644 (file)
@@ -15,6 +15,7 @@
  */
 package com.intellij.ide.structureView.impl.java;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.structureView.impl.AddAllMembersProcessor;
 import com.intellij.ide.util.FileStructureNodeProvider;
@@ -23,7 +24,6 @@ import com.intellij.ide.util.treeView.smartTree.ActionPresentationData;
 import com.intellij.ide.util.treeView.smartTree.TreeElement;
 import com.intellij.openapi.actionSystem.Shortcut;
 import com.intellij.openapi.keymap.KeymapManager;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.psi.*;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NonNls;
@@ -84,8 +84,7 @@ public class JavaInheritedMembersNodeProvider implements FileStructureNodeProvid
 
   @NotNull
   public ActionPresentation getPresentation() {
-    return new ActionPresentationData(IdeBundle.message("action.structureview.show.inherited"), null, IconLoader
-      .getIcon("/hierarchy/supertypes.png"));
+    return new ActionPresentationData(IdeBundle.message("action.structureview.show.inherited"), null, AllIcons.Hierarchy.Supertypes);
   }
 
   @NotNull
index 0b74461b4f784cc22f5a6f9c9fa05e0126c756a4..716e00450bbd6ca0a505480a271cef94f6b2e976 100644 (file)
  */
 package com.intellij.ide.structureView.impl.java;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.util.treeView.smartTree.Group;
 import com.intellij.ide.util.treeView.smartTree.TreeElement;
 import com.intellij.navigation.ItemPresentation;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.psi.PsiClass;
+import com.intellij.psi.PsiModifierList;
 import com.intellij.psi.SmartPointerManager;
 import com.intellij.psi.SmartPsiElementPointer;
-import com.intellij.psi.PsiModifierList;
 import com.intellij.psi.util.PsiUtil;
 import org.jetbrains.annotations.Nullable;
 
@@ -35,9 +35,9 @@ 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 = IconLoader.getIcon("/general/overridingMethod.png");
-  private static final Icon IMPLEMENTING_ICON = IconLoader.getIcon("/general/implementingMethod.png");
-  private static final Icon INHERITED_ICON = IconLoader.getIcon("/general/inheritedMethod.png");
+  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,
index 7fce7bfdf227abafc7cb881187bcbb1192b3abf5..0f5a7589f6d634653ce72581fc6ebe01e5c1bcb4 100644 (file)
  */
 package com.intellij.ide.structureView.impl.java;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.util.treeView.AbstractTreeNode;
 import com.intellij.ide.util.treeView.smartTree.*;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Key;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.PsiMethod;
@@ -115,7 +115,7 @@ public class SuperTypesGrouper implements Grouper{
   @NotNull
   public ActionPresentation getPresentation() {
     return new ActionPresentationData(IdeBundle.message("action.structureview.group.methods.by.defining.type"), null,
-                                      IconLoader.getIcon("/general/implementingMethod.png"));
+                                      AllIcons.General.ImplementingMethod);
   }
 
   @NotNull
index 722c80e8ed4ec30cfc26023a70b64d2b6930450d..9b630b8fb82489aedff47a0b669cac5ebec52ef6 100644 (file)
  */
 package com.intellij.ide.structureView.impl.java;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.util.treeView.smartTree.ActionPresentation;
 import com.intellij.ide.util.treeView.smartTree.Sorter;
-import com.intellij.openapi.util.IconLoader;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
@@ -29,7 +29,7 @@ public class VisibilitySorter implements Sorter{
 
   public static final Sorter INSTANCE = new VisibilitySorter();
 
-  private static final Icon ICON = IconLoader.getIcon("/objectBrowser/visibilitySort.png");
+  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");
index 671b12ab815dd0e5be020b46a53803985d23a57b..6cffaa929563d7561a3ee2c66990383eb2f1fc9c 100644 (file)
  */
 package com.intellij.ide.util;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.editor.colors.EditorColorsManager;
 import com.intellij.openapi.editor.colors.EditorColorsScheme;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.psi.PsiClass;
 import com.intellij.ui.SimpleColoredComponent;
 import com.intellij.ui.SimpleTextAttributes;
@@ -29,7 +29,7 @@ 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 = IconLoader.getIcon("/nodes/static.png");
+  private static final Icon ourStaticThingIcon = AllIcons.Nodes.Static;
 
   public FQNameCellRenderer() {
     EditorColorsScheme scheme = EditorColorsManager.getInstance().getGlobalScheme();
index 1a861fe5d58582d945b0bd636c8fa25efdb0756c..eb868511d269a399a4101c20aa6a377b05971f4f 100644 (file)
@@ -16,6 +16,7 @@
 package com.intellij.ide.util;
 
 import com.intellij.CommonBundle;
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.openapi.actionSystem.*;
 import com.intellij.openapi.application.ApplicationManager;
@@ -31,7 +32,6 @@ import com.intellij.openapi.ui.InputValidator;
 import com.intellij.openapi.ui.Messages;
 import com.intellij.openapi.ui.PackageChooser;
 import com.intellij.openapi.util.Comparing;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
@@ -372,7 +372,7 @@ public class PackageChooserDialog extends PackageChooser {
   private class NewPackageAction extends AnAction {
     public NewPackageAction() {
       super(IdeBundle.message("action.new.package"),
-            IdeBundle.message("action.description.create.new.package"), IconLoader.getIcon("/actions/newFolder.png"));
+            IdeBundle.message("action.description.create.new.package"), AllIcons.Actions.NewFolder);
     }
 
     public void actionPerformed(AnActionEvent e) {
index a170e2d7014ba172bedd90d39674d52f08515280..ecb5e7af5b58395327a8389df0a39b3ee8444b1d 100644 (file)
  */
 package com.intellij.ide.util.scopeChooser;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.ToggleAction;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.packageDependencies.DependencyUISettings;
 import com.intellij.packageDependencies.ui.ProjectPatternProvider;
 
@@ -32,7 +32,7 @@ public final class GroupByScopeTypeAction extends ToggleAction {
 
   public GroupByScopeTypeAction(Runnable update) {
     super(IdeBundle.message("action.group.by.scope.type"),
-          IdeBundle.message("action.description.group.by.scope"), IconLoader.getIcon("/nodes/testSourceFolder.png"));
+          IdeBundle.message("action.description.group.by.scope"), AllIcons.Nodes.TestSourceFolder);
     myUpdate = update;
   }
 
@@ -49,4 +49,4 @@ public final class GroupByScopeTypeAction extends ToggleAction {
     super.update(e);
     e.getPresentation().setVisible(DependencyUISettings.getInstance().SCOPE_TYPE != ProjectPatternProvider.FILE);
   }
-}
\ No newline at end of file
+}
diff --git a/java/java-impl/src/com/intellij/internal/UsedIconsListingAction.java b/java/java-impl/src/com/intellij/internal/UsedIconsListingAction.java
new file mode 100644 (file)
index 0000000..de0054d
--- /dev/null
@@ -0,0 +1,197 @@
+/*
+ * 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.ide.highlighter.XmlFileType;
+import com.intellij.lang.java.JavaLanguage;
+import com.intellij.openapi.actionSystem.AnAction;
+import com.intellij.openapi.actionSystem.AnActionEvent;
+import com.intellij.openapi.actionSystem.LangDataKeys;
+import com.intellij.openapi.application.Result;
+import com.intellij.openapi.command.WriteCommandAction;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.roots.ProjectFileIndex;
+import com.intellij.openapi.roots.ProjectRootManager;
+import com.intellij.openapi.vfs.VirtualFile;
+import com.intellij.psi.*;
+import com.intellij.psi.codeStyle.JavaCodeStyleManager;
+import com.intellij.psi.search.DelegatingGlobalSearchScope;
+import com.intellij.psi.search.GlobalSearchScope;
+import com.intellij.psi.search.PsiSearchHelper;
+import com.intellij.psi.search.searches.MethodReferencesSearch;
+import com.intellij.psi.util.PsiTreeUtil;
+import com.intellij.psi.xml.XmlFile;
+import com.intellij.psi.xml.XmlTag;
+import com.intellij.util.Processor;
+import com.intellij.util.containers.MultiMap;
+
+import java.util.*;
+
+public class UsedIconsListingAction extends AnAction {
+  @Override
+  public void actionPerformed(AnActionEvent e) {
+    final Project project = LangDataKeys.PROJECT.getData(e.getDataContext());
+
+    final Set<String> answer = new HashSet<String>();
+    final MultiMap<String, PsiCallExpression> calls = new MultiMap<String, PsiCallExpression>();
+
+
+    Processor<PsiReference> consumer = new Processor<PsiReference>() {
+      @Override
+      public boolean process(PsiReference reference) {
+        PsiCallExpression call = PsiTreeUtil.getParentOfType(reference.getElement(), PsiCallExpression.class, false);
+        if (call == null) return true;
+        if (call.getArgumentList() == null) return true;
+        if (call.getArgumentList().getExpressions() == null) return true;
+
+        PsiFile file = reference.getElement().getContainingFile();
+        if ("AllIcons.java".equals(file.getName())) return true;
+        for (PsiExpression arg : call.getArgumentList().getExpressions()) {
+          if (arg instanceof PsiLiteralExpression) {
+            Object value = ((PsiLiteralExpression)arg).getValue();
+            processValue(value, call, file);
+          }
+          else {
+            Object value = JavaPsiFacade.getInstance(project).getConstantEvaluationHelper().computeConstantExpression(arg, false);
+            processValue(value, call, file);
+          }
+        }
+
+
+        return true;
+      }
+
+      private void processValue(Object value, PsiCallExpression call, PsiFile file) {
+        if (value instanceof String) {
+          String str = (String)value;
+          if (str.startsWith("\"")) {
+            str = str.substring(0);
+            if (str.endsWith("\"")) {
+              str = str.substring(0, str.length() - 1);
+            }
+          }
+
+          if (!str.startsWith("/")) {
+
+            if (file instanceof PsiClassOwner) {
+              str = "/" + ((PsiClassOwner)file).getPackageName().replace('.', '/') + "/" + str;
+            }
+          }
+
+          calls.putValue(str, call);
+          answer.add(str);
+        }
+      }
+    };
+
+    PsiClass iconLoader =
+      JavaPsiFacade.getInstance(project).findClass("com.intellij.openapi.util.IconLoader", GlobalSearchScope.allScope(project));
+
+    PsiMethod getIconMethod = iconLoader.findMethodsByName("getIcon", false)[0];
+    PsiMethod findIconMethod = iconLoader.findMethodsByName("findIcon", false)[0];
+    MethodReferencesSearch.search(getIconMethod, false).forEach(consumer);
+    MethodReferencesSearch.search(findIconMethod, false).forEach(consumer);
+
+    final ProjectFileIndex index = ProjectRootManager.getInstance(project).getFileIndex();
+
+    PsiSearchHelper.SERVICE.getInstance(project).processAllFilesWithWordInText(
+      "action",
+      new DelegatingGlobalSearchScope(GlobalSearchScope.projectScope(project)) {
+        @Override
+        public boolean contains(VirtualFile file) {
+          return super.contains(file) && file.getFileType() == XmlFileType.INSTANCE && index.isInSource(file);
+        }
+      },
+
+      new Processor<PsiFile>() {
+        @Override
+        public boolean process(PsiFile file) {
+          if (file instanceof XmlFile) {
+            processTag(((XmlFile)file).getRootTag());
+          }
+          return true;
+        }
+
+        private void processTag(XmlTag tag) {
+          if ("action".equals(tag.getLocalName())) {
+            String icon = tag.getAttributeValue("icon");
+            if (icon != null) {
+              answer.add(icon);
+            }
+          }
+          else {
+            for (XmlTag sub : tag.getSubTags()) {
+              processTag(sub);
+            }
+          }
+        }
+      },
+
+      true
+    );
+
+    ArrayList<String> sorted = new ArrayList<String>(answer);
+    Collections.sort(sorted);
+
+    for (String icon : sorted) {
+      System.out.println(icon);
+    }
+
+    PsiClass allIcons =
+      JavaPsiFacade.getInstance(project).findClass("com.intellij.icons.AllIcons", GlobalSearchScope.allScope(project));
+
+    HashMap<String, String> mappings = new HashMap<String, String>();
+    collectFields(allIcons, "", mappings);
+
+    final JVMElementFactory factory = JVMElementFactories.getFactory(JavaLanguage.INSTANCE, project);
+    for (Map.Entry<String, Collection<PsiCallExpression>> entry : calls.entrySet()) {
+      String path = entry.getKey();
+      final String replacement = mappings.get(path);
+      if (replacement != null) {
+        for (final PsiCallExpression call : entry.getValue()) {
+          new WriteCommandAction(project, call.getContainingFile()) {
+            @Override
+            protected void run(Result result) throws Throwable {
+              JavaCodeStyleManager styleManager = JavaCodeStyleManager.getInstance(project);
+              PsiElement expr = factory.createExpressionFromText("com.intellij.icons." + replacement, call);
+              styleManager.shortenClassReferences(call.replace(expr));
+            }
+          }.execute();
+        }
+      }
+    }
+  }
+
+  private void collectFields(PsiClass klass, String prefix, Map<String, String> mapping) {
+    String thePrefix = prefix + klass.getName() + ".";
+
+    for (PsiClass inner : klass.getInnerClasses()) {
+      collectFields(inner, thePrefix, mapping);
+    }
+
+    for (PsiField field : klass.getFields()) {
+      PsiCallExpression initializer = (PsiCallExpression)field.getInitializer();
+      PsiLiteralExpression arg = (PsiLiteralExpression)initializer.getArgumentList().getExpressions()[0];
+
+      mapping.put((String)arg.getValue(), thePrefix + field.getName());
+    }
+  }
+}
+
index 6bb5d1aad01e7570f8cbcafeb746fddd29210420..e2a0a92fc422994cfb5221d8400aa924e76343a5 100644 (file)
@@ -15,6 +15,7 @@
  */
 package com.intellij.openapi.module;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.util.projectWizard.JavaModuleBuilder;
 import com.intellij.ide.util.projectWizard.ModuleWizardStep;
 import com.intellij.ide.util.projectWizard.ProjectWizardStepFactory;
@@ -91,7 +92,7 @@ public class JavaModuleType extends ModuleType<JavaModuleBuilder> {
   }
 
   private static class IconHolder {
-    private static final Icon JAVA_MODULE_ICON = IconLoader.getIcon("/modules/javaModule.png");
+    private static final Icon JAVA_MODULE_ICON = AllIcons.Modules.JavaModule;
   }
 
   private static Icon getJavaModuleIcon() {
@@ -100,7 +101,7 @@ public class JavaModuleType extends ModuleType<JavaModuleBuilder> {
   }
 
   private static class JavaModuleOpenIconHolder {
-    private static final Icon JAVA_MODULE_NODE_ICON_OPEN = IconLoader.getIcon("/nodes/ModuleOpen.png");
+    private static final Icon JAVA_MODULE_NODE_ICON_OPEN = AllIcons.Nodes.ModuleOpen;
   }
 
   private static Icon getJavaModuleNodeIconOpen() {
@@ -108,7 +109,7 @@ public class JavaModuleType extends ModuleType<JavaModuleBuilder> {
   }
 
   private static class JavaModuleClosedIconHolder {
-    private static final Icon JAVA_MODULE_NODE_ICON_CLOSED = IconLoader.getIcon("/nodes/ModuleClosed.png");
+    private static final Icon JAVA_MODULE_NODE_ICON_CLOSED = AllIcons.Nodes.ModuleClosed;
   }
 
   private static Icon getJavaModuleNodeIconClosed() {
index 953b22827ad2c44f21da4871f091e662974b277f..5e8b6dbf65e900a2f204423df8b84863050c9be4 100644 (file)
 package com.intellij.openapi.projectRoots.impl;
 
 import com.intellij.execution.util.ExecUtil;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.application.PathManager;
 import com.intellij.openapi.project.ProjectBundle;
 import com.intellij.openapi.projectRoots.*;
 import com.intellij.openapi.roots.AnnotationOrderRootType;
 import com.intellij.openapi.roots.JavadocOrderRootType;
 import com.intellij.openapi.roots.OrderRootType;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.SystemInfo;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.vfs.*;
@@ -33,7 +33,9 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.swing.*;
-import java.io.*;
+import java.io.File;
+import java.io.FileFilter;
+import java.io.IOException;
 import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -46,9 +48,9 @@ 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 = IconLoader.getIcon("/nodes/ppJdkClosed.png");
-  private static final Icon JDK_ICON_EXPANDED = IconLoader.getIcon("/nodes/ppJdkOpen.png");
-  private static final Icon ADD_ICON = IconLoader.getIcon("/general/addJdk.png");
+  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);
index fef1b6b4e63bfd188a157bb5c7f60dfc31926962..cdbbf5656beb53b25de263942f4ca7c620e7e87f 100644 (file)
  */
 package com.intellij.packageDependencies.ui;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.JdkOrderEntry;
 import com.intellij.openapi.roots.OrderEntry;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.psi.PsiFile;
 
 import javax.swing.*;
 import java.util.Set;
 
 public class LibraryNode extends PackageDependenciesNode {
-  private static final Icon LIB_ICON_OPEN = IconLoader.getIcon("/nodes/ppLibOpen.png");
-  private static final Icon LIB_ICON_CLOSED = IconLoader.getIcon("/nodes/ppLibClosed.png");
-  private static final Icon JDK_ICON_OPEN = IconLoader.getIcon("/nodes/ppJdkOpen.png");
-  private static final Icon JDK_ICON_CLOSED = IconLoader.getIcon("/nodes/ppJdkClosed.png");
+  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;
 
index de6483ad38dbfc749946c41c9237e88037f8edf7..ee08aadbe295957c0b6139ff75a273809297ab6a 100644 (file)
  */
 package com.intellij.packageDependencies.ui;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.util.scopeChooser.GroupByScopeTypeAction;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.ProjectRootManager;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.JavaPsiFacade;
@@ -45,7 +45,7 @@ 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 = IconLoader.getIcon("/general/packagesTab.png");
+   public static final Icon ICON = AllIcons.General.PackagesTab;
 
   @Nullable
   private static GeneralGroupNode getGroupParent(PackageDependenciesNode node) {
@@ -141,4 +141,4 @@ public class PackagePatternProvider extends PatternDialectProvider {
   public AnAction[] createActions(Project project, final Runnable update) {
     return new AnAction[]{new GroupByScopeTypeAction(update)};
   }
-}
\ No newline at end of file
+}
index 660215a8a9294568b4ace18f4dd80e68744be405..cae9eb2b3df56b7651ebe21e63512ccf21f0d489 100644 (file)
@@ -16,6 +16,7 @@
 package com.intellij.packageDependencies.ui;
 
 import com.intellij.analysis.AnalysisScopeBundle;
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.projectView.impl.ModuleGroup;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.module.Module;
@@ -25,7 +26,6 @@ import com.intellij.openapi.progress.ProgressManager;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.roots.*;
 import com.intellij.openapi.roots.libraries.LibraryUtil;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.text.StringUtil;
@@ -79,9 +79,9 @@ public class TreeModelBuilder {
   private GeneralGroupNode myTestRoot = null;
   private GeneralGroupNode myLibsRoot = null;
 
-  private static final Icon LIB_ICON_OPEN = IconLoader.getIcon("/nodes/ppLibOpen.png");
-  private static final Icon LIB_ICON_CLOSED = IconLoader.getIcon("/nodes/ppLibClosed.png");
-  private static final Icon TEST_ICON = IconLoader.getIcon("/nodes/testSourceFolder.png");
+  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");
index 0d3262ecc710d8931620187f93e7c41b012d4ec1..3826be4293b76dd1ce4f97ef2fe126be2142ab08 100644 (file)
 
 package com.intellij.psi.impl.beanProperties;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.presentation.Presentation;
-import com.intellij.openapi.util.IconLoader;
-import com.intellij.psi.*;
+import com.intellij.psi.PsiMethod;
+import com.intellij.psi.PsiNamedElement;
+import com.intellij.psi.PsiType;
 import com.intellij.psi.util.PropertyUtil;
 import com.intellij.util.IncorrectOperationException;
 import org.jetbrains.annotations.NotNull;
@@ -29,7 +31,7 @@ import javax.swing.*;
 @Presentation(icon = "/nodes/property.png")
 public class BeanProperty {
 
-  public static final Icon ICON = IconLoader.getIcon("/nodes/property.png");
+  public static final Icon ICON = AllIcons.Nodes.Property;
 
   private final PsiMethod myMethod;
 
index 75e0946951f68c89b894562b03d60c94c5c31e59..0d6d2b145f0be6e3f6df6c9243e1ee4311ed9760 100644 (file)
  */
 package com.intellij.refactoring.encapsulateFields;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.help.HelpManager;
 import com.intellij.openapi.project.Project;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Iconable;
 import com.intellij.psi.*;
 import com.intellij.psi.util.PropertyUtil;
@@ -625,8 +625,8 @@ public String getAccessorsVisibility() {
     }
   }
 
-  private static final Icon OVERRIDING_METHOD_ICON = IconLoader.getIcon("/general/overridingMethod.png");
-  private static final Icon IMPLEMENTING_METHOD_ICON = IconLoader.getIcon("/general/implementingMethod.png");
+  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 {
index 8ab184d66e97f8abb9118d993ec01a16141aa563..1f2c28ccca4a16f4482ea2c1c76aabcd7c21552e 100644 (file)
@@ -15,9 +15,9 @@
  */
 package com.intellij.slicer;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.psi.*;
 
 /**
@@ -28,7 +28,7 @@ public class CanItBeNullAction  extends AnAction {
   private static final String TEXT = "Can it be null?";
 
   public CanItBeNullAction(SliceTreeBuilder treeBuilder) {
-    super(TEXT, "Determine whether null can flow into this expression", IconLoader.getIcon("/debugger/db_disabled_breakpoint_process.png"));
+    super(TEXT, "Determine whether null can flow into this expression", AllIcons.Debugger.Db_disabled_breakpoint_process);
     myTreeBuilder = treeBuilder;
   }
 
index d7b822f1c024b86b6005f8d14f210dc2bd7068e9..29c97144e5cf3d80fb5ee87b6778e79c480ed691 100644 (file)
@@ -15,6 +15,7 @@
  */
 package com.intellij.slicer;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.ide.actions.CloseTabToolbarAction;
 import com.intellij.ide.actions.RefreshAction;
@@ -26,7 +27,6 @@ import com.intellij.openapi.progress.ProgressIndicator;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.Splitter;
 import com.intellij.openapi.util.Disposer;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ToolWindowAnchor;
 import com.intellij.openapi.wm.ex.ToolWindowManagerEx;
@@ -332,7 +332,7 @@ public abstract class SlicePanel extends JPanel implements TypeSafeDataProvider,
     actionGroup.add(new MyRefreshAction(myTree));
     actionGroup.add(myAutoScrollToSourceHandler.createToggleAction());
     actionGroup.add(new CloseAction());
-    actionGroup.add(new ToggleAction(UsageViewBundle.message("preview.usages.action.text"), "preview", IconLoader.getIcon("/actions/preview.png")) {
+    actionGroup.add(new ToggleAction(UsageViewBundle.message("preview.usages.action.text"), "preview", AllIcons.Actions.Preview) {
       @Override
       public boolean isSelected(AnActionEvent e) {
         return isPreview();
@@ -379,7 +379,7 @@ public abstract class SlicePanel extends JPanel implements TypeSafeDataProvider,
 
   private final class MyRefreshAction extends RefreshAction {
     private MyRefreshAction(JComponent tree) {
-      super(IdeBundle.message("action.refresh"), IdeBundle.message("action.refresh"), IconLoader.getIcon("/actions/sync.png"));
+      super(IdeBundle.message("action.refresh"), IdeBundle.message("action.refresh"), AllIcons.Actions.Sync);
       registerShortcutOn(tree);
     }
 
index cd2a3ef3a05e30dda0ca06a06d675c1d8cf583d2..3b38008516db3a19843de55bb85efdb0dda0361b 100644 (file)
@@ -18,6 +18,7 @@ package com.intellij.testIntegration.createTest;
 import com.intellij.CommonBundle;
 import com.intellij.codeInsight.CodeInsightBundle;
 import com.intellij.codeInsight.daemon.impl.quickfix.OrderEntryFix;
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.util.PackageUtil;
 import com.intellij.ide.util.PropertiesComponent;
 import com.intellij.ide.util.TreeClassChooser;
@@ -40,7 +41,6 @@ import com.intellij.openapi.roots.ModuleRootManager;
 import com.intellij.openapi.roots.SourceFolder;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.Messages;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.*;
@@ -295,7 +295,7 @@ public class CreateTestDialog extends DialogWrapper {
 
     myFixLibraryPanel = new JPanel(new BorderLayout());
     myFixLibraryLabel = new JLabel();
-    myFixLibraryLabel.setIcon(IconLoader.getIcon("/actions/intentionBulb.png"));
+    myFixLibraryLabel.setIcon(AllIcons.Actions.IntentionBulb);
     myFixLibraryPanel.add(myFixLibraryLabel, BorderLayout.CENTER);
     myFixLibraryPanel.add(myFixLibraryButton, BorderLayout.EAST);
 
index f033a1a607d36e47c29a43115d00781fe4d70f85..52501e77b291d220b6affef541e25e6cff53cf52 100644 (file)
@@ -16,6 +16,7 @@
 package com.intellij.unscramble;
 
 import com.intellij.execution.ui.ConsoleView;
+import com.intellij.icons.AllIcons;
 import com.intellij.notification.NotificationGroup;
 import com.intellij.openapi.actionSystem.ActionManager;
 import com.intellij.openapi.actionSystem.ActionPlaces;
@@ -26,7 +27,6 @@ import com.intellij.openapi.project.DumbAwareAction;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.MessageType;
 import com.intellij.openapi.ui.Splitter;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.wm.ToolWindowId;
 import com.intellij.ui.*;
 import com.intellij.ui.components.JBList;
@@ -48,20 +48,20 @@ import java.util.List;
  * @author Konstantin Bulenkov
  */
 public class ThreadDumpPanel extends JPanel {
-  private static final Icon DAEMON = IconLoader.getIcon("/debugger/threadStates/daemon_sign.png");
-  private static final Icon PAUSE_ICON = IconLoader.getIcon("/debugger/threadStates/paused.png");
+  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 = IconLoader.getIcon("/debugger/threadStates/locked.png");
+  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 = IconLoader.getIcon("/debugger/threadStates/running.png");
+  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 = IconLoader.getIcon("/debugger/threadStates/socket.png");
+  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 = IconLoader.getIcon("/debugger/threadStates/idle.png");
+  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 = IconLoader.getIcon("/debugger/threadStates/edtBusy.png");
+  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 = IconLoader.getIcon("/debugger/threadStates/io.png");
+  private static final Icon IO_ICON = AllIcons.Debugger.ThreadStates.IO;
   private static final Icon IO_ICON_DAEMON = new LayeredIcon(IO_ICON, DAEMON);
   private final JBList myThreadList;
 
@@ -205,8 +205,8 @@ public class ThreadDumpPanel extends JPanel {
       }
     };
     private Comparator<ThreadState> COMPARATOR = BY_TYPE;
-    private final Icon typeIcon = IconLoader.getIcon("/objectBrowser/sortByType.png");
-    private final Icon nameIcon = IconLoader.getIcon("/icons/inspector/sortByName.png");
+    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() {
index bcae03df6b5a7de1cac82954275c1bc688eea497..176ae548f79da0edae3a5bdf40ec537bb10b298f 100644 (file)
@@ -17,6 +17,7 @@ package com.intellij.unscramble;
 
 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.ide.ui.ListCellRendererWrapper;
 import com.intellij.ide.util.PropertiesComponent;
@@ -31,7 +32,6 @@ import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.util.Comparing;
 import com.intellij.openapi.util.Condition;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.util.text.StringUtil;
@@ -71,9 +71,9 @@ public class UnscrambleDialog extends DialogWrapper {
       return state.isDeadlocked();
     }
   };
-  private static final Icon THREAD_DUMP_ICON = IconLoader.getIcon("/debugger/threadStates/threaddump.png");
-  private static final Icon DEADLOCK_ICON = IconLoader.getIcon("/debugger/killProcess.png");
-  private static final Icon EXCEPTION_ICON = IconLoader.getIcon("/debugger/threadStates/exception.png");
+  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;
@@ -470,4 +470,4 @@ public class UnscrambleDialog extends DialogWrapper {
       return builder.toString();
   }
 
-}
\ No newline at end of file
+}
index b2770da3ea50b8f40cda2341739f9c7f8fe5d6b0..eef4824cfbd1e54a0b5f9e9a2cd52a9dc1983c6c 100644 (file)
@@ -15,9 +15,9 @@
  */
 package com.intellij.ide.highlighter;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.NotNullLazyValue;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
@@ -32,7 +32,7 @@ public class JavaClassFileType implements FileType {
     @NotNull
     @Override
     protected Icon compute() {
-      return IconLoader.getIcon("/fileTypes/javaClass.png");
+      return AllIcons.FileTypes.JavaClass;
     }
   };
 
@@ -76,4 +76,4 @@ public class JavaClassFileType implements FileType {
   public String getCharset(@NotNull VirtualFile file, final byte[] content) {
     return null;
   }
-}
\ No newline at end of file
+}
index b4433553f6c7d2022bbf52b488d832dbe7d17725..e48525b725c461657af07a7e4559f9e745eda3d0 100644 (file)
  */
 package com.intellij.ide.highlighter;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.lang.java.JavaLanguage;
 import com.intellij.openapi.fileTypes.LanguageFileType;
-import com.intellij.openapi.util.IconLoader;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
@@ -27,7 +27,7 @@ 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 = IconLoader.getIcon("/fileTypes/java.png");
+  private static final Icon ICON = AllIcons.FileTypes.Java;
   public static final JavaFileType INSTANCE = new JavaFileType();
 
   private JavaFileType() {
@@ -61,4 +61,4 @@ public class JavaFileType extends LanguageFileType {
   public boolean isJVMDebuggingSupported() {
     return true;
   }
-}
\ No newline at end of file
+}
index 33de2b108a084fb26d89babf7cb4eb9fb9ddb9ec..d1917a8bdcdbeae77503c04477db2261babdb749 100644 (file)
@@ -17,10 +17,10 @@ package com.intellij.psi.impl;
 
 import com.intellij.codeInsight.CodeInsightBundle;
 import com.intellij.codeInsight.TestFrameworks;
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.IconLayerProvider;
 import com.intellij.openapi.extensions.Extensions;
 import com.intellij.openapi.project.DumbService;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.Iconable;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.text.StringUtil;
@@ -34,10 +34,10 @@ import gnu.trove.TIntObjectHashMap;
 import javax.swing.*;
 
 public class ElementPresentationUtil implements PlatformIcons {
-  private static final Icon STATIC_MARK_ICON = IconLoader.getIcon("/nodes/staticMark.png");
-  private static final Icon FINAL_MARK_ICON = IconLoader.getIcon("/nodes/finalMark.png");
-  public static final Icon JUNIT_TEST_MARK = IconLoader.getIcon("/nodes/junitTestMark.png");
-  private static final Icon RUNNABLE_MARK = IconLoader.getIcon("/nodes/runnableMark.png");
+  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,7 +69,7 @@ public class ElementPresentationUtil implements PlatformIcons {
     return ElementBase.createLayeredIcon(element, baseIcon, getFlags(element, isLocked));
   }
 
-  private static final Icon ABSTRACT_EXCEPTION_CLASS_ICON = IconLoader.getIcon("/nodes/abstractException.png");
+  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;
index 979faaeef5d3262dbad00c210c04292e5a5471e0..be97392947d0786c6064bb76efa498a3b5462670 100644 (file)
@@ -15,6 +15,7 @@
  */
 package com.intellij.codeInsight;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.util.ClassFilter;
 import com.intellij.ide.util.TreeClassChooser;
 import com.intellij.ide.util.TreeClassChooserFactory;
@@ -22,7 +23,6 @@ import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.openapi.ui.Splitter;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.psi.PsiClass;
 import com.intellij.psi.search.GlobalSearchScope;
 import com.intellij.ui.*;
@@ -45,7 +45,7 @@ import java.util.Set;
  */
 public class NullableNotNullDialog extends DialogWrapper {
   private static final Icon SELECT_ICON = PlatformIcons.CHECK_ICON;
-  private static final Icon SELECTED_ICON = IconLoader.getIcon("/diff/currentLine.png");
+  private static final Icon SELECTED_ICON = AllIcons.Diff.CurrentLine;
 
   private final Project myProject;
   private AnnotationsPanel myNullablePanel;
index 86f90ca749a2e9782e5745ac88822bac45ad2127..438fb52de9da9e7f140fa29545c4c1791a3e7e32 100644 (file)
@@ -15,9 +15,9 @@
  */
 package com.intellij.ide.highlighter;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.IdeBundle;
 import com.intellij.openapi.fileTypes.FileType;
-import com.intellij.openapi.util.IconLoader;
 import com.intellij.openapi.util.NotNullLazyValue;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
@@ -29,7 +29,7 @@ public class ArchiveFileType implements FileType {
       @NotNull
       @Override
       protected Icon compute() {
-        return IconLoader.getIcon("/fileTypes/archive.png");
+        return AllIcons.FileTypes.Archive;
       }
     };
 
@@ -65,4 +65,4 @@ public class ArchiveFileType implements FileType {
   public String getCharset(@NotNull VirtualFile file, final byte[] content) {
     return null;
   }
-}
\ No newline at end of file
+}
index 0b6b7ccac45a48d7a5ddf8b9fb625058c63f41d5..6b71c76a52065aa6c56fbd627c0e0b765724f237 100644 (file)
@@ -15,7 +15,7 @@
  */
 package com.intellij.openapi.fileTypes;
 
-import com.intellij.openapi.util.IconLoader;
+import com.intellij.icons.AllIcons;
 import com.intellij.openapi.util.NotNullLazyValue;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
@@ -27,7 +27,7 @@ public class UnknownFileType implements FileType {
     @NotNull
     @Override
     protected Icon compute() {
-      return IconLoader.getIcon("/fileTypes/unknown.png");
+      return AllIcons.FileTypes.Unknown;
     }
   };
   public static final FileType INSTANCE = new UnknownFileType();
index 3cd7c526a073d5b541ca322ee99ce26c1e1705a9..dd79fed1e8bcf2382b997ce9849505524fa7be4a 100644 (file)
@@ -16,6 +16,7 @@
 
 package com.intellij.psi.impl;
 
+import com.intellij.icons.AllIcons;
 import com.intellij.ide.IconLayerProvider;
 import com.intellij.navigation.ItemPresentation;
 import com.intellij.openapi.diagnostic.Logger;
@@ -25,7 +26,10 @@ import com.intellij.openapi.fileTypes.INativeFileType;
 import com.intellij.openapi.fileTypes.UnknownFileType;
 import com.intellij.openapi.progress.ProcessCanceledException;
 import com.intellij.openapi.project.IndexNotReadyException;
-import com.intellij.openapi.util.*;
+import com.intellij.openapi.util.Iconable;
+import com.intellij.openapi.util.Key;
+import com.intellij.openapi.util.NotNullLazyValue;
+import com.intellij.openapi.util.UserDataHolderBase;
 import com.intellij.openapi.util.registry.Registry;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
@@ -73,7 +77,7 @@ public abstract class ElementBase extends UserDataHolderBase implements Iconable
     @NotNull
     @Override
     protected Icon compute() {
-      return IconLoader.getIcon("/nodes/nodePlaceholder.png");
+      return AllIcons.Nodes.NodePlaceholder;
     }
   };
 
index 7de89de85ea891433eb534371fe199e6f3d8e1b9..c4f06f12415b8e5a5a9bc9b6cc93c058d86f4b6a 100644 (file)
@@ -15,7 +15,7 @@
  */
 package com.intellij.util;
 
-import com.intellij.openapi.util.IconLoader;
+import com.intellij.icons.AllIcons;
 import org.jetbrains.annotations.NonNls;
 
 import javax.swing.*;
@@ -25,97 +25,97 @@ import javax.swing.*;
  */
 public interface PlatformIcons {
   @NonNls String PUBLIC_ICON_PATH = "/nodes/c_public.png";
-  Icon PUBLIC_ICON = IconLoader.getIcon(PUBLIC_ICON_PATH);
-  Icon LOCKED_ICON = IconLoader.getIcon("/nodes/locked.png");
-  Icon SYMLINK_ICON = IconLoader.getIcon("/nodes/symlink.png");
-  Icon PRIVATE_ICON = IconLoader.getIcon("/nodes/c_private.png");
-  Icon PROTECTED_ICON = IconLoader.getIcon("/nodes/c_protected.png");
-  Icon PACKAGE_LOCAL_ICON = IconLoader.getIcon("/nodes/c_plocal.png");
-  Icon PACKAGE_ICON = IconLoader.getIcon("/nodes/packageClosed.png");
-  Icon PACKAGE_OPEN_ICON = IconLoader.getIcon("/nodes/packageOpen.png");
-  Icon DIRECTORY_CLOSED_ICON = IconLoader.getIcon("/nodes/TreeClosed.png");
-  Icon DIRECTORY_OPEN_ICON = IconLoader.getIcon("/nodes/TreeOpen.png");
+  Icon PUBLIC_ICON = AllIcons.Nodes.C_public;
+  Icon LOCKED_ICON = AllIcons.Nodes.Locked;
+  Icon SYMLINK_ICON = AllIcons.Nodes.Symlink;
+  Icon PRIVATE_ICON = AllIcons.Nodes.C_private;
+  Icon PROTECTED_ICON = AllIcons.Nodes.C_protected;
+  Icon PACKAGE_LOCAL_ICON = AllIcons.Nodes.C_plocal;
+  Icon PACKAGE_ICON = AllIcons.Nodes.PackageClosed;
+  Icon PACKAGE_OPEN_ICON = AllIcons.Nodes.PackageOpen;
+  Icon DIRECTORY_CLOSED_ICON = AllIcons.Nodes.TreeClosed;
+  Icon DIRECTORY_OPEN_ICON = AllIcons.Nodes.TreeOpen;
   @NonNls String CLASS_ICON_PATH = "/nodes/class.png";
-  Icon CLASS_ICON = IconLoader.getIcon(CLASS_ICON_PATH);
-  Icon EXCEPTION_CLASS_ICON = IconLoader.getIcon("/nodes/exceptionClass.png");
-  Icon NEW_EXCEPTION = IconLoader.getIcon("/nodes/newException.png");
-  Icon ANONYMOUS_CLASS_ICON = IconLoader.getIcon("/nodes/anonymousClass.png");
-  Icon ABSTRACT_CLASS_ICON = IconLoader.getIcon("/nodes/abstractClass.png");
-  Icon ANNOTATION_TYPE_ICON = IconLoader.getIcon("/nodes/annotationtype.png");
-  Icon ENUM_ICON = IconLoader.getIcon("/nodes/enum.png");
-  Icon INTERFACE_ICON = IconLoader.getIcon("/nodes/interface.png");
-  Icon METHOD_ICON = IconLoader.getIcon("/nodes/method.png");
-  Icon FUNCTION_ICON = IconLoader.getIcon("/nodes/function.png");
-  Icon ABSTRACT_METHOD_ICON = IconLoader.getIcon("/nodes/abstractMethod.png");
-  Icon FIELD_ICON = IconLoader.getIcon("/nodes/field.png");
-  Icon PARAMETER_ICON = IconLoader.getIcon("/nodes/parameter.png");
-  Icon VARIABLE_ICON = IconLoader.getIcon("/nodes/variable.png");
-  Icon XML_TAG_ICON = IconLoader.getIcon("/nodes/tag.png");
-  Icon LIBRARY_ICON = IconLoader.getIcon("/nodes/ppLib.png");
-  Icon WEB_ICON = IconLoader.getIcon("/nodes/ppWeb.png");
-  Icon JAR_ICON = IconLoader.getIcon("/nodes/ppJar.png");
-  Icon FILE_ICON = IconLoader.getIcon("/nodes/ppFile.png");
+  Icon CLASS_ICON = AllIcons.Nodes.Class;
+  Icon EXCEPTION_CLASS_ICON = AllIcons.Nodes.ExceptionClass;
+  Icon NEW_EXCEPTION = AllIcons.Nodes.NewException;
+  Icon ANONYMOUS_CLASS_ICON = AllIcons.Nodes.AnonymousClass;
+  Icon ABSTRACT_CLASS_ICON = AllIcons.Nodes.AbstractClass;
+  Icon ANNOTATION_TYPE_ICON = AllIcons.Nodes.Annotationtype;
+  Icon ENUM_ICON = AllIcons.Nodes.Enum;
+  Icon INTERFACE_ICON = AllIcons.Nodes.Interface;
+  Icon METHOD_ICON = AllIcons.Nodes.Method;
+  Icon FUNCTION_ICON = AllIcons.Nodes.Function;
+  Icon ABSTRACT_METHOD_ICON = AllIcons.Nodes.AbstractMethod;
+  Icon FIELD_ICON = AllIcons.Nodes.Field;
+  Icon PARAMETER_ICON = AllIcons.Nodes.Parameter;
+  Icon VARIABLE_ICON = AllIcons.Nodes.Variable;
+  Icon XML_TAG_ICON = AllIcons.Nodes.Tag;
+  Icon LIBRARY_ICON = AllIcons.Nodes.PpLib;
+  Icon WEB_ICON = AllIcons.Nodes.PpWeb;
+  Icon JAR_ICON = AllIcons.Nodes.PpJar;
+  Icon FILE_ICON = AllIcons.Nodes.PpFile;
 
-  Icon VARIABLE_READ_ACCESS = IconLoader.getIcon("/nodes/read-access.png");
-  Icon VARIABLE_WRITE_ACCESS = IconLoader.getIcon("/nodes/write-access.png");
-  Icon VARIABLE_RW_ACCESS = IconLoader.getIcon("/nodes/rw-access.png");
-  Icon CUSTOM_FILE_ICON = IconLoader.getIcon("/fileTypes/custom.png");
-  Icon PROPERTY_ICON = IconLoader.getIcon("/nodes/property.png");
-  Icon NEW_PARAMETER = IconLoader.getIcon("/nodes/newParameter.png");
-  Icon ASPECT_ICON = IconLoader.getIcon("/nodes/aspect.png");
-  Icon POINTCUT_ICON = IconLoader.getIcon("/nodes/pointcut.png");
-  Icon ADVICE_ICON = IconLoader.getIcon("/nodes/advice.png");
-  Icon ERROR_INTRODUCTION_ICON = IconLoader.getIcon("/nodes/errorIntroduction.png");
-  Icon WARNING_INTRODUCTION_ICON = IconLoader.getIcon("/nodes/warningIntroduction.png");
-  Icon JAVA_OUTSIDE_SOURCE_ICON = IconLoader.getIcon("/fileTypes/javaOutsideSource.png");
-  Icon EXCLUDED_FROM_COMPILE_ICON = IconLoader.getIcon("/nodes/excludedFromCompile.png");
-  Icon PROJECT_ICON = IconLoader.getIcon("/icon_small.png");
-  Icon UI_FORM_ICON = IconLoader.getIcon("/fileTypes/uiForm.png");
-  Icon JSP_ICON = IconLoader.getIcon("/fileTypes/jsp.png");
-  Icon SMALL_VCS_CONFIGURABLE = IconLoader.getIcon("/general/smallConfigurableVcs.png");
-  Icon VCS_SMALL_TAB = IconLoader.getIcon("/general/vcsSmallTab.png");
-  Icon GROUP_BY_PACKAGES = IconLoader.getIcon("/toolbar/folders.png");
+  Icon VARIABLE_READ_ACCESS = AllIcons.Nodes.Read_access;
+  Icon VARIABLE_WRITE_ACCESS = AllIcons.Nodes.Write_access;
+  Icon VARIABLE_RW_ACCESS = AllIcons.Nodes.Rw_access;
+  Icon CUSTOM_FILE_ICON = AllIcons.FileTypes.Custom;
+  Icon PROPERTY_ICON = AllIcons.Nodes.Property;
+  Icon NEW_PARAMETER = AllIcons.Nodes.NewParameter;
+  Icon ASPECT_ICON = AllIcons.Nodes.Aspect;
+  Icon POINTCUT_ICON = AllIcons.Nodes.Pointcut;
+  Icon ADVICE_ICON = AllIcons.Nodes.Advice;
+  Icon ERROR_INTRODUCTION_ICON = AllIcons.Nodes.ErrorIntroduction;
+  Icon WARNING_INTRODUCTION_ICON = AllIcons.Nodes.WarningIntroduction;
+  Icon JAVA_OUTSIDE_SOURCE_ICON = AllIcons.FileTypes.JavaOutsideSource;
+  Icon EXCLUDED_FROM_COMPILE_ICON = AllIcons.Nodes.ExcludedFromCompile;
+  Icon PROJECT_ICON = AllIcons.Icon_small;
+  Icon UI_FORM_ICON = AllIcons.FileTypes.UiForm;
+  Icon JSP_ICON = AllIcons.FileTypes.Jsp;
+  Icon SMALL_VCS_CONFIGURABLE = AllIcons.General.SmallConfigurableVcs;
+  Icon VCS_SMALL_TAB = AllIcons.General.VcsSmallTab;
+  Icon GROUP_BY_PACKAGES = AllIcons.Toolbar.Folders;
   Icon ADD_ICON = IconUtil.getAddIcon();
   Icon DELETE_ICON = IconUtil.getRemoveIcon();
-  Icon COPY_ICON = IconLoader.getIcon("/actions/copy.png");
+  Icon COPY_ICON = AllIcons.Actions.Copy;
   Icon EDIT = IconUtil.getEditIcon();
   Icon ANALYZE = IconUtil.getAnalyzeIcon();
-  Icon SELECT_ALL_ICON = IconLoader.getIcon("/actions/selectall.png");
-  Icon UNSELECT_ALL_ICON = IconLoader.getIcon("/actions/unselectall.png");
-  Icon PROPERTIES_ICON = IconLoader.getIcon("/actions/properties.png");
-  Icon SYNCHRONIZE_ICON = IconLoader.getIcon("/actions/sync.png");
-  Icon SHOW_SETTINGS_ICON = IconLoader.getIcon("/actions/showSettings.png");
+  Icon SELECT_ALL_ICON = AllIcons.Actions.Selectall;
+  Icon UNSELECT_ALL_ICON = AllIcons.Actions.Unselectall;
+  Icon PROPERTIES_ICON = AllIcons.Actions.Properties;
+  Icon SYNCHRONIZE_ICON = AllIcons.Actions.Sync;
+  Icon SHOW_SETTINGS_ICON = AllIcons.Actions.ShowSettings;
 
-  Icon CHECK_ICON = IconLoader.getIcon("/actions/checked.png");
-  Icon CHECK_ICON_SELECTED = IconLoader.getIcon("/actions/checked_selected.png");
-  Icon CHECK_ICON_SMALL = IconLoader.getIcon("/actions/checked_small.png");
-  Icon CHECK_ICON_SMALL_SELECTED = IconLoader.getIcon("/actions/checked_small_selected.png");
+  Icon CHECK_ICON = AllIcons.Actions.Checked;
+  Icon CHECK_ICON_SELECTED = AllIcons.Actions.Checked_selected;
+  Icon CHECK_ICON_SMALL = AllIcons.Actions.Checked_small;
+  Icon CHECK_ICON_SMALL_SELECTED = AllIcons.Actions.Checked_small_selected;