From ce21064639e0050f637139763c5c1c5b9c364180 Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Wed, 30 May 2012 18:29:53 +0400 Subject: [PATCH] Unified access to icons.jar resources --- .../intellij/lang/regexp/RegExpFileType.java | 3 +- .../compiler/impl/CompilerErrorTreeView.java | 4 +- .../options/AnnotationProcessorsPanel.java | 7 +- .../options/CompilerConfigurable.java | 4 +- .../impl/artifacts/InvalidArtifactType.java | 4 +- .../impl/artifacts/PlainArtifactType.java | 4 +- .../elements/DirectoryCopyElementType.java | 8 +- .../impl/elements/DirectoryElementType.java | 4 +- .../ExtractedDirectoryElementType.java | 4 +- .../impl/elements/FileCopyElementType.java | 4 +- .../ProductionModuleOutputElementType.java | 4 +- .../debugger/ui/DebuggerSessionTab.java | 8 +- .../com/intellij/debugger/ui/FramesPanel.java | 4 +- .../ui/breakpoints/FieldBreakpoint.java | 30 +- .../ui/breakpoints/LineBreakpoint.java | 4 +- .../ui/breakpoints/MethodBreakpoint.java | 26 +- .../ui/impl/DebuggerTreeRenderer.java | 8 +- .../impl/watch/StackFrameDescriptorImpl.java | 8 +- .../ui/impl/watch/ThreadDescriptorImpl.java | 12 +- .../options/CompileStepBeforeRun.java | 4 +- .../applet/AppletConfigurationType.java | 4 +- .../ApplicationConfigurationType.java | 4 +- .../impl/DefaultJavaProgramRunner.java | 6 +- .../remote/RemoteConfigurationType.java | 6 +- .../ui/libraries/LibraryOptionsPanel.java | 4 +- .../ide/palette/impl/PaletteManager.java | 4 +- .../importProject/ProjectLayoutPanel.java | 8 +- .../ProjectCreateModeStep.java | 4 +- .../ui/configuration/AnnotationsEditor.java | 4 +- .../ui/configuration/BuildElementsEditor.java | 4 +- .../ui/configuration/ClasspathEditor.java | 4 +- .../ConfigurationErrorsComponent.java | 14 +- .../configuration/JavaContentRootPanel.java | 6 +- .../roots/ui/configuration/JavadocEditor.java | 6 +- .../ui/configuration/ProjectConfigurable.java | 4 +- .../ProjectStructureConfigurable.java | 4 +- .../artifacts/ArtifactEditorImpl.java | 4 +- .../artifacts/ArtifactErrorPanel.java | 4 +- .../InvalidArtifactConfigurable.java | 4 +- .../actions/SortElementsToggleAction.java | 4 +- .../AnalyzeDependenciesComponent.java | 11 +- .../ModuleDependenciesAnalyzer.java | 4 +- .../AnnotationsOrderRootTypeUIFactory.java | 4 +- .../ClassesOrderRootTypeUIFactory.java | 4 +- .../libraryEditor/ItemElementDescriptor.java | 6 +- .../JavadocOrderRootTypeUIFactory.java | 4 +- .../SourcesOrderRootTypeUIFactory.java | 4 +- .../FacetStructureConfigurable.java | 4 +- ...indUsagesInProjectStructureActionBase.java | 4 +- .../ModuleStructureConfigurable.java | 8 +- .../ExternalAnnotationsManagerImpl.java | 4 +- .../daemon/impl/JavaLineMarkerProvider.java | 10 +- .../impl/RecursiveCallLineMarkerProvider.java | 4 +- ...eWithDefaultParamValueIntentionAction.java | 4 +- .../quickfix/RunRefactoringIntention.java | 4 +- .../generation/OverrideImplementUtil.java | 5 +- .../deadCode/UnusedDeclarationInspection.java | 8 +- .../codeInspection/ui/EntryPointsNode.java | 6 +- .../ui/CyclicDependenciesPanel.java | 15 +- .../method/MethodHierarchyNodeDescriptor.java | 8 +- .../ide/projectView/impl/PackageViewPane.java | 7 +- .../impl/java/InheritedMembersFilter.java | 4 +- .../JavaInheritedMembersNodeProvider.java | 5 +- .../impl/java/SuperTypeGroup.java | 10 +- .../impl/java/SuperTypesGrouper.java | 4 +- .../impl/java/VisibilitySorter.java | 4 +- .../intellij/ide/util/FQNameCellRenderer.java | 4 +- .../ide/util/PackageChooserDialog.java | 4 +- .../scopeChooser/GroupByScopeTypeAction.java | 6 +- .../internal/UsedIconsListingAction.java | 197 +++ .../openapi/module/JavaModuleType.java | 7 +- .../projectRoots/impl/JavaSdkImpl.java | 12 +- .../packageDependencies/ui/LibraryNode.java | 10 +- .../ui/PackagePatternProvider.java | 6 +- .../ui/TreeModelBuilder.java | 8 +- .../psi/impl/beanProperties/BeanProperty.java | 8 +- .../EncapsulateFieldsDialog.java | 6 +- .../intellij/slicer/CanItBeNullAction.java | 4 +- .../src/com/intellij/slicer/SlicePanel.java | 6 +- .../createTest/CreateTestDialog.java | 4 +- .../intellij/unscramble/ThreadDumpPanel.java | 22 +- .../intellij/unscramble/UnscrambleDialog.java | 10 +- .../ide/highlighter/JavaClassFileType.java | 6 +- .../ide/highlighter/JavaFileType.java | 6 +- .../psi/impl/ElementPresentationUtil.java | 12 +- .../codeInsight/NullableNotNullDialog.java | 4 +- .../ide/highlighter/ArchiveFileType.java | 6 +- .../openapi/fileTypes/UnknownFileType.java | 4 +- .../com/intellij/psi/impl/ElementBase.java | 8 +- .../src/com/intellij/util/PlatformIcons.java | 158 +- .../openapi/fileTypes/PlainTextFileType.java | 6 +- platform/icons/src/general/tab_white_left.png | Bin 219 -> 0 bytes .../icons/src/general/tab_white_right.png | Bin 222 -> 0 bytes .../SuppressIntentionAction.java | 6 +- .../execution/DefaultExecutionResult.java | 6 +- .../configurations/CommandLineState.java | 4 +- .../UnknownConfigurationType.java | 4 +- .../executors/DefaultRunExecutor.java | 8 +- .../execution/ui/actions/CloseAction.java | 4 +- .../projectRoots/impl/UnknownSdkType.java | 6 +- .../openapi/projectRoots/ui/PathEditor.java | 6 +- .../DocumentationOrderRootTypeUIFactory.java | 4 +- .../src/com/intellij/profile/Profile.java | 6 +- .../intellij/psi/search/TodoAttributes.java | 8 +- .../scope/packageSet/NamedScopeManager.java | 6 +- .../intellij/analysis/AnalysisUIOptions.java | 11 +- .../options/CodeCompletionOptions.java | 6 +- .../options/CodeStyleSchemesConfigurable.java | 6 +- .../options/InitialConfigurationDialog.java | 6 +- .../options/colors/ColorAndFontOptions.java | 4 +- .../options/editor/EditorOptions.java | 6 +- .../daemon/impl/TrafficLightRenderer.java | 8 +- .../documentation/DockablePopupManager.java | 8 +- .../documentation/DocumentationComponent.java | 11 +- .../codeInsight/hint/ElementLocationUtil.java | 10 +- .../hint/ImplementationViewComponent.java | 12 +- .../impl/FileLevelIntentionComponent.java | 6 +- .../impl/IntentionHintComponent.java | 16 +- .../config/IntentionSettingsConfigurable.java | 4 +- .../codeInsight/lookup/impl/LookupImpl.java | 12 +- .../impl/LiveTemplatesConfigurable.java | 6 +- .../ex/DisableInspectionToolAction.java | 5 +- .../ex/EditInspectionToolsSettingsAction.java | 4 +- .../ex/InspectionManagerEx.java | 4 +- .../codeInspection/ex/QuickFixAction.java | 4 +- .../codeInspection/ui/InspectionNode.java | 4 +- .../ui/InspectionResultsView.java | 15 +- .../ui/ProblemDescriptionNode.java | 8 +- .../ui/actions/ExportHTMLAction.java | 4 +- .../InspectionsOptionsToolbarAction.java | 5 +- .../ui/actions/InvokeQuickFixAction.java | 5 +- .../intellij/execution/ProgramRunnerUtil.java | 3 +- .../execution/RunContentExecutor.java | 4 +- .../actions/ChooseRunConfigurationAction.java | 6 +- .../actions/EditRunConfigurationsAction.java | 4 +- .../actions/RunConfigurationAction.java | 4 +- .../execution/actions/StopAction.java | 4 +- .../execution/impl/ConsoleViewImpl.java | 3 +- .../execution/impl/RunConfigurable.java | 8 +- .../RunConfigurationBeforeRunProvider.java | 4 +- .../impl/SingleConfigurationConfigurable.java | 6 +- .../AbstractConsoleRunnerWithHistory.java | 4 +- .../execution/runners/RestartAction.java | 4 +- .../execution/runners/RunContentBuilder.java | 8 +- .../ui/CommonProgramParametersPanel.java | 4 +- .../ui/layout/actions/CloseViewAction.java | 8 +- .../ui/layout/actions/MinimizeViewAction.java | 8 +- .../impl/invalid/InvalidFacetEditor.java | 4 +- .../facet/impl/invalid/InvalidFacetType.java | 4 +- .../intellij/find/EditorSearchComponent.java | 4 +- .../find/actions/ShowUsagesAction.java | 6 +- .../editorHeaderActions/FindAllAction.java | 4 +- .../ShowHistoryAction.java | 4 +- .../editorHeaderActions/ToggleMultiline.java | 4 +- .../ide/actions/CreateFileAction.java | 4 +- .../actions/DeleteBookmarkAction.java | 4 +- .../EditBookmarkDescriptionAction.java | 5 +- .../actions/MoveBookmarkDownAction.java | 4 +- .../actions/MoveBookmarkUpAction.java | 4 +- .../intellij/ide/commander/TopLevelNode.java | 4 +- .../favoritesTreeView/FavoritesListNode.java | 4 +- .../FavoritesProjectViewPane.java | 4 +- .../FavoritesTreeViewPanel.java | 6 +- ...dAllOpenFilesToNewFavoritesListAction.java | 4 +- .../actions/AddToNewFavoritesListAction.java | 4 +- .../FavoritesAutoScrollToSourceAction.java | 4 +- ...ritesCompactEmptyMiddlePackagesAction.java | 4 +- .../FavoritesFlattenPackagesAction.java | 4 +- .../actions/FavoritesShowMembersAction.java | 4 +- .../actions/RenameFavoritesListAction.java | 4 +- .../impl/AllFileTemplatesConfigurable.java | 8 +- .../hierarchy/CallHierarchyBrowserBase.java | 6 +- .../ide/hierarchy/HierarchyBrowserBaseEx.java | 6 +- .../hierarchy/HierarchyBrowserManager.java | 5 +- .../hierarchy/HierarchyNodeDescriptor.java | 4 +- .../hierarchy/MethodHierarchyBrowserBase.java | 10 +- .../hierarchy/ViewClassHierarchyAction.java | 4 +- .../ViewSubtypesHierarchyAction.java | 4 +- .../ViewSupertypesHierarchyAction.java | 4 +- .../navigationToolbar/NavBarPresentation.java | 6 +- .../ide/projectView/impl/ProjectViewImpl.java | 23 +- .../ide/projectView/impl/ProjectViewPane.java | 4 +- .../projectView/impl/ShowModulesAction.java | 6 +- .../impl/nodes/NamedLibraryElementNode.java | 8 +- .../intellij/ide/scopeView/ScopeViewPane.java | 9 +- .../ide/todo/SetTodoFilterAction.java | 6 +- .../src/com/intellij/ide/todo/TodoPanel.java | 6 +- .../todo/configurable/TodoConfigurable.java | 4 +- .../intellij/ide/util/DirectoryChooser.java | 4 +- .../com/intellij/ide/util/MemberChooser.java | 8 +- .../ide/util/PsiElementModuleRenderer.java | 6 +- .../ide/util/gotoByName/ChooseByNameBase.java | 3 +- .../util/gotoByName/ChooseByNameFilter.java | 4 +- .../ScopeChooserConfigurable.java | 6 +- .../util/scopeChooser/ScopeEditorPanel.java | 4 +- .../util/scopeChooser/ShowFilesAction.java | 6 +- .../scopeChooser/ShowModuleGroupsAction.java | 6 +- .../util/scopeChooser/ShowModulesAction.java | 6 +- .../DependenciesAnalyzeManager.java | 5 +- .../ModulesDependenciesPanel.java | 12 +- .../EnforcedPlainTextFileTypeFactory.java | 4 +- .../http/JumpFromRemoteFileToLocalAction.java | 4 +- .../fileTypes/impl/FileTypeConfigurable.java | 4 +- .../openapi/module/EmptyModuleType.java | 10 +- .../openapi/module/WebModuleTypeBase.java | 8 +- .../CommonContentEntriesEditor.java | 6 +- .../configuration/ContentEntryTreeEditor.java | 4 +- .../ui/configuration/ContentRootPanel.java | 10 +- .../roots/ui/configuration/IconSet.java | 22 +- .../openapi/util/registry/RegistryUi.java | 6 +- .../encoding/FileEncodingConfigurable.java | 4 +- .../wm/impl/status/TogglePopupHintsPanel.java | 10 +- .../DependenciesToolWindow.java | 4 +- .../DependencyValidationManagerImpl.java | 3 +- .../ui/DependenciesPanel.java | 28 +- .../ui/ProjectPatternProvider.java | 8 +- .../ui/InspectionToolsConfigurable.java | 3 +- .../ui/SingleInspectionProfilePanel.java | 9 +- .../TemplateDataLanguageConfigurable.java | 4 +- .../refactoring/RefactoringBaseIntention.java | 4 +- .../ui/AbstractMemberSelectionTable.java | 6 +- .../GotoTestOrCodeHandler.java | 4 +- .../com/intellij/tools/ToolConfigurable.java | 6 +- .../intellij/tools/ToolKeymapExtension.java | 18 +- .../intellij/ui/ColorLineMarkerProvider.java | 4 +- .../ui/debugger/extensions/ActionTracer.java | 4 +- .../debugger/extensions/DisposerDebugger.java | 4 +- .../ui/debugger/extensions/FocusDebugger.java | 4 +- .../debugger/extensions/PlaybackDebugger.java | 14 +- .../ui/tabs/FileColorsConfigurablePanel.java | 6 +- .../usageView/impl/UsageViewManagerImpl.java | 4 +- .../integration/ui/views/HistoryDialog.java | 6 +- .../ide/actions/CloseTabToolbarAction.java | 4 +- .../ide/actions/ContextHelpAction.java | 4 +- .../ide/actions/QuickSwitchSchemeAction.java | 4 +- .../ide/highlighter/WorkspaceFileType.java | 4 +- .../ide/util/treeView/smartTree/Sorter.java | 4 +- .../actionSystem/ex/ComboBoxAction.java | 3 +- .../openapi/fileTypes/NativeFileType.java | 4 +- .../intellij/openapi/keymap/KeymapUtil.java | 6 +- .../src/com/intellij/openapi/ui/Banner.java | 4 +- .../openapi/ui/ComboBoxTableRenderer.java | 4 +- .../intellij/openapi/ui/DialogWrapper.java | 7 +- .../intellij/openapi/ui/FixedSizeButton.java | 4 +- .../openapi/ui/MasterDetailsComponent.java | 4 +- .../openapi/ui/popup/util/MinimizeButton.java | 8 +- .../ui/AutoScrollFromSourceHandler.java | 4 +- .../ui/AutoScrollToSourceHandler.java | 5 +- .../com/intellij/ui/RawCommandLineEditor.java | 4 +- .../ui/ReorderableListController.java | 4 +- .../src/com/intellij/ui/SearchTextField.java | 6 +- .../ui/components/JBComboBoxLabel.java | 4 +- .../ui/components/JBOptionButton.java | 4 +- .../ui/components/labels/LinkLabel.java | 4 +- .../com/intellij/ui/dualView/DualView.java | 6 +- .../src/com/intellij/ui/tabs/TabInfo.java | 4 +- .../ui/tabs/impl/singleRow/MoreTabsIcon.java | 4 +- .../actions/CollapseAllAction.java | 4 +- .../actions/ExpandAllAction.java | 4 +- .../src/com/intellij/util/Icons.java | 64 +- .../intellij/util/ui/AsyncProcessIcon.java | 5 +- .../options/ExportSchemeAction.java | 4 +- .../pathMacros/PathMacroConfigurable.java | 4 +- .../intellij/codeInsight/hint/HintUtil.java | 6 +- .../diagnostic/IdeFatalErrorsIcon.java | 8 +- .../src/com/intellij/ide/BrowserSettings.java | 4 +- .../ide/GeneralSettingsConfigurable.java | 6 +- .../ide/actionMacro/ActionMacroManager.java | 16 +- .../StartStopMacroRecordingAction.java | 4 +- .../com/intellij/ide/actions/CloseAction.java | 4 +- .../ide/actions/ToolWindowsGroup.java | 36 +- .../com/intellij/ide/dnd/Highlighters.java | 13 +- .../ide/errorTreeView/ErrorViewStructure.java | 4 +- .../FixedHotfixGroupElement.java | 4 +- .../ide/errorTreeView/HotfixGroupElement.java | 4 +- .../errorTreeView/NewErrorTreeRenderer.java | 10 +- .../errorTreeView/NewErrorTreeViewPanel.java | 8 +- .../ide/plugins/ActionInstallPlugin.java | 5 +- .../ide/plugins/ActionUninstallPlugin.java | 4 +- .../plugins/AvailablePluginColumnInfo.java | 6 +- .../plugins/InstalledPluginsTableModel.java | 8 +- .../ide/plugins/PluginManagerColumnInfo.java | 11 +- .../plugins/PluginManagerConfigurable.java | 4 +- .../ide/plugins/PluginManagerMain.java | 6 +- .../ide/ui/AppearanceConfigurable.java | 4 +- .../com/intellij/ide/ui/LafManagerImpl.java | 17 +- .../CustomizableActionsPanel.java | 5 +- .../CustomizationConfigurable.java | 4 +- .../src/com/intellij/ide/util/TipPanel.java | 4 +- .../internal/inspector/UiInspectorAction.java | 6 +- .../com/intellij/notification/EventLog.java | 7 +- .../impl/IdeNotificationArea.java | 10 +- .../actionSystem/impl/ActionButton.java | 3 +- .../actionSystem/impl/ActionToolbarImpl.java | 10 +- .../ui/ApplyNonConflicts.java | 4 +- .../impl/incrementalMerge/ui/MergePanel2.java | 8 +- .../diff/impl/util/GutterActionRenderer.java | 6 +- .../editor/actions/ContentChooser.java | 4 +- .../actions/ScrollToTheEndToolbarAction.java | 6 +- .../editor/impl/EditorMarkupModelImpl.java | 4 +- .../fileChooser/actions/NewFileAction.java | 6 +- .../impl/EditorTabbedContainer.java | 9 +- .../openapi/fileEditor/impl/EditorWindow.java | 12 +- .../impl/http/RefreshRemoteFileAction.java | 4 +- .../fileEditor/impl/http/RemoteFilePanel.java | 9 +- .../openapi/keymap/impl/ui/ActionsTree.java | 4 +- .../keymap/impl/ui/ActionsTreeUtil.java | 12 +- .../keymap/impl/ui/ChooseActionsDialog.java | 6 +- .../keymap/impl/ui/KeymapConfigurable.java | 6 +- .../openapi/keymap/impl/ui/KeymapPanel.java | 8 +- .../keymap/impl/ui/MouseShortcutDialog.java | 4 +- .../keymap/impl/ui/QuickListPanel.java | 4 +- .../ex/ControlPanelSettingsEditor.java | 4 +- .../newEditor/ShowSearchFieldAction.java | 4 +- .../openapi/progress/util/ProgressBar.java | 4 +- .../openapi/ui/impl/ShadowBorderPainter.java | 34 +- .../impl/UpdateSettingsConfigurable.java | 4 +- .../openapi/wm/impl/ToolWindowHeader.java | 32 +- .../openapi/wm/impl/content/ComboIcon.java | 4 +- .../openapi/wm/impl/content/MoreIcon.java | 6 +- .../wm/impl/content/PushedTabBackground.java | 18 +- .../openapi/wm/impl/status/EncodingPanel.java | 4 +- .../wm/impl/status/IdeStatusBarImpl.java | 8 +- .../impl/status/InlineProgressIndicator.java | 8 +- .../status/ToggleReadOnlyAttributePanel.java | 6 +- .../welcomeScreen/DefaultWelcomeScreen.java | 7 +- .../src/com/intellij/ui/AppIcon.java | 5 +- .../src/com/intellij/ui/BalloonImpl.java | 3 +- .../src/com/intellij/ui/ColorPicker.java | 6 +- .../com/intellij/ui/HideableTitledPanel.java | 6 +- .../ui/SplitterWithSecondHideable.java | 10 +- .../intellij/ui/content/impl/ContentImpl.java | 8 +- .../ui/content/impl/MessageViewImpl.java | 4 +- .../content/tabs/PinToolwindowTabAction.java | 4 +- .../com/intellij/ui/popup/AbstractPopup.java | 7 +- .../intellij/ui/popup/PopupFactoryImpl.java | 4 +- .../src/com/intellij/ui/popup/PopupIcons.java | 8 +- .../intellij/ui/popup/SpeedSearchPane.java | 4 +- .../intellij/ui/popup/tree/TreePopupImpl.java | 9 +- .../com/intellij/ui/tabs/impl/JBTabsDemo.java | 3 +- .../ide/highlighter/ModuleFileType.java | 4 +- .../ide/highlighter/ProjectFileType.java | 4 +- .../testframework/PoolOfTestIcons.java | 4 +- .../execution/testframework/ToolbarPanel.java | 8 +- .../actions/ScrollToTestSourceAction.java | 4 +- .../autotest/ToggleAutoTestAction.java | 4 +- .../ImportUsageFilteringRuleProvider.java | 4 +- .../usages/impl/PreviewUsageAction.java | 4 +- .../impl/SortMembersAlphabeticallyAction.java | 6 +- .../impl/UsageFilteringRuleProviderImpl.java | 6 +- .../impl/UsageGroupingRuleProviderImpl.java | 8 +- .../intellij/usages/impl/UsageViewImpl.java | 5 +- .../usages/impl/UsageViewManagerImpl.java | 8 +- .../usages/impl/rules/ModuleGroupingRule.java | 4 +- .../util/src/com/intellij/icons/AllIcons.java | 1331 +++++++++++++++++ .../util/src/com/intellij/util/ui/UIUtil.java | 7 +- .../com/intellij/util/ui/tree/MacTreeUI.java | 6 +- .../ShowAllAffectedGenericAction.java | 4 +- .../openapi/vcs/ui/SearchFieldAction.java | 4 +- .../src/com/intellij/vcsUtil/VcsUtil.java | 6 +- .../openapi/diff/impl/dir/DirDiffIcons.java | 10 +- .../diff/impl/dir/DirDiffOperation.java | 12 +- .../vcs/actions/ShowDiffFromAnnotation.java | 4 +- .../changes/ChangesFragmentedDiffPanel.java | 16 +- .../vcs/changes/ChangesViewManager.java | 5 +- .../actions/CreatePatchFromChangesAction.java | 4 +- .../actions/IgnoredSettingsAction.java | 6 +- .../MoveChangesToAnotherListAction.java | 4 +- .../actions/OpenRepositoryVersionAction.java | 4 +- .../actions/RevertSelectedChangesAction.java | 6 +- .../changes/actions/RollbackDialogAction.java | 4 +- .../actions/SetDefaultChangeListAction.java | 13 +- .../vcs/changes/actions/ShowDiffAction.java | 5 +- .../actions/ShowDiffWithLocalAction.java | 4 +- .../committed/IncomingChangesIndicator.java | 6 +- .../committed/RepositoryChangesBrowser.java | 5 +- .../ChangelistConflictNotificationPanel.java | 4 +- .../patch/ApplyPatchDifferentiatedDialog.java | 25 +- .../vcs/changes/patch/PatchFileType.java | 6 +- .../vcs/changes/ui/ChangesTreeList.java | 4 +- .../changes/ui/ChangesViewContentManager.java | 4 +- .../changes/ui/EditSourceInCommitAction.java | 4 +- .../changes/ui/MultipleChangeListBrowser.java | 4 +- .../configurable/VcsManagerConfigurable.java | 4 +- .../vcs/ex/RollbackLineStatusRangeAction.java | 4 +- .../vcs/ex/ShowLineStatusRangeDiffAction.java | 4 +- .../vcs/history/FileHistoryPanelImpl.java | 12 +- .../openapi/vcs/update/DirectoryTreeNode.java | 8 +- .../openapi/vcs/update/UpdateInfoTree.java | 4 +- .../executors/DefaultDebugExecutor.java | 8 +- .../intellij/xdebugger/ui/DebuggerIcons.java | 44 +- .../AbstractValueHintTreeComponent.java | 8 +- .../impl/settings/DebuggerConfigurable.java | 6 +- .../xdebugger/impl/ui/DebuggerColorsPage.java | 4 +- .../impl/ui/DebuggerSessionTabBase.java | 4 +- .../impl/ui/XDebuggerUIConstants.java | 18 +- .../TestDataHighlightingPass.java | 4 +- .../ig/telemetry/ResetTelemetryAction.java | 6 +- .../telemetry/UpdateTelemetryViewAction.java | 6 +- .../intelliLang/InjectionsSettingsUI.java | 5 +- .../run/AndroidRunConfigurationEditor.java | 4 +- .../com/intellij/lang/ant/AntFileType.java | 4 +- .../src/com/intellij/lang/ant/AntIcons.java | 6 +- .../actions/AntBuildFilePropertiesAction.java | 4 +- .../ant/config/actions/ChangeViewAction.java | 4 +- .../ant/config/actions/PauseOutputAction.java | 4 +- .../lang/ant/config/actions/RunAction.java | 4 +- .../lang/ant/config/actions/StopAction.java | 4 +- .../ant/config/actions/VerboseAction.java | 4 +- .../config/execution/MessageTreeRenderer.java | 10 +- .../explorer/AntBuildFileNodeDescriptor.java | 4 +- .../lang/ant/config/explorer/AntExplorer.java | 6 +- .../ant/config/impl/AllJarsUnderDirEntry.java | 4 +- .../ant/config/impl/AntKeymapExtension.java | 6 +- .../config/impl/configuration/AntUIUtil.java | 6 +- .../config/ui/CvsListCellRenderer.java | 4 +- .../cvsBrowser/CvsElementFactory.java | 6 +- .../cvsSupport2/cvsBrowser/LoadingNode.java | 26 +- .../cvsBrowser/ui/BrowserPanel.java | 10 +- .../cvsoperations/cvsAdd/AddedFileInfo.java | 6 +- .../ui/AddMultipleFilesOptionsDialog.java | 6 +- .../cvsCheckOut/ui/FileCellRenderer.java | 4 +- .../cvsSupport2/ui/CvsTabbedWindow.java | 8 +- .../ui/CvsTabbedWindowComponent.java | 4 +- .../src/DevKitFileTemplatesFactory.java | 5 +- .../devkit/src/actions/NewActionDialog.java | 4 +- .../build/PluginModuleBuildConfEditor.java | 4 +- .../devkit/src/module/PluginModuleType.java | 7 +- .../src/run/PluginConfigurationType.java | 6 +- .../SelectEclipseImportedProjectsStep.java | 4 +- .../history/wholeTree/BasePopupAction.java | 4 +- .../git4idea/history/wholeTree/GitLogUI.java | 11 +- .../git4idea/push/GitManualPushToBranch.java | 4 +- .../ui/branch/GitCompareBranchesDialog.java | 3 +- .../plugins/gradle/ui/GradleIcons.java | 9 +- .../actions/GroovyDocReducePackageAction.java | 6 +- .../plugins/groovy/mvc/MvcConsole.java | 9 +- .../plugins/groovy/mvc/MvcIcons.java | 3 +- .../mvc/projectView/MvcProjectViewPane.java | 8 +- .../junit/JUnitConfigurationType.java | 4 +- .../configuration/JUnitConfigurable.java | 4 +- .../maven/execution/MavenResumeAction.java | 4 +- .../indices/MavenArtifactSearchPanel.java | 4 +- .../MavenRepositoriesConfigurable.java | 4 +- .../idea/maven/utils/MavenIcons.java | 7 +- .../idea/maven/utils/MavenSettings.java | 4 +- .../maven/utils/RepositoryAttachDialog.java | 8 +- .../maven/wizards/MavenModuleBuilder.java | 4 +- .../lang/properties/PropertiesFileType.java | 4 +- .../lang/properties/ResourceBundle.java | 8 +- .../structureView/GroupByWordPrefixes.java | 4 +- .../PropertiesFileStructureViewModel.java | 4 +- .../structureView/PropertiesPrefixGroup.java | 5 +- .../idea/svn/dialogs/CopyDialog.java | 4 +- .../svn/dialogs/PagedListWithActions.java | 6 +- .../idea/svn/dialogs/PropertiesComponent.java | 14 +- .../svn/dialogs/RepositoryBrowserDialog.java | 12 +- .../idea/svn/dialogs/ToBeMergedDialog.java | 6 +- .../idea/svn/history/RootsAndBranches.java | 3 +- .../idea/svn/dialogs/CopyDialog.java | 3 +- .../svn/dialogs/PagedListWithActions.java | 5 +- .../idea/svn/dialogs/PropertiesComponent.java | 15 +- .../svn/dialogs/RepositoryBrowserDialog.java | 13 +- .../idea/svn/dialogs/ToBeMergedDialog.java | 5 +- .../idea/svn/history/RootsAndBranches.java | 3 +- .../TestNGConfigurationEditor.java | 4 +- .../uiDesigner/GuiDesignerConfigurable.java | 9 +- .../ConfigureClientPropertiesDialog.java | 9 +- .../quickFixes/QuickFixManager.java | 4 +- .../snapShooter/CreateSnapShotAction.java | 3 +- .../designer/DesignerToolWindowManager.java | 5 +- .../inspection/AbstractQuickFixManager.java | 10 +- .../propertyTable/actions/RestoreDefault.java | 6 +- .../propertyTable/actions/ShowJavadoc.java | 6 +- .../lang/xpath/completion/AxisLookup.java | 4 +- .../xpath/xslt/run/XsltRunSettingsEditor.java | 4 +- .../xsltDebugger/XsltDebuggerExtension.java | 4 +- .../ui/actions/OpenOutputAction.java | 6 +- resources/src/idea/JavaActions.xml | 7 +- .../highlighting/DomElementsErrorPanel.java | 4 +- .../xml/tree/actions/DeleteDomElement.java | 4 +- .../tree/actions/DomElementsToggleAction.java | 6 +- .../xml/ui/ErrorableTableCellRenderer.java | 4 +- .../daemon/impl/analysis/XmlNSRenderer.java | 8 +- .../ide/browsers/BrowsersConfiguration.java | 12 +- .../intellij/ide/highlighter/DTDFileType.java | 6 +- .../ide/highlighter/HtmlFileType.java | 6 +- .../ide/highlighter/XHtmlFileType.java | 6 +- .../intellij/ide/highlighter/XmlFileType.java | 6 +- .../javaee/ExternalResourceConfigurable.java | 4 +- .../intellij/xml/util/XmlIconProvider.java | 6 +- .../plugins/relaxNG/compact/RncFileType.java | 6 +- .../compact/psi/impl/RncDefineImpl.java | 4 +- .../relaxNG/convert/AdvancedDtdOptions.java | 4 +- .../annotation/OverriddenDefineRenderer.java | 6 +- .../annotation/OverridingDefineRenderer.java | 6 +- .../xml/dom/impl/RngDefineMetaData.java | 4 +- 497 files changed, 3278 insertions(+), 1615 deletions(-) create mode 100644 java/java-impl/src/com/intellij/internal/UsedIconsListingAction.java delete mode 100644 platform/icons/src/general/tab_white_left.png delete mode 100644 platform/icons/src/general/tab_white_right.png create mode 100644 platform/util/src/com/intellij/icons/AllIcons.java diff --git a/RegExpSupport/src/org/intellij/lang/regexp/RegExpFileType.java b/RegExpSupport/src/org/intellij/lang/regexp/RegExpFileType.java index 0cc8f8ba045c..7706c35acd10 100644 --- a/RegExpSupport/src/org/intellij/lang/regexp/RegExpFileType.java +++ b/RegExpSupport/src/org/intellij/lang/regexp/RegExpFileType.java @@ -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( diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java index 9824924fdc4d..16df24ec340d 100644 --- a/java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java +++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompilerErrorTreeView.java @@ -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); diff --git a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsPanel.java b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsPanel.java index dc5f2329b41d..aeea296ce192 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsPanel.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/AnnotationProcessorsPanel.java @@ -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()); } } diff --git a/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java b/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java index c0411cb544d5..136cbe8fc5b7 100644 --- a/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java +++ b/java/compiler/impl/src/com/intellij/compiler/options/CompilerConfigurable.java @@ -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; diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/InvalidArtifactType.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/InvalidArtifactType.java index ef483f9b54e4..c73a727b3801 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/InvalidArtifactType.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/InvalidArtifactType.java @@ -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); diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/PlainArtifactType.java b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/PlainArtifactType.java index b720824c04f3..77a7a47019cc 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/PlainArtifactType.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/artifacts/PlainArtifactType.java @@ -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() { diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/DirectoryCopyElementType.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/DirectoryCopyElementType.java index 1c709ea2d8c0..4db82e0cf771 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/DirectoryCopyElementType.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/DirectoryCopyElementType.java @@ -15,9 +15,11 @@ */ 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 { - 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"); diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/DirectoryElementType.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/DirectoryElementType.java index b13388013826..081cda1a0e06 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/DirectoryElementType.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/DirectoryElementType.java @@ -15,10 +15,10 @@ */ 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 { - 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")); diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ExtractedDirectoryElementType.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ExtractedDirectoryElementType.java index 833efd590b94..7b36993bba3e 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ExtractedDirectoryElementType.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ExtractedDirectoryElementType.java @@ -15,10 +15,10 @@ */ 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 { - 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"); diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/FileCopyElementType.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/FileCopyElementType.java index b793db96bf1c..bfdd5766270a 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/FileCopyElementType.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/FileCopyElementType.java @@ -15,10 +15,10 @@ */ 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 { - public static final Icon ICON = IconLoader.getIcon("/fileTypes/text.png"); + public static final Icon ICON = AllIcons.FileTypes.Text; FileCopyElementType() { super("file-copy", "File"); diff --git a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ProductionModuleOutputElementType.java b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ProductionModuleOutputElementType.java index 9545b365961e..3565c05aaa48 100644 --- a/java/compiler/impl/src/com/intellij/packaging/impl/elements/ProductionModuleOutputElementType.java +++ b/java/compiler/impl/src/com/intellij/packaging/impl/elements/ProductionModuleOutputElementType.java @@ -15,12 +15,12 @@ */ 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 getSuitableModules(ArtifactEditorContext context) { diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerSessionTab.java b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerSessionTab.java index fa8035a41846..251434eedaf8 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerSessionTab.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/DebuggerSessionTab.java @@ -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"), diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/FramesPanel.java b/java/debugger/impl/src/com/intellij/debugger/ui/FramesPanel.java index a1737263be12..dd6cf3705b68 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/FramesPanel.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/FramesPanel.java @@ -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; diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpoint.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpoint.java index 0d94431301fd..3ea7c83fc72d 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpoint.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/FieldBreakpoint.java @@ -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 CATEGORY = BreakpointCategory.lookup("field_breakpoints"); protected FieldBreakpoint(Project project) { diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/LineBreakpoint.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/LineBreakpoint.java index e3586870ec1e..9d0afabb4966 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/LineBreakpoint.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/LineBreakpoint.java @@ -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 CATEGORY = BreakpointCategory.lookup("line_breakpoints"); diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java index ae6e5d89b54d..d294620ad451 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/breakpoints/MethodBreakpoint.java @@ -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 CATEGORY = BreakpointCategory.lookup("method_breakpoints"); protected MethodBreakpoint(@NotNull Project project) { diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeRenderer.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeRenderer.java index f64ab3b15152..6864ab88c519 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeRenderer.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/DebuggerTreeRenderer.java @@ -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); diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/StackFrameDescriptorImpl.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/StackFrameDescriptorImpl.java index 5ed274b7aa35..6176f938aabb 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/StackFrameDescriptorImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/StackFrameDescriptorImpl.java @@ -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 +} diff --git a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/ThreadDescriptorImpl.java b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/ThreadDescriptorImpl.java index a35cc7e08e62..1279a75a08dd 100644 --- a/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/ThreadDescriptorImpl.java +++ b/java/debugger/impl/src/com/intellij/debugger/ui/impl/watch/ThreadDescriptorImpl.java @@ -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 +} diff --git a/java/execution/impl/src/com/intellij/compiler/options/CompileStepBeforeRun.java b/java/execution/impl/src/com/intellij/compiler/options/CompileStepBeforeRun.java index b4b7d42c9cfe..784d69332a3c 100644 --- a/java/execution/impl/src/com/intellij/compiler/options/CompileStepBeforeRun.java +++ b/java/execution/impl/src/com/intellij/compiler/options/CompileStepBeforeRun.java @@ -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 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 myEntriesChooser; private final JList myDependenciesList; diff --git a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectCreateModeStep.java b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectCreateModeStep.java index cd13249fd076..c507c78e8063 100644 --- a/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectCreateModeStep.java +++ b/java/idea-ui/src/com/intellij/ide/util/newProjectWizard/ProjectCreateModeStep.java @@ -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( - "" + buf.toString() + "", IconLoader.getIcon("/nodes/warningIntroduction.png"), + "" + buf.toString() + "", AllIcons.Nodes.WarningIntroduction, SwingConstants.LEFT ); note.setVisible(buf.length() > 0); diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/AnnotationsEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/AnnotationsEditor.java index 095957693162..0ec251b33936 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/AnnotationsEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/AnnotationsEditor.java @@ -15,12 +15,12 @@ */ 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); diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/BuildElementsEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/BuildElementsEditor.java index 3d8c45224ebf..6de8a78ec9ef 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/BuildElementsEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/BuildElementsEditor.java @@ -22,13 +22,13 @@ */ 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; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java index 606295598715..402317101fa6 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ClasspathEditor.java @@ -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; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ConfigurationErrorsComponent.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ConfigurationErrorsComponent.java index 47021b9899ad..521414f5cce3 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ConfigurationErrorsComponent.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ConfigurationErrorsComponent.java @@ -15,12 +15,12 @@ */ 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"; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavaContentRootPanel.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavaContentRootPanel.java index 5935e6571742..20703fd2e3f2 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavaContentRootPanel.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavaContentRootPanel.java @@ -15,11 +15,11 @@ */ 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); diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavadocEditor.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavadocEditor.java index e2b13dde6e5a..e88a023751ab 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavadocEditor.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/JavadocEditor.java @@ -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 +} diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java index 12ec4001e269..12a9d25524a1 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/ProjectConfigurable.java @@ -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 { - 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) { diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocOrderRootTypeUIFactory.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocOrderRootTypeUIFactory.java index a3ded8524382..5961de40005e 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocOrderRootTypeUIFactory.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/JavadocOrderRootTypeUIFactory.java @@ -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); diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/SourcesOrderRootTypeUIFactory.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/SourcesOrderRootTypeUIFactory.java index 4edc0f1a2ee8..baaf303d4051 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/SourcesOrderRootTypeUIFactory.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/SourcesOrderRootTypeUIFactory.java @@ -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)) { diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java index 4e80e946cc11..adcf1bc9eeac 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FacetStructureConfigurable.java @@ -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, FacetTypeEditor> myFacetTypeEditors = new HashMap, FacetTypeEditor>(); private MultipleFacetSettingsEditor myCurrentMultipleSettingsEditor; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FindUsagesInProjectStructureActionBase.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FindUsagesInProjectStructureActionBase.java index e69a0b88cc11..37557f985720 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FindUsagesInProjectStructureActionBase.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/FindUsagesInProjectStructureActionBase.java @@ -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; diff --git a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java index b275bcb66544..21fcacd3767d 100644 --- a/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java +++ b/java/idea-ui/src/com/intellij/openapi/roots/ui/configuration/projectRoot/ModuleStructureConfigurable.java @@ -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 NODE_COMPARATOR = new Comparator() { 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) { diff --git a/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java b/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java index 1b183c36d6de..8ab78f932376 100644 --- a/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java +++ b/java/java-impl/src/com/intellij/codeInsight/ExternalAnnotationsManagerImpl.java @@ -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> myExternalAnnotations = new ConcurrentWeakValueHashMap>(); diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java index 770606bfd372..bf7305100d6f 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/JavaLineMarkerProvider.java @@ -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; diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/RecursiveCallLineMarkerProvider.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/RecursiveCallLineMarkerProvider.java index cbc4dc935246..ce5130a9aff9 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/RecursiveCallLineMarkerProvider.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/RecursiveCallLineMarkerProvider.java @@ -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) { diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DelegateWithDefaultParamValueIntentionAction.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DelegateWithDefaultParamValueIntentionAction.java index 4348764edd35..984cee5c4f7d 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DelegateWithDefaultParamValueIntentionAction.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/DelegateWithDefaultParamValueIntentionAction.java @@ -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); diff --git a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RunRefactoringIntention.java b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RunRefactoringIntention.java index f35ecc3bf051..f053a18527b7 100644 --- a/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RunRefactoringIntention.java +++ b/java/java-impl/src/com/intellij/codeInsight/daemon/impl/quickfix/RunRefactoringIntention.java @@ -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; diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java b/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java index 3a4b690af4e5..8047c2579ffe 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java @@ -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(); diff --git a/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java b/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java index 0ca78f5850da..99e73041652c 100644 --- a/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java +++ b/java/java-impl/src/com/intellij/codeInspection/deadCode/UnusedDeclarationInspection.java @@ -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) { diff --git a/java/java-impl/src/com/intellij/codeInspection/ui/EntryPointsNode.java b/java/java-impl/src/com/intellij/codeInspection/ui/EntryPointsNode.java index 9fb69df6b7c6..524307ed1653 100644 --- a/java/java-impl/src/com/intellij/codeInspection/ui/EntryPointsNode.java +++ b/java/java-impl/src/com/intellij/codeInspection/ui/EntryPointsNode.java @@ -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(); diff --git a/java/java-impl/src/com/intellij/cyclicDependencies/ui/CyclicDependenciesPanel.java b/java/java-impl/src/com/intellij/cyclicDependencies/ui/CyclicDependenciesPanel.java index bda8c6b684fc..793e1e600022 100644 --- a/java/java-impl/src/com/intellij/cyclicDependencies/ui/CyclicDependenciesPanel.java +++ b/java/java-impl/src/com/intellij/cyclicDependencies/ui/CyclicDependenciesPanel.java @@ -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); } diff --git a/java/java-impl/src/com/intellij/ide/hierarchy/method/MethodHierarchyNodeDescriptor.java b/java/java-impl/src/com/intellij/ide/hierarchy/method/MethodHierarchyNodeDescriptor.java index feebc4a265f7..b712328b5921 100644 --- a/java/java-impl/src/com/intellij/ide/hierarchy/method/MethodHierarchyNodeDescriptor.java +++ b/java/java-impl/src/com/intellij/ide/hierarchy/method/MethodHierarchyNodeDescriptor.java @@ -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; diff --git a/java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java b/java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java index 770ae99bdf1b..93c2fb084d8d 100644 --- a/java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java +++ b/java/java-impl/src/com/intellij/ide/projectView/impl/PackageViewPane.java @@ -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) { diff --git a/java/java-impl/src/com/intellij/ide/structureView/impl/java/InheritedMembersFilter.java b/java/java-impl/src/com/intellij/ide/structureView/impl/java/InheritedMembersFilter.java index 566f15d23d68..b176cc00325d 100644 --- a/java/java-impl/src/com/intellij/ide/structureView/impl/java/InheritedMembersFilter.java +++ b/java/java-impl/src/com/intellij/ide/structureView/impl/java/InheritedMembersFilter.java @@ -15,12 +15,12 @@ */ 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 diff --git a/java/java-impl/src/com/intellij/ide/structureView/impl/java/JavaInheritedMembersNodeProvider.java b/java/java-impl/src/com/intellij/ide/structureView/impl/java/JavaInheritedMembersNodeProvider.java index ffcabf941e97..7ad89f99559f 100644 --- a/java/java-impl/src/com/intellij/ide/structureView/impl/java/JavaInheritedMembersNodeProvider.java +++ b/java/java-impl/src/com/intellij/ide/structureView/impl/java/JavaInheritedMembersNodeProvider.java @@ -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 diff --git a/java/java-impl/src/com/intellij/ide/structureView/impl/java/SuperTypeGroup.java b/java/java-impl/src/com/intellij/ide/structureView/impl/java/SuperTypeGroup.java index 0b74461b4f78..716e00450bbd 100644 --- a/java/java-impl/src/com/intellij/ide/structureView/impl/java/SuperTypeGroup.java +++ b/java/java-impl/src/com/intellij/ide/structureView/impl/java/SuperTypeGroup.java @@ -15,15 +15,15 @@ */ 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 myChildren = new ArrayList(); - 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, diff --git a/java/java-impl/src/com/intellij/ide/structureView/impl/java/SuperTypesGrouper.java b/java/java-impl/src/com/intellij/ide/structureView/impl/java/SuperTypesGrouper.java index 7fce7bfdf227..0f5a7589f6d6 100644 --- a/java/java-impl/src/com/intellij/ide/structureView/impl/java/SuperTypesGrouper.java +++ b/java/java-impl/src/com/intellij/ide/structureView/impl/java/SuperTypesGrouper.java @@ -15,10 +15,10 @@ */ 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 diff --git a/java/java-impl/src/com/intellij/ide/structureView/impl/java/VisibilitySorter.java b/java/java-impl/src/com/intellij/ide/structureView/impl/java/VisibilitySorter.java index 722c80e8ed4e..9b630b8fb824 100644 --- a/java/java-impl/src/com/intellij/ide/structureView/impl/java/VisibilitySorter.java +++ b/java/java-impl/src/com/intellij/ide/structureView/impl/java/VisibilitySorter.java @@ -15,10 +15,10 @@ */ 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"); diff --git a/java/java-impl/src/com/intellij/ide/util/FQNameCellRenderer.java b/java/java-impl/src/com/intellij/ide/util/FQNameCellRenderer.java index 671b12ab815d..6cffaa929563 100644 --- a/java/java-impl/src/com/intellij/ide/util/FQNameCellRenderer.java +++ b/java/java-impl/src/com/intellij/ide/util/FQNameCellRenderer.java @@ -15,10 +15,10 @@ */ 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(); diff --git a/java/java-impl/src/com/intellij/ide/util/PackageChooserDialog.java b/java/java-impl/src/com/intellij/ide/util/PackageChooserDialog.java index 1a861fe5d585..eb868511d269 100644 --- a/java/java-impl/src/com/intellij/ide/util/PackageChooserDialog.java +++ b/java/java-impl/src/com/intellij/ide/util/PackageChooserDialog.java @@ -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) { diff --git a/java/java-impl/src/com/intellij/ide/util/scopeChooser/GroupByScopeTypeAction.java b/java/java-impl/src/com/intellij/ide/util/scopeChooser/GroupByScopeTypeAction.java index a170e2d7014b..ecb5e7af5b58 100644 --- a/java/java-impl/src/com/intellij/ide/util/scopeChooser/GroupByScopeTypeAction.java +++ b/java/java-impl/src/com/intellij/ide/util/scopeChooser/GroupByScopeTypeAction.java @@ -20,10 +20,10 @@ */ 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 index 000000000000..de0054dae7c0 --- /dev/null +++ b/java/java-impl/src/com/intellij/internal/UsedIconsListingAction.java @@ -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 answer = new HashSet(); + final MultiMap calls = new MultiMap(); + + + Processor consumer = new Processor() { + @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() { + @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 sorted = new ArrayList(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 mappings = new HashMap(); + collectFields(allIcons, "", mappings); + + final JVMElementFactory factory = JVMElementFactories.getFactory(JavaLanguage.INSTANCE, project); + for (Map.Entry> 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 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()); + } + } +} + diff --git a/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java b/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java index 6bb5d1aad01e..e2a0a92fc422 100644 --- a/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java +++ b/java/java-impl/src/com/intellij/openapi/module/JavaModuleType.java @@ -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 { } 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 { } 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 { } 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() { diff --git a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java index 953b22827ad2..5e8b6dbf65e9 100644 --- a/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java +++ b/java/java-impl/src/com/intellij/openapi/projectRoots/impl/JavaSdkImpl.java @@ -16,13 +16,13 @@ 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 VERSION_STRINGS = new EnumMap(JavaSdkVersion.class); diff --git a/java/java-impl/src/com/intellij/packageDependencies/ui/LibraryNode.java b/java/java-impl/src/com/intellij/packageDependencies/ui/LibraryNode.java index fef1b6b4e63b..cdbbf5656beb 100644 --- a/java/java-impl/src/com/intellij/packageDependencies/ui/LibraryNode.java +++ b/java/java-impl/src/com/intellij/packageDependencies/ui/LibraryNode.java @@ -15,20 +15,20 @@ */ 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; diff --git a/java/java-impl/src/com/intellij/packageDependencies/ui/PackagePatternProvider.java b/java/java-impl/src/com/intellij/packageDependencies/ui/PackagePatternProvider.java index de6483ad38db..ee08aadbe295 100644 --- a/java/java-impl/src/com/intellij/packageDependencies/ui/PackagePatternProvider.java +++ b/java/java-impl/src/com/intellij/packageDependencies/ui/PackagePatternProvider.java @@ -20,13 +20,13 @@ */ 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 +} diff --git a/java/java-impl/src/com/intellij/packageDependencies/ui/TreeModelBuilder.java b/java/java-impl/src/com/intellij/packageDependencies/ui/TreeModelBuilder.java index 660215a8a929..cae9eb2b3df5 100644 --- a/java/java-impl/src/com/intellij/packageDependencies/ui/TreeModelBuilder.java +++ b/java/java-impl/src/com/intellij/packageDependencies/ui/TreeModelBuilder.java @@ -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"); diff --git a/java/java-impl/src/com/intellij/psi/impl/beanProperties/BeanProperty.java b/java/java-impl/src/com/intellij/psi/impl/beanProperties/BeanProperty.java index 0d3262ecc710..3826be4293b7 100644 --- a/java/java-impl/src/com/intellij/psi/impl/beanProperties/BeanProperty.java +++ b/java/java-impl/src/com/intellij/psi/impl/beanProperties/BeanProperty.java @@ -16,9 +16,11 @@ 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; diff --git a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java index 75e0946951f6..0d6d2b145f0b 100644 --- a/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java +++ b/java/java-impl/src/com/intellij/refactoring/encapsulateFields/EncapsulateFieldsDialog.java @@ -15,10 +15,10 @@ */ 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 { diff --git a/java/java-impl/src/com/intellij/slicer/CanItBeNullAction.java b/java/java-impl/src/com/intellij/slicer/CanItBeNullAction.java index 8ab184d66e97..1f2c28ccca4a 100644 --- a/java/java-impl/src/com/intellij/slicer/CanItBeNullAction.java +++ b/java/java-impl/src/com/intellij/slicer/CanItBeNullAction.java @@ -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; } diff --git a/java/java-impl/src/com/intellij/slicer/SlicePanel.java b/java/java-impl/src/com/intellij/slicer/SlicePanel.java index d7b822f1c024..29c97144e5cf 100644 --- a/java/java-impl/src/com/intellij/slicer/SlicePanel.java +++ b/java/java-impl/src/com/intellij/slicer/SlicePanel.java @@ -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); } diff --git a/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java b/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java index cd2a3ef3a05e..3b38008516db 100644 --- a/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java +++ b/java/java-impl/src/com/intellij/testIntegration/createTest/CreateTestDialog.java @@ -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); diff --git a/java/java-impl/src/com/intellij/unscramble/ThreadDumpPanel.java b/java/java-impl/src/com/intellij/unscramble/ThreadDumpPanel.java index f033a1a607d3..52501e77b291 100644 --- a/java/java-impl/src/com/intellij/unscramble/ThreadDumpPanel.java +++ b/java/java-impl/src/com/intellij/unscramble/ThreadDumpPanel.java @@ -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 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() { diff --git a/java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.java b/java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.java index bcae03df6b5a..176ae548f79d 100644 --- a/java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.java +++ b/java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.java @@ -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 +} diff --git a/java/java-psi-impl/src/com/intellij/ide/highlighter/JavaClassFileType.java b/java/java-psi-impl/src/com/intellij/ide/highlighter/JavaClassFileType.java index b2770da3ea50..eef4824cfbd1 100644 --- a/java/java-psi-impl/src/com/intellij/ide/highlighter/JavaClassFileType.java +++ b/java/java-psi-impl/src/com/intellij/ide/highlighter/JavaClassFileType.java @@ -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 +} diff --git a/java/java-psi-impl/src/com/intellij/ide/highlighter/JavaFileType.java b/java/java-psi-impl/src/com/intellij/ide/highlighter/JavaFileType.java index b4433553f6c7..e48525b725c4 100644 --- a/java/java-psi-impl/src/com/intellij/ide/highlighter/JavaFileType.java +++ b/java/java-psi-impl/src/com/intellij/ide/highlighter/JavaFileType.java @@ -15,10 +15,10 @@ */ 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 +} diff --git a/java/java-psi-impl/src/com/intellij/psi/impl/ElementPresentationUtil.java b/java/java-psi-impl/src/com/intellij/psi/impl/ElementPresentationUtil.java index 33de2b108a08..d1917a8bdcdb 100644 --- a/java/java-psi-impl/src/com/intellij/psi/impl/ElementPresentationUtil.java +++ b/java/java-psi-impl/src/com/intellij/psi/impl/ElementPresentationUtil.java @@ -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; diff --git a/java/openapi/src/com/intellij/codeInsight/NullableNotNullDialog.java b/java/openapi/src/com/intellij/codeInsight/NullableNotNullDialog.java index 979faaeef5d3..be97392947d0 100644 --- a/java/openapi/src/com/intellij/codeInsight/NullableNotNullDialog.java +++ b/java/openapi/src/com/intellij/codeInsight/NullableNotNullDialog.java @@ -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; diff --git a/platform/core-api/src/com/intellij/ide/highlighter/ArchiveFileType.java b/platform/core-api/src/com/intellij/ide/highlighter/ArchiveFileType.java index 86f90ca749a2..438fb52de9da 100644 --- a/platform/core-api/src/com/intellij/ide/highlighter/ArchiveFileType.java +++ b/platform/core-api/src/com/intellij/ide/highlighter/ArchiveFileType.java @@ -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 +} diff --git a/platform/core-api/src/com/intellij/openapi/fileTypes/UnknownFileType.java b/platform/core-api/src/com/intellij/openapi/fileTypes/UnknownFileType.java index 0b6b7ccac45a..6b71c76a5206 100644 --- a/platform/core-api/src/com/intellij/openapi/fileTypes/UnknownFileType.java +++ b/platform/core-api/src/com/intellij/openapi/fileTypes/UnknownFileType.java @@ -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(); diff --git a/platform/core-api/src/com/intellij/psi/impl/ElementBase.java b/platform/core-api/src/com/intellij/psi/impl/ElementBase.java index 3cd7c526a073..dd79fed1e8bc 100644 --- a/platform/core-api/src/com/intellij/psi/impl/ElementBase.java +++ b/platform/core-api/src/com/intellij/psi/impl/ElementBase.java @@ -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; } }; diff --git a/platform/core-api/src/com/intellij/util/PlatformIcons.java b/platform/core-api/src/com/intellij/util/PlatformIcons.java index 7de89de85ea8..c4f06f12415b 100644 --- a/platform/core-api/src/com/intellij/util/PlatformIcons.java +++ b/platform/core-api/src/com/intellij/util/PlatformIcons.java @@ -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; - Icon OPEN_EDIT_DIALOG_ICON = IconLoader.getIcon("/actions/showViewer.png"); - Icon FLATTEN_PACKAGES_ICON = IconLoader.getIcon("/objectBrowser/flattenPackages.png"); - Icon EDIT_IN_SECTION_ICON = IconLoader.getIcon("/general/editItemInSection.png"); - Icon TASK_ICON = IconLoader.getIcon("/ant/task.png"); - Icon CLASS_INITIALIZER = IconLoader.getIcon("/nodes/classInitializer.png"); + Icon OPEN_EDIT_DIALOG_ICON = AllIcons.Actions.ShowViewer; + Icon FLATTEN_PACKAGES_ICON = AllIcons.ObjectBrowser.FlattenPackages; + Icon EDIT_IN_SECTION_ICON = AllIcons.General.EditItemInSection; + Icon TASK_ICON = AllIcons.Ant.Task; + Icon CLASS_INITIALIZER = AllIcons.Nodes.ClassInitializer; - Icon OPENED_MODULE_GROUP_ICON = IconLoader.getIcon("/nodes/moduleGroupOpen.png"); - Icon CLOSED_MODULE_GROUP_ICON = IconLoader.getIcon("/nodes/moduleGroupClosed.png"); - Icon FOLDER_ICON = IconLoader.getIcon("/nodes/folder.png"); - Icon SOURCE_FOLDERS_ICON = IconLoader.getIcon("/nodes/sourceFolder.png"); - Icon TEST_SOURCE_FOLDER = IconLoader.getIcon("/nodes/testSourceFolder.png"); - Icon INVALID_ENTRY_ICON = IconLoader.getIcon("/nodes/ppInvalid.png"); + Icon OPENED_MODULE_GROUP_ICON = AllIcons.Nodes.ModuleGroupOpen; + Icon CLOSED_MODULE_GROUP_ICON = AllIcons.Nodes.ModuleGroupClosed; + Icon FOLDER_ICON = AllIcons.Nodes.Folder; + Icon SOURCE_FOLDERS_ICON = AllIcons.Nodes.SourceFolder; + Icon TEST_SOURCE_FOLDER = AllIcons.Nodes.TestSourceFolder; + Icon INVALID_ENTRY_ICON = AllIcons.Nodes.PpInvalid; - Icon MODULES_SOURCE_FOLDERS_ICON = IconLoader.getIcon("/modules/sourceRootClosed.png"); - Icon MODULES_TEST_SOURCE_FOLDER = IconLoader.getIcon("/modules/testRootClosed.png"); + Icon MODULES_SOURCE_FOLDERS_ICON = AllIcons.Modules.SourceRootClosed; + Icon MODULES_TEST_SOURCE_FOLDER = AllIcons.Modules.TestRootClosed; - Icon CONTENT_ROOT_ICON_OPEN = IconLoader.getIcon("/nodes/ModuleOpen.png"); - Icon CONTENT_ROOT_ICON_CLOSED = IconLoader.getIcon("/nodes/ModuleClosed.png"); + Icon CONTENT_ROOT_ICON_OPEN = AllIcons.Nodes.ModuleOpen; + Icon CONTENT_ROOT_ICON_CLOSED = AllIcons.Nodes.ModuleClosed; - Icon UP_DOWN_ARROWS = IconLoader.getIcon("/ide/upDown.png"); + Icon UP_DOWN_ARROWS = AllIcons.Ide.UpDown; - Icon COMBOBOX_ARROW_ICON = IconLoader.getIcon("/general/comboArrow.png"); + Icon COMBOBOX_ARROW_ICON = AllIcons.General.ComboArrow; - Icon EXPORT_ICON = IconLoader.getIcon("/toolbarDecorator/export.png"); - Icon IMPORT_ICON = IconLoader.getIcon("/toolbarDecorator/import.png"); + Icon EXPORT_ICON = AllIcons.ToolbarDecorator.Export; + Icon IMPORT_ICON = AllIcons.ToolbarDecorator.Import; - Icon SEPARATOR_HORIZONTAL_ICON = IconLoader.getIcon("/general/separatorH.png"); + Icon SEPARATOR_HORIZONTAL_ICON = AllIcons.General.SeparatorH; } diff --git a/platform/core-impl/src/com/intellij/openapi/fileTypes/PlainTextFileType.java b/platform/core-impl/src/com/intellij/openapi/fileTypes/PlainTextFileType.java index 2e74df7b20bf..abc3163e6b2d 100644 --- a/platform/core-impl/src/com/intellij/openapi/fileTypes/PlainTextFileType.java +++ b/platform/core-impl/src/com/intellij/openapi/fileTypes/PlainTextFileType.java @@ -15,14 +15,14 @@ */ package com.intellij.openapi.fileTypes; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import org.jetbrains.annotations.NotNull; import javax.swing.*; public class PlainTextFileType extends LanguageFileType { public static final PlainTextFileType INSTANCE = new PlainTextFileType(); - private static final Icon ICON = IconLoader.getIcon("/fileTypes/text.png"); + private static final Icon ICON = AllIcons.FileTypes.Text; private PlainTextFileType() { super(PlainTextLanguage.INSTANCE); @@ -50,4 +50,4 @@ public class PlainTextFileType extends LanguageFileType { public Icon getIcon() { return ICON; } -} \ No newline at end of file +} diff --git a/platform/icons/src/general/tab_white_left.png b/platform/icons/src/general/tab_white_left.png deleted file mode 100644 index 7b8982aa033715c4c9b5cf3e783721a80eca099e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^EI=&C0U`q)AH55tBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrH1%)q1)(hHykDN1ol_*s`!wu_0Ai{<7e4-hJtj60=2?t8f__ zY%pkj`pdY2NwSAWiAUkUp(7vo4<)4i;7@CE{l{n-AZYM-`qA~@|Cci^m9T3TH3q6v zFy-O#abQ#K`1s9Of5yhN&bV_M_dB?~eJw0pe?&Iz<^PC`@7p%+mt{CVSBvjo3tK4A OAq<|belF{r5}E*@y-oQ5 diff --git a/platform/icons/src/general/tab_white_right.png b/platform/icons/src/general/tab_white_right.png deleted file mode 100644 index 7702d005a837906bf3b5117d5cf0f0c99348adaf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^EI=&C0U`q)AH55tBuiW)N`mv#O3D+9QW+dm@{>{( zJaZG%Q-e|yQz{EjrrH1%HF&x>hHykD_tYKR(6~_V0q^CO&FALN=*xMM{Ad5nhb4b^ z|JL&1ahOm&Nt5S{Kw?5l!cX=jLj%JNe^`UhD6lEJJdvMpkVEL_zV3;QXPHhU{NM>a z^FeY6+lsk@Cm1BzQVb0Cu)a+GbLdZMr`%zwY5wuzH}`2LFudCR>o2!+&3|hKwLsM+ UK8Gfx0Nuji>FVdQ&MBb@0CCS%6#xJL diff --git a/platform/lang-api/src/com/intellij/codeInspection/SuppressIntentionAction.java b/platform/lang-api/src/com/intellij/codeInspection/SuppressIntentionAction.java index c5c1d5cfcd0d..ea0b47873d2e 100644 --- a/platform/lang-api/src/com/intellij/codeInspection/SuppressIntentionAction.java +++ b/platform/lang-api/src/com/intellij/codeInspection/SuppressIntentionAction.java @@ -21,10 +21,10 @@ package com.intellij.codeInspection; import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction; +import com.intellij.icons.AllIcons; import com.intellij.openapi.editor.CaretModel; 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.PsiElement; import com.intellij.psi.PsiFile; @@ -34,7 +34,7 @@ import org.jetbrains.annotations.NotNull; import javax.swing.*; public abstract class SuppressIntentionAction extends PsiElementBaseIntentionAction implements Iconable { - private static final Icon ICON = IconLoader.getIcon("/general/inspectionsOff.png"); + private static final Icon ICON = AllIcons.General.InspectionsOff; public void invoke(@NotNull final Project project, final Editor editor, final PsiFile file) throws IncorrectOperationException { final CaretModel caretModel = editor.getCaretModel(); @@ -50,4 +50,4 @@ public abstract class SuppressIntentionAction extends PsiElementBaseIntentionAct public Icon getIcon(int flags) { return ICON; } -} \ No newline at end of file +} diff --git a/platform/lang-api/src/com/intellij/execution/DefaultExecutionResult.java b/platform/lang-api/src/com/intellij/execution/DefaultExecutionResult.java index 1251e87e2f67..309c2191c451 100644 --- a/platform/lang-api/src/com/intellij/execution/DefaultExecutionResult.java +++ b/platform/lang-api/src/com/intellij/execution/DefaultExecutionResult.java @@ -17,14 +17,14 @@ package com.intellij.execution; import com.intellij.execution.process.ProcessHandler; import com.intellij.execution.ui.ExecutionConsole; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.project.DumbAware; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NotNull; -import java.util.List; import java.util.ArrayList; +import java.util.List; /** * @author dyoma @@ -83,7 +83,7 @@ public class DefaultExecutionResult implements ExecutionResult { private final ProcessHandler myProcessHandler; public StopAction(final ProcessHandler processHandler) { - super(ExecutionBundle.message("run.configuration.stop.action.name"), null, IconLoader.getIcon("/actions/suspend.png")); + super(ExecutionBundle.message("run.configuration.stop.action.name"), null, AllIcons.Actions.Suspend); getTemplatePresentation().setEnabled(false); myProcessHandler = processHandler; } diff --git a/platform/lang-api/src/com/intellij/execution/configurations/CommandLineState.java b/platform/lang-api/src/com/intellij/execution/configurations/CommandLineState.java index a8d12914c73d..7de2365cce5a 100644 --- a/platform/lang-api/src/com/intellij/execution/configurations/CommandLineState.java +++ b/platform/lang-api/src/com/intellij/execution/configurations/CommandLineState.java @@ -22,6 +22,7 @@ import com.intellij.execution.process.ProcessHandler; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.runners.ProgramRunner; import com.intellij.execution.ui.ConsoleView; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.Presentation; @@ -29,7 +30,6 @@ import com.intellij.openapi.actionSystem.ToggleAction; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.DumbAware; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -95,7 +95,7 @@ public abstract class CommandLineState implements RunnableState { private final ProcessHandler myProcessHandler; public PauseOutputAction(final ConsoleView console, final ProcessHandler processHandler) { - super(ExecutionBundle.message("run.configuration.pause.output.action.name"), null, IconLoader.getIcon("/actions/pause.png")); + super(ExecutionBundle.message("run.configuration.pause.output.action.name"), null, AllIcons.Actions.Pause); myConsole = console; myProcessHandler = processHandler; } diff --git a/platform/lang-api/src/com/intellij/execution/configurations/UnknownConfigurationType.java b/platform/lang-api/src/com/intellij/execution/configurations/UnknownConfigurationType.java index b4c7a4a1a2a1..9a86b783e389 100644 --- a/platform/lang-api/src/com/intellij/execution/configurations/UnknownConfigurationType.java +++ b/platform/lang-api/src/com/intellij/execution/configurations/UnknownConfigurationType.java @@ -16,7 +16,7 @@ package com.intellij.execution.configurations; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.openapi.project.Project; import org.jetbrains.annotations.NotNull; @@ -29,7 +29,7 @@ public class UnknownConfigurationType implements ConfigurationType { public static final UnknownConfigurationType INSTANCE = new UnknownConfigurationType(); - private static final Icon ICON = IconLoader.getIcon("/runConfigurations/unknown.png"); + private static final Icon ICON = AllIcons.RunConfigurations.Unknown; public static final String NAME = "Unknown"; public String getDisplayName() { diff --git a/platform/lang-api/src/com/intellij/execution/executors/DefaultRunExecutor.java b/platform/lang-api/src/com/intellij/execution/executors/DefaultRunExecutor.java index 7acf27492faf..8ba013dc13f0 100644 --- a/platform/lang-api/src/com/intellij/execution/executors/DefaultRunExecutor.java +++ b/platform/lang-api/src/com/intellij/execution/executors/DefaultRunExecutor.java @@ -19,7 +19,7 @@ package com.intellij.execution.executors; import com.intellij.execution.ExecutionBundle; import com.intellij.execution.Executor; import com.intellij.execution.ExecutorRegistry; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.openapi.wm.ToolWindowId; import com.intellij.ui.UIBundle; import org.jetbrains.annotations.NonNls; @@ -33,9 +33,9 @@ import javax.swing.*; public class DefaultRunExecutor extends Executor { @NonNls public static final String EXECUTOR_ID = ToolWindowId.RUN; - private static final Icon ICON = IconLoader.getIcon("/actions/execute.png"); - private static final Icon TOOLWINDOW_ICON = IconLoader.getIcon("/general/toolWindowRun.png"); - private static final Icon DISABLED_ICON = IconLoader.getIcon("/process/disabledRun.png"); + private static final Icon ICON = AllIcons.Actions.Execute; + private static final Icon TOOLWINDOW_ICON = AllIcons.General.ToolWindowRun; + private static final Icon DISABLED_ICON = AllIcons.Process.DisabledRun; @NotNull public String getStartActionText() { diff --git a/platform/lang-api/src/com/intellij/execution/ui/actions/CloseAction.java b/platform/lang-api/src/com/intellij/execution/ui/actions/CloseAction.java index f14b59c6728c..4c01de3fdd9f 100644 --- a/platform/lang-api/src/com/intellij/execution/ui/actions/CloseAction.java +++ b/platform/lang-api/src/com/intellij/execution/ui/actions/CloseAction.java @@ -19,10 +19,10 @@ import com.intellij.execution.ExecutionBundle; import com.intellij.execution.ExecutionManager; import com.intellij.execution.Executor; import com.intellij.execution.ui.RunContentDescriptor; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; public class CloseAction extends AnAction implements DumbAware { private RunContentDescriptor myContentDescriptor; @@ -35,7 +35,7 @@ public class CloseAction extends AnAction implements DumbAware { myProject = project; copyFrom(ActionManager.getInstance().getAction(IdeActions.ACTION_CLOSE)); final Presentation templatePresentation = getTemplatePresentation(); - templatePresentation.setIcon(IconLoader.getIcon("/actions/cancel.png")); + templatePresentation.setIcon(AllIcons.Actions.Cancel); templatePresentation.setText(ExecutionBundle.message("close.tab.action.name")); templatePresentation.setDescription(null); } diff --git a/platform/lang-api/src/com/intellij/openapi/projectRoots/impl/UnknownSdkType.java b/platform/lang-api/src/com/intellij/openapi/projectRoots/impl/UnknownSdkType.java index 866ea9a671ee..ace8598bc8d7 100644 --- a/platform/lang-api/src/com/intellij/openapi/projectRoots/impl/UnknownSdkType.java +++ b/platform/lang-api/src/com/intellij/openapi/projectRoots/impl/UnknownSdkType.java @@ -15,9 +15,9 @@ */ package com.intellij.openapi.projectRoots.impl; +import com.intellij.icons.AllIcons; import com.intellij.openapi.project.ProjectBundle; import com.intellij.openapi.projectRoots.*; -import com.intellij.openapi.util.IconLoader; import org.jdom.Element; import javax.swing.*; @@ -30,8 +30,8 @@ import java.util.Map; * Date: Dec 11, 2004 */ public class UnknownSdkType extends SdkType{ - public static final Icon ICON = IconLoader.getIcon("/nodes/unknownJdkClosed.png"); - private static final Icon JDK_ICON_EXPANDED = IconLoader.getIcon("/nodes/unknownJdkOpen.png"); + public static final Icon ICON = AllIcons.Nodes.UnknownJdkClosed; + private static final Icon JDK_ICON_EXPANDED = AllIcons.Nodes.UnknownJdkOpen; private static final Map ourTypeNameToInstanceMap = new HashMap(); /** diff --git a/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java b/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java index 6627c435541d..d120e3c0fd06 100644 --- a/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java +++ b/platform/lang-api/src/com/intellij/openapi/projectRoots/ui/PathEditor.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.projectRoots.ui; +import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -26,7 +27,6 @@ import com.intellij.openapi.fileChooser.FileChooserDialog; import com.intellij.openapi.fileTypes.FileTypes; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Computable; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.JarFileSystem; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VfsUtil; @@ -55,8 +55,8 @@ public class PathEditor { private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.projectRoots.ui.PathEditor"); public static final Color INVALID_COLOR = new Color(210, 0, 0); - private static final Icon ICON_INVALID = IconLoader.getIcon("/nodes/ppInvalid.png"); - private static final Icon ICON_EMPTY = IconLoader.getIcon("/nodes/emptyNode.png"); + private static final Icon ICON_INVALID = AllIcons.Nodes.PpInvalid; + private static final Icon ICON_EMPTY = AllIcons.Nodes.EmptyNode; protected JPanel myPanel; private JBList myList; diff --git a/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/DocumentationOrderRootTypeUIFactory.java b/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/DocumentationOrderRootTypeUIFactory.java index 1c0ec6cf198d..aa0cf2b1da1b 100644 --- a/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/DocumentationOrderRootTypeUIFactory.java +++ b/platform/lang-api/src/com/intellij/openapi/roots/ui/configuration/libraryEditor/DocumentationOrderRootTypeUIFactory.java @@ -15,11 +15,11 @@ */ package com.intellij.openapi.roots.ui.configuration.libraryEditor; +import com.intellij.icons.AllIcons; import com.intellij.openapi.project.ProjectBundle; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.projectRoots.ui.SdkPathEditor; import com.intellij.openapi.roots.ui.OrderRootTypeUIFactory; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -29,7 +29,7 @@ import javax.swing.*; */ public class DocumentationOrderRootTypeUIFactory implements OrderRootTypeUIFactory { - private static final Icon ICON = IconLoader.getIcon("/nodes/javaDocFolder.png"); + private static final Icon ICON = AllIcons.Nodes.JavaDocFolder; @Override @Nullable diff --git a/platform/lang-api/src/com/intellij/profile/Profile.java b/platform/lang-api/src/com/intellij/profile/Profile.java index 03062f7584f2..08e4584d58d9 100644 --- a/platform/lang-api/src/com/intellij/profile/Profile.java +++ b/platform/lang-api/src/com/intellij/profile/Profile.java @@ -15,8 +15,8 @@ */ package com.intellij.profile; +import com.intellij.icons.AllIcons; import com.intellij.openapi.options.Scheme; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.JDOMExternalizable; import org.jetbrains.annotations.NotNull; @@ -27,8 +27,8 @@ import javax.swing.*; * Date: 20-Nov-2005 */ public interface Profile extends JDOMExternalizable, Comparable, Scheme { - Icon LOCAL_PROFILE = IconLoader.getIcon("/general/applicationSettings.png"); - Icon PROJECT_PROFILE = IconLoader.getIcon("/general/projectSettings.png"); + Icon LOCAL_PROFILE = AllIcons.General.ApplicationSettings; + Icon PROJECT_PROFILE = AllIcons.General.ProjectSettings; void copyFrom(@NotNull Profile profile); diff --git a/platform/lang-api/src/com/intellij/psi/search/TodoAttributes.java b/platform/lang-api/src/com/intellij/psi/search/TodoAttributes.java index 7f7b74f6d08c..203387748448 100644 --- a/platform/lang-api/src/com/intellij/psi/search/TodoAttributes.java +++ b/platform/lang-api/src/com/intellij/psi/search/TodoAttributes.java @@ -15,10 +15,10 @@ */ package com.intellij.psi.search; +import com.intellij.icons.AllIcons; import com.intellij.openapi.editor.colors.CodeInsightColors; import com.intellij.openapi.editor.colors.EditorColorsManager; import com.intellij.openapi.editor.markup.TextAttributes; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.JDOMExternalizable; import com.intellij.openapi.util.WriteExternalException; @@ -31,9 +31,9 @@ import javax.swing.*; * @author Vladimir Kondratyev */ public class TodoAttributes implements JDOMExternalizable, Cloneable { - public static final Icon DEFAULT_ICON = IconLoader.getIcon("/general/todoDefault.png"); - public static final Icon QUESTION_ICON = IconLoader.getIcon("/general/todoQuestion.png"); - public static final Icon IMPORTANT_ICON = IconLoader.getIcon("/general/todoImportant.png"); + public static final Icon DEFAULT_ICON = AllIcons.General.TodoDefault; + public static final Icon QUESTION_ICON = AllIcons.General.TodoQuestion; + public static final Icon IMPORTANT_ICON = AllIcons.General.TodoImportant; private Icon myIcon; private TextAttributes myTextAttributes = new TextAttributes(); diff --git a/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/NamedScopeManager.java b/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/NamedScopeManager.java index 2471565ed7c5..5206ddab6a4d 100644 --- a/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/NamedScopeManager.java +++ b/platform/lang-api/src/com/intellij/psi/search/scope/packageSet/NamedScopeManager.java @@ -15,13 +15,13 @@ */ package com.intellij.psi.search.scope.packageSet; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.components.State; import com.intellij.openapi.components.Storage; import com.intellij.openapi.components.StoragePathMacros; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import javax.swing.*; @@ -33,7 +33,7 @@ import javax.swing.*; )} ) public class NamedScopeManager extends NamedScopesHolder { - private static final Icon LOCAL_SCOPES = IconLoader.getIcon("/ide/localScope.png"); + private static final Icon LOCAL_SCOPES = AllIcons.Ide.LocalScope; public NamedScopeManager(final Project project) { super(project); @@ -50,4 +50,4 @@ public class NamedScopeManager extends NamedScopesHolder { public Icon getIcon() { return LOCAL_SCOPES; } -} \ No newline at end of file +} diff --git a/platform/lang-impl/src/com/intellij/analysis/AnalysisUIOptions.java b/platform/lang-impl/src/com/intellij/analysis/AnalysisUIOptions.java index a63a730dab84..863999b03366 100644 --- a/platform/lang-impl/src/com/intellij/analysis/AnalysisUIOptions.java +++ b/platform/lang-impl/src/com/intellij/analysis/AnalysisUIOptions.java @@ -18,13 +18,12 @@ package com.intellij.analysis; import com.intellij.codeInspection.InspectionsBundle; import com.intellij.codeInspection.ui.InspectionResultsView; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.ToggleAction; import com.intellij.openapi.components.*; -import com.intellij.openapi.components.StoragePathMacros; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.AutoScrollToSourceHandler; import com.intellij.util.PlatformIcons; import com.intellij.util.xmlb.XmlSerializerUtil; @@ -91,7 +90,7 @@ public class AnalysisUIOptions implements PersistentStateComponent { myToolWindow = toolWindow == null ? toolWindowManagerEx.registerToolWindow(getToolwindowId(), true, ToolWindowAnchor.RIGHT, myProject) : toolWindow; - myToolWindow.setIcon(IconLoader.getIcon("/general/documentation.png")); + myToolWindow.setIcon(AllIcons.General.Documentation); myToolWindow.setAvailable(true, null); myToolWindow.setToHideOnEmptyContent(false); @@ -131,7 +131,7 @@ public abstract class DockablePopupManager { protected AnAction[] createActions() { return new AnAction[]{ new ToggleAction(getAutoUpdateTitle(), getAutoUpdateDescription(), - IconLoader.getIcon("/general/autoscrollFromSource.png")) { + AllIcons.General.AutoscrollFromSource) { @Override public boolean isSelected(AnActionEvent e) { return myAutoUpdateDocumentation; @@ -144,7 +144,7 @@ public abstract class DockablePopupManager { restartAutoUpdate(state); } }, - new AnAction("Restore Popup", getRestorePopupDescription(), IconLoader.getIcon("/actions/cancel.png")) { + new AnAction("Restore Popup", getRestorePopupDescription(), AllIcons.Actions.Cancel) { @Override public void actionPerformed(AnActionEvent e) { restorePopupBehavior(); diff --git a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java index d78a589e7ab3..6e94ec35d74d 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/documentation/DocumentationComponent.java @@ -20,8 +20,8 @@ import com.intellij.codeInsight.CodeInsightBundle; import com.intellij.codeInsight.hint.ElementLocationUtil; import com.intellij.codeInsight.hint.HintManagerImpl; import com.intellij.codeInsight.hint.HintUtil; +import com.intellij.icons.AllIcons; import com.intellij.ide.actions.ExternalJavaDocAction; -import com.intellij.ide.ui.UISettings; import com.intellij.lang.documentation.CompositeDocumentationProvider; import com.intellij.lang.documentation.DocumentationProvider; import com.intellij.lang.documentation.ExternalDocumentationHandler; @@ -37,7 +37,6 @@ import com.intellij.openapi.editor.ex.util.EditorUtil; import com.intellij.openapi.options.FontSize; import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.wm.ex.WindowManagerEx; import com.intellij.psi.PsiElement; @@ -561,7 +560,7 @@ public class DocumentationComponent extends JPanel implements Disposable, DataPr private class BackAction extends AnAction implements HintManagerImpl.ActionToIgnore { public BackAction() { - super(CodeInsightBundle.message("javadoc.action.back"), null, IconLoader.getIcon("/actions/back.png")); + super(CodeInsightBundle.message("javadoc.action.back"), null, AllIcons.Actions.Back); } public void actionPerformed(AnActionEvent e) { @@ -576,7 +575,7 @@ public class DocumentationComponent extends JPanel implements Disposable, DataPr private class ForwardAction extends AnAction implements HintManagerImpl.ActionToIgnore { public ForwardAction() { - super(CodeInsightBundle.message("javadoc.action.forward"), null, IconLoader.getIcon("/actions/forward.png")); + super(CodeInsightBundle.message("javadoc.action.forward"), null, AllIcons.Actions.Forward); } public void actionPerformed(AnActionEvent e) { @@ -591,7 +590,7 @@ public class DocumentationComponent extends JPanel implements Disposable, DataPr private class ExternalDocAction extends AnAction implements HintManagerImpl.ActionToIgnore { public ExternalDocAction() { - super(CodeInsightBundle.message("javadoc.action.view.external"), null, IconLoader.getIcon("/actions/browser-externalJavaDoc.png")); + super(CodeInsightBundle.message("javadoc.action.view.external"), null, AllIcons.Actions.Browser_externalJavaDoc); registerCustomShortcutSet(ActionManager.getInstance().getAction(IdeActions.ACTION_EXTERNAL_JAVADOC).getShortcutSet(), null); } @@ -746,7 +745,7 @@ public class DocumentationComponent extends JPanel implements Disposable, DataPr MyShowSettingsButton(AnAction action, Presentation presentation, String place, @NotNull Dimension minimumSize) { super(action, presentation, place, minimumSize); - myPresentation.setIcon(IconLoader.getIcon("/general/secondaryGroup.png")); + myPresentation.setIcon(AllIcons.General.SecondaryGroup); } public void hideSettings() { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/ElementLocationUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/ElementLocationUtil.java index 6349077970d8..70a0a47f6f4b 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hint/ElementLocationUtil.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/ElementLocationUtil.java @@ -16,11 +16,11 @@ package com.intellij.codeInsight.hint; -import com.intellij.openapi.module.ModuleType; -import com.intellij.openapi.util.IconLoader; -import com.intellij.openapi.vfs.VirtualFile; -import com.intellij.openapi.roots.*; +import com.intellij.icons.AllIcons; import com.intellij.openapi.module.Module; +import com.intellij.openapi.module.ModuleType; +import com.intellij.openapi.roots.*; +import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; @@ -28,7 +28,7 @@ import javax.swing.*; import java.util.List; public class ElementLocationUtil { - public static final Icon LIB_ICON_CLOSED = IconLoader.getIcon("/nodes/ppLibClosed.png");//TODO: Move to a more proper place + public static final Icon LIB_ICON_CLOSED = AllIcons.Nodes.PpLibClosed;//TODO: Move to a more proper place private ElementLocationUtil() { } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java index 45f2a1530a66..635ec2ad9d70 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/ImplementationViewComponent.java @@ -16,6 +16,7 @@ package com.intellij.codeInsight.hint; import com.intellij.codeInsight.CodeInsightBundle; +import com.intellij.icons.AllIcons; import com.intellij.ide.highlighter.HighlighterFactory; import com.intellij.ide.ui.ListCellRendererWrapper; import com.intellij.navigation.ItemPresentation; @@ -37,7 +38,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.ComboBox; import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.FileStatusManager; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; @@ -69,7 +69,7 @@ import java.util.Set; public class ImplementationViewComponent extends JPanel { @NonNls private static final String TEXT_PAGE_KEY = "Text"; @NonNls private static final String BINARY_PAGE_KEY = "Binary"; - private static final Icon FIND_ICON = IconLoader.getIcon("/actions/find.png"); + private static final Icon FIND_ICON = AllIcons.Actions.Find; private PsiElement[] myElements; private int myIndex; @@ -505,7 +505,7 @@ public class ImplementationViewComponent extends JPanel { private class BackAction extends AnAction implements HintManagerImpl.ActionToIgnore { public BackAction() { - super(CodeInsightBundle.message("quick.definition.back"), null, IconLoader.getIcon("/actions/back.png")); + super(CodeInsightBundle.message("quick.definition.back"), null, AllIcons.Actions.Back); } public void actionPerformed(AnActionEvent e) { @@ -521,7 +521,7 @@ public class ImplementationViewComponent extends JPanel { private class ForwardAction extends AnAction implements HintManagerImpl.ActionToIgnore { public ForwardAction() { - super(CodeInsightBundle.message("quick.definition.forward"), null, IconLoader.getIcon("/actions/forward.png")); + super(CodeInsightBundle.message("quick.definition.forward"), null, AllIcons.Actions.Forward); } public void actionPerformed(AnActionEvent e) { @@ -536,7 +536,7 @@ public class ImplementationViewComponent extends JPanel { private class EditSourceAction extends EditSourceActionBase { public EditSourceAction() { - super(true, IconLoader.getIcon("/actions/editSource.png"), CodeInsightBundle.message("quick.definition.edit.source")); + super(true, AllIcons.Actions.EditSource, CodeInsightBundle.message("quick.definition.edit.source")); } @Override public void actionPerformed(AnActionEvent e) { @@ -549,7 +549,7 @@ public class ImplementationViewComponent extends JPanel { private class ShowSourceAction extends EditSourceActionBase implements HintManagerImpl.ActionToIgnore { public ShowSourceAction() { - super(false, IconLoader.getIcon("/actions/showSource.png"), CodeInsightBundle.message("quick.definition.show.source")); + super(false, AllIcons.Actions.ShowSource, CodeInsightBundle.message("quick.definition.show.source")); } } diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/FileLevelIntentionComponent.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/FileLevelIntentionComponent.java index 89b8754f61d3..7250f6fecbbd 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/FileLevelIntentionComponent.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/FileLevelIntentionComponent.java @@ -21,11 +21,11 @@ import com.intellij.codeInsight.daemon.impl.SeverityRegistrar; import com.intellij.codeInsight.daemon.impl.ShowIntentionsPass; import com.intellij.codeInsight.intention.EmptyIntentionAction; import com.intellij.codeInsight.intention.IntentionAction; +import com.intellij.icons.AllIcons; import com.intellij.lang.annotation.HighlightSeverity; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.popup.JBPopupFactory; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiFile; @@ -42,8 +42,8 @@ import java.util.List; * @author max */ public class FileLevelIntentionComponent extends EditorNotificationPanel { - private static final Icon ourIntentionIcon = IconLoader.getIcon("/actions/intentionBulb.png"); - private static final Icon ourQuickFixIcon = IconLoader.getIcon("/actions/quickfixBulb.png"); + private static final Icon ourIntentionIcon = AllIcons.Actions.IntentionBulb; + private static final Icon ourQuickFixIcon = AllIcons.Actions.QuickfixBulb; private final Project myProject; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionHintComponent.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionHintComponent.java index fc1a2811b841..18778111ef20 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionHintComponent.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/IntentionHintComponent.java @@ -26,6 +26,7 @@ import com.intellij.codeInsight.hint.ScrollAwareHint; import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInsight.intention.impl.config.IntentionManagerSettings; import com.intellij.codeInsight.intention.impl.config.IntentionSettingsConfigurable; +import com.intellij.icons.AllIcons; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.IdeActions; @@ -45,7 +46,6 @@ import com.intellij.openapi.ui.popup.JBPopupListener; import com.intellij.openapi.ui.popup.LightweightWindowEvent; import com.intellij.openapi.ui.popup.ListPopup; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.psi.PsiFile; import com.intellij.refactoring.RefactoringBaseIntention; import com.intellij.ui.HintHint; @@ -79,13 +79,13 @@ import java.util.List; public class IntentionHintComponent extends JPanel implements Disposable, ScrollAwareHint { private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.intention.impl.IntentionHintComponent.ListPopupRunnable"); - static final Icon ourIntentionIcon = IconLoader.getIcon("/actions/realIntentionBulb.png"); - static final Icon ourBulbIcon = IconLoader.getIcon("/actions/intentionBulb.png"); - static final Icon ourQuickFixIcon = IconLoader.getIcon("/actions/quickfixBulb.png"); - static final Icon ourRefactoringBulbIcon = IconLoader.getIcon("/actions/refactoringBulb.png"); - static final Icon ourIntentionOffIcon = IconLoader.getIcon("/actions/realIntentionOffBulb.png"); - static final Icon ourQuickFixOffIcon = IconLoader.getIcon("/actions/quickfixOffBulb.png"); - static final Icon ourArrowIcon = IconLoader.getIcon("/general/arrowDown.png"); + static final Icon ourIntentionIcon = AllIcons.Actions.RealIntentionBulb; + static final Icon ourBulbIcon = AllIcons.Actions.IntentionBulb; + static final Icon ourQuickFixIcon = AllIcons.Actions.QuickfixBulb; + static final Icon ourRefactoringBulbIcon = AllIcons.Actions.RefactoringBulb; + static final Icon ourIntentionOffIcon = AllIcons.Actions.RealIntentionOffBulb; + static final Icon ourQuickFixOffIcon = AllIcons.Actions.QuickfixOffBulb; + static final Icon ourArrowIcon = AllIcons.General.ArrowDown; static final Icon ourInactiveArrowIcon = new EmptyIcon(ourArrowIcon.getIconWidth(), ourArrowIcon.getIconHeight()); private static final int NORMAL_BORDER_SIZE = 6; diff --git a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionSettingsConfigurable.java b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionSettingsConfigurable.java index 16023c1b8df5..f4e6c79d2ca9 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionSettingsConfigurable.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/intention/impl/config/IntentionSettingsConfigurable.java @@ -17,11 +17,11 @@ package com.intellij.codeInsight.intention.impl.config; import com.intellij.codeInsight.CodeInsightBundle; +import com.intellij.icons.AllIcons; import com.intellij.openapi.options.BaseConfigurable; import com.intellij.openapi.options.MasterDetails; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.ui.DetailsComponent; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -74,7 +74,7 @@ public class IntentionSettingsConfigurable extends BaseConfigurable implements S } public Icon getIcon() { - return IconLoader.getIcon("/general/configurableIntentionSettings.png"); + return AllIcons.General.ConfigurableIntentionSettings; } public void reset() { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java index f005cf441d56..2494d208a23a 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/lookup/impl/LookupImpl.java @@ -26,6 +26,7 @@ import com.intellij.codeInsight.hint.HintManager; import com.intellij.codeInsight.hint.HintManagerImpl; import com.intellij.codeInsight.lookup.*; import com.intellij.featureStatistics.FeatureUsageTracker; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeEventQueue; import com.intellij.ide.ui.UISettings; import com.intellij.lang.LangBundle; @@ -44,7 +45,10 @@ import com.intellij.openapi.keymap.KeymapUtil; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.ui.popup.JBPopupFactory; -import com.intellij.openapi.util.*; +import com.intellij.openapi.util.ActionCallback; +import com.intellij.openapi.util.Condition; +import com.intellij.openapi.util.Disposer; +import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtilRt; import com.intellij.openapi.wm.IdeFocusManager; @@ -88,8 +92,8 @@ import java.util.List; public class LookupImpl extends LightweightHint implements LookupEx, Disposable { private static final Logger LOG = Logger.getInstance("#com.intellij.codeInsight.lookup.impl.LookupImpl"); - private static final Icon relevanceSortIcon = IconLoader.getIcon("/ide/lookupRelevance.png"); - private static final Icon lexiSortIcon = IconLoader.getIcon("/ide/lookupAlphanumeric.png"); + private static final Icon relevanceSortIcon = AllIcons.Ide.LookupRelevance; + private static final Icon lexiSortIcon = AllIcons.Ide.LookupAlphanumeric; private final Project myProject; private final Editor myEditor; @@ -1419,7 +1423,7 @@ public class LookupImpl extends LightweightHint implements LookupEx, Disposable private LookupHint() { setOpaque(false); setBorder(INACTIVE_BORDER); - setIcon(IconLoader.findIcon("/actions/intentionBulb.png")); + setIcon(AllIcons.Actions.IntentionBulb); String acceleratorsText = KeymapUtil.getFirstKeyboardShortcutText( ActionManager.getInstance().getAction(IdeActions.ACTION_SHOW_INTENTION_ACTIONS)); if (acceleratorsText.length() > 0) { diff --git a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplatesConfigurable.java b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplatesConfigurable.java index 849a068423dc..68765876eb78 100644 --- a/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplatesConfigurable.java +++ b/platform/lang-impl/src/com/intellij/codeInsight/template/impl/LiveTemplatesConfigurable.java @@ -17,12 +17,12 @@ package com.intellij.codeInsight.template.impl; import com.intellij.codeInsight.CodeInsightBundle; +import com.intellij.icons.AllIcons; import com.intellij.openapi.options.BaseConfigurable; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -45,7 +45,7 @@ public class LiveTemplatesConfigurable extends BaseConfigurable implements Searc } public Icon getIcon() { - return IconLoader.getIcon("/general/liveTemplates.png"); + return AllIcons.General.LiveTemplates; } public void reset() { @@ -82,4 +82,4 @@ public class LiveTemplatesConfigurable extends BaseConfigurable implements Searc return myPanel; } -} \ No newline at end of file +} diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/DisableInspectionToolAction.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/DisableInspectionToolAction.java index 58d838130d32..df111cddda4f 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/DisableInspectionToolAction.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/DisableInspectionToolAction.java @@ -20,15 +20,14 @@ import com.intellij.CommonBundle; import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; import com.intellij.codeInsight.daemon.HighlightDisplayKey; import com.intellij.codeInsight.intention.IntentionAction; -import com.intellij.codeInsight.intention.LowPriorityAction; import com.intellij.codeInspection.InspectionProfile; import com.intellij.codeInspection.InspectionsBundle; import com.intellij.codeInspection.LocalInspectionTool; import com.intellij.codeInspection.ModifiableModel; +import com.intellij.icons.AllIcons; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Iconable; import com.intellij.profile.codeInspection.InspectionProjectProfileManager; import com.intellij.psi.PsiFile; @@ -41,7 +40,7 @@ import java.io.IOException; public class DisableInspectionToolAction implements IntentionAction, Iconable { private final String myToolId; public static final String NAME = InspectionsBundle.message("disable.inspection.action.name"); - private static final Icon ICON = IconLoader.getIcon("/actions/cancel.png"); + private static final Icon ICON = AllIcons.Actions.Cancel; public DisableInspectionToolAction(LocalInspectionTool tool) { myToolId = tool.getShortName(); diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/EditInspectionToolsSettingsAction.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/EditInspectionToolsSettingsAction.java index 30aebd1284da..a3fdefaf428d 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/EditInspectionToolsSettingsAction.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/EditInspectionToolsSettingsAction.java @@ -22,10 +22,10 @@ import com.intellij.codeInsight.intention.IntentionAction; import com.intellij.codeInspection.InspectionProfile; import com.intellij.codeInspection.InspectionsBundle; import com.intellij.codeInspection.LocalInspectionTool; +import com.intellij.icons.AllIcons; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.options.ShowSettingsUtil; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Iconable; import com.intellij.profile.codeInspection.InspectionProfileManager; import com.intellij.profile.codeInspection.InspectionProjectProfileManager; @@ -43,7 +43,7 @@ import javax.swing.*; */ public class EditInspectionToolsSettingsAction implements IntentionAction, Iconable, HighPriorityAction { private final String myShortName; - private static final Icon ICON = IconLoader.getIcon("/general/ideOptions.png"); + private static final Icon ICON = AllIcons.General.IdeOptions; public EditInspectionToolsSettingsAction(@NotNull LocalInspectionTool tool) { myShortName = tool.getShortName(); diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionManagerEx.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionManagerEx.java index 9a7f9bb8040e..093045ec662f 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionManagerEx.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/InspectionManagerEx.java @@ -24,11 +24,11 @@ package com.intellij.codeInspection.ex; import com.intellij.codeInspection.*; import com.intellij.codeInspection.lang.InspectionExtensionsFactory; +import com.intellij.icons.AllIcons; import com.intellij.ide.impl.ContentManagerWatcher; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.NotNullLazyValue; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.wm.ToolWindow; @@ -68,7 +68,7 @@ public class InspectionManagerEx extends InspectionManager { ToolWindow toolWindow = toolWindowManager.registerToolWindow(ToolWindowId.INSPECTION, true, ToolWindowAnchor.BOTTOM, myProject); ContentManager contentManager = toolWindow.getContentManager(); - toolWindow.setIcon(IconLoader.getIcon("/general/toolWindowInspection.png")); + toolWindow.setIcon(AllIcons.General.ToolWindowInspection); new ContentManagerWatcher(toolWindow, contentManager); return contentManager; } diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ex/QuickFixAction.java b/platform/lang-impl/src/com/intellij/codeInspection/ex/QuickFixAction.java index a862ec2997c8..84334d3e0256 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ex/QuickFixAction.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ex/QuickFixAction.java @@ -24,6 +24,7 @@ import com.intellij.codeInspection.reference.RefEntity; import com.intellij.codeInspection.reference.RefManagerImpl; import com.intellij.codeInspection.ui.InspectionResultsView; import com.intellij.codeInspection.ui.InspectionTree; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CustomShortcutSet; @@ -32,7 +33,6 @@ import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.ReadonlyStatusHandler; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; @@ -58,7 +58,7 @@ public class QuickFixAction extends AnAction { } protected QuickFixAction(String text, InspectionTool tool) { - this(text, IconLoader.getIcon("/actions/createFromUsage.png"), null, tool); + this(text, AllIcons.Actions.CreateFromUsage, null, tool); } protected QuickFixAction(String text, Icon icon, KeyStroke keyStroke, InspectionTool tool) { diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionNode.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionNode.java index 633c08da2c74..f3bdab06ee0c 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionNode.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionNode.java @@ -17,7 +17,7 @@ package com.intellij.codeInspection.ui; import com.intellij.codeInspection.ex.InspectionTool; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.ui.LayeredIcon; import com.intellij.util.IconUtil; @@ -31,7 +31,7 @@ public class InspectionNode extends InspectionTreeNode { public static final Icon TOOL; static { - TOOL = LayeredIcon.create(IconLoader.getIcon("/general/toolWindowInspection.png"), IconUtil.getEmptyIcon(false)); + TOOL = LayeredIcon.create(AllIcons.General.ToolWindowInspection, IconUtil.getEmptyIcon(false)); } public InspectionNode(InspectionTool tool) { diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java index 279babe97f02..f2c909fdeca4 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/InspectionResultsView.java @@ -29,6 +29,7 @@ import com.intellij.codeInspection.reference.RefEntity; import com.intellij.codeInspection.ui.actions.ExportHTMLAction; import com.intellij.codeInspection.ui.actions.InspectionsOptionsToolbarAction; import com.intellij.codeInspection.ui.actions.InvokeQuickFixAction; +import com.intellij.icons.AllIcons; import com.intellij.ide.*; import com.intellij.ide.actions.ContextHelpAction; import com.intellij.injected.editor.VirtualFileWindow; @@ -45,7 +46,6 @@ import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Splitter; import com.intellij.openapi.ui.popup.JBPopup; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.wm.ToolWindowId; @@ -55,7 +55,10 @@ import com.intellij.profile.codeInspection.InspectionProjectProfileManager; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; import com.intellij.psi.util.PsiUtilBase; -import com.intellij.ui.*; +import com.intellij.ui.PopupHandler; +import com.intellij.ui.ScrollPaneFactory; +import com.intellij.ui.SideBorder; +import com.intellij.ui.SmartExpander; import com.intellij.util.OpenSourceUtil; import com.intellij.util.ui.tree.TreeUtil; import org.jetbrains.annotations.NonNls; @@ -774,7 +777,7 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren private class CloseAction extends AnAction implements DumbAware { private CloseAction() { - super(CommonBundle.message("action.close"), null, IconLoader.getIcon("/actions/cancel.png")); + super(CommonBundle.message("action.close"), null, AllIcons.Actions.Cancel); } public void actionPerformed(AnActionEvent e) { @@ -784,7 +787,8 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren private class EditSettingsAction extends AnAction { private EditSettingsAction() { - super(InspectionsBundle.message("inspection.action.edit.settings"), InspectionsBundle.message("inspection.action.edit.settings"), IconLoader.getIcon("/general/ideOptions.png")); + super(InspectionsBundle.message("inspection.action.edit.settings"), InspectionsBundle.message("inspection.action.edit.settings"), + AllIcons.General.IdeOptions); } public void actionPerformed(AnActionEvent e) { @@ -819,7 +823,8 @@ public class InspectionResultsView extends JPanel implements Disposable, Occuren private class RerunAction extends AnAction { public RerunAction(JComponent comp) { - super(InspectionsBundle.message("inspection.action.rerun"), InspectionsBundle.message("inspection.action.rerun"), IconLoader.getIcon("/actions/refreshUsages.png")); + super(InspectionsBundle.message("inspection.action.rerun"), InspectionsBundle.message("inspection.action.rerun"), + AllIcons.Actions.RefreshUsages); registerCustomShortcutSet(CommonShortcuts.getRerun(), comp); } diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/ProblemDescriptionNode.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/ProblemDescriptionNode.java index 0dae656923cc..4c5437ccab0c 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ui/ProblemDescriptionNode.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/ProblemDescriptionNode.java @@ -24,7 +24,7 @@ import com.intellij.codeInspection.ex.DescriptorProviderInspection; import com.intellij.codeInspection.ex.ProblemDescriptorImpl; import com.intellij.codeInspection.reference.RefElement; import com.intellij.codeInspection.reference.RefEntity; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.FileStatus; @@ -38,9 +38,9 @@ import javax.swing.*; * @author max */ public class ProblemDescriptionNode extends InspectionTreeNode { - private static final Icon INFO = IconLoader.getIcon("/compiler/information.png"); - private static final Icon ERROR = IconLoader.getIcon("/compiler/error.png"); - private static final Icon WARNING = IconLoader.getIcon("/compiler/warning.png"); + private static final Icon INFO = AllIcons.Compiler.Information; + private static final Icon ERROR = AllIcons.Compiler.Error; + private static final Icon WARNING = AllIcons.Compiler.Warning; protected RefEntity myElement; private final CommonProblemDescriptor myDescriptor; protected final DescriptorProviderInspection myTool; diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/actions/ExportHTMLAction.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/actions/ExportHTMLAction.java index baa320e5d0e4..8edfa738e7aa 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ui/actions/ExportHTMLAction.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/actions/ExportHTMLAction.java @@ -32,6 +32,7 @@ import com.intellij.codeInspection.ui.InspectionNode; import com.intellij.codeInspection.ui.InspectionResultsView; import com.intellij.codeInspection.ui.InspectionTreeNode; import com.intellij.codeInspection.util.RefEntityAlphabeticalComparator; +import com.intellij.icons.AllIcons; import com.intellij.ide.BrowserUtil; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -47,7 +48,6 @@ import com.intellij.openapi.ui.popup.ListPopup; 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.JDOMUtil; import com.intellij.psi.codeStyle.CodeStyleSettingsManager; import com.intellij.util.ui.tree.TreeUtil; @@ -71,7 +71,7 @@ public class ExportHTMLAction extends AnAction implements DumbAware { @NonNls private static final String XML = "XML"; public ExportHTMLAction(final InspectionResultsView view) { - super(InspectionsBundle.message("inspection.action.export.html"), null, IconLoader.getIcon("/actions/export.png")); + super(InspectionsBundle.message("inspection.action.export.html"), null, AllIcons.Actions.Export); myView = view; } diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/actions/InspectionsOptionsToolbarAction.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/actions/InspectionsOptionsToolbarAction.java index f730d0eb5a08..e296b5bf4a30 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ui/actions/InspectionsOptionsToolbarAction.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/actions/InspectionsOptionsToolbarAction.java @@ -8,13 +8,13 @@ import com.intellij.codeInspection.InspectionsBundle; import com.intellij.codeInspection.ModifiableModel; import com.intellij.codeInspection.actions.RunInspectionIntention; import com.intellij.codeInspection.ex.DisableInspectionToolAction; -import com.intellij.codeInspection.ex.InspectionManagerEx; import com.intellij.codeInspection.ex.InspectionProfileImpl; import com.intellij.codeInspection.ex.InspectionTool; import com.intellij.codeInspection.reference.RefElement; import com.intellij.codeInspection.reference.RefEntity; import com.intellij.codeInspection.ui.InspectionResultsView; import com.intellij.codeInspection.ui.InspectionTree; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.DataContext; @@ -24,7 +24,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.ui.popup.ListPopup; -import com.intellij.openapi.util.IconLoader; import com.intellij.profile.codeInspection.InspectionProjectProfileManager; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.Nullable; @@ -44,7 +43,7 @@ public class InspectionsOptionsToolbarAction extends AnAction { private final InspectionResultsView myView; public InspectionsOptionsToolbarAction(final InspectionResultsView view) { - super(getToolOptions(null), getToolOptions(null), IconLoader.getIcon("/general/inspectionsOff.png")); + super(getToolOptions(null), getToolOptions(null), AllIcons.General.InspectionsOff); myView = view; } diff --git a/platform/lang-impl/src/com/intellij/codeInspection/ui/actions/InvokeQuickFixAction.java b/platform/lang-impl/src/com/intellij/codeInspection/ui/actions/InvokeQuickFixAction.java index f851b050b5a4..1718797f1c9c 100644 --- a/platform/lang-impl/src/com/intellij/codeInspection/ui/actions/InvokeQuickFixAction.java +++ b/platform/lang-impl/src/com/intellij/codeInspection/ui/actions/InvokeQuickFixAction.java @@ -21,11 +21,11 @@ import com.intellij.codeInspection.ex.InspectionRVContentProvider; import com.intellij.codeInspection.ex.InspectionTool; import com.intellij.codeInspection.ex.QuickFixAction; import com.intellij.codeInspection.ui.InspectionResultsView; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.ui.popup.ListPopup; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -40,7 +40,8 @@ public class InvokeQuickFixAction extends AnAction { private final InspectionResultsView myView; public InvokeQuickFixAction(final InspectionResultsView view) { - super(InspectionsBundle.message("inspection.action.apply.quickfix"), InspectionsBundle.message("inspection.action.apply.quickfix.description"), IconLoader.getIcon("/actions/createFromUsage.png")); + super(InspectionsBundle.message("inspection.action.apply.quickfix"), InspectionsBundle.message("inspection.action.apply.quickfix.description"), + AllIcons.Actions.CreateFromUsage); myView = view; registerCustomShortcutSet(ActionManager.getInstance().getAction(IdeActions.ACTION_SHOW_INTENTION_ACTIONS).getShortcutSet(), myView.getTree()); diff --git a/platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java b/platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java index d9902bc11e83..1b57ba7b0df4 100644 --- a/platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java +++ b/platform/lang-impl/src/com/intellij/execution/ProgramRunnerUtil.java @@ -23,6 +23,7 @@ import com.intellij.execution.impl.RunManagerImpl; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.runners.ExecutionUtil; import com.intellij.execution.runners.ProgramRunner; +import com.intellij.icons.AllIcons; import com.intellij.internal.statistic.UsageTrigger; import com.intellij.internal.statistic.beans.ConvertUsagesUtil; import com.intellij.openapi.diagnostic.Logger; @@ -40,7 +41,7 @@ import javax.swing.*; */ public class ProgramRunnerUtil { private static final Logger LOG = Logger.getInstance("#com.intellij.execution.ProgramRunnerUtil"); - private static final Icon INVALID_CONFIGURATION = IconLoader.getIcon("/runConfigurations/invalidConfigurationLayer.png"); + private static final Icon INVALID_CONFIGURATION = AllIcons.RunConfigurations.InvalidConfigurationLayer; private ProgramRunnerUtil() { } diff --git a/platform/lang-impl/src/com/intellij/execution/RunContentExecutor.java b/platform/lang-impl/src/com/intellij/execution/RunContentExecutor.java index 9f98e18a7b65..a7f1481da89a 100644 --- a/platform/lang-impl/src/com/intellij/execution/RunContentExecutor.java +++ b/platform/lang-impl/src/com/intellij/execution/RunContentExecutor.java @@ -10,12 +10,12 @@ import com.intellij.execution.process.ProcessHandler; import com.intellij.execution.ui.ConsoleView; import com.intellij.execution.ui.RunContentDescriptor; import com.intellij.execution.ui.actions.CloseAction; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.wm.ToolWindowId; import com.intellij.openapi.wm.ToolWindowManager; @@ -141,7 +141,7 @@ public class RunContentExecutor { private class RerunAction extends AnAction implements DumbAware { public RerunAction(JComponent consolePanel) { super("Rerun", "Rerun", - IconLoader.getIcon("/actions/refreshUsages.png")); + AllIcons.Actions.RefreshUsages); registerCustomShortcutSet(CommonShortcuts.getRerun(), consolePanel); } diff --git a/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java b/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java index 91fe8164e25b..935bfcfa2627 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/ChooseRunConfigurationAction.java @@ -25,6 +25,7 @@ import com.intellij.execution.impl.RunDialog; import com.intellij.execution.impl.RunnerAndConfigurationSettingsImpl; import com.intellij.execution.junit.RuntimeConfigurationProducer; import com.intellij.execution.runners.ProgramRunner; +import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.ide.util.PropertiesComponent; import com.intellij.openapi.actionSystem.*; @@ -34,7 +35,6 @@ import com.intellij.openapi.ui.popup.ListPopupStep; import com.intellij.openapi.ui.popup.ListSeparator; import com.intellij.openapi.ui.popup.PopupStep; import com.intellij.openapi.ui.popup.util.BaseListPopupStep; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.wm.ToolWindowId; import com.intellij.ui.popup.list.ListPopupImpl; import com.intellij.ui.popup.list.PopupListElementRenderer; @@ -53,8 +53,8 @@ import java.util.List; * @author spleaner */ public class ChooseRunConfigurationAction extends AnAction { - private static final Icon EDIT_ICON = IconLoader.getIcon("/actions/editSource.png"); - private static final Icon SAVE_ICON = IconLoader.getIcon("/runConfigurations/saveTempConfig.png"); + private static final Icon EDIT_ICON = AllIcons.Actions.EditSource; + private static final Icon SAVE_ICON = AllIcons.RunConfigurations.SaveTempConfig; private Executor myCurrentExecutor; private boolean myEditConfiguration; diff --git a/platform/lang-impl/src/com/intellij/execution/actions/EditRunConfigurationsAction.java b/platform/lang-impl/src/com/intellij/execution/actions/EditRunConfigurationsAction.java index 232036ed3d7d..472cac3ba4c8 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/EditRunConfigurationsAction.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/EditRunConfigurationsAction.java @@ -18,17 +18,17 @@ package com.intellij.execution.actions; import com.intellij.execution.ExecutionBundle; import com.intellij.execution.impl.EditConfigurationsDialog; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.LayeredIcon; import com.intellij.util.ui.EmptyIcon; public class EditRunConfigurationsAction extends AnAction{ public EditRunConfigurationsAction() { LayeredIcon icon = new LayeredIcon(2); - icon.setIcon(IconLoader.getIcon("/actions/editSource.png"),0,2,2); + icon.setIcon(AllIcons.Actions.EditSource,0,2,2); icon.setIcon(EmptyIcon.ICON_18, 1); getTemplatePresentation().setIcon(icon); } diff --git a/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationAction.java b/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationAction.java index 68e4b437a954..44a934ee0e2a 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationAction.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/RunConfigurationAction.java @@ -22,6 +22,7 @@ import com.intellij.execution.RunManagerEx; import com.intellij.execution.RunnerAndConfigurationSettings; import com.intellij.execution.configurations.ConfigurationType; import com.intellij.execution.configurations.RunConfiguration; +import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.actionSystem.ex.ComboBoxAction; @@ -30,7 +31,6 @@ import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.DumbService; import com.intellij.openapi.project.IndexNotReadyException; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Key; import com.intellij.openapi.wm.IdeFrame; import com.intellij.util.ui.UIUtil; @@ -177,7 +177,7 @@ public class RunConfigurationAction extends ComboBoxAction implements DumbAware } private static class SaveTemporaryAction extends AnAction { - private static final Icon ICON = IconLoader.getIcon("/runConfigurations/saveTempConfig.png"); + private static final Icon ICON = AllIcons.RunConfigurations.SaveTempConfig; public SaveTemporaryAction() { Presentation presentation = getTemplatePresentation(); diff --git a/platform/lang-impl/src/com/intellij/execution/actions/StopAction.java b/platform/lang-impl/src/com/intellij/execution/actions/StopAction.java index ddfa286e16e3..1c9dbe0faddc 100644 --- a/platform/lang-impl/src/com/intellij/execution/actions/StopAction.java +++ b/platform/lang-impl/src/com/intellij/execution/actions/StopAction.java @@ -21,13 +21,13 @@ import com.intellij.execution.KillableProcess; import com.intellij.execution.process.ProcessHandler; import com.intellij.execution.ui.RunContentDescriptor; import com.intellij.execution.ui.RunContentManager; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.ui.popup.PopupChooserBuilder; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.components.JBList; import com.intellij.util.NotNullFunction; import org.jetbrains.annotations.NotNull; @@ -40,7 +40,7 @@ import java.util.Collections; import java.util.List; public class StopAction extends DumbAwareAction implements AnAction.TransparentUpdate { - public static final Icon KILL_PROCESS_ICON = IconLoader.getIcon("/debugger/killProcess.png"); + public static final Icon KILL_PROCESS_ICON = AllIcons.Debugger.KillProcess; public void actionPerformed(final AnActionEvent e) { final DataContext dataContext = e.getDataContext(); diff --git a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java index ea170ee52d31..e87a6cf4d699 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/ConsoleViewImpl.java @@ -26,6 +26,7 @@ import com.intellij.execution.process.ProcessHandler; import com.intellij.execution.ui.ConsoleView; import com.intellij.execution.ui.ConsoleViewContentType; import com.intellij.execution.ui.ObservableConsoleView; +import com.intellij.icons.AllIcons; import com.intellij.ide.CommonActionsManager; import com.intellij.ide.OccurenceNavigator; import com.intellij.openapi.Disposable; @@ -1070,7 +1071,7 @@ public class ConsoleViewImpl extends JPanel implements ConsoleView, ObservableCo public static class ClearAllAction extends DumbAwareAction { public ClearAllAction() { - super(ExecutionBundle.message("clear.all.from.console.action.name"), "Clear the contents of the console", IconLoader.findIcon("/actions/gc.png")); + super(ExecutionBundle.message("clear.all.from.console.action.name"), "Clear the contents of the console", AllIcons.Actions.GC); } @Override diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java index 1d20640a7930..40f5bdd3cca1 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurable.java @@ -19,6 +19,7 @@ package com.intellij.execution.impl; import com.intellij.execution.*; import com.intellij.execution.configuration.ConfigurationFactoryEx; import com.intellij.execution.configurations.*; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.options.*; @@ -31,7 +32,6 @@ import com.intellij.openapi.ui.popup.ListPopupStep; 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.wm.IdeFocusManager; import com.intellij.ui.*; import com.intellij.ui.components.JBScrollPane; @@ -65,11 +65,11 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; class RunConfigurable extends BaseConfigurable { - private static final Icon ICON = IconLoader.getIcon("/general/configurableRunDebug.png"); + private static final Icon ICON = AllIcons.General.ConfigurableRunDebug; private static final Icon ADD_ICON = IconUtil.getAddIcon(); private static final Icon REMOVE_ICON = IconUtil.getRemoveIcon(); - private static final Icon SAVE_ICON = IconLoader.getIcon("/runConfigurations/saveTempConfig.png"); - private static final Icon EDIT_DEFAULTS_ICON = IconLoader.getIcon("/general/ideOptions.png"); + private static final Icon SAVE_ICON = AllIcons.RunConfigurations.SaveTempConfig; + private static final Icon EDIT_DEFAULTS_ICON = AllIcons.General.IdeOptions; @NonNls private static final String DIVIDER_PROPORTION = "dividerProportion"; private volatile boolean isDisposed = false; diff --git a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationBeforeRunProvider.java b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationBeforeRunProvider.java index 5aa825b75ca8..01a466737a06 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationBeforeRunProvider.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/RunConfigurationBeforeRunProvider.java @@ -25,13 +25,13 @@ import com.intellij.execution.process.ProcessHandler; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.runners.ProgramRunner; import com.intellij.execution.ui.RunContentDescriptor; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Key; import com.intellij.ui.ColoredListCellRenderer; import com.intellij.ui.SimpleTextAttributes; @@ -56,7 +56,7 @@ import java.util.List; */ public class RunConfigurationBeforeRunProvider extends BeforeRunTaskProvider { - private static final Icon ICON = IconLoader.getIcon("/actions/execute.png"); + private static final Icon ICON = AllIcons.Actions.Execute; public static final Key ID = Key.create("RunConfigurationTask"); diff --git a/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java b/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java index 957597304bcc..5a8a8e7c13b1 100644 --- a/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java +++ b/platform/lang-impl/src/com/intellij/execution/impl/SingleConfigurationConfigurable.java @@ -19,12 +19,12 @@ package com.intellij.execution.impl; import com.intellij.execution.*; import com.intellij.execution.configurations.*; import com.intellij.execution.runners.ProgramRunner; +import com.intellij.icons.AllIcons; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.options.SettingsEditorConfigurable; import com.intellij.openapi.options.SettingsEditorListener; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.DocumentAdapter; import org.jetbrains.annotations.NonNls; @@ -220,14 +220,14 @@ public final class SingleConfigurationConfigurable myProgramParametersComponent; private LabeledComponent myWorkingDirectoryComponent; diff --git a/platform/lang-impl/src/com/intellij/execution/ui/layout/actions/CloseViewAction.java b/platform/lang-impl/src/com/intellij/execution/ui/layout/actions/CloseViewAction.java index 54ccf41abb3b..5f6260f7aa1e 100644 --- a/platform/lang-impl/src/com/intellij/execution/ui/layout/actions/CloseViewAction.java +++ b/platform/lang-impl/src/com/intellij/execution/ui/layout/actions/CloseViewAction.java @@ -18,15 +18,15 @@ package com.intellij.execution.ui.layout.actions; import com.intellij.execution.ui.actions.BaseViewAction; import com.intellij.execution.ui.layout.ViewContext; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.content.Content; import javax.swing.*; public class CloseViewAction extends BaseViewAction { - private static final Icon ICON = IconLoader.getIcon("/actions/closeNew.png"); - private static final Icon HOVERED_ICON = IconLoader.getIcon("/actions/closeNewHovered.png"); + private static final Icon ICON = AllIcons.Actions.CloseNew; + private static final Icon HOVERED_ICON = AllIcons.Actions.CloseNewHovered; protected void update(final AnActionEvent e, final ViewContext context, final Content[] content) { setEnabled(e, isEnabled(content)); @@ -46,4 +46,4 @@ public class CloseViewAction extends BaseViewAction { return content.length == 1 && content[0].isCloseable(); } -} \ No newline at end of file +} diff --git a/platform/lang-impl/src/com/intellij/execution/ui/layout/actions/MinimizeViewAction.java b/platform/lang-impl/src/com/intellij/execution/ui/layout/actions/MinimizeViewAction.java index 874e8e5609f8..259d6add0871 100644 --- a/platform/lang-impl/src/com/intellij/execution/ui/layout/actions/MinimizeViewAction.java +++ b/platform/lang-impl/src/com/intellij/execution/ui/layout/actions/MinimizeViewAction.java @@ -16,18 +16,18 @@ package com.intellij.execution.ui.layout.actions; +import com.intellij.execution.ui.actions.BaseViewAction; import com.intellij.execution.ui.layout.Tab; import com.intellij.execution.ui.layout.ViewContext; -import com.intellij.execution.ui.actions.BaseViewAction; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.content.Content; import javax.swing.*; public class MinimizeViewAction extends BaseViewAction { - private static final Icon ICON = IconLoader.getIcon("/actions/move-to-button.png"); - private static final Icon ICON_TOP = IconLoader.getIcon("/actions/move-to-button-top.png"); + private static final Icon ICON = AllIcons.Actions.Move_to_button; + private static final Icon ICON_TOP = AllIcons.Actions.Move_to_button_top; protected void update(final AnActionEvent e, final ViewContext context, final Content[] content) { setEnabled(e, isEnabled(context, content, e.getPlace())); diff --git a/platform/lang-impl/src/com/intellij/facet/impl/invalid/InvalidFacetEditor.java b/platform/lang-impl/src/com/intellij/facet/impl/invalid/InvalidFacetEditor.java index 6011226a5e3b..67fa48513fb4 100644 --- a/platform/lang-impl/src/com/intellij/facet/impl/invalid/InvalidFacetEditor.java +++ b/platform/lang-impl/src/com/intellij/facet/impl/invalid/InvalidFacetEditor.java @@ -17,8 +17,8 @@ package com.intellij.facet.impl.invalid; import com.intellij.facet.ui.FacetEditorContext; import com.intellij.facet.ui.FacetEditorTab; +import com.intellij.icons.AllIcons; import com.intellij.openapi.ui.ex.MultiLineLabel; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.Nls; import javax.swing.*; @@ -53,7 +53,7 @@ public class InvalidFacetEditor extends FacetEditorTab { @Override public JComponent createComponent() { - myIconLabel.setIcon(IconLoader.getIcon("/runConfigurations/configurationWarning.png")); + myIconLabel.setIcon(AllIcons.RunConfigurations.ConfigurationWarning); myDescriptionLabel.setText(myErrorMessage); return myMainPanel; } diff --git a/platform/lang-impl/src/com/intellij/facet/impl/invalid/InvalidFacetType.java b/platform/lang-impl/src/com/intellij/facet/impl/invalid/InvalidFacetType.java index 5c873bde6a18..262247ea3bac 100644 --- a/platform/lang-impl/src/com/intellij/facet/impl/invalid/InvalidFacetType.java +++ b/platform/lang-impl/src/com/intellij/facet/impl/invalid/InvalidFacetType.java @@ -20,11 +20,11 @@ import com.intellij.facet.FacetType; import com.intellij.facet.FacetTypeId; import com.intellij.facet.ui.FacetEditor; import com.intellij.facet.ui.MultipleFacetSettingsEditor; +import com.intellij.icons.AllIcons; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -35,7 +35,7 @@ import javax.swing.*; */ public class InvalidFacetType extends FacetType { public static final FacetTypeId TYPE_ID = new FacetTypeId("invalid"); - public static final Icon ICON = IconLoader.getIcon("/fileTypes/unknown.png"); + public static final Icon ICON = AllIcons.FileTypes.Unknown; public static InvalidFacetType getInstance() { return ServiceManager.getService(InvalidFacetType.class); diff --git a/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java b/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java index 7e78ce424956..a860dac383f8 100644 --- a/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java +++ b/platform/lang-impl/src/com/intellij/find/EditorSearchComponent.java @@ -23,6 +23,7 @@ import com.intellij.find.impl.livePreview.LiveOccurrence; import com.intellij.find.impl.livePreview.LivePreview; import com.intellij.find.impl.livePreview.LivePreviewControllerBase; import com.intellij.find.impl.livePreview.SearchResults; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.actionSystem.impl.ActionToolbarImpl; import com.intellij.openapi.application.ApplicationManager; @@ -34,7 +35,6 @@ import com.intellij.openapi.editor.event.SelectionListener; import com.intellij.openapi.editor.impl.EditorHeaderComponent; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Getter; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.util.text.StringUtil; @@ -297,7 +297,7 @@ public class EditorSearchComponent extends EditorHeaderComponent implements Data setSmallerFontAndOpaque(myClickToHighlightLabel); myClickToHighlightLabel.setVisible(false); - JLabel closeLabel = new JLabel(" ", IconLoader.getIcon("/actions/cross.png"), SwingConstants.RIGHT); + JLabel closeLabel = new JLabel(" ", AllIcons.Actions.Cross, SwingConstants.RIGHT); closeLabel.addMouseListener(new MouseAdapter() { @Override public void mousePressed(final MouseEvent e) { diff --git a/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java b/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java index df92c28ff1cb..6bcbd42a0ebf 100644 --- a/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java +++ b/platform/lang-impl/src/com/intellij/find/actions/ShowUsagesAction.java @@ -22,6 +22,7 @@ import com.intellij.featureStatistics.FeatureUsageTracker; import com.intellij.find.FindManager; import com.intellij.find.findUsages.*; import com.intellij.find.impl.FindManagerImpl; +import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.*; @@ -39,7 +40,6 @@ import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.ui.popup.PopupChooserBuilder; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.wm.IdeFocusManager; import com.intellij.psi.*; @@ -311,7 +311,7 @@ public class ShowUsagesAction extends AnAction implements PopupAction { if (shortcut != null) { shortcutText = "(" + KeymapUtil.getShortcutText(shortcut) + ")"; } - return new InplaceButton("Options..." + shortcutText, IconLoader.getIcon("/general/ideOptions.png"), new ActionListener() { + return new InplaceButton("Options..." + shortcutText, AllIcons.General.IdeOptions, new ActionListener() { @Override public void actionPerformed(ActionEvent e) { SwingUtilities.invokeLater(new Runnable() { @@ -500,7 +500,7 @@ public class ShowUsagesAction extends AnAction implements PopupAction { usageView.addFilteringActions(toolbar); toolbar.add(UsageGroupingRuleProviderImpl.createGroupByFileStructureAction(usageView)); - toolbar.add(new AnAction("Open Find Usages Toolwindow", "Show all usages in a separate toolwindow", IconLoader.getIcon("/general/toolWindowFind.png")) { + toolbar.add(new AnAction("Open Find Usages Toolwindow", "Show all usages in a separate toolwindow", AllIcons.General.ToolWindowFind) { { AnAction action = ActionManager.getInstance().getAction(IdeActions.ACTION_FIND_USAGES); setShortcutSet(action.getShortcutSet()); diff --git a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/FindAllAction.java b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/FindAllAction.java index 345a23f07743..f237cb133861 100644 --- a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/FindAllAction.java +++ b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/FindAllAction.java @@ -4,13 +4,13 @@ import com.intellij.find.EditorSearchComponent; import com.intellij.find.FindManager; import com.intellij.find.FindModel; import com.intellij.find.FindUtil; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.IdeActions; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiDocumentManager; @@ -24,7 +24,7 @@ import com.intellij.psi.PsiDocumentManager; public class FindAllAction extends EditorHeaderAction implements DumbAware { public FindAllAction(EditorSearchComponent editorSearchComponent) { super(editorSearchComponent); - getTemplatePresentation().setIcon(IconLoader.getIcon("/actions/export.png")); + getTemplatePresentation().setIcon(AllIcons.Actions.Export); getTemplatePresentation().setDescription("Export matches to Find tool window"); getTemplatePresentation().setText("Find All"); registerCustomShortcutSet(ActionManager.getInstance().getAction(IdeActions.ACTION_FIND_USAGES).getShortcutSet(), diff --git a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ShowHistoryAction.java b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ShowHistoryAction.java index 38a5a2eef6c1..4d807d11e7d8 100644 --- a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ShowHistoryAction.java +++ b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ShowHistoryAction.java @@ -1,10 +1,10 @@ package com.intellij.find.editorHeaderActions; import com.intellij.find.EditorSearchComponent; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.util.Getter; -import com.intellij.openapi.util.IconLoader; import com.intellij.util.containers.ContainerUtil; import javax.swing.*; @@ -29,7 +29,7 @@ public class ShowHistoryAction extends EditorHeaderAction implements DumbAware { public ShowHistoryAction(final Getter textField, EditorSearchComponent editorSearchComponent) { super(editorSearchComponent); myTextField = textField; - getTemplatePresentation().setIcon(IconLoader.getIcon("/actions/search.png")); + getTemplatePresentation().setIcon(AllIcons.Actions.Search); final String s = getTextField() == getEditorSearchComponent().getSearchField() ? "Search" : "Replace"; getTemplatePresentation().setDescription(s + " history"); getTemplatePresentation().setText(s + " History"); diff --git a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ToggleMultiline.java b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ToggleMultiline.java index f1b4dd862d15..87b1b1b7e987 100644 --- a/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ToggleMultiline.java +++ b/platform/lang-impl/src/com/intellij/find/editorHeaderActions/ToggleMultiline.java @@ -1,16 +1,16 @@ package com.intellij.find.editorHeaderActions; import com.intellij.find.EditorSearchComponent; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.ToggleAction; -import com.intellij.openapi.util.IconLoader; import javax.swing.*; public class ToggleMultiline extends ToggleAction { private EditorSearchComponent myEditorSearchComponent; - private static final Icon ICON = IconLoader.getIcon("/actions/showViewer.png"); + private static final Icon ICON = AllIcons.Actions.ShowViewer; public ToggleMultiline(EditorSearchComponent editorSearchComponent) { super("Multiline", "Toggle Multiline Mode", ICON); diff --git a/platform/lang-impl/src/com/intellij/ide/actions/CreateFileAction.java b/platform/lang-impl/src/com/intellij/ide/actions/CreateFileAction.java index 5a204cfa3f18..2d29744033b0 100644 --- a/platform/lang-impl/src/com/intellij/ide/actions/CreateFileAction.java +++ b/platform/lang-impl/src/com/intellij/ide/actions/CreateFileAction.java @@ -16,6 +16,7 @@ package com.intellij.ide.actions; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.fileTypes.FileType; @@ -25,7 +26,6 @@ import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.InputValidatorEx; import com.intellij.openapi.ui.Messages; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.io.FileUtil; import com.intellij.psi.PsiDirectory; import com.intellij.psi.PsiElement; @@ -38,7 +38,7 @@ import java.io.File; public class CreateFileAction extends CreateElementActionBase implements DumbAware { public CreateFileAction() { - super(IdeBundle.message("action.create.new.file"), IdeBundle.message("action.create.new.file"), IconLoader.getIcon("/fileTypes/text.png")); + super(IdeBundle.message("action.create.new.file"), IdeBundle.message("action.create.new.file"), AllIcons.FileTypes.Text); } public CreateFileAction(final String text, final String description, final Icon icon) { diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/DeleteBookmarkAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/DeleteBookmarkAction.java index 886d5d758592..d8c1c49f2a26 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/DeleteBookmarkAction.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/DeleteBookmarkAction.java @@ -15,13 +15,13 @@ */ package com.intellij.ide.bookmarks.actions; +import com.intellij.icons.AllIcons; import com.intellij.ide.bookmarks.Bookmark; import com.intellij.ide.bookmarks.BookmarkManager; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CustomShortcutSet; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.ListUtil; import javax.swing.*; @@ -32,7 +32,7 @@ class DeleteBookmarkAction extends DumbAwareAction { private final JList myList; DeleteBookmarkAction(Project project, JList list) { - super("Delete", "Delete current bookmark", IconLoader.getIcon("/general/remove.png")); + super("Delete", "Delete current bookmark", AllIcons.General.Remove); myProject = project; myList = list; registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke("DELETE")), list); diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/EditBookmarkDescriptionAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/EditBookmarkDescriptionAction.java index 946f75ed666e..a825d8104602 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/EditBookmarkDescriptionAction.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/EditBookmarkDescriptionAction.java @@ -15,6 +15,7 @@ */ package com.intellij.ide.bookmarks.actions; +import com.intellij.icons.AllIcons; import com.intellij.ide.bookmarks.Bookmark; import com.intellij.ide.bookmarks.BookmarkManager; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -24,7 +25,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.InputValidator; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.popup.JBPopup; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.SystemInfo; import javax.swing.*; @@ -35,8 +35,7 @@ class EditBookmarkDescriptionAction extends DumbAwareAction { private JBPopup myPopup; EditBookmarkDescriptionAction(Project project, JList list) { - super("Edit Description", "Assign short description for the bookmark to be shown along the file name", IconLoader - .getIcon("/actions/properties.png")); + super("Edit Description", "Assign short description for the bookmark to be shown along the file name", AllIcons.Actions.Properties); myProject = project; myList = list; registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(SystemInfo.isMac ? "meta ENTER" : "control ENTER")), list); diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkDownAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkDownAction.java index ea3c28cdac74..4c02f20b2931 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkDownAction.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkDownAction.java @@ -15,13 +15,13 @@ */ package com.intellij.ide.bookmarks.actions; +import com.intellij.icons.AllIcons; import com.intellij.ide.bookmarks.BookmarkItem; import com.intellij.ide.bookmarks.BookmarkManager; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CustomShortcutSet; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.SystemInfo; import com.intellij.ui.ListUtil; @@ -32,7 +32,7 @@ class MoveBookmarkDownAction extends DumbAwareAction { private final JList myList; MoveBookmarkDownAction(Project project, JList list) { - super("Down", "Move current bookmark down", IconLoader.getIcon("/actions/nextOccurence.png")); + super("Down", "Move current bookmark down", AllIcons.Actions.NextOccurence); myProject = project; myList = list; registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(SystemInfo.isMac ? "meta DOWN" : "control DOWN")), list); diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkUpAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkUpAction.java index 72c09e7be5d3..f9079e82aafb 100644 --- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkUpAction.java +++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/MoveBookmarkUpAction.java @@ -15,12 +15,12 @@ */ package com.intellij.ide.bookmarks.actions; +import com.intellij.icons.AllIcons; import com.intellij.ide.bookmarks.BookmarkManager; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CustomShortcutSet; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.SystemInfo; import com.intellij.ui.ListUtil; @@ -31,7 +31,7 @@ class MoveBookmarkUpAction extends DumbAwareAction { private final JList myList; MoveBookmarkUpAction(Project project, JList list) { - super("Up", "Move current bookmark up", IconLoader.getIcon("/actions/previousOccurence.png")); + super("Up", "Move current bookmark up", AllIcons.Actions.PreviousOccurence); myProject = project; myList = list; registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(SystemInfo.isMac ? "meta UP" : "control UP")), list); diff --git a/platform/lang-impl/src/com/intellij/ide/commander/TopLevelNode.java b/platform/lang-impl/src/com/intellij/ide/commander/TopLevelNode.java index aa5980128d8b..1e8469c5affb 100644 --- a/platform/lang-impl/src/com/intellij/ide/commander/TopLevelNode.java +++ b/platform/lang-impl/src/com/intellij/ide/commander/TopLevelNode.java @@ -15,10 +15,10 @@ */ package com.intellij.ide.commander; +import com.intellij.icons.AllIcons; import com.intellij.ide.projectView.PresentationData; import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -30,7 +30,7 @@ import java.util.Collections; * Date: Jun 23, 2005 */ public class TopLevelNode extends AbstractTreeNode { - private static final Icon ourUpLevelIcon = IconLoader.getIcon("/nodes/upLevel.png"); + private static final Icon ourUpLevelIcon = AllIcons.Nodes.UpLevel; public TopLevelNode(Project project, Object value) { super(project, value); diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesListNode.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesListNode.java index 6a55f3b947ed..ea14a7a7d644 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesListNode.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesListNode.java @@ -15,12 +15,12 @@ */ package com.intellij.ide.favoritesTreeView; +import com.intellij.icons.AllIcons; import com.intellij.ide.projectView.PresentationData; import com.intellij.ide.projectView.ProjectViewNode; import com.intellij.ide.projectView.impl.AbstractUrl; import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Pair; import org.jetbrains.annotations.NotNull; @@ -50,7 +50,7 @@ public class FavoritesListNode extends AbstractTreeNode { @Override protected void update(PresentationData presentation) { - presentation.setIcons(IconLoader.getIcon("/general/toolWindowFavorites.png")); + presentation.setIcons(AllIcons.General.ToolWindowFavorites); presentation.setPresentableText(myListName); } diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesProjectViewPane.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesProjectViewPane.java index 2f443ee9c896..d8e95c715fcd 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesProjectViewPane.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesProjectViewPane.java @@ -16,6 +16,7 @@ package com.intellij.ide.favoritesTreeView; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.ide.SelectInTarget; import com.intellij.ide.projectView.ProjectView; @@ -26,7 +27,6 @@ import com.intellij.openapi.actionSystem.IdeActions; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.ActionCallback; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiUtilBase; @@ -83,7 +83,7 @@ public class FavoritesProjectViewPane extends AbstractProjectViewPane { } public Icon getIcon() { - return IconLoader.getIcon("/general/toolWindowFavorites.png"); + return AllIcons.General.ToolWindowFavorites; } @NotNull diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java index c73ad3b97909..510ce562be71 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/FavoritesTreeViewPanel.java @@ -18,6 +18,7 @@ package com.intellij.ide.favoritesTreeView; import com.intellij.history.LocalHistory; import com.intellij.history.LocalHistoryAction; +import com.intellij.icons.AllIcons; import com.intellij.ide.CopyPasteDelegator; import com.intellij.ide.DeleteProvider; import com.intellij.ide.IdeBundle; @@ -43,7 +44,6 @@ import com.intellij.openapi.module.ModuleManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ui.configuration.actions.ModuleDeleteProvider; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.JarFileSystem; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; @@ -425,8 +425,8 @@ public class FavoritesTreeViewPanel extends JPanel implements DataProvider { public void setupToolWindow(ToolWindowEx window) { final CollapseAllAction collapseAction = new CollapseAllAction(myTree); - collapseAction.getTemplatePresentation().setIcon(IconLoader.getIcon("/general/collapseAll.png")); - collapseAction.getTemplatePresentation().setHoveredIcon(IconLoader.getIcon("/general/collapseAllHover.png")); + collapseAction.getTemplatePresentation().setIcon(AllIcons.General.CollapseAll); + collapseAction.getTemplatePresentation().setHoveredIcon(AllIcons.General.CollapseAllHover); window.setTitleActions(collapseAction); final DefaultActionGroup group = new DefaultActionGroup(); diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddAllOpenFilesToNewFavoritesListAction.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddAllOpenFilesToNewFavoritesListAction.java index fc6cc7493196..9b1c85a43ccf 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddAllOpenFilesToNewFavoritesListAction.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddAllOpenFilesToNewFavoritesListAction.java @@ -16,13 +16,13 @@ package com.intellij.ide.favoritesTreeView.actions; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; /** * User: anna @@ -31,7 +31,7 @@ import com.intellij.openapi.util.IconLoader; class AddAllOpenFilesToNewFavoritesListAction extends AnAction { public AddAllOpenFilesToNewFavoritesListAction() { super(IdeBundle.message("action.add.all.open.tabs.to.new.favorites.list"), - IdeBundle.message("action.add.to.new.favorites.list"), IconLoader.getIcon("/general/addFavoritesList.png")); + IdeBundle.message("action.add.to.new.favorites.list"), AllIcons.General.AddFavoritesList); } public void actionPerformed(AnActionEvent e) { diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToNewFavoritesListAction.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToNewFavoritesListAction.java index 0d61a44d9dfc..f59890f3b15e 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToNewFavoritesListAction.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/AddToNewFavoritesListAction.java @@ -16,6 +16,7 @@ package com.intellij.ide.favoritesTreeView.actions; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.ide.favoritesTreeView.FavoritesManager; import com.intellij.ide.util.treeView.AbstractTreeNode; @@ -24,7 +25,6 @@ import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import java.util.Collection; @@ -35,7 +35,7 @@ import java.util.Collection; class AddToNewFavoritesListAction extends AnAction { public AddToNewFavoritesListAction() { super(IdeBundle.message("action.add.to.new.favorites.list"), - IdeBundle.message("action.add.to.new.favorites.list"), IconLoader.getIcon("/general/addFavoritesList.png")); + IdeBundle.message("action.add.to.new.favorites.list"), AllIcons.General.AddFavoritesList); } public void actionPerformed(AnActionEvent e) { diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesAutoScrollToSourceAction.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesAutoScrollToSourceAction.java index 8fcf90a9704a..e5c0b58bdc98 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesAutoScrollToSourceAction.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesAutoScrollToSourceAction.java @@ -15,9 +15,9 @@ */ package com.intellij.ide.favoritesTreeView.actions; +import com.intellij.icons.AllIcons; import com.intellij.ide.favoritesTreeView.FavoritesViewTreeBuilder; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.AutoScrollToSourceHandler; import com.intellij.ui.UIBundle; @@ -30,7 +30,7 @@ public class FavoritesAutoScrollToSourceAction extends FavoritesToolbarButtonAct public FavoritesAutoScrollToSourceAction(Project project, AutoScrollToSourceHandler autoScrollToSourceHandler, FavoritesViewTreeBuilder builder) { - super(project, builder, UIBundle.message("autoscroll.to.source.action.name"), IconLoader.getIcon("/general/autoscrollToSource.png")); + super(project, builder, UIBundle.message("autoscroll.to.source.action.name"), AllIcons.General.AutoscrollToSource); myAutoScrollToSourceHandler = autoScrollToSourceHandler; } diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesCompactEmptyMiddlePackagesAction.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesCompactEmptyMiddlePackagesAction.java index ed96f9d3b1d0..38e73a631048 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesCompactEmptyMiddlePackagesAction.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesCompactEmptyMiddlePackagesAction.java @@ -15,10 +15,10 @@ */ package com.intellij.ide.favoritesTreeView.actions; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.ide.favoritesTreeView.FavoritesViewTreeBuilder; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; /** * @author Konstantin Bulenkov @@ -37,6 +37,6 @@ public class FavoritesCompactEmptyMiddlePackagesAction extends FavoritesToolbarB public FavoritesCompactEmptyMiddlePackagesAction(Project project, FavoritesViewTreeBuilder builder) { super(project, builder, IdeBundle.message("action.compact.empty.middle.packages"), - IconLoader.getIcon("/objectBrowser/compactEmptyPackages.png")); + AllIcons.ObjectBrowser.CompactEmptyPackages); } } diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesFlattenPackagesAction.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesFlattenPackagesAction.java index 22ebf5678db7..fa382b9d2f6c 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesFlattenPackagesAction.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesFlattenPackagesAction.java @@ -15,17 +15,17 @@ */ package com.intellij.ide.favoritesTreeView.actions; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.ide.favoritesTreeView.FavoritesViewTreeBuilder; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; /** * @author Konstantin Bulenkov */ public class FavoritesFlattenPackagesAction extends FavoritesToolbarButtonAction { public FavoritesFlattenPackagesAction(Project project, FavoritesViewTreeBuilder builder) { - super(project, builder, IdeBundle.message("action.flatten.packages"), IconLoader.getIcon("/objectBrowser/flattenPackages.png")); + super(project, builder, IdeBundle.message("action.flatten.packages"), AllIcons.ObjectBrowser.FlattenPackages); } @Override diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesShowMembersAction.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesShowMembersAction.java index 2d2b99d1181c..ade9413b075e 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesShowMembersAction.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/FavoritesShowMembersAction.java @@ -15,17 +15,17 @@ */ package com.intellij.ide.favoritesTreeView.actions; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.ide.favoritesTreeView.FavoritesViewTreeBuilder; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; /** * @author Konstantin Bulenkov */ public class FavoritesShowMembersAction extends FavoritesToolbarButtonAction { public FavoritesShowMembersAction(Project project, FavoritesViewTreeBuilder builder) { - super(project, builder, IdeBundle.message("action.show.members"), IconLoader.getIcon("/objectBrowser/showMembers.png")); + super(project, builder, IdeBundle.message("action.show.members"), AllIcons.ObjectBrowser.ShowMembers); } @Override diff --git a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/RenameFavoritesListAction.java b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/RenameFavoritesListAction.java index 0c80f8a030f2..6fdf7b9c400f 100644 --- a/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/RenameFavoritesListAction.java +++ b/platform/lang-impl/src/com/intellij/ide/favoritesTreeView/actions/RenameFavoritesListAction.java @@ -16,6 +16,7 @@ package com.intellij.ide.favoritesTreeView.actions; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.ide.favoritesTreeView.FavoritesManager; import com.intellij.ide.favoritesTreeView.FavoritesTreeViewPanel; @@ -27,7 +28,6 @@ import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.InputValidator; import com.intellij.openapi.ui.Messages; -import com.intellij.openapi.util.IconLoader; import com.intellij.util.ArrayUtil; /** @@ -37,7 +37,7 @@ import com.intellij.util.ArrayUtil; public class RenameFavoritesListAction extends AnAction implements DumbAware { public RenameFavoritesListAction() { super(IdeBundle.message("action.rename.favorites.list"), IdeBundle.message("action.rename.favorites.list"), - IconLoader.getIcon("/actions/menu-replace.png")); + AllIcons.Actions.Menu_replace); } public void actionPerformed(AnActionEvent e) { diff --git a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/AllFileTemplatesConfigurable.java b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/AllFileTemplatesConfigurable.java index 70ed0e4ab00e..5aef70a7de44 100644 --- a/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/AllFileTemplatesConfigurable.java +++ b/platform/lang-impl/src/com/intellij/ide/fileTemplates/impl/AllFileTemplatesConfigurable.java @@ -16,6 +16,7 @@ package com.intellij.ide.fileTemplates.impl; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.ide.fileTemplates.*; import com.intellij.ide.util.PropertiesComponent; @@ -32,7 +33,6 @@ import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.Splitter; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.TabbedPaneWrapper; import com.intellij.util.ArrayUtil; @@ -66,7 +66,7 @@ public class AllFileTemplatesConfigurable implements SearchableConfigurable, Con private static final String INCLUDES_TITLE = IdeBundle.message("tab.filetemplates.includes"); private static final String CODE_TITLE = IdeBundle.message("tab.filetemplates.code"); private static final String J2EE_TITLE = IdeBundle.message("tab.filetemplates.j2ee"); - private static final Icon ourIcon = IconLoader.getIcon("/general/fileTemplates.png"); + private static final Icon ourIcon = AllIcons.General.FileTemplates; private JPanel myMainPanel; private FileTemplateTab myCurrentTab; @@ -242,7 +242,7 @@ public class AllFileTemplatesConfigurable implements SearchableConfigurable, Con }); DefaultActionGroup group = new DefaultActionGroup(); - AnAction removeAction = new AnAction(IdeBundle.message("action.remove.template"), null, IconLoader.getIcon("/general/remove.png")) { + AnAction removeAction = new AnAction(IdeBundle.message("action.remove.template"), null, AllIcons.General.Remove) { public void actionPerformed(AnActionEvent e) { onRemove(); } @@ -275,7 +275,7 @@ public class AllFileTemplatesConfigurable implements SearchableConfigurable, Con && myCurrentTab.getSelectedTemplate() != null); } }; - AnAction resetAction = new AnAction(IdeBundle.message("action.reset.to.default"), null, IconLoader.getIcon("/actions/reset.png")) { + AnAction resetAction = new AnAction(IdeBundle.message("action.reset.to.default"), null, AllIcons.Actions.Reset) { public void actionPerformed(AnActionEvent e) { onReset(); } diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/CallHierarchyBrowserBase.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/CallHierarchyBrowserBase.java index 7358b5da8707..d5909847af1c 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/CallHierarchyBrowserBase.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/CallHierarchyBrowserBase.java @@ -16,11 +16,11 @@ package com.intellij.ide.hierarchy; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.psi.PsiElement; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -55,10 +55,10 @@ public abstract class CallHierarchyBrowserBase extends HierarchyBrowserBaseEx { protected void prependActions(@NotNull DefaultActionGroup actionGroup) { actionGroup.add(new ChangeViewTypeActionBase(IdeBundle.message("action.caller.methods.hierarchy"), IdeBundle.message("action.caller.methods.hierarchy"), - IconLoader.getIcon("/hierarchy/caller.png"), CALLER_TYPE)); + AllIcons.Hierarchy.Caller, CALLER_TYPE)); actionGroup.add(new ChangeViewTypeActionBase(IdeBundle.message("action.callee.methods.hierarchy"), IdeBundle.message("action.callee.methods.hierarchy"), - IconLoader.getIcon("/hierarchy/callee.png"), CALLEE_TYPE)); + AllIcons.Hierarchy.Callee, CALLEE_TYPE)); actionGroup.add(new AlphaSortAction()); actionGroup.add(new ChangeScopeAction()); } diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java index f2e93238790f..3691be93d500 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserBaseEx.java @@ -16,6 +16,7 @@ package com.intellij.ide.hierarchy; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.ide.OccurenceNavigator; import com.intellij.ide.OccurenceNavigatorSupport; @@ -35,7 +36,6 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.fileEditor.OpenFileDescriptor; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Ref; import com.intellij.openapi.vfs.VirtualFile; @@ -480,7 +480,7 @@ public abstract class HierarchyBrowserBaseEx extends HierarchyBrowserBase implem protected class AlphaSortAction extends ToggleAction { public AlphaSortAction() { super(IdeBundle.message("action.sort.alphabetically"), IdeBundle.message("action.sort.alphabetically"), - IconLoader.getIcon("/objectBrowser/sorted.png")); + AllIcons.ObjectBrowser.Sorted); } public final boolean isSelected(final AnActionEvent event) { @@ -578,7 +578,7 @@ public abstract class HierarchyBrowserBaseEx extends HierarchyBrowserBase implem protected class RefreshAction extends com.intellij.ide.actions.RefreshAction { public RefreshAction() { - 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); } public final void actionPerformed(final AnActionEvent e) { diff --git a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java index 08937c9acb45..b6e24d3aa25b 100644 --- a/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java +++ b/platform/lang-impl/src/com/intellij/ide/hierarchy/HierarchyBrowserManager.java @@ -16,11 +16,10 @@ package com.intellij.ide.hierarchy; +import com.intellij.icons.AllIcons; import com.intellij.ide.impl.ContentManagerWatcher; import com.intellij.openapi.components.*; -import com.intellij.openapi.components.StoragePathMacros; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowAnchor; import com.intellij.openapi.wm.ToolWindowId; @@ -50,7 +49,7 @@ public final class HierarchyBrowserManager implements PersistentStateComponent myUninitializedPaneState = new HashMap(); private final Map mySelectInTargets = new HashMap(); @@ -504,8 +507,8 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo } if (action instanceof CollapseAllToolbarAction) { collapseAction = (CollapseAllToolbarAction)action; - collapseAction.getTemplatePresentation().setIcon(IconLoader.getIcon("/general/collapseAll.png")); - collapseAction.getTemplatePresentation().setHoveredIcon(IconLoader.getIcon("/general/collapseAllHover.png")); + collapseAction.getTemplatePresentation().setIcon(AllIcons.General.CollapseAll); + collapseAction.getTemplatePresentation().setHoveredIcon(AllIcons.General.CollapseAllHover); myActionGroup.remove(collapseAction); } } @@ -633,7 +636,7 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo myActionGroup.addAction(new FlattenPackagesDependableAction(myAbbreviatePackageNames, IdeBundle.message("action.abbreviate.qualified.package.names"), IdeBundle.message("action.abbreviate.qualified.package.names"), - IconLoader.getIcon("/objectBrowser/abbreviatePackageNames.png"), + AllIcons.ObjectBrowser.AbbreviatePackageNames, ourAbbreviatePackagesDefaults) { public boolean isSelected(AnActionEvent event) { return super.isSelected(event) && isAbbreviatePackageNames(myCurrentViewId); @@ -652,7 +655,7 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo if (!PlatformUtils.isCidr()) { myActionGroup.addAction(new PaneOptionAction(myShowMembers, IdeBundle.message("action.show.members"), IdeBundle.message("action.show.hide.members"), - IconLoader.getIcon("/objectBrowser/showMembers.png"), ourShowMembersDefaults)) + AllIcons.ObjectBrowser.ShowMembers, ourShowMembersDefaults)) .setAsSecondary(true); } myActionGroup.addAction(myAutoScrollToSourceHandler.createToggleAction()).setAsSecondary(true); @@ -1677,7 +1680,7 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo private class SortByTypeAction extends ToggleAction { private SortByTypeAction() { super(IdeBundle.message("action.sort.by.type"), IdeBundle.message("action.sort.by.type"), - IconLoader.getIcon("/objectBrowser/sortByType.png")); + AllIcons.ObjectBrowser.SortByType); } public boolean isSelected(AnActionEvent event) { @@ -1697,8 +1700,8 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo private class ScrollFromSourceAction extends AnAction implements DumbAware { private ScrollFromSourceAction() { - super("Scroll from Source", "Select the file open in the active editor", IconLoader.getIcon("/general/locate.png")); - getTemplatePresentation().setHoveredIcon(IconLoader.getIcon("/general/locateHover.png")); + super("Scroll from Source", "Select the file open in the active editor", AllIcons.General.Locate); + getTemplatePresentation().setHoveredIcon(AllIcons.General.LocateHover); } @Override diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewPane.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewPane.java index 47d95c0eab01..f1e90af90e4f 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewPane.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewPane.java @@ -19,6 +19,7 @@ */ package com.intellij.ide.projectView.impl; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.ide.SelectInTarget; import com.intellij.ide.impl.ProjectPaneSelectInTarget; @@ -29,7 +30,6 @@ import com.intellij.ide.util.treeView.AbstractTreeBuilder; import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.ide.util.treeView.AbstractTreeUpdater; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.psi.PsiDirectory; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -40,7 +40,7 @@ import javax.swing.tree.DefaultTreeModel; public class ProjectViewPane extends AbstractProjectViewPSIPane { @NonNls public static final String ID = "ProjectPane"; - private static final Icon ICON = IconLoader.getIcon("/general/projectTab.png"); + private static final Icon ICON = AllIcons.General.ProjectTab; public ProjectViewPane(Project project) { super(project); diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ShowModulesAction.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ShowModulesAction.java index d92469b19c1c..16c7c1d06add 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ShowModulesAction.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ShowModulesAction.java @@ -1,5 +1,6 @@ package com.intellij.ide.projectView.impl; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.ide.projectView.ProjectView; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -7,7 +8,6 @@ import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.actionSystem.ToggleAction; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.util.IconLoader; import com.intellij.util.PlatformUtils; /** @@ -21,8 +21,8 @@ public abstract class ShowModulesAction extends ToggleAction { private Project myProject; public ShowModulesAction(Project project) { - super(IdeBundle.message("action.show.modules"), IdeBundle.message("action.description.show.modules"), IconLoader - .getIcon("/objectBrowser/showModules.png")); + super(IdeBundle.message("action.show.modules"), IdeBundle.message("action.description.show.modules"), + AllIcons.ObjectBrowser.ShowModules); myProject = project; } diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/NamedLibraryElementNode.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/NamedLibraryElementNode.java index b291d6851eb9..27085840be94 100644 --- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/NamedLibraryElementNode.java +++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/nodes/NamedLibraryElementNode.java @@ -16,6 +16,7 @@ package com.intellij.ide.projectView.impl.nodes; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.ide.projectView.PresentationData; import com.intellij.ide.projectView.ProjectViewNode; @@ -29,7 +30,6 @@ import com.intellij.openapi.roots.LibraryOrderEntry; import com.intellij.openapi.roots.OrderEntry; import com.intellij.openapi.roots.OrderRootType; import com.intellij.openapi.roots.ui.configuration.ProjectSettingsService; -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.VfsUtilCore; @@ -43,9 +43,9 @@ import java.util.Collection; import java.util.List; public class NamedLibraryElementNode extends ProjectViewNode implements NavigatableWithText { - private static final Icon GENERIC_JDK_ICON = IconLoader.getIcon("/general/jdk.png"); - 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 GENERIC_JDK_ICON = AllIcons.General.Jdk; + private static final Icon LIB_ICON_OPEN = AllIcons.Nodes.PpLibOpen; + private static final Icon LIB_ICON_CLOSED = AllIcons.Nodes.PpLibClosed; public NamedLibraryElementNode(Project project, NamedLibraryElement value, ViewSettings viewSettings) { super(project, value, viewSettings); diff --git a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewPane.java b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewPane.java index 4b64143d527e..14ed50860350 100644 --- a/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewPane.java +++ b/platform/lang-impl/src/com/intellij/ide/scopeView/ScopeViewPane.java @@ -16,17 +16,20 @@ package com.intellij.ide.scopeView; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.ide.SelectInTarget; import com.intellij.ide.projectView.ProjectView; import com.intellij.ide.projectView.impl.AbstractProjectViewPane; import com.intellij.ide.projectView.impl.ShowModulesAction; -import com.intellij.openapi.actionSystem.*; +import com.intellij.openapi.actionSystem.ActionManager; +import com.intellij.openapi.actionSystem.ActionPlaces; +import com.intellij.openapi.actionSystem.DefaultActionGroup; +import com.intellij.openapi.actionSystem.IdeActions; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.ActionCallback; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.packageDependencies.DependencyValidationManager; import com.intellij.packageDependencies.ui.PackageDependenciesNode; @@ -58,7 +61,7 @@ public class ScopeViewPane extends AbstractProjectViewPane { private final DependencyValidationManager myDependencyValidationManager; private final NamedScopeManager myNamedScopeManager; private final NamedScopesHolder.ScopeListener myScopeListener; - public static final Icon ICON = IconLoader.getIcon("/ide/localScope.png"); + public static final Icon ICON = AllIcons.Ide.LocalScope; public ScopeViewPane(final Project project, ProjectView projectView, DependencyValidationManager dependencyValidationManager, NamedScopeManager namedScopeManager) { super(project); diff --git a/platform/lang-impl/src/com/intellij/ide/todo/SetTodoFilterAction.java b/platform/lang-impl/src/com/intellij/ide/todo/SetTodoFilterAction.java index 90b4bd54f7b9..b09c1822c162 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/SetTodoFilterAction.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/SetTodoFilterAction.java @@ -15,6 +15,7 @@ */ package com.intellij.ide.todo; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.ide.todo.configurable.TodoConfigurable; import com.intellij.openapi.actionSystem.*; @@ -23,7 +24,6 @@ import com.intellij.openapi.actionSystem.impl.ActionButton; import com.intellij.openapi.options.ShowSettingsUtil; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.util.IconLoader; import com.intellij.util.Consumer; import javax.swing.*; @@ -40,7 +40,7 @@ public class SetTodoFilterAction extends AnAction implements CustomComponentActi private final Consumer myTodoFilterConsumer; public SetTodoFilterAction(final Project project, final TodoPanelSettings toDoSettings, final Consumer todoFilterConsumer) { - super(IdeBundle.message("action.filter.todo.items"), null, IconLoader.getIcon("/ant/filter.png")); + super(IdeBundle.message("action.filter.todo.items"), null, AllIcons.Ant.Filter); myProject = project; myToDoSettings = toDoSettings; myTodoFilterConsumer = todoFilterConsumer; @@ -79,7 +79,7 @@ public class SetTodoFilterAction extends AnAction implements CustomComponentActi group.addSeparator(); group.add( new AnAction(IdeBundle.message("action.todo.edit.filters"), - IdeBundle.message("action.todo.edit.filters"), IconLoader.getIcon("/general/ideOptions.png")) { + IdeBundle.message("action.todo.edit.filters"), AllIcons.General.IdeOptions) { public void actionPerformed(AnActionEvent e) { final ShowSettingsUtil util = ShowSettingsUtil.getInstance(); util.editConfigurable(project, new TodoConfigurable()); diff --git a/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java b/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java index c87c226cd8ef..268b9b3a29bb 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/TodoPanel.java @@ -16,6 +16,7 @@ package com.intellij.ide.todo; +import com.intellij.icons.AllIcons; import com.intellij.ide.*; import com.intellij.ide.actions.ContextHelpAction; import com.intellij.ide.actions.NextOccurenceToolbarAction; @@ -34,7 +35,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.SimpleToolWindowPanel; import com.intellij.openapi.ui.Splitter; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.wm.impl.VisibilityWatcher; @@ -72,7 +72,7 @@ import java.util.List; */ abstract class TodoPanel extends SimpleToolWindowPanel implements OccurenceNavigator, DataProvider, Disposable { private static final Logger LOG = Logger.getInstance("#com.intellij.ide.todo.TodoPanel"); - private static final Icon PREVIEW_ICON = IconLoader.getIcon("/actions/preview.png"); + private static final Icon PREVIEW_ICON = AllIcons.Actions.Preview; protected Project myProject; private final TodoPanelSettings mySettings; @@ -577,7 +577,7 @@ abstract class TodoPanel extends SimpleToolWindowPanel implements OccurenceNavig private final class MyShowModulesAction extends ToggleAction { MyShowModulesAction() { - super(IdeBundle.message("action.group.by.modules"), null, IconLoader.getIcon("/objectBrowser/showModules.png")); + super(IdeBundle.message("action.group.by.modules"), null, AllIcons.ObjectBrowser.ShowModules); } public boolean isSelected(AnActionEvent e) { diff --git a/platform/lang-impl/src/com/intellij/ide/todo/configurable/TodoConfigurable.java b/platform/lang-impl/src/com/intellij/ide/todo/configurable/TodoConfigurable.java index c14e68f53e30..da41de4df424 100644 --- a/platform/lang-impl/src/com/intellij/ide/todo/configurable/TodoConfigurable.java +++ b/platform/lang-impl/src/com/intellij/ide/todo/configurable/TodoConfigurable.java @@ -16,6 +16,7 @@ package com.intellij.ide.todo.configurable; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.ide.todo.TodoConfiguration; import com.intellij.ide.todo.TodoFilter; @@ -24,7 +25,6 @@ import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.ui.DialogWrapper; -import com.intellij.openapi.util.IconLoader; import com.intellij.psi.search.TodoAttributes; import com.intellij.psi.search.TodoPattern; import com.intellij.ui.*; @@ -386,7 +386,7 @@ public class TodoConfigurable extends BaseConfigurable implements SearchableConf } public Icon getIcon() { - return IconLoader.getIcon("/general/configurableTodo.png"); + return AllIcons.General.ConfigurableTodo; } public void reset() { diff --git a/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooser.java b/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooser.java index 08724c9c284c..defe1d719904 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooser.java +++ b/platform/lang-impl/src/com/intellij/ide/util/DirectoryChooser.java @@ -16,6 +16,7 @@ package com.intellij.ide.util; +import com.intellij.icons.AllIcons; import com.intellij.ide.util.gotoByName.ChooseByNamePanel; import com.intellij.ide.util.gotoByName.ChooseByNamePopupComponent; import com.intellij.ide.util.gotoByName.GotoClassModel2; @@ -28,7 +29,6 @@ import com.intellij.openapi.roots.ProjectRootManager; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.LocalFileSystem; @@ -525,7 +525,7 @@ public class DirectoryChooser extends DialogWrapper { public FilterExistentAction() { super(RefactoringBundle.message("directory.chooser.hide.non.existent.checkBox.text"), UIUtil.removeMnemonic(RefactoringBundle.message("directory.chooser.hide.non.existent.checkBox.text")), - IconLoader.getIcon("/ant/filter.png")); + AllIcons.Ant.Filter); } @Override diff --git a/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java b/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java index 6c2cf697d2a3..8e87db8885be 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java +++ b/platform/lang-impl/src/com/intellij/ide/util/MemberChooser.java @@ -17,13 +17,13 @@ package com.intellij.ide.util; import com.intellij.codeInsight.generation.*; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.VerticalFlowLayout; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.SystemInfo; @@ -694,7 +694,7 @@ public class MemberChooser extends DialogWrapper implemen private class SortEmAction extends ToggleAction { public SortEmAction() { super(IdeBundle.message("action.sort.alphabetically"), - IdeBundle.message("action.sort.alphabetically"), IconLoader.getIcon("/objectBrowser/sorted.png")); + IdeBundle.message("action.sort.alphabetically"), AllIcons.ObjectBrowser.Sorted); } public boolean isSelected(AnActionEvent event) { @@ -733,7 +733,7 @@ public class MemberChooser extends DialogWrapper implemen private class ExpandAllAction extends AnAction { public ExpandAllAction() { super(IdeBundle.message("action.expand.all"), IdeBundle.message("action.expand.all"), - IconLoader.getIcon("/actions/expandall.png")); + AllIcons.Actions.Expandall); } public void actionPerformed(AnActionEvent e) { @@ -744,7 +744,7 @@ public class MemberChooser extends DialogWrapper implemen private class CollapseAllAction extends AnAction { public CollapseAllAction() { super(IdeBundle.message("action.collapse.all"), IdeBundle.message("action.collapse.all"), - IconLoader.getIcon("/actions/collapseall.png")); + AllIcons.Actions.Collapseall); } public void actionPerformed(AnActionEvent e) { diff --git a/platform/lang-impl/src/com/intellij/ide/util/PsiElementModuleRenderer.java b/platform/lang-impl/src/com/intellij/ide/util/PsiElementModuleRenderer.java index 152b8961c0a6..f9070b63b434 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/PsiElementModuleRenderer.java +++ b/platform/lang-impl/src/com/intellij/ide/util/PsiElementModuleRenderer.java @@ -16,11 +16,11 @@ package com.intellij.ide.util; +import com.intellij.icons.AllIcons; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.module.ModuleUtil; import com.intellij.openapi.roots.*; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.JarFileSystem; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; @@ -32,8 +32,8 @@ import java.awt.*; import java.io.File; public class PsiElementModuleRenderer extends DefaultListCellRenderer{ - private static final Icon TEST_ICON = IconLoader.getIcon("/nodes/testSourceFolder.png"); - private static final Icon LIB_ICON = IconLoader.getIcon("/nodes/ppLibClosed.png"); + private static final Icon TEST_ICON = AllIcons.Nodes.TestSourceFolder; + private static final Icon LIB_ICON = AllIcons.Nodes.PpLibClosed; private String myText; diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java index 208f6e1778a8..057d2e3591a2 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java @@ -20,6 +20,7 @@ import com.intellij.Patches; import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; import com.intellij.codeInsight.daemon.impl.DaemonCodeAnalyzerImpl; import com.intellij.find.findUsages.PsiElement2UsageTargetAdapter; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.ide.IdeEventQueue; import com.intellij.ide.actions.CopyReferenceAction; @@ -1528,7 +1529,7 @@ public abstract class ChooseByNameBase { } private static final String ACTION_NAME = "Show All in View"; - private static final Icon FIND_ICON = IconLoader.getIcon("/actions/find.png"); + private static final Icon FIND_ICON = AllIcons.Actions.Find; private abstract class ShowFindUsagesAction extends AnAction { public ShowFindUsagesAction() { diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameFilter.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameFilter.java index 8155ef70cc19..692f21a034f3 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameFilter.java +++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameFilter.java @@ -15,6 +15,7 @@ */ package com.intellij.ide.util.gotoByName; +import com.intellij.icons.AllIcons; import com.intellij.ide.util.ElementsChooser; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.project.DumbService; @@ -24,7 +25,6 @@ import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.ui.popup.JBPopupListener; import com.intellij.openapi.ui.popup.LightweightWindowEvent; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -43,7 +43,7 @@ public abstract class ChooseByNameFilter { /** * an icon to use */ - private static final Icon FILTER_ICON = IconLoader.getIcon("/icons/inspector/useFilter.png"); + private static final Icon FILTER_ICON = AllIcons.Icons.Inspector.UseFilter; /** * a parent popup */ diff --git a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java index 3acb3a95a39c..fde591842444 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java +++ b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeChooserConfigurable.java @@ -18,6 +18,7 @@ package com.intellij.ide.util.scopeChooser; import com.intellij.codeInspection.InspectionsBundle; import com.intellij.execution.ExecutionBundle; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.options.ConfigurationException; @@ -27,7 +28,6 @@ import com.intellij.openapi.project.ProjectBundle; import com.intellij.openapi.ui.*; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Condition; -import com.intellij.openapi.util.IconLoader; import com.intellij.packageDependencies.DependencyValidationManager; import com.intellij.psi.search.scope.packageSet.*; import com.intellij.ui.TreeSpeedSearch; @@ -56,8 +56,8 @@ import java.util.*; * Date: 01-Jul-2006 */ public class ScopeChooserConfigurable extends MasterDetailsComponent implements /*NonDefaultProjectConfigurable,*/ SearchableConfigurable { - private static final Icon SCOPES = IconLoader.getIcon("/ide/scopeConfigurable.png"); - private static final Icon SAVE_ICON = IconLoader.getIcon("/runConfigurations/saveTempConfig.png"); + private static final Icon SCOPES = AllIcons.Ide.ScopeConfigurable; + private static final Icon SAVE_ICON = AllIcons.RunConfigurations.SaveTempConfig; @NonNls public static final String SCOPE_CHOOSER_CONFIGURABLE_UI_KEY = "ScopeChooserConfigurable.UI"; private final NamedScopesHolder myLocalScopesManager; private final NamedScopesHolder mySharedScopesManager; diff --git a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeEditorPanel.java b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeEditorPanel.java index 6e7b08829e06..b17e874c866b 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeEditorPanel.java +++ b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ScopeEditorPanel.java @@ -15,6 +15,7 @@ */ package com.intellij.ide.util.scopeChooser; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.ide.projectView.impl.nodes.ProjectViewDirectoryHelper; import com.intellij.openapi.actionSystem.*; @@ -29,7 +30,6 @@ import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.VerticalFlowLayout; 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.packageDependencies.DependencyUISettings; @@ -698,7 +698,7 @@ public class ScopeEditorPanel { public FilterLegalsAction(final Runnable update) { super(IdeBundle.message("action.show.included.only"), - IdeBundle.message("action.description.show.included.only"), IconLoader.getIcon("/ant/filter.png")); + IdeBundle.message("action.description.show.included.only"), AllIcons.Ant.Filter); myUpdate = update; } diff --git a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ShowFilesAction.java b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ShowFilesAction.java index f2376dbbd314..286cfb02aee4 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ShowFilesAction.java +++ b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ShowFilesAction.java @@ -20,10 +20,10 @@ */ 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; public final class ShowFilesAction extends ToggleAction { @@ -31,7 +31,7 @@ public final class ShowFilesAction extends ToggleAction { public ShowFilesAction(final Runnable update) { super(IdeBundle.message("action.show.files"), - IdeBundle.message("action.description.show.files"), IconLoader.getIcon("/fileTypes/any_type.png")); + IdeBundle.message("action.description.show.files"), AllIcons.FileTypes.Any_type); myUpdate = update; } @@ -43,4 +43,4 @@ public final class ShowFilesAction extends ToggleAction { DependencyUISettings.getInstance().UI_SHOW_FILES = flag; myUpdate.run(); } -} \ No newline at end of file +} diff --git a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ShowModuleGroupsAction.java b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ShowModuleGroupsAction.java index 2913c7362142..71f374dd694f 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ShowModuleGroupsAction.java +++ b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ShowModuleGroupsAction.java @@ -20,9 +20,9 @@ */ package com.intellij.ide.util.scopeChooser; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.ToggleAction; -import com.intellij.openapi.util.IconLoader; import com.intellij.packageDependencies.DependencyUISettings; public class ShowModuleGroupsAction extends ToggleAction { @@ -30,7 +30,7 @@ public class ShowModuleGroupsAction extends ToggleAction { public ShowModuleGroupsAction(final Runnable update) { super("Show Module Groups", - "Show/hide module groups", IconLoader.getIcon("/nodes/moduleGroupClosed.png")); + "Show/hide module groups", AllIcons.Nodes.ModuleGroupClosed); myUpdate = update; } @@ -47,4 +47,4 @@ public class ShowModuleGroupsAction extends ToggleAction { super.update(e); e.getPresentation().setEnabled(DependencyUISettings.getInstance().UI_SHOW_MODULES); } -} \ No newline at end of file +} diff --git a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ShowModulesAction.java b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ShowModulesAction.java index 6a97962f9569..aa0f79b48d09 100644 --- a/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ShowModulesAction.java +++ b/platform/lang-impl/src/com/intellij/ide/util/scopeChooser/ShowModulesAction.java @@ -20,10 +20,10 @@ */ 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; public final class ShowModulesAction extends ToggleAction { @@ -31,7 +31,7 @@ public final class ShowModulesAction extends ToggleAction { public ShowModulesAction(final Runnable update) { super(IdeBundle.message("action.show.modules"), - IdeBundle.message("action.description.show.modules"), IconLoader.getIcon("/objectBrowser/showModules.png")); + IdeBundle.message("action.description.show.modules"), AllIcons.ObjectBrowser.ShowModules); myUpdate = update; } @@ -43,4 +43,4 @@ public final class ShowModulesAction extends ToggleAction { DependencyUISettings.getInstance().UI_SHOW_MODULES = flag; myUpdate.run(); } -} \ No newline at end of file +} diff --git a/platform/lang-impl/src/com/intellij/moduleDependencies/DependenciesAnalyzeManager.java b/platform/lang-impl/src/com/intellij/moduleDependencies/DependenciesAnalyzeManager.java index 797ae57cfa3b..592779460dba 100644 --- a/platform/lang-impl/src/com/intellij/moduleDependencies/DependenciesAnalyzeManager.java +++ b/platform/lang-impl/src/com/intellij/moduleDependencies/DependenciesAnalyzeManager.java @@ -16,12 +16,11 @@ package com.intellij.moduleDependencies; +import com.intellij.icons.AllIcons; import com.intellij.ide.impl.ContentManagerWatcher; import com.intellij.openapi.components.*; -import com.intellij.openapi.components.StoragePathMacros; import com.intellij.openapi.project.Project; import com.intellij.openapi.startup.StartupManager; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowAnchor; import com.intellij.openapi.wm.ToolWindowId; @@ -57,7 +56,7 @@ public class DependenciesAnalyzeManager implements PersistentStateComponent { - private static final Icon ICON = IconLoader.getIcon("/modules/emptyProjectType.png"); - private static final Icon NODE_ICON_OPEN = IconLoader.getIcon("/nodes/ModuleOpen.png"); - private static final Icon NODE_ICON_CLOSED = IconLoader.getIcon("/nodes/ModuleClosed.png"); + private static final Icon ICON = AllIcons.Modules.EmptyProjectType; + private static final Icon NODE_ICON_OPEN = AllIcons.Nodes.ModuleOpen; + private static final Icon NODE_ICON_CLOSED = AllIcons.Nodes.ModuleClosed; @NonNls public static final String EMPTY_MODULE = "EMPTY_MODULE"; //private static final EmptyModuleType ourInstance = new EmptyModuleType(); @@ -61,4 +61,4 @@ public class EmptyModuleType extends ModuleType { public Icon getNodeIcon(boolean isOpened) { return isOpened ? NODE_ICON_OPEN : NODE_ICON_CLOSED; } -} \ No newline at end of file +} diff --git a/platform/lang-impl/src/com/intellij/openapi/module/WebModuleTypeBase.java b/platform/lang-impl/src/com/intellij/openapi/module/WebModuleTypeBase.java index f08adb58192c..00c61edf05d4 100644 --- a/platform/lang-impl/src/com/intellij/openapi/module/WebModuleTypeBase.java +++ b/platform/lang-impl/src/com/intellij/openapi/module/WebModuleTypeBase.java @@ -15,9 +15,9 @@ */ package com.intellij.openapi.module; +import com.intellij.icons.AllIcons; import com.intellij.ide.util.projectWizard.ModuleBuilder; import com.intellij.openapi.project.ProjectBundle; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NonNls; import javax.swing.*; @@ -28,9 +28,9 @@ import javax.swing.*; public abstract class WebModuleTypeBase extends ModuleType { @NonNls public static final String WEB_MODULE = "WEB_MODULE"; - private static final Icon MODULE_ICON = IconLoader.getIcon("/javaee/webModuleBig.png"); - private static final Icon MODULE_NODE_ICON_OPEN = IconLoader.getIcon("/nodes/ModuleOpen.png"); - private static final Icon MODULE_NODE_ICON_CLOSED = IconLoader.getIcon("/nodes/ModuleClosed.png"); + private static final Icon MODULE_ICON = AllIcons.Javaee.WebModuleBig; + private static final Icon MODULE_NODE_ICON_OPEN = AllIcons.Nodes.ModuleOpen; + private static final Icon MODULE_NODE_ICON_CLOSED = AllIcons.Nodes.ModuleClosed; public WebModuleTypeBase() { super(WEB_MODULE); diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java index 91f1d56049bf..56d3e45833e4 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/CommonContentEntriesEditor.java @@ -16,6 +16,7 @@ package com.intellij.openapi.roots.ui.configuration; +import com.intellij.icons.AllIcons; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.DefaultActionGroup; @@ -35,7 +36,6 @@ import com.intellij.openapi.roots.ui.componentsList.components.ScrollablePanel; import com.intellij.openapi.roots.ui.componentsList.layout.VerticalStackLayout; import com.intellij.openapi.roots.ui.configuration.actions.IconWithTextAction; import com.intellij.openapi.ui.Splitter; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileManager; @@ -64,9 +64,9 @@ import java.util.Map; public class CommonContentEntriesEditor extends ModuleElementsEditor { private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.roots.ui.configuration.ContentEntriesEditor"); public static final String NAME = ProjectBundle.message("module.paths.title"); - public static final Icon ICON = IconLoader.getIcon("/modules/sources.png"); + public static final Icon ICON = AllIcons.Modules.Sources; private static final Color BACKGROUND_COLOR = UIUtil.getListBackground(); - private static final Icon ADD_CONTENT_ENTRY_ICON = IconLoader.getIcon("/modules/addContentEntry.png"); + private static final Icon ADD_CONTENT_ENTRY_ICON = AllIcons.Modules.AddContentEntry; protected ContentEntryTreeEditor myRootTreeEditor; private MyContentEntryEditorListener myContentEntryEditorListener; diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentEntryTreeEditor.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentEntryTreeEditor.java index 9eb223dff4ed..712798025bd1 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentEntryTreeEditor.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentEntryTreeEditor.java @@ -16,6 +16,7 @@ package com.intellij.openapi.roots.ui.configuration; +import com.intellij.icons.AllIcons; import com.intellij.ide.util.treeView.AbstractTreeBuilder; import com.intellij.ide.util.treeView.AbstractTreeStructure; import com.intellij.ide.util.treeView.NodeDescriptor; @@ -39,7 +40,6 @@ import com.intellij.openapi.roots.ui.configuration.actions.IconWithTextAction; import com.intellij.openapi.roots.ui.configuration.actions.ToggleExcludedStateAction; import com.intellij.openapi.roots.ui.configuration.actions.ToggleSourcesStateAction; import com.intellij.openapi.util.Disposer; -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; @@ -240,7 +240,7 @@ public class ContentEntryTreeEditor { private MyNewFolderAction() { super(ActionsBundle.message("action.FileChooser.NewFolder.text"), ActionsBundle.message("action.FileChooser.NewFolder.description"), - IconLoader.getIcon("/actions/newFolder.png")); + AllIcons.Actions.NewFolder); } public JComponent createCustomComponent(Presentation presentation) { diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentRootPanel.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentRootPanel.java index c0c369de120c..7389b6dfc22c 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentRootPanel.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/ContentRootPanel.java @@ -16,12 +16,12 @@ package com.intellij.openapi.roots.ui.configuration; +import com.intellij.icons.AllIcons; import com.intellij.openapi.project.ProjectBundle; import com.intellij.openapi.roots.ContentEntry; import com.intellij.openapi.roots.ContentFolder; import com.intellij.openapi.roots.ExcludeFolder; import com.intellij.openapi.roots.SourceFolder; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VfsUtil; @@ -61,10 +61,10 @@ public abstract class ContentRootPanel extends JPanel { private static final Color CONTENT_COLOR = Color.WHITE; private static final Color UNSELECTED_TEXT_COLOR = new Color(0x333333); - private static final Icon DELETE_ROOT_ICON = IconLoader.getIcon("/modules/deleteContentRoot.png"); - private static final Icon DELETE_ROOT_ROLLOVER_ICON = IconLoader.getIcon("/modules/deleteContentRootRollover.png"); - private static final Icon DELETE_FOLDER_ICON = IconLoader.getIcon("/modules/deleteContentFolder.png"); - private static final Icon DELETE_FOLDER_ROLLOVER_ICON = IconLoader.getIcon("/modules/deleteContentFolderRollover.png"); + private static final Icon DELETE_ROOT_ICON = AllIcons.Modules.DeleteContentRoot; + private static final Icon DELETE_ROOT_ROLLOVER_ICON = AllIcons.Modules.DeleteContentRootRollover; + private static final Icon DELETE_FOLDER_ICON = AllIcons.Modules.DeleteContentFolder; + private static final Icon DELETE_FOLDER_ROLLOVER_ICON = AllIcons.Modules.DeleteContentFolderRollover; protected final ActionCallback myCallback; private JComponent myHeader; diff --git a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/IconSet.java b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/IconSet.java index c5a4c072cb54..d7e825ac9d07 100644 --- a/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/IconSet.java +++ b/platform/lang-impl/src/com/intellij/openapi/roots/ui/configuration/IconSet.java @@ -16,7 +16,7 @@ package com.intellij.openapi.roots.ui.configuration; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import javax.swing.*; @@ -26,18 +26,18 @@ import javax.swing.*; * @author 2003 */ public class IconSet { - public static final Icon SOURCE_ROOT_FOLDER = IconLoader.getIcon("/modules/sourceRootClosed.png"); - public static final Icon SOURCE_ROOT_FOLDER_EXPANDED = IconLoader.getIcon("/modules/sourceRootOpened.png"); - public static final Icon SOURCE_FOLDER = IconLoader.getIcon("/modules/sourceClosed.png"); - public static final Icon SOURCE_FOLDER_EXPANDED = IconLoader.getIcon("/modules/sourceOpened.png"); + public static final Icon SOURCE_ROOT_FOLDER = AllIcons.Modules.SourceRootClosed; + public static final Icon SOURCE_ROOT_FOLDER_EXPANDED = AllIcons.Modules.SourceRootOpened; + public static final Icon SOURCE_FOLDER = AllIcons.Modules.SourceClosed; + public static final Icon SOURCE_FOLDER_EXPANDED = AllIcons.Modules.SourceOpened; - public static final Icon TEST_ROOT_FOLDER = IconLoader.getIcon("/modules/testRootClosed.png"); - public static final Icon TEST_ROOT_FOLDER_EXPANDED = IconLoader.getIcon("/modules/testRootOpened.png"); - public static final Icon TEST_SOURCE_FOLDER = IconLoader.getIcon("/modules/testSourceClosed.png"); - public static final Icon TEST_SOURCE_FOLDER_EXPANDED = IconLoader.getIcon("/modules/testSourceOpened.png"); + public static final Icon TEST_ROOT_FOLDER = AllIcons.Modules.TestRootClosed; + public static final Icon TEST_ROOT_FOLDER_EXPANDED = AllIcons.Modules.TestRootOpened; + public static final Icon TEST_SOURCE_FOLDER = AllIcons.Modules.TestSourceClosed; + public static final Icon TEST_SOURCE_FOLDER_EXPANDED = AllIcons.Modules.TestSourceOpened; - public static final Icon EXCLUDE_FOLDER = IconLoader.getIcon("/modules/excludeRootClosed.png"); - public static final Icon EXCLUDE_FOLDER_EXPANDED = IconLoader.getIcon("/modules/excludeRootOpened.png"); + public static final Icon EXCLUDE_FOLDER = AllIcons.Modules.ExcludeRootClosed; + public static final Icon EXCLUDE_FOLDER_EXPANDED = AllIcons.Modules.ExcludeRootOpened; public static Icon getSourceRootIcon(boolean isTestSource, final boolean isExpanded) { if (isExpanded) { diff --git a/platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java b/platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java index df38b816c4f5..11f5a3253201 100644 --- a/platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java +++ b/platform/lang-impl/src/com/intellij/openapi/util/registry/RegistryUi.java @@ -16,6 +16,7 @@ package com.intellij.openapi.util.registry; +import com.intellij.icons.AllIcons; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.ApplicationInfo; @@ -26,7 +27,6 @@ import com.intellij.openapi.application.impl.LaterInvocator; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.ShadowAction; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.*; import com.intellij.ui.table.JBTable; import com.intellij.util.PlatformIcons; @@ -143,7 +143,7 @@ public class RegistryUi implements Disposable { public void update(AnActionEvent e) { e.getPresentation().setEnabled(!myTable.isEditing() && myTable.getSelectedRow() >= 0); e.getPresentation().setText("Revert to Default"); - e.getPresentation().setIcon(IconLoader.getIcon("/general/remove.png")); + e.getPresentation().setIcon(AllIcons.General.Remove); if (e.getPresentation().isEnabled()) { final RegistryValue rv = myModel.getRegistryValue(myTable.getSelectedRow()); @@ -170,7 +170,7 @@ public class RegistryUi implements Disposable { public void update(AnActionEvent e) { e.getPresentation().setEnabled(!myTable.isEditing() && myTable.getSelectedRow() >= 0); e.getPresentation().setText("Edit"); - e.getPresentation().setIcon(IconLoader.getIcon("/actions/editSource.png")); + e.getPresentation().setIcon(AllIcons.Actions.EditSource); } public void actionPerformed(AnActionEvent e) { diff --git a/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.java b/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.java index 3f8e26441e84..07f8d6fe2cd1 100644 --- a/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.java +++ b/platform/lang-impl/src/com/intellij/openapi/vfs/encoding/FileEncodingConfigurable.java @@ -16,6 +16,7 @@ package com.intellij.openapi.vfs.encoding; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.Presentation; @@ -26,7 +27,6 @@ import com.intellij.openapi.options.OptionalConfigurable; 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.util.text.StringUtil; import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.openapi.vfs.VirtualFile; @@ -69,7 +69,7 @@ public class FileEncodingConfigurable implements SearchableConfigurable, Optiona @Nullable public Icon getIcon() { - return IconLoader.getIcon("/general/configureEncoding.png"); + return AllIcons.General.ConfigureEncoding; } @Nullable diff --git a/platform/lang-impl/src/com/intellij/openapi/wm/impl/status/TogglePopupHintsPanel.java b/platform/lang-impl/src/com/intellij/openapi/wm/impl/status/TogglePopupHintsPanel.java index 00c5fe8f7757..0c3a969ed442 100644 --- a/platform/lang-impl/src/com/intellij/openapi/wm/impl/status/TogglePopupHintsPanel.java +++ b/platform/lang-impl/src/com/intellij/openapi/wm/impl/status/TogglePopupHintsPanel.java @@ -19,12 +19,12 @@ package com.intellij.openapi.wm.impl.status; import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer; import com.intellij.codeInsight.daemon.impl.HectorComponent; import com.intellij.codeInsight.daemon.impl.analysis.HighlightLevelUtil; +import com.intellij.icons.AllIcons; import com.intellij.ide.PowerSaveMode; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.fileEditor.FileEditorManagerEvent; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.wm.StatusBarWidget; import com.intellij.profile.codeInspection.InspectionProjectProfileManager; @@ -41,10 +41,10 @@ import java.awt.*; import java.awt.event.MouseEvent; public class TogglePopupHintsPanel extends EditorBasedWidget implements StatusBarWidget.Multiframe, StatusBarWidget.IconPresentation { - private static final Icon INSPECTIONS_ICON = IconLoader.getIcon("/ide/hectorOn.png"); - private static final Icon INSPECTIONS_OFF_ICON = IconLoader.getIcon("/ide/hectorOff.png"); - private static final Icon SYNTAX_ONLY_ICON = IconLoader.getIcon("/ide/hectorSyntax.png"); - private static final Icon EMPTY_ICON = IconLoader.getIcon("/ide/hectorNo.png"); + private static final Icon INSPECTIONS_ICON = AllIcons.Ide.HectorOn; + private static final Icon INSPECTIONS_OFF_ICON = AllIcons.Ide.HectorOff; + private static final Icon SYNTAX_ONLY_ICON = AllIcons.Ide.HectorSyntax; + private static final Icon EMPTY_ICON = AllIcons.Ide.HectorNo; private Icon myCurrentIcon; private String myToolTipText; diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/DependenciesToolWindow.java b/platform/lang-impl/src/com/intellij/packageDependencies/DependenciesToolWindow.java index 440d5726a651..c72821fef78b 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/DependenciesToolWindow.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/DependenciesToolWindow.java @@ -15,11 +15,11 @@ */ package com.intellij.packageDependencies; +import com.intellij.icons.AllIcons; import com.intellij.ide.impl.ContentManagerWatcher; import com.intellij.openapi.components.ServiceManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.startup.StartupManager; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowAnchor; import com.intellij.openapi.wm.ToolWindowId; @@ -50,7 +50,7 @@ public class DependenciesToolWindow { project); myContentManager = toolWindow.getContentManager(); - toolWindow.setIcon(IconLoader.getIcon("/general/toolWindowInspection.png")); + toolWindow.setIcon(AllIcons.General.ToolWindowInspection); new ContentManagerWatcher(toolWindow, myContentManager); } }); diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/DependencyValidationManagerImpl.java b/platform/lang-impl/src/com/intellij/packageDependencies/DependencyValidationManagerImpl.java index 2c76471eee57..8b2df14ab754 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/DependencyValidationManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/DependencyValidationManagerImpl.java @@ -16,6 +16,7 @@ package com.intellij.packageDependencies; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.openapi.components.*; import com.intellij.openapi.diagnostic.Logger; @@ -57,7 +58,7 @@ public class DependencyValidationManagerImpl extends DependencyValidationManager @NonNls private static final String VALUE = "value"; - private static final Icon SHARED_SCOPES = IconLoader.getIcon("/ide/sharedScope.png"); + private static final Icon SHARED_SCOPES = AllIcons.Ide.SharedScope; private final Map myUnnamedScopes = new HashMap(); diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java index cffe3fa9158c..7d288c7c4c63 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/DependenciesPanel.java @@ -21,6 +21,7 @@ import com.intellij.analysis.AnalysisScope; import com.intellij.analysis.AnalysisScopeBundle; import com.intellij.analysis.PerformAnalysisInBackgroundOption; import com.intellij.codeInsight.hint.HintUtil; +import com.intellij.icons.AllIcons; import com.intellij.ide.CommonActionsManager; import com.intellij.ide.ExporterToTextFile; import com.intellij.ide.actions.ContextHelpAction; @@ -41,7 +42,6 @@ import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.Splitter; import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.JDOMUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; @@ -481,7 +481,8 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide 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) { @@ -511,7 +512,8 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide private final class ShowFilesAction extends ToggleAction { ShowFilesAction() { - super(AnalysisScopeBundle.message("action.show.files"), AnalysisScopeBundle.message("action.show.files.description"), IconLoader.getIcon("/fileTypes/unknown.png")); + super(AnalysisScopeBundle.message("action.show.files"), AnalysisScopeBundle.message("action.show.files.description"), + AllIcons.FileTypes.Unknown); } public boolean isSelected(AnActionEvent event) { @@ -547,7 +549,8 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide private final class ShowModulesAction extends ToggleAction { ShowModulesAction() { - super(AnalysisScopeBundle.message("action.show.modules"), AnalysisScopeBundle.message("action.show.modules.description"), IconLoader.getIcon("/objectBrowser/showModules.png")); + super(AnalysisScopeBundle.message("action.show.modules"), AnalysisScopeBundle.message("action.show.modules.description"), + AllIcons.ObjectBrowser.ShowModules); } public boolean isSelected(AnActionEvent event) { @@ -563,7 +566,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide private final class ShowModuleGroupsAction extends ToggleAction { ShowModuleGroupsAction() { - super("Show module groups", "Show module groups", IconLoader.getIcon("/nodes/moduleGroupClosed.png")); + super("Show module groups", "Show module groups", AllIcons.Nodes.ModuleGroupClosed); } public boolean isSelected(AnActionEvent event) { @@ -584,7 +587,8 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide 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) { @@ -605,7 +609,8 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide private final class FilterLegalsAction extends ToggleAction { FilterLegalsAction() { - super(AnalysisScopeBundle.message("action.show.illegals.only"), AnalysisScopeBundle.message("action.show.illegals.only.description"), IconLoader.getIcon("/ant/filter.png")); + super(AnalysisScopeBundle.message("action.show.illegals.only"), AnalysisScopeBundle.message("action.show.illegals.only.description"), + AllIcons.Ant.Filter); } public boolean isSelected(AnActionEvent event) { @@ -621,7 +626,8 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide private final class EditDependencyRulesAction extends AnAction { public EditDependencyRulesAction() { - super(AnalysisScopeBundle.message("action.edit.rules"), AnalysisScopeBundle.message("action.edit.rules.description"), IconLoader.getIcon("/general/ideOptions.png")); + super(AnalysisScopeBundle.message("action.edit.rules"), AnalysisScopeBundle.message("action.edit.rules.description"), + AllIcons.General.IdeOptions); } public void actionPerformed(AnActionEvent e) { @@ -689,7 +695,7 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide private class RerunAction extends AnAction { public RerunAction(JComponent comp) { - super(CommonBundle.message("action.rerun"), AnalysisScopeBundle.message("action.rerun.dependency"), IconLoader.getIcon("/actions/refreshUsages.png")); + super(CommonBundle.message("action.rerun"), AnalysisScopeBundle.message("action.rerun.dependency"), AllIcons.Actions.RefreshUsages); registerCustomShortcutSet(CommonShortcuts.getRerun(), comp); } @@ -905,8 +911,8 @@ public class DependenciesPanel extends JPanel implements Disposable, DataProvide private class MarkAsIllegalAction extends AnAction { public MarkAsIllegalAction() { - super(AnalysisScopeBundle.message("mark.dependency.illegal.text"), AnalysisScopeBundle.message("mark.dependency.illegal.text"), IconLoader.getIcon( - "/actions/lightning.png")); + super(AnalysisScopeBundle.message("mark.dependency.illegal.text"), AnalysisScopeBundle.message("mark.dependency.illegal.text"), + AllIcons.Actions.Lightning); } public void actionPerformed(AnActionEvent e) { diff --git a/platform/lang-impl/src/com/intellij/packageDependencies/ui/ProjectPatternProvider.java b/platform/lang-impl/src/com/intellij/packageDependencies/ui/ProjectPatternProvider.java index 5933d377590e..9191a1ee0fb1 100644 --- a/platform/lang-impl/src/com/intellij/packageDependencies/ui/ProjectPatternProvider.java +++ b/platform/lang-impl/src/com/intellij/packageDependencies/ui/ProjectPatternProvider.java @@ -20,6 +20,7 @@ */ package com.intellij.packageDependencies.ui; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.ide.projectView.impl.nodes.ProjectViewDirectoryHelper; import com.intellij.openapi.actionSystem.AnAction; @@ -28,7 +29,6 @@ import com.intellij.openapi.actionSystem.ToggleAction; 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.vfs.VfsUtilCore; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.packageDependencies.DependencyUISettings; @@ -46,8 +46,8 @@ public class ProjectPatternProvider extends PatternDialectProvider { @NonNls public static final String FILE = "file"; - private static final Icon COMPACT_EMPTY_MIDDLE_PACKAGES_ICON = IconLoader.getIcon("/objectBrowser/compactEmptyPackages.png"); - private static final Icon ICON = IconLoader.getIcon("/general/projectTab.png"); + private static final Icon COMPACT_EMPTY_MIDDLE_PACKAGES_ICON = AllIcons.ObjectBrowser.CompactEmptyPackages; + private static final Icon ICON = AllIcons.General.ProjectTab; private static final Logger LOG = Logger.getInstance("#" + ProjectPatternProvider.class.getName()); @@ -143,4 +143,4 @@ public class ProjectPatternProvider extends PatternDialectProvider { e.getPresentation().setVisible(DependencyUISettings.getInstance().SCOPE_TYPE == FILE); } } -} \ No newline at end of file +} diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java index d8c97a0c7837..e327573d0481 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/InspectionToolsConfigurable.java @@ -27,6 +27,7 @@ import com.intellij.codeInsight.daemon.impl.SeverityRegistrar; import com.intellij.codeInspection.ModifiableModel; import com.intellij.codeInspection.ex.InspectionProfileImpl; import com.intellij.codeInspection.ex.InspectionToolRegistrar; +import com.intellij.icons.AllIcons; import com.intellij.ide.ui.ListCellRendererWrapper; import com.intellij.lang.annotation.HighlightSeverity; import com.intellij.openapi.diagnostic.Logger; @@ -255,7 +256,7 @@ public abstract class InspectionToolsConfigurable extends BaseConfigurable imple } public Icon getIcon() { - return IconLoader.getIcon("/general/configurableErrorHighlighting.png"); + return AllIcons.General.ConfigurableErrorHighlighting; } public String getHelpTopic() { diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java index 1b2225e01774..322404d59adb 100644 --- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java +++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java @@ -29,6 +29,7 @@ import com.intellij.codeInspection.ex.Descriptor; import com.intellij.codeInspection.ex.InspectionProfileImpl; import com.intellij.codeInspection.ex.InspectionToolRegistrar; import com.intellij.codeInspection.ex.ScopeToolState; +import com.intellij.icons.AllIcons; import com.intellij.ide.CommonActionsManager; import com.intellij.ide.DefaultTreeExpander; import com.intellij.ide.IdeTooltipManager; @@ -44,7 +45,6 @@ import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.Splitter; import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.JDOMUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.profile.ProfileManager; @@ -336,7 +336,8 @@ public class SingleInspectionProfilePanel extends JPanel { actions.add(actionManager.createExpandAllAction(myTreeExpander, myTree)); actions.add(actionManager.createCollapseAllAction(myTreeExpander, myTree)); - actions.add(new AnAction(CommonBundle.message("button.reset.to.default"), CommonBundle.message("button.reset.to.default"), IconLoader.getIcon("/actions/reset-to-default.png")) { + actions.add(new AnAction(CommonBundle.message("button.reset.to.default"), CommonBundle.message("button.reset.to.default"), + AllIcons.Actions.Reset_to_default) { { registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.CTRL_MASK)), myTree); } @@ -352,7 +353,7 @@ public class SingleInspectionProfilePanel extends JPanel { } }); - actions.add(new AnAction("Reset to Empty", "Reset to empty", IconLoader.getIcon("/general/reset.png")){ + actions.add(new AnAction("Reset to Empty", "Reset to empty", AllIcons.General.Reset){ @Override public void update(AnActionEvent e) { @@ -365,7 +366,7 @@ public class SingleInspectionProfilePanel extends JPanel { } }); - actions.add(new ToggleAction("Lock Profile", "Lock profile", IconLoader.getIcon("/nodes/padlock.png")) { + actions.add(new ToggleAction("Lock Profile", "Lock profile", AllIcons.Nodes.Padlock) { public boolean isSelected(AnActionEvent e) { return mySelectedProfile != null && mySelectedProfile.isProfileLocked(); } diff --git a/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataLanguageConfigurable.java b/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataLanguageConfigurable.java index fa55a45878af..9f993f6e9a4c 100644 --- a/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataLanguageConfigurable.java +++ b/platform/lang-impl/src/com/intellij/psi/templateLanguages/TemplateDataLanguageConfigurable.java @@ -15,11 +15,11 @@ */ package com.intellij.psi.templateLanguages; +import com.intellij.icons.AllIcons; import com.intellij.lang.LangBundle; import com.intellij.lang.Language; import com.intellij.openapi.application.ApplicationNamesInfo; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.ColoredTableCellRenderer; import com.intellij.ui.SimpleTextAttributes; @@ -62,7 +62,7 @@ public class TemplateDataLanguageConfigurable extends LanguagePerFileConfigurabl @Override @Nullable public Icon getIcon() { - return IconLoader.getIcon("/general/configurableFileTypes.png"); + return AllIcons.General.ConfigurableFileTypes; } @Override diff --git a/platform/lang-impl/src/com/intellij/refactoring/RefactoringBaseIntention.java b/platform/lang-impl/src/com/intellij/refactoring/RefactoringBaseIntention.java index 7e66f846b414..490e5def12e9 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/RefactoringBaseIntention.java +++ b/platform/lang-impl/src/com/intellij/refactoring/RefactoringBaseIntention.java @@ -2,7 +2,7 @@ package com.intellij.refactoring; import com.intellij.codeInsight.intention.HighPriorityAction; import com.intellij.codeInsight.intention.PsiElementBaseIntentionAction; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.openapi.util.Iconable; import javax.swing.*; @@ -12,7 +12,7 @@ import javax.swing.*; * Date: 11/11/11 */ public abstract class RefactoringBaseIntention extends PsiElementBaseIntentionAction implements Iconable, HighPriorityAction { - public static final Icon REFACTORING_BULB = IconLoader.getIcon("/actions/refactoringBulb.png"); + public static final Icon REFACTORING_BULB = AllIcons.Actions.RefactoringBulb; @Override public Icon getIcon(int flags) { diff --git a/platform/lang-impl/src/com/intellij/refactoring/ui/AbstractMemberSelectionTable.java b/platform/lang-impl/src/com/intellij/refactoring/ui/AbstractMemberSelectionTable.java index 77b88fa59a5b..e2016ddb2280 100644 --- a/platform/lang-impl/src/com/intellij/refactoring/ui/AbstractMemberSelectionTable.java +++ b/platform/lang-impl/src/com/intellij/refactoring/ui/AbstractMemberSelectionTable.java @@ -16,11 +16,11 @@ package com.intellij.refactoring.ui; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.DataKey; import com.intellij.openapi.actionSystem.DataSink; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.actionSystem.TypeSafeDataProvider; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Iconable; import com.intellij.psi.PsiElement; import com.intellij.refactoring.RefactoringBundle; @@ -49,8 +49,8 @@ public abstract class AbstractMemberSelectionTable filtered, final Project project) { final ActionManagerEx actionManager = ActionManagerEx.getInstanceEx(); @@ -71,4 +71,4 @@ public class ToolKeymapExtension implements KeymapExtension { return group; } -} \ No newline at end of file +} diff --git a/platform/lang-impl/src/com/intellij/ui/ColorLineMarkerProvider.java b/platform/lang-impl/src/com/intellij/ui/ColorLineMarkerProvider.java index 9801f0d5c26f..c418a61c061d 100644 --- a/platform/lang-impl/src/com/intellij/ui/ColorLineMarkerProvider.java +++ b/platform/lang-impl/src/com/intellij/ui/ColorLineMarkerProvider.java @@ -20,12 +20,12 @@ import com.intellij.codeInsight.daemon.GutterIconNavigationHandler; 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.AccessToken; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.ElementColorProvider; import com.intellij.openapi.editor.markup.GutterIconRenderer; -import com.intellij.openapi.util.IconLoader; import com.intellij.psi.PsiElement; import com.intellij.psi.util.PsiUtilBase; import com.intellij.util.Function; @@ -97,7 +97,7 @@ public final class ColorLineMarkerProvider implements LineMarkerProvider { @Override public Icon getCommonIcon(@NotNull List infos) { - return IconLoader.getIcon("/gutter/colors.png"); + return AllIcons.Gutter.Colors; } @Override diff --git a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/ActionTracer.java b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/ActionTracer.java index 59c59e5cfe4a..7b06cfab69fc 100644 --- a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/ActionTracer.java +++ b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/ActionTracer.java @@ -15,11 +15,11 @@ */ package com.intellij.ui.debugger.extensions; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.actionSystem.ex.AnActionListener; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.keymap.KeymapManager; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.components.JBScrollPane; import com.intellij.ui.debugger.UiDebuggerExtension; @@ -47,7 +47,7 @@ public class ActionTracer implements UiDebuggerExtension, AnActionListener { if (myComponent == null) { myText = new JTextArea(); final JBScrollPane log = new JBScrollPane(myText); - final AnAction clear = new AnAction("Clear", "Clear log", IconLoader.getIcon("/general/reset.png")) { + final AnAction clear = new AnAction("Clear", "Clear log", AllIcons.General.Reset) { @Override public void actionPerformed(AnActionEvent e) { myText.setText(null); diff --git a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/DisposerDebugger.java b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/DisposerDebugger.java index 7dc9f822b259..d5ab63556c81 100644 --- a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/DisposerDebugger.java +++ b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/DisposerDebugger.java @@ -16,6 +16,7 @@ package com.intellij.ui.debugger.extensions; +import com.intellij.icons.AllIcons; import com.intellij.ide.projectView.PresentationData; import com.intellij.ide.projectView.TreeStructureProvider; import com.intellij.ide.util.treeView.AbstractTreeNode; @@ -28,7 +29,6 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.ide.CopyPasteManager; import com.intellij.openapi.ui.Splitter; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.objectTree.ObjectNode; import com.intellij.openapi.util.objectTree.ObjectTree; import com.intellij.openapi.util.objectTree.ObjectTreeListener; @@ -112,7 +112,7 @@ public class DisposerDebugger implements UiDebuggerExtension, Disposable { @Override public void update(AnActionEvent e) { - e.getPresentation().setIcon(IconLoader.getIcon("/debugger/watch.png")); + e.getPresentation().setIcon(AllIcons.Debugger.Watch); } public void actionPerformed(AnActionEvent e) { diff --git a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/FocusDebugger.java b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/FocusDebugger.java index 63ff0484e9ef..600dda6f0f1d 100644 --- a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/FocusDebugger.java +++ b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/FocusDebugger.java @@ -16,10 +16,10 @@ package com.intellij.ui.debugger.extensions; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.ui.Splitter; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.ColoredListCellRenderer; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SimpleColoredText; @@ -92,7 +92,7 @@ public class FocusDebugger implements UiDebuggerExtension, PropertyChangeListene class ClearAction extends AnAction { ClearAction() { - super("Clear", "", IconLoader.getIcon("/actions/cross.png")); + super("Clear", "", AllIcons.Actions.Cross); } @Override diff --git a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java index a30b1274b1a2..1c7daed32048 100644 --- a/platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java +++ b/platform/lang-impl/src/com/intellij/ui/debugger/extensions/PlaybackDebugger.java @@ -16,6 +16,7 @@ package com.intellij.ui.debugger.extensions; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.components.*; @@ -28,7 +29,6 @@ import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.Splitter; import com.intellij.openapi.ui.playback.PlaybackContext; import com.intellij.openapi.ui.playback.PlaybackRunner; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.*; import com.intellij.openapi.wm.IdeFrame; @@ -164,7 +164,7 @@ public class PlaybackDebugger implements UiDebuggerExtension, PlaybackRunner.Sta private class SaveAction extends AnAction { private SaveAction() { - super("Save", "", IconLoader.getIcon("/actions/menu-saveall.png")); + super("Save", "", AllIcons.Actions.Menu_saveall); } @Override @@ -210,7 +210,7 @@ public class PlaybackDebugger implements UiDebuggerExtension, PlaybackRunner.Sta private class SetScriptFileAction extends AnAction { private SetScriptFileAction() { - super("Set Script File", "", IconLoader.getIcon("/nodes/packageOpen.png")); + super("Set Script File", "", AllIcons.Nodes.PackageOpen); } @Override @@ -226,7 +226,7 @@ public class PlaybackDebugger implements UiDebuggerExtension, PlaybackRunner.Sta private class NewScriptAction extends AnAction { private NewScriptAction() { - super("New Script", "", IconLoader.getIcon("/actions/new.png")); + super("New Script", "", AllIcons.Actions.New); } @Override @@ -287,7 +287,7 @@ public class PlaybackDebugger implements UiDebuggerExtension, PlaybackRunner.Sta private class StopAction extends AnAction { private StopAction() { - super("Stop", null, IconLoader.getIcon("/actions/suspend.png")); + super("Stop", null, AllIcons.Actions.Suspend); } @Override @@ -310,7 +310,7 @@ public class PlaybackDebugger implements UiDebuggerExtension, PlaybackRunner.Sta private class ActivateFrameAndRun extends AnAction { private ActivateFrameAndRun() { - super("Activate Frame And Run", "", IconLoader.getIcon("/nodes/deploy.png")); + super("Activate Frame And Run", "", AllIcons.Nodes.Deploy); } public void actionPerformed(AnActionEvent e) { @@ -326,7 +326,7 @@ public class PlaybackDebugger implements UiDebuggerExtension, PlaybackRunner.Sta private class RunOnFameActivationAction extends AnAction { private RunOnFameActivationAction() { - super("Run On Frame Activation", "", IconLoader.getIcon("/general/run.png")); + super("Run On Frame Activation", "", AllIcons.General.Run); } @Override diff --git a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurablePanel.java b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurablePanel.java index c68ca1afaec8..44a500317837 100644 --- a/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurablePanel.java +++ b/platform/lang-impl/src/com/intellij/ui/tabs/FileColorsConfigurablePanel.java @@ -16,12 +16,12 @@ package com.intellij.ui.tabs; +import com.intellij.icons.AllIcons; import com.intellij.ide.ui.UISettings; import com.intellij.ide.util.scopeChooser.EditScopesDialog; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.ui.MessageType; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.AnActionButton; import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.ToolbarDecorator; @@ -46,8 +46,8 @@ public class FileColorsConfigurablePanel extends JPanel implements Disposable { private final FileColorSettingsTable myLocalTable; private final FileColorSettingsTable mySharedTable; - private static final Icon SHARE = IconLoader.getIcon("/actions/share.png"); - private static final Icon UNSHARE = IconLoader.getIcon("/actions/unshare.png"); + private static final Icon SHARE = AllIcons.Actions.Share; + private static final Icon UNSHARE = AllIcons.Actions.Unshare; public FileColorsConfigurablePanel(@NotNull final FileColorManagerImpl manager) { diff --git a/platform/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java b/platform/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java index 42a87106f7e1..dcb7cb0ea5de 100644 --- a/platform/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java +++ b/platform/lang-impl/src/com/intellij/usageView/impl/UsageViewManagerImpl.java @@ -16,9 +16,9 @@ package com.intellij.usageView.impl; +import com.intellij.icons.AllIcons; import com.intellij.ide.impl.ContentManagerWatcher; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Key; import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowAnchor; @@ -43,7 +43,7 @@ public class UsageViewManagerImpl extends UsageViewManager { ToolWindow toolWindow = myToolWindowManager.registerToolWindow(ToolWindowId.FIND, true, ToolWindowAnchor.BOTTOM, project, true); toolWindow.setToHideOnEmptyContent(true); - toolWindow.setIcon(IconLoader.getIcon("/general/toolWindowFind.png")); + toolWindow.setIcon(AllIcons.General.ToolWindowFind); myFindContentManager = toolWindow.getContentManager(); myFindContentManager.addContentManagerListener(new ContentManagerAdapter() { @Override diff --git a/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/HistoryDialog.java b/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/HistoryDialog.java index bc7140cd40f1..9ab4b4114257 100644 --- a/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/HistoryDialog.java +++ b/platform/lvcs-impl/src/com/intellij/history/integration/ui/views/HistoryDialog.java @@ -26,6 +26,7 @@ import com.intellij.history.integration.ui.models.FileDifferenceModel; import com.intellij.history.integration.ui.models.HistoryDialogModel; import com.intellij.history.integration.ui.models.RevisionProcessingProgress; import com.intellij.history.utils.LocalHistoryLog; +import com.intellij.icons.AllIcons; import com.intellij.ide.actions.ContextHelpAction; import com.intellij.ide.actions.ShowFilePathAction; import com.intellij.ide.ui.SplitterProportionsDataImpl; @@ -42,7 +43,6 @@ import com.intellij.openapi.ui.popup.Balloon; import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vcs.VcsException; @@ -536,7 +536,7 @@ public abstract class HistoryDialog extends FrameW private class RevertAction extends MyAction { public RevertAction() { - super(message("action.revert"), null, IconLoader.getIcon("/actions/rollback.png")); + super(message("action.revert"), null, AllIcons.Actions.Rollback); } @Override @@ -552,7 +552,7 @@ public abstract class HistoryDialog extends FrameW private class CreatePatchAction extends MyAction { public CreatePatchAction() { - super(message("action.create.patch"), null, IconLoader.getIcon("/actions/createPatch.png")); + super(message("action.create.patch"), null, AllIcons.Actions.CreatePatch); } @Override diff --git a/platform/platform-api/src/com/intellij/ide/actions/CloseTabToolbarAction.java b/platform/platform-api/src/com/intellij/ide/actions/CloseTabToolbarAction.java index 055e2ede999e..9c79660fa15d 100644 --- a/platform/platform-api/src/com/intellij/ide/actions/CloseTabToolbarAction.java +++ b/platform/platform-api/src/com/intellij/ide/actions/CloseTabToolbarAction.java @@ -16,18 +16,18 @@ package com.intellij.ide.actions; import com.intellij.CommonBundle; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.IdeActions; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.project.DumbAware; -import com.intellij.openapi.util.IconLoader; public abstract class CloseTabToolbarAction extends AnAction implements DumbAware { public CloseTabToolbarAction() { copyFrom(ActionManager.getInstance().getAction(IdeActions.ACTION_CLOSE_ACTIVE_TAB)); Presentation presentation = getTemplatePresentation(); - presentation.setIcon(IconLoader.getIcon("/actions/cancel.png")); + presentation.setIcon(AllIcons.Actions.Cancel); presentation.setText(CommonBundle.getCloseButtonText()); presentation.setDescription(null); } diff --git a/platform/platform-api/src/com/intellij/ide/actions/ContextHelpAction.java b/platform/platform-api/src/com/intellij/ide/actions/ContextHelpAction.java index 900af9791db0..ce8afcf58a29 100644 --- a/platform/platform-api/src/com/intellij/ide/actions/ContextHelpAction.java +++ b/platform/platform-api/src/com/intellij/ide/actions/ContextHelpAction.java @@ -16,18 +16,18 @@ package com.intellij.ide.actions; import com.intellij.CommonBundle; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.ApplicationInfo; import com.intellij.openapi.help.HelpManager; import com.intellij.openapi.project.DumbAware; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.Nullable; import javax.swing.*; public class ContextHelpAction extends AnAction implements DumbAware { - private static final Icon myIcon=IconLoader.getIcon("/actions/help.png"); + private static final Icon myIcon= AllIcons.Actions.Help; private final String myHelpID; public ContextHelpAction() { diff --git a/platform/platform-api/src/com/intellij/ide/actions/QuickSwitchSchemeAction.java b/platform/platform-api/src/com/intellij/ide/actions/QuickSwitchSchemeAction.java index c3143fbe55ca..8a29dfa8841c 100644 --- a/platform/platform-api/src/com/intellij/ide/actions/QuickSwitchSchemeAction.java +++ b/platform/platform-api/src/com/intellij/ide/actions/QuickSwitchSchemeAction.java @@ -16,12 +16,12 @@ package com.intellij.ide.actions; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.ui.popup.ListPopup; -import com.intellij.openapi.util.IconLoader; import com.intellij.util.ui.EmptyIcon; import org.jetbrains.annotations.NotNull; @@ -31,7 +31,7 @@ import javax.swing.*; * @author max */ public abstract class QuickSwitchSchemeAction extends AnAction implements DumbAware { - protected static final Icon ourCurrentAction = IconLoader.getIcon("/diff/currentLine.png"); + protected static final Icon ourCurrentAction = AllIcons.Diff.CurrentLine; protected static final Icon ourNotCurrentAction = new EmptyIcon(ourCurrentAction.getIconWidth(), ourCurrentAction.getIconHeight()); @NotNull protected String myActionPlace = ActionPlaces.UNKNOWN; diff --git a/platform/platform-api/src/com/intellij/ide/highlighter/WorkspaceFileType.java b/platform/platform-api/src/com/intellij/ide/highlighter/WorkspaceFileType.java index 19e10ffc05da..1349311d28ba 100644 --- a/platform/platform-api/src/com/intellij/ide/highlighter/WorkspaceFileType.java +++ b/platform/platform-api/src/com/intellij/ide/highlighter/WorkspaceFileType.java @@ -15,9 +15,9 @@ */ package com.intellij.ide.highlighter; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.openapi.fileTypes.InternalFileType; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NonNls; @@ -26,7 +26,7 @@ import org.jetbrains.annotations.NotNull; import javax.swing.*; public class WorkspaceFileType implements InternalFileType { - private static final Icon ICON = IconLoader.getIcon("/nodes/ideaWorkspace.png"); + private static final Icon ICON = AllIcons.Nodes.IdeaWorkspace; @NonNls public static final String DEFAULT_EXTENSION = "iws"; @NonNls public static final String DOT_DEFAULT_EXTENSION = "." + DEFAULT_EXTENSION; diff --git a/platform/platform-api/src/com/intellij/ide/util/treeView/smartTree/Sorter.java b/platform/platform-api/src/com/intellij/ide/util/treeView/smartTree/Sorter.java index 1ffcda3bcf7a..5a2992799433 100644 --- a/platform/platform-api/src/com/intellij/ide/util/treeView/smartTree/Sorter.java +++ b/platform/platform-api/src/com/intellij/ide/util/treeView/smartTree/Sorter.java @@ -15,8 +15,8 @@ */ package com.intellij.ide.util.treeView.smartTree; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -67,7 +67,7 @@ public interface Sorter extends TreeAction { public ActionPresentation getPresentation() { return new ActionPresentationData(IdeBundle.message("action.sort.alphabetically"), IdeBundle.message("action.sort.alphabetically"), - IconLoader.getIcon("/objectBrowser/sorted.png")); + AllIcons.ObjectBrowser.Sorted); } @NotNull diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java index c8bb89d23895..5034dddbc5c7 100644 --- a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java +++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.actionSystem.ex; +import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.ui.popup.JBPopupFactory; @@ -40,7 +41,7 @@ import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; public abstract class ComboBoxAction extends AnAction implements CustomComponentAction { - private static final Icon ARROW_ICON = IconLoader.getIcon("/general/comboArrow.png"); + private static final Icon ARROW_ICON = AllIcons.General.ComboArrow; private static final Icon DISABLED_ARROW_ICON = IconLoader.getDisabledIcon(ARROW_ICON); private boolean mySmallVariant = true; diff --git a/platform/platform-api/src/com/intellij/openapi/fileTypes/NativeFileType.java b/platform/platform-api/src/com/intellij/openapi/fileTypes/NativeFileType.java index 765fe5c5ae0f..2a7238a550f2 100644 --- a/platform/platform-api/src/com/intellij/openapi/fileTypes/NativeFileType.java +++ b/platform/platform-api/src/com/intellij/openapi/fileTypes/NativeFileType.java @@ -16,8 +16,8 @@ package com.intellij.openapi.fileTypes; import com.intellij.execution.configurations.GeneralCommandLine; +import com.intellij.icons.AllIcons; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; @@ -32,7 +32,7 @@ import java.util.List; public class NativeFileType implements INativeFileType { public static final NativeFileType INSTANCE = new NativeFileType(); - private static final Icon ICON = IconLoader.getIcon("/fileTypes/custom.png"); + private static final Icon ICON = AllIcons.FileTypes.Custom; private NativeFileType() { } diff --git a/platform/platform-api/src/com/intellij/openapi/keymap/KeymapUtil.java b/platform/platform-api/src/com/intellij/openapi/keymap/KeymapUtil.java index 976f307edc4c..97c6a865f8ee 100644 --- a/platform/platform-api/src/com/intellij/openapi/keymap/KeymapUtil.java +++ b/platform/platform-api/src/com/intellij/openapi/keymap/KeymapUtil.java @@ -15,9 +15,9 @@ */ package com.intellij.openapi.keymap; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.InvalidDataException; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.registry.Registry; @@ -39,8 +39,8 @@ import java.util.StringTokenizer; public class KeymapUtil { - private static final Icon ourKeyboardShortcutIcon = IconLoader.getIcon("/general/keyboardShortcut.png"); - private static final Icon ourMouseShortcutIcon = IconLoader.getIcon("/general/mouseShortcut.png"); + private static final Icon ourKeyboardShortcutIcon = AllIcons.General.KeyboardShortcut; + private static final Icon ourMouseShortcutIcon = AllIcons.General.MouseShortcut; @NonNls private static final String APPLE_LAF_AQUA_LOOK_AND_FEEL_CLASS_NAME = "apple.laf.AquaLookAndFeel"; @NonNls private static final String GET_KEY_MODIFIERS_TEXT_METHOD = "getKeyModifiersText"; @NonNls private static final String CANCEL_KEY_TEXT = "Cancel"; diff --git a/platform/platform-api/src/com/intellij/openapi/ui/Banner.java b/platform/platform-api/src/com/intellij/openapi/ui/Banner.java index 4b99bb2e407e..52e555a92211 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/Banner.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/Banner.java @@ -15,7 +15,7 @@ */ package com.intellij.openapi.ui; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.ui.components.labels.LinkLabel; import com.intellij.ui.components.labels.LinkListener; import com.intellij.ui.components.panels.NonOpaquePanel; @@ -114,7 +114,7 @@ public class Banner extends NonOpaquePanel implements PropertyChangeListener{ eachLabel.setFont(eachLabel.getFont().deriveFont(Font.BOLD, eachLabel.getFont().getSize())); myText.add(eachLabel); if (i < text.length - 1) { - final JLabel eachIcon = new JLabel(IconLoader.getIcon("/general/comboArrowRight.png"), JLabel.CENTER); + final JLabel eachIcon = new JLabel(AllIcons.General.ComboArrowRight, JLabel.CENTER); eachIcon.setBorder(new EmptyBorder(0, 0, 0, gap)); myText.add(eachIcon); } diff --git a/platform/platform-api/src/com/intellij/openapi/ui/ComboBoxTableRenderer.java b/platform/platform-api/src/com/intellij/openapi/ui/ComboBoxTableRenderer.java index 4afd7754bdc4..66554bc17963 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/ComboBoxTableRenderer.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/ComboBoxTableRenderer.java @@ -16,9 +16,9 @@ package com.intellij.openapi.ui; +import com.intellij.icons.AllIcons; import com.intellij.openapi.ui.popup.*; import com.intellij.openapi.util.Condition; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.ui.UIUtil; @@ -40,7 +40,7 @@ import java.util.List; * @author spleaner */ public class ComboBoxTableRenderer extends JLabel implements TableCellRenderer, TableCellEditor, JBPopupListener { - private static final Icon ARROW_ICON = IconLoader.getIcon("/general/comboArrow.png"); + private static final Icon ARROW_ICON = AllIcons.General.ComboArrow; private final T[] myValues; private WeakReference myPopupRef; diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java index b8b031ba44a7..50162deaf448 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java @@ -16,6 +16,7 @@ package com.intellij.openapi.ui; import com.intellij.CommonBundle; +import com.intellij.icons.AllIcons; import com.intellij.ide.ui.UISettings; import com.intellij.idea.ActionsBundle; import com.intellij.openapi.Disposable; @@ -237,8 +238,8 @@ public abstract class DialogWrapper { private int myValidationDelay = 300; private boolean myDisposed = false; private boolean myValidationStarted = false; - private static final Icon ERROR_POINT = IconLoader.getIcon("/ide/errorPoint.png"); - private static final Icon ERROR_SIGN = IconLoader.getIcon("/ide/errorSign.png"); + private static final Icon ERROR_POINT = AllIcons.Ide.ErrorPoint; + private static final Icon ERROR_SIGN = AllIcons.Ide.ErrorSign; private final ErrorPainter myErrorPainter = new ErrorPainter(); private JComponent myErrorPane; private boolean myErrorPainterInstalled = false; @@ -1761,7 +1762,7 @@ public abstract class DialogWrapper { } else { myLabel.setText("" + text + ""); - myLabel.setIcon(IconLoader.getIcon("/actions/lightning.png")); + myLabel.setIcon(AllIcons.Actions.Lightning); myLabel.setBorder(new EmptyBorder(4, 10, 0, 2)); setVisible(true); } diff --git a/platform/platform-api/src/com/intellij/openapi/ui/FixedSizeButton.java b/platform/platform-api/src/com/intellij/openapi/ui/FixedSizeButton.java index 10d29ebd7a40..2faccd9e3ca4 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/FixedSizeButton.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/FixedSizeButton.java @@ -15,7 +15,7 @@ */ package com.intellij.openapi.ui; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NotNull; @@ -35,7 +35,7 @@ public class FixedSizeButton extends JButton { } private FixedSizeButton(int size, JComponent component) { - Icon icon = IconLoader.findIcon("/general/ellipsis.png"); + Icon icon = AllIcons.General.Ellipsis; if (icon != null) { // loading may fail at design time setIcon(icon); diff --git a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java index 35e81d39e964..c2d5c3365ef7 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/MasterDetailsComponent.java @@ -16,6 +16,7 @@ package com.intellij.openapi.ui; import com.intellij.CommonBundle; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.options.Configurable; @@ -28,7 +29,6 @@ import com.intellij.openapi.ui.popup.ListPopupStep; import com.intellij.openapi.util.ActionCallback; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Condition; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.*; import com.intellij.ui.navigation.History; @@ -881,7 +881,7 @@ public abstract class MasterDetailsComponent implements Configurable, DetailsCom } public Icon getIcon() { - return IconLoader.getIcon("/general/applicationSettings.png"); + return AllIcons.General.ApplicationSettings; } @Nullable diff --git a/platform/platform-api/src/com/intellij/openapi/ui/popup/util/MinimizeButton.java b/platform/platform-api/src/com/intellij/openapi/ui/popup/util/MinimizeButton.java index e33bc1eea12d..f1a3e5fd7d07 100644 --- a/platform/platform-api/src/com/intellij/openapi/ui/popup/util/MinimizeButton.java +++ b/platform/platform-api/src/com/intellij/openapi/ui/popup/util/MinimizeButton.java @@ -16,14 +16,14 @@ package com.intellij.openapi.ui.popup.util; +import com.intellij.icons.AllIcons; import com.intellij.openapi.ui.popup.IconButton; -import com.intellij.openapi.util.IconLoader; public class MinimizeButton extends IconButton { public MinimizeButton(final String tooltip) { - super(tooltip, IconLoader.getIcon("/general/hideToolWindow.png"), - IconLoader.getIcon("/general/hideToolWindow.png"), - IconLoader.getIcon("/general/hideToolWindowInactive.png")); + super(tooltip, AllIcons.General.HideToolWindow, + AllIcons.General.HideToolWindow, + AllIcons.General.HideToolWindowInactive); } } diff --git a/platform/platform-api/src/com/intellij/ui/AutoScrollFromSourceHandler.java b/platform/platform-api/src/com/intellij/ui/AutoScrollFromSourceHandler.java index 08fbaa882979..304cb92af336 100644 --- a/platform/platform-api/src/com/intellij/ui/AutoScrollFromSourceHandler.java +++ b/platform/platform-api/src/com/intellij/ui/AutoScrollFromSourceHandler.java @@ -16,6 +16,7 @@ package com.intellij.ui; +import com.intellij.icons.AllIcons; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.ToggleAction; @@ -27,7 +28,6 @@ import com.intellij.openapi.fileEditor.FileEditorManagerListener; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.util.Alarm; import com.intellij.util.messages.MessageBusConnection; import org.jetbrains.annotations.NotNull; @@ -106,7 +106,7 @@ public abstract class AutoScrollFromSourceHandler implements Disposable { public AutoScrollFromSourceAction() { super(UIBundle.message("autoscroll.from.source.action.name"), UIBundle.message("autoscroll.from.source.action.description"), - IconLoader.getIcon("/general/autoscrollFromSource.png")); + AllIcons.General.AutoscrollFromSource); } public boolean isSelected(final AnActionEvent event) { diff --git a/platform/platform-api/src/com/intellij/ui/AutoScrollToSourceHandler.java b/platform/platform-api/src/com/intellij/ui/AutoScrollToSourceHandler.java index 5540c1bf9d3c..e5aba7b777e0 100644 --- a/platform/platform-api/src/com/intellij/ui/AutoScrollToSourceHandler.java +++ b/platform/platform-api/src/com/intellij/ui/AutoScrollToSourceHandler.java @@ -16,6 +16,7 @@ package com.intellij.ui; +import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.DataContext; @@ -25,7 +26,6 @@ import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.fileTypes.FileTypes; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.util.ActionCallback; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.PersistentFSConstants; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.wm.ToolWindow; @@ -205,7 +205,8 @@ public abstract class AutoScrollToSourceHandler { private class AutoscrollToSourceAction extends ToggleAction implements DumbAware { public AutoscrollToSourceAction() { - super(UIBundle.message("autoscroll.to.source.action.name"), UIBundle.message("autoscroll.to.source.action.description"), IconLoader.getIcon("/general/autoscrollToSource.png")); + super(UIBundle.message("autoscroll.to.source.action.name"), UIBundle.message("autoscroll.to.source.action.description"), + AllIcons.General.AutoscrollToSource); } public boolean isSelected(AnActionEvent event) { diff --git a/platform/platform-api/src/com/intellij/ui/RawCommandLineEditor.java b/platform/platform-api/src/com/intellij/ui/RawCommandLineEditor.java index 5b0296ecfd54..ad1673eb7406 100644 --- a/platform/platform-api/src/com/intellij/ui/RawCommandLineEditor.java +++ b/platform/platform-api/src/com/intellij/ui/RawCommandLineEditor.java @@ -15,12 +15,12 @@ */ package com.intellij.ui; +import com.intellij.icons.AllIcons; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.ui.LabeledComponent; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.TextFieldWithBrowseButton; -import com.intellij.openapi.util.IconLoader; import javax.swing.*; import javax.swing.text.Document; @@ -49,7 +49,7 @@ public class RawCommandLineEditor extends JPanel { Messages.showTextAreaDialog(myTextField.getTextField(), myDialogCaption, "EditParametersPopupWindow"); } }); - myTextField.setButtonIcon(IconLoader.getIcon("/actions/showViewer.png")); + myTextField.setButtonIcon(AllIcons.Actions.ShowViewer); add(myTextField, BorderLayout.CENTER); setDescriptor(null); } diff --git a/platform/platform-api/src/com/intellij/ui/ReorderableListController.java b/platform/platform-api/src/com/intellij/ui/ReorderableListController.java index b2db5b5c5bc7..c7cb1ba5b1ee 100644 --- a/platform/platform-api/src/com/intellij/ui/ReorderableListController.java +++ b/platform/platform-api/src/com/intellij/ui/ReorderableListController.java @@ -15,11 +15,11 @@ */ package com.intellij.ui; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.Factory; -import com.intellij.openapi.util.IconLoader; import com.intellij.util.IconUtil; import com.intellij.util.PlatformIcons; import com.intellij.util.containers.Convertor; @@ -82,7 +82,7 @@ public abstract class ReorderableListController { } public void addMoveDownAction() { - addAction(new AnAction(UIBundle.message("move.down.action.name"), null, IconLoader.getIcon("/actions/moveDown.png")) { + addAction(new AnAction(UIBundle.message("move.down.action.name"), null, AllIcons.Actions.MoveDown) { public void actionPerformed(final AnActionEvent e) { ListUtil.moveSelectedItemsDown(myList); } diff --git a/platform/platform-api/src/com/intellij/ui/SearchTextField.java b/platform/platform-api/src/com/intellij/ui/SearchTextField.java index 20009ae1d601..185079a0ecda 100644 --- a/platform/platform-api/src/com/intellij/ui/SearchTextField.java +++ b/platform/platform-api/src/com/intellij/ui/SearchTextField.java @@ -15,13 +15,13 @@ */ package com.intellij.ui; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.CommonShortcuts; import com.intellij.openapi.actionSystem.IdeActions; import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.ui.popup.JBPopupFactory; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.SystemInfo; import com.intellij.ui.components.JBList; import com.intellij.util.ui.UIUtil; @@ -39,8 +39,8 @@ import java.util.List; * @author max */ public class SearchTextField extends JPanel { - private static final Icon SEARCH_ICON = IconLoader.getIcon("/actions/search.png"); - private static final Icon CLEAR_ICON = IconLoader.getIcon("/actions/cleanLight.png"); + private static final Icon SEARCH_ICON = AllIcons.Actions.Search; + private static final Icon CLEAR_ICON = AllIcons.Actions.CleanLight; private int myHistorySize = 5; private final MyModel myModel; diff --git a/platform/platform-api/src/com/intellij/ui/components/JBComboBoxLabel.java b/platform/platform-api/src/com/intellij/ui/components/JBComboBoxLabel.java index fe8f2f11e523..f8f8b22340d5 100644 --- a/platform/platform-api/src/com/intellij/ui/components/JBComboBoxLabel.java +++ b/platform/platform-api/src/com/intellij/ui/components/JBComboBoxLabel.java @@ -15,7 +15,7 @@ */ package com.intellij.ui.components; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.util.PlatformIcons; import javax.swing.*; @@ -55,7 +55,7 @@ public class JBComboBoxLabel extends JPanel { } public void setSelectionIcon() { - myIcon.setIcon(IconLoader.getIcon("/general/combo.png")); + myIcon.setIcon(AllIcons.General.Combo); } @Override diff --git a/platform/platform-api/src/com/intellij/ui/components/JBOptionButton.java b/platform/platform-api/src/com/intellij/ui/components/JBOptionButton.java index db80798b0ac3..ae821731f8ac 100644 --- a/platform/platform-api/src/com/intellij/ui/components/JBOptionButton.java +++ b/platform/platform-api/src/com/intellij/ui/components/JBOptionButton.java @@ -15,9 +15,9 @@ */ package com.intellij.ui.components; +import com.intellij.icons.AllIcons; import com.intellij.openapi.Disposable; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Ref; import com.intellij.openapi.wm.IdeGlassPane; import com.intellij.openapi.wm.IdeGlassPaneUtil; @@ -36,7 +36,7 @@ import java.util.Set; public class JBOptionButton extends JButton implements MouseMotionListener { - private static final Icon myDownIcon = IconLoader.getIcon("/general/arrowDown.png"); + private static final Icon myDownIcon = AllIcons.General.ArrowDown; private static final Insets myDownIconInsets = new Insets(0, 6, 0, 4); private Rectangle myMoreRec; diff --git a/platform/platform-api/src/com/intellij/ui/components/labels/LinkLabel.java b/platform/platform-api/src/com/intellij/ui/components/labels/LinkLabel.java index 5169e7a4e937..78707b3d12c0 100644 --- a/platform/platform-api/src/com/intellij/ui/components/labels/LinkLabel.java +++ b/platform/platform-api/src/com/intellij/ui/components/labels/LinkLabel.java @@ -15,10 +15,10 @@ */ package com.intellij.ui.components.labels; +import com.intellij.icons.AllIcons; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.wm.StatusBar; import com.intellij.ui.UI; import com.intellij.util.ui.UIUtil; @@ -55,7 +55,7 @@ public class LinkLabel extends JLabel { private boolean myClickIsBeingProcessed; private boolean myPaintDefaultIcon; protected static final int DEFAULT_ICON_GAP = 2; - private static final Icon LINK = IconLoader.getIcon("/ide/link.png"); + private static final Icon LINK = AllIcons.Ide.Link; public LinkLabel() { this("", LINK); diff --git a/platform/platform-api/src/com/intellij/ui/dualView/DualView.java b/platform/platform-api/src/com/intellij/ui/dualView/DualView.java index efc1765053eb..3839098caf7e 100644 --- a/platform/platform-api/src/com/intellij/ui/dualView/DualView.java +++ b/platform/platform-api/src/com/intellij/ui/dualView/DualView.java @@ -15,13 +15,13 @@ */ package com.intellij.ui.dualView; +import com.intellij.icons.AllIcons; import com.intellij.ide.util.PropertiesComponent; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonShortcuts; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.UIBundle; import com.intellij.ui.table.BaseTableView; @@ -379,7 +379,7 @@ public class DualView extends JPanel { } public AnAction getExpandAllAction() { - return new AnAction(UIBundle.message("tree.view.expand.all.action.name"), null, IconLoader.getIcon("/actions/expandall.png")) { + return new AnAction(UIBundle.message("tree.view.expand.all.action.name"), null, AllIcons.Actions.Expandall) { public void update(AnActionEvent e) { Presentation presentation = e.getPresentation(); presentation.setVisible(true); @@ -393,7 +393,7 @@ public class DualView extends JPanel { } public AnAction getCollapseAllAction() { - return new AnAction(UIBundle.message("tree.view.collapse.all.action.name"), null, IconLoader.getIcon("/actions/collapseall.png")) { + return new AnAction(UIBundle.message("tree.view.collapse.all.action.name"), null, AllIcons.Actions.Collapseall) { public void update(AnActionEvent e) { Presentation presentation = e.getPresentation(); presentation.setVisible(true); diff --git a/platform/platform-api/src/com/intellij/ui/tabs/TabInfo.java b/platform/platform-api/src/com/intellij/ui/tabs/TabInfo.java index b851d9745126..40cbb9a94307 100644 --- a/platform/platform-api/src/com/intellij/ui/tabs/TabInfo.java +++ b/platform/platform-api/src/com/intellij/ui/tabs/TabInfo.java @@ -15,9 +15,9 @@ */ package com.intellij.ui.tabs; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.ActionGroup; import com.intellij.openapi.ui.Queryable; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.PlaceProvider; import com.intellij.ui.SimpleColoredText; import com.intellij.ui.SimpleTextAttributes; @@ -78,7 +78,7 @@ public final class TabInfo implements Queryable, PlaceProvider { private Color myDefaultWaveColor; private SimpleTextAttributes myDefaultAttributes; - private static final AlertIcon DEFAULT_ALERT_ICON = new AlertIcon(IconLoader.getIcon("/nodes/tabAlert.png")); + private static final AlertIcon DEFAULT_ALERT_ICON = new AlertIcon(AllIcons.Nodes.TabAlert); private boolean myEnabled = true; private Color myTabColor = null; diff --git a/platform/platform-api/src/com/intellij/ui/tabs/impl/singleRow/MoreTabsIcon.java b/platform/platform-api/src/com/intellij/ui/tabs/impl/singleRow/MoreTabsIcon.java index 98b6ebce5add..57972c71d61d 100644 --- a/platform/platform-api/src/com/intellij/ui/tabs/impl/singleRow/MoreTabsIcon.java +++ b/platform/platform-api/src/com/intellij/ui/tabs/impl/singleRow/MoreTabsIcon.java @@ -15,7 +15,7 @@ */ package com.intellij.ui.tabs.impl.singleRow; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import org.jetbrains.annotations.Nullable; import javax.swing.*; @@ -25,7 +25,7 @@ import java.awt.*; * @author pegov */ public abstract class MoreTabsIcon { - final Icon myIcon = IconLoader.getIcon("/general/moreTabs.png"); + final Icon myIcon = AllIcons.General.MoreTabs; private boolean myPainted; public void paintIcon(final Component c, final Graphics g) { diff --git a/platform/platform-api/src/com/intellij/ui/treeStructure/actions/CollapseAllAction.java b/platform/platform-api/src/com/intellij/ui/treeStructure/actions/CollapseAllAction.java index 1b8a0668776e..c96a3c9dfebe 100644 --- a/platform/platform-api/src/com/intellij/ui/treeStructure/actions/CollapseAllAction.java +++ b/platform/platform-api/src/com/intellij/ui/treeStructure/actions/CollapseAllAction.java @@ -15,10 +15,10 @@ */ package com.intellij.ui.treeStructure.actions; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.project.DumbAware; -import com.intellij.openapi.util.IconLoader; import javax.swing.*; @@ -27,7 +27,7 @@ public class CollapseAllAction extends AnAction implements DumbAware { protected JTree myTree; public CollapseAllAction(JTree tree) { - super("Collapse All", "", IconLoader.getIcon("/actions/collapseall.png")); + super("Collapse All", "", AllIcons.Actions.Collapseall); myTree = tree; } diff --git a/platform/platform-api/src/com/intellij/ui/treeStructure/actions/ExpandAllAction.java b/platform/platform-api/src/com/intellij/ui/treeStructure/actions/ExpandAllAction.java index 56c7374baa17..06500e7a4d4d 100644 --- a/platform/platform-api/src/com/intellij/ui/treeStructure/actions/ExpandAllAction.java +++ b/platform/platform-api/src/com/intellij/ui/treeStructure/actions/ExpandAllAction.java @@ -15,9 +15,9 @@ */ package com.intellij.ui.treeStructure.actions; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.util.IconLoader; import javax.swing.*; @@ -26,7 +26,7 @@ public class ExpandAllAction extends AnAction { protected JTree myTree; public ExpandAllAction(JTree tree) { - super("Expand All", "", IconLoader.getIcon("/actions/expandall.png")); + super("Expand All", "", AllIcons.Actions.Expandall); myTree = tree; } diff --git a/platform/platform-api/src/com/intellij/util/Icons.java b/platform/platform-api/src/com/intellij/util/Icons.java index f4a87ed22e6c..21fc60149ece 100644 --- a/platform/platform-api/src/com/intellij/util/Icons.java +++ b/platform/platform-api/src/com/intellij/util/Icons.java @@ -15,7 +15,7 @@ */ package com.intellij.util; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import javax.swing.*; @@ -24,41 +24,41 @@ import javax.swing.*; * @see PlatformIcons */ public abstract class Icons implements PlatformIcons { - @Deprecated public static final Icon EJB_CLASS_ICON = IconLoader.getIcon("/javaee/ejbClass.png"); - @Deprecated public static final Icon EJB_INTERCEPTOR_CLASS_ICON = IconLoader.getIcon("/javaee/interceptorClass.png"); - @Deprecated public static final Icon EJB_HOME_INTERFACE_ICON = IconLoader.getIcon("/javaee/home.png"); - @Deprecated public static final Icon EJB_LOCAL_HOME_INTERFACE_ICON = IconLoader.getIcon("/javaee/localHome.png"); - @Deprecated public static final Icon EJB_LOCAL_INTERFACE_ICON = IconLoader.getIcon("/javaee/local.png"); - @Deprecated public static final Icon EJB_REMOTE_INTERFACE_ICON = IconLoader.getIcon("/javaee/remote.png"); - @Deprecated public static final Icon EJB_ICON = IconLoader.getIcon("/nodes/ejb.png"); - @Deprecated public static final Icon EJB_CREATE_METHOD_ICON = IconLoader.getIcon("/nodes/ejbCreateMethod.png"); - @Deprecated public static final Icon EJB_FINDER_METHOD_ICON = IconLoader.getIcon("/nodes/ejbFinderMethod.png"); - @Deprecated public static final Icon EJB_BUSINESS_METHOD_ICON = IconLoader.getIcon("/nodes/ejbBusinessMethod.png"); - @Deprecated public static final Icon EJB_CMP_FIELD_ICON = IconLoader.getIcon("/nodes/ejbCmpField.png"); - @Deprecated public static final Icon EJB_CMR_FIELD_ICON = IconLoader.getIcon("/nodes/ejbCmrField.png"); - @Deprecated public static final Icon EJB_PRIMARY_KEY_CLASS = IconLoader.getIcon("/nodes/ejbPrimaryKeyClass.png"); - @Deprecated public static final Icon EJB_REFERENCE = IconLoader.getIcon("/nodes/ejbReference.png"); - @Deprecated public static final Icon EJB_FIELD_PK = IconLoader.getIcon("/nodes/fieldPK.png"); + @Deprecated public static final Icon EJB_CLASS_ICON = AllIcons.Javaee.EjbClass; + @Deprecated public static final Icon EJB_INTERCEPTOR_CLASS_ICON = AllIcons.Javaee.InterceptorClass; + @Deprecated public static final Icon EJB_HOME_INTERFACE_ICON = AllIcons.Javaee.Home; + @Deprecated public static final Icon EJB_LOCAL_HOME_INTERFACE_ICON = AllIcons.Javaee.LocalHome; + @Deprecated public static final Icon EJB_LOCAL_INTERFACE_ICON = AllIcons.Javaee.Local; + @Deprecated public static final Icon EJB_REMOTE_INTERFACE_ICON = AllIcons.Javaee.Remote; + @Deprecated public static final Icon EJB_ICON = AllIcons.Nodes.Ejb; + @Deprecated public static final Icon EJB_CREATE_METHOD_ICON = AllIcons.Nodes.EjbCreateMethod; + @Deprecated public static final Icon EJB_FINDER_METHOD_ICON = AllIcons.Nodes.EjbFinderMethod; + @Deprecated public static final Icon EJB_BUSINESS_METHOD_ICON = AllIcons.Nodes.EjbBusinessMethod; + @Deprecated public static final Icon EJB_CMP_FIELD_ICON = AllIcons.Nodes.EjbCmpField; + @Deprecated public static final Icon EJB_CMR_FIELD_ICON = AllIcons.Nodes.EjbCmrField; + @Deprecated public static final Icon EJB_PRIMARY_KEY_CLASS = AllIcons.Nodes.EjbPrimaryKeyClass; + @Deprecated public static final Icon EJB_REFERENCE = AllIcons.Nodes.EjbReference; + @Deprecated public static final Icon EJB_FIELD_PK = AllIcons.Nodes.FieldPK; - @Deprecated public static final Icon DATASOURCE_ICON = IconLoader.getIcon("/nodes/DataSource.png"); - @Deprecated public static final Icon DATASOURCE_DISABLED_ICON = IconLoader.getIcon("/nodes/DataSourceDisabled.png"); - @Deprecated public static final Icon DATASOURCE_TABLE_ICON = IconLoader.getIcon("/nodes/DataTables.png"); - @Deprecated public static final Icon DATASOURCE_VIEW_ICON = IconLoader.getIcon("/nodes/dataView.png"); - @Deprecated public static final Icon DATASOURCE_SEQUENCE_ICON = IconLoader.getIcon("/nodes/dataSequence.png"); - @Deprecated public static final Icon DATASOURCE_COLUMN_ICON = IconLoader.getIcon("/nodes/dataColumn.png"); - @Deprecated public static final Icon DATASOURCE_FK_COLUMN_ICON = IconLoader.getIcon("/nodes/dataFkColumn.png"); - @Deprecated public static final Icon DATASOURCE_PK_COLUMN_ICON = IconLoader.getIcon("/nodes/dataPkColumn.png"); + @Deprecated public static final Icon DATASOURCE_ICON = AllIcons.Nodes.DataSource; + @Deprecated public static final Icon DATASOURCE_DISABLED_ICON = AllIcons.Nodes.DataSourceDisabled; + @Deprecated public static final Icon DATASOURCE_TABLE_ICON = AllIcons.Nodes.DataTables; + @Deprecated public static final Icon DATASOURCE_VIEW_ICON = AllIcons.Nodes.DataView; + @Deprecated public static final Icon DATASOURCE_SEQUENCE_ICON = AllIcons.Nodes.DataSequence; + @Deprecated public static final Icon DATASOURCE_COLUMN_ICON = AllIcons.Nodes.DataColumn; + @Deprecated public static final Icon DATASOURCE_FK_COLUMN_ICON = AllIcons.Nodes.DataFkColumn; + @Deprecated public static final Icon DATASOURCE_PK_COLUMN_ICON = AllIcons.Nodes.DataPkColumn; - @Deprecated public static final Icon WEB_FOLDER_OPEN = IconLoader.getIcon("/nodes/webFolderOpen.png"); - @Deprecated public static final Icon WEB_FOLDER_CLOSED = IconLoader.getIcon("/nodes/webFolderClosed.png"); + @Deprecated public static final Icon WEB_FOLDER_OPEN = AllIcons.Nodes.WebFolderOpen; + @Deprecated public static final Icon WEB_FOLDER_CLOSED = AllIcons.Nodes.WebFolderClosed; - @Deprecated public static final Icon DATASOURCE_REMOTE_INSTANCE = IconLoader.getIcon("/nodes/addRemoteWeblogicInstance.png"); + @Deprecated public static final Icon DATASOURCE_REMOTE_INSTANCE = AllIcons.Nodes.AddRemoteWeblogicInstance; - @Deprecated public static final Icon ANT_TARGET_ICON = IconLoader.getIcon("/ant/target.png"); - @Deprecated public static final Icon ANT_META_TARGET_ICON = IconLoader.getIcon("/ant/metaTarget.png"); + @Deprecated public static final Icon ANT_TARGET_ICON = AllIcons.Ant.Target; + @Deprecated public static final Icon ANT_META_TARGET_ICON = AllIcons.Ant.MetaTarget; - @Deprecated public static final Icon JUNIT_TEST_CLASS_ICON = IconLoader.getIcon("/nodes/junitTestClass.png"); + @Deprecated public static final Icon JUNIT_TEST_CLASS_ICON = AllIcons.Nodes.JunitTestClass; - @Deprecated public static final Icon PARENTS_INTRODUCTION_ICON = IconLoader.getIcon("/nodes/parentsIntroduction.png"); - @Deprecated public static final Icon SOFTENING_INTRODUCTION_ICON = IconLoader.getIcon("/nodes/softeningIntroduction.png"); + @Deprecated public static final Icon PARENTS_INTRODUCTION_ICON = AllIcons.Nodes.ParentsIntroduction; + @Deprecated public static final Icon SOFTENING_INTRODUCTION_ICON = AllIcons.Nodes.SofteningIntroduction; } diff --git a/platform/platform-api/src/com/intellij/util/ui/AsyncProcessIcon.java b/platform/platform-api/src/com/intellij/util/ui/AsyncProcessIcon.java index 6e8a74b756c5..4d89b8fe863a 100644 --- a/platform/platform-api/src/com/intellij/util/ui/AsyncProcessIcon.java +++ b/platform/platform-api/src/com/intellij/util/ui/AsyncProcessIcon.java @@ -16,6 +16,7 @@ package com.intellij.util.ui; +import com.intellij.icons.AllIcons; import com.intellij.openapi.util.IconLoader; import com.intellij.ui.LayeredIcon; import org.jetbrains.annotations.NonNls; @@ -28,7 +29,7 @@ public class AsyncProcessIcon extends AnimatedIcon { public static final int CYCLE_LENGTH = 800; private static final Icon[] SMALL_ICONS = findIcons("/process/step_", "/process/step_mask.png"); - private static final Icon SMALL_PASSIVE_ICON = IconLoader.getIcon("/process/step_passive.png"); + private static final Icon SMALL_PASSIVE_ICON = AllIcons.Process.Step_passive; private boolean myUseMask; public AsyncProcessIcon(@NonNls String name) { @@ -91,7 +92,7 @@ public class AsyncProcessIcon extends AnimatedIcon { public static class Big extends AsyncProcessIcon { private static final Icon[] BIG_ICONS = findIcons("/process/big/step_", null); - private static final Icon BIG_PASSIVE_ICON = IconLoader.getIcon("/process/big/step_passive.png"); + private static final Icon BIG_PASSIVE_ICON = AllIcons.Process.Big.Step_passive; public Big(@NonNls final String name) { super(name, BIG_ICONS, BIG_PASSIVE_ICON); diff --git a/platform/platform-impl/src/com/intellij/application/options/ExportSchemeAction.java b/platform/platform-impl/src/com/intellij/application/options/ExportSchemeAction.java index 3b5dbeaad241..c0e672634096 100644 --- a/platform/platform-impl/src/com/intellij/application/options/ExportSchemeAction.java +++ b/platform/platform-impl/src/com/intellij/application/options/ExportSchemeAction.java @@ -15,6 +15,7 @@ */ package com.intellij.application.options; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.Presentation; @@ -22,7 +23,6 @@ import com.intellij.openapi.options.ExternalizableScheme; import com.intellij.openapi.options.Scheme; import com.intellij.openapi.options.SchemesManager; import com.intellij.openapi.ui.Messages; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.WriteExternalException; import java.io.IOException; @@ -31,7 +31,7 @@ public abstract class ExportSchemeAction mySchemesManager; public ExportSchemeAction(SchemesManager manager) { - super("Share", "Share scheme on server", IconLoader.getIcon("/actions/export.png")); + super("Share", "Share scheme on server", AllIcons.Actions.Export); mySchemesManager = manager; } diff --git a/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroConfigurable.java b/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroConfigurable.java index f3346ab507a0..11761bcd5190 100644 --- a/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroConfigurable.java +++ b/platform/platform-impl/src/com/intellij/application/options/pathMacros/PathMacroConfigurable.java @@ -15,6 +15,7 @@ */ package com.intellij.application.options.pathMacros; +import com.intellij.icons.AllIcons; import com.intellij.openapi.application.ApplicationBundle; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; @@ -22,7 +23,6 @@ import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.project.ex.ProjectEx; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -33,7 +33,7 @@ import javax.swing.*; * @author dsl */ public class PathMacroConfigurable implements SearchableConfigurable, Configurable.NoScroll { - public static final Icon ICON = IconLoader.getIcon("/general/pathVariables.png"); + public static final Icon ICON = AllIcons.General.PathVariables; @NonNls public static final String HELP_ID = "preferences.pathVariables"; private PathMacroListEditor myEditor; diff --git a/platform/platform-impl/src/com/intellij/codeInsight/hint/HintUtil.java b/platform/platform-impl/src/com/intellij/codeInsight/hint/HintUtil.java index a87d71b8a9c8..e123688ec328 100644 --- a/platform/platform-impl/src/com/intellij/codeInsight/hint/HintUtil.java +++ b/platform/platform-impl/src/com/intellij/codeInsight/hint/HintUtil.java @@ -15,8 +15,8 @@ */ package com.intellij.codeInsight.hint; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeTooltipManager; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.ColoredSideBorder; import com.intellij.ui.HintHint; import com.intellij.ui.SimpleColoredComponent; @@ -36,7 +36,7 @@ public class HintUtil { public static final Color ERROR_COLOR = new Color(255, 220, 220); private static final Icon INFORMATION_ICON = null; - private static final Icon QUESTION_ICON = IconLoader.getIcon("/actions/help.png"); + private static final Icon QUESTION_ICON = AllIcons.Actions.Help; private static final Icon ERROR_ICON = null; public static final Color QUESTION_UNDERSCORE_COLOR = Color.black; @@ -220,4 +220,4 @@ public class HintUtil { return "Hint: text='" + (myPane != null ? myPane.getText() : "") + "'"; } } -} \ No newline at end of file +} diff --git a/platform/platform-impl/src/com/intellij/diagnostic/IdeFatalErrorsIcon.java b/platform/platform-impl/src/com/intellij/diagnostic/IdeFatalErrorsIcon.java index 4d907e968563..17b525a0a4a9 100644 --- a/platform/platform-impl/src/com/intellij/diagnostic/IdeFatalErrorsIcon.java +++ b/platform/platform-impl/src/com/intellij/diagnostic/IdeFatalErrorsIcon.java @@ -1,7 +1,7 @@ package com.intellij.diagnostic; import com.intellij.concurrency.JobScheduler; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.ui.LayeredIcon; import javax.swing.*; @@ -16,9 +16,9 @@ import java.util.concurrent.TimeUnit; * @author ksafonov */ public class IdeFatalErrorsIcon extends JLabel { - public static final Icon UNREAD_ERROR_ICON = IconLoader.getIcon("/ide/fatalError.png"); - private static final Icon READ_ERROR_ICON = IconLoader.getIcon("/ide/fatalError-read.png"); - private static final Icon NO_ERRORS_ICON = IconLoader.getIcon("/ide/emptyFatalError.png"); + public static final Icon UNREAD_ERROR_ICON = AllIcons.Ide.FatalError; + private static final Icon READ_ERROR_ICON = AllIcons.Ide.FatalError_read; + private static final Icon NO_ERRORS_ICON = AllIcons.Ide.EmptyFatalError; public enum State {UnreadErrors, ReadErrors, NoErrors} diff --git a/platform/platform-impl/src/com/intellij/ide/BrowserSettings.java b/platform/platform-impl/src/com/intellij/ide/BrowserSettings.java index f991bb6a2946..97a057948aa5 100644 --- a/platform/platform-impl/src/com/intellij/ide/BrowserSettings.java +++ b/platform/platform-impl/src/com/intellij/ide/BrowserSettings.java @@ -15,10 +15,10 @@ */ package com.intellij.ide; +import com.intellij.icons.AllIcons; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; @@ -28,7 +28,7 @@ import javax.swing.*; * @author spleaner */ public class BrowserSettings implements Configurable, SearchableConfigurable { - private static final Icon ICON = IconLoader.getIcon("/general/browsersettings.png"); + private static final Icon ICON = AllIcons.General.Browsersettings; private BrowserSettingsPanel mySettingsPanel; @NotNull diff --git a/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java b/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java index 9c1caa26569d..afc512824019 100644 --- a/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java +++ b/platform/platform-impl/src/com/intellij/ide/GeneralSettingsConfigurable.java @@ -15,9 +15,9 @@ */ package com.intellij.ide; +import com.intellij.icons.AllIcons; import com.intellij.openapi.extensions.ExtensionPointName; import com.intellij.openapi.options.*; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -124,7 +124,7 @@ public class GeneralSettingsConfigurable extends CompositeConfigurable createConfigurables() { return AbstractConfigurableEP.createConfigurables(EP_NAME); } -} \ No newline at end of file +} diff --git a/platform/platform-impl/src/com/intellij/ide/actionMacro/ActionMacroManager.java b/platform/platform-impl/src/com/intellij/ide/actionMacro/ActionMacroManager.java index 190f202cd05b..dab0bdc4748e 100644 --- a/platform/platform-impl/src/com/intellij/ide/actionMacro/ActionMacroManager.java +++ b/platform/platform-impl/src/com/intellij/ide/actionMacro/ActionMacroManager.java @@ -15,6 +15,7 @@ */ package com.intellij.ide.actionMacro; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.ide.IdeEventQueue; import com.intellij.openapi.Disposable; @@ -34,7 +35,10 @@ import com.intellij.openapi.ui.popup.Balloon; import com.intellij.openapi.ui.popup.JBPopupAdapter; import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.ui.popup.LightweightWindowEvent; -import com.intellij.openapi.util.*; +import com.intellij.openapi.util.Disposer; +import com.intellij.openapi.util.InvalidDataException; +import com.intellij.openapi.util.NamedJDOMExternalizable; +import com.intellij.openapi.util.WriteExternalException; import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.wm.CustomStatusBarWidget; import com.intellij.openapi.wm.IdeFrame; @@ -181,11 +185,11 @@ public class ActionMacroManager implements ExportableApplicationComponent, Named private AnimatedIcon myIcon = new AnimatedIcon("Macro recording", new Icon[]{ - IconLoader.getIcon("/ide/macro/recording_1.png"), - IconLoader.getIcon("/ide/macro/recording_2.png"), - IconLoader.getIcon("/ide/macro/recording_3.png"), - IconLoader.getIcon("/ide/macro/recording_4.png")}, - IconLoader.getIcon("/ide/macro/recording_1.png"), 1000); + AllIcons.Ide.Macro.Recording_1, + AllIcons.Ide.Macro.Recording_2, + AllIcons.Ide.Macro.Recording_3, + AllIcons.Ide.Macro.Recording_4}, + AllIcons.Ide.Macro.Recording_1, 1000); private StatusBar myStatusBar; private final WidgetPresentation myPresentation; diff --git a/platform/platform-impl/src/com/intellij/ide/actionMacro/actions/StartStopMacroRecordingAction.java b/platform/platform-impl/src/com/intellij/ide/actionMacro/actions/StartStopMacroRecordingAction.java index 44f03ad0111e..887ac76e2e56 100644 --- a/platform/platform-impl/src/com/intellij/ide/actionMacro/actions/StartStopMacroRecordingAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actionMacro/actions/StartStopMacroRecordingAction.java @@ -15,6 +15,7 @@ */ package com.intellij.ide.actionMacro.actions; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.ide.actionMacro.ActionMacroManager; import com.intellij.openapi.actionSystem.ActionPlaces; @@ -22,7 +23,6 @@ import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.DumbAware; -import com.intellij.openapi.util.IconLoader; /** * @author max @@ -36,7 +36,7 @@ public class StartStopMacroRecordingAction extends AnAction implements DumbAware : IdeBundle.message("action.start.macro.recording")); if (ActionPlaces.STATUS_BAR_PLACE.equals(e.getPlace())) { - e.getPresentation().setIcon(isRecording ? IconLoader.getIcon("/ide/macro/recording_stop.png") : IconLoader.getIcon("/ide/macro/recording_stop.png")); + e.getPresentation().setIcon(isRecording ? AllIcons.Ide.Macro.Recording_stop : AllIcons.Ide.Macro.Recording_stop); } else { e.getPresentation().setIcon(null); } diff --git a/platform/platform-impl/src/com/intellij/ide/actions/CloseAction.java b/platform/platform-impl/src/com/intellij/ide/actions/CloseAction.java index 42a32c18e47d..78468c9d4d7b 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/CloseAction.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/CloseAction.java @@ -15,18 +15,18 @@ */ package com.intellij.ide.actions; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.ActionPlaces; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.DataKey; import com.intellij.openapi.project.DumbAware; -import com.intellij.openapi.util.IconLoader; public class CloseAction extends AnAction implements DumbAware { @Override public void update(AnActionEvent e) { - e.getPresentation().setIcon(ActionPlaces.isToolbarPlace(e.getPlace()) ? IconLoader.getIcon("/actions/cancel.png") : null); + e.getPresentation().setIcon(ActionPlaces.isToolbarPlace(e.getPlace()) ? AllIcons.Actions.Cancel : null); CloseTarget closeTarget = e.getData(CloseTarget.KEY); e.getPresentation().setEnabled(closeTarget != null); diff --git a/platform/platform-impl/src/com/intellij/ide/actions/ToolWindowsGroup.java b/platform/platform-impl/src/com/intellij/ide/actions/ToolWindowsGroup.java index 7be9a633c3ea..30b2096d1135 100644 --- a/platform/platform-impl/src/com/intellij/ide/actions/ToolWindowsGroup.java +++ b/platform/platform-impl/src/com/intellij/ide/actions/ToolWindowsGroup.java @@ -15,6 +15,7 @@ */ package com.intellij.ide.actions; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.openapi.actionSystem.ActionGroup; import com.intellij.openapi.actionSystem.ActionManager; @@ -23,7 +24,6 @@ import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.project.ProjectManagerAdapter; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.wm.ToolWindowId; import com.intellij.openapi.wm.ex.ToolWindowManagerAdapter; import com.intellij.openapi.wm.ex.ToolWindowManagerEx; @@ -43,19 +43,27 @@ public final class ToolWindowsGroup extends ActionGroup { private static final HashMap ourId2Text; static{ ourId2Text = new HashMap(); - ourId2Text.put(ToolWindowId.COMMANDER, new MyDescriptor(IdeBundle.message("action.toolwindow.commander"), IconLoader.getIcon("/general/toolWindowCommander.png"))); - ourId2Text.put(ToolWindowId.MESSAGES_WINDOW, new MyDescriptor(IdeBundle.message("action.toolwindow.messages"), IconLoader.getIcon("/general/toolWindowMessages.png"))); - ourId2Text.put(ToolWindowId.PROJECT_VIEW, new MyDescriptor(IdeBundle.message("action.toolwindow.project"), IconLoader.getIcon("/general/toolWindowProject.png"))); - ourId2Text.put(ToolWindowId.STRUCTURE_VIEW, new MyDescriptor(IdeBundle.message("action.toolwindow.structure"), IconLoader.getIcon("/general/toolWindowStructure.png"))); - ourId2Text.put(ToolWindowId.ANT_BUILD, new MyDescriptor(IdeBundle.message("action.toolwindow.ant.build"), IconLoader.getIcon("/general/toolWindowAnt.png"))); - ourId2Text.put(ToolWindowId.DEBUG, new MyDescriptor(IdeBundle.message("action.toolwindow.debug"), IconLoader.getIcon("/general/toolWindowDebugger.png"))); - ourId2Text.put(ToolWindowId.RUN, new MyDescriptor(IdeBundle.message("action.toolwindow.run"), IconLoader.getIcon("/general/toolWindowRun.png"))); - ourId2Text.put(ToolWindowId.FIND, new MyDescriptor(IdeBundle.message("action.toolwindow.find"), IconLoader.getIcon("/general/toolWindowFind.png"))); - ourId2Text.put(ToolWindowId.CVS, new MyDescriptor(IdeBundle.message("action.toolwindow.cvs"), IconLoader.getIcon("/general/toolWindowCvs.png"))); - ourId2Text.put(ToolWindowId.HIERARCHY, new MyDescriptor(IdeBundle.message("action.toolwindow.hierarchy"), IconLoader.getIcon("/general/toolWindowHierarchy.png"))); - ourId2Text.put(ToolWindowId.TODO_VIEW, new MyDescriptor(IdeBundle.message("action.toolwindow.todo"), IconLoader.getIcon("/general/toolWindowTodo.png"))); - ourId2Text.put(ToolWindowId.INSPECTION, new MyDescriptor(IdeBundle.message("action.toolwindow.inspection"), IconLoader.getIcon("/general/toolWindowInspection.png"))); - ourId2Text.put(ToolWindowId.FAVORITES_VIEW, new MyDescriptor(IdeBundle.message("action.toolwindow.favorites"), IconLoader.getIcon("/general/toolWindowFavorites.png"))); + ourId2Text.put(ToolWindowId.COMMANDER, new MyDescriptor(IdeBundle.message("action.toolwindow.commander"), + AllIcons.General.ToolWindowCommander)); + ourId2Text.put(ToolWindowId.MESSAGES_WINDOW, new MyDescriptor(IdeBundle.message("action.toolwindow.messages"), + AllIcons.General.ToolWindowMessages)); + ourId2Text.put(ToolWindowId.PROJECT_VIEW, new MyDescriptor(IdeBundle.message("action.toolwindow.project"), + AllIcons.General.ToolWindowProject)); + ourId2Text.put(ToolWindowId.STRUCTURE_VIEW, new MyDescriptor(IdeBundle.message("action.toolwindow.structure"), + AllIcons.General.ToolWindowStructure)); + ourId2Text.put(ToolWindowId.ANT_BUILD, new MyDescriptor(IdeBundle.message("action.toolwindow.ant.build"), + AllIcons.General.ToolWindowAnt)); + ourId2Text.put(ToolWindowId.DEBUG, new MyDescriptor(IdeBundle.message("action.toolwindow.debug"), AllIcons.General.ToolWindowDebugger)); + ourId2Text.put(ToolWindowId.RUN, new MyDescriptor(IdeBundle.message("action.toolwindow.run"), AllIcons.General.ToolWindowRun)); + ourId2Text.put(ToolWindowId.FIND, new MyDescriptor(IdeBundle.message("action.toolwindow.find"), AllIcons.General.ToolWindowFind)); + ourId2Text.put(ToolWindowId.CVS, new MyDescriptor(IdeBundle.message("action.toolwindow.cvs"), AllIcons.General.ToolWindowCvs)); + ourId2Text.put(ToolWindowId.HIERARCHY, new MyDescriptor(IdeBundle.message("action.toolwindow.hierarchy"), + AllIcons.General.ToolWindowHierarchy)); + ourId2Text.put(ToolWindowId.TODO_VIEW, new MyDescriptor(IdeBundle.message("action.toolwindow.todo"), AllIcons.General.ToolWindowTodo)); + ourId2Text.put(ToolWindowId.INSPECTION, new MyDescriptor(IdeBundle.message("action.toolwindow.inspection"), + AllIcons.General.ToolWindowInspection)); + ourId2Text.put(ToolWindowId.FAVORITES_VIEW, new MyDescriptor(IdeBundle.message("action.toolwindow.favorites"), + AllIcons.General.ToolWindowFavorites)); } private final ArrayList myChildren; diff --git a/platform/platform-impl/src/com/intellij/ide/dnd/Highlighters.java b/platform/platform-impl/src/com/intellij/ide/dnd/Highlighters.java index ad253baa9774..4c9de72bc16f 100644 --- a/platform/platform-impl/src/com/intellij/ide/dnd/Highlighters.java +++ b/platform/platform-impl/src/com/intellij/ide/dnd/Highlighters.java @@ -15,16 +15,13 @@ */ package com.intellij.ide.dnd; +import com.intellij.icons.AllIcons; import com.intellij.openapi.ui.MessageType; import com.intellij.openapi.ui.popup.Balloon; import com.intellij.openapi.ui.popup.JBPopupFactory; -import com.intellij.openapi.util.IconLoader; -import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.registry.Registry; import com.intellij.ui.awt.RelativePoint; -import com.intellij.util.ui.UIUtil; -import javax.accessibility.Accessible; import javax.swing.*; import java.awt.*; import java.util.ArrayList; @@ -232,8 +229,8 @@ public class Highlighters implements DnDEvent.DropTargetHighlightingType { } private static class HorizontalLinesHighlighter extends AbstractComponentHighlighter { - private final Icon myLeft = IconLoader.getIcon("/ide/dnd/left.png"); - private final Icon myRight = IconLoader.getIcon("/ide/dnd/right.png"); + private final Icon myLeft = AllIcons.Ide.Dnd.Left; + private final Icon myRight = AllIcons.Ide.Dnd.Right; protected void _show(JLayeredPane aPane, Rectangle aRectangle, DnDEvent aEvent) { final Rectangle rectangle = new Rectangle(aRectangle.x - myLeft.getIconWidth(), aRectangle.y - myLeft.getIconHeight(), aRectangle.width + myLeft.getIconWidth() + myRight.getIconWidth(), aRectangle.height + myLeft.getIconHeight()); @@ -251,8 +248,8 @@ public class Highlighters implements DnDEvent.DropTargetHighlightingType { } private static class VerticalLinesHighlighter extends AbstractComponentHighlighter { - private final Icon myTop = IconLoader.getIcon("/ide/dnd/top.png"); - private final Icon myBottom = IconLoader.getIcon("/ide/dnd/bottom.png"); + private final Icon myTop = AllIcons.Ide.Dnd.Top; + private final Icon myBottom = AllIcons.Ide.Dnd.Bottom; protected void _show(JLayeredPane aPane, Rectangle aRectangle, DnDEvent aEvent) { final Rectangle rectangle = new Rectangle(aRectangle.x, aRectangle.y - myTop.getIconHeight(), aRectangle.width, aRectangle.height + myTop.getIconHeight() + myBottom.getIconHeight()); diff --git a/platform/platform-impl/src/com/intellij/ide/errorTreeView/ErrorViewStructure.java b/platform/platform-impl/src/com/intellij/ide/errorTreeView/ErrorViewStructure.java index 2d69e3387700..d90d50d50848 100644 --- a/platform/platform-impl/src/com/intellij/ide/errorTreeView/ErrorViewStructure.java +++ b/platform/platform-impl/src/com/intellij/ide/errorTreeView/ErrorViewStructure.java @@ -15,12 +15,12 @@ */ package com.intellij.ide.errorTreeView; +import com.intellij.icons.AllIcons; import com.intellij.ide.errorTreeView.impl.ErrorTreeViewConfiguration; import com.intellij.ide.util.treeView.AbstractTreeStructure; import com.intellij.ide.util.treeView.NodeDescriptor; import com.intellij.openapi.fileEditor.OpenFileDescriptor; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.pom.Navigatable; import com.intellij.ui.CustomizeColoredTreeCellRenderer; @@ -348,7 +348,7 @@ public class ErrorViewStructure extends AbstractTreeStructure { } private static class MyNavigatableWithDataElement extends NavigatableMessageElement { - private final static Icon ourFileIcon = IconLoader.getIcon("/fileTypes/unknown.png"); + private final static Icon ourFileIcon = AllIcons.FileTypes.Unknown; private final VirtualFile myVf; private final CustomizeColoredTreeCellRenderer myCustomizeColoredTreeCellRenderer; diff --git a/platform/platform-impl/src/com/intellij/ide/errorTreeView/FixedHotfixGroupElement.java b/platform/platform-impl/src/com/intellij/ide/errorTreeView/FixedHotfixGroupElement.java index fe859b315e79..507f092594a5 100644 --- a/platform/platform-impl/src/com/intellij/ide/errorTreeView/FixedHotfixGroupElement.java +++ b/platform/platform-impl/src/com/intellij/ide/errorTreeView/FixedHotfixGroupElement.java @@ -15,7 +15,7 @@ */ package com.intellij.ide.errorTreeView; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.CustomizeColoredTreeCellRenderer; import com.intellij.ui.SimpleColoredComponent; @@ -24,7 +24,7 @@ import com.intellij.ui.SimpleTextAttributes; import javax.swing.*; public class FixedHotfixGroupElement extends GroupingElement { - private final static Icon ourIcon = IconLoader.getIcon("/compiler/information.png"); + private final static Icon ourIcon = AllIcons.Compiler.Information; private final CustomizeColoredTreeCellRenderer myCustomizeColoredTreeCellRenderer; public FixedHotfixGroupElement(String name, Object data, VirtualFile file) { diff --git a/platform/platform-impl/src/com/intellij/ide/errorTreeView/HotfixGroupElement.java b/platform/platform-impl/src/com/intellij/ide/errorTreeView/HotfixGroupElement.java index f5e55891c835..d9125912b697 100644 --- a/platform/platform-impl/src/com/intellij/ide/errorTreeView/HotfixGroupElement.java +++ b/platform/platform-impl/src/com/intellij/ide/errorTreeView/HotfixGroupElement.java @@ -15,7 +15,7 @@ */ package com.intellij.ide.errorTreeView; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.CustomizeColoredTreeCellRenderer; import com.intellij.ui.SimpleColoredComponent; @@ -26,7 +26,7 @@ import com.intellij.util.ui.MutableErrorTreeView; import javax.swing.*; public class HotfixGroupElement extends GroupingElement { - private final static Icon ourIcon = IconLoader.getIcon("/compiler/error.png"); + private final static Icon ourIcon = AllIcons.Compiler.Error; private final Consumer myHotfix; private final String myFixDescription; diff --git a/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeRenderer.java b/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeRenderer.java index 2031517995ea..ffe59e9c2530 100644 --- a/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeRenderer.java +++ b/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeRenderer.java @@ -15,7 +15,7 @@ */ package com.intellij.ide.errorTreeView; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.changes.issueLinks.ClickableTreeCellRenderer; import com.intellij.openapi.vcs.changes.issueLinks.TreeNodePartListener; @@ -32,10 +32,10 @@ import javax.swing.tree.TreeCellRenderer; import java.awt.*; public class NewErrorTreeRenderer extends MultilineTreeCellRenderer { - private final static Icon ourFileIcon = IconLoader.getIcon("/fileTypes/java.png"); - private final static Icon ourErrorIcon = IconLoader.getIcon("/compiler/error.png"); - private final static Icon ourWarningIcon = IconLoader.getIcon("/compiler/warning.png"); - private final static Icon ourInfoIcon = IconLoader.getIcon("/compiler/information.png"); + private final static Icon ourFileIcon = AllIcons.FileTypes.Java; + private final static Icon ourErrorIcon = AllIcons.Compiler.Error; + private final static Icon ourWarningIcon = AllIcons.Compiler.Warning; + private final static Icon ourInfoIcon = AllIcons.Compiler.Information; private final MyWrapperRenderer myWrapperRenderer; private final CallingBackColoredTreeCellRenderer myColoredTreeCellRenderer; diff --git a/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeViewPanel.java b/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeViewPanel.java index bd36f9f98b3b..1b21a1e8b61e 100644 --- a/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeViewPanel.java +++ b/platform/platform-impl/src/com/intellij/ide/errorTreeView/NewErrorTreeViewPanel.java @@ -15,6 +15,7 @@ */ package com.intellij.ide.errorTreeView; +import com.intellij.icons.AllIcons; import com.intellij.ide.*; import com.intellij.ide.actions.*; import com.intellij.ide.errorTreeView.impl.ErrorTreeViewConfiguration; @@ -24,7 +25,6 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.ide.CopyPasteManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.pom.Navigatable; @@ -518,7 +518,7 @@ public class NewErrorTreeViewPanel extends JPanel implements DataProvider, Occur private final AnAction myCloseAction; public RerunAction(@NotNull Runnable rerunAction, @NotNull AnAction closeAction) { - super(IdeBundle.message("action.refresh"), null, IconLoader.getIcon("/actions/refreshUsages.png")); + super(IdeBundle.message("action.refresh"), null, AllIcons.Actions.RefreshUsages); myRerunAction = rerunAction; myCloseAction = closeAction; } @@ -536,7 +536,7 @@ public class NewErrorTreeViewPanel extends JPanel implements DataProvider, Occur private class StopAction extends AnAction { public StopAction() { - super(IdeBundle.message("action.stop"), null, IconLoader.getIcon("/actions/suspend.png")); + super(IdeBundle.message("action.stop"), null, AllIcons.Actions.Suspend); } public void actionPerformed(AnActionEvent e) { @@ -559,7 +559,7 @@ public class NewErrorTreeViewPanel extends JPanel implements DataProvider, Occur private class HideWarningsAction extends ToggleAction { public HideWarningsAction() { - super(IdeBundle.message("action.hide.warnings"), null, IconLoader.getIcon("/compiler/hideWarnings.png")); + super(IdeBundle.message("action.hide.warnings"), null, AllIcons.Compiler.HideWarnings); } public boolean isSelected(AnActionEvent event) { diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/ActionInstallPlugin.java b/platform/platform-impl/src/com/intellij/ide/plugins/ActionInstallPlugin.java index 4969f9275175..d221a61520a6 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/ActionInstallPlugin.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/ActionInstallPlugin.java @@ -16,6 +16,7 @@ package com.intellij.ide.plugins; import com.intellij.CommonBundle; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.notification.Notification; import com.intellij.notification.NotificationListener; @@ -31,7 +32,6 @@ import com.intellij.openapi.extensions.PluginId; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.Function; import com.intellij.util.net.IOExceptionDialog; @@ -54,7 +54,8 @@ public class ActionInstallPlugin extends AnAction implements DumbAware { private final PluginManagerMain host; public ActionInstallPlugin(PluginManagerMain mgr, PluginManagerMain installed) { - super(IdeBundle.message("action.download.and.install.plugin"), IdeBundle.message("action.download.and.install.plugin"), IconLoader.getIcon("/actions/install.png")); + super(IdeBundle.message("action.download.and.install.plugin"), IdeBundle.message("action.download.and.install.plugin"), + AllIcons.Actions.Install); host = mgr; this.installed = installed; } diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/ActionUninstallPlugin.java b/platform/platform-impl/src/com/intellij/ide/plugins/ActionUninstallPlugin.java index 2b9ad0cad3df..40f676ad9102 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/ActionUninstallPlugin.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/ActionUninstallPlugin.java @@ -15,6 +15,7 @@ */ package com.intellij.ide.plugins; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -22,7 +23,6 @@ import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.extensions.PluginId; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.ui.Messages; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.JDOMExternalizableStringList; import java.io.IOException; @@ -38,7 +38,7 @@ public class ActionUninstallPlugin extends AnAction implements DumbAware { private final PluginManagerMain host; public ActionUninstallPlugin(PluginManagerMain mgr, PluginTable table) { - super(IdeBundle.message("action.uninstall.plugin"), IdeBundle.message("action.uninstall.plugin"), IconLoader.getIcon("/actions/uninstall.png")); + super(IdeBundle.message("action.uninstall.plugin"), IdeBundle.message("action.uninstall.plugin"), AllIcons.Actions.Uninstall); pluginTable = table; host = mgr; diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/AvailablePluginColumnInfo.java b/platform/platform-impl/src/com/intellij/ide/plugins/AvailablePluginColumnInfo.java index 2d6f38fab769..e93445fc31e7 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/AvailablePluginColumnInfo.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/AvailablePluginColumnInfo.java @@ -15,9 +15,9 @@ */ package com.intellij.ide.plugins; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.openapi.extensions.PluginId; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.FileStatus; import com.intellij.util.ui.UIUtil; @@ -89,7 +89,7 @@ class AvailablePluginColumnInfo extends PluginManagerColumnInfo { myPanel.setBackground(bg); myNameLabel.setBackground(bg); - myNameLabel.setIcon(IconLoader.getIcon("/nodes/plugin.png")); + myNameLabel.setIcon(AllIcons.Nodes.Plugin); String category = myPluginDescriptor.getCategory(); if (category != null) { myCategoryLabel.setText(category); @@ -110,7 +110,7 @@ class AvailablePluginColumnInfo extends PluginManagerColumnInfo { if (!isSelected){ myNameLabel.setForeground(Color.RED); } - myNameLabel.setIcon(IconLoader.getIcon("/nodes/pluginobsolete.png")); + myNameLabel.setIcon(AllIcons.Nodes.Pluginobsolete); } myStatusLabel.setText("v." + pluginNode.getInstalledVersion() + (hasNewerVersion ? (" -> " + pluginNode.getVersion()) : "")); myStatusLabel.setBorder(BorderFactory.createEmptyBorder(0, LEFT_MARGIN, 0, 0)); diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsTableModel.java b/platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsTableModel.java index 1f9d4213bcfa..c3fbf2fa3a27 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsTableModel.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/InstalledPluginsTableModel.java @@ -15,6 +15,7 @@ */ package com.intellij.ide.plugins; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.openapi.application.ApplicationNamesInfo; import com.intellij.openapi.application.ex.ApplicationInfoEx; @@ -28,7 +29,6 @@ import com.intellij.openapi.updateSettings.impl.PluginDownloader; import com.intellij.openapi.updateSettings.impl.UpdateChecker; import com.intellij.openapi.updateSettings.impl.UpdateSettings; import com.intellij.openapi.util.Condition; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.JDOMExternalizableStringList; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.FileStatus; @@ -551,14 +551,14 @@ public class InstalledPluginsTableModel extends PluginTableModel { } } if (myPluginDescriptor instanceof IdeaPluginDescriptorImpl && ((IdeaPluginDescriptorImpl)myPluginDescriptor).isDeleted()) { - myNameLabel.setIcon(IconLoader.getIcon("/actions/clean.png")); + myNameLabel.setIcon(AllIcons.Actions.Clean); } else if (hasNewerVersion(pluginId)) { - myNameLabel.setIcon(IconLoader.getIcon("/nodes/pluginobsolete.png")); + myNameLabel.setIcon(AllIcons.Nodes.Pluginobsolete); myPanel.setToolTipText("Newer version of the plugin is available"); } else { - myNameLabel.setIcon(IconLoader.getIcon("/nodes/plugin.png")); + myNameLabel.setIcon(AllIcons.Nodes.Plugin); } final Color fg = orig.getForeground(); diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerColumnInfo.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerColumnInfo.java index a5d4c4b98715..f1dc4e14671b 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerColumnInfo.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerColumnInfo.java @@ -15,6 +15,7 @@ */ package com.intellij.ide.plugins; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.openapi.extensions.PluginId; import com.intellij.openapi.util.Comparing; @@ -323,12 +324,12 @@ class PluginManagerColumnInfo extends ColumnInfo { private static class RatesPanel extends JPanel { public static int MAX_RATE = 5; - private static final Icon STAR = IconLoader.getIcon("/ide/rating.png"); + private static final Icon STAR = AllIcons.Ide.Rating; - private static final Icon STAR3 = IconLoader.getIcon("/ide/rating1.png"); - private static final Icon STAR4 = IconLoader.getIcon("/ide/rating2.png"); - private static final Icon STAR5 = IconLoader.getIcon("/ide/rating3.png"); - private static final Icon STAR6 = IconLoader.getIcon("/ide/rating4.png"); + private static final Icon STAR3 = AllIcons.Ide.Rating1; + private static final Icon STAR4 = AllIcons.Ide.Rating2; + private static final Icon STAR5 = AllIcons.Ide.Rating3; + private static final Icon STAR6 = AllIcons.Ide.Rating4; private static final Icon[] STARs = new Icon[]{IconLoader.getDisabledIcon(STAR), STAR3, STAR3, STAR4, STAR4, STAR5, STAR5, STAR6, STAR6, STAR}; private JLabel[] myLabels = new JLabel[MAX_RATE]; diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java index f0ae7142cc54..f61f8cb0c011 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerConfigurable.java @@ -15,6 +15,7 @@ */ package com.intellij.ide.plugins; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.openapi.application.ApplicationNamesInfo; import com.intellij.openapi.application.ex.ApplicationEx; @@ -26,7 +27,6 @@ import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.SplitterProportionsData; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -179,7 +179,7 @@ public class PluginManagerConfigurable extends BaseConfigurable implements Searc } public Icon getIcon() { - return IconLoader.getIcon("/general/pluginManager.png"); + return AllIcons.General.PluginManager; } @NotNull diff --git a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java index a074c9363748..38c457e5a35c 100644 --- a/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java +++ b/platform/platform-impl/src/com/intellij/ide/plugins/PluginManagerMain.java @@ -16,6 +16,7 @@ package com.intellij.ide.plugins; import com.intellij.CommonBundle; +import com.intellij.icons.AllIcons; import com.intellij.ide.BrowserUtil; import com.intellij.ide.IdeBundle; import com.intellij.ide.ui.search.SearchUtil; @@ -34,7 +35,6 @@ import com.intellij.openapi.ui.Messages; import com.intellij.openapi.updateSettings.impl.PluginDownloader; import com.intellij.openapi.updateSettings.impl.UpdateChecker; import com.intellij.openapi.updateSettings.impl.UpdateSettings; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.*; import com.intellij.util.concurrency.SwingWorker; @@ -511,7 +511,7 @@ public abstract class PluginManagerMain implements Disposable { protected class SortByStatusAction extends ToggleAction { protected SortByStatusAction(final String title) { - super(title, title, IconLoader.getIcon("/objectBrowser/sortByType.png")); + super(title, title, AllIcons.ObjectBrowser.SortByType); } @Override @@ -544,7 +544,7 @@ public abstract class PluginManagerMain implements Disposable { protected class RefreshAction extends DumbAwareAction { public RefreshAction() { - super("Reload List of Plugins", "Reload list of plugins", IconLoader.getIcon("/vcs/refresh.png")); + super("Reload List of Plugins", "Reload list of plugins", AllIcons.Vcs.Refresh); } @Override diff --git a/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java b/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java index f25fb7c91d2b..626c73957db2 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/AppearanceConfigurable.java @@ -15,12 +15,12 @@ */ package com.intellij.ide.ui; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.openapi.options.BaseConfigurable; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.ui.ComboBox; import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.wm.ex.WindowManagerEx; import com.intellij.ui.components.JBCheckBox; import com.intellij.util.ui.UIUtil; @@ -99,7 +99,7 @@ public class AppearanceConfigurable extends BaseConfigurable implements Searchab } public Icon getIcon() { - return IconLoader.getIcon("/general/configurableAppearance.png"); + return AllIcons.General.ConfigurableAppearance; } public void apply() { diff --git a/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java b/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java index 626d4f9a66ea..c419a0a8c39e 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/LafManagerImpl.java @@ -16,6 +16,7 @@ package com.intellij.ide.ui; import com.intellij.CommonBundle; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.idea.StartupUtil; import com.intellij.notification.Notification; @@ -728,14 +729,14 @@ public final class LafManagerImpl extends LafManager implements ApplicationCompo defaults.put("ToolTip.background", new ColorUIResource(255, 255, 231)); defaults.put("ToolTip.border", new ColoredSideBorder(Color.gray, Color.gray, Color.black, Color.black, 1)); defaults.put("Tree.ancestorInputMap", null); - defaults.put("FileView.directoryIcon", IconLoader.getIcon("/nodes/folder.png")); - defaults.put("FileChooser.upFolderIcon", IconLoader.getIcon("/nodes/upFolder.png")); - defaults.put("FileChooser.newFolderIcon", IconLoader.getIcon("/nodes/newFolder.png")); - defaults.put("FileChooser.homeFolderIcon", IconLoader.getIcon("/nodes/homeFolder.png")); - defaults.put("OptionPane.errorIcon", IconLoader.getIcon("/general/errorDialog.png")); - defaults.put("OptionPane.informationIcon", IconLoader.getIcon("/general/informationDialog.png")); - defaults.put("OptionPane.warningIcon", IconLoader.getIcon("/general/warningDialog.png")); - defaults.put("OptionPane.questionIcon", IconLoader.getIcon("/general/questionDialog.png")); + defaults.put("FileView.directoryIcon", AllIcons.Nodes.Folder); + defaults.put("FileChooser.upFolderIcon", AllIcons.Nodes.UpFolder); + defaults.put("FileChooser.newFolderIcon", AllIcons.Nodes.NewFolder); + defaults.put("FileChooser.homeFolderIcon", AllIcons.Nodes.HomeFolder); + defaults.put("OptionPane.errorIcon", AllIcons.General.ErrorDialog); + defaults.put("OptionPane.informationIcon", AllIcons.General.InformationDialog); + defaults.put("OptionPane.warningIcon", AllIcons.General.WarningDialog); + defaults.put("OptionPane.questionIcon", AllIcons.General.QuestionDialog); defaults.put("Tree.openIcon", LookAndFeel.makeIcon(WindowsLookAndFeel.class, "icons/TreeOpen.gif")); defaults.put("Tree.closedIcon", LookAndFeel.makeIcon(WindowsLookAndFeel.class, "icons/TreeClosed.gif")); defaults.put("Tree.leafIcon", LookAndFeel.makeIcon(WindowsLookAndFeel.class, "icons/TreeLeaf.gif")); diff --git a/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.java b/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.java index 74061c3e6da4..198e0c7a8bfc 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.java @@ -15,6 +15,7 @@ */ package com.intellij.ide.ui.customization; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.AnAction; @@ -73,7 +74,7 @@ public class CustomizableActionsPanel { private static final Icon EMPTY_ICON = EmptyIcon.ICON_18; - private static final Icon QUICK_LIST_ICON = IconLoader.getIcon("/actions/quickList.png"); + private static final Icon QUICK_LIST_ICON = AllIcons.Actions.QuickList; private JButton myEditIconButton; private JButton myRemoveActionButton; @@ -92,7 +93,7 @@ public class CustomizableActionsPanel { private JButton myRestoreAllDefaultButton; private JButton myRestoreDefaultButton; - public static final Icon FULLISH_ICON = IconLoader.getIcon("/toolbar/unknown.png"); + public static final Icon FULLISH_ICON = AllIcons.Toolbar.Unknown; public CustomizableActionsPanel() { diff --git a/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationConfigurable.java b/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationConfigurable.java index 03225650157a..ca2d008e1fd6 100644 --- a/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationConfigurable.java +++ b/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizationConfigurable.java @@ -15,12 +15,12 @@ */ package com.intellij.ide.ui.customization; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.openapi.options.BaseConfigurable; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -45,7 +45,7 @@ public class CustomizationConfigurable extends BaseConfigurable implements Searc } public Icon getIcon() { - return IconLoader.getIcon("/general/configurableCustomization.png"); + return AllIcons.General.ConfigurableCustomization; } public String getHelpTopic() { diff --git a/platform/platform-impl/src/com/intellij/ide/util/TipPanel.java b/platform/platform-impl/src/com/intellij/ide/util/TipPanel.java index 5b17e3717713..d5ea97e8219c 100644 --- a/platform/platform-impl/src/com/intellij/ide/util/TipPanel.java +++ b/platform/platform-impl/src/com/intellij/ide/util/TipPanel.java @@ -17,10 +17,10 @@ package com.intellij.ide.util; import com.intellij.featureStatistics.FeatureDescriptor; import com.intellij.featureStatistics.ProductivityFeaturesProvider; +import com.intellij.icons.AllIcons; import com.intellij.ide.GeneralSettings; import com.intellij.ide.IdeBundle; import com.intellij.openapi.application.ApplicationNamesInfo; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.JDOMUtil; import com.intellij.ui.ScrollPaneFactory; import org.jdom.Document; @@ -51,7 +51,7 @@ public class TipPanel extends JPanel { public TipPanel() { setLayout(new BorderLayout()); - JLabel jlabel = new JLabel(IconLoader.getIcon("/general/tip.png")); + JLabel jlabel = new JLabel(AllIcons.General.Tip); jlabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5)); JLabel jlabel1 = new JLabel(IdeBundle.message("label.did.you.know")); Font font = jlabel1.getFont(); diff --git a/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java b/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java index dbc6eb1c091b..05780ab6c94b 100644 --- a/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java +++ b/platform/platform-impl/src/com/intellij/internal/inspector/UiInspectorAction.java @@ -15,6 +15,7 @@ */ package com.intellij.internal.inspector; +import com.intellij.icons.AllIcons; import com.intellij.notification.Notification; import com.intellij.notification.NotificationType; import com.intellij.notification.Notifications; @@ -25,7 +26,6 @@ import com.intellij.openapi.actionSystem.ToggleAction; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.ui.StripeTable; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.containers.HashMap; import com.intellij.util.ui.ColorIcon; @@ -117,7 +117,7 @@ public class UiInspectorAction extends ToggleAction implements DumbAware { JToolBar bar = new JToolBar(SwingConstants.HORIZONTAL); bar.setFloatable(false); - bar.add(new AbstractAction("Highlight", IconLoader.getIcon("/toolbar/unknown.png")) { + bar.add(new AbstractAction("Highlight", AllIcons.Toolbar.Unknown) { public void actionPerformed(ActionEvent e) { myHighlighted = !myHighlighted; highlight(myComponent, !myHighlighted); @@ -131,7 +131,7 @@ public class UiInspectorAction extends ToggleAction implements DumbAware { bar.addSeparator(); - bar.add(new AbstractAction("Refresh", IconLoader.getIcon("/vcs/refresh.png")) { + bar.add(new AbstractAction("Refresh", AllIcons.Vcs.Refresh) { public void actionPerformed(ActionEvent e) { getCurrentTable().refresh(); } diff --git a/platform/platform-impl/src/com/intellij/notification/EventLog.java b/platform/platform-impl/src/com/intellij/notification/EventLog.java index 7a33e1205234..99f50ee18360 100644 --- a/platform/platform-impl/src/com/intellij/notification/EventLog.java +++ b/platform/platform-impl/src/com/intellij/notification/EventLog.java @@ -17,6 +17,7 @@ package com.intellij.notification; import com.intellij.execution.filters.HyperlinkInfo; +import com.intellij.icons.AllIcons; import com.intellij.ide.actions.ContextHelpAction; import com.intellij.notification.impl.NotificationsConfigurable; import com.intellij.notification.impl.NotificationsConfigurationImpl; @@ -431,7 +432,7 @@ public class EventLog implements Notifications { panel.setContent(editor.getComponent()); DefaultActionGroup group = new DefaultActionGroup(); - group.add(new DumbAwareAction("Settings", "Edit notification settings", IconLoader.getIcon("/actions/showSettings.png")) { + group.add(new DumbAwareAction("Settings", "Edit notification settings", AllIcons.Actions.ShowSettings) { @Override public void actionPerformed(AnActionEvent e) { ShowSettingsUtil.getInstance().editConfigurable(project, new NotificationsConfigurable()); @@ -445,7 +446,7 @@ public class EventLog implements Notifications { } }); group.add(new ScrollToTheEndToolbarAction(editor)); - group.add(new DumbAwareAction("Mark all as read", "Mark all unread notifications as read", IconLoader.getIcon("/general/reset.png")) { + group.add(new DumbAwareAction("Mark all as read", "Mark all unread notifications as read", AllIcons.General.Reset) { @Override public void update(AnActionEvent e) { if (project.isDisposed()) return; @@ -473,7 +474,7 @@ public class EventLog implements Notifications { private static class DisplayBalloons extends ToggleAction implements DumbAware { public DisplayBalloons() { - super("Show balloons", "Enable or suppress notification balloons", IconLoader.getIcon("/general/balloon.png")); + super("Show balloons", "Enable or suppress notification balloons", AllIcons.General.Balloon); } @Override diff --git a/platform/platform-impl/src/com/intellij/notification/impl/IdeNotificationArea.java b/platform/platform-impl/src/com/intellij/notification/impl/IdeNotificationArea.java index 6d8ead14ade1..b27a66ad9683 100644 --- a/platform/platform-impl/src/com/intellij/notification/impl/IdeNotificationArea.java +++ b/platform/platform-impl/src/com/intellij/notification/impl/IdeNotificationArea.java @@ -15,6 +15,7 @@ */ package com.intellij.notification.impl; +import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.ide.ui.UISettings; import com.intellij.ide.ui.UISettingsListener; @@ -25,7 +26,6 @@ import com.intellij.notification.NotificationType; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.wm.CustomStatusBarWidget; import com.intellij.openapi.wm.IconLikeCustomStatusBarWidget; import com.intellij.openapi.wm.StatusBar; @@ -46,10 +46,10 @@ import java.util.List; * @author spleaner */ public class IdeNotificationArea extends JLabel implements CustomStatusBarWidget, IconLikeCustomStatusBarWidget { - private static final Icon EMPTY_ICON = IconLoader.getIcon("/ide/notifications.png"); - private static final Icon ERROR_ICON = IconLoader.getIcon("/ide/error_notifications.png"); - private static final Icon WARNING_ICON = IconLoader.getIcon("/ide/warning_notifications.png"); - private static final Icon INFO_ICON = IconLoader.getIcon("/ide/info_notifications.png"); + private static final Icon EMPTY_ICON = AllIcons.Ide.Notifications; + private static final Icon ERROR_ICON = AllIcons.Ide.Error_notifications; + private static final Icon WARNING_ICON = AllIcons.Ide.Warning_notifications; + private static final Icon INFO_ICON = AllIcons.Ide.Info_notifications; public static final String WIDGET_ID = "Notifications"; private StatusBar myStatusBar; diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButton.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButton.java index 0e8383476843..55e5736667b8 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButton.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionButton.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.actionSystem.impl; +import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.actionSystem.ex.ActionButtonLook; @@ -52,7 +53,7 @@ public class ActionButton extends JComponent implements ActionButtonComponent, A private boolean myRollover; private static boolean ourGlobalMouseDown = false; - private static final Icon myDropdownIcon = IconLoader.getIcon("/general/dropdown.png"); + private static final Icon myDropdownIcon = AllIcons.General.Dropdown; private boolean myNoIconsInPopup = false; private Insets myInsets; diff --git a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java index 00ef9f89ad09..a1e7d307321f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/actionSystem/impl/ActionToolbarImpl.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.actionSystem.impl; +import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.ide.impl.DataManagerImpl; import com.intellij.openapi.Disposable; @@ -33,7 +34,10 @@ import com.intellij.openapi.keymap.ex.KeymapManagerEx; import com.intellij.openapi.keymap.ex.WeakKeymapManagerListener; import com.intellij.openapi.project.DumbAwareRunnable; import com.intellij.openapi.ui.popup.*; -import com.intellij.openapi.util.*; +import com.intellij.openapi.util.ActionCallback; +import com.intellij.openapi.util.Computable; +import com.intellij.openapi.util.Disposer; +import com.intellij.openapi.util.IdRunnable; import com.intellij.openapi.wm.IdeFocusManager; import com.intellij.openapi.wm.WindowManager; import com.intellij.openapi.wm.ex.WindowManagerEx; @@ -88,8 +92,8 @@ public class ActionToolbarImpl extends JPanel implements ActionToolbar { private Rectangle myAutoPopupRec; - private static final Icon myAutoPopupIcon = IconLoader.getIcon("/ide/link.png"); - private static final Icon mySecondaryGroupIcon = IconLoader.getIcon("/general/secondaryGroup.png"); + private static final Icon myAutoPopupIcon = AllIcons.Ide.Link; + private static final Icon mySecondaryGroupIcon = AllIcons.General.SecondaryGroup; private final DefaultActionGroup mySecondaryActions = new DefaultActionGroup(); private boolean myMinimalMode; diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/ApplyNonConflicts.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/ApplyNonConflicts.java index 4ea4bf781df4..8316b865e9cf 100644 --- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/ApplyNonConflicts.java +++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/ApplyNonConflicts.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.diff.impl.incrementalMerge.ui; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.DataContext; @@ -22,7 +23,6 @@ import com.intellij.openapi.diff.DiffBundle; import com.intellij.openapi.diff.impl.incrementalMerge.Change; import com.intellij.openapi.diff.impl.incrementalMerge.MergeList; import com.intellij.openapi.project.DumbAware; -import com.intellij.openapi.util.IconLoader; import com.intellij.util.containers.ContainerUtil; import com.intellij.util.containers.FilteringIterator; @@ -32,7 +32,7 @@ import java.util.List; public class ApplyNonConflicts extends AnAction implements DumbAware { public ApplyNonConflicts() { - super(DiffBundle.message("merge.dialog.apply.all.non.conflicting.changes.action.name"), null, IconLoader.getIcon("/diff/applyNotConflicts.png")); + super(DiffBundle.message("merge.dialog.apply.all.non.conflicting.changes.action.name"), null, AllIcons.Diff.ApplyNotConflicts); } public void actionPerformed(AnActionEvent e) { diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/MergePanel2.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/MergePanel2.java index 37bcf703b30e..b4efcc44044f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/MergePanel2.java +++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/incrementalMerge/ui/MergePanel2.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.diff.impl.incrementalMerge.ui; +import com.intellij.icons.AllIcons; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.DataContext; @@ -48,7 +49,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogBuilder; import com.intellij.openapi.ui.LabeledComponent; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.EditorNotificationPanel; import com.intellij.util.containers.HashMap; import com.intellij.util.containers.HashSet; @@ -161,9 +161,9 @@ public class MergePanel2 implements DiffViewer { toolbar.addAction(PreviousDiffAction.find()); toolbar.addAction(NextDiffAction.find()); toolbar.addSeparator(); - toolbar.addAction(new OpenPartialDiffAction(1, 0, IconLoader.getIcon("/diff/leftDiff.png"))); - toolbar.addAction(new OpenPartialDiffAction(1, 2, IconLoader.getIcon("/diff/rightDiff.png"))); - toolbar.addAction(new OpenPartialDiffAction(0, 2, IconLoader.getIcon("/diff/branchDiff.png"))); + toolbar.addAction(new OpenPartialDiffAction(1, 0, AllIcons.Diff.LeftDiff)); + toolbar.addAction(new OpenPartialDiffAction(1, 2, AllIcons.Diff.RightDiff)); + toolbar.addAction(new OpenPartialDiffAction(0, 2, AllIcons.Diff.BranchDiff)); toolbar.addSeparator(); toolbar.addAction(new ApplyNonConflicts()); } diff --git a/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/GutterActionRenderer.java b/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/GutterActionRenderer.java index cb6a035ba2c2..32c28cd84eff 100644 --- a/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/GutterActionRenderer.java +++ b/platform/platform-impl/src/com/intellij/openapi/diff/impl/util/GutterActionRenderer.java @@ -15,17 +15,17 @@ */ package com.intellij.openapi.diff.impl.util; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.editor.markup.GutterIconRenderer; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NotNull; import javax.swing.*; public class GutterActionRenderer extends GutterIconRenderer { private final AnAction myAction; - public static final Icon REPLACE_ARROW = IconLoader.getIcon("/diff/arrow.png"); - public static final Icon REMOVE_CROSS = IconLoader.getIcon("/diff/remove.png"); + public static final Icon REPLACE_ARROW = AllIcons.Diff.Arrow; + public static final Icon REMOVE_CROSS = AllIcons.Diff.Remove; public GutterActionRenderer(@NotNull AnAction action) { myAction = action; diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/ContentChooser.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/ContentChooser.java index bc2e13d565b5..e35933882842 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/ContentChooser.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/ContentChooser.java @@ -16,13 +16,13 @@ package com.intellij.openapi.editor.actions; import com.intellij.CommonBundle; +import com.intellij.icons.AllIcons; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.EditorFactory; 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.openapi.util.text.StringUtil; import com.intellij.ui.ColoredListCellRenderer; import com.intellij.ui.ListSpeedSearch; @@ -46,7 +46,7 @@ import java.util.List; public abstract class ContentChooser extends DialogWrapper { - private static final Icon textIcon = IconLoader.getIcon("/fileTypes/text.png"); + private static final Icon textIcon = AllIcons.FileTypes.Text; private JList myList; private List myAllContents; diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/actions/ScrollToTheEndToolbarAction.java b/platform/platform-impl/src/com/intellij/openapi/editor/actions/ScrollToTheEndToolbarAction.java index ba85adbe2524..2c479326c976 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/actions/ScrollToTheEndToolbarAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/actions/ScrollToTheEndToolbarAction.java @@ -15,12 +15,12 @@ */ package com.intellij.openapi.editor.actions; +import com.intellij.icons.AllIcons; import com.intellij.idea.ActionsBundle; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.ex.util.EditorUtil; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NotNull; /** @@ -35,11 +35,11 @@ public class ScrollToTheEndToolbarAction extends AnAction { final String message = ActionsBundle.message("action.EditorConsoleScrollToTheEnd.text"); getTemplatePresentation().setDescription(message); getTemplatePresentation().setText(message); - getTemplatePresentation().setIcon(IconLoader.getIcon("/runConfigurations/scroll_down.png")); + getTemplatePresentation().setIcon(AllIcons.RunConfigurations.Scroll_down); } @Override public void actionPerformed(AnActionEvent e) { EditorUtil.scrollToTheEnd(myEditor); } -} \ No newline at end of file +} diff --git a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java index 2b11e3e28c5a..a665ef4edcca 100644 --- a/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/editor/impl/EditorMarkupModelImpl.java @@ -28,6 +28,7 @@ import com.intellij.codeInsight.hint.LineTooltipRenderer; import com.intellij.codeInsight.hint.TooltipController; import com.intellij.codeInsight.hint.TooltipGroup; import com.intellij.codeInsight.hint.TooltipRenderer; +import com.intellij.icons.AllIcons; import com.intellij.openapi.Disposable; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ex.ApplicationManagerEx; @@ -42,7 +43,6 @@ import com.intellij.openapi.editor.markup.ErrorStripeRenderer; import com.intellij.openapi.editor.markup.RangeHighlighter; import com.intellij.openapi.ui.popup.Balloon; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.ProperTextRange; import com.intellij.ui.ColorUtil; import com.intellij.ui.HintHint; @@ -70,7 +70,7 @@ public class EditorMarkupModelImpl extends MarkupModelImpl implements EditorMark private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.editor.impl.EditorMarkupModelImpl"); private static final TooltipGroup ERROR_STRIPE_TOOLTIP_GROUP = new TooltipGroup("ERROR_STRIPE_TOOLTIP_GROUP", 0); - private static final Icon ERRORS_FOUND_ICON = IconLoader.getIcon("/general/errorsFound.png"); + private static final Icon ERRORS_FOUND_ICON = AllIcons.General.ErrorsFound; private static final int ERROR_ICON_WIDTH = ERRORS_FOUND_ICON.getIconWidth(); private static final int ERROR_ICON_HEIGHT = ERRORS_FOUND_ICON.getIconHeight(); private static final int PREFERRED_WIDTH = ERRORS_FOUND_ICON.getIconWidth() + 3; diff --git a/platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/NewFileAction.java b/platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/NewFileAction.java index 0f03e1863db5..64f21659d8f6 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/NewFileAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileChooser/actions/NewFileAction.java @@ -16,6 +16,7 @@ package com.intellij.openapi.fileChooser.actions; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.fileChooser.FileSystemTree; @@ -23,7 +24,6 @@ import com.intellij.openapi.fileChooser.ex.FileChooserKeys; import com.intellij.openapi.fileChooser.ex.FileSystemTreeImpl; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.ui.Messages; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.LayeredIcon; import com.intellij.ui.UIBundle; @@ -36,7 +36,7 @@ public class NewFileAction extends FileChooserAction { presentation.setVisible(true); VirtualFile selectedFile = fileSystemTree.getNewFileParent(); presentation.setEnabled(selectedFile != null && selectedFile.isDirectory()); - presentation.setIcon(LayeredIcon.create(fileType.getIcon(), IconLoader.getIcon("/actions/new.png"))); + presentation.setIcon(LayeredIcon.create(fileType.getIcon(), AllIcons.Actions.New)); } else { presentation.setVisible(false); @@ -76,4 +76,4 @@ public class NewFileAction extends FileChooserAction { return; } } -} \ No newline at end of file +} diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java index e780e7f6f7b5..ddb285f2e388 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorTabbedContainer.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.fileEditor.impl; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeEventQueue; import com.intellij.ide.actions.CloseAction; import com.intellij.ide.actions.ShowFilePathAction; @@ -376,10 +377,10 @@ final class EditorTabbedContainer implements Disposable, CloseAction.CloseTarget ShadowAction myShadow; private final TabInfo myTabInfo; - private final Icon myIcon = IconLoader.getIcon("/actions/close.png"); - private final Icon myNewIcon = IconLoader.getIcon("/actions/closeNew.png"); - private final Icon myHoveredIcon = IconLoader.getIcon("/actions/closeHovered.png"); - private final Icon myNewHoveredIcon = IconLoader.getIcon("/actions/closeNewHovered.png"); + private final Icon myIcon = AllIcons.Actions.Close; + private final Icon myNewIcon = AllIcons.Actions.CloseNew; + private final Icon myHoveredIcon = AllIcons.Actions.CloseHovered; + private final Icon myNewHoveredIcon = AllIcons.Actions.CloseNewHovered; public CloseTab(JComponent c, TabInfo info) { myTabInfo = info; diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java index dcb42a23a658..6a4145a2a387 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/EditorWindow.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.fileEditor.impl; +import com.intellij.icons.AllIcons; import com.intellij.ide.ui.UISettings; import com.intellij.openapi.actionSystem.DataKey; import com.intellij.openapi.actionSystem.DataProvider; @@ -32,7 +33,10 @@ import com.intellij.openapi.fileEditor.ex.FileEditorManagerEx; import com.intellij.openapi.fileTypes.FileTypes; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Splitter; -import com.intellij.openapi.util.*; +import com.intellij.openapi.util.ActionCallback; +import com.intellij.openapi.util.Disposer; +import com.intellij.openapi.util.Iconable; +import com.intellij.openapi.util.Key; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.wm.IdeFocusManager; import com.intellij.openapi.wm.ToolWindowManager; @@ -64,11 +68,11 @@ public class EditorWindow { protected JPanel myPanel; private EditorTabbedContainer myTabbedPane; private final EditorsSplitters myOwner; - private static final Icon MODIFIED_ICON = IconLoader.getIcon("/general/modified.png"); + private static final Icon MODIFIED_ICON = AllIcons.General.Modified; private static final Icon GAP_ICON = new EmptyIcon(MODIFIED_ICON.getIconWidth(), MODIFIED_ICON.getIconHeight()); private boolean myIsDisposed = false; - private static final Icon PIN_ICON = IconLoader.getIcon("/nodes/tabPin.png"); + private static final Icon PIN_ICON = AllIcons.Nodes.TabPin; public static final Key INITIAL_INDEX_KEY = Key.create("initial editor index"); protected EditorWindow(final EditorsSplitters owner) { @@ -628,7 +632,7 @@ public class EditorWindow { } final VirtualFile file = editor.getFile(); - final Icon template = IconLoader.getIcon("/fileTypes/text.png"); + final Icon template = AllIcons.FileTypes.Text; myTabbedPane.insertTab(file, new EmptyIcon(template.getIconWidth(), template.getIconHeight()), new TComp(this, editor), null, indexToInsert); trimToSize(UISettings.getInstance().EDITOR_TAB_LIMIT, file, false); setSelectedEditor(editor, focusEditor); diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RefreshRemoteFileAction.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RefreshRemoteFileAction.java index 69bb46d13283..0354d25b5477 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RefreshRemoteFileAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RefreshRemoteFileAction.java @@ -15,9 +15,9 @@ */ package com.intellij.openapi.fileEditor.impl.http; +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.openapi.vfs.impl.http.HttpVirtualFile; import com.intellij.openapi.vfs.impl.http.RemoteFileState; @@ -28,7 +28,7 @@ public class RefreshRemoteFileAction extends AnAction { private final HttpVirtualFile myFile; public RefreshRemoteFileAction(HttpVirtualFile file) { - super("Reload File", "", IconLoader.findIcon("/actions/sync.png")); + super("Reload File", "", AllIcons.Actions.Sync); myFile = file; } diff --git a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RemoteFilePanel.java b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RemoteFilePanel.java index 03152dc8b811..9583ef72c5da 100644 --- a/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RemoteFilePanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/fileEditor/impl/http/RemoteFilePanel.java @@ -15,14 +15,17 @@ */ package com.intellij.openapi.fileEditor.impl.http; -import com.intellij.openapi.actionSystem.*; +import com.intellij.icons.AllIcons; +import com.intellij.openapi.actionSystem.ActionManager; +import com.intellij.openapi.actionSystem.ActionPlaces; +import com.intellij.openapi.actionSystem.ActionToolbar; +import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.fileEditor.TextEditor; import com.intellij.openapi.fileEditor.impl.text.TextEditorProvider; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.impl.http.FileDownloadingListener; import com.intellij.openapi.vfs.impl.http.HttpVirtualFile; @@ -48,7 +51,7 @@ import java.beans.PropertyChangeListener; */ public class RemoteFilePanel implements PropertyChangeListener { private static final Logger LOG = Logger.getInstance("#com.intellij.openapi.fileEditor.impl.http.RemoteFilePanel"); - private static final Icon ERROR_ICON = IconLoader.getIcon("/runConfigurations/configurationWarning.png"); + private static final Icon ERROR_ICON = AllIcons.RunConfigurations.ConfigurationWarning; @NonNls private static final String ERROR_CARD = "error"; @NonNls private static final String DOWNLOADING_CARD = "downloading"; @NonNls private static final String EDITOR_CARD = "editor"; diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTree.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTree.java index c8dc8ad532d9..371d832133e6 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTree.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTree.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.keymap.impl.ui; +import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.ide.ui.UISettings; import com.intellij.ide.ui.search.SearchUtil; @@ -26,7 +27,6 @@ import com.intellij.openapi.keymap.KeymapUtil; import com.intellij.openapi.keymap.impl.KeymapImpl; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.ColoredTreeCellRenderer; @@ -51,7 +51,7 @@ import java.util.Enumeration; public class ActionsTree { private static final Icon EMPTY_ICON = EmptyIcon.ICON_18; - private static final Icon QUICK_LIST_ICON = IconLoader.getIcon("/actions/quickList.png"); + private static final Icon QUICK_LIST_ICON = AllIcons.Actions.QuickList; private static final Icon OPEN_ICON = new DefaultTreeCellRenderer().getOpenIcon(); private static final Icon CLOSE_ICON = new DefaultTreeCellRenderer().getClosedIcon(); diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java index 53464e46d5fa..24b8bd8e2f07 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.keymap.impl.ui; +import com.intellij.icons.AllIcons; import com.intellij.ide.actionMacro.ActionMacro; import com.intellij.ide.plugins.IdeaPluginDescriptor; import com.intellij.ide.plugins.PluginManager; @@ -33,7 +34,6 @@ import com.intellij.openapi.keymap.impl.KeymapImpl; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Condition; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.util.text.StringUtil; import com.intellij.util.containers.ContainerUtil; @@ -51,10 +51,10 @@ public class ActionsTreeUtil { public static final String MAIN_TOOLBAR = KeyMapBundle.message("main.toolbar.title"); public static final String EDITOR_POPUP = KeyMapBundle.message("editor.popup.menu.title"); - private static final Icon MAIN_MENU_ICON = IconLoader.getIcon("/nodes/keymapMainMenu.png"); - private static final Icon EDITOR_ICON = IconLoader.getIcon("/nodes/keymapEditor.png"); - private static final Icon EDITOR_OPEN_ICON = IconLoader.getIcon("/nodes/keymapEditorOpen.png"); - private static final Icon OTHER_ICON = IconLoader.getIcon("/nodes/keymapOther.png"); + private static final Icon MAIN_MENU_ICON = AllIcons.Nodes.KeymapMainMenu; + private static final Icon EDITOR_ICON = AllIcons.Nodes.KeymapEditor; + private static final Icon EDITOR_OPEN_ICON = AllIcons.Nodes.KeymapEditorOpen; + private static final Icon OTHER_ICON = AllIcons.Nodes.KeymapOther; public static final String EDITOR_TAB_POPUP = KeyMapBundle.message("editor.tab.popup.menu.title"); public static final String FAVORITES_POPUP = KeyMapBundle.message("favorites.popup.title"); public static final String PROJECT_VIEW_POPUP = KeyMapBundle.message("project.view.popup.menu.title"); @@ -533,4 +533,4 @@ public class ActionsTreeUtil { } }; } -} \ No newline at end of file +} diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ChooseActionsDialog.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ChooseActionsDialog.java index 072aea54019c..c4e09d743376 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ChooseActionsDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ChooseActionsDialog.java @@ -19,6 +19,7 @@ */ package com.intellij.openapi.keymap.impl.ui; +import com.intellij.icons.AllIcons; import com.intellij.ide.CommonActionsManager; import com.intellij.ide.TreeExpander; import com.intellij.openapi.actionSystem.*; @@ -28,7 +29,6 @@ import com.intellij.openapi.keymap.Keymap; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.ui.popup.JBPopupFactory; -import com.intellij.openapi.util.IconLoader; import com.intellij.packageDependencies.ui.TreeExpansionMonitor; import com.intellij.ui.DocumentAdapter; import com.intellij.ui.FilterComponent; @@ -173,7 +173,7 @@ public class ChooseActionsDialog extends DialogWrapper { group.add(new AnAction(KeyMapBundle.message("filter.shortcut.action.text"), KeyMapBundle.message("filter.shortcut.action.text"), - IconLoader.getIcon("/ant/shortcutFilter.png")) { + AllIcons.Ant.ShortcutFilter) { public void actionPerformed(AnActionEvent e) { myFilterComponent.reset(); if (myPopup == null || myPopup.getContent() == null) { @@ -187,7 +187,7 @@ public class ChooseActionsDialog extends DialogWrapper { } }); group.add(new AnAction(KeyMapBundle.message("filter.clear.action.text"), - KeyMapBundle.message("filter.clear.action.text"), IconLoader.getIcon("/actions/gc.png")) { + KeyMapBundle.message("filter.clear.action.text"), AllIcons.Actions.GC) { public void actionPerformed(AnActionEvent e) { myActionsTree.filter(null, myQuicklists); //clear filtering TreeUtil.collapseAll(myActionsTree.getTree(), 0); diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapConfigurable.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapConfigurable.java index 1becf1e51a01..12d43b937fce 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapConfigurable.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapConfigurable.java @@ -15,16 +15,16 @@ */ package com.intellij.openapi.keymap.impl.ui; +import com.intellij.icons.AllIcons; import com.intellij.openapi.keymap.KeyMapBundle; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.SearchableConfigurable; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NotNull; import javax.swing.*; public class KeymapConfigurable extends SearchableConfigurable.Parent.Abstract { - private static final Icon icon = IconLoader.getIcon("/general/keymap.png"); + private static final Icon icon = AllIcons.General.Keymap; public String getDisplayName() { return KeyMapBundle.message("keymap.parent.display.name"); @@ -56,4 +56,4 @@ public class KeymapConfigurable extends SearchableConfigurable.Parent.Abstract { public boolean isVisible() { return false; } -} \ No newline at end of file +} diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java index 6d223a185ef1..efb498cc54b7 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/KeymapPanel.java @@ -18,6 +18,7 @@ package com.intellij.openapi.keymap.impl.ui; import com.intellij.CommonBundle; import com.intellij.application.options.ExportSchemeAction; import com.intellij.application.options.SchemesToImportPopup; +import com.intellij.icons.AllIcons; import com.intellij.ide.CommonActionsManager; import com.intellij.ide.DataManager; import com.intellij.ide.TreeExpander; @@ -43,7 +44,6 @@ import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.ui.popup.ListPopup; import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.text.StringUtil; import com.intellij.packageDependencies.ui.TreeExpansionMonitor; import com.intellij.ui.DocumentAdapter; @@ -381,7 +381,7 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable, Confi group.add(commonActionsManager.createExpandAllAction(treeExpander, myActionsTree.getTree())); group.add(commonActionsManager.createCollapseAllAction(treeExpander, myActionsTree.getTree())); - group.add(new AnAction("Edit Shortcut", "Edit Shortcut", IconLoader.getIcon("/actions/properties.png")) { + group.add(new AnAction("Edit Shortcut", "Edit Shortcut", AllIcons.Actions.Properties) { { registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0)), myActionsTree.getTree()); } @@ -427,7 +427,7 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable, Confi group.add(new AnAction(KeyMapBundle.message("filter.shortcut.action.text"), KeyMapBundle.message("filter.shortcut.action.text"), - IconLoader.getIcon("/ant/shortcutFilter.png")) { + AllIcons.Ant.ShortcutFilter) { public void actionPerformed(AnActionEvent e) { myFilterComponent.reset(); if (myPopup == null || myPopup.getContent() == null){ @@ -441,7 +441,7 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable, Confi } }); group.add(new AnAction(KeyMapBundle.message("filter.clear.action.text"), - KeyMapBundle.message("filter.clear.action.text"), IconLoader.getIcon("/actions/gc.png")) { + KeyMapBundle.message("filter.clear.action.text"), AllIcons.Actions.GC) { public void actionPerformed(AnActionEvent e) { myActionsTree.filter(null, getCurrentQuickListIds()); //clear filtering TreeUtil.collapseAll(myActionsTree.getTree(), 0); diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java index 7c7a4c74cf2a..3f09ea6ce5dc 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/MouseShortcutDialog.java @@ -15,13 +15,13 @@ */ package com.intellij.openapi.keymap.impl.ui; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.MouseShortcut; import com.intellij.openapi.actionSystem.Shortcut; import com.intellij.openapi.keymap.KeyMapBundle; import com.intellij.openapi.keymap.Keymap; import com.intellij.openapi.keymap.KeymapUtil; import com.intellij.openapi.ui.DialogWrapper; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.ScrollPaneFactory; import com.intellij.util.ui.UIUtil; @@ -267,7 +267,7 @@ class MouseShortcutDialog extends DialogWrapper{ public MyClickPad(){ super( KeyMapBundle.message("mouse.shortcut.label"), - IconLoader.getIcon("/general/mouse.png"), SwingConstants.CENTER + AllIcons.General.Mouse, SwingConstants.CENTER ); // It's very imporatant that MouseListener is added to the Dialog. If you add // the same listener, for example, into the MyClickPad component you get fake diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListPanel.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListPanel.java index c18c98d4a148..f9d0a86c3293 100644 --- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/QuickListPanel.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.keymap.impl.ui; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -24,7 +25,6 @@ import com.intellij.openapi.actionSystem.ex.QuickListsManager; import com.intellij.openapi.keymap.KeyMapBundle; import com.intellij.openapi.keymap.KeymapManager; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.*; import com.intellij.ui.components.JBList; import com.intellij.util.PlatformIcons; @@ -41,7 +41,7 @@ import java.awt.event.MouseEvent; public class QuickListPanel { private static final Icon EMPTY_ICON = EmptyIcon.ICON_18; - private static final Icon QUICK_LIST_ICON = IconLoader.getIcon("/actions/quickList.png"); + private static final Icon QUICK_LIST_ICON = AllIcons.Actions.QuickList; private JPanel myPanel; private JBList myActionsList; private JTextField myDisplayName; diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/ControlPanelSettingsEditor.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/ControlPanelSettingsEditor.java index 3cbe23ebbbb1..d1e94736b1bc 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/ex/ControlPanelSettingsEditor.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/ControlPanelSettingsEditor.java @@ -16,6 +16,7 @@ package com.intellij.openapi.options.ex; import com.intellij.CommonBundle; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.ide.actions.ShowSettingsUtilImpl; import com.intellij.ide.ui.search.DefaultSearchableConfigurable; @@ -38,7 +39,6 @@ import com.intellij.openapi.ui.VerticalFlowLayout; import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.DocumentAdapter; import com.intellij.ui.LabeledIcon; import com.intellij.ui.ScrollPaneFactory; @@ -354,7 +354,7 @@ public class ControlPanelSettingsEditor extends DialogWrapper { private Icon createIcon() { Icon icon = myConfigurable.getIcon(); if (icon == null) { - icon = IconLoader.getIcon("/general/configurableDefault.png"); + icon = AllIcons.General.ConfigurableDefault; } String displayName = myConfigurable.getDisplayName(); diff --git a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/ShowSearchFieldAction.java b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/ShowSearchFieldAction.java index 537d1dc4244d..3fb00178fd66 100644 --- a/platform/platform-impl/src/com/intellij/openapi/options/newEditor/ShowSearchFieldAction.java +++ b/platform/platform-impl/src/com/intellij/openapi/options/newEditor/ShowSearchFieldAction.java @@ -15,12 +15,12 @@ */ package com.intellij.openapi.options.newEditor; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.Toggleable; import com.intellij.openapi.ui.ShadowAction; -import com.intellij.openapi.util.IconLoader; public class ShowSearchFieldAction extends AnAction implements Toggleable { @@ -36,7 +36,7 @@ public class ShowSearchFieldAction extends AnAction implements Toggleable { @Override public void update(final AnActionEvent e) { super.update(e); - e.getPresentation().setIcon(IconLoader.getIcon("/actions/find.png")); + e.getPresentation().setIcon(AllIcons.Actions.Find); e.getPresentation().putClientProperty(SELECTED_PROPERTY, myEditor.isFilterFieldVisible()); } diff --git a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressBar.java b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressBar.java index 095d2b72f6c6..0283afdf0658 100644 --- a/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressBar.java +++ b/platform/platform-impl/src/com/intellij/openapi/progress/util/ProgressBar.java @@ -15,7 +15,7 @@ */ package com.intellij.openapi.progress.util; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -24,7 +24,7 @@ import java.awt.*; public class ProgressBar extends JComponent { private double myFraction = 0.0; - private Icon myProgressIcon = IconLoader.getIcon("/general/progress.png"); + private Icon myProgressIcon = AllIcons.General.Progress; public ProgressBar() { updateUI(); diff --git a/platform/platform-impl/src/com/intellij/openapi/ui/impl/ShadowBorderPainter.java b/platform/platform-impl/src/com/intellij/openapi/ui/impl/ShadowBorderPainter.java index 0a74d0322702..7956349c965f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/ui/impl/ShadowBorderPainter.java +++ b/platform/platform-impl/src/com/intellij/openapi/ui/impl/ShadowBorderPainter.java @@ -15,7 +15,7 @@ */ package com.intellij.openapi.ui.impl; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import org.jdesktop.swingx.graphics.GraphicsUtilities; import org.jdesktop.swingx.graphics.ShadowRenderer; @@ -28,27 +28,27 @@ import java.awt.image.BufferedImage; * @author Konstantin Bulenkov */ public class ShadowBorderPainter { - private static final Icon TOP = IconLoader.getIcon("/ide/shadow/top.png"); - private static final Icon TOP_RIGHT = IconLoader.getIcon("/ide/shadow/top-right.png"); - private static final Icon RIGHT = IconLoader.getIcon("/ide/shadow/right.png"); - private static final Icon BOTTOM_RIGHT = IconLoader.getIcon("/ide/shadow/bottom-right.png"); - private static final Icon BOTTOM = IconLoader.getIcon("/ide/shadow/bottom.png"); - private static final Icon BOTTOM_LEFT = IconLoader.getIcon("/ide/shadow/bottom-left.png"); - private static final Icon LEFT = IconLoader.getIcon("/ide/shadow/left.png"); - private static final Icon TOP_LEFT = IconLoader.getIcon("/ide/shadow/top-left.png"); + private static final Icon TOP = AllIcons.Ide.Shadow.Top; + private static final Icon TOP_RIGHT = AllIcons.Ide.Shadow.Top_right; + private static final Icon RIGHT = AllIcons.Ide.Shadow.Right; + private static final Icon BOTTOM_RIGHT = AllIcons.Ide.Shadow.Bottom_right; + private static final Icon BOTTOM = AllIcons.Ide.Shadow.Bottom; + private static final Icon BOTTOM_LEFT = AllIcons.Ide.Shadow.Bottom_left; + private static final Icon LEFT = AllIcons.Ide.Shadow.Left; + private static final Icon TOP_LEFT = AllIcons.Ide.Shadow.Top_left; public static final int SIDE_SIZE = 35; public static final int TOP_SIZE = 20; public static final int BOTTOM_SIZE = 49; - private static final Icon POPUP_TOP = IconLoader.getIcon("/ide/shadow/popup/top.png"); - private static final Icon POPUP_TOP_RIGHT = IconLoader.getIcon("/ide/shadow/popup/top-right.png"); - private static final Icon POPUP_RIGHT = IconLoader.getIcon("/ide/shadow/popup/right.png"); - private static final Icon POPUP_BOTTOM_RIGHT = IconLoader.getIcon("/ide/shadow/popup/bottom-right.png"); - private static final Icon POPUP_BOTTOM = IconLoader.getIcon("/ide/shadow/popup/bottom.png"); - private static final Icon POPUP_BOTTOM_LEFT = IconLoader.getIcon("/ide/shadow/popup/bottom-left.png"); - private static final Icon POPUP_LEFT = IconLoader.getIcon("/ide/shadow/popup/left.png"); - private static final Icon POPUP_TOP_LEFT = IconLoader.getIcon("/ide/shadow/popup/top-left.png"); + private static final Icon POPUP_TOP = AllIcons.Ide.Shadow.Popup.Top; + private static final Icon POPUP_TOP_RIGHT = AllIcons.Ide.Shadow.Popup.Top_right; + private static final Icon POPUP_RIGHT = AllIcons.Ide.Shadow.Popup.Right; + private static final Icon POPUP_BOTTOM_RIGHT = AllIcons.Ide.Shadow.Popup.Bottom_right; + private static final Icon POPUP_BOTTOM = AllIcons.Ide.Shadow.Popup.Bottom; + private static final Icon POPUP_BOTTOM_LEFT = AllIcons.Ide.Shadow.Popup.Bottom_left; + private static final Icon POPUP_LEFT = AllIcons.Ide.Shadow.Popup.Left; + private static final Icon POPUP_TOP_LEFT = AllIcons.Ide.Shadow.Popup.Top_left; public static final int POPUP_SIDE_SIZE = 7; public static final int POPUP_TOP_SIZE = 4; diff --git a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java index 4b78b9a77f3a..cad452ef552f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java +++ b/platform/platform-impl/src/com/intellij/openapi/updateSettings/impl/UpdateSettingsConfigurable.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.updateSettings.impl; +import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.ide.IdeBundle; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -23,7 +24,6 @@ import com.intellij.openapi.options.BaseConfigurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.CollectionComboBoxModel; import com.intellij.util.text.DateFormatUtil; import org.jetbrains.annotations.Nullable; @@ -53,7 +53,7 @@ public class UpdateSettingsConfigurable extends BaseConfigurable implements Sear } public Icon getIcon() { - return IconLoader.getIcon("/general/configurableUpdates.png"); + return AllIcons.General.ConfigurableUpdates; } public void setCheckNowEnabled(boolean enabled) { diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java index f400145531e6..49af843ac29f 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/ToolWindowHeader.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.wm.impl; +import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.*; @@ -23,7 +24,6 @@ import com.intellij.openapi.actionSystem.impl.ActionManagerImpl; import com.intellij.openapi.actionSystem.impl.MenuItemPresentationFactory; import com.intellij.openapi.keymap.KeymapUtil; import com.intellij.openapi.project.DumbAware; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowAnchor; @@ -55,26 +55,26 @@ public abstract class ToolWindowHeader extends JPanel implements Disposable { @NonNls private static final String HIDE_ACTIVE_WINDOW_ACTION_ID = "HideActiveWindow"; @NonNls private static final String HIDE_ACTIVE_SIDE_WINDOW_ACTION_ID = "HideSideWindows"; - private static final Icon ourHideLeftSideIcon = IconLoader.getIcon("/general/hideLeft.png"); - private static final Icon ourHideRightSideIcon = IconLoader.getIcon("/general/hideRight.png"); - private static final Icon ourHideDownSideIcon = IconLoader.getIcon("/general/hideDown.png"); + private static final Icon ourHideLeftSideIcon = AllIcons.General.HideLeft; + private static final Icon ourHideRightSideIcon = AllIcons.General.HideRight; + private static final Icon ourHideDownSideIcon = AllIcons.General.HideDown; - private static final Icon ourHideLeftIcon = IconLoader.getIcon("/general/hideLeftPart.png"); - private static final Icon ourHideRightIcon = IconLoader.getIcon("/general/hideRightPart.png"); - private static final Icon ourHideDownIcon = IconLoader.getIcon("/general/hideDownPart.png"); + private static final Icon ourHideLeftIcon = AllIcons.General.HideLeftPart; + private static final Icon ourHideRightIcon = AllIcons.General.HideRightPart; + private static final Icon ourHideDownIcon = AllIcons.General.HideDownPart; - private static final Icon ourSettingsIcon = IconLoader.getIcon("/general/gear.png"); - private static final Icon ourSeparatorIcon = IconLoader.getIcon("/general/divider.png"); + private static final Icon ourSettingsIcon = AllIcons.General.Gear; + private static final Icon ourSeparatorIcon = AllIcons.General.Divider; - private static final Icon ourHideLeftSideHoveredIcon = IconLoader.getIcon("/general/hideLeftHover.png"); - private static final Icon ourHideRightSideHoveredIcon = IconLoader.getIcon("/general/hideRightHover.png"); - private static final Icon ourHideDownSideHoveredIcon = IconLoader.getIcon("/general/hideDownHover.png"); + private static final Icon ourHideLeftSideHoveredIcon = AllIcons.General.HideLeftHover; + private static final Icon ourHideRightSideHoveredIcon = AllIcons.General.HideRightHover; + private static final Icon ourHideDownSideHoveredIcon = AllIcons.General.HideDownHover; - private static final Icon ourHideLeftHoveredIcon = IconLoader.getIcon("/general/hideLeftPartHover.png"); - private static final Icon ourHideRightHoveredIcon = IconLoader.getIcon("/general/hideRightPartHover.png"); - private static final Icon ourHideDownHoveredIcon = IconLoader.getIcon("/general/hideDownPartHover.png"); + private static final Icon ourHideLeftHoveredIcon = AllIcons.General.HideLeftPartHover; + private static final Icon ourHideRightHoveredIcon = AllIcons.General.HideRightPartHover; + private static final Icon ourHideDownHoveredIcon = AllIcons.General.HideDownPartHover; - private static final Icon ourSettingsHoveredIcon = IconLoader.getIcon("/general/gearHover.png"); + private static final Icon ourSettingsHoveredIcon = AllIcons.General.GearHover; private ToolWindow myToolWindow; private WindowInfoImpl myInfo; diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ComboIcon.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ComboIcon.java index 28eadb12e0d9..e64be3ec7773 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ComboIcon.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/ComboIcon.java @@ -15,14 +15,14 @@ */ package com.intellij.openapi.wm.impl.content; +import com.intellij.icons.AllIcons; import com.intellij.openapi.ui.popup.ActiveIcon; -import com.intellij.openapi.util.IconLoader; import java.awt.*; public abstract class ComboIcon { - private final ActiveIcon myIcon = new ActiveIcon(IconLoader.getIcon("/general/combo2.png")); + private final ActiveIcon myIcon = new ActiveIcon(AllIcons.General.Combo2); public void paintIcon(final Component c, final Graphics g) { myIcon.setActive(isActive()); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/MoreIcon.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/MoreIcon.java index 2bcf01ffa0c5..e86c0b89f68e 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/MoreIcon.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/MoreIcon.java @@ -15,8 +15,8 @@ */ package com.intellij.openapi.wm.impl.content; +import com.intellij.icons.AllIcons; import com.intellij.openapi.ui.popup.ActiveIcon; -import com.intellij.openapi.util.IconLoader; import javax.swing.*; import java.awt.*; @@ -24,9 +24,9 @@ import java.awt.*; public abstract class MoreIcon { private final ActiveIcon myLeft = - new ActiveIcon(IconLoader.getIcon("/general/comboArrowLeft.png"), IconLoader.getIcon("/general/comboArrowLeftPassive.png")); + new ActiveIcon(AllIcons.General.ComboArrowLeft, AllIcons.General.ComboArrowLeftPassive); private final ActiveIcon myRight = - new ActiveIcon(IconLoader.getIcon("/general/comboArrowRight.png"), IconLoader.getIcon("/general/comboArrowRightPassive.png")); + new ActiveIcon(AllIcons.General.ComboArrowRight, AllIcons.General.ComboArrowRightPassive); protected final int myGap = 2; protected boolean myLeftPainted; diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/PushedTabBackground.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/PushedTabBackground.java index b1baeff70709..21916d4b9a31 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/PushedTabBackground.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/content/PushedTabBackground.java @@ -19,24 +19,24 @@ */ package com.intellij.openapi.wm.impl.content; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.ui.Gray; import javax.swing.*; import java.awt.*; public class PushedTabBackground { - private static final Icon ourLeftRound = IconLoader.getIcon("/general/tab_grey_left.png"); - private static final Icon ourRightRound = IconLoader.getIcon("/general/tab_grey_right.png"); + private static final Icon ourLeftRound = AllIcons.General.Tab_grey_left; + private static final Icon ourRightRound = AllIcons.General.Tab_grey_right; - private static final Icon ourLeftWhiteRound = IconLoader.getIcon("/general/tab-white-left.png"); - private static final Icon ourRightWhiteRound = IconLoader.getIcon("/general/tab-white-right.png"); + private static final Icon ourLeftWhiteRound = AllIcons.General.Tab_white_left; + private static final Icon ourRightWhiteRound = AllIcons.General.Tab_white_right; - private static final Icon ourRightStraight = IconLoader.getIcon("/general/tab_grey_right_inner.png"); - private static final Icon ourLeftStraight = IconLoader.getIcon("/general/tab_grey_left_inner.png"); + private static final Icon ourRightStraight = AllIcons.General.Tab_grey_right_inner; + private static final Icon ourLeftStraight = AllIcons.General.Tab_grey_left_inner; - private static final Icon ourMiddle = IconLoader.getIcon("/general/tab_grey_bckgrnd.png"); - private static final Icon ourMiddleWhite = IconLoader.getIcon("/general/tab-white-center.png"); + private static final Icon ourMiddle = AllIcons.General.Tab_grey_bckgrnd; + private static final Icon ourMiddleWhite = AllIcons.General.Tab_white_center; diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/EncodingPanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/EncodingPanel.java index ccdd72697650..d5b6ed99a05d 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/EncodingPanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/EncodingPanel.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.wm.impl.status; +import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.actionSystem.impl.SimpleDataContext; @@ -30,7 +31,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.ui.popup.ListPopup; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Pair; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFileAdapter; @@ -117,7 +117,7 @@ public class EncodingPanel extends EditorBasedWidget implements StatusBarWidget. return "windows-1251"; } - private static final Icon ARROWS_ICON = IconLoader.getIcon("/ide/statusbar_arrows.png"); + private static final Icon ARROWS_ICON = AllIcons.Ide.Statusbar_arrows; @Override public void install(@NotNull StatusBar statusBar) { super.install(statusBar); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/IdeStatusBarImpl.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/IdeStatusBarImpl.java index 36fae5e5ec4b..24b4122515fd 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/IdeStatusBarImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/IdeStatusBarImpl.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.wm.impl.status; +import com.intellij.icons.AllIcons; import com.intellij.ide.ui.UISettings; import com.intellij.ide.ui.UISettingsListener; import com.intellij.notification.impl.IdeNotificationArea; @@ -25,7 +26,6 @@ import com.intellij.openapi.ui.MessageType; import com.intellij.openapi.ui.popup.BalloonHandler; import com.intellij.openapi.ui.popup.ListPopup; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.registry.Registry; @@ -608,7 +608,7 @@ public class IdeStatusBarImpl extends JComponent implements StatusBarEx { } private static final class MultipleTextValuesPresentationWrapper extends TextPanel implements StatusBarWrapper { - private static final Icon ARROWS_ICON = IconLoader.getIcon("/ide/statusbar_arrows.png"); + private static final Icon ARROWS_ICON = AllIcons.Ide.Statusbar_arrows; private final StatusBarWidget.MultipleTextValuesPresentation myPresentation; private MultipleTextValuesPresentationWrapper(@NotNull final StatusBarWidget.MultipleTextValuesPresentation presentation) { @@ -781,8 +781,8 @@ public class IdeStatusBarImpl extends JComponent implements StatusBarEx { private static class ToolWindowsWidget extends JLabel implements CustomStatusBarWidget, StatusBarWidget, Disposable, UISettingsListener, PropertyChangeListener { - private static final Icon HIDDEN = IconLoader.getIcon("/general/tbShown.png"); - private static final Icon SHOWN = IconLoader.getIcon("/general/tbHidden.png"); + private static final Icon HIDDEN = AllIcons.General.TbShown; + private static final Icon SHOWN = AllIcons.General.TbHidden; private StatusBar myStatusBar; private ToolWindowsWidget() { diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InlineProgressIndicator.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InlineProgressIndicator.java index 44eaea9a677a..631f71d27b6e 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InlineProgressIndicator.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/InlineProgressIndicator.java @@ -15,15 +15,15 @@ */ package com.intellij.openapi.wm.impl.status; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.openapi.Disposable; import com.intellij.openapi.progress.TaskInfo; import com.intellij.openapi.progress.util.ProgressIndicatorBase; +import com.intellij.openapi.ui.GraphicsConfig; import com.intellij.openapi.ui.popup.IconButton; import com.intellij.openapi.util.EmptyRunnable; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.SystemInfo; -import com.intellij.openapi.ui.GraphicsConfig; import com.intellij.ui.ColorUtil; import com.intellij.ui.InplaceButton; import com.intellij.ui.components.panels.NonOpaquePanel; @@ -63,8 +63,8 @@ public class InlineProgressIndicator extends ProgressIndicatorBase implements Di myInfo = processInfo; myCancelButton = new InplaceButton(new IconButton(processInfo.getCancelTooltipText(), - IconLoader.getIcon("/process/stop.png"), - IconLoader.getIcon("/process/stopHovered.png")) { + AllIcons.Process.Stop, + AllIcons.Process.StopHovered) { }, new ActionListener() { public void actionPerformed(final ActionEvent e) { cancelRequest(); diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ToggleReadOnlyAttributePanel.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ToggleReadOnlyAttributePanel.java index 48605f2b992c..4871691117e0 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ToggleReadOnlyAttributePanel.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/status/ToggleReadOnlyAttributePanel.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.wm.impl.status; +import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; @@ -23,7 +24,6 @@ import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.fileEditor.FileEditorManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.wm.StatusBar; import com.intellij.openapi.wm.StatusBarWidget; @@ -38,8 +38,8 @@ import java.awt.event.MouseEvent; import java.io.IOException; public class ToggleReadOnlyAttributePanel implements StatusBarWidget.Multiframe, StatusBarWidget.IconPresentation { - private static final Icon myLockedIcon = IconLoader.getIcon("/ide/readonly.png"); - private static final Icon myUnlockedIcon = IconLoader.getIcon("/ide/readwrite.png"); + private static final Icon myLockedIcon = AllIcons.Ide.Readonly; + private static final Icon myUnlockedIcon = AllIcons.Ide.Readwrite; private StatusBar myStatusBar; diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/DefaultWelcomeScreen.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/DefaultWelcomeScreen.java index c8e816ec880e..270a078d8970 100644 --- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/DefaultWelcomeScreen.java +++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/welcomeScreen/DefaultWelcomeScreen.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.wm.impl.welcomeScreen; +import com.intellij.icons.AllIcons; import com.intellij.ide.BrowserUtil; import com.intellij.ide.DataManager; import com.intellij.ide.RecentProjectsManagerBase; @@ -75,7 +76,7 @@ public class DefaultWelcomeScreen implements WelcomeScreen { private static final Dimension ACTION_BUTTON_SIZE = new Dimension(66, 66); private static final Dimension PLUGIN_LOGO_SIZE = new Dimension(16, 16); - private static final Icon DEFAULT_ICON = IconLoader.getIcon("/general/configurableDefault.png"); + private static final Icon DEFAULT_ICON = AllIcons.General.ConfigurableDefault; @NonNls private static final String CAPTION_FONT_NAME = "Tahoma"; private static final Font TEXT_FONT = new Font(CAPTION_FONT_NAME, Font.PLAIN, 11); @@ -100,7 +101,7 @@ public class DefaultWelcomeScreen implements WelcomeScreen { @NonNls private static final String HTML_SUFFIX = ""; @NonNls private static final String ___HTML_SUFFIX = "..."; @NonNls private static final String ESC_NEW_LINE = "\\n"; - public static final Icon ICON = IconLoader.getIcon("/actions/closeNew.png"); + public static final Icon ICON = AllIcons.Actions.CloseNew; private final JPanel myWelcomePanel; private final JPanel myMainPanel; @@ -238,7 +239,7 @@ public class DefaultWelcomeScreen implements WelcomeScreen { myRecentProjectsPanel.add(caption, new GridBagConstraints(0, 0, 2, 1, 1, 0, NORTHWEST, HORIZONTAL, new Insets(0, 0, 20, 0), 0, 0)); JLabel iconLabel = new JLabel(); - iconLabel.setIcon(IconLoader.getIcon("/general/reopenRecentProject.png")); + iconLabel.setIcon(AllIcons.General.ReopenRecentProject); myRecentProjectsPanel.add(iconLabel, new GridBagConstraints(0, 1, 1, 5, 0, 0, NORTHWEST, NONE, new Insets(5, 0, 15, 20), 0, 0)); int row = 1; diff --git a/platform/platform-impl/src/com/intellij/ui/AppIcon.java b/platform/platform-impl/src/com/intellij/ui/AppIcon.java index 95cb2a8840da..74c12f842d69 100644 --- a/platform/platform-impl/src/com/intellij/ui/AppIcon.java +++ b/platform/platform-impl/src/com/intellij/ui/AppIcon.java @@ -15,12 +15,11 @@ */ package com.intellij.ui; +import com.intellij.icons.AllIcons; import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationActivationListener; -import com.intellij.openapi.application.ApplicationListener; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.registry.Registry; import com.intellij.openapi.wm.AppIconScheme; @@ -251,7 +250,7 @@ public abstract class AppIcon { AppImage img = createAppImage(); if (visible) { - Icon okIcon = IconLoader.getIcon("/mac/appIconOk512.png"); + Icon okIcon = AllIcons.Mac.AppIconOk512; int x = img.myImg.getWidth() - okIcon.getIconWidth(); int y = 0; diff --git a/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java b/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java index bd349fc19f2c..2958e9668b5e 100644 --- a/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/BalloonImpl.java @@ -15,6 +15,7 @@ */ package com.intellij.ui; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeEventQueue; import com.intellij.ide.IdeTooltip; import com.intellij.openapi.actionSystem.ActionManager; @@ -190,7 +191,7 @@ public class BalloonImpl implements Balloon, IdeTooltip.Ui { private final boolean myHideOnKey; private boolean myHideOnAction; private final boolean myEnableCloseButton; - private final Icon myCloseButton = IconLoader.getIcon("/general/balloonClose.png"); + private final Icon myCloseButton = AllIcons.General.BalloonClose; public BalloonImpl(JComponent content, Color borderColor, diff --git a/platform/platform-impl/src/com/intellij/ui/ColorPicker.java b/platform/platform-impl/src/com/intellij/ui/ColorPicker.java index 2117aab05475..f5333efeebbf 100644 --- a/platform/platform-impl/src/com/intellij/ui/ColorPicker.java +++ b/platform/platform-impl/src/com/intellij/ui/ColorPicker.java @@ -15,10 +15,10 @@ */ package com.intellij.ui; +import com.intellij.icons.AllIcons; import com.intellij.ide.util.PropertiesComponent; import com.intellij.openapi.Disposable; import com.intellij.openapi.ui.DialogWrapper; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.text.StringUtil; @@ -52,8 +52,8 @@ import java.util.concurrent.CopyOnWriteArrayList; * @author Konstantin Bulenkov */ public class ColorPicker extends JPanel implements ColorListener, DocumentListener { - public static final Icon PICK = IconLoader.findIcon("/ide/pipette.png"); - public static final Icon PICK_ROLLOVER = IconLoader.findIcon("/ide/pipette_rollover.png"); + public static final Icon PICK = AllIcons.Ide.Pipette; + public static final Icon PICK_ROLLOVER = AllIcons.Ide.Pipette_rollover; private static final String COLOR_CHOOSER_COLORS_KEY = "ColorChooser.RecentColors"; private static final String HSB_PROPERTY = "color.picker.is.hsb"; diff --git a/platform/platform-impl/src/com/intellij/ui/HideableTitledPanel.java b/platform/platform-impl/src/com/intellij/ui/HideableTitledPanel.java index faafc77fcab6..5894baf3e219 100644 --- a/platform/platform-impl/src/com/intellij/ui/HideableTitledPanel.java +++ b/platform/platform-impl/src/com/intellij/ui/HideableTitledPanel.java @@ -1,9 +1,9 @@ package com.intellij.ui; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CustomShortcutSet; -import com.intellij.openapi.util.IconLoader; import com.intellij.util.ui.UIUtil; import javax.swing.*; @@ -14,8 +14,8 @@ import java.awt.event.*; * @author evgeny zakrevsky */ public class HideableTitledPanel extends JPanel { - private final static Icon OFF_ICON = IconLoader.getIcon("/general/comboArrow.png"); - private final static Icon ON_ICON = IconLoader.getIcon("/general/comboUpPassive.png"); + private final static Icon OFF_ICON = AllIcons.General.ComboArrow; + private final static Icon ON_ICON = AllIcons.General.ComboUpPassive; private TitledSeparatorWithMnemonic myTitledSeparator; private boolean myOn; diff --git a/platform/platform-impl/src/com/intellij/ui/SplitterWithSecondHideable.java b/platform/platform-impl/src/com/intellij/ui/SplitterWithSecondHideable.java index 8e80795c01c6..bfcc9f09947e 100644 --- a/platform/platform-impl/src/com/intellij/ui/SplitterWithSecondHideable.java +++ b/platform/platform-impl/src/com/intellij/ui/SplitterWithSecondHideable.java @@ -15,9 +15,9 @@ */ package com.intellij.ui; +import com.intellij.icons.AllIcons; import com.intellij.openapi.ui.PseudoSplitter; import com.intellij.openapi.ui.Splitter; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.changes.RefreshablePanel; import com.intellij.util.OnOffListener; import com.intellij.util.ui.UIUtil; @@ -54,12 +54,12 @@ public abstract class SplitterWithSecondHideable { Icon icon; Icon openIcon; if (vertical) { - icon = IconLoader.getIcon("/general/comboArrow.png"); - openIcon = IconLoader.getIcon("/general/comboUpPassive.png"); + icon = AllIcons.General.ComboArrow; + openIcon = AllIcons.General.ComboUpPassive; } else { - icon = IconLoader.getIcon("/general/comboArrowRight.png"); - openIcon = IconLoader.getIcon("/general/comboArrowRightPassive.png"); + icon = AllIcons.General.ComboArrowRight; + openIcon = AllIcons.General.ComboArrowRightPassive; } myTitledSeparator = new AbstractTitledSeparatorWithIcon(icon, openIcon, separatorText) { diff --git a/platform/platform-impl/src/com/intellij/ui/content/impl/ContentImpl.java b/platform/platform-impl/src/com/intellij/ui/content/impl/ContentImpl.java index 49832a64079a..55a73c1694b8 100644 --- a/platform/platform-impl/src/com/intellij/ui/content/impl/ContentImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/content/impl/ContentImpl.java @@ -16,9 +16,13 @@ */ package com.intellij.ui.content.impl; +import com.intellij.icons.AllIcons; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.ActionGroup; -import com.intellij.openapi.util.*; +import com.intellij.openapi.util.BusyObject; +import com.intellij.openapi.util.Computable; +import com.intellij.openapi.util.Disposer; +import com.intellij.openapi.util.UserDataHolderBase; import com.intellij.ui.LayeredIcon; import com.intellij.ui.content.AlertIcon; import com.intellij.ui.content.Content; @@ -32,7 +36,7 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; public class ContentImpl extends UserDataHolderBase implements Content { - private static final Icon PIN_ICON = IconLoader.getIcon("/nodes/pinToolWindow.png"); + private static final Icon PIN_ICON = AllIcons.Nodes.PinToolWindow; private String myDisplayName; private String myDescription; private JComponent myComponent; diff --git a/platform/platform-impl/src/com/intellij/ui/content/impl/MessageViewImpl.java b/platform/platform-impl/src/com/intellij/ui/content/impl/MessageViewImpl.java index 6a9409d232db..599460ff26ff 100644 --- a/platform/platform-impl/src/com/intellij/ui/content/impl/MessageViewImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/content/impl/MessageViewImpl.java @@ -16,10 +16,10 @@ */ package com.intellij.ui.content.impl; +import com.intellij.icons.AllIcons; import com.intellij.ide.impl.ContentManagerWatcher; import com.intellij.openapi.project.Project; import com.intellij.openapi.startup.StartupManager; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowAnchor; import com.intellij.openapi.wm.ToolWindowId; @@ -41,7 +41,7 @@ public class MessageViewImpl implements MessageView { final Runnable runnable = new Runnable() { public void run() { myToolWindow = toolWindowManager.registerToolWindow(ToolWindowId.MESSAGES_WINDOW, true, ToolWindowAnchor.BOTTOM, project, true); - myToolWindow.setIcon(IconLoader.getIcon("/general/toolWindowMessages.png")); + myToolWindow.setIcon(AllIcons.General.ToolWindowMessages); new ContentManagerWatcher(myToolWindow, getContentManager()); for (Runnable postponedRunnable : myPostponedRunnables) { postponedRunnable.run(); diff --git a/platform/platform-impl/src/com/intellij/ui/content/tabs/PinToolwindowTabAction.java b/platform/platform-impl/src/com/intellij/ui/content/tabs/PinToolwindowTabAction.java index 27de648fdbea..36586bfed508 100644 --- a/platform/platform-impl/src/com/intellij/ui/content/tabs/PinToolwindowTabAction.java +++ b/platform/platform-impl/src/com/intellij/ui/content/tabs/PinToolwindowTabAction.java @@ -15,9 +15,9 @@ */ package com.intellij.ui.content.tabs; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.project.DumbAware; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.impl.content.ToolWindowContentUi; import com.intellij.ui.content.Content; @@ -33,7 +33,7 @@ import javax.swing.*; public class PinToolwindowTabAction extends ToggleAction implements DumbAware { public static final String ACTION_NAME = "PinToolwindowTab"; - private static final Icon ICON = IconLoader.getIcon("/general/pin_tab.png"); + private static final Icon ICON = AllIcons.General.Pin_tab; public static AnAction getPinAction() { return ActionManager.getInstance().getAction(ACTION_NAME); diff --git a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java index 5598316ec556..1d1e588a2cd9 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java @@ -16,6 +16,7 @@ package com.intellij.ui.popup; import com.intellij.codeInsight.hint.HintUtil; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeEventQueue; import com.intellij.ide.UiActivity; import com.intellij.ide.UiActivityMonitor; @@ -238,9 +239,9 @@ public class AbstractPopup implements JBPopup { } if (pinCallback != null) { - myCaption.setButtonComponent(new InplaceButton(new IconButton("Pin", IconLoader.getIcon("/general/autohideOff.png"), - IconLoader.getIcon("/general/autohideOff.png"), - IconLoader.getIcon("/general/autohideOffInactive.png")), + myCaption.setButtonComponent(new InplaceButton(new IconButton("Pin", AllIcons.General.AutohideOff, + AllIcons.General.AutohideOff, + AllIcons.General.AutohideOffInactive), new ActionListener() { public void actionPerformed(final ActionEvent e) { pinCallback.process(AbstractPopup.this); diff --git a/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java b/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java index 368fe19e8666..414c5ece580e 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/PopupFactoryImpl.java @@ -16,6 +16,7 @@ package com.intellij.ui.popup; import com.intellij.CommonBundle; +import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.ide.IdeEventQueue; import com.intellij.ide.IdeTooltipManager; @@ -35,7 +36,6 @@ import com.intellij.openapi.ui.popup.*; import com.intellij.openapi.ui.popup.util.BaseListPopupStep; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.EmptyRunnable; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.wm.WindowManager; import com.intellij.openapi.wm.ex.WindowManagerEx; import com.intellij.openapi.wm.impl.IdeFrameImpl; @@ -67,7 +67,7 @@ import java.util.List; public class PopupFactoryImpl extends JBPopupFactory { private static final Logger LOG = Logger.getInstance("#com.intellij.ui.popup.PopupFactoryImpl"); - private static final Icon QUICK_LIST_ICON = IconLoader.getIcon("/actions/quickList.png"); + private static final Icon QUICK_LIST_ICON = AllIcons.Actions.QuickList; public ListPopup createConfirmation(String title, final Runnable onYes, int defaultOptionIndex) { return createConfirmation(title, CommonBundle.getYesButtonText(), CommonBundle.getNoButtonText(), onYes, defaultOptionIndex); diff --git a/platform/platform-impl/src/com/intellij/ui/popup/PopupIcons.java b/platform/platform-impl/src/com/intellij/ui/popup/PopupIcons.java index 00c0bd67052b..f230a6cb6bf3 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/PopupIcons.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/PopupIcons.java @@ -15,16 +15,16 @@ */ package com.intellij.ui.popup; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import javax.swing.*; import java.awt.*; public class PopupIcons { - public static Icon HAS_NEXT_ICON = IconLoader.getIcon("/icons/ide/nextStep.png"); - public static Icon HAS_NEXT_ICON_GRAYED = IconLoader.getIcon("/icons/ide/nextStepGrayed.png"); - public static Icon HAS_NEXT_ICON_INVERTED = IconLoader.getIcon("/icons/ide/nextStepInverted.png"); + public static Icon HAS_NEXT_ICON = AllIcons.Icons.Ide.NextStep; + public static Icon HAS_NEXT_ICON_GRAYED = AllIcons.Icons.Ide.NextStepGrayed; + public static Icon HAS_NEXT_ICON_INVERTED = AllIcons.Icons.Ide.NextStepInverted; public static Icon EMPTY_ICON = new EmptyIcon(); diff --git a/platform/platform-impl/src/com/intellij/ui/popup/SpeedSearchPane.java b/platform/platform-impl/src/com/intellij/ui/popup/SpeedSearchPane.java index 7f4bef0598cb..8047a9941ac2 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/SpeedSearchPane.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/SpeedSearchPane.java @@ -15,7 +15,7 @@ */ package com.intellij.ui.popup; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.ui.CaptionPanel; import javax.swing.*; @@ -32,7 +32,7 @@ public class SpeedSearchPane extends JDialog { private final JPanel myPanel = new JPanel(); private Dimension myLastLabelSize = new Dimension(); - private static final Icon ICON_PROMPT = IconLoader.getIcon("/icons/ide/speedSearchPrompt.png"); + private static final Icon ICON_PROMPT = AllIcons.Icons.Ide.SpeedSearchPrompt; public SpeedSearchPane(WizardPopup popup) throws HeadlessException { myPopup = popup; diff --git a/platform/platform-impl/src/com/intellij/ui/popup/tree/TreePopupImpl.java b/platform/platform-impl/src/com/intellij/ui/popup/tree/TreePopupImpl.java index 778cce6e609d..7bcf3575ca8c 100644 --- a/platform/platform-impl/src/com/intellij/ui/popup/tree/TreePopupImpl.java +++ b/platform/platform-impl/src/com/intellij/ui/popup/tree/TreePopupImpl.java @@ -15,16 +15,17 @@ */ package com.intellij.ui.popup.tree; +import com.intellij.icons.AllIcons; import com.intellij.ide.util.treeView.AlphaComparator; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.ui.popup.PopupStep; import com.intellij.openapi.ui.popup.TreePopup; import com.intellij.openapi.ui.popup.TreePopupStep; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.awt.RelativePoint; import com.intellij.ui.popup.WizardPopup; -import com.intellij.ui.treeStructure.*; +import com.intellij.ui.treeStructure.SimpleNodeRenderer; +import com.intellij.ui.treeStructure.SimpleTree; import com.intellij.ui.treeStructure.filtered.FilteringTreeBuilder; import com.intellij.ui.treeStructure.filtered.FilteringTreeStructure; import com.intellij.util.Range; @@ -397,8 +398,8 @@ public class TreePopupImpl extends WizardPopup implements TreePopup { if (!hasNextStep) continue; Icon icon = isPathSelected(eachPath) ? - IconLoader.getIcon("/icons/ide/nextStep.png") : - IconLoader.getIcon("/icons/ide/nextStepGrayed.png"); + AllIcons.Icons.Ide.NextStep : + AllIcons.Icons.Ide.NextStepGrayed; final Rectangle rec = getPathBounds(eachPath); int x = getSize().width - icon.getIconWidth() - 1; int y = rec.y + (rec.height - icon.getIconWidth()) / 2; diff --git a/platform/platform-tests/testSrc/com/intellij/ui/tabs/impl/JBTabsDemo.java b/platform/platform-tests/testSrc/com/intellij/ui/tabs/impl/JBTabsDemo.java index 71de0c229b09..4544a7e547f1 100644 --- a/platform/platform-tests/testSrc/com/intellij/ui/tabs/impl/JBTabsDemo.java +++ b/platform/platform-tests/testSrc/com/intellij/ui/tabs/impl/JBTabsDemo.java @@ -15,6 +15,7 @@ */ package com.intellij.ui.tabs.impl; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.util.Disposer; import com.intellij.openapi.util.IconLoader; @@ -150,7 +151,7 @@ public class JBTabsDemo { }; //someTree.setBorder(new LineBorder(Color.cyan)); tabs.addTab(new TabInfo(someTree)).setText("Tree1").setActions(new DefaultActionGroup(), null) - .setIcon(IconLoader.getIcon("/debugger/frame.png")); + .setIcon(AllIcons.Debugger.Frame); final JTree component = new Tree(); final TabInfo toAnimate1 = new TabInfo(component); diff --git a/platform/projectModel-api/src/com/intellij/ide/highlighter/ModuleFileType.java b/platform/projectModel-api/src/com/intellij/ide/highlighter/ModuleFileType.java index 718da71533f8..88601a5b1a70 100644 --- a/platform/projectModel-api/src/com/intellij/ide/highlighter/ModuleFileType.java +++ b/platform/projectModel-api/src/com/intellij/ide/highlighter/ModuleFileType.java @@ -15,9 +15,9 @@ */ package com.intellij.ide.highlighter; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.openapi.fileTypes.InternalFileType; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NonNls; @@ -29,7 +29,7 @@ public class ModuleFileType implements InternalFileType { @NonNls public static final String DEFAULT_EXTENSION = "iml"; @NonNls public static final String DOT_DEFAULT_EXTENSION = ".iml"; - private static final Icon ICON = IconLoader.getIcon("/nodes/ideaModule.png"); + private static final Icon ICON = AllIcons.Nodes.IdeaModule; @NotNull public String getName() { diff --git a/platform/projectModel-api/src/com/intellij/ide/highlighter/ProjectFileType.java b/platform/projectModel-api/src/com/intellij/ide/highlighter/ProjectFileType.java index aadd1ee96020..505be152e358 100644 --- a/platform/projectModel-api/src/com/intellij/ide/highlighter/ProjectFileType.java +++ b/platform/projectModel-api/src/com/intellij/ide/highlighter/ProjectFileType.java @@ -15,9 +15,9 @@ */ package com.intellij.ide.highlighter; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.openapi.fileTypes.InternalFileType; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NonNls; @@ -28,7 +28,7 @@ import javax.swing.*; public class ProjectFileType implements InternalFileType { @NonNls public static final String DEFAULT_EXTENSION = "ipr"; @NonNls public static final String DOT_DEFAULT_EXTENSION = ".ipr"; - private static final Icon ICON = IconLoader.getIcon("/nodes/ideaProject.png"); + private static final Icon ICON = AllIcons.Nodes.IdeaProject; @NotNull public String getName() { diff --git a/platform/testRunner/src/com/intellij/execution/testframework/PoolOfTestIcons.java b/platform/testRunner/src/com/intellij/execution/testframework/PoolOfTestIcons.java index 1195fa31abbd..582acf17d3f8 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/PoolOfTestIcons.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/PoolOfTestIcons.java @@ -15,7 +15,7 @@ */ package com.intellij.execution.testframework; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.ui.LayeredIcon; import javax.swing.*; @@ -29,6 +29,6 @@ public interface PoolOfTestIcons { Icon LOADING_ICON = TestsUIUtil.loadIcon("loadingTree"); Icon TERMINATED_ICON = TestsUIUtil.loadIcon("testTerminated"); Icon IGNORED_ICON = TestsUIUtil.loadIcon("testIgnored"); - Icon ERROR_ICON_MARK = IconLoader.getIcon("/nodes/errorMark.png"); + Icon ERROR_ICON_MARK = AllIcons.Nodes.ErrorMark; Icon TEAR_DOWN_FAILURE = new LayeredIcon(PASSED_ICON, ERROR_ICON_MARK); } diff --git a/platform/testRunner/src/com/intellij/execution/testframework/ToolbarPanel.java b/platform/testRunner/src/com/intellij/execution/testframework/ToolbarPanel.java index 9538c13bd891..e184740be8b2 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/ToolbarPanel.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/ToolbarPanel.java @@ -29,6 +29,7 @@ import com.intellij.execution.testframework.actions.TestFrameworkActions; import com.intellij.execution.testframework.actions.TestTreeExpander; import com.intellij.execution.testframework.export.ExportTestResultsAction; import com.intellij.execution.testframework.ui.AbstractTestTreeBuilder; +import com.intellij.icons.AllIcons; import com.intellij.ide.CommonActionsManager; import com.intellij.ide.OccurenceNavigator; import com.intellij.openapi.Disposable; @@ -37,7 +38,6 @@ import com.intellij.openapi.actionSystem.ActionPlaces; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.extensions.Extensions; -import com.intellij.openapi.util.IconLoader; import com.intellij.util.config.ToggleBooleanProperty; import javax.swing.*; @@ -70,7 +70,7 @@ public class ToolbarPanel extends JPanel implements OccurenceNavigator, Disposab actionGroup.addAction(new ToggleBooleanProperty(ExecutionBundle.message("junit.runing.info.sort.alphabetically.action.name"), ExecutionBundle.message("junit.runing.info.sort.alphabetically.action.description"), - IconLoader.getIcon("/objectBrowser/sorted.png"), + AllIcons.ObjectBrowser.Sorted, properties, TestConsoleProperties.SORT_ALPHABETICALLY)); actionGroup.addSeparator(); @@ -94,14 +94,14 @@ public class ToolbarPanel extends JPanel implements OccurenceNavigator, Disposab properties, TestConsoleProperties.SELECT_FIRST_DEFECT)).setAsSecondary(true); actionGroup.addAction(new ToggleBooleanProperty(ExecutionBundle.message("junit.runing.info.scroll.to.stacktrace.action.name"), ExecutionBundle.message("junit.runing.info.scroll.to.stacktrace.action.description"), - IconLoader.getIcon("/runConfigurations/scrollToStackTrace.png"), + AllIcons.RunConfigurations.ScrollToStackTrace, properties, TestConsoleProperties.SCROLL_TO_STACK_TRACE)).setAsSecondary(true); myScrollToSource = new ScrollToTestSourceAction(properties); actionGroup.addAction(myScrollToSource).setAsSecondary(true); actionGroup.addAction(new ToggleBooleanProperty(ExecutionBundle.message("junit.runing.info.open.source.at.exception.action.name"), ExecutionBundle .message("junit.runing.info.open.source.at.exception.action.description"), - IconLoader.getIcon("/runConfigurations/sourceAtException.png"), + AllIcons.RunConfigurations.SourceAtException, properties, TestConsoleProperties.OPEN_FAILURE_LINE)).setAsSecondary(true); actionGroup.addAction(new ShowStatisticsAction(properties)).setAsSecondary(true); diff --git a/platform/testRunner/src/com/intellij/execution/testframework/actions/ScrollToTestSourceAction.java b/platform/testRunner/src/com/intellij/execution/testframework/actions/ScrollToTestSourceAction.java index 25453e88bfe0..e09f55855057 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/actions/ScrollToTestSourceAction.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/actions/ScrollToTestSourceAction.java @@ -18,7 +18,7 @@ package com.intellij.execution.testframework.actions; import com.intellij.execution.ExecutionBundle; import com.intellij.execution.testframework.TestConsoleProperties; import com.intellij.execution.testframework.TestFrameworkRunningModel; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.util.config.AbstractProperty; import com.intellij.util.config.ToggleBooleanProperty; @@ -27,7 +27,7 @@ public class ScrollToTestSourceAction extends ToggleBooleanProperty.Disablable { public ScrollToTestSourceAction(final TestConsoleProperties properties) { super(ExecutionBundle.message("junit.auto.scroll.to.source.action.name"), ExecutionBundle.message("junit.open.text.in.editor.action.name"), - IconLoader.getIcon("/general/autoscrollToSource.png"), + AllIcons.General.AutoscrollToSource, properties, TestConsoleProperties.SCROLL_TO_SOURCE); } diff --git a/platform/testRunner/src/com/intellij/execution/testframework/autotest/ToggleAutoTestAction.java b/platform/testRunner/src/com/intellij/execution/testframework/autotest/ToggleAutoTestAction.java index e900bda821a8..0d40afa098ef 100644 --- a/platform/testRunner/src/com/intellij/execution/testframework/autotest/ToggleAutoTestAction.java +++ b/platform/testRunner/src/com/intellij/execution/testframework/autotest/ToggleAutoTestAction.java @@ -2,11 +2,11 @@ package com.intellij.execution.testframework.autotest; import com.intellij.execution.ui.RunContentDescriptor; import com.intellij.execution.ui.RunContentManager; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.actionSystem.ToggleAction; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; /** * @author yole @@ -14,7 +14,7 @@ import com.intellij.openapi.util.IconLoader; public class ToggleAutoTestAction extends ToggleAction { public ToggleAutoTestAction() { super("Toggle auto-test", "Toggle automatic rerun of tests on code changes", - IconLoader.getIcon("/actions/swapPanels.png")); + AllIcons.Actions.SwapPanels); } @Override diff --git a/platform/usageView/src/com/intellij/usages/impl/ImportUsageFilteringRuleProvider.java b/platform/usageView/src/com/intellij/usages/impl/ImportUsageFilteringRuleProvider.java index bd47eae235be..2787371fc31e 100644 --- a/platform/usageView/src/com/intellij/usages/impl/ImportUsageFilteringRuleProvider.java +++ b/platform/usageView/src/com/intellij/usages/impl/ImportUsageFilteringRuleProvider.java @@ -15,11 +15,11 @@ */ package com.intellij.usages.impl; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.CustomShortcutSet; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.usageView.UsageViewBundle; import com.intellij.usages.UsageView; import com.intellij.usages.rules.ImportFilteringRule; @@ -65,7 +65,7 @@ public class ImportUsageFilteringRuleProvider implements UsageFilteringRuleProvi private static class ShowImportsAction extends RuleAction { private ShowImportsAction(UsageViewImpl view) { - super(view, UsageViewBundle.message("action.show.import.statements"), IconLoader.getIcon("/actions/showImportStatements.png")); + super(view, UsageViewBundle.message("action.show.import.statements"), AllIcons.Actions.ShowImportStatements); } @Override diff --git a/platform/usageView/src/com/intellij/usages/impl/PreviewUsageAction.java b/platform/usageView/src/com/intellij/usages/impl/PreviewUsageAction.java index 60893d23ade5..11f7efd66531 100644 --- a/platform/usageView/src/com/intellij/usages/impl/PreviewUsageAction.java +++ b/platform/usageView/src/com/intellij/usages/impl/PreviewUsageAction.java @@ -15,9 +15,9 @@ */ package com.intellij.usages.impl; +import com.intellij.icons.AllIcons; import com.intellij.usageView.UsageViewBundle; import com.intellij.usages.UsageViewSettings; -import com.intellij.openapi.util.IconLoader; import javax.swing.*; @@ -25,7 +25,7 @@ import javax.swing.*; * @author cdr */ class PreviewUsageAction extends RuleAction { - private static final Icon PREVIEW_ICON = IconLoader.getIcon("/actions/preview.png"); + private static final Icon PREVIEW_ICON = AllIcons.Actions.Preview; PreviewUsageAction(UsageViewImpl usageView) { super(usageView, UsageViewBundle.message("preview.usages.action.text"), PREVIEW_ICON); diff --git a/platform/usageView/src/com/intellij/usages/impl/SortMembersAlphabeticallyAction.java b/platform/usageView/src/com/intellij/usages/impl/SortMembersAlphabeticallyAction.java index 2ff623336619..e6bac82b5da0 100644 --- a/platform/usageView/src/com/intellij/usages/impl/SortMembersAlphabeticallyAction.java +++ b/platform/usageView/src/com/intellij/usages/impl/SortMembersAlphabeticallyAction.java @@ -15,7 +15,7 @@ */ package com.intellij.usages.impl; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.usageView.UsageViewBundle; import com.intellij.usages.UsageViewSettings; @@ -25,7 +25,7 @@ import javax.swing.*; * @author cdr */ class SortMembersAlphabeticallyAction extends RuleAction { - private static final Icon ICON = IconLoader.getIcon("/objectBrowser/sorted.png"); + private static final Icon ICON = AllIcons.ObjectBrowser.Sorted; SortMembersAlphabeticallyAction(UsageViewImpl usageView) { super(usageView, UsageViewBundle.message("sort.alphabetically.action.text"), ICON); @@ -40,4 +40,4 @@ class SortMembersAlphabeticallyAction extends RuleAction { protected void setOptionValue(final boolean value) { UsageViewSettings.getInstance().IS_SORT_MEMBERS_ALPHABETICALLY = value; } -} \ No newline at end of file +} diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageFilteringRuleProviderImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageFilteringRuleProviderImpl.java index 6cf3a2ba26c2..034b383d29ad 100644 --- a/platform/usageView/src/com/intellij/usages/impl/UsageFilteringRuleProviderImpl.java +++ b/platform/usageView/src/com/intellij/usages/impl/UsageFilteringRuleProviderImpl.java @@ -15,10 +15,10 @@ */ package com.intellij.usages.impl; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.usageView.UsageViewBundle; import com.intellij.usages.UsageView; import com.intellij.usages.impl.rules.ReadAccessFilteringRule; @@ -99,7 +99,7 @@ public class UsageFilteringRuleProviderImpl implements UsageFilteringRuleProvide private class ShowReadAccessUsagesAction extends ToggleAction implements DumbAware { private ShowReadAccessUsagesAction() { - super(UsageViewBundle.message("action.show.read.access"), null, IconLoader.getIcon("/actions/showReadAccess.png")); + super(UsageViewBundle.message("action.show.read.access"), null, AllIcons.Actions.ShowReadAccess); } @Override @@ -118,7 +118,7 @@ public class UsageFilteringRuleProviderImpl implements UsageFilteringRuleProvide private class ShowWriteAccessUsagesAction extends ToggleAction implements DumbAware { private ShowWriteAccessUsagesAction() { - super(UsageViewBundle.message("action.show.write.access"), null, IconLoader.getIcon("/actions/showWriteAccess.png")); + super(UsageViewBundle.message("action.show.write.access"), null, AllIcons.Actions.ShowWriteAccess); } @Override diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageGroupingRuleProviderImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageGroupingRuleProviderImpl.java index 518fbf1bae1d..e85a496fe23a 100644 --- a/platform/usageView/src/com/intellij/usages/impl/UsageGroupingRuleProviderImpl.java +++ b/platform/usageView/src/com/intellij/usages/impl/UsageGroupingRuleProviderImpl.java @@ -15,11 +15,11 @@ */ package com.intellij.usages.impl; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.CustomShortcutSet; import com.intellij.openapi.extensions.Extensions; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.usageView.UsageViewBundle; import com.intellij.usages.UsageView; import com.intellij.usages.UsageViewSettings; @@ -121,7 +121,7 @@ public class UsageGroupingRuleProviderImpl implements UsageGroupingRuleProvider private static class GroupByUsageTypeAction extends RuleAction { private GroupByUsageTypeAction(UsageViewImpl view) { - super(view, UsageViewBundle.message("action.group.by.usage.type"), IconLoader.getIcon("/ant/filter.png")); //TODO: special icon + super(view, UsageViewBundle.message("action.group.by.usage.type"), AllIcons.Ant.Filter); //TODO: special icon } @Override protected boolean getOptionValue() { @@ -149,7 +149,7 @@ public class UsageGroupingRuleProviderImpl implements UsageGroupingRuleProvider private static class GroupByModuleTypeAction extends RuleAction { private GroupByModuleTypeAction(UsageViewImpl view) { - super(view, UsageViewBundle.message("action.group.by.module"), IconLoader.getIcon("/objectBrowser/showModules.png")); + super(view, UsageViewBundle.message("action.group.by.module"), AllIcons.ObjectBrowser.ShowModules); } @Override @@ -179,7 +179,7 @@ public class UsageGroupingRuleProviderImpl implements UsageGroupingRuleProvider private static class GroupByFileStructureAction extends RuleAction { private GroupByFileStructureAction(UsageViewImpl view) { - super(view, UsageViewBundle.message("action.group.by.file.structure"), IconLoader.getIcon("/actions/groupByMethod.png")); + super(view, UsageViewBundle.message("action.group.by.file.structure"), AllIcons.Actions.GroupByMethod); } @Override protected boolean getOptionValue() { diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java index 21eff6b28853..db8dafac57fb 100644 --- a/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java +++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewImpl.java @@ -15,6 +15,7 @@ */ package com.intellij.usages.impl; +import com.intellij.icons.AllIcons; import com.intellij.ide.*; import com.intellij.ide.actions.CloseTabToolbarAction; import com.intellij.openapi.Disposable; @@ -600,7 +601,7 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra private class MergeDupLines extends RuleAction { private MergeDupLines() { - super(UsageViewImpl.this, UsageViewBundle.message("action.merge.same.line"), IconLoader.getIcon("/toolbar/filterdups.png")); + super(UsageViewImpl.this, UsageViewBundle.message("action.merge.same.line"), AllIcons.Toolbar.Filterdups); setShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_DOWN_MASK))); } @@ -617,7 +618,7 @@ public class UsageViewImpl implements UsageView, UsageModelTracker.UsageModelTra private class ReRunAction extends AnAction implements DumbAware { private ReRunAction() { - super(UsageViewBundle.message("action.rerun"), UsageViewBundle.message("action.description.rerun"), IconLoader.getIcon("/actions/refreshUsages.png")); + super(UsageViewBundle.message("action.rerun"), UsageViewBundle.message("action.description.rerun"), AllIcons.Actions.RefreshUsages); registerCustomShortcutSet(CommonShortcuts.getRerun(), myRootPanel); } diff --git a/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java b/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java index af4a1d0bb20d..7c055d4e05dc 100644 --- a/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java +++ b/platform/usageView/src/com/intellij/usages/impl/UsageViewManagerImpl.java @@ -16,6 +16,7 @@ package com.intellij.usages.impl; import com.intellij.find.SearchInBackgroundOption; +import com.intellij.icons.AllIcons; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.editor.Editor; @@ -30,7 +31,10 @@ import com.intellij.openapi.project.DumbModeAction; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.MessageType; import com.intellij.openapi.ui.Messages; -import com.intellij.openapi.util.*; +import com.intellij.openapi.util.Disposer; +import com.intellij.openapi.util.Factory; +import com.intellij.openapi.util.Key; +import com.intellij.openapi.util.Segment; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowId; @@ -370,7 +374,7 @@ public class UsageViewManagerImpl extends UsageViewManager { //noinspection SSBasedInspection ToolWindowManager.getInstance(myProject).notifyByBalloon(ToolWindowId.FIND, MessageType.INFO, XmlStringUtil.escapeString(message), - IconLoader.getIcon("/actions/find.png"), null); + AllIcons.Actions.Find, null); } else { List titles = new ArrayList(notFoundActions.size() + 1); diff --git a/platform/usageView/src/com/intellij/usages/impl/rules/ModuleGroupingRule.java b/platform/usageView/src/com/intellij/usages/impl/rules/ModuleGroupingRule.java index 59c346535c18..c0ebbf1bc7b1 100644 --- a/platform/usageView/src/com/intellij/usages/impl/rules/ModuleGroupingRule.java +++ b/platform/usageView/src/com/intellij/usages/impl/rules/ModuleGroupingRule.java @@ -15,6 +15,7 @@ */ package com.intellij.usages.impl.rules; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.DataKey; import com.intellij.openapi.actionSystem.DataSink; import com.intellij.openapi.actionSystem.LangDataKeys; @@ -22,7 +23,6 @@ import com.intellij.openapi.actionSystem.TypeSafeDataProvider; import com.intellij.openapi.module.Module; import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.roots.OrderEntry; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.FileStatus; import com.intellij.usageView.UsageViewBundle; import com.intellij.usages.Usage; @@ -57,7 +57,7 @@ public class ModuleGroupingRule implements UsageGroupingRule { } private static class LibraryUsageGroup implements UsageGroup { - public static final Icon LIBRARY_ICON = IconLoader.getIcon("/nodes/ppLibOpen.png"); + public static final Icon LIBRARY_ICON = AllIcons.Nodes.PpLibOpen; private final OrderEntry myEntry; diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java new file mode 100644 index 000000000000..0c06cb97f392 --- /dev/null +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -0,0 +1,1331 @@ +package com.intellij.icons; + +import com.intellij.openapi.util.IconLoader; + +import javax.swing.*; + +public class AllIcons { + + public static class _cvs { + public static Icon CheckOut = IconLoader.getIcon("/_cvs/checkOut.png"); + public static Icon Cvs = IconLoader.getIcon("/_cvs/cvs.png"); + public static Icon HideMissing = IconLoader.getIcon("/_cvs/hideMissing.png"); + public static Icon HideUnknown = IconLoader.getIcon("/_cvs/hideUnknown.png"); + public static Icon HideUptodate = IconLoader.getIcon("/_cvs/hideUptodate.png"); + public static Icon Missing = IconLoader.getIcon("/_cvs/missing.png"); + public static Icon ShowAsTree = IconLoader.getIcon("/_cvs/showAsTree.png"); + public static Icon TestInProgress1 = IconLoader.getIcon("/_cvs/testInProgress1.png"); + public static Icon TestInProgress2 = IconLoader.getIcon("/_cvs/testInProgress2.png"); + public static Icon TestInProgress3 = IconLoader.getIcon("/_cvs/testInProgress3.png"); + public static Icon TestInProgress4 = IconLoader.getIcon("/_cvs/testInProgress4.png"); + public static Icon TestInProgress5 = IconLoader.getIcon("/_cvs/testInProgress5.png"); + public static Icon TestInProgress6 = IconLoader.getIcon("/_cvs/testInProgress6.png"); + public static Icon TestInProgress7 = IconLoader.getIcon("/_cvs/testInProgress7.png"); + public static Icon TestInProgress8 = IconLoader.getIcon("/_cvs/testInProgress8.png"); + public static Icon Unknown = IconLoader.getIcon("/_cvs/unknown.png"); + + } + + public static class Actions { + public static Icon AddFacesSupport = IconLoader.getIcon("/actions/addFacesSupport.png"); + public static Icon Annotate = IconLoader.getIcon("/actions/annotate.png"); + public static Icon Apache = IconLoader.getIcon("/actions/apache.png"); + public static Icon Back = IconLoader.getIcon("/actions/back.png"); + public static Icon Bookmark0 = IconLoader.getIcon("/actions/bookmark0.png"); + public static Icon Bookmark1 = IconLoader.getIcon("/actions/bookmark1.png"); + public static Icon Bookmark2 = IconLoader.getIcon("/actions/bookmark2.png"); + public static Icon Bookmark3 = IconLoader.getIcon("/actions/bookmark3.png"); + public static Icon Bookmark4 = IconLoader.getIcon("/actions/bookmark4.png"); + public static Icon Bookmark5 = IconLoader.getIcon("/actions/bookmark5.png"); + public static Icon Bookmark6 = IconLoader.getIcon("/actions/bookmark6.png"); + public static Icon Bookmark7 = IconLoader.getIcon("/actions/bookmark7.png"); + public static Icon Bookmark8 = IconLoader.getIcon("/actions/bookmark8.png"); + public static Icon Bookmark9 = IconLoader.getIcon("/actions/bookmark9.png"); + public static Icon Breakpoint = IconLoader.getIcon("/actions/breakpoint.png"); + public static Icon Browser_externalJavaDoc = IconLoader.getIcon("/actions/browser-externalJavaDoc.png"); + public static Icon Cancel = IconLoader.getIcon("/actions/cancel.png"); + public static Icon Checked = IconLoader.getIcon("/actions/checked.png"); + public static Icon Checked_selected = IconLoader.getIcon("/actions/checked_selected.png"); + public static Icon Checked_small = IconLoader.getIcon("/actions/checked_small.png"); + public static Icon Checked_small_selected = IconLoader.getIcon("/actions/checked_small_selected.png"); + public static Icon CheckOut = IconLoader.getIcon("/actions/checkOut.png"); + public static Icon Clean = IconLoader.getIcon("/actions/clean.png"); + public static Icon CleanHeavy = IconLoader.getIcon("/actions/cleanHeavy.png"); + public static Icon CleanLight = IconLoader.getIcon("/actions/cleanLight.png"); + public static Icon Close = IconLoader.getIcon("/actions/close.png"); + public static Icon CloseHovered = IconLoader.getIcon("/actions/closeHovered.png"); + public static Icon CloseNew = IconLoader.getIcon("/actions/closeNew.png"); + public static Icon CloseNewHovered = IconLoader.getIcon("/actions/closeNewHovered.png"); + public static Icon Collapseall = IconLoader.getIcon("/actions/collapseall.png"); + public static Icon CollapsePanel = IconLoader.getIcon("/actions/collapsePanel.png"); + public static Icon Commit = IconLoader.getIcon("/actions/commit.png"); + public static Icon Compile = IconLoader.getIcon("/actions/compile.png"); + public static Icon ConsoleHistory = IconLoader.getIcon("/actions/consoleHistory.png"); + public static Icon Copy = IconLoader.getIcon("/actions/copy.png"); + public static Icon CreateFromUsage = IconLoader.getIcon("/actions/createFromUsage.png"); + public static Icon CreateFromUsage_off = IconLoader.getIcon("/actions/createFromUsage_off.png"); + public static Icon CreatePatch = IconLoader.getIcon("/actions/createPatch.png"); + public static Icon Cross = IconLoader.getIcon("/actions/cross.png"); + public static Icon Cvs = IconLoader.getIcon("/actions/cvs.png"); + public static Icon Delete = IconLoader.getIcon("/actions/delete.png"); + public static Icon Diff = IconLoader.getIcon("/actions/diff.png"); + public static Icon DiffWithCurrent = IconLoader.getIcon("/actions/diffWithCurrent.png"); + public static Icon DownBig = IconLoader.getIcon("/actions/downBig.png"); + public static Icon Dump = IconLoader.getIcon("/actions/dump.png"); + public static Icon Eclipse = IconLoader.getIcon("/actions/eclipse.png"); + public static Icon Edit = IconLoader.getIcon("/actions/edit.png"); + public static Icon EditDefaultExcludes = IconLoader.getIcon("/actions/editDefaultExcludes.png"); + public static Icon EditSource = IconLoader.getIcon("/actions/editSource.png"); + public static Icon EnterpriseBuild = IconLoader.getIcon("/actions/enterpriseBuild.png"); + public static Icon Er_state = IconLoader.getIcon("/actions/er-state.png"); + public static Icon ErDiagram = IconLoader.getIcon("/actions/erDiagram.png"); + public static Icon Exception = IconLoader.getIcon("/actions/exception.png"); + public static Icon Exclude = IconLoader.getIcon("/actions/exclude.png"); + public static Icon Execute = IconLoader.getIcon("/actions/execute.png"); + public static Icon Exit = IconLoader.getIcon("/actions/exit.png"); + public static Icon Expandall = IconLoader.getIcon("/actions/expandall.png"); + public static Icon ExpandPanel = IconLoader.getIcon("/actions/expandPanel.png"); + public static Icon Export = IconLoader.getIcon("/actions/export.png"); + public static Icon FileStatus = IconLoader.getIcon("/actions/fileStatus.png"); + public static Icon Filter_small = IconLoader.getIcon("/actions/filter_small.png"); + public static Icon Find = IconLoader.getIcon("/actions/find.png"); + public static Icon Forward = IconLoader.getIcon("/actions/forward.png"); + public static Icon FreezeThread = IconLoader.getIcon("/actions/freezeThread.png"); + public static Icon GC = IconLoader.getIcon("/actions/gc.png"); + public static Icon Get = IconLoader.getIcon("/actions/get.png"); + public static Icon GroupByMethod = IconLoader.getIcon("/actions/groupByMethod.png"); + public static Icon Help = IconLoader.getIcon("/actions/help.png"); + public static Icon Hibernate = IconLoader.getIcon("/actions/hibernate.png"); + public static Icon Ibm = IconLoader.getIcon("/actions/ibm.png"); + public static Icon Ignore1 = IconLoader.getIcon("/actions/ignore1.png"); + public static Icon Ignore2 = IconLoader.getIcon("/actions/ignore2.png"); + public static Icon Ignore3 = IconLoader.getIcon("/actions/ignore3.png"); + public static Icon Import = IconLoader.getIcon("/actions/import.png"); + public static Icon Install = IconLoader.getIcon("/actions/install.png"); + public static Icon IntentionBulb = IconLoader.getIcon("/actions/intentionBulb.png"); + public static Icon IntentionOffBulb = IconLoader.getIcon("/actions/intentionOffBulb.png"); + public static Icon Lightning = IconLoader.getIcon("/actions/lightning.png"); + public static Icon Menu_cut = IconLoader.getIcon("/actions/menu-cut.png"); + public static Icon Menu_find = IconLoader.getIcon("/actions/menu-find.png"); + public static Icon Menu_help = IconLoader.getIcon("/actions/menu-help.png"); + public static Icon Menu_open = IconLoader.getIcon("/actions/menu-open.png"); + public static Icon Menu_paste = IconLoader.getIcon("/actions/menu-paste.png"); + public static Icon Menu_replace = IconLoader.getIcon("/actions/menu-replace.png"); + public static Icon Menu_saveall = IconLoader.getIcon("/actions/menu-saveall.png"); + public static Icon Microsoft = IconLoader.getIcon("/actions/microsoft.png"); + public static Icon Minimize = IconLoader.getIcon("/actions/minimize.png"); + public static Icon Modul = IconLoader.getIcon("/actions/modul.png"); + public static Icon Move_to_button_top = IconLoader.getIcon("/actions/move-to-button-top.png"); + public static Icon Move_to_button = IconLoader.getIcon("/actions/move-to-button.png"); + public static Icon MoveDown = IconLoader.getIcon("/actions/moveDown.png"); + public static Icon MoveUp = IconLoader.getIcon("/actions/moveUp.png"); + public static Icon Mysql = IconLoader.getIcon("/actions/mysql.png"); + public static Icon New = IconLoader.getIcon("/actions/new.png"); + public static Icon NewFolder = IconLoader.getIcon("/actions/newFolder.png"); + public static Icon Nextfile = IconLoader.getIcon("/actions/nextfile.png"); + public static Icon NextOccurence = IconLoader.getIcon("/actions/nextOccurence.png"); + public static Icon Oracle = IconLoader.getIcon("/actions/oracle.png"); + public static Icon Pause = IconLoader.getIcon("/actions/pause.png"); + public static Icon PopFrame = IconLoader.getIcon("/actions/popFrame.png"); + public static Icon Postgresql = IconLoader.getIcon("/actions/postgresql.png"); + public static Icon Prevfile = IconLoader.getIcon("/actions/prevfile.png"); + public static Icon Preview = IconLoader.getIcon("/actions/preview.png"); + public static Icon PreviousOccurence = IconLoader.getIcon("/actions/previousOccurence.png"); + public static Icon ProfileCPU = IconLoader.getIcon("/actions/profileCPU.png"); + public static Icon ProfileMemory = IconLoader.getIcon("/actions/profileMemory.png"); + public static Icon Properties = IconLoader.getIcon("/actions/properties.png"); + public static Icon QuickfixBulb = IconLoader.getIcon("/actions/quickfixBulb.png"); + public static Icon QuickfixOffBulb = IconLoader.getIcon("/actions/quickfixOffBulb.png"); + public static Icon QuickList = IconLoader.getIcon("/actions/quickList.png"); + public static Icon RealIntentionBulb = IconLoader.getIcon("/actions/realIntentionBulb.png"); + public static Icon RealIntentionOffBulb = IconLoader.getIcon("/actions/realIntentionOffBulb.png"); + public static Icon Redo = IconLoader.getIcon("/actions/redo.png"); + public static Icon RefactoringBulb = IconLoader.getIcon("/actions/refactoringBulb.png"); + public static Icon Refresh = IconLoader.getIcon("/actions/refresh.png"); + public static Icon RefreshUsages = IconLoader.getIcon("/actions/refreshUsages.png"); + public static Icon RemoveBig = IconLoader.getIcon("/actions/removeBig.png"); + public static Icon Replace = IconLoader.getIcon("/actions/replace.png"); + public static Icon Reset_to_default = IconLoader.getIcon("/actions/reset-to-default.png"); + public static Icon Reset = IconLoader.getIcon("/actions/reset.png"); + public static Icon Restart = IconLoader.getIcon("/actions/restart.png"); + public static Icon Resume = IconLoader.getIcon("/actions/resume.png"); + public static Icon ResumeThread = IconLoader.getIcon("/actions/resumeThread.png"); + public static Icon Rollback = IconLoader.getIcon("/actions/rollback.png"); + public static Icon RunToCursor = IconLoader.getIcon("/actions/runToCursor.png"); + public static Icon Search = IconLoader.getIcon("/actions/search.png"); + public static Icon Selectall = IconLoader.getIcon("/actions/selectall.png"); + public static Icon Share = IconLoader.getIcon("/actions/share.png"); + public static Icon ShowChangesOnly = IconLoader.getIcon("/actions/showChangesOnly.png"); + public static Icon ShowHiddens = IconLoader.getIcon("/actions/showHiddens.png"); + public static Icon ShowImportStatements = IconLoader.getIcon("/actions/showImportStatements.png"); + public static Icon ShowReadAccess = IconLoader.getIcon("/actions/showReadAccess.png"); + public static Icon ShowSettings = IconLoader.getIcon("/actions/showSettings.png"); + public static Icon ShowSource = IconLoader.getIcon("/actions/showSource.png"); + public static Icon ShowViewer = IconLoader.getIcon("/actions/showViewer.png"); + public static Icon ShowWriteAccess = IconLoader.getIcon("/actions/showWriteAccess.png"); + public static Icon SortAsc = IconLoader.getIcon("/actions/sortAsc.png"); + public static Icon SortDesc = IconLoader.getIcon("/actions/sortDesc.png"); + public static Icon SplitHorizontally = IconLoader.getIcon("/actions/splitHorizontally.png"); + public static Icon SplitVertically = IconLoader.getIcon("/actions/splitVertically.png"); + public static Icon Sqlite = IconLoader.getIcon("/actions/sqlite.png"); + public static Icon StartDebugger = IconLoader.getIcon("/actions/startDebugger.png"); + public static Icon StepOut = IconLoader.getIcon("/actions/stepOut.png"); + public static Icon Submit1 = IconLoader.getIcon("/actions/submit1.png"); + public static Icon Submit2 = IconLoader.getIcon("/actions/submit2.png"); + public static Icon Submit3 = IconLoader.getIcon("/actions/submit3.png"); + public static Icon Sun = IconLoader.getIcon("/actions/sun.png"); + public static Icon Suspend = IconLoader.getIcon("/actions/suspend.png"); + public static Icon SwapPanels = IconLoader.getIcon("/actions/swapPanels.png"); + public static Icon Sync = IconLoader.getIcon("/actions/sync.png"); + public static Icon SyncPanels = IconLoader.getIcon("/actions/syncPanels.png"); + public static Icon ToggleSoftWrap = IconLoader.getIcon("/actions/toggleSoftWrap.png"); + public static Icon TraceInto = IconLoader.getIcon("/actions/traceInto.png"); + public static Icon TraceOver = IconLoader.getIcon("/actions/traceOver.png"); + public static Icon Undo = IconLoader.getIcon("/actions/undo.png"); + public static Icon Uninstall = IconLoader.getIcon("/actions/uninstall.png"); + public static Icon Unselectall = IconLoader.getIcon("/actions/unselectall.png"); + public static Icon Unshare = IconLoader.getIcon("/actions/unshare.png"); + public static Icon UpBig = IconLoader.getIcon("/actions/upBig.png"); + + } + + public static class Ant { + public static Icon AllJarsInDir = IconLoader.getIcon("/ant/allJarsInDir.png"); + public static Icon AntInstallation = IconLoader.getIcon("/ant/antInstallation.png"); + public static Icon Build = IconLoader.getIcon("/ant/build.png"); + public static Icon ChangeView = IconLoader.getIcon("/ant/changeView.png"); + public static Icon Filter = IconLoader.getIcon("/ant/filter.png"); + public static Icon FilterError = IconLoader.getIcon("/ant/filterError.png"); + public static Icon FilterInfo = IconLoader.getIcon("/ant/filterInfo.png"); + public static Icon FilterWarning = IconLoader.getIcon("/ant/filterWarning.png"); + public static Icon Message = IconLoader.getIcon("/ant/message.png"); + public static Icon MetaTarget = IconLoader.getIcon("/ant/metaTarget.png"); + public static Icon Properties = IconLoader.getIcon("/ant/properties.png"); + public static Icon ShortcutFilter = IconLoader.getIcon("/ant/shortcutFilter.png"); + public static Icon Target = IconLoader.getIcon("/ant/target.png"); + public static Icon Task = IconLoader.getIcon("/ant/task.png"); + public static Icon Verbose = IconLoader.getIcon("/ant/verbose.png"); + + } + + public static class Compiler { + public static Icon Error = IconLoader.getIcon("/compiler/error.png"); + public static Icon HideWarnings = IconLoader.getIcon("/compiler/hideWarnings.png"); + public static Icon Information = IconLoader.getIcon("/compiler/information.png"); + public static Icon Warning = IconLoader.getIcon("/compiler/warning.png"); + + } + + public static class Debugger { + + public static class Actions { + public static Icon Force_run_to_cursor = IconLoader.getIcon("/debugger/actions/force_run_to_cursor.png"); + public static Icon Force_step_into = IconLoader.getIcon("/debugger/actions/force_step_into.png"); + public static Icon Force_step_over = IconLoader.getIcon("/debugger/actions/force_step_over.png"); + + } + public static Icon AddBreakpoint = IconLoader.getIcon("/debugger/addBreakpoint.png"); + public static Icon AddToWatch = IconLoader.getIcon("/debugger/addToWatch.png"); + public static Icon Attach = IconLoader.getIcon("/debugger/attach.png"); + public static Icon AutoVariablesMode = IconLoader.getIcon("/debugger/autoVariablesMode.png"); + public static Icon BreakpointAlert = IconLoader.getIcon("/debugger/breakpointAlert.png"); + public static Icon Class_filter = IconLoader.getIcon("/debugger/class_filter.png"); + public static Icon Console = IconLoader.getIcon("/debugger/console.png"); + public static Icon Db_array = IconLoader.getIcon("/debugger/db_array.png"); + public static Icon Db_dep_exception_breakpoint = IconLoader.getIcon("/debugger/db_dep_exception_breakpoint.png"); + public static Icon Db_dep_field_breakpoint = IconLoader.getIcon("/debugger/db_dep_field_breakpoint.png"); + public static Icon Db_dep_line_breakpoint = IconLoader.getIcon("/debugger/db_dep_line_breakpoint.png"); + public static Icon Db_dep_method_breakpoint = IconLoader.getIcon("/debugger/db_dep_method_breakpoint.png"); + public static Icon Db_disabled_breakpoint = IconLoader.getIcon("/debugger/db_disabled_breakpoint.png"); + public static Icon Db_disabled_breakpoint_process = IconLoader.getIcon("/debugger/db_disabled_breakpoint_process.png"); + public static Icon Db_disabled_exception_breakpoint = IconLoader.getIcon("/debugger/db_disabled_exception_breakpoint.png"); + public static Icon Db_disabled_field_breakpoint = IconLoader.getIcon("/debugger/db_disabled_field_breakpoint.png"); + public static Icon Db_disabled_method_breakpoint = IconLoader.getIcon("/debugger/db_disabled_method_breakpoint.png"); + public static Icon Db_error = IconLoader.getIcon("/debugger/db_error.png"); + public static Icon Db_exception_breakpoint = IconLoader.getIcon("/debugger/db_exception_breakpoint.png"); + public static Icon Db_field_breakpoint = IconLoader.getIcon("/debugger/db_field_breakpoint.png"); + public static Icon Db_field_warning_breakpoint = IconLoader.getIcon("/debugger/db_field_warning_breakpoint.png"); + public static Icon Db_invalid_breakpoint = IconLoader.getIcon("/debugger/db_invalid_breakpoint.png"); + public static Icon Db_invalid_field_breakpoint = IconLoader.getIcon("/debugger/db_invalid_field_breakpoint.png"); + public static Icon Db_invalid_method_breakpoint = IconLoader.getIcon("/debugger/db_invalid_method_breakpoint.png"); + public static Icon Db_method_breakpoint = IconLoader.getIcon("/debugger/db_method_breakpoint.png"); + public static Icon Db_method_warning_breakpoint = IconLoader.getIcon("/debugger/db_method_warning_breakpoint.png"); + public static Icon Db_muted_breakpoint = IconLoader.getIcon("/debugger/db_muted_breakpoint.png"); + public static Icon Db_muted_dep_exception_breakpoint = IconLoader.getIcon("/debugger/db_muted_dep_exception_breakpoint.png"); + public static Icon Db_muted_dep_field_breakpoint = IconLoader.getIcon("/debugger/db_muted_dep_field_breakpoint.png"); + public static Icon Db_muted_dep_line_breakpoint = IconLoader.getIcon("/debugger/db_muted_dep_line_breakpoint.png"); + public static Icon Db_muted_dep_method_breakpoint = IconLoader.getIcon("/debugger/db_muted_dep_method_breakpoint.png"); + public static Icon Db_muted_disabled_breakpoint = IconLoader.getIcon("/debugger/db_muted_disabled_breakpoint.png"); + public static Icon Db_muted_disabled_breakpoint_process = IconLoader.getIcon("/debugger/db_muted_disabled_breakpoint_process.png"); + public static Icon Db_muted_disabled_exception_breakpoint = IconLoader.getIcon("/debugger/db_muted_disabled_exception_breakpoint.png"); + public static Icon Db_muted_disabled_field_breakpoint = IconLoader.getIcon("/debugger/db_muted_disabled_field_breakpoint.png"); + public static Icon Db_muted_disabled_method_breakpoint = IconLoader.getIcon("/debugger/db_muted_disabled_method_breakpoint.png"); + public static Icon Db_muted_exception_breakpoint = IconLoader.getIcon("/debugger/db_muted_exception_breakpoint.png"); + public static Icon Db_muted_field_breakpoint = IconLoader.getIcon("/debugger/db_muted_field_breakpoint.png"); + public static Icon Db_muted_field_warning_breakpoint = IconLoader.getIcon("/debugger/db_muted_field_warning_breakpoint.png"); + public static Icon Db_muted_invalid_breakpoint = IconLoader.getIcon("/debugger/db_muted_invalid_breakpoint.png"); + public static Icon Db_muted_invalid_field_breakpoint = IconLoader.getIcon("/debugger/db_muted_invalid_field_breakpoint.png"); + public static Icon Db_muted_invalid_method_breakpoint = IconLoader.getIcon("/debugger/db_muted_invalid_method_breakpoint.png"); + public static Icon Db_muted_method_breakpoint = IconLoader.getIcon("/debugger/db_muted_method_breakpoint.png"); + public static Icon Db_muted_method_warning_breakpoint = IconLoader.getIcon("/debugger/db_muted_method_warning_breakpoint.png"); + public static Icon Db_muted_verified_breakpoint = IconLoader.getIcon("/debugger/db_muted_verified_breakpoint.png"); + public static Icon Db_muted_verified_field_breakpoint = IconLoader.getIcon("/debugger/db_muted_verified_field_breakpoint.png"); + public static Icon Db_muted_verified_method_breakpoint = IconLoader.getIcon("/debugger/db_muted_verified_method_breakpoint.png"); + public static Icon Db_muted_verified_warning_breakpoint = IconLoader.getIcon("/debugger/db_muted_verified_warning_breakpoint.png"); + public static Icon Db_obsolete = IconLoader.getIcon("/debugger/db_obsolete.png"); + public static Icon Db_primitive = IconLoader.getIcon("/debugger/db_primitive.png"); + public static Icon Db_set_breakpoint = IconLoader.getIcon("/debugger/db_set_breakpoint.png"); + public static Icon Db_verified_breakpoint = IconLoader.getIcon("/debugger/db_verified_breakpoint.png"); + public static Icon Db_verified_field_breakpoint = IconLoader.getIcon("/debugger/db_verified_field_breakpoint.png"); + public static Icon Db_verified_method_breakpoint = IconLoader.getIcon("/debugger/db_verified_method_breakpoint.png"); + public static Icon Db_verified_warning_breakpoint = IconLoader.getIcon("/debugger/db_verified_warning_breakpoint.png"); + public static Icon Db_warning = IconLoader.getIcon("/debugger/db_warning.png"); + public static Icon Detach = IconLoader.getIcon("/debugger/detach.png"); + public static Icon Disable_value_calculation = IconLoader.getIcon("/debugger/disable_value_calculation.png"); + public static Icon EvaluateExpression = IconLoader.getIcon("/debugger/evaluateExpression.png"); + public static Icon Frame = IconLoader.getIcon("/debugger/frame.png"); + public static Icon GroupClosed = IconLoader.getIcon("/debugger/groupClosed.png"); + public static Icon GroupOpened = IconLoader.getIcon("/debugger/groupOpened.png"); + public static Icon KillProcess = IconLoader.getIcon("/debugger/killProcess.png"); + public static Icon MuteBreakpoints = IconLoader.getIcon("/debugger/muteBreakpoints.png"); + public static Icon NewWatch = IconLoader.getIcon("/debugger/newWatch.png"); + public static Icon Pattern = IconLoader.getIcon("/debugger/pattern.png"); + public static Icon RestoreLayout = IconLoader.getIcon("/debugger/restoreLayout.png"); + public static Icon ShowCurrentFrame = IconLoader.getIcon("/debugger/showCurrentFrame.png"); + public static Icon StackFrame = IconLoader.getIcon("/debugger/stackFrame.png"); + public static Icon Suspend_all = IconLoader.getIcon("/debugger/suspend_all.png"); + public static Icon Suspend_thread = IconLoader.getIcon("/debugger/suspend_thread.png"); + public static Icon ThreadAtBreakpoint = IconLoader.getIcon("/debugger/threadAtBreakpoint.png"); + public static Icon ThreadCurrent = IconLoader.getIcon("/debugger/threadCurrent.png"); + public static Icon ThreadFrozen = IconLoader.getIcon("/debugger/threadFrozen.png"); + public static Icon ThreadGroup = IconLoader.getIcon("/debugger/threadGroup.png"); + public static Icon ThreadGroupCurrent = IconLoader.getIcon("/debugger/threadGroupCurrent.png"); + public static Icon ThreadRunning = IconLoader.getIcon("/debugger/threadRunning.png"); + public static Icon Threads = IconLoader.getIcon("/debugger/threads.png"); + + public static class ThreadStates { + public static Icon Daemon_sign = IconLoader.getIcon("/debugger/threadStates/daemon_sign.png"); + public static Icon EdtBusy = IconLoader.getIcon("/debugger/threadStates/edtBusy.png"); + public static Icon Exception = IconLoader.getIcon("/debugger/threadStates/exception.png"); + public static Icon Idle = IconLoader.getIcon("/debugger/threadStates/idle.png"); + public static Icon IO = IconLoader.getIcon("/debugger/threadStates/io.png"); + public static Icon Locked = IconLoader.getIcon("/debugger/threadStates/locked.png"); + public static Icon Paused = IconLoader.getIcon("/debugger/threadStates/paused.png"); + public static Icon Running = IconLoader.getIcon("/debugger/threadStates/running.png"); + public static Icon Socket = IconLoader.getIcon("/debugger/threadStates/socket.png"); + public static Icon Threaddump = IconLoader.getIcon("/debugger/threadStates/threaddump.png"); + + } + public static Icon ThreadSuspended = IconLoader.getIcon("/debugger/threadSuspended.png"); + public static Icon ToGrid = IconLoader.getIcon("/debugger/toGrid.png"); + public static Icon ToolConsole = IconLoader.getIcon("/debugger/toolConsole.png"); + public static Icon ToTab = IconLoader.getIcon("/debugger/toTab.png"); + public static Icon Value = IconLoader.getIcon("/debugger/value.png"); + public static Icon ViewBreakpoints = IconLoader.getIcon("/debugger/viewBreakpoints.png"); + public static Icon Watch = IconLoader.getIcon("/debugger/watch.png"); + public static Icon Watches = IconLoader.getIcon("/debugger/watches.png"); + public static Icon WatchLastReturnValue = IconLoader.getIcon("/debugger/watchLastReturnValue.png"); + public static Icon WatchReturnValues = IconLoader.getIcon("/debugger/watchReturnValues.png"); + + } + + public static class Diff { + public static Icon ApplyNotConflicts = IconLoader.getIcon("/diff/applyNotConflicts.png"); + public static Icon Arrow = IconLoader.getIcon("/diff/arrow.png"); + public static Icon BranchDiff = IconLoader.getIcon("/diff/branchDiff.png"); + public static Icon CurrentLine = IconLoader.getIcon("/diff/currentLine.png"); + public static Icon Diff = IconLoader.getIcon("/diff/Diff.png"); + public static Icon LeftDiff = IconLoader.getIcon("/diff/leftDiff.png"); + public static Icon Remove = IconLoader.getIcon("/diff/remove.png"); + public static Icon RightDiff = IconLoader.getIcon("/diff/rightDiff.png"); + + } + + public static class Duplicates { + public static Icon SendToTheLeft = IconLoader.getIcon("/duplicates/sendToTheLeft.png"); + public static Icon SendToTheLeftGrayed = IconLoader.getIcon("/duplicates/sendToTheLeftGrayed.png"); + public static Icon SendToTheRight = IconLoader.getIcon("/duplicates/sendToTheRight.png"); + public static Icon SendToTheRightGrayed = IconLoader.getIcon("/duplicates/sendToTheRightGrayed.png"); + + } + + public static class FileTypes { + public static Icon Any_type = IconLoader.getIcon("/fileTypes/any_type.png"); + public static Icon Archive = IconLoader.getIcon("/fileTypes/archive.png"); + public static Icon Aspectj = IconLoader.getIcon("/fileTypes/aspectj.png"); + public static Icon Css = IconLoader.getIcon("/fileTypes/css.png"); + public static Icon Custom = IconLoader.getIcon("/fileTypes/custom.png"); + public static Icon Dtd = IconLoader.getIcon("/fileTypes/dtd.png"); + public static Icon Facelets = IconLoader.getIcon("/fileTypes/facelets.png"); + public static Icon FacesConfig = IconLoader.getIcon("/fileTypes/facesConfig.png"); + public static Icon FacesFile = IconLoader.getIcon("/fileTypes/facesFile.png"); + public static Icon FacesXFile = IconLoader.getIcon("/fileTypes/facesXFile.png"); + public static Icon Html = IconLoader.getIcon("/fileTypes/html.png"); + public static Icon Idl = IconLoader.getIcon("/fileTypes/idl.png"); + public static Icon Java = IconLoader.getIcon("/fileTypes/java.png"); + public static Icon JavaClass = IconLoader.getIcon("/fileTypes/javaClass.png"); + public static Icon JavaOutsideSource = IconLoader.getIcon("/fileTypes/javaOutsideSource.png"); + public static Icon JavaScript = IconLoader.getIcon("/fileTypes/javaScript.png"); + public static Icon Jsp = IconLoader.getIcon("/fileTypes/jsp.png"); + public static Icon Jspx = IconLoader.getIcon("/fileTypes/jspx.png"); + public static Icon Properties = IconLoader.getIcon("/fileTypes/properties.png"); + public static Icon Text = IconLoader.getIcon("/fileTypes/text.png"); + public static Icon UiForm = IconLoader.getIcon("/fileTypes/uiForm.png"); + public static Icon Unknown = IconLoader.getIcon("/fileTypes/unknown.png"); + public static Icon WsdlFile = IconLoader.getIcon("/fileTypes/wsdlFile.png"); + public static Icon Xhtml = IconLoader.getIcon("/fileTypes/xhtml.png"); + public static Icon Xml = IconLoader.getIcon("/fileTypes/xml.png"); + public static Icon XsdFile = IconLoader.getIcon("/fileTypes/xsdFile.png"); + + } + + public static class General { + public static Icon Add = IconLoader.getIcon("/general/add.png"); + public static Icon AddFavoritesList = IconLoader.getIcon("/general/addFavoritesList.png"); + public static Icon AddJdk = IconLoader.getIcon("/general/addJdk.png"); + public static Icon ApplicationSettings = IconLoader.getIcon("/general/applicationSettings.png"); + public static Icon ArrowDown = IconLoader.getIcon("/general/arrowDown.png"); + public static Icon AutohideOff = IconLoader.getIcon("/general/autohideOff.png"); + public static Icon AutohideOffInactive = IconLoader.getIcon("/general/autohideOffInactive.png"); + public static Icon AutohideOn = IconLoader.getIcon("/general/autohideOn.png"); + public static Icon AutohideOnInactive = IconLoader.getIcon("/general/autohideOnInactive.png"); + public static Icon AutoscrollFromSource = IconLoader.getIcon("/general/autoscrollFromSource.png"); + public static Icon AutoscrollToSource = IconLoader.getIcon("/general/autoscrollToSource.png"); + public static Icon Balloon = IconLoader.getIcon("/general/balloon.png"); + public static Icon BalloonClose = IconLoader.getIcon("/general/balloonClose.png"); + public static Icon BalloonError = IconLoader.getIcon("/general/balloonError.png"); + public static Icon BalloonInformation = IconLoader.getIcon("/general/balloonInformation.png"); + public static Icon BalloonWarning = IconLoader.getIcon("/general/balloonWarning.png"); + public static Icon Bea = IconLoader.getIcon("/general/bea.png"); + public static Icon Browsersettings = IconLoader.getIcon("/general/browsersettings.png"); + public static Icon Bullet = IconLoader.getIcon("/general/bullet.png"); + public static Icon CheckForUpdate = IconLoader.getIcon("/general/checkForUpdate.png"); + public static Icon CollapseAll = IconLoader.getIcon("/general/collapseAll.png"); + public static Icon CollapseAllHover = IconLoader.getIcon("/general/collapseAllHover.png"); + public static Icon Combo = IconLoader.getIcon("/general/combo.png"); + public static Icon Combo2 = IconLoader.getIcon("/general/combo2.png"); + public static Icon ComboArrow = IconLoader.getIcon("/general/comboArrow.png"); + public static Icon ComboArrowDown = IconLoader.getIcon("/general/comboArrowDown.png"); + public static Icon ComboArrowLeft = IconLoader.getIcon("/general/comboArrowLeft.png"); + public static Icon ComboArrowLeftPassive = IconLoader.getIcon("/general/comboArrowLeftPassive.png"); + public static Icon ComboArrowRight = IconLoader.getIcon("/general/comboArrowRight.png"); + public static Icon ComboArrowRightPassive = IconLoader.getIcon("/general/comboArrowRightPassive.png"); + public static Icon ComboUpPassive = IconLoader.getIcon("/general/comboUpPassive.png"); + public static Icon ConfigurableAppearance = IconLoader.getIcon("/general/configurableAppearance.png"); + public static Icon ConfigurableCodeCompletion = IconLoader.getIcon("/general/configurableCodeCompletion.png"); + public static Icon ConfigurableCodeStyle = IconLoader.getIcon("/general/configurableCodeStyle.png"); + public static Icon ConfigurableColorsAndFonts = IconLoader.getIcon("/general/configurableColorsAndFonts.png"); + public static Icon ConfigurableCompiler = IconLoader.getIcon("/general/configurableCompiler.png"); + public static Icon ConfigurableCustomization = IconLoader.getIcon("/general/configurableCustomization.png"); + public static Icon ConfigurableDebugger = IconLoader.getIcon("/general/configurableDebugger.png"); + public static Icon ConfigurableDefault = IconLoader.getIcon("/general/configurableDefault.png"); + public static Icon ConfigurableEditor = IconLoader.getIcon("/general/configurableEditor.png"); + public static Icon ConfigurableEjb = IconLoader.getIcon("/general/configurableEjb.png"); + public static Icon ConfigurableErrorHighlighting = IconLoader.getIcon("/general/configurableErrorHighlighting.png"); + public static Icon ConfigurableExternalResources = IconLoader.getIcon("/general/configurableExternalResources.png"); + public static Icon ConfigurableFileTypes = IconLoader.getIcon("/general/configurableFileTypes.png"); + public static Icon ConfigurableGeneral = IconLoader.getIcon("/general/configurableGeneral.png"); + public static Icon ConfigurableGlobalLibraries = IconLoader.getIcon("/general/configurableGlobalLibraries.png"); + public static Icon ConfigurableIntentionSettings = IconLoader.getIcon("/general/configurableIntentionSettings.png"); + public static Icon ConfigurableJavadoc = IconLoader.getIcon("/general/configurableJavadoc.png"); + public static Icon ConfigurableLocalVCS = IconLoader.getIcon("/general/configurableLocalVCS.png"); + public static Icon ConfigurableMisc = IconLoader.getIcon("/general/configurableMisc.png"); + public static Icon ConfigurableProjectLibraries = IconLoader.getIcon("/general/configurableProjectLibraries.png"); + public static Icon ConfigurableProjectPaths = IconLoader.getIcon("/general/configurableProjectPaths.png"); + public static Icon ConfigurableRunDebug = IconLoader.getIcon("/general/configurableRunDebug.png"); + public static Icon ConfigurableTodo = IconLoader.getIcon("/general/configurableTodo.png"); + public static Icon ConfigurableUpdates = IconLoader.getIcon("/general/configurableUpdates.png"); + public static Icon ConfigurableValidation = IconLoader.getIcon("/general/configurableValidation.png"); + public static Icon ConfigurableVcs = IconLoader.getIcon("/general/configurableVcs.png"); + public static Icon ConfigurableWeb = IconLoader.getIcon("/general/configurableWeb.png"); + public static Icon ConfigureEncoding = IconLoader.getIcon("/general/configureEncoding.png"); + public static Icon CreateNewProject = IconLoader.getIcon("/general/createNewProject.png"); + public static Icon Debug = IconLoader.getIcon("/general/debug.png"); + public static Icon DefaultKeymap = IconLoader.getIcon("/general/defaultKeymap.png"); + public static Icon Divider = IconLoader.getIcon("/general/divider.png"); + public static Icon Docked = IconLoader.getIcon("/general/docked.png"); + public static Icon DockedInactive = IconLoader.getIcon("/general/dockedInactive.png"); + public static Icon Documentation = IconLoader.getIcon("/general/documentation.png"); + public static Icon Dropdown = IconLoader.getIcon("/general/dropdown.png"); + public static Icon EditColors = IconLoader.getIcon("/general/editColors.png"); + public static Icon EditItemInSection = IconLoader.getIcon("/general/editItemInSection.png"); + public static Icon Ellipsis = IconLoader.getIcon("/general/ellipsis.png"); + public static Icon EnterpriseEAR = IconLoader.getIcon("/general/enterpriseEAR.png"); + public static Icon ErrorDialog = IconLoader.getIcon("/general/errorDialog.png"); + public static Icon ErrorMask = IconLoader.getIcon("/general/errorMask.png"); + public static Icon ErrorsFound = IconLoader.getIcon("/general/errorsFound.png"); + public static Icon ErrorsInProgress = IconLoader.getIcon("/general/errorsInProgress.png"); + public static Icon ErrorsOK = IconLoader.getIcon("/general/errorsOK.png"); + public static Icon ExclMark = IconLoader.getIcon("/general/exclMark.png"); + public static Icon ExternalTools = IconLoader.getIcon("/general/externalTools.png"); + public static Icon ExtTools = IconLoader.getIcon("/general/extTools.png"); + public static Icon FileTemplates = IconLoader.getIcon("/general/fileTemplates.png"); + public static Icon Fix = IconLoader.getIcon("/general/fix.png"); + public static Icon FixInactive = IconLoader.getIcon("/general/fixInactive.png"); + public static Icon Floating = IconLoader.getIcon("/general/floating.png"); + public static Icon FloatingInactive = IconLoader.getIcon("/general/floatingInactive.png"); + public static Icon Gear = IconLoader.getIcon("/general/gear.png"); + public static Icon GearHover = IconLoader.getIcon("/general/gearHover.png"); + public static Icon GetProjectfromVCS = IconLoader.getIcon("/general/getProjectfromVCS.png"); + public static Icon Help = IconLoader.getIcon("/general/help.png"); + public static Icon HideDown = IconLoader.getIcon("/general/hideDown.png"); + public static Icon HideDownHover = IconLoader.getIcon("/general/hideDownHover.png"); + public static Icon HideDownPart = IconLoader.getIcon("/general/hideDownPart.png"); + public static Icon HideDownPartHover = IconLoader.getIcon("/general/hideDownPartHover.png"); + public static Icon HideLeft = IconLoader.getIcon("/general/hideLeft.png"); + public static Icon HideLeftHover = IconLoader.getIcon("/general/hideLeftHover.png"); + public static Icon HideLeftPart = IconLoader.getIcon("/general/hideLeftPart.png"); + public static Icon HideLeftPartHover = IconLoader.getIcon("/general/hideLeftPartHover.png"); + public static Icon HideRight = IconLoader.getIcon("/general/hideRight.png"); + public static Icon HideRightHover = IconLoader.getIcon("/general/hideRightHover.png"); + public static Icon HideRightPart = IconLoader.getIcon("/general/hideRightPart.png"); + public static Icon HideRightPartHover = IconLoader.getIcon("/general/hideRightPartHover.png"); + public static Icon HideSideDown = IconLoader.getIcon("/general/hideSideDown.png"); + public static Icon HideSideDownInactive = IconLoader.getIcon("/general/hideSideDownInactive.png"); + public static Icon HideSideLeft = IconLoader.getIcon("/general/hideSideLeft.png"); + public static Icon HideSideLeftInactive = IconLoader.getIcon("/general/hideSideLeftInactive.png"); + public static Icon HideSideRight = IconLoader.getIcon("/general/hideSideRight.png"); + public static Icon HideSideRightInactive = IconLoader.getIcon("/general/hideSideRightInactive.png"); + public static Icon HideSideUp = IconLoader.getIcon("/general/hideSideUp.png"); + public static Icon HideSideUpInactive = IconLoader.getIcon("/general/hideSideUpInactive.png"); + public static Icon HideToolWindow = IconLoader.getIcon("/general/hideToolWindow.png"); + public static Icon HideToolWindowInactive = IconLoader.getIcon("/general/hideToolWindowInactive.png"); + public static Icon HideUp = IconLoader.getIcon("/general/hideUp.png"); + public static Icon IdeFatalError = IconLoader.getIcon("/general/ideFatalError.png"); + public static Icon IdeOptions = IconLoader.getIcon("/general/ideOptions.png"); + public static Icon IjLogo = IconLoader.getIcon("/general/ijLogo.png"); + public static Icon ImplementedMethod = IconLoader.getIcon("/general/implementedMethod.png"); + public static Icon ImplementingMethod = IconLoader.getIcon("/general/implementingMethod.png"); + public static Icon ImportProjects = IconLoader.getIcon("/general/importProjects.png"); + public static Icon InactiveSeparator = IconLoader.getIcon("/general/inactiveSeparator.png"); + public static Icon InformationDialog = IconLoader.getIcon("/general/informationDialog.png"); + public static Icon InheritedMethod = IconLoader.getIcon("/general/inheritedMethod.png"); + public static Icon InspectionInProgress = IconLoader.getIcon("/general/inspectionInProgress.png"); + public static Icon InspectionsOff = IconLoader.getIcon("/general/inspectionsOff.png"); + public static Icon Jdk = IconLoader.getIcon("/general/jdk.png"); + public static Icon JetbrainsTvIdea = IconLoader.getIcon("/general/jetbrainsTvIdea.png"); + public static Icon KeyboardShortcut = IconLoader.getIcon("/general/keyboardShortcut.png"); + public static Icon Keymap = IconLoader.getIcon("/general/keymap.png"); + public static Icon LiveTemplates = IconLoader.getIcon("/general/liveTemplates.png"); + public static Icon Locate = IconLoader.getIcon("/general/locate.png"); + public static Icon LocateHover = IconLoader.getIcon("/general/locateHover.png"); + public static Icon MacCorner = IconLoader.getIcon("/general/macCorner.png"); + public static Icon Mdot_empty = IconLoader.getIcon("/general/mdot-empty.png"); + public static Icon Mdot_white = IconLoader.getIcon("/general/mdot-white.png"); + public static Icon Mdot = IconLoader.getIcon("/general/mdot.png"); + public static Icon Modified = IconLoader.getIcon("/general/modified.png"); + public static Icon MoreTabs = IconLoader.getIcon("/general/moreTabs.png"); + public static Icon Mouse = IconLoader.getIcon("/general/mouse.png"); + public static Icon MouseShortcut = IconLoader.getIcon("/general/mouseShortcut.png"); + public static Icon NavbarSeparatorActive = IconLoader.getIcon("/general/navbarSeparatorActive.png"); + public static Icon NavbarSeparatorGradient = IconLoader.getIcon("/general/navbarSeparatorGradient.png"); + public static Icon NavbarSeparatorPassive = IconLoader.getIcon("/general/navbarSeparatorPassive.png"); + public static Icon NoAnalysis = IconLoader.getIcon("/general/noAnalysis.png"); + public static Icon OpenProject = IconLoader.getIcon("/general/openProject.png"); + public static Icon OverridenMethod = IconLoader.getIcon("/general/overridenMethod.png"); + public static Icon OverridingMethod = IconLoader.getIcon("/general/overridingMethod.png"); + public static Icon PackagesTab = IconLoader.getIcon("/general/packagesTab.png"); + public static Icon PathVariables = IconLoader.getIcon("/general/pathVariables.png"); + public static Icon Pin_tab = IconLoader.getIcon("/general/pin_tab.png"); + public static Icon PluginManager = IconLoader.getIcon("/general/pluginManager.png"); + public static Icon Progress = IconLoader.getIcon("/general/progress.png"); + public static Icon ProgressTransparentPlaceHolder = IconLoader.getIcon("/general/progressTransparentPlaceHolder.png"); + public static Icon ProjectProperties = IconLoader.getIcon("/general/projectProperties.png"); + public static Icon ProjectSettings = IconLoader.getIcon("/general/projectSettings.png"); + public static Icon ProjectStructure = IconLoader.getIcon("/general/projectStructure.png"); + public static Icon ProjectTab = IconLoader.getIcon("/general/projectTab.png"); + public static Icon QuestionDialog = IconLoader.getIcon("/general/questionDialog.png"); + public static Icon ReadHelp = IconLoader.getIcon("/general/readHelp.png"); + public static Icon Remove = IconLoader.getIcon("/general/remove.png"); + public static Icon ReopenRecentProject = IconLoader.getIcon("/general/reopenRecentProject.png"); + public static Icon Reset = IconLoader.getIcon("/general/reset.png"); + public static Icon Run = IconLoader.getIcon("/general/run.png"); + public static Icon RunWithCoverage = IconLoader.getIcon("/general/runWithCoverage.png"); + public static Icon SecondaryGroup = IconLoader.getIcon("/general/secondaryGroup.png"); + public static Icon Separator = IconLoader.getIcon("/general/separator.png"); + public static Icon SeparatorH = IconLoader.getIcon("/general/separatorH.png"); + public static Icon SeparatorV = IconLoader.getIcon("/general/separatorV.png"); + public static Icon Show_to_implement = IconLoader.getIcon("/general/show_to_implement.png"); + public static Icon Show_to_override = IconLoader.getIcon("/general/show_to_override.png"); + public static Icon Sliding = IconLoader.getIcon("/general/sliding.png"); + public static Icon SlidingInactive = IconLoader.getIcon("/general/slidingInactive.png"); + public static Icon SmallConfigurableVcs = IconLoader.getIcon("/general/smallConfigurableVcs.png"); + public static Icon SplitCenterH = IconLoader.getIcon("/general/splitCenterH.png"); + public static Icon SplitCenterV = IconLoader.getIcon("/general/splitCenterV.png"); + public static Icon SplitDown = IconLoader.getIcon("/general/splitDown.png"); + public static Icon SplitGlueH = IconLoader.getIcon("/general/splitGlueH.png"); + public static Icon SplitGlueV = IconLoader.getIcon("/general/splitGlueV.png"); + public static Icon SplitLeft = IconLoader.getIcon("/general/splitLeft.png"); + public static Icon SplitRight = IconLoader.getIcon("/general/splitRight.png"); + public static Icon SplitUp = IconLoader.getIcon("/general/splitUp.png"); + public static Icon Tab_white_center = IconLoader.getIcon("/general/tab-white-center.png"); + public static Icon Tab_white_left = IconLoader.getIcon("/general/tab-white-left.png"); + public static Icon Tab_white_right = IconLoader.getIcon("/general/tab-white-right.png"); + public static Icon Tab_grey_bckgrnd = IconLoader.getIcon("/general/tab_grey_bckgrnd.png"); + public static Icon Tab_grey_left = IconLoader.getIcon("/general/tab_grey_left.png"); + public static Icon Tab_grey_left_inner = IconLoader.getIcon("/general/tab_grey_left_inner.png"); + public static Icon Tab_grey_right = IconLoader.getIcon("/general/tab_grey_right.png"); + public static Icon Tab_grey_right_inner = IconLoader.getIcon("/general/tab_grey_right_inner.png"); + public static Icon Tab_white_bckgrnd = IconLoader.getIcon("/general/tab_white_bckgrnd.png"); + public static Icon TbHidden = IconLoader.getIcon("/general/tbHidden.png"); + public static Icon TbShown = IconLoader.getIcon("/general/tbShown.png"); + public static Icon Template = IconLoader.getIcon("/general/template.png"); + public static Icon TemplateGroup = IconLoader.getIcon("/general/templateGroup.png"); + public static Icon Tip = IconLoader.getIcon("/general/tip.png"); + public static Icon TipsOfTheDay = IconLoader.getIcon("/general/tipsOfTheDay.png"); + public static Icon TodoDefault = IconLoader.getIcon("/general/todoDefault.png"); + public static Icon TodoImportant = IconLoader.getIcon("/general/todoImportant.png"); + public static Icon TodoQuestion = IconLoader.getIcon("/general/todoQuestion.png"); + public static Icon ToolWindowAnt = IconLoader.getIcon("/general/toolWindowAnt.png"); + public static Icon ToolWindowAspects = IconLoader.getIcon("/general/toolWindowAspects.png"); + public static Icon ToolWindowChanges = IconLoader.getIcon("/general/toolWindowChanges.png"); + public static Icon ToolWindowCommander = IconLoader.getIcon("/general/toolWindowCommander.png"); + public static Icon ToolWindowCoverage = IconLoader.getIcon("/general/toolWindowCoverage.png"); + public static Icon ToolWindowCvs = IconLoader.getIcon("/general/toolWindowCvs.png"); + public static Icon ToolWindowDebugger = IconLoader.getIcon("/general/toolWindowDebugger.png"); + public static Icon ToolWindowFavorites = IconLoader.getIcon("/general/toolWindowFavorites.png"); + public static Icon ToolWindowFind = IconLoader.getIcon("/general/toolWindowFind.png"); + public static Icon ToolWindowHierarchy = IconLoader.getIcon("/general/toolWindowHierarchy.png"); + public static Icon ToolWindowInspection = IconLoader.getIcon("/general/toolWindowInspection.png"); + public static Icon ToolWindowMessages = IconLoader.getIcon("/general/toolWindowMessages.png"); + public static Icon ToolWindowModuleDependencies = IconLoader.getIcon("/general/toolWindowModuleDependencies.png"); + public static Icon ToolWindowPalette = IconLoader.getIcon("/general/toolWindowPalette.png"); + public static Icon ToolWindowProject = IconLoader.getIcon("/general/toolWindowProject.png"); + public static Icon ToolWindowRun = IconLoader.getIcon("/general/toolWindowRun.png"); + public static Icon ToolWindowStructure = IconLoader.getIcon("/general/toolWindowStructure.png"); + public static Icon ToolWindowTodo = IconLoader.getIcon("/general/toolWindowTodo.png"); + public static Icon UiDesigner = IconLoader.getIcon("/general/uiDesigner.png"); + public static Icon VcsSmallTab = IconLoader.getIcon("/general/vcsSmallTab.png"); + public static Icon Vss = IconLoader.getIcon("/general/vss.png"); + public static Icon WarningDialog = IconLoader.getIcon("/general/warningDialog.png"); + public static Icon WarningsFound = IconLoader.getIcon("/general/warningsFound.png"); + public static Icon Web = IconLoader.getIcon("/general/web.png"); + + } + + public static class Graph { + public static Icon ActualZoom = IconLoader.getIcon("/graph/actualZoom.png"); + public static Icon Export = IconLoader.getIcon("/graph/export.png"); + public static Icon FitContent = IconLoader.getIcon("/graph/fitContent.png"); + public static Icon Grid = IconLoader.getIcon("/graph/grid.png"); + public static Icon Layout = IconLoader.getIcon("/graph/layout.png"); + public static Icon NodeSelectionMode = IconLoader.getIcon("/graph/nodeSelectionMode.png"); + public static Icon Print = IconLoader.getIcon("/graph/print.png"); + public static Icon PrintPreview = IconLoader.getIcon("/graph/printPreview.png"); + public static Icon SnapToGrid = IconLoader.getIcon("/graph/snapToGrid.png"); + public static Icon ZoomIn = IconLoader.getIcon("/graph/zoomIn.png"); + public static Icon ZoomOut = IconLoader.getIcon("/graph/zoomOut.png"); + + } + + public static class Gutter { + public static Icon Bookmark0 = IconLoader.getIcon("/gutter/bookmark0.png"); + public static Icon Bookmark1 = IconLoader.getIcon("/gutter/bookmark1.png"); + public static Icon Bookmark2 = IconLoader.getIcon("/gutter/bookmark2.png"); + public static Icon Bookmark3 = IconLoader.getIcon("/gutter/bookmark3.png"); + public static Icon Bookmark4 = IconLoader.getIcon("/gutter/bookmark4.png"); + public static Icon Bookmark5 = IconLoader.getIcon("/gutter/bookmark5.png"); + public static Icon Bookmark6 = IconLoader.getIcon("/gutter/bookmark6.png"); + public static Icon Bookmark7 = IconLoader.getIcon("/gutter/bookmark7.png"); + public static Icon Bookmark8 = IconLoader.getIcon("/gutter/bookmark8.png"); + public static Icon Bookmark9 = IconLoader.getIcon("/gutter/bookmark9.png"); + public static Icon Colors = IconLoader.getIcon("/gutter/colors.png"); + public static Icon ImplementedMethod = IconLoader.getIcon("/gutter/implementedMethod.png"); + public static Icon ImplementingMethod = IconLoader.getIcon("/gutter/implementingMethod.png"); + public static Icon OverridenMethod = IconLoader.getIcon("/gutter/overridenMethod.png"); + public static Icon OverridingMethod = IconLoader.getIcon("/gutter/overridingMethod.png"); + public static Icon RecursiveMethod = IconLoader.getIcon("/gutter/recursiveMethod.png"); + public static Icon Unique = IconLoader.getIcon("/gutter/unique.png"); + + } + + public static class Hierarchy { + public static Icon Base = IconLoader.getIcon("/hierarchy/base.png"); + public static Icon Callee = IconLoader.getIcon("/hierarchy/callee.png"); + public static Icon Caller = IconLoader.getIcon("/hierarchy/caller.png"); + public static Icon Class = IconLoader.getIcon("/hierarchy/class.png"); + public static Icon MethodDefined = IconLoader.getIcon("/hierarchy/methodDefined.png"); + public static Icon MethodNotDefined = IconLoader.getIcon("/hierarchy/methodNotDefined.png"); + public static Icon ShouldDefineMethod = IconLoader.getIcon("/hierarchy/shouldDefineMethod.png"); + public static Icon Subtypes = IconLoader.getIcon("/hierarchy/subtypes.png"); + public static Icon Supertypes = IconLoader.getIcon("/hierarchy/supertypes.png"); + + } + public static Icon Icon = IconLoader.getIcon("/icon.png"); + public static Icon Icon_CE = IconLoader.getIcon("/icon_CE.png"); + public static Icon Icon_CEsmall = IconLoader.getIcon("/icon_CEsmall.png"); + public static Icon Icon_CEwhite = IconLoader.getIcon("/icon_CEwhite.png"); + public static Icon Icon_small = IconLoader.getIcon("/icon_small.png"); + public static Icon Icon_white = IconLoader.getIcon("/icon_white.png"); + + public static class Icons { + + public static class Ide { + public static Icon NextStep = IconLoader.getIcon("/icons/ide/nextStep.png"); + public static Icon NextStepGrayed = IconLoader.getIcon("/icons/ide/nextStepGrayed.png"); + public static Icon NextStepInverted = IconLoader.getIcon("/icons/ide/nextStepInverted.png"); + public static Icon SpeedSearchPrompt = IconLoader.getIcon("/icons/ide/speedSearchPrompt.png"); + + } + + public static class Inspector { + public static Icon Collapseall = IconLoader.getIcon("/icons/inspector/collapseall.png"); + public static Icon Expandall = IconLoader.getIcon("/icons/inspector/expandall.png"); + public static Icon HideMarks = IconLoader.getIcon("/icons/inspector/hideMarks.png"); + public static Icon Minus = IconLoader.getIcon("/icons/inspector/minus.png"); + public static Icon SortByCategory = IconLoader.getIcon("/icons/inspector/sortByCategory.png"); + public static Icon SortByName = IconLoader.getIcon("/icons/inspector/sortByName.png"); + public static Icon UseFilter = IconLoader.getIcon("/icons/inspector/useFilter.png"); + + } + + } + + public static class Ide { + public static Icon DefaultProfile = IconLoader.getIcon("/ide/defaultProfile.png"); + public static Icon DefaultProjectProfile = IconLoader.getIcon("/ide/defaultProjectProfile.png"); + + public static class Dnd { + public static Icon Bottom = IconLoader.getIcon("/ide/dnd/bottom.png"); + public static Icon Error = IconLoader.getIcon("/ide/dnd/error.png"); + public static Icon Left = IconLoader.getIcon("/ide/dnd/left.png"); + public static Icon Right = IconLoader.getIcon("/ide/dnd/right.png"); + public static Icon Top = IconLoader.getIcon("/ide/dnd/top.png"); + + } + public static Icon EmptyFatalError = IconLoader.getIcon("/ide/emptyFatalError.png"); + public static Icon Error_notifications = IconLoader.getIcon("/ide/error_notifications.png"); + public static Icon ErrorPoint = IconLoader.getIcon("/ide/errorPoint.png"); + public static Icon ErrorSign = IconLoader.getIcon("/ide/errorSign.png"); + public static Icon FacetDetected = IconLoader.getIcon("/ide/facetDetected.png"); + public static Icon FatalError_read = IconLoader.getIcon("/ide/fatalError-read.png"); + public static Icon FatalError = IconLoader.getIcon("/ide/fatalError.png"); + public static Icon HectorNo = IconLoader.getIcon("/ide/hectorNo.png"); + public static Icon HectorOff = IconLoader.getIcon("/ide/hectorOff.png"); + public static Icon HectorOn = IconLoader.getIcon("/ide/hectorOn.png"); + public static Icon HectorSyntax = IconLoader.getIcon("/ide/hectorSyntax.png"); + public static Icon IncomingChangesOff = IconLoader.getIcon("/ide/incomingChangesOff.png"); + public static Icon IncomingChangesOn = IconLoader.getIcon("/ide/incomingChangesOn.png"); + public static Icon Info_notifications = IconLoader.getIcon("/ide/info_notifications.png"); + public static Icon Link = IconLoader.getIcon("/ide/link.png"); + public static Icon LocalScope = IconLoader.getIcon("/ide/localScope.png"); + public static Icon LookupAlphanumeric = IconLoader.getIcon("/ide/lookupAlphanumeric.png"); + public static Icon LookupRelevance = IconLoader.getIcon("/ide/lookupRelevance.png"); + + public static class Macro { + public static Icon Recording_1 = IconLoader.getIcon("/ide/macro/recording_1.png"); + public static Icon Recording_2 = IconLoader.getIcon("/ide/macro/recording_2.png"); + public static Icon Recording_3 = IconLoader.getIcon("/ide/macro/recording_3.png"); + public static Icon Recording_4 = IconLoader.getIcon("/ide/macro/recording_4.png"); + public static Icon Recording_stop = IconLoader.getIcon("/ide/macro/recording_stop.png"); + + } + public static Icon MacroToolbar1 = IconLoader.getIcon("/ide/macroToolbar1.png"); + public static Icon MacroToolbar2 = IconLoader.getIcon("/ide/macroToolbar2.png"); + public static Icon Notifications = IconLoader.getIcon("/ide/notifications.png"); + public static Icon Pipette = IconLoader.getIcon("/ide/pipette.png"); + public static Icon Pipette_rollover = IconLoader.getIcon("/ide/pipette_rollover.png"); + public static Icon Rating = IconLoader.getIcon("/ide/rating.png"); + public static Icon Rating1 = IconLoader.getIcon("/ide/rating1.png"); + public static Icon Rating2 = IconLoader.getIcon("/ide/rating2.png"); + public static Icon Rating3 = IconLoader.getIcon("/ide/rating3.png"); + public static Icon Rating4 = IconLoader.getIcon("/ide/rating4.png"); + public static Icon Readonly = IconLoader.getIcon("/ide/readonly.png"); + public static Icon Readwrite = IconLoader.getIcon("/ide/readwrite.png"); + public static Icon ScopeConfigurable = IconLoader.getIcon("/ide/scopeConfigurable.png"); + + public static class Shadow { + public static Icon Bottom_left = IconLoader.getIcon("/ide/shadow/bottom-left.png"); + public static Icon Bottom_right = IconLoader.getIcon("/ide/shadow/bottom-right.png"); + public static Icon Bottom = IconLoader.getIcon("/ide/shadow/bottom.png"); + public static Icon Left = IconLoader.getIcon("/ide/shadow/left.png"); + + public static class Popup { + public static Icon Bottom_left = IconLoader.getIcon("/ide/shadow/popup/bottom-left.png"); + public static Icon Bottom_right = IconLoader.getIcon("/ide/shadow/popup/bottom-right.png"); + public static Icon Bottom = IconLoader.getIcon("/ide/shadow/popup/bottom.png"); + public static Icon Left = IconLoader.getIcon("/ide/shadow/popup/left.png"); + public static Icon Right = IconLoader.getIcon("/ide/shadow/popup/right.png"); + public static Icon Top_left = IconLoader.getIcon("/ide/shadow/popup/top-left.png"); + public static Icon Top_right = IconLoader.getIcon("/ide/shadow/popup/top-right.png"); + public static Icon Top = IconLoader.getIcon("/ide/shadow/popup/top.png"); + + } + public static Icon Right = IconLoader.getIcon("/ide/shadow/right.png"); + public static Icon Top_left = IconLoader.getIcon("/ide/shadow/top-left.png"); + public static Icon Top_right = IconLoader.getIcon("/ide/shadow/top-right.png"); + public static Icon Top = IconLoader.getIcon("/ide/shadow/top.png"); + + } + public static Icon SharedScope = IconLoader.getIcon("/ide/sharedScope.png"); + public static Icon Statusbar_arrows = IconLoader.getIcon("/ide/statusbar_arrows.png"); + public static Icon Tab = IconLoader.getIcon("/ide/tab.png"); + public static Icon UpDown = IconLoader.getIcon("/ide/upDown.png"); + public static Icon Warning_notifications = IconLoader.getIcon("/ide/warning_notifications.png"); + + } + + public static class Javaee { + public static Icon Application_xml = IconLoader.getIcon("/javaee/application_xml.png"); + public static Icon BuildOnFrameDeactivation = IconLoader.getIcon("/javaee/buildOnFrameDeactivation.png"); + public static Icon DatabaseSchemaImportLegend = IconLoader.getIcon("/javaee/databaseSchemaImportLegend.png"); + public static Icon DataSourceImport = IconLoader.getIcon("/javaee/dataSourceImport.png"); + public static Icon DbSchemaImportBig = IconLoader.getIcon("/javaee/dbSchemaImportBig.png"); + public static Icon Ejb_jar_xml = IconLoader.getIcon("/javaee/ejb-jar_xml.png"); + public static Icon EjbClass = IconLoader.getIcon("/javaee/ejbClass.png"); + public static Icon EjbModule = IconLoader.getIcon("/javaee/ejbModule.png"); + public static Icon EjbModuleBig = IconLoader.getIcon("/javaee/ejbModuleBig.png"); + public static Icon EjbModuleGroup = IconLoader.getIcon("/javaee/ejbModuleGroup.png"); + public static Icon EmbeddedAttributeOverlay = IconLoader.getIcon("/javaee/embeddedAttributeOverlay.png"); + public static Icon EntityBean = IconLoader.getIcon("/javaee/entityBean.png"); + public static Icon EntityBeanBig = IconLoader.getIcon("/javaee/entityBeanBig.png"); + public static Icon Home = IconLoader.getIcon("/javaee/home.png"); + public static Icon InheritedAttributeOverlay = IconLoader.getIcon("/javaee/inheritedAttributeOverlay.png"); + public static Icon InterceptorClass = IconLoader.getIcon("/javaee/interceptorClass.png"); + public static Icon InterceptorMethod = IconLoader.getIcon("/javaee/interceptorMethod.png"); + public static Icon JavaeeAppModule = IconLoader.getIcon("/javaee/JavaeeAppModule.png"); + public static Icon JavaeeAppModuleBig = IconLoader.getIcon("/javaee/JavaeeAppModuleBig.png"); + public static Icon JavaeeAppModuleGroup = IconLoader.getIcon("/javaee/JavaeeAppModuleGroup.png"); + public static Icon JavaModuleGroup = IconLoader.getIcon("/javaee/javaModuleGroup.png"); + public static Icon JpaFacet = IconLoader.getIcon("/javaee/jpaFacet.png"); + public static Icon Local = IconLoader.getIcon("/javaee/local.png"); + public static Icon LocalHome = IconLoader.getIcon("/javaee/localHome.png"); + public static Icon MessageBean = IconLoader.getIcon("/javaee/messageBean.png"); + public static Icon MessageBeanBig = IconLoader.getIcon("/javaee/messageBeanBig.png"); + public static Icon PersistenceAttribute = IconLoader.getIcon("/javaee/persistenceAttribute.png"); + public static Icon PersistenceEmbeddable = IconLoader.getIcon("/javaee/persistenceEmbeddable.png"); + public static Icon PersistenceEntity = IconLoader.getIcon("/javaee/persistenceEntity.png"); + public static Icon PersistenceEntityListener = IconLoader.getIcon("/javaee/persistenceEntityListener.png"); + public static Icon PersistenceId = IconLoader.getIcon("/javaee/persistenceId.png"); + public static Icon PersistenceIdRelationship = IconLoader.getIcon("/javaee/persistenceIdRelationship.png"); + public static Icon PersistenceMappedSuperclass = IconLoader.getIcon("/javaee/persistenceMappedSuperclass.png"); + public static Icon PersistenceRelationship = IconLoader.getIcon("/javaee/persistenceRelationship.png"); + public static Icon PersistenceUnit = IconLoader.getIcon("/javaee/persistenceUnit.png"); + public static Icon Remote = IconLoader.getIcon("/javaee/remote.png"); + public static Icon SessionBean = IconLoader.getIcon("/javaee/sessionBean.png"); + public static Icon SessionBeanBig = IconLoader.getIcon("/javaee/sessionBeanBig.png"); + public static Icon TypeBinary = IconLoader.getIcon("/javaee/typeBinary.png"); + public static Icon TypeDateTime = IconLoader.getIcon("/javaee/typeDateTime.png"); + public static Icon TypeNotNull = IconLoader.getIcon("/javaee/typeNotNull.png"); + public static Icon TypeNullable = IconLoader.getIcon("/javaee/typeNullable.png"); + public static Icon TypeNumeric = IconLoader.getIcon("/javaee/typeNumeric.png"); + public static Icon TypeString = IconLoader.getIcon("/javaee/typeString.png"); + public static Icon UpdateRunningApplication = IconLoader.getIcon("/javaee/updateRunningApplication.png"); + public static Icon Web_xml = IconLoader.getIcon("/javaee/web_xml.png"); + public static Icon WebModule = IconLoader.getIcon("/javaee/webModule.png"); + public static Icon WebModuleBig = IconLoader.getIcon("/javaee/webModuleBig.png"); + public static Icon WebModuleGroup = IconLoader.getIcon("/javaee/webModuleGroup.png"); + public static Icon WebService = IconLoader.getIcon("/javaee/WebService.png"); + public static Icon WebServiceClient = IconLoader.getIcon("/javaee/WebServiceClient.png"); + public static Icon WebToolWindow = IconLoader.getIcon("/javaee/webToolWindow.png"); + + } + + public static class Mac { + public static Icon AppIconOk512 = IconLoader.getIcon("/mac/appIconOk512.png"); + public static Icon Tree_white_down_arrow = IconLoader.getIcon("/mac/tree_white_down_arrow.png"); + public static Icon Tree_white_right_arrow = IconLoader.getIcon("/mac/tree_white_right_arrow.png"); + + } + + public static class Modules { + public static Icon AddContentEntry = IconLoader.getIcon("/modules/addContentEntry.png"); + public static Icon AddExistingModule = IconLoader.getIcon("/modules/addExistingModule.png"); + public static Icon AddLibraries = IconLoader.getIcon("/modules/addLibraries.png"); + public static Icon Annotation = IconLoader.getIcon("/modules/annotation.png"); + public static Icon BottomCenter = IconLoader.getIcon("/modules/bottomCenter.png"); + public static Icon BottomLeftCorner = IconLoader.getIcon("/modules/bottomLeftCorner.png"); + public static Icon BottomRightCorner = IconLoader.getIcon("/modules/bottomRightCorner.png"); + public static Icon CenterGeneralTitleBar = IconLoader.getIcon("/modules/CenterGeneralTitleBar.png"); + public static Icon Classpath = IconLoader.getIcon("/modules/classpath.png"); + public static Icon CreateNewModule = IconLoader.getIcon("/modules/createNewModule.png"); + public static Icon DeleteContentFolder = IconLoader.getIcon("/modules/deleteContentFolder.png"); + public static Icon DeleteContentFolderRollover = IconLoader.getIcon("/modules/deleteContentFolderRollover.png"); + public static Icon DeleteContentRoot = IconLoader.getIcon("/modules/deleteContentRoot.png"); + public static Icon DeleteContentRootRollover = IconLoader.getIcon("/modules/deleteContentRootRollover.png"); + public static Icon Dependencies = IconLoader.getIcon("/modules/dependencies.png"); + public static Icon Edit = IconLoader.getIcon("/modules/edit.png"); + public static Icon EditLibraries = IconLoader.getIcon("/modules/editLibraries.png"); + public static Icon EmptyProjectType = IconLoader.getIcon("/modules/emptyProjectType.png"); + public static Icon ExcludeFolder = IconLoader.getIcon("/modules/excludeFolder.png"); + public static Icon ExcludeRootClosed = IconLoader.getIcon("/modules/excludeRootClosed.png"); + public static Icon ExcludeRootOpened = IconLoader.getIcon("/modules/excludeRootOpened.png"); + public static Icon GlobalLibraries = IconLoader.getIcon("/modules/globalLibraries.png"); + public static Icon HeaderCenter = IconLoader.getIcon("/modules/headerCenter.png"); + public static Icon HeaderCenterSelected = IconLoader.getIcon("/modules/headerCenterSelected.png"); + public static Icon HeaderLeftCorner = IconLoader.getIcon("/modules/headerLeftCorner.png"); + public static Icon HeaderLeftCornerSelected = IconLoader.getIcon("/modules/headerLeftCornerSelected.png"); + public static Icon HeaderRightCorner = IconLoader.getIcon("/modules/headerRightCorner.png"); + public static Icon HeaderRightCornerSelected = IconLoader.getIcon("/modules/headerRightCornerSelected.png"); + public static Icon Javadoc = IconLoader.getIcon("/modules/javadoc.png"); + public static Icon JavaModule = IconLoader.getIcon("/modules/javaModule.png"); + public static Icon Jbuilder = IconLoader.getIcon("/modules/jbuilder.png"); + public static Icon Jdks = IconLoader.getIcon("/modules/jdks.png"); + public static Icon LeftTopCornerGeneralTitleBar = IconLoader.getIcon("/modules/LeftTopCornerGeneralTitleBar.png"); + public static Icon Libraries = IconLoader.getIcon("/modules/libraries.png"); + public static Icon Library = IconLoader.getIcon("/modules/library.png"); + public static Icon LibraryItemAttachmentCenter = IconLoader.getIcon("/modules/libraryItemAttachmentCenter.png"); + public static Icon LibraryLeftSide = IconLoader.getIcon("/modules/libraryLeftSide.png"); + public static Icon LibraryRightSide = IconLoader.getIcon("/modules/libraryRightSide.png"); + public static Icon MarkSource = IconLoader.getIcon("/modules/markSource.png"); + public static Icon MarkTests = IconLoader.getIcon("/modules/markTests.png"); + public static Icon MarkWebroot = IconLoader.getIcon("/modules/markWebroot.png"); + public static Icon Merge = IconLoader.getIcon("/modules/merge.png"); + public static Icon ModuleLibraries = IconLoader.getIcon("/modules/moduleLibraries.png"); + public static Icon Modules = IconLoader.getIcon("/modules/modules.png"); + public static Icon ModulesNode = IconLoader.getIcon("/modules/modulesNode.png"); + public static Icon Order = IconLoader.getIcon("/modules/order.png"); + public static Icon Output = IconLoader.getIcon("/modules/output.png"); + public static Icon Paths = IconLoader.getIcon("/modules/paths.png"); + public static Icon PluginModule = IconLoader.getIcon("/modules/pluginModule.png"); + public static Icon ProjectLibraries = IconLoader.getIcon("/modules/projectLibraries.png"); + public static Icon Remove = IconLoader.getIcon("/modules/remove.png"); + public static Icon RemoveModule = IconLoader.getIcon("/modules/removeModule.png"); + public static Icon RightTopCornerGeneralTitleBar = IconLoader.getIcon("/modules/RightTopCornerGeneralTitleBar.png"); + public static Icon SetPackagePrefix = IconLoader.getIcon("/modules/setPackagePrefix.png"); + public static Icon SetPackagePrefixRollover = IconLoader.getIcon("/modules/setPackagePrefixRollover.png"); + public static Icon SourceClosed = IconLoader.getIcon("/modules/sourceClosed.png"); + public static Icon SourceOpened = IconLoader.getIcon("/modules/sourceOpened.png"); + public static Icon SourceRootClosed = IconLoader.getIcon("/modules/sourceRootClosed.png"); + public static Icon SourceRootOpened = IconLoader.getIcon("/modules/sourceRootOpened.png"); + public static Icon Sources = IconLoader.getIcon("/modules/sources.png"); + public static Icon Split = IconLoader.getIcon("/modules/split.png"); + public static Icon TestRootClosed = IconLoader.getIcon("/modules/testRootClosed.png"); + public static Icon TestRootOpened = IconLoader.getIcon("/modules/testRootOpened.png"); + public static Icon TestSourceClosed = IconLoader.getIcon("/modules/testSourceClosed.png"); + public static Icon TestSourceOpened = IconLoader.getIcon("/modules/testSourceOpened.png"); + public static Icon UnmarkSource = IconLoader.getIcon("/modules/unmarkSource.png"); + public static Icon UnmarkTests = IconLoader.getIcon("/modules/unmarkTests.png"); + public static Icon UnmarkWebroot = IconLoader.getIcon("/modules/unmarkWebroot.png"); + public static Icon WebRoot = IconLoader.getIcon("/modules/webRoot.png"); + + } + + public static class Nodes { + public static Icon AbstractClass = IconLoader.getIcon("/nodes/abstractClass.png"); + public static Icon AbstractException = IconLoader.getIcon("/nodes/abstractException.png"); + public static Icon AbstractMethod = IconLoader.getIcon("/nodes/abstractMethod.png"); + public static Icon AddLocalWeblogicInstance = IconLoader.getIcon("/nodes/addLocalWeblogicInstance.png"); + public static Icon AddRemoteWeblogicInstance = IconLoader.getIcon("/nodes/addRemoteWeblogicInstance.png"); + public static Icon Advice = IconLoader.getIcon("/nodes/advice.png"); + public static Icon Annotationtype = IconLoader.getIcon("/nodes/annotationtype.png"); + public static Icon AnonymousClass = IconLoader.getIcon("/nodes/anonymousClass.png"); + public static Icon Artifact = IconLoader.getIcon("/nodes/artifact.png"); + public static Icon Aspect = IconLoader.getIcon("/nodes/aspect.png"); + public static Icon BeaSmall = IconLoader.getIcon("/nodes/beaSmall.png"); + public static Icon C_plocal = IconLoader.getIcon("/nodes/c_plocal.png"); + public static Icon C_private = IconLoader.getIcon("/nodes/c_private.png"); + public static Icon C_protected = IconLoader.getIcon("/nodes/c_protected.png"); + public static Icon C_public = IconLoader.getIcon("/nodes/c_public.png"); + public static Icon Class = IconLoader.getIcon("/nodes/class.png"); + public static Icon ClassInitializer = IconLoader.getIcon("/nodes/classInitializer.png"); + public static Icon CollapseNode = IconLoader.getIcon("/nodes/collapseNode.png"); + public static Icon CompiledClassesFolder = IconLoader.getIcon("/nodes/compiledClassesFolder.png"); + public static Icon CopyOfFolder = IconLoader.getIcon("/nodes/copyOfFolder.png"); + public static Icon Cvs_global = IconLoader.getIcon("/nodes/cvs_global.png"); + public static Icon Cvs_roots = IconLoader.getIcon("/nodes/cvs_roots.png"); + public static Icon DataColumn = IconLoader.getIcon("/nodes/dataColumn.png"); + public static Icon DataConnection = IconLoader.getIcon("/nodes/dataConnection.png"); + public static Icon DataFkColumn = IconLoader.getIcon("/nodes/dataFkColumn.png"); + public static Icon DataForeignKey = IconLoader.getIcon("/nodes/dataForeignKey.png"); + public static Icon DataIndex = IconLoader.getIcon("/nodes/dataIndex.png"); + public static Icon DataPkColumn = IconLoader.getIcon("/nodes/dataPkColumn.png"); + public static Icon DataPrimaryKey = IconLoader.getIcon("/nodes/dataPrimaryKey.png"); + public static Icon DataSchema = IconLoader.getIcon("/nodes/dataSchema.png"); + public static Icon DataSequence = IconLoader.getIcon("/nodes/dataSequence.png"); + public static Icon DataSource = IconLoader.getIcon("/nodes/DataSource.png"); + public static Icon DataSourceDisabled = IconLoader.getIcon("/nodes/DataSourceDisabled.png"); + public static Icon DataTables = IconLoader.getIcon("/nodes/DataTables.png"); + public static Icon DataView = IconLoader.getIcon("/nodes/dataView.png"); + public static Icon Deploy = IconLoader.getIcon("/nodes/deploy.png"); + public static Icon Ejb = IconLoader.getIcon("/nodes/ejb.png"); + public static Icon EjbBusinessMethod = IconLoader.getIcon("/nodes/ejbBusinessMethod.png"); + public static Icon EjbCmpField = IconLoader.getIcon("/nodes/ejbCmpField.png"); + public static Icon EjbCmrField = IconLoader.getIcon("/nodes/ejbCmrField.png"); + public static Icon EjbCreateMethod = IconLoader.getIcon("/nodes/ejbCreateMethod.png"); + public static Icon EjbFinderMethod = IconLoader.getIcon("/nodes/ejbFinderMethod.png"); + public static Icon EjbNewGroup = IconLoader.getIcon("/nodes/ejbNewGroup.png"); + public static Icon EjbPrimaryKeyClass = IconLoader.getIcon("/nodes/ejbPrimaryKeyClass.png"); + public static Icon EjbReference = IconLoader.getIcon("/nodes/ejbReference.png"); + public static Icon EmptyNode = IconLoader.getIcon("/nodes/emptyNode.png"); + public static Icon EnterpriseClient = IconLoader.getIcon("/nodes/enterpriseClient.png"); + public static Icon EnterpriseProject = IconLoader.getIcon("/nodes/enterpriseProject.png"); + public static Icon EnterpriseResource = IconLoader.getIcon("/nodes/enterpriseResource.png"); + public static Icon EntryPoints = IconLoader.getIcon("/nodes/entryPoints.png"); + public static Icon Enum = IconLoader.getIcon("/nodes/enum.png"); + public static Icon ErrorIntroduction = IconLoader.getIcon("/nodes/errorIntroduction.png"); + public static Icon ErrorMark = IconLoader.getIcon("/nodes/errorMark.png"); + public static Icon ExceptionClass = IconLoader.getIcon("/nodes/exceptionClass.png"); + public static Icon ExcludedFromCompile = IconLoader.getIcon("/nodes/excludedFromCompile.png"); + public static Icon ExpandNode = IconLoader.getIcon("/nodes/expandNode.png"); + public static Icon ExtractedFolder = IconLoader.getIcon("/nodes/extractedFolder.png"); + public static Icon Field = IconLoader.getIcon("/nodes/field.png"); + public static Icon FieldPK = IconLoader.getIcon("/nodes/fieldPK.png"); + public static Icon FinalMark = IconLoader.getIcon("/nodes/finalMark.png"); + public static Icon Folder = IconLoader.getIcon("/nodes/folder.png"); + public static Icon FolderOpen = IconLoader.getIcon("/nodes/folderOpen.png"); + public static Icon Function = IconLoader.getIcon("/nodes/function.png"); + public static Icon HomeFolder = IconLoader.getIcon("/nodes/homeFolder.png"); + public static Icon IdeaModule = IconLoader.getIcon("/nodes/ideaModule.png"); + public static Icon IdeaProject = IconLoader.getIcon("/nodes/ideaProject.png"); + public static Icon IdeaWorkspace = IconLoader.getIcon("/nodes/ideaWorkspace.png"); + public static Icon Interface = IconLoader.getIcon("/nodes/interface.png"); + public static Icon J2eeParameter = IconLoader.getIcon("/nodes/j2eeParameter.png"); + public static Icon JarDirectory = IconLoader.getIcon("/nodes/jarDirectory.png"); + public static Icon JavaDocFolder = IconLoader.getIcon("/nodes/javaDocFolder.png"); + + public static class Jsf { + + public static class Big_icons { + public static Icon Component = IconLoader.getIcon("/nodes/jsf/big_icons/component.png"); + public static Icon Converter = IconLoader.getIcon("/nodes/jsf/big_icons/converter.png"); + public static Icon General = IconLoader.getIcon("/nodes/jsf/big_icons/general.png"); + public static Icon GenericValue = IconLoader.getIcon("/nodes/jsf/big_icons/genericValue.png"); + public static Icon ManagedBean = IconLoader.getIcon("/nodes/jsf/big_icons/managedBean.png"); + public static Icon NavigationCase = IconLoader.getIcon("/nodes/jsf/big_icons/navigationCase.png"); + public static Icon NavigationRule = IconLoader.getIcon("/nodes/jsf/big_icons/navigationRule.png"); + public static Icon Renderer = IconLoader.getIcon("/nodes/jsf/big_icons/renderer.png"); + public static Icon RenderKit = IconLoader.getIcon("/nodes/jsf/big_icons/renderKit.png"); + public static Icon Validator = IconLoader.getIcon("/nodes/jsf/big_icons/validator.png"); + + } + public static Icon Component = IconLoader.getIcon("/nodes/jsf/component.png"); + public static Icon Converter = IconLoader.getIcon("/nodes/jsf/converter.png"); + public static Icon General = IconLoader.getIcon("/nodes/jsf/general.png"); + public static Icon GenericValue = IconLoader.getIcon("/nodes/jsf/genericValue.png"); + public static Icon ManagedBean = IconLoader.getIcon("/nodes/jsf/managedBean.png"); + public static Icon NavigationCase = IconLoader.getIcon("/nodes/jsf/navigationCase.png"); + public static Icon NavigationRule = IconLoader.getIcon("/nodes/jsf/navigationRule.png"); + public static Icon Renderer = IconLoader.getIcon("/nodes/jsf/renderer.png"); + public static Icon RenderKit = IconLoader.getIcon("/nodes/jsf/renderKit.png"); + public static Icon Validator = IconLoader.getIcon("/nodes/jsf/validator.png"); + + } + public static Icon Jsr45 = IconLoader.getIcon("/nodes/jsr45.png"); + public static Icon JunitTestClass = IconLoader.getIcon("/nodes/junitTestClass.png"); + public static Icon JunitTestMark = IconLoader.getIcon("/nodes/junitTestMark.png"); + public static Icon KeymapAnt = IconLoader.getIcon("/nodes/keymapAnt.png"); + public static Icon KeymapAntOpen = IconLoader.getIcon("/nodes/keymapAntOpen.png"); + public static Icon KeymapEditor = IconLoader.getIcon("/nodes/keymapEditor.png"); + public static Icon KeymapEditorOpen = IconLoader.getIcon("/nodes/keymapEditorOpen.png"); + public static Icon KeymapMainMenu = IconLoader.getIcon("/nodes/keymapMainMenu.png"); + public static Icon KeymapOther = IconLoader.getIcon("/nodes/keymapOther.png"); + public static Icon KeymapTools = IconLoader.getIcon("/nodes/keymapTools.png"); + public static Icon KeymapToolsOpen = IconLoader.getIcon("/nodes/keymapToolsOpen.png"); + public static Icon Locked = IconLoader.getIcon("/nodes/locked.png"); + public static Icon LockedSingle = IconLoader.getIcon("/nodes/lockedSingle.png"); + public static Icon Method = IconLoader.getIcon("/nodes/method.png"); + public static Icon ModuleClosed = IconLoader.getIcon("/nodes/ModuleClosed.png"); + public static Icon ModuleGroupClosed = IconLoader.getIcon("/nodes/moduleGroupClosed.png"); + public static Icon ModuleGroupOpen = IconLoader.getIcon("/nodes/moduleGroupOpen.png"); + public static Icon ModuleJar = IconLoader.getIcon("/nodes/moduleJar.png"); + public static Icon ModuleOpen = IconLoader.getIcon("/nodes/ModuleOpen.png"); + public static Icon NamedBunch = IconLoader.getIcon("/nodes/namedBunch.png"); + public static Icon NewException = IconLoader.getIcon("/nodes/newException.png"); + public static Icon NewFolder = IconLoader.getIcon("/nodes/newFolder.png"); + public static Icon NewParameter = IconLoader.getIcon("/nodes/newParameter.png"); + public static Icon NodePlaceholder = IconLoader.getIcon("/nodes/nodePlaceholder.png"); + public static Icon PackageClosed = IconLoader.getIcon("/nodes/packageClosed.png"); + public static Icon PackageOpen = IconLoader.getIcon("/nodes/packageOpen.png"); + public static Icon Padlock = IconLoader.getIcon("/nodes/padlock.png"); + public static Icon Parameter = IconLoader.getIcon("/nodes/parameter.png"); + public static Icon ParentsIntroduction = IconLoader.getIcon("/nodes/parentsIntroduction.png"); + public static Icon Pin = IconLoader.getIcon("/nodes/pin.png"); + public static Icon PinToolWindow = IconLoader.getIcon("/nodes/pinToolWindow.png"); + public static Icon Plugin = IconLoader.getIcon("/nodes/plugin.png"); + public static Icon Pluginnotinstalled = IconLoader.getIcon("/nodes/pluginnotinstalled.png"); + public static Icon Pluginobsolete = IconLoader.getIcon("/nodes/pluginobsolete.png"); + public static Icon Pointcut = IconLoader.getIcon("/nodes/pointcut.png"); + public static Icon PpFile = IconLoader.getIcon("/nodes/ppFile.png"); + public static Icon PpInvalid = IconLoader.getIcon("/nodes/ppInvalid.png"); + public static Icon PpJar = IconLoader.getIcon("/nodes/ppJar.png"); + public static Icon PpJdk = IconLoader.getIcon("/nodes/ppJdk.png"); + public static Icon PpJdkClosed = IconLoader.getIcon("/nodes/ppJdkClosed.png"); + public static Icon PpJdkOpen = IconLoader.getIcon("/nodes/ppJdkOpen.png"); + public static Icon PpLib = IconLoader.getIcon("/nodes/ppLib.png"); + public static Icon PpLibClosed = IconLoader.getIcon("/nodes/ppLibClosed.png"); + public static Icon PpLibOpen = IconLoader.getIcon("/nodes/ppLibOpen.png"); + public static Icon PpWeb = IconLoader.getIcon("/nodes/ppWeb.png"); + public static Icon Project = IconLoader.getIcon("/nodes/project.png"); + public static Icon Property = IconLoader.getIcon("/nodes/property.png"); + public static Icon PropertyRead = IconLoader.getIcon("/nodes/propertyRead.png"); + public static Icon PropertyReadStatic = IconLoader.getIcon("/nodes/propertyReadStatic.png"); + public static Icon PropertyReadWrite = IconLoader.getIcon("/nodes/propertyReadWrite.png"); + public static Icon PropertyReadWriteStatic = IconLoader.getIcon("/nodes/propertyReadWriteStatic.png"); + public static Icon PropertyWrite = IconLoader.getIcon("/nodes/propertyWrite.png"); + public static Icon PropertyWriteStatic = IconLoader.getIcon("/nodes/propertyWriteStatic.png"); + public static Icon Read_access = IconLoader.getIcon("/nodes/read-access.png"); + public static Icon ResourceBundleClosed = IconLoader.getIcon("/nodes/resourceBundleClosed.png"); + public static Icon ResourceBundleOpen = IconLoader.getIcon("/nodes/resourceBundleOpen.png"); + public static Icon RunnableMark = IconLoader.getIcon("/nodes/runnableMark.png"); + public static Icon Rw_access = IconLoader.getIcon("/nodes/rw-access.png"); + public static Icon SecurityRole = IconLoader.getIcon("/nodes/SecurityRole.png"); + public static Icon Servlet = IconLoader.getIcon("/nodes/servlet.png"); + public static Icon ServletMapping = IconLoader.getIcon("/nodes/servletMapping.png"); + public static Icon SofteningIntroduction = IconLoader.getIcon("/nodes/softeningIntroduction.png"); + public static Icon SortBySeverity = IconLoader.getIcon("/nodes/sortBySeverity.png"); + public static Icon SourceFolder = IconLoader.getIcon("/nodes/sourceFolder.png"); + public static Icon Sql = IconLoader.getIcon("/nodes/sql.png"); + public static Icon Static = IconLoader.getIcon("/nodes/static.png"); + public static Icon StaticMark = IconLoader.getIcon("/nodes/staticMark.png"); + public static Icon Symlink = IconLoader.getIcon("/nodes/symlink.png"); + public static Icon TabAlert = IconLoader.getIcon("/nodes/tabAlert.png"); + public static Icon TabPin = IconLoader.getIcon("/nodes/tabPin.png"); + public static Icon Tag = IconLoader.getIcon("/nodes/tag.png"); + public static Icon TestSourceFolder = IconLoader.getIcon("/nodes/testSourceFolder.png"); + public static Icon TreeClosed = IconLoader.getIcon("/nodes/TreeClosed.png"); + public static Icon TreeOpen = IconLoader.getIcon("/nodes/TreeOpen.png"); + public static Icon Undeploy = IconLoader.getIcon("/nodes/undeploy.png"); + public static Icon UnknownJdkClosed = IconLoader.getIcon("/nodes/unknownJdkClosed.png"); + public static Icon UnknownJdkOpen = IconLoader.getIcon("/nodes/unknownJdkOpen.png"); + public static Icon UpFolder = IconLoader.getIcon("/nodes/upFolder.png"); + public static Icon UpLevel = IconLoader.getIcon("/nodes/upLevel.png"); + public static Icon Variable = IconLoader.getIcon("/nodes/variable.png"); + public static Icon WarningIntroduction = IconLoader.getIcon("/nodes/warningIntroduction.png"); + public static Icon WebFolderClosed = IconLoader.getIcon("/nodes/webFolderClosed.png"); + public static Icon WebFolderOpen = IconLoader.getIcon("/nodes/webFolderOpen.png"); + public static Icon Weblistener = IconLoader.getIcon("/nodes/weblistener.png"); + public static Icon Write_access = IconLoader.getIcon("/nodes/write-access.png"); + + } + + public static class ObjectBrowser { + public static Icon AbbreviatePackageNames = IconLoader.getIcon("/objectBrowser/abbreviatePackageNames.png"); + public static Icon Bean = IconLoader.getIcon("/objectBrowser/bean.png"); + public static Icon Browser = IconLoader.getIcon("/objectBrowser/browser.png"); + public static Icon CompactEmptyPackages = IconLoader.getIcon("/objectBrowser/compactEmptyPackages.png"); + public static Icon FlattenPackages = IconLoader.getIcon("/objectBrowser/flattenPackages.png"); + public static Icon HideEmptyPackages = IconLoader.getIcon("/objectBrowser/hideEmptyPackages.png"); + public static Icon HideFields = IconLoader.getIcon("/objectBrowser/hideFields.png"); + public static Icon ShowEditorHighlighting = IconLoader.getIcon("/objectBrowser/showEditorHighlighting.png"); + public static Icon ShowGlobalInspections = IconLoader.getIcon("/objectBrowser/showGlobalInspections.png"); + public static Icon ShowLibraryContents = IconLoader.getIcon("/objectBrowser/showLibraryContents.png"); + public static Icon ShowMembers = IconLoader.getIcon("/objectBrowser/showMembers.png"); + public static Icon ShowModules = IconLoader.getIcon("/objectBrowser/showModules.png"); + public static Icon ShowStructure = IconLoader.getIcon("/objectBrowser/showStructure.png"); + public static Icon SortByType = IconLoader.getIcon("/objectBrowser/sortByType.png"); + public static Icon Sorted = IconLoader.getIcon("/objectBrowser/sorted.png"); + public static Icon Variable = IconLoader.getIcon("/objectBrowser/variable.png"); + public static Icon VisibilitySort = IconLoader.getIcon("/objectBrowser/visibilitySort.png"); + + } + + public static class Process { + + public static class Big { + public static Icon Step_1 = IconLoader.getIcon("/process/big/step_1.png"); + public static Icon Step_10 = IconLoader.getIcon("/process/big/step_10.png"); + public static Icon Step_11 = IconLoader.getIcon("/process/big/step_11.png"); + public static Icon Step_12 = IconLoader.getIcon("/process/big/step_12.png"); + public static Icon Step_2 = IconLoader.getIcon("/process/big/step_2.png"); + public static Icon Step_3 = IconLoader.getIcon("/process/big/step_3.png"); + public static Icon Step_4 = IconLoader.getIcon("/process/big/step_4.png"); + public static Icon Step_5 = IconLoader.getIcon("/process/big/step_5.png"); + public static Icon Step_6 = IconLoader.getIcon("/process/big/step_6.png"); + public static Icon Step_7 = IconLoader.getIcon("/process/big/step_7.png"); + public static Icon Step_8 = IconLoader.getIcon("/process/big/step_8.png"); + public static Icon Step_9 = IconLoader.getIcon("/process/big/step_9.png"); + public static Icon Step_passive = IconLoader.getIcon("/process/big/step_passive.png"); + + } + public static Icon DisabledDebug = IconLoader.getIcon("/process/disabledDebug.png"); + public static Icon DisabledRun = IconLoader.getIcon("/process/disabledRun.png"); + + public static class FS { + public static Icon Step_1 = IconLoader.getIcon("/process/fs/step_1.png"); + public static Icon Step_10 = IconLoader.getIcon("/process/fs/step_10.png"); + public static Icon Step_11 = IconLoader.getIcon("/process/fs/step_11.png"); + public static Icon Step_12 = IconLoader.getIcon("/process/fs/step_12.png"); + public static Icon Step_13 = IconLoader.getIcon("/process/fs/step_13.png"); + public static Icon Step_14 = IconLoader.getIcon("/process/fs/step_14.png"); + public static Icon Step_15 = IconLoader.getIcon("/process/fs/step_15.png"); + public static Icon Step_16 = IconLoader.getIcon("/process/fs/step_16.png"); + public static Icon Step_17 = IconLoader.getIcon("/process/fs/step_17.png"); + public static Icon Step_18 = IconLoader.getIcon("/process/fs/step_18.png"); + public static Icon Step_2 = IconLoader.getIcon("/process/fs/step_2.png"); + public static Icon Step_3 = IconLoader.getIcon("/process/fs/step_3.png"); + public static Icon Step_4 = IconLoader.getIcon("/process/fs/step_4.png"); + public static Icon Step_5 = IconLoader.getIcon("/process/fs/step_5.png"); + public static Icon Step_6 = IconLoader.getIcon("/process/fs/step_6.png"); + public static Icon Step_7 = IconLoader.getIcon("/process/fs/step_7.png"); + public static Icon Step_8 = IconLoader.getIcon("/process/fs/step_8.png"); + public static Icon Step_9 = IconLoader.getIcon("/process/fs/step_9.png"); + public static Icon Step_mask = IconLoader.getIcon("/process/fs/step_mask.png"); + public static Icon Step_passive = IconLoader.getIcon("/process/fs/step_passive.png"); + + } + public static Icon Step_1 = IconLoader.getIcon("/process/step_1.png"); + public static Icon Step_10 = IconLoader.getIcon("/process/step_10.png"); + public static Icon Step_11 = IconLoader.getIcon("/process/step_11.png"); + public static Icon Step_12 = IconLoader.getIcon("/process/step_12.png"); + public static Icon Step_2 = IconLoader.getIcon("/process/step_2.png"); + public static Icon Step_3 = IconLoader.getIcon("/process/step_3.png"); + public static Icon Step_4 = IconLoader.getIcon("/process/step_4.png"); + public static Icon Step_5 = IconLoader.getIcon("/process/step_5.png"); + public static Icon Step_6 = IconLoader.getIcon("/process/step_6.png"); + public static Icon Step_7 = IconLoader.getIcon("/process/step_7.png"); + public static Icon Step_8 = IconLoader.getIcon("/process/step_8.png"); + public static Icon Step_9 = IconLoader.getIcon("/process/step_9.png"); + public static Icon Step_mask = IconLoader.getIcon("/process/step_mask.png"); + public static Icon Step_passive = IconLoader.getIcon("/process/step_passive.png"); + public static Icon Stop = IconLoader.getIcon("/process/stop.png"); + public static Icon StopHovered = IconLoader.getIcon("/process/stopHovered.png"); + + } + + public static class RunConfigurations { + public static Icon Applet = IconLoader.getIcon("/runConfigurations/applet.png"); + public static Icon Application = IconLoader.getIcon("/runConfigurations/application.png"); + public static Icon ConfigurationWarning = IconLoader.getIcon("/runConfigurations/configurationWarning.png"); + public static Icon HidePassed = IconLoader.getIcon("/runConfigurations/hidePassed.png"); + public static Icon IgnoredTest = IconLoader.getIcon("/runConfigurations/ignoredTest.png"); + public static Icon InvalidConfigurationLayer = IconLoader.getIcon("/runConfigurations/invalidConfigurationLayer.png"); + public static Icon Junit = IconLoader.getIcon("/runConfigurations/junit.png"); + public static Icon LoadingTree = IconLoader.getIcon("/runConfigurations/loadingTree.png"); + public static Icon Ql_console = IconLoader.getIcon("/runConfigurations/ql_console.png"); + public static Icon Remote = IconLoader.getIcon("/runConfigurations/remote.png"); + public static Icon RerunFailedTests = IconLoader.getIcon("/runConfigurations/rerunFailedTests.png"); + public static Icon SaveTempConfig = IconLoader.getIcon("/runConfigurations/saveTempConfig.png"); + public static Icon Scroll_down = IconLoader.getIcon("/runConfigurations/scroll_down.png"); + public static Icon ScrollToStackTrace = IconLoader.getIcon("/runConfigurations/scrollToStackTrace.png"); + public static Icon SelectFirstDefect = IconLoader.getIcon("/runConfigurations/selectFirstDefect.png"); + public static Icon SourceAtException = IconLoader.getIcon("/runConfigurations/sourceAtException.png"); + public static Icon TestError = IconLoader.getIcon("/runConfigurations/testError.png"); + public static Icon TestFailed = IconLoader.getIcon("/runConfigurations/testFailed.png"); + public static Icon TestIgnored = IconLoader.getIcon("/runConfigurations/testIgnored.png"); + public static Icon TestInProgress1 = IconLoader.getIcon("/runConfigurations/testInProgress1.png"); + public static Icon TestInProgress2 = IconLoader.getIcon("/runConfigurations/testInProgress2.png"); + public static Icon TestInProgress3 = IconLoader.getIcon("/runConfigurations/testInProgress3.png"); + public static Icon TestInProgress4 = IconLoader.getIcon("/runConfigurations/testInProgress4.png"); + public static Icon TestInProgress5 = IconLoader.getIcon("/runConfigurations/testInProgress5.png"); + public static Icon TestInProgress6 = IconLoader.getIcon("/runConfigurations/testInProgress6.png"); + public static Icon TestInProgress7 = IconLoader.getIcon("/runConfigurations/testInProgress7.png"); + public static Icon TestInProgress8 = IconLoader.getIcon("/runConfigurations/testInProgress8.png"); + public static Icon TestMark = IconLoader.getIcon("/runConfigurations/testMark.png"); + public static Icon TestNotRan = IconLoader.getIcon("/runConfigurations/testNotRan.png"); + public static Icon TestOuput = IconLoader.getIcon("/runConfigurations/testOuput.png"); + public static Icon TestPassed = IconLoader.getIcon("/runConfigurations/testPassed.png"); + public static Icon TestPaused = IconLoader.getIcon("/runConfigurations/testPaused.png"); + public static Icon TestSkipped = IconLoader.getIcon("/runConfigurations/testSkipped.png"); + public static Icon TestStatistics = IconLoader.getIcon("/runConfigurations/testStatistics.png"); + public static Icon TestTerminated = IconLoader.getIcon("/runConfigurations/testTerminated.png"); + public static Icon Tomcat = IconLoader.getIcon("/runConfigurations/tomcat.png"); + public static Icon TrackCoverage = IconLoader.getIcon("/runConfigurations/trackCoverage.png"); + public static Icon TrackTests = IconLoader.getIcon("/runConfigurations/trackTests.png"); + public static Icon Unknown = IconLoader.getIcon("/runConfigurations/unknown.png"); + public static Icon Variables = IconLoader.getIcon("/runConfigurations/variables.png"); + public static Icon Web_app = IconLoader.getIcon("/runConfigurations/web_app.png"); + public static Icon WithCoverageLayer = IconLoader.getIcon("/runConfigurations/withCoverageLayer.png"); + + } + + public static class Toolbar { + public static Icon Filterdups = IconLoader.getIcon("/toolbar/filterdups.png"); + public static Icon Folders = IconLoader.getIcon("/toolbar/folders.png"); + public static Icon Show_packages = IconLoader.getIcon("/toolbar/show_packages.png"); + public static Icon Unknown = IconLoader.getIcon("/toolbar/unknown.png"); + + } + + public static class ToolbarDecorator { + public static Icon Add = IconLoader.getIcon("/toolbarDecorator/add.png"); + public static Icon AddBlankLine = IconLoader.getIcon("/toolbarDecorator/addBlankLine.png"); + public static Icon AddClass = IconLoader.getIcon("/toolbarDecorator/addClass.png"); + public static Icon AddFolder = IconLoader.getIcon("/toolbarDecorator/addFolder.png"); + public static Icon AddIcon = IconLoader.getIcon("/toolbarDecorator/addIcon.png"); + public static Icon AddJira = IconLoader.getIcon("/toolbarDecorator/addJira.png"); + public static Icon AddLink = IconLoader.getIcon("/toolbarDecorator/addLink.png"); + public static Icon AddPackage = IconLoader.getIcon("/toolbarDecorator/addPackage.png"); + public static Icon AddPattern = IconLoader.getIcon("/toolbarDecorator/addPattern.png"); + public static Icon AddYouTrack = IconLoader.getIcon("/toolbarDecorator/addYouTrack.png"); + public static Icon Analyze = IconLoader.getIcon("/toolbarDecorator/analyze.png"); + public static Icon Edit = IconLoader.getIcon("/toolbarDecorator/edit.png"); + public static Icon Export = IconLoader.getIcon("/toolbarDecorator/export.png"); + public static Icon Import = IconLoader.getIcon("/toolbarDecorator/import.png"); + + public static class Mac { + public static Icon Add = IconLoader.getIcon("/toolbarDecorator/mac/add.png"); + public static Icon AddBlankLine = IconLoader.getIcon("/toolbarDecorator/mac/addBlankLine.png"); + public static Icon AddClass = IconLoader.getIcon("/toolbarDecorator/mac/addClass.png"); + public static Icon AddFolder = IconLoader.getIcon("/toolbarDecorator/mac/addFolder.png"); + public static Icon AddIcon = IconLoader.getIcon("/toolbarDecorator/mac/addIcon.png"); + public static Icon AddJira = IconLoader.getIcon("/toolbarDecorator/mac/addJira.png"); + public static Icon AddLink = IconLoader.getIcon("/toolbarDecorator/mac/addLink.png"); + public static Icon AddPackage = IconLoader.getIcon("/toolbarDecorator/mac/addPackage.png"); + public static Icon AddPattern = IconLoader.getIcon("/toolbarDecorator/mac/addPattern.png"); + public static Icon AddYouTrack = IconLoader.getIcon("/toolbarDecorator/mac/addYouTrack.png"); + public static Icon Analyze = IconLoader.getIcon("/toolbarDecorator/mac/analyze.png"); + public static Icon Edit = IconLoader.getIcon("/toolbarDecorator/mac/edit.png"); + public static Icon MoveDown = IconLoader.getIcon("/toolbarDecorator/mac/moveDown.png"); + public static Icon MoveUp = IconLoader.getIcon("/toolbarDecorator/mac/moveUp.png"); + public static Icon Remove = IconLoader.getIcon("/toolbarDecorator/mac/remove.png"); + + } + public static Icon MoveDown = IconLoader.getIcon("/toolbarDecorator/moveDown.png"); + public static Icon MoveUp = IconLoader.getIcon("/toolbarDecorator/moveUp.png"); + public static Icon Remove = IconLoader.getIcon("/toolbarDecorator/remove.png"); + + } + + public static class Vcs { + public static Icon AllRevisions = IconLoader.getIcon("/vcs/allRevisions.png"); + public static Icon Annotate1 = IconLoader.getIcon("/vcs/annotate1.png"); + public static Icon Arrow_left = IconLoader.getIcon("/vcs/arrow_left.png"); + public static Icon Arrow_right = IconLoader.getIcon("/vcs/arrow_right.png"); + public static Icon CheckSpelling = IconLoader.getIcon("/vcs/checkSpelling.png"); + public static Icon CustomizeView = IconLoader.getIcon("/vcs/customizeView.png"); + public static Icon Equal = IconLoader.getIcon("/vcs/equal.png"); + public static Icon MapBase = IconLoader.getIcon("/vcs/mapBase.png"); + public static Icon Merge = IconLoader.getIcon("/vcs/merge.png"); + public static Icon MergeSourcesTree = IconLoader.getIcon("/vcs/mergeSourcesTree.png"); + public static Icon MessageHistory = IconLoader.getIcon("/vcs/messageHistory.png"); + public static Icon Not_equal = IconLoader.getIcon("/vcs/not_equal.png"); + public static Icon Refresh = IconLoader.getIcon("/vcs/refresh.png"); + public static Icon Remove = IconLoader.getIcon("/vcs/remove.png"); + public static Icon ResetStrip = IconLoader.getIcon("/vcs/resetStrip.png"); + public static Icon Showfilter = IconLoader.getIcon("/vcs/showfilter.png"); + public static Icon StripDown = IconLoader.getIcon("/vcs/stripDown.png"); + public static Icon StripNull = IconLoader.getIcon("/vcs/stripNull.png"); + public static Icon StripUp = IconLoader.getIcon("/vcs/stripUp.png"); + public static Icon Volute = IconLoader.getIcon("/vcs/volute.png"); + + } + + public static class Webreferences { + public static Icon Add = IconLoader.getIcon("/webreferences/add.png"); + public static Icon InvalidFile = IconLoader.getIcon("/webreferences/invalidFile.png"); + public static Icon InvalidWebReference = IconLoader.getIcon("/webreferences/invalidWebReference.png"); + public static Icon Properties = IconLoader.getIcon("/webreferences/properties.png"); + public static Icon Remove = IconLoader.getIcon("/webreferences/remove.png"); + public static Icon Server = IconLoader.getIcon("/webreferences/server.png"); + public static Icon SystemIcon = IconLoader.getIcon("/webreferences/systemIcon.png"); + public static Icon SystemIconX = IconLoader.getIcon("/webreferences/systemIconX.png"); + public static Icon WebReference = IconLoader.getIcon("/webreferences/webReference.png"); + public static Icon WebReferencesRoot = IconLoader.getIcon("/webreferences/webReferencesRoot.png"); + + } + + public static class Xml { + + public static class Actions { + public static Icon Add_column_after = IconLoader.getIcon("/xml/actions/add_column_after.png"); + public static Icon Add_column_before = IconLoader.getIcon("/xml/actions/add_column_before.png"); + + } + + public static class Browsers { + public static Icon Chrome16 = IconLoader.getIcon("/xml/browsers/chrome16.png"); + public static Icon Explorer16 = IconLoader.getIcon("/xml/browsers/explorer16.png"); + public static Icon Firefox16 = IconLoader.getIcon("/xml/browsers/firefox16.png"); + public static Icon Opera16 = IconLoader.getIcon("/xml/browsers/opera16.png"); + public static Icon Safari16 = IconLoader.getIcon("/xml/browsers/safari16.png"); + + } + public static Icon Css_class = IconLoader.getIcon("/xml/css_class.png"); + public static Icon Html_id = IconLoader.getIcon("/xml/html_id.png"); + public static Icon Toggle_addressbar = IconLoader.getIcon("/xml/toggle_addressbar.png"); + public static Icon Web_preview = IconLoader.getIcon("/xml/web_preview.png"); + public static Icon Web_preview2 = IconLoader.getIcon("/xml/web_preview2.png"); + + } +} diff --git a/platform/util/src/com/intellij/util/ui/UIUtil.java b/platform/util/src/com/intellij/util/ui/UIUtil.java index 89aa02faf0be..8c9d5b35d4c4 100644 --- a/platform/util/src/com/intellij/util/ui/UIUtil.java +++ b/platform/util/src/com/intellij/util/ui/UIUtil.java @@ -16,6 +16,7 @@ package com.intellij.util.ui; import com.intellij.BundleBase; +import com.intellij.icons.AllIcons; import com.intellij.openapi.Disposable; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.*; @@ -737,15 +738,15 @@ public class UIUtil { } public static Icon getBalloonInformationIcon() { - return IconLoader.getIcon("/general/balloonInformation.png"); + return AllIcons.General.BalloonInformation; } public static Icon getBalloonWarningIcon() { - return IconLoader.getIcon("/general/balloonWarning.png"); + return AllIcons.General.BalloonWarning; } public static Icon getBalloonErrorIcon() { - return IconLoader.getIcon("/general/balloonError.png"); + return AllIcons.General.BalloonError; } public static Icon getRadioButtonIcon() { diff --git a/platform/util/src/com/intellij/util/ui/tree/MacTreeUI.java b/platform/util/src/com/intellij/util/ui/tree/MacTreeUI.java index 1c3a0ae5ec87..05e744059e02 100644 --- a/platform/util/src/com/intellij/util/ui/tree/MacTreeUI.java +++ b/platform/util/src/com/intellij/util/ui/tree/MacTreeUI.java @@ -15,7 +15,7 @@ */ package com.intellij.util.ui.tree; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.openapi.util.SystemInfo; import com.intellij.util.ui.UIUtil; import org.jetbrains.annotations.NonNls; @@ -42,8 +42,8 @@ public class MacTreeUI extends BasicTreeUI { private static final Icon TREE_COLLAPSED_ICON = UIUtil.getTreeCollapsedIcon(); private static final Icon TREE_EXPANDED_ICON = UIUtil.getTreeExpandedIcon(); - private static final Icon TREE_SELECTED_COLLAPSED_ICON = IconLoader.getIcon("/mac/tree_white_right_arrow.png"); - private static final Icon TREE_SELECTED_EXPANDED_ICON = IconLoader.getIcon("/mac/tree_white_down_arrow.png"); + private static final Icon TREE_SELECTED_COLLAPSED_ICON = AllIcons.Mac.Tree_white_right_arrow; + private static final Icon TREE_SELECTED_EXPANDED_ICON = AllIcons.Mac.Tree_white_down_arrow; private static final Border LIST_BACKGROUND_PAINTER = (Border)UIManager.get("List.sourceListBackgroundPainter"); private static final Border LIST_SELECTION_BACKGROUND_PAINTER = (Border)UIManager.get("List.sourceListSelectionBackgroundPainter"); diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/annotate/ShowAllAffectedGenericAction.java b/platform/vcs-api/src/com/intellij/openapi/vcs/annotate/ShowAllAffectedGenericAction.java index 2c82e4943aca..abe73951ef31 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/annotate/ShowAllAffectedGenericAction.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/annotate/ShowAllAffectedGenericAction.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.vcs.annotate; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -23,7 +24,6 @@ import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.progress.Task; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Pair; import com.intellij.openapi.vcs.*; import com.intellij.openapi.vcs.changes.BackgroundFromStartOption; @@ -44,7 +44,7 @@ import java.util.List; */ public class ShowAllAffectedGenericAction extends AnAction { public ShowAllAffectedGenericAction() { - super("Show all affected files", null, IconLoader.getIcon("/vcs/allRevisions.png")); + super("Show all affected files", null, AllIcons.Vcs.AllRevisions); } @Override diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/ui/SearchFieldAction.java b/platform/vcs-api/src/com/intellij/openapi/vcs/ui/SearchFieldAction.java index 0443a3f03a90..565cbf0b227c 100644 --- a/platform/vcs-api/src/com/intellij/openapi/vcs/ui/SearchFieldAction.java +++ b/platform/vcs-api/src/com/intellij/openapi/vcs/ui/SearchFieldAction.java @@ -15,10 +15,10 @@ */ package com.intellij.openapi.vcs.ui; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.actionSystem.ex.CustomComponentAction; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.SearchTextField; import com.intellij.util.ui.UIUtil; @@ -68,7 +68,7 @@ public abstract class SearchFieldAction extends AnAction implements CustomCompon myField.setBorder(emptyBorder); } - myField.setSearchIcon(IconLoader.getIcon("/actions/filter_small.png")); + myField.setSearchIcon(AllIcons.Actions.Filter_small); myComponent = new JPanel(); final BoxLayout layout = new BoxLayout(myComponent, BoxLayout.X_AXIS); myComponent.setLayout(layout); diff --git a/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java b/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java index 1d639ff1c655..7f225e9134e2 100644 --- a/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java +++ b/platform/vcs-api/src/com/intellij/vcsUtil/VcsUtil.java @@ -15,6 +15,7 @@ */ package com.intellij.vcsUtil; +import com.intellij.icons.AllIcons; import com.intellij.ide.util.PropertiesComponent; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -29,7 +30,6 @@ import com.intellij.openapi.fileTypes.FileTypes; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Computable; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vcs.*; @@ -52,8 +52,8 @@ import java.util.*; @SuppressWarnings({"UtilityClassWithoutPrivateConstructor"}) public class VcsUtil { - public static final Icon ourDot = IconLoader.getIcon("/general/mdot.png"); - public static final Icon ourNotDot = IconLoader.getIcon("/general/mdot-empty.png"); + public static final Icon ourDot = AllIcons.General.Mdot; + public static final Icon ourNotDot = AllIcons.General.Mdot_empty; protected static final char[] ourCharsToBeChopped = new char[]{'/', '\\'}; private static final Logger LOG = Logger.getInstance("#com.intellij.vcsUtil.VcsUtil"); diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffIcons.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffIcons.java index 2a71810bc9d2..dfe94f185e33 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffIcons.java +++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffIcons.java @@ -15,7 +15,7 @@ */ package com.intellij.openapi.diff.impl.dir; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.util.PlatformIcons; import javax.swing.*; @@ -25,8 +25,8 @@ import javax.swing.*; */ public interface DirDiffIcons { Icon FOLDER = PlatformIcons.FOLDER_ICON; - Icon MOVE_RIGHT = IconLoader.getIcon("/vcs/arrow_right.png"); - Icon MOVE_LEFT = IconLoader.getIcon("/vcs/arrow_left.png"); - Icon EQUAL = IconLoader.getIcon("/vcs/equal.png"); - Icon NOT_EQUAL = IconLoader.getIcon("/vcs/not_equal.png"); + Icon MOVE_RIGHT = AllIcons.Vcs.Arrow_right; + Icon MOVE_LEFT = AllIcons.Vcs.Arrow_left; + Icon EQUAL = AllIcons.Vcs.Equal; + Icon NOT_EQUAL = AllIcons.Vcs.Not_equal; } diff --git a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffOperation.java b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffOperation.java index d9a543f4d952..af3bf2bdedba 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffOperation.java +++ b/platform/vcs-impl/src/com/intellij/openapi/diff/impl/dir/DirDiffOperation.java @@ -15,7 +15,7 @@ */ package com.intellij.openapi.diff.impl.dir; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.openapi.vcs.FileStatus; import com.intellij.util.ui.EmptyIcon; @@ -30,11 +30,11 @@ public enum DirDiffOperation { public Icon getIcon() { switch (this) { - case COPY_TO: return IconLoader.getIcon("/vcs/arrow_right.png"); - case COPY_FROM: return IconLoader.getIcon("/vcs/arrow_left.png"); - case MERGE: return IconLoader.getIcon("/vcs/not_equal.png"); - case EQUAL: return IconLoader.getIcon("/vcs/equal.png"); - case DELETE: return IconLoader.getIcon("/vcs/remove.png"); + case COPY_TO: return AllIcons.Vcs.Arrow_right; + case COPY_FROM: return AllIcons.Vcs.Arrow_left; + case MERGE: return AllIcons.Vcs.Not_equal; + case EQUAL: return AllIcons.Vcs.Equal; + case DELETE: return AllIcons.Vcs.Remove; case NONE: } return EmptyIcon.create(16); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowDiffFromAnnotation.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowDiffFromAnnotation.java index 0d716c1dc3ae..72acaf90efb3 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowDiffFromAnnotation.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/ShowDiffFromAnnotation.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.vcs.actions; +import com.intellij.icons.AllIcons; import com.intellij.idea.ActionsBundle; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -24,7 +25,6 @@ import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.progress.ProgressManager; import com.intellij.openapi.progress.Task; import com.intellij.openapi.ui.MessageType; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.*; @@ -64,7 +64,7 @@ class ShowDiffFromAnnotation extends AnAction implements LineNumberListener { final FileAnnotation fileAnnotation, final AbstractVcs vcs, final VirtualFile file) { super(ActionsBundle.message("action.Diff.UpdatedFiles.text"), ActionsBundle.message("action.Diff.UpdatedFiles.description"), - IconLoader.getIcon("/actions/diff.png")); + AllIcons.Actions.Diff); myLineNumberProvider = lineNumberProvider; myFileAnnotation = fileAnnotation; myVcs = vcs; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java index 1be3fb0ae7c8..ac61196b18c6 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesFragmentedDiffPanel.java @@ -15,13 +15,13 @@ */ package com.intellij.openapi.vcs.changes; +import com.intellij.icons.AllIcons; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.diff.DiffPanel; import com.intellij.openapi.diff.ShiftedSimpleContent; -import com.intellij.openapi.diff.SimpleContent; import com.intellij.openapi.diff.ex.DiffPanelEx; import com.intellij.openapi.diff.ex.DiffPanelOptions; import com.intellij.openapi.diff.impl.DiffPanelImpl; @@ -50,21 +50,17 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.DialogWrapperDialog; import com.intellij.openapi.ui.Splitter; -import com.intellij.openapi.ui.impl.DialogWrapperPeerImpl; import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.ui.popup.ListPopup; import com.intellij.openapi.util.*; import com.intellij.openapi.vcs.VcsConfiguration; -import com.intellij.openapi.vcs.VcsDataKeys; -import com.intellij.pom.Navigatable; import com.intellij.ui.awt.RelativePoint; import com.intellij.util.BeforeAfter; import com.intellij.util.PlatformIcons; import com.intellij.util.ui.ButtonlessScrollBarUI; import com.intellij.util.ui.UIUtil; import com.intellij.vcsUtil.VcsUtil; -import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import javax.swing.*; @@ -164,7 +160,7 @@ public class ChangesFragmentedDiffPanel implements Disposable { } private void createNavigateAction() { - myNavigateAction = new DumbAwareAction("Edit Source", "Edit Source", IconLoader.getIcon("/actions/editSource.png")) { + myNavigateAction = new DumbAwareAction("Edit Source", "Edit Source", AllIcons.Actions.EditSource) { @Override public void actionPerformed(AnActionEvent e) { final boolean enabled = getEnabled(); @@ -618,7 +614,7 @@ public class ChangesFragmentedDiffPanel implements Disposable { private final ChangesFragmentedDiffPanel.MyUseSoftWrapsAction mySoftWrapsAction; private PopupAction() { - super("Settings", "Settings", IconLoader.getIcon("/general/secondaryGroup.png")); + super("Settings", "Settings", AllIcons.General.SecondaryGroup); myUsual = new AnAction("Top | Bottom", "", VcsUtil.ourNotDot) { @Override public void actionPerformed(AnActionEvent e) { @@ -810,7 +806,7 @@ public class ChangesFragmentedDiffPanel implements Disposable { private class MyChangeContextAction extends DumbAwareAction { private MyChangeContextAction() { - super("More/Less Lines...", "More/Less Lines...", IconLoader.getIcon("/actions/expandall.png")); + super("More/Less Lines...", "More/Less Lines...", AllIcons.Actions.Expandall); } @Override @@ -866,7 +862,7 @@ public class ChangesFragmentedDiffPanel implements Disposable { private boolean myEnabled; private MyPreviousDiffAction() { - super("Previous Change", "Previous Change", IconLoader.getIcon("/actions/previousOccurence.png")); + super("Previous Change", "Previous Change", AllIcons.Actions.PreviousOccurence); } @Override @@ -895,7 +891,7 @@ public class ChangesFragmentedDiffPanel implements Disposable { private boolean myEnabled; private MyNextDiffAction() { - super("Next Change", "Next Change", IconLoader.getIcon("/actions/nextOccurence.png")); + super("Next Change", "Next Change", AllIcons.Actions.NextOccurence); } @Override diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java index 3deb24658cce..0e038b559128 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangesViewManager.java @@ -22,6 +22,7 @@ */ package com.intellij.openapi.vcs.changes; +import com.intellij.icons.AllIcons; import com.intellij.ide.CommonActionsManager; import com.intellij.ide.TreeExpander; import com.intellij.ide.actions.ContextHelpAction; @@ -73,7 +74,7 @@ import java.util.List; public class ChangesViewManager implements ChangesViewI, JDOMExternalizable, ProjectComponent { public static final int UNVERSIONED_MAX_SIZE = 50; - public static final Icon detailsIcon = IconLoader.getIcon("/vcs/volute.png"); + public static final Icon detailsIcon = AllIcons.Vcs.Volute; private boolean SHOW_FLATTEN_MODE = true; private boolean SHOW_IGNORED_MODE = false; @@ -551,7 +552,7 @@ public class ChangesViewManager implements ChangesViewI, JDOMExternalizable, Pro public ToggleShowIgnoredAction() { super(VcsBundle.message("changes.action.show.ignored.text"), VcsBundle.message("changes.action.show.ignored.description"), - IconLoader.getIcon("/actions/showHiddens.png")); + AllIcons.Actions.ShowHiddens); } public boolean isSelected(AnActionEvent e) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/CreatePatchFromChangesAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/CreatePatchFromChangesAction.java index c2b9a12c6d3a..95fe4074b5dc 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/CreatePatchFromChangesAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/CreatePatchFromChangesAction.java @@ -16,6 +16,7 @@ package com.intellij.openapi.vcs.changes.actions; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -24,7 +25,6 @@ import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.openapi.project.ProjectManager; import com.intellij.openapi.ui.DialogWrapper; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.VcsBundle; import com.intellij.openapi.vcs.VcsDataKeys; import com.intellij.openapi.vcs.VcsException; @@ -44,7 +44,7 @@ import java.util.List; public class CreatePatchFromChangesAction extends AnAction implements DumbAware { public CreatePatchFromChangesAction() { super(VcsBundle.message("action.name.create.patch.for.selected.revisions"), - VcsBundle.message("action.description.create.patch.for.selected.revisions"), IconLoader.getIcon("/actions/createPatch.png")); + VcsBundle.message("action.description.create.patch.for.selected.revisions"), AllIcons.Actions.CreatePatch); } public void actionPerformed(AnActionEvent e) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/IgnoredSettingsAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/IgnoredSettingsAction.java index e89575383fdd..421d6b52ab83 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/IgnoredSettingsAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/IgnoredSettingsAction.java @@ -16,12 +16,12 @@ package com.intellij.openapi.vcs.changes.actions; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.changes.ChangeListManager; import com.intellij.openapi.vcs.changes.ui.IgnoredSettingsDialog; @@ -31,7 +31,7 @@ import com.intellij.openapi.vcs.changes.ui.IgnoredSettingsDialog; public class IgnoredSettingsAction extends AnAction implements DumbAware { public IgnoredSettingsAction() { super("Configure Ignored Files...", "Specify file paths and masks which are ignored", - IconLoader.getIcon("/actions/properties.png")); + AllIcons.Actions.Properties); } public void actionPerformed(AnActionEvent e) { @@ -40,4 +40,4 @@ public class IgnoredSettingsAction extends AnAction implements DumbAware { IgnoredSettingsDialog.configure(project); } -} \ No newline at end of file +} diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/MoveChangesToAnotherListAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/MoveChangesToAnotherListAction.java index 0f204236add2..e01907a70615 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/MoveChangesToAnotherListAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/MoveChangesToAnotherListAction.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.vcs.changes.actions; +import com.intellij.icons.AllIcons; import com.intellij.idea.ActionsBundle; import com.intellij.openapi.actionSystem.ActionPlaces; import com.intellij.openapi.actionSystem.AnAction; @@ -22,7 +23,6 @@ import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.FileStatus; import com.intellij.openapi.vcs.ProjectLevelVcsManager; import com.intellij.openapi.vcs.VcsDataKeys; @@ -48,7 +48,7 @@ public class MoveChangesToAnotherListAction extends AnAction implements DumbAwar public MoveChangesToAnotherListAction() { super(ActionsBundle.actionText("ChangesView.Move"), ActionsBundle.actionDescription("ChangesView.Move"), - IconLoader.getIcon("/actions/fileStatus.png")); + AllIcons.Actions.FileStatus); } public void update(AnActionEvent e) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/OpenRepositoryVersionAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/OpenRepositoryVersionAction.java index 16369891a044..fdb4cd509d40 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/OpenRepositoryVersionAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/OpenRepositoryVersionAction.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.vcs.changes.actions; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.PlatformDataKeys; @@ -22,7 +23,6 @@ import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.fileEditor.OpenFileDescriptor; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.VcsBundle; import com.intellij.openapi.vcs.VcsDataKeys; import com.intellij.openapi.vcs.changes.Change; @@ -39,7 +39,7 @@ public class OpenRepositoryVersionAction extends AnAction implements DumbAware { public OpenRepositoryVersionAction() { // TODO[yole]: real icon super(VcsBundle.message("open.repository.version.text"), VcsBundle.message("open.repository.version.description"), - IconLoader.getIcon("/objectBrowser/showEditorHighlighting.png")); + AllIcons.ObjectBrowser.ShowEditorHighlighting); } public void actionPerformed(AnActionEvent e) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RevertSelectedChangesAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RevertSelectedChangesAction.java index 8153c0fd7f3e..27df5e17ac9d 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RevertSelectedChangesAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RevertSelectedChangesAction.java @@ -15,11 +15,11 @@ */ package com.intellij.openapi.vcs.changes.actions; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.Presentation; -import com.intellij.openapi.util.IconLoader; -import com.intellij.openapi.vcs.VcsDataKeys; import com.intellij.openapi.vcs.VcsBundle; +import com.intellij.openapi.vcs.VcsDataKeys; import com.intellij.openapi.vcs.changes.Change; import com.intellij.util.containers.Convertor; @@ -40,7 +40,7 @@ public class RevertSelectedChangesAction extends RevertCommittedStuffAbstractAct private static void initPresentation() { if (ourIcon == null) { - ourIcon = IconLoader.getIcon("/actions/rollback.png"); + ourIcon = AllIcons.Actions.Rollback; ourText = VcsBundle.message("action.revert.selected.changes.text"); } } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackDialogAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackDialogAction.java index 7dfcb14f37fe..41d902dbc62c 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackDialogAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/RollbackDialogAction.java @@ -15,13 +15,13 @@ */ package com.intellij.openapi.vcs.changes.actions; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.fileEditor.FileDocumentManager; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.VcsBundle; import com.intellij.openapi.vcs.VcsDataKeys; import com.intellij.openapi.vcs.changes.Change; @@ -36,7 +36,7 @@ import java.util.Arrays; public class RollbackDialogAction extends AnAction implements DumbAware { public RollbackDialogAction() { super(VcsBundle.message("changes.action.rollback.text"), VcsBundle.message("changes.action.rollback.description"), - IconLoader.getIcon("/actions/rollback.png")); + AllIcons.Actions.Rollback); } public void actionPerformed(AnActionEvent e) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/SetDefaultChangeListAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/SetDefaultChangeListAction.java index d9b98d5c8be8..97813d604f9e 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/SetDefaultChangeListAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/SetDefaultChangeListAction.java @@ -22,10 +22,13 @@ */ package com.intellij.openapi.vcs.changes.actions; -import com.intellij.openapi.actionSystem.*; -import com.intellij.openapi.project.Project; +import com.intellij.icons.AllIcons; +import com.intellij.openapi.actionSystem.ActionPlaces; +import com.intellij.openapi.actionSystem.AnAction; +import com.intellij.openapi.actionSystem.AnActionEvent; +import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.DumbAware; -import com.intellij.openapi.util.IconLoader; +import com.intellij.openapi.project.Project; import com.intellij.openapi.vcs.VcsBundle; import com.intellij.openapi.vcs.VcsDataKeys; import com.intellij.openapi.vcs.changes.ChangeList; @@ -35,7 +38,7 @@ import com.intellij.openapi.vcs.changes.LocalChangeList; public class SetDefaultChangeListAction extends AnAction implements DumbAware { public SetDefaultChangeListAction() { super(VcsBundle.message("changes.action.setdefaultchangelist.text"), - VcsBundle.message("changes.action.setdefaultchangelist.description"), IconLoader.getIcon("/actions/submit1.png")); + VcsBundle.message("changes.action.setdefaultchangelist.description"), AllIcons.Actions.Submit1); } @@ -55,4 +58,4 @@ public class SetDefaultChangeListAction extends AnAction implements DumbAware { assert lists != null; ChangeListManager.getInstance(project).setDefaultChangeList((LocalChangeList)lists[0]); } -} \ No newline at end of file +} diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ShowDiffAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ShowDiffAction.java index 3124718db898..0b8ce1c89bde 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ShowDiffAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ShowDiffAction.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.vcs.changes.actions; +import com.intellij.icons.AllIcons; import com.intellij.idea.ActionsBundle; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -28,12 +29,10 @@ import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.Condition; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.*; import com.intellij.openapi.vcs.changes.*; import com.intellij.util.ArrayUtil; import com.intellij.util.BeforeAfter; -import com.intellij.util.containers.Convertor; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -50,7 +49,7 @@ public class ShowDiffAction extends AnAction implements DumbAware { public ShowDiffAction() { super(ourText, ActionsBundle.actionDescription("ChangesView.Diff"), - IconLoader.getIcon("/actions/diff.png")); + AllIcons.Actions.Diff); } public void update(AnActionEvent e) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ShowDiffWithLocalAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ShowDiffWithLocalAction.java index 93b6f50dc6c9..ac28b46a0666 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ShowDiffWithLocalAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/actions/ShowDiffWithLocalAction.java @@ -15,12 +15,12 @@ */ package com.intellij.openapi.vcs.changes.actions; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.VcsBundle; import com.intellij.openapi.vcs.VcsDataKeys; import com.intellij.openapi.vcs.changes.Change; @@ -39,7 +39,7 @@ public class ShowDiffWithLocalAction extends AnAction implements DumbAware { public ShowDiffWithLocalAction() { super(VcsBundle.message("show.diff.with.local.action.text"), VcsBundle.message("show.diff.with.local.action.description"), - IconLoader.getIcon("/actions/diffWithCurrent.png")); + AllIcons.Actions.DiffWithCurrent); } public void actionPerformed(AnActionEvent e) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/IncomingChangesIndicator.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/IncomingChangesIndicator.java index fb42df5b4dc4..8e489568a1d6 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/IncomingChangesIndicator.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/IncomingChangesIndicator.java @@ -15,13 +15,13 @@ */ package com.intellij.openapi.vcs.changes.committed; +import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.DataContext; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.AbstractVcs; import com.intellij.openapi.vcs.ProjectLevelVcsManager; import com.intellij.openapi.vcs.VcsBundle; @@ -121,8 +121,8 @@ public class IncomingChangesIndicator { private static class IndicatorComponent implements StatusBarWidget, StatusBarWidget.IconPresentation { private StatusBar myStatusBar; - private static final Icon CHANGES_AVAILABLE_ICON = IconLoader.getIcon("/ide/incomingChangesOn.png"); - private static final Icon CHANGES_NOT_AVAILABLE_ICON = IconLoader.getIcon("/ide/incomingChangesOff.png"); + private static final Icon CHANGES_AVAILABLE_ICON = AllIcons.Ide.IncomingChangesOn; + private static final Icon CHANGES_NOT_AVAILABLE_ICON = AllIcons.Ide.IncomingChangesOff; private Icon myCurrentIcon = CHANGES_NOT_AVAILABLE_ICON; private String myToolTipText; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java index 9bf5ca0c38e6..3e3cca72fde0 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/committed/RepositoryChangesBrowser.java @@ -15,12 +15,12 @@ */ package com.intellij.openapi.vcs.changes.committed; +import com.intellij.icons.AllIcons; import com.intellij.ide.actions.EditSourceAction; import com.intellij.ide.impl.TypeSafeDataProviderAdapter; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.VcsDataKeys; import com.intellij.openapi.vcs.changes.Change; import com.intellij.openapi.vcs.changes.ChangeList; @@ -32,7 +32,6 @@ import com.intellij.openapi.vcs.changes.ui.ChangesBrowser; import com.intellij.openapi.vcs.versionBrowser.CommittedChangeList; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.pom.Navigatable; -import com.intellij.ui.table.TableView; import org.jetbrains.annotations.NonNls; import javax.swing.*; @@ -105,7 +104,7 @@ public class RepositoryChangesBrowser extends ChangesBrowser implements DataProv private final Icon myEditSourceIcon; public MyEditSourceAction() { - myEditSourceIcon = IconLoader.getIcon("/actions/editSource.png"); + myEditSourceIcon = AllIcons.Actions.EditSource; } public void update(final AnActionEvent event) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictNotificationPanel.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictNotificationPanel.java index 1c35ba034482..ae5654da7e9a 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictNotificationPanel.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictNotificationPanel.java @@ -15,8 +15,8 @@ */ package com.intellij.openapi.vcs.changes.conflicts; +import com.intellij.icons.AllIcons; import com.intellij.openapi.options.ShowSettingsUtil; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.changes.*; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.EditorNotificationPanel; @@ -74,7 +74,7 @@ public class ChangelistConflictNotificationPanel extends EditorNotificationPanel // setBorder(BorderFactory.createEmptyBorder(0, 4, 0, 0)); - myLinksPanel.add(new InplaceButton("Show options dialog", IconLoader.getIcon("/general/ideOptions.png"), new ActionListener() { + myLinksPanel.add(new InplaceButton("Show options dialog", AllIcons.General.IdeOptions, new ActionListener() { public void actionPerformed(ActionEvent e) { ShowSettingsUtil.getInstance().editConfigurable(myTracker.getProject(), diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java index c40d3c5f41ca..22610770973a 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java @@ -15,10 +15,14 @@ */ package com.intellij.openapi.vcs.changes.patch; +import com.intellij.icons.AllIcons; import com.intellij.ide.util.PropertiesComponent; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.*; -import com.intellij.openapi.diff.impl.patch.*; +import com.intellij.openapi.diff.impl.patch.PatchReader; +import com.intellij.openapi.diff.impl.patch.PatchSyntaxException; +import com.intellij.openapi.diff.impl.patch.PatchVirtualFileReader; +import com.intellij.openapi.diff.impl.patch.TextFilePatch; import com.intellij.openapi.fileChooser.FileChooser; import com.intellij.openapi.fileChooser.FileChooserDescriptor; import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory; @@ -30,7 +34,10 @@ import com.intellij.openapi.ui.TextFieldWithBrowseButton; 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.*; +import com.intellij.openapi.util.Disposer; +import com.intellij.openapi.util.EmptyRunnable; +import com.intellij.openapi.util.Getter; +import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vcs.ObjectsConvertor; import com.intellij.openapi.vcs.VcsBundle; @@ -400,7 +407,7 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper { group.add(new ResetStrip()); group.add(new ZeroStrip()); if (myCanChangePatchFile) { - group.add(new AnAction("Refresh", "Refresh", IconLoader.getIcon("/actions/sync.png")) { + group.add(new AnAction("Refresh", "Refresh", AllIcons.Actions.Sync) { @Override public void actionPerformed(AnActionEvent e) { myLoadQueue.queue(myUpdater); @@ -481,7 +488,7 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper { private final NewBaseSelector myNewBaseSelector; private MapDirectory() { - super("Map base directory", "Map base directory", IconLoader.getIcon("/vcs/mapBase.png")); + super("Map base directory", "Map base directory", AllIcons.Vcs.MapBase); myNewBaseSelector = new NewBaseSelector(); } @@ -819,7 +826,7 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper { private class ZeroStrip extends AnAction { private ZeroStrip() { - super("Remove Directories", "Remove Directories", IconLoader.getIcon("/vcs/stripNull.png")); + super("Remove Directories", "Remove Directories", AllIcons.Vcs.StripNull); } @Override @@ -834,7 +841,7 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper { private class StripDown extends AnAction { private StripDown() { - super("Restore Directory", "Restore Directory", IconLoader.getIcon("/vcs/stripDown.png")); + super("Restore Directory", "Restore Directory", AllIcons.Vcs.StripDown); } @Override @@ -864,7 +871,7 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper { private class StripUp extends AnAction { private StripUp() { - super("Strip Directory", "Strip Directory", IconLoader.getIcon("/vcs/stripUp.png")); + super("Strip Directory", "Strip Directory", AllIcons.Vcs.StripUp); } @Override @@ -894,7 +901,7 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper { private class ResetStrip extends AnAction { private ResetStrip() { - super("Reset Directories", "Reset Directories", IconLoader.getIcon("/vcs/resetStrip.png")); + super("Reset Directories", "Reset Directories", AllIcons.Vcs.ResetStrip); } @Override @@ -910,7 +917,7 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper { private class MyShowDiff extends AnAction { private final MyChangeComparator myMyChangeComparator; private MyShowDiff() { - super("Show Diff", "Show Diff", IconLoader.getIcon("/actions/diff.png")); + super("Show Diff", "Show Diff", AllIcons.Actions.Diff); myMyChangeComparator = new MyChangeComparator(); } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/PatchFileType.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/PatchFileType.java index eeb3edf85b69..e68bc51f0105 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/PatchFileType.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/PatchFileType.java @@ -22,11 +22,11 @@ */ package com.intellij.openapi.vcs.changes.patch; +import com.intellij.icons.AllIcons; import com.intellij.ide.structureView.StructureViewBuilder; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.SyntaxHighlighter; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.VcsBundle; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NonNls; @@ -57,7 +57,7 @@ public class PatchFileType implements FileType { @Nullable public Icon getIcon() { - return IconLoader.getIcon("/nodes/pointcut.png"); + return AllIcons.Nodes.Pointcut; } public boolean isBinary() { @@ -83,4 +83,4 @@ public class PatchFileType implements FileType { public StructureViewBuilder getStructureViewBuilder(@NotNull VirtualFile file, @NotNull Project project) { return null; } -} \ No newline at end of file +} diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java index 2251ef3b626e..4aa730b6880d 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesTreeList.java @@ -15,6 +15,7 @@ */ package com.intellij.openapi.vcs.changes.ui; +import com.intellij.icons.AllIcons; import com.intellij.ide.util.PropertiesComponent; import com.intellij.ide.util.treeView.TreeState; import com.intellij.openapi.actionSystem.*; @@ -23,7 +24,6 @@ import com.intellij.openapi.diff.DiffBundle; import com.intellij.openapi.keymap.KeymapManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.EmptyRunnable; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.registry.Registry; @@ -863,7 +863,7 @@ public abstract class ChangesTreeList extends JPanel { private class SelectAllAction extends AnAction { private SelectAllAction() { - super("Select All", "Select all items", IconLoader.getIcon("/actions/selectall.png")); + super("Select All", "Select all items", AllIcons.Actions.Selectall); } public void actionPerformed(final AnActionEvent e) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentManager.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentManager.java index 030f97347299..d34fb8800a31 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentManager.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/ChangesViewContentManager.java @@ -16,6 +16,7 @@ package com.intellij.openapi.vcs.changes.ui; +import com.intellij.icons.AllIcons; import com.intellij.lifecycle.PeriodicalTasksCloser; import com.intellij.openapi.Disposable; import com.intellij.openapi.application.ApplicationManager; @@ -26,7 +27,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.startup.StartupManager; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Key; import com.intellij.openapi.vcs.AbstractVcs; import com.intellij.openapi.vcs.ProjectLevelVcsManager; @@ -77,7 +77,7 @@ public class ChangesViewContentManager extends AbstractProjectComponent implemen final ToolWindowManager toolWindowManager = ToolWindowManager.getInstance(myProject); if (toolWindowManager != null) { myToolWindow = toolWindowManager.registerToolWindow(TOOLWINDOW_ID, true, ToolWindowAnchor.BOTTOM, myProject, true); - myToolWindow.setIcon(IconLoader.getIcon("/general/toolWindowChanges.png")); + myToolWindow.setIcon(AllIcons.General.ToolWindowChanges); updateToolWindowAvailability(); final ContentManager contentManager = myToolWindow.getContentManager(); myContentManagerListener = new MyContentManagerListener(); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/EditSourceInCommitAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/EditSourceInCommitAction.java index f774fe15d591..7fb88b8b1686 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/EditSourceInCommitAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/EditSourceInCommitAction.java @@ -15,12 +15,12 @@ */ package com.intellij.openapi.vcs.changes.ui; +import com.intellij.icons.AllIcons; import com.intellij.idea.ActionsBundle; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.ui.DialogWrapper; -import com.intellij.openapi.util.IconLoader; import com.intellij.pom.Navigatable; import com.intellij.util.OpenSourceUtil; @@ -32,7 +32,7 @@ public class EditSourceInCommitAction extends AnAction { public EditSourceInCommitAction(final DialogWrapper dialogWrapper) { super(ActionsBundle.actionText("EditSource"), ActionsBundle.actionDescription("EditSource"), - IconLoader.getIcon("/actions/editSource.png")); + AllIcons.Actions.EditSource); myDialogWrapper = dialogWrapper; } diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/MultipleChangeListBrowser.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/MultipleChangeListBrowser.java index a29aeb287d17..2772fc188001 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/MultipleChangeListBrowser.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ui/MultipleChangeListBrowser.java @@ -22,13 +22,13 @@ */ package com.intellij.openapi.vcs.changes.ui; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.AbstractVcs; import com.intellij.openapi.vcs.ProjectLevelVcsManager; import com.intellij.openapi.vcs.VcsBundle; @@ -322,7 +322,7 @@ public class MultipleChangeListBrowser extends ChangesBrowser { } public void addToolbarActions(final DialogWrapper dialogWrapper) { - final Icon icon = IconLoader.getIcon("/vcs/refresh.png"); + final Icon icon = AllIcons.Vcs.Refresh; if (myBrowser.myChangesToDisplay == null) { myBrowser.addToolbarAction(new AnAction("Refresh Changes") { @Override diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java index 86dc3940cd42..05b03dea69b0 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/configurable/VcsManagerConfigurable.java @@ -15,11 +15,11 @@ */ package com.intellij.openapi.vcs.configurable; +import com.intellij.icons.AllIcons; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.AbstractVcs; import com.intellij.openapi.vcs.ProjectLevelVcsManager; import com.intellij.openapi.vcs.VcsBundle; @@ -37,7 +37,7 @@ import java.util.Collection; import java.util.List; public class VcsManagerConfigurable extends SearchableConfigurable.Parent.Abstract { - public static final Icon ICON = IconLoader.getIcon("/general/configurableVcs.png"); + public static final Icon ICON = AllIcons.General.ConfigurableVcs; private final Project myProject; private VcsDirectoryConfigurationPanel myMappings; private VcsGeneralConfigurationPanel myGeneralPanel; diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/RollbackLineStatusRangeAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/RollbackLineStatusRangeAction.java index 07c6190c707d..ed5846d20ade 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/RollbackLineStatusRangeAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/RollbackLineStatusRangeAction.java @@ -12,11 +12,11 @@ */ package com.intellij.openapi.vcs.ex; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.editor.Editor; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.VcsBundle; import com.intellij.openapi.vfs.ReadonlyStatusHandler; @@ -25,7 +25,7 @@ import com.intellij.openapi.vfs.ReadonlyStatusHandler; */ public class RollbackLineStatusRangeAction extends BaseLineStatusRangeAction { public RollbackLineStatusRangeAction(final LineStatusTracker lineStatusTracker, final Range range, final Editor editor) { - super(VcsBundle.message("action.name.rollback"), IconLoader.getIcon("/actions/reset.png"), lineStatusTracker, range); + super(VcsBundle.message("action.name.rollback"), AllIcons.Actions.Reset, lineStatusTracker, range); } public boolean isEnabled() { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/ShowLineStatusRangeDiffAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/ShowLineStatusRangeDiffAction.java index 675d50396695..07e31510c435 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/ShowLineStatusRangeDiffAction.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/ex/ShowLineStatusRangeDiffAction.java @@ -15,12 +15,12 @@ */ package com.intellij.openapi.vcs.ex; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.diff.*; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.TextRange; import com.intellij.openapi.vcs.VcsBundle; import com.intellij.openapi.vfs.VirtualFile; @@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull; */ public class ShowLineStatusRangeDiffAction extends BaseLineStatusRangeAction { public ShowLineStatusRangeDiffAction(final LineStatusTracker lineStatusTracker, final Range range, final Editor editor) { - super(VcsBundle.message("action.name.show.difference"), IconLoader.getIcon("/actions/diff.png"), lineStatusTracker, range); + super(VcsBundle.message("action.name.show.difference"), AllIcons.Actions.Diff, lineStatusTracker, range); } public boolean isEnabled() { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java index af08b7c08ae5..77b81e18bd09 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/history/FileHistoryPanelImpl.java @@ -17,6 +17,7 @@ package com.intellij.openapi.vcs.history; import com.intellij.history.LocalHistory; import com.intellij.history.LocalHistoryAction; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; @@ -56,7 +57,10 @@ import com.intellij.openapi.vfs.ReadonlyStatusHandler; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.*; import com.intellij.ui.content.ContentManager; -import com.intellij.ui.dualView.*; +import com.intellij.ui.dualView.CellWrapper; +import com.intellij.ui.dualView.DualTreeElement; +import com.intellij.ui.dualView.DualView; +import com.intellij.ui.dualView.DualViewColumnInfo; import com.intellij.ui.table.TableView; import com.intellij.util.*; import com.intellij.util.text.DateFormatUtil; @@ -808,7 +812,7 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton { } result.add(new RefreshFileHistoryAction()); if (! myIsStaticAndEmbedded) { - result.add(new ToggleAction("Show Details", "Display details panel", IconLoader.getIcon("/actions/showSource.png")) { + result.add(new ToggleAction("Show Details", "Display details panel", AllIcons.Actions.ShowSource) { @Override public boolean isSelected(AnActionEvent e) { return getConfiguration().SHOW_FILE_HISTORY_DETAILS; @@ -1141,7 +1145,7 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton { private class MyAnnotateAction extends AnAction { public MyAnnotateAction() { super(VcsBundle.message("annotate.action.name"), VcsBundle.message("annotate.action.description"), - IconLoader.getIcon("/actions/annotate.png")); + AllIcons.Actions.Annotate); } private String key(final VirtualFile vf) { @@ -1687,7 +1691,7 @@ public class FileHistoryPanelImpl extends PanelWithActionsAndCloseButton { private class RefreshFileHistoryAction extends AnAction implements DumbAware { public RefreshFileHistoryAction() { - super(VcsBundle.message("action.name.refresh"), VcsBundle.message("action.desctiption.refresh"), IconLoader.getIcon("/actions/sync.png")); + super(VcsBundle.message("action.name.refresh"), VcsBundle.message("action.desctiption.refresh"), AllIcons.Actions.Sync); } public void actionPerformed(AnActionEvent e) { diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/DirectoryTreeNode.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/DirectoryTreeNode.java index 14051fc448fd..03a307dec537 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/DirectoryTreeNode.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/DirectoryTreeNode.java @@ -15,22 +15,22 @@ */ package com.intellij.openapi.vcs.update; +import com.intellij.icons.AllIcons; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.SimpleTextAttributes; import javax.swing.*; +import java.io.File; import java.util.ArrayList; import java.util.Collection; -import java.io.File; /** * author: lesya */ public class DirectoryTreeNode extends FileOrDirectoryTreeNode{ - private static final Icon OPEN_ICON = IconLoader.getIcon("/nodes/folderOpen.png"); - private static final Icon COLLAPSED_ICON = IconLoader.getIcon("/nodes/folder.png"); + private static final Icon OPEN_ICON = AllIcons.Nodes.FolderOpen; + private static final Icon COLLAPSED_ICON = AllIcons.Nodes.Folder; public DirectoryTreeNode(String path, Project project, String parentPath) { super(path, SimpleTextAttributes.ERROR_ATTRIBUTES, project, parentPath); diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateInfoTree.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateInfoTree.java index ce6c95ee1838..c42901db8282 100644 --- a/platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateInfoTree.java +++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/update/UpdateInfoTree.java @@ -16,6 +16,7 @@ package com.intellij.openapi.vcs.update; import com.intellij.history.Label; +import com.intellij.icons.AllIcons; import com.intellij.ide.DefaultTreeExpander; import com.intellij.ide.TreeExpander; import com.intellij.openapi.Disposable; @@ -26,7 +27,6 @@ import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.PanelWithActionsAndCloseButton; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.*; import com.intellij.openapi.vcs.changes.committed.CommittedChangesBrowserUseCase; import com.intellij.openapi.vcs.changes.committed.CommittedChangesCache; @@ -369,7 +369,7 @@ public class UpdateInfoTree extends PanelWithActionsAndCloseButton implements Di private class GroupByChangeListAction extends ToggleAction implements DumbAware { public GroupByChangeListAction() { - super(VcsBundle.message("update.info.group.by.changelist"), null, IconLoader.getIcon("/objectBrowser/browser.png")); + super(VcsBundle.message("update.info.group.by.changelist"), null, AllIcons.ObjectBrowser.Browser); } public boolean isSelected(AnActionEvent e) { diff --git a/platform/xdebugger-api/src/com/intellij/execution/executors/DefaultDebugExecutor.java b/platform/xdebugger-api/src/com/intellij/execution/executors/DefaultDebugExecutor.java index 6ee42a4c2764..bae8f1a422f9 100644 --- a/platform/xdebugger-api/src/com/intellij/execution/executors/DefaultDebugExecutor.java +++ b/platform/xdebugger-api/src/com/intellij/execution/executors/DefaultDebugExecutor.java @@ -17,7 +17,7 @@ package com.intellij.execution.executors; import com.intellij.execution.Executor; import com.intellij.execution.ExecutorRegistry; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.openapi.wm.ToolWindowId; import com.intellij.ui.UIBundle; import com.intellij.xdebugger.XDebuggerBundle; @@ -31,9 +31,9 @@ import javax.swing.*; */ public class DefaultDebugExecutor extends Executor { @NonNls public static final String EXECUTOR_ID = ToolWindowId.DEBUG; - private static final Icon TOOL_WINDOW_ICON = IconLoader.getIcon("/general/toolWindowDebugger.png"); - private static final Icon ICON = IconLoader.getIcon("/actions/startDebugger.png"); - private static final Icon DISABLED_ICON = IconLoader.getIcon("/process/disabledDebug.png"); + private static final Icon TOOL_WINDOW_ICON = AllIcons.General.ToolWindowDebugger; + private static final Icon ICON = AllIcons.Actions.StartDebugger; + private static final Icon DISABLED_ICON = AllIcons.Process.DisabledDebug; private final String myStartActionText = XDebuggerBundle.message("debugger.runner.start.action.text"); private final String myDescription = XDebuggerBundle.message("string.debugger.runner.description"); diff --git a/platform/xdebugger-api/src/com/intellij/xdebugger/ui/DebuggerIcons.java b/platform/xdebugger-api/src/com/intellij/xdebugger/ui/DebuggerIcons.java index 2fbcd0959cc5..6136e1f5082b 100644 --- a/platform/xdebugger-api/src/com/intellij/xdebugger/ui/DebuggerIcons.java +++ b/platform/xdebugger-api/src/com/intellij/xdebugger/ui/DebuggerIcons.java @@ -16,7 +16,7 @@ package com.intellij.xdebugger.ui; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import javax.swing.*; @@ -25,28 +25,28 @@ import javax.swing.*; */ public interface DebuggerIcons { - Icon ENABLED_BREAKPOINT_ICON = IconLoader.getIcon("/debugger/db_set_breakpoint.png"); - Icon MUTED_BREAKPOINT_ICON = IconLoader.getIcon("/debugger/db_muted_breakpoint.png"); - Icon DISABLED_BREAKPOINT_ICON = IconLoader.getIcon("/debugger/db_disabled_breakpoint.png"); - Icon MUTED_DISABLED_BREAKPOINT_ICON = IconLoader.getIcon("/debugger/db_muted_disabled_breakpoint.png"); - Icon INVALID_BREAKPOINT_ICON = IconLoader.getIcon("/debugger/db_invalid_breakpoint.png"); - Icon MUTED_INVALID_BREAKPOINT_ICON = IconLoader.getIcon("/debugger/db_muted_invalid_breakpoint.png"); - Icon VERIFIED_BREAKPOINT_ICON = IconLoader.getIcon("/debugger/db_verified_breakpoint.png"); - Icon MUTED_VERIFIED_BREAKPOINT_ICON = IconLoader.getIcon("/debugger/db_muted_verified_breakpoint.png"); - Icon DISABLED_DEPENDENT_BREAKPOINT_ICON = IconLoader.getIcon("/debugger/db_dep_line_breakpoint.png"); - Icon MUTED_DISABLED_DEPENDENT_BREAKPOINT_ICON = IconLoader.getIcon("/debugger/db_muted_dep_line_breakpoint.png"); - Icon VERIFIED_WARNING_BREAKPOINT_ICON = IconLoader.getIcon("/debugger/db_verified_warning_breakpoint.png"); + Icon ENABLED_BREAKPOINT_ICON = AllIcons.Debugger.Db_set_breakpoint; + Icon MUTED_BREAKPOINT_ICON = AllIcons.Debugger.Db_muted_breakpoint; + Icon DISABLED_BREAKPOINT_ICON = AllIcons.Debugger.Db_disabled_breakpoint; + Icon MUTED_DISABLED_BREAKPOINT_ICON = AllIcons.Debugger.Db_muted_disabled_breakpoint; + Icon INVALID_BREAKPOINT_ICON = AllIcons.Debugger.Db_invalid_breakpoint; + Icon MUTED_INVALID_BREAKPOINT_ICON = AllIcons.Debugger.Db_muted_invalid_breakpoint; + Icon VERIFIED_BREAKPOINT_ICON = AllIcons.Debugger.Db_verified_breakpoint; + Icon MUTED_VERIFIED_BREAKPOINT_ICON = AllIcons.Debugger.Db_muted_verified_breakpoint; + Icon DISABLED_DEPENDENT_BREAKPOINT_ICON = AllIcons.Debugger.Db_dep_line_breakpoint; + Icon MUTED_DISABLED_DEPENDENT_BREAKPOINT_ICON = AllIcons.Debugger.Db_muted_dep_line_breakpoint; + Icon VERIFIED_WARNING_BREAKPOINT_ICON = AllIcons.Debugger.Db_verified_warning_breakpoint; - Icon ENABLED_EXCEPTION_BREAKPOINT_ICON = IconLoader.getIcon("/debugger/db_exception_breakpoint.png"); - Icon DISABLED_EXCEPTION_BREAKPOINT_ICON = IconLoader.getIcon("/debugger/db_disabled_exception_breakpoint.png"); - Icon DISABLED_DEPENDENT_EXCEPTION_BREAKPOINT_ICON = IconLoader.getIcon("/debugger/db_dep_exception_breakpoint.png"); + Icon ENABLED_EXCEPTION_BREAKPOINT_ICON = AllIcons.Debugger.Db_exception_breakpoint; + Icon DISABLED_EXCEPTION_BREAKPOINT_ICON = AllIcons.Debugger.Db_disabled_exception_breakpoint; + Icon DISABLED_DEPENDENT_EXCEPTION_BREAKPOINT_ICON = AllIcons.Debugger.Db_dep_exception_breakpoint; - Icon VALUE_ICON = IconLoader.getIcon("/debugger/value.png"); - Icon ARRAY_VALUE_ICON = IconLoader.getIcon("/debugger/db_array.png"); - Icon PRIMITIVE_VALUE_ICON = IconLoader.getIcon("/debugger/db_primitive.png"); - Icon WATCHED_VALUE_ICON = IconLoader.getIcon("/debugger/watch.png"); + Icon VALUE_ICON = AllIcons.Debugger.Value; + Icon ARRAY_VALUE_ICON = AllIcons.Debugger.Db_array; + Icon PRIMITIVE_VALUE_ICON = AllIcons.Debugger.Db_primitive; + Icon WATCHED_VALUE_ICON = AllIcons.Debugger.Watch; - Icon STACK_FRAME_ICON = IconLoader.getIcon("/debugger/stackFrame.png"); - Icon CURRENT_THREAD_ICON = IconLoader.getIcon("/debugger/threadCurrent.png"); - Icon SUSPENDED_THREAD_ICON = IconLoader.getIcon("/debugger/threadSuspended.png"); + Icon STACK_FRAME_ICON = AllIcons.Debugger.StackFrame; + Icon CURRENT_THREAD_ICON = AllIcons.Debugger.ThreadCurrent; + Icon SUSPENDED_THREAD_ICON = AllIcons.Debugger.ThreadSuspended; } diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/common/AbstractValueHintTreeComponent.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/common/AbstractValueHintTreeComponent.java index 98d1e79a5ffb..ea5d3b3af3e7 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/common/AbstractValueHintTreeComponent.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/evaluate/quick/common/AbstractValueHintTreeComponent.java @@ -16,8 +16,8 @@ package com.intellij.xdebugger.impl.evaluate.quick.common; import com.intellij.codeInsight.CodeInsightBundle; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.treeStructure.Tree; import com.intellij.xdebugger.XDebuggerBundle; @@ -32,9 +32,9 @@ import java.util.ArrayList; * @author nik */ public abstract class AbstractValueHintTreeComponent { - private static final Icon ICON_FWD = IconLoader.getIcon("/actions/forward.png"); - private static final Icon ICON_BACK = IconLoader.getIcon("/actions/back.png"); - private static final Icon ICON_UNMARK_WEBROOT = IconLoader.getIcon("/modules/unmarkWebroot.png"); + private static final Icon ICON_FWD = AllIcons.Actions.Forward; + private static final Icon ICON_BACK = AllIcons.Actions.Back; + private static final Icon ICON_UNMARK_WEBROOT = AllIcons.Modules.UnmarkWebroot; private static final int HISTORY_SIZE = 11; private final ArrayList myHistory = new ArrayList(); private int myCurrentIndex = -1; diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/DebuggerConfigurable.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/DebuggerConfigurable.java index 8076728d8172..bb36b136739e 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/DebuggerConfigurable.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/settings/DebuggerConfigurable.java @@ -15,10 +15,10 @@ */ package com.intellij.xdebugger.impl.settings; +import com.intellij.icons.AllIcons; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; -import com.intellij.openapi.util.IconLoader; import com.intellij.xdebugger.XDebuggerBundle; import com.intellij.xdebugger.impl.DebuggerSupport; import org.jetbrains.annotations.NonNls; @@ -41,7 +41,7 @@ public class DebuggerConfigurable implements SearchableConfigurable.Parent { } public Icon getIcon() { - return IconLoader.getIcon("/general/configurableDebugger.png"); + return AllIcons.General.ConfigurableDebugger; } public String getDisplayName() { @@ -102,4 +102,4 @@ public class DebuggerConfigurable implements SearchableConfigurable.Parent { public String getId() { return "project.propDebugger"; } -} \ No newline at end of file +} diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerColorsPage.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerColorsPage.java index eb2e4228fd7e..617bcedf7a6a 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerColorsPage.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerColorsPage.java @@ -15,6 +15,7 @@ */ package com.intellij.xdebugger.impl.ui; +import com.intellij.icons.AllIcons; import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.openapi.fileTypes.PlainSyntaxHighlighter; import com.intellij.openapi.fileTypes.SyntaxHighlighter; @@ -22,7 +23,6 @@ import com.intellij.openapi.options.OptionsBundle; import com.intellij.openapi.options.colors.AttributesDescriptor; import com.intellij.openapi.options.colors.ColorDescriptor; import com.intellij.openapi.options.colors.ColorSettingsPage; -import com.intellij.openapi.util.IconLoader; import com.intellij.psi.codeStyle.DisplayPriority; import com.intellij.psi.codeStyle.DisplayPrioritySortable; import com.intellij.xdebugger.XDebuggerBundle; @@ -45,7 +45,7 @@ public class DebuggerColorsPage implements ColorSettingsPage, DisplayPrioritySor @Nullable public Icon getIcon() { - return IconLoader.getIcon("/actions/startDebugger.png"); + return AllIcons.Actions.StartDebugger; } @NotNull diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerSessionTabBase.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerSessionTabBase.java index 2c2ac49701d7..7bc4b122db63 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerSessionTabBase.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/DebuggerSessionTabBase.java @@ -26,6 +26,7 @@ import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.ui.*; import com.intellij.execution.ui.layout.LayoutAttractionPolicy; import com.intellij.execution.ui.layout.LayoutViewOptions; +import com.intellij.icons.AllIcons; import com.intellij.ide.impl.ProjectUtil; import com.intellij.openapi.Disposable; import com.intellij.openapi.application.ApplicationManager; @@ -33,7 +34,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.ComponentWithActions; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Ref; import com.intellij.openapi.util.registry.Registry; import com.intellij.ui.AppIcon; @@ -72,7 +72,7 @@ public abstract class DebuggerSessionTabBase implements DebuggerLogConsoleManage protected ExecutionConsole myConsole; protected RunContentDescriptor myRunContentDescriptor; - private final Icon DEFAULT_TAB_COMPONENT_ICON = IconLoader.getIcon("/fileTypes/text.png"); + private final Icon DEFAULT_TAB_COMPONENT_ICON = AllIcons.FileTypes.Text; public DebuggerSessionTabBase(Project project, @NotNull String runnerId, @NotNull final String sessionName) { myProject = project; diff --git a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerUIConstants.java b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerUIConstants.java index d467eac7bea4..72b893461dea 100644 --- a/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerUIConstants.java +++ b/platform/xdebugger-impl/src/com/intellij/xdebugger/impl/ui/XDebuggerUIConstants.java @@ -15,7 +15,7 @@ */ package com.intellij.xdebugger.impl.ui; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.ui.SimpleTextAttributes; import com.intellij.xdebugger.XDebuggerBundle; import org.jetbrains.annotations.NonNls; @@ -31,8 +31,8 @@ public class XDebuggerUIConstants { public static final String EVALUATING_EXPRESSION_MESSAGE = XDebuggerBundle.message("xdebugger.evaluating.expression.node.message"); public static final String MODIFYING_VALUE_MESSAGE = XDebuggerBundle.message("xdebugger.modifiyng.value.node.message"); - public static final Icon ERROR_MESSAGE_ICON = IconLoader.getIcon("/debugger/db_error.png"); - public static final Icon INFORMATION_MESSAGE_ICON = IconLoader.getIcon("/compiler/information.png"); + public static final Icon ERROR_MESSAGE_ICON = AllIcons.Debugger.Db_error; + public static final Icon INFORMATION_MESSAGE_ICON = AllIcons.Compiler.Information; public static final SimpleTextAttributes COLLECTING_DATA_HIGHLIGHT_ATTRIBUTES = new SimpleTextAttributes(Font.PLAIN, Color.lightGray); public static final SimpleTextAttributes EVALUATING_EXPRESSION_HIGHLIGHT_ATTRIBUTES = new SimpleTextAttributes(Font.PLAIN, Color.lightGray); @@ -43,12 +43,12 @@ public class XDebuggerUIConstants { public static final SimpleTextAttributes ERROR_MESSAGE_ATTRIBUTES = new SimpleTextAttributes(Font.PLAIN, Color.red); @NonNls public static final String EQ_TEXT = " = "; - public static final Icon DEBUG_AGAIN_ICON = IconLoader.getIcon("/actions/startDebugger.png"); - public static final Icon FRAMES_TAB_ICON = IconLoader.getIcon("/debugger/frame.png"); - public static final Icon THREADS_TAB_ICON = IconLoader.getIcon("/debugger/threads.png"); - public static final Icon VARIABLES_TAB_ICON = IconLoader.getIcon("/debugger/value.png"); - public static final Icon WATCHES_TAB_ICON = IconLoader.getIcon("/debugger/watches.png"); - public static final Icon CONSOLE_TAB_ICON = IconLoader.getIcon("/debugger/console.png"); + public static final Icon DEBUG_AGAIN_ICON = AllIcons.Actions.StartDebugger; + public static final Icon FRAMES_TAB_ICON = AllIcons.Debugger.Frame; + public static final Icon THREADS_TAB_ICON = AllIcons.Debugger.Threads; + public static final Icon VARIABLES_TAB_ICON = AllIcons.Debugger.Value; + public static final Icon WATCHES_TAB_ICON = AllIcons.Debugger.Watches; + public static final Icon CONSOLE_TAB_ICON = AllIcons.Debugger.Console; public static final SimpleTextAttributes TYPE_ATTRIBUTES = SimpleTextAttributes.GRAY_ATTRIBUTES; public static final String LAYOUT_VIEW_BREAKPOINT_CONDITION = "breakpoint"; diff --git a/plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataHighlightingPass.java b/plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataHighlightingPass.java index 3ebb823b3841..04e4a6978641 100644 --- a/plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataHighlightingPass.java +++ b/plugins/IdeaTestAssistant/src/com/intellij/testAssistant/TestDataHighlightingPass.java @@ -16,12 +16,12 @@ package com.intellij.testAssistant; import com.intellij.codeHighlighting.TextEditorHighlightingPass; +import com.intellij.icons.AllIcons; import com.intellij.openapi.editor.Document; import com.intellij.openapi.editor.impl.DocumentMarkupModel; import com.intellij.openapi.editor.markup.*; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Key; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -36,7 +36,7 @@ public class TestDataHighlightingPass extends TextEditorHighlightingPass { private static final Key KEY = Key.create("TestDataHighlighterKey"); private static final Object VALUE = new Object(); - private static final Icon ICON = IconLoader.getIcon("/runConfigurations/junit.png"); + private static final Icon ICON = AllIcons.RunConfigurations.Junit; private static final GutterIconRenderer ICON_RENDERER = new MyGutterIconRenderer(); private static final TextAttributes CARET_ATTRIBUTES = new TextAttributes(Color.BLUE, null, null, null, Font.BOLD); diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/ResetTelemetryAction.java b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/ResetTelemetryAction.java index fe186631d8f3..0aaaf05bac75 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/ResetTelemetryAction.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/ResetTelemetryAction.java @@ -16,9 +16,9 @@ package com.siyeh.ig.telemetry; import com.intellij.CommonBundle; +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.siyeh.InspectionGadgetsBundle; class ResetTelemetryAction extends AnAction { @@ -31,7 +31,7 @@ class ResetTelemetryAction extends AnAction { super(CommonBundle.message("button.reset"), InspectionGadgetsBundle.message( "action.reset.telemetry.description"), - IconLoader.getIcon("/actions/reset.png")); + AllIcons.Actions.Reset); this.telemetry = telemetry; this.display = display; } @@ -41,4 +41,4 @@ class ResetTelemetryAction extends AnAction { telemetry.reset(); display.update(telemetry.buildList()); } -} \ No newline at end of file +} diff --git a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/UpdateTelemetryViewAction.java b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/UpdateTelemetryViewAction.java index f6bcb040c916..6444573caa21 100644 --- a/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/UpdateTelemetryViewAction.java +++ b/plugins/InspectionGadgets/src/com/siyeh/ig/telemetry/UpdateTelemetryViewAction.java @@ -16,9 +16,9 @@ package com.siyeh.ig.telemetry; import com.intellij.CommonBundle; +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.siyeh.InspectionGadgetsBundle; class UpdateTelemetryViewAction extends AnAction { @@ -31,7 +31,7 @@ class UpdateTelemetryViewAction extends AnAction { super(CommonBundle.message("action.refresh"), InspectionGadgetsBundle.message( "action.telemetry.refresh.description"), - IconLoader.getIcon("/actions/sync.png")); + AllIcons.Actions.Sync); this.telemetry = telemetry; this.telemetryDisplay = telemetryDisplay; } @@ -40,4 +40,4 @@ class UpdateTelemetryViewAction extends AnAction { public void actionPerformed(AnActionEvent event) { telemetryDisplay.update(telemetry.buildList()); } -} \ No newline at end of file +} diff --git a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java index 7becdee9f53a..71072b230213 100644 --- a/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java +++ b/plugins/IntelliLang/src/org/intellij/plugins/intelliLang/InjectionsSettingsUI.java @@ -16,6 +16,7 @@ package org.intellij.plugins.intelliLang; +import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.ide.ui.SplitterProportionsDataImpl; import com.intellij.lang.Language; @@ -286,14 +287,14 @@ public class InjectionsSettingsUI implements SearchableConfigurable.Parent, NonD group.add(shareAction); } group.addSeparator(); - group.add(new AnAction("Import", "Import", IconLoader.getIcon("/actions/install.png")) { + group.add(new AnAction("Import", "Import", AllIcons.Actions.Install) { @Override public void actionPerformed(final AnActionEvent e) { doImportAction(e.getDataContext()); updateCountLabel(); } }); - group.add(new AnAction("Export", "Export", IconLoader.getIcon("/actions/export.png")) { + group.add(new AnAction("Export", "Export", AllIcons.Actions.Export) { @Override public void actionPerformed(final AnActionEvent e) { final List injections = getInjectionList(getSelectedInjections()); diff --git a/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.java b/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.java index 47b7efd4bb78..658dee0c86ef 100644 --- a/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.java +++ b/plugins/android/src/org/jetbrains/android/run/AndroidRunConfigurationEditor.java @@ -16,6 +16,7 @@ package org.jetbrains.android.run; import com.intellij.execution.ui.ConfigurationModuleSelector; +import com.intellij.icons.AllIcons; import com.intellij.ide.ui.ListCellRendererWrapper; import com.intellij.openapi.application.ModalityState; import com.intellij.openapi.module.Module; @@ -24,7 +25,6 @@ import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.LabeledComponent; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.PanelWithAnchor; import com.intellij.ui.RawCommandLineEditor; @@ -41,7 +41,7 @@ import java.awt.event.ActionListener; * @author yole */ public class AndroidRunConfigurationEditor extends SettingsEditor implements PanelWithAnchor { - private static final Icon INFO_MESSAGE_ICON = IconLoader.getIcon("/compiler/warning.png"); + private static final Icon INFO_MESSAGE_ICON = AllIcons.Compiler.Warning; private JPanel myPanel; private JComboBox myModulesComboBox; diff --git a/plugins/ant/src/com/intellij/lang/ant/AntFileType.java b/plugins/ant/src/com/intellij/lang/ant/AntFileType.java index ef66afe420dc..bab35e686caa 100644 --- a/plugins/ant/src/com/intellij/lang/ant/AntFileType.java +++ b/plugins/ant/src/com/intellij/lang/ant/AntFileType.java @@ -15,9 +15,9 @@ */ package com.intellij.lang.ant; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.openapi.fileTypes.LanguageFileType; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -28,7 +28,7 @@ public class AntFileType extends LanguageFileType { @NonNls public static final String DEFAULT_EXTENSION = "ant"; @NonNls public static final String DOT_DEFAULT_EXTENSION = ".ant"; - private static final Icon ICON = IconLoader.getIcon("/fileTypes/xml.png"); + private static final Icon ICON = AllIcons.FileTypes.Xml; public AntFileType() { super(new AntLanguage()); diff --git a/plugins/ant/src/com/intellij/lang/ant/AntIcons.java b/plugins/ant/src/com/intellij/lang/ant/AntIcons.java index 470c8339e982..d753d2efe18b 100644 --- a/plugins/ant/src/com/intellij/lang/ant/AntIcons.java +++ b/plugins/ant/src/com/intellij/lang/ant/AntIcons.java @@ -15,7 +15,7 @@ */ package com.intellij.lang.ant; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import javax.swing.*; @@ -23,6 +23,6 @@ import javax.swing.*; * @author nik */ public interface AntIcons { - Icon ANT_TARGET_ICON = IconLoader.getIcon("/ant/target.png"); - Icon ANT_META_TARGET_ICON = IconLoader.getIcon("/ant/metaTarget.png"); + Icon ANT_TARGET_ICON = AllIcons.Ant.Target; + Icon ANT_META_TARGET_ICON = AllIcons.Ant.MetaTarget; } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/AntBuildFilePropertiesAction.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/AntBuildFilePropertiesAction.java index d839f2756ec3..5df01e8ec22b 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/AntBuildFilePropertiesAction.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/AntBuildFilePropertiesAction.java @@ -15,13 +15,13 @@ */ package com.intellij.lang.ant.config.actions; +import com.intellij.icons.AllIcons; import com.intellij.lang.ant.AntBundle; import com.intellij.lang.ant.config.explorer.AntExplorer; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonShortcuts; import com.intellij.openapi.actionSystem.Presentation; -import com.intellij.openapi.util.IconLoader; public final class AntBuildFilePropertiesAction extends AnAction { private final AntExplorer myAntExplorer; @@ -29,7 +29,7 @@ public final class AntBuildFilePropertiesAction extends AnAction { public AntBuildFilePropertiesAction(AntExplorer antExplorer) { super(AntBundle.message("build.file.properties.action.name"), AntBundle.message("build.file.properties.action.description"), - IconLoader.getIcon("/ant/properties.png")); + AllIcons.Ant.Properties); myAntExplorer = antExplorer; registerCustomShortcutSet(CommonShortcuts.ALT_ENTER, myAntExplorer); } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/ChangeViewAction.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/ChangeViewAction.java index 61271b20209c..210bbe1b13dc 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/ChangeViewAction.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/ChangeViewAction.java @@ -15,17 +15,17 @@ */ package com.intellij.lang.ant.config.actions; +import com.intellij.icons.AllIcons; import com.intellij.lang.ant.AntBundle; import com.intellij.lang.ant.config.execution.AntBuildMessageView; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; -import com.intellij.openapi.util.IconLoader; public final class ChangeViewAction extends AnAction { private final AntBuildMessageView myAntBuildMessageView; public ChangeViewAction(AntBuildMessageView antBuildMessageView) { - super(AntBundle.message("ant.view.toggle.tree.text.action.name"),null, IconLoader.getIcon("/ant/changeView.png")); + super(AntBundle.message("ant.view.toggle.tree.text.action.name"),null, AllIcons.Ant.ChangeView); myAntBuildMessageView = antBuildMessageView; } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/PauseOutputAction.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/PauseOutputAction.java index c10b602e2075..e3eb3d9ed517 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/PauseOutputAction.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/PauseOutputAction.java @@ -15,18 +15,18 @@ */ package com.intellij.lang.ant.config.actions; +import com.intellij.icons.AllIcons; import com.intellij.lang.ant.AntBundle; import com.intellij.lang.ant.config.execution.AntBuildMessageView; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.actionSystem.ToggleAction; -import com.intellij.openapi.util.IconLoader; public final class PauseOutputAction extends ToggleAction { private final AntBuildMessageView myAntBuildMessageView; public PauseOutputAction(AntBuildMessageView antBuildMessageView) { - super(AntBundle.message("ant.view.pause.output.action.name"),null, IconLoader.getIcon("/actions/pause.png")); + super(AntBundle.message("ant.view.pause.output.action.name"),null, AllIcons.Actions.Pause); myAntBuildMessageView = antBuildMessageView; } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/RunAction.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/RunAction.java index 5523153c4745..66292b48c683 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/RunAction.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/RunAction.java @@ -15,6 +15,7 @@ */ package com.intellij.lang.ant.config.actions; +import com.intellij.icons.AllIcons; import com.intellij.lang.ant.AntBundle; import com.intellij.lang.ant.config.AntBuildListener; import com.intellij.lang.ant.config.execution.AntBuildMessageView; @@ -23,14 +24,13 @@ import com.intellij.lang.ant.config.impl.BuildFileProperty; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.Presentation; -import com.intellij.openapi.util.IconLoader; import javax.swing.*; import java.util.Collections; public final class RunAction extends AnAction { private final AntBuildMessageView myAntBuildMessageView; - public static final Icon RERUN_ICON = IconLoader.getIcon("/actions/refreshUsages.png"); + public static final Icon RERUN_ICON = AllIcons.Actions.RefreshUsages; public RunAction(AntBuildMessageView antBuildMessageView) { super(AntBundle.message("rerun.ant.action.name"), null, RERUN_ICON); diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/StopAction.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/StopAction.java index b49b5fdb01c5..858184b61b74 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/StopAction.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/StopAction.java @@ -15,18 +15,18 @@ */ package com.intellij.lang.ant.config.actions; +import com.intellij.icons.AllIcons; import com.intellij.lang.ant.AntBundle; import com.intellij.lang.ant.config.execution.AntBuildMessageView; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.Presentation; -import com.intellij.openapi.util.IconLoader; public final class StopAction extends AnAction { private final AntBuildMessageView myAntBuildMessageView; public StopAction(AntBuildMessageView antBuildMessageView) { - super(AntBundle.message("stop.ant.action.name"),null, IconLoader.getIcon("/actions/suspend.png")); + super(AntBundle.message("stop.ant.action.name"),null, AllIcons.Actions.Suspend); myAntBuildMessageView = antBuildMessageView; } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/actions/VerboseAction.java b/plugins/ant/src/com/intellij/lang/ant/config/actions/VerboseAction.java index d40e0b09459a..8c2ac15c89b7 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/actions/VerboseAction.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/actions/VerboseAction.java @@ -15,18 +15,18 @@ */ package com.intellij.lang.ant.config.actions; +import com.intellij.icons.AllIcons; import com.intellij.lang.ant.AntBundle; import com.intellij.lang.ant.config.execution.AntBuildMessageView; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.ToggleAction; -import com.intellij.openapi.util.IconLoader; public final class VerboseAction extends ToggleAction { private final AntBuildMessageView myAntBuildMessageView; public VerboseAction(AntBuildMessageView antBuildMessageView) { super(AntBundle.message("ant.verbose.show.all.messages.action.name"), - AntBundle.message("ant.verbose.show.all.messages.action.description"), IconLoader.getIcon("/ant/verbose.png")); + AntBundle.message("ant.verbose.show.all.messages.action.description"), AllIcons.Ant.Verbose); myAntBuildMessageView = antBuildMessageView; } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/execution/MessageTreeRenderer.java b/plugins/ant/src/com/intellij/lang/ant/config/execution/MessageTreeRenderer.java index 2a626e69a537..36cef7a701ac 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/execution/MessageTreeRenderer.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/execution/MessageTreeRenderer.java @@ -15,8 +15,8 @@ */ package com.intellij.lang.ant.config.execution; +import com.intellij.icons.AllIcons; import com.intellij.lang.ant.AntIcons; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.IdeBorderFactory; import com.intellij.ui.MultilineTreeCellRenderer; import com.intellij.ui.SideBorder; @@ -26,10 +26,10 @@ import javax.swing.*; final class MessageTreeRenderer extends MultilineTreeCellRenderer { - private static final Icon myBuildIcon = IconLoader.getIcon("/ant/build.png"); - private static final Icon myMessageIcon = IconLoader.getIcon("/ant/message.png"); - private static final Icon myWarningIcon = IconLoader.getIcon("/compiler/warning.png"); - private static final Icon myErrorIcon = IconLoader.getIcon("/compiler/error.png"); + private static final Icon myBuildIcon = AllIcons.Ant.Build; + private static final Icon myMessageIcon = AllIcons.Ant.Message; + private static final Icon myWarningIcon = AllIcons.Compiler.Warning; + private static final Icon myErrorIcon = AllIcons.Compiler.Error; private MessageTreeRenderer() { } diff --git a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntBuildFileNodeDescriptor.java b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntBuildFileNodeDescriptor.java index 5e2aaf36eb60..bb8efcf38011 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntBuildFileNodeDescriptor.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntBuildFileNodeDescriptor.java @@ -15,6 +15,7 @@ */ package com.intellij.lang.ant.config.explorer; +import com.intellij.icons.AllIcons; import com.intellij.ide.util.treeView.NodeDescriptor; import com.intellij.lang.ant.config.AntBuildFile; import com.intellij.lang.ant.config.AntBuildFileBase; @@ -22,7 +23,6 @@ import com.intellij.lang.ant.config.AntBuildModelBase; 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.ui.HtmlListCellRenderer; import com.intellij.ui.SimpleColoredComponent; import com.intellij.ui.SimpleTextAttributes; @@ -31,7 +31,7 @@ import org.jetbrains.annotations.NotNull; import javax.swing.*; final class AntBuildFileNodeDescriptor extends AntNodeDescriptor { - private static final Icon ICON = IconLoader.getIcon("/ant/build.png"); + private static final Icon ICON = AllIcons.Ant.Build; private final AntBuildFileBase myBuildFile; private CompositeAppearance myAppearance; diff --git a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java index fa5bc9f35e90..e495a7564bb1 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntExplorer.java @@ -17,6 +17,7 @@ package com.intellij.lang.ant.config.explorer; import com.intellij.execution.RunManagerAdapter; import com.intellij.execution.RunManagerEx; +import com.intellij.icons.AllIcons; import com.intellij.ide.CommonActionsManager; import com.intellij.ide.DataManager; import com.intellij.ide.TreeExpander; @@ -43,7 +44,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.SimpleToolWindowPanel; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.ui.*; @@ -98,10 +98,10 @@ public class AntExplorer extends SimpleToolWindowPanel implements DataProvider, return canExpand(); } }; - private static final Icon ICON_RUN = IconLoader.getIcon("/actions/execute.png"); + private static final Icon ICON_RUN = AllIcons.Actions.Execute; private static final Icon ICON_REMOVE = IconUtil.getRemoveIcon(); private static final Icon ICON_ADD = IconUtil.getAddIcon(); - private static final Icon ICON_FILTER = IconLoader.getIcon("/ant/filter.png"); + private static final Icon ICON_FILTER = AllIcons.Ant.Filter; public AntExplorer(final Project project) { super(true, true); diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AllJarsUnderDirEntry.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AllJarsUnderDirEntry.java index 6ab06e4b18fb..5a2f87fab539 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AllJarsUnderDirEntry.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AllJarsUnderDirEntry.java @@ -15,11 +15,11 @@ */ package com.intellij.lang.ant.config.impl; +import com.intellij.icons.AllIcons; import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory; import com.intellij.openapi.roots.ui.CellAppearanceEx; import com.intellij.openapi.roots.ui.FileAppearanceService; import com.intellij.openapi.roots.ui.ModifiableCellAppearanceEx; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.WriteExternalException; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.vfs.VirtualFile; @@ -35,7 +35,7 @@ import java.io.FileFilter; import java.util.List; public class AllJarsUnderDirEntry implements AntClasspathEntry { - private static final Icon ALL_JARS_IN_DIR_ICON = IconLoader.getIcon("/ant/allJarsInDir.png"); + private static final Icon ALL_JARS_IN_DIR_ICON = AllIcons.Ant.AllJarsInDir; @NonNls private static final String JAR_SUFFIX = ".jar"; private static final Function CREATE_FROM_VIRTUAL_FILE = new Function() { diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntKeymapExtension.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntKeymapExtension.java index f0759d77dd3d..326c5acb31f3 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntKeymapExtension.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntKeymapExtension.java @@ -15,6 +15,7 @@ */ package com.intellij.lang.ant.config.impl; +import com.intellij.icons.AllIcons; import com.intellij.lang.ant.config.AntBuildFile; import com.intellij.lang.ant.config.AntConfiguration; import com.intellij.openapi.actionSystem.AnAction; @@ -27,7 +28,6 @@ import com.intellij.openapi.keymap.KeymapGroup; import com.intellij.openapi.keymap.KeymapGroupFactory; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Condition; -import com.intellij.openapi.util.IconLoader; import com.intellij.util.containers.HashMap; import javax.swing.*; @@ -40,8 +40,8 @@ import java.util.Map; class AntKeymapExtension implements KeymapExtension { private static final Logger LOG = Logger.getInstance("#com.intellij.lang.ant.config.impl.AntProjectKeymap"); - private static final Icon ANT_ICON = IconLoader.getIcon("/nodes/keymapAnt.png"); - private static final Icon ANT_OPEN_ICON = IconLoader.getIcon("/nodes/keymapAntOpen.png"); + private static final Icon ANT_ICON = AllIcons.Nodes.KeymapAnt; + private static final Icon ANT_OPEN_ICON = AllIcons.Nodes.KeymapAntOpen; public KeymapGroup createGroup(final Condition filtered, Project project) { final Map buildFileToGroup = new HashMap(); diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntUIUtil.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntUIUtil.java index 018acc3c4ded..969b16758de3 100644 --- a/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntUIUtil.java +++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/configuration/AntUIUtil.java @@ -15,6 +15,7 @@ */ package com.intellij.lang.ant.config.impl.configuration; +import com.intellij.icons.AllIcons; import com.intellij.ide.macro.MacrosDialog; import com.intellij.lang.ant.AntBundle; import com.intellij.lang.ant.config.impl.AntClasspathEntry; @@ -26,7 +27,6 @@ import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.ui.OrderEntryAppearanceService; import com.intellij.openapi.ui.FixedSizeButton; import com.intellij.openapi.ui.TextFieldWithBrowseButton; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.ColoredListCellRenderer; import com.intellij.ui.SimpleColoredComponent; import com.intellij.ui.SimpleTextAttributes; @@ -43,8 +43,8 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; public class AntUIUtil { - private static final Icon ANT_INSTALLATION_ICON = IconLoader.getIcon("/ant/antInstallation.png"); - private static final Icon GENERIC_JDK_ICON = IconLoader.getIcon("/general/jdk.png"); + private static final Icon ANT_INSTALLATION_ICON = AllIcons.Ant.AntInstallation; + private static final Icon GENERIC_JDK_ICON = AllIcons.General.Jdk; private static final Logger LOG = Logger.getInstance("#com.intellij.ant.impl.configuration.AntUIUtil"); diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsListCellRenderer.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsListCellRenderer.java index 72588714c300..fbf80a581f47 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsListCellRenderer.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/config/ui/CvsListCellRenderer.java @@ -16,7 +16,7 @@ package com.intellij.cvsSupport2.config.ui; import com.intellij.cvsSupport2.ui.AbstractListCellRenderer; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import javax.swing.*; @@ -25,7 +25,7 @@ import javax.swing.*; */ public class CvsListCellRenderer extends AbstractListCellRenderer { - private static final Icon ICON = IconLoader.getIcon("/actions/cvs.png"); + private static final Icon ICON = AllIcons.Actions.Cvs; protected Icon getPresentableIcon(Object value) { if (value == null) return null; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsElementFactory.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsElementFactory.java index f628f66a3d5d..8410c7d0f311 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsElementFactory.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/CvsElementFactory.java @@ -16,8 +16,8 @@ package com.intellij.cvsSupport2.cvsBrowser; import com.intellij.cvsSupport2.connections.CvsEnvironment; +import com.intellij.icons.AllIcons; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.util.PlatformIcons; import javax.swing.*; @@ -25,8 +25,8 @@ import javax.swing.*; public abstract class CvsElementFactory { private final static Icon TREE_OPEN = PlatformIcons.DIRECTORY_OPEN_ICON; private final static Icon TREE_CLOSE = PlatformIcons.DIRECTORY_CLOSED_ICON; - private final static Icon MODULE_OPEN = IconLoader.getIcon("/nodes/ModuleOpen.png"); - private final static Icon MODULE_CLOSE = IconLoader.getIcon("/nodes/ModuleClosed.png"); + private final static Icon MODULE_OPEN = AllIcons.Nodes.ModuleOpen; + private final static Icon MODULE_CLOSE = AllIcons.Nodes.ModuleClosed; public abstract CvsElement createElement(String name, CvsEnvironment env, Project project); diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/LoadingNode.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/LoadingNode.java index 1f827f85134f..a2d5404898f5 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/LoadingNode.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/LoadingNode.java @@ -17,7 +17,7 @@ package com.intellij.cvsSupport2.cvsBrowser; import com.intellij.CommonBundle; import com.intellij.cvsSupport2.ui.CvsTabbedWindow; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.util.Alarm; import javax.swing.*; @@ -36,18 +36,18 @@ class LoadingNode extends DefaultMutableTreeNode { private int myPeriod = 0; private final Icon[] myIcons = new Icon[] { - IconLoader.getIcon("/process/step_1.png"), - IconLoader.getIcon("/process/step_2.png"), - IconLoader.getIcon("/process/step_3.png"), - IconLoader.getIcon("/process/step_4.png"), - IconLoader.getIcon("/process/step_5.png"), - IconLoader.getIcon("/process/step_6.png"), - IconLoader.getIcon("/process/step_7.png"), - IconLoader.getIcon("/process/step_8.png"), - IconLoader.getIcon("/process/step_9.png"), - IconLoader.getIcon("/process/step_10.png"), - IconLoader.getIcon("/process/step_11.png"), - IconLoader.getIcon("/process/step_12.png") + AllIcons.Process.Step_1, + AllIcons.Process.Step_2, + AllIcons.Process.Step_3, + AllIcons.Process.Step_4, + AllIcons.Process.Step_5, + AllIcons.Process.Step_6, + AllIcons.Process.Step_7, + AllIcons.Process.Step_8, + AllIcons.Process.Step_9, + AllIcons.Process.Step_10, + AllIcons.Process.Step_11, + AllIcons.Process.Step_12 }; private volatile boolean stopped = false; private Runnable myPeriodRequest; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/ui/BrowserPanel.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/ui/BrowserPanel.java index 777f20da957b..4fb2207fbc24 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/ui/BrowserPanel.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsBrowser/ui/BrowserPanel.java @@ -29,11 +29,11 @@ import com.intellij.cvsSupport2.cvsBrowser.CvsTree; import com.intellij.cvsSupport2.cvshandlers.CommandCvsHandler; import com.intellij.cvsSupport2.cvshandlers.CvsHandler; import com.intellij.cvsSupport2.ui.CvsTabbedWindow; +import com.intellij.icons.AllIcons; import com.intellij.idea.ActionsBundle; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.fileEditor.OpenFileDescriptor; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.AbstractVcsHelper; import com.intellij.openapi.vcs.VcsBundle; import com.intellij.openapi.vcs.VcsConfiguration; @@ -98,7 +98,7 @@ public class BrowserPanel extends JPanel implements DataProvider, CvsTabbedWindo public EditSourceAction() { super(ActionsBundle.actionText("EditSource"), ActionsBundle.actionDescription("EditSource"), - IconLoader.getIcon("/actions/editSource.png")); + AllIcons.Actions.EditSource); } public void actionPerformed(AnActionEvent e) { @@ -116,7 +116,7 @@ public class BrowserPanel extends JPanel implements DataProvider, CvsTabbedWindo private class MyCheckoutAction extends AnAction { public MyCheckoutAction() { - super(CvsBundle.message("operation.name.check.out"), null, IconLoader.getIcon("/actions/checkOut.png")); + super(CvsBundle.message("operation.name.check.out"), null, AllIcons.Actions.CheckOut); } public void update(AnActionEvent e) { @@ -155,7 +155,7 @@ public class BrowserPanel extends JPanel implements DataProvider, CvsTabbedWindo private class MyAnnotateAction extends AnAction { public MyAnnotateAction() { - super(CvsBundle.message("operation.name.annotate"), null, IconLoader.getIcon("/actions/annotate.png")); + super(CvsBundle.message("operation.name.annotate"), null, AllIcons.Actions.Annotate); } public void update(AnActionEvent e) { @@ -186,7 +186,7 @@ public class BrowserPanel extends JPanel implements DataProvider, CvsTabbedWindo private class BrowseChangesAction extends AnAction { public BrowseChangesAction() { - super(VcsBundle.message("browse.changes.action"), "", IconLoader.getIcon("/actions/showChangesOnly.png")); + super(VcsBundle.message("browse.changes.action"), "", AllIcons.Actions.ShowChangesOnly); } public void actionPerformed(AnActionEvent e) { diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/AddedFileInfo.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/AddedFileInfo.java index 71d6c0b3b96b..7e1484e92305 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/AddedFileInfo.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/AddedFileInfo.java @@ -20,8 +20,8 @@ import com.intellij.cvsSupport2.application.CvsStorageSupportingDeletionComponen import com.intellij.cvsSupport2.config.CvsConfiguration; import com.intellij.cvsSupport2.keywordSubstitution.KeywordSubstitutionListWithSelection; import com.intellij.cvsSupport2.keywordSubstitution.KeywordSubstitutionWrapper; +import com.intellij.icons.AllIcons; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.impl.VcsPathPresenter; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.util.IconUtil; @@ -46,8 +46,8 @@ public class AddedFileInfo extends DefaultMutableTreeNode { private final MyComparator myComparator = new MyComparator(); @NotNull private final Project myProject; private final MyObservable myExcludedObservable = new MyObservable(); - private static final Icon OPEN_ICON = IconLoader.getIcon("/nodes/folderOpen.png"); - private static final Icon COLLAPSED_ICON = IconLoader.getIcon("/nodes/folder.png"); + private static final Icon OPEN_ICON = AllIcons.Nodes.FolderOpen; + private static final Icon COLLAPSED_ICON = AllIcons.Nodes.Folder; public AddedFileInfo(VirtualFile addedFile, @NotNull Project project, CvsConfiguration config) { myAddedFile = addedFile; diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddMultipleFilesOptionsDialog.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddMultipleFilesOptionsDialog.java index 115b84c43bea..6433b586efce 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddMultipleFilesOptionsDialog.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsAdd/ui/AddMultipleFilesOptionsDialog.java @@ -20,12 +20,12 @@ import com.intellij.cvsSupport2.CvsActionPlaces; import com.intellij.cvsSupport2.cvsoperations.cvsAdd.AddedFileInfo; import com.intellij.cvsSupport2.keywordSubstitution.KeywordSubstitutionWrapper; import com.intellij.cvsSupport2.ui.Options; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.DefaultActionGroup; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.dualView.TreeTableView; import com.intellij.ui.treeStructure.treetable.ListTreeTableModelOnColumns; @@ -294,7 +294,7 @@ public class AddMultipleFilesOptionsDialog extends AbstractAddOptionsDialog { private class SelectAllAction extends SelectUnselectAllAction { public SelectAllAction() { - super(CvsBundle.message("action.name.select.all"), IconLoader.getIcon("/actions/selectall.png")); + super(CvsBundle.message("action.name.select.all"), AllIcons.Actions.Selectall); } protected boolean includedValue() { @@ -304,7 +304,7 @@ public class AddMultipleFilesOptionsDialog extends AbstractAddOptionsDialog { private class UnselectAllAction extends SelectUnselectAllAction { public UnselectAllAction() { - super(CvsBundle.message("action.name.unselect.all"), IconLoader.getIcon("/actions/unselectall.png")); + super(CvsBundle.message("action.name.unselect.all"), AllIcons.Actions.Unselectall); } protected boolean includedValue() { diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/ui/FileCellRenderer.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/ui/FileCellRenderer.java index d1c16476202a..90bcc479eddd 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/ui/FileCellRenderer.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/cvsoperations/cvsCheckOut/ui/FileCellRenderer.java @@ -16,7 +16,7 @@ package com.intellij.cvsSupport2.cvsoperations.cvsCheckOut.ui; import com.intellij.cvsSupport2.ui.AbstractListCellRenderer; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import javax.swing.*; import java.io.File; @@ -26,7 +26,7 @@ import java.io.File; */ public class FileCellRenderer extends AbstractListCellRenderer { - private static final Icon ICON = IconLoader.getIcon("/nodes/enterpriseProject.png"); + private static final Icon ICON = AllIcons.Nodes.EnterpriseProject; protected String getPresentableString(Object value) { return ((File) value).getAbsolutePath(); diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindow.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindow.java index 9e3f48ba014e..7eb880e46b1f 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindow.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindow.java @@ -19,6 +19,7 @@ import com.intellij.CvsBundle; import com.intellij.cvsSupport2.config.ui.ConfigureCvsGlobalSettingsDialog; import com.intellij.cvsSupport2.config.ui.CvsConfigurationsListEditor; import com.intellij.cvsSupport2.errorHandling.CvsException; +import com.intellij.icons.AllIcons; import com.intellij.lifecycle.PeriodicalTasksCloser; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.*; @@ -27,7 +28,6 @@ import com.intellij.openapi.editor.Editor; import com.intellij.openapi.editor.EditorFactory; import com.intellij.openapi.project.Project; 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.ToolWindowId; @@ -108,7 +108,7 @@ public class CvsTabbedWindow { ToolWindowManager toolWindowManager = ToolWindowManager.getInstance(myProject); ToolWindow toolWindow = toolWindowManager.registerToolWindow(ToolWindowId.CVS, myContentManager.getComponent(), ToolWindowAnchor.BOTTOM); - toolWindow.setIcon(IconLoader.getIcon("/_cvs/cvs.png")); + toolWindow.setIcon(AllIcons._cvs.Cvs); toolWindow.installWatcher(myContentManager); } @@ -221,7 +221,7 @@ public class CvsTabbedWindow { private static class GlobalCvsSettingsAction extends AnAction { public GlobalCvsSettingsAction() { - super(CvsBundle.message("configure.global.cvs.settings.action.name"), null, IconLoader.getIcon("/nodes/cvs_global.png")); + super(CvsBundle.message("configure.global.cvs.settings.action.name"), null, AllIcons.Nodes.Cvs_global); } public void actionPerformed(AnActionEvent e) { @@ -231,7 +231,7 @@ public class CvsTabbedWindow { private class ReconfigureCvsRootAction extends AnAction { public ReconfigureCvsRootAction() { - super(CvsBundle.message("action.name.reconfigure.cvs.root"), null, IconLoader.getIcon("/nodes/cvs_roots.png")); + super(CvsBundle.message("action.name.reconfigure.cvs.root"), null, AllIcons.Nodes.Cvs_roots); } public void update(AnActionEvent e) { diff --git a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindowComponent.java b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindowComponent.java index 872455030075..b5e9ddc0bc7b 100644 --- a/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindowComponent.java +++ b/plugins/cvs/cvs-plugin/src/com/intellij/cvsSupport2/ui/CvsTabbedWindowComponent.java @@ -15,10 +15,10 @@ */ package com.intellij.cvsSupport2.ui; +import com.intellij.icons.AllIcons; import com.intellij.ide.actions.ContextHelpAction; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.project.DumbAware; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.content.Content; import com.intellij.ui.content.ContentManager; import org.jetbrains.annotations.Nullable; @@ -83,7 +83,7 @@ public class CvsTabbedWindowComponent extends JPanel implements DataProvider, Cv private class CloseAction extends AnAction implements DumbAware { public CloseAction() { - super(com.intellij.CvsBundle.message("close.tab.action.name"), "", IconLoader.getIcon("/actions/cancel.png")); + super(com.intellij.CvsBundle.message("close.tab.action.name"), "", AllIcons.Actions.Cancel); } public void actionPerformed(AnActionEvent e) { diff --git a/plugins/devkit/src/DevKitFileTemplatesFactory.java b/plugins/devkit/src/DevKitFileTemplatesFactory.java index 0c2543b4a093..b31e5432bd90 100644 --- a/plugins/devkit/src/DevKitFileTemplatesFactory.java +++ b/plugins/devkit/src/DevKitFileTemplatesFactory.java @@ -15,16 +15,17 @@ */ package org.jetbrains.idea.devkit; +import com.intellij.icons.AllIcons; import com.intellij.ide.fileTemplates.FileTemplateDescriptor; import com.intellij.ide.fileTemplates.FileTemplateGroupDescriptor; import com.intellij.ide.fileTemplates.FileTemplateGroupDescriptorFactory; import com.intellij.openapi.fileTypes.StdFileTypes; -import com.intellij.openapi.util.IconLoader; public class DevKitFileTemplatesFactory implements FileTemplateGroupDescriptorFactory { public FileTemplateGroupDescriptor getFileTemplatesDescriptor() { - FileTemplateGroupDescriptor descriptor = new FileTemplateGroupDescriptor(DevKitBundle.message("plugin.descriptor"), IconLoader.getIcon("/nodes/plugin.png")); + FileTemplateGroupDescriptor descriptor = new FileTemplateGroupDescriptor(DevKitBundle.message("plugin.descriptor"), + AllIcons.Nodes.Plugin); descriptor.addTemplate(new FileTemplateDescriptor("plugin.xml", StdFileTypes.XML.getIcon())); descriptor.addTemplate(new FileTemplateDescriptor("ProjectComponent.java", StdFileTypes.JAVA.getIcon())); descriptor.addTemplate(new FileTemplateDescriptor("ApplicationComponent.java", StdFileTypes.JAVA.getIcon())); diff --git a/plugins/devkit/src/actions/NewActionDialog.java b/plugins/devkit/src/actions/NewActionDialog.java index 332fd6310942..1e1d6ebe583a 100644 --- a/plugins/devkit/src/actions/NewActionDialog.java +++ b/plugins/devkit/src/actions/NewActionDialog.java @@ -15,6 +15,7 @@ */ package org.jetbrains.idea.devkit.actions; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.ActionGroup; import com.intellij.openapi.actionSystem.ActionManager; import com.intellij.openapi.actionSystem.AnAction; @@ -23,7 +24,6 @@ import com.intellij.openapi.keymap.KeymapUtil; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.TextFieldWithBrowseButton; -import com.intellij.openapi.util.IconLoader; import com.intellij.peer.PeerFactory; import com.intellij.psi.JavaPsiFacade; import com.intellij.psi.PsiClass; @@ -157,7 +157,7 @@ public class NewActionDialog extends DialogWrapper implements ActionData { myFirstKeystrokeEdit.getDocument().addDocumentListener(listener); myClearFirstKeystroke.setText(null); - final Icon icon = IconLoader.getIcon("/actions/cancel.png"); + final Icon icon = AllIcons.Actions.Cancel; final Dimension size = new Dimension(icon.getIconWidth(), icon.getIconHeight()); myClearFirstKeystroke.setIcon(icon); myClearFirstKeystroke.setPreferredSize(size); diff --git a/plugins/devkit/src/build/PluginModuleBuildConfEditor.java b/plugins/devkit/src/build/PluginModuleBuildConfEditor.java index b2be3bc68f32..22f65a0aa09c 100644 --- a/plugins/devkit/src/build/PluginModuleBuildConfEditor.java +++ b/plugins/devkit/src/build/PluginModuleBuildConfEditor.java @@ -15,6 +15,7 @@ */ package org.jetbrains.idea.devkit.build; +import com.intellij.icons.AllIcons; import com.intellij.ide.util.BrowseFilesListener; import com.intellij.openapi.command.CommandProcessor; import com.intellij.openapi.module.Module; @@ -25,7 +26,6 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.io.FileUtil; import com.intellij.ui.IdeBorderFactory; import org.jetbrains.annotations.NonNls; @@ -141,7 +141,7 @@ public class PluginModuleBuildConfEditor implements ModuleConfigurationEditor { } public Icon getIcon() { - return IconLoader.getIcon("/nodes/plugin.png"); + return AllIcons.Nodes.Plugin; } public String getHelpTopic() { diff --git a/plugins/devkit/src/module/PluginModuleType.java b/plugins/devkit/src/module/PluginModuleType.java index 59b4f93aad08..a6099efd6a63 100644 --- a/plugins/devkit/src/module/PluginModuleType.java +++ b/plugins/devkit/src/module/PluginModuleType.java @@ -15,6 +15,7 @@ */ package org.jetbrains.idea.devkit.module; +import com.intellij.icons.AllIcons; import com.intellij.ide.util.projectWizard.ModuleWizardStep; import com.intellij.ide.util.projectWizard.ProjectWizardStepFactory; import com.intellij.ide.util.projectWizard.WizardContext; @@ -47,8 +48,8 @@ import java.util.List; import java.util.Set; public class PluginModuleType extends ModuleType { - private static final Icon PLUGIN_MODULE_ICON = IconLoader.getIcon("/modules/pluginModule.png"); - private static final Icon PLUGIN_MODULE_NODE_ICON = IconLoader.getIcon("/nodes/plugin.png"); + private static final Icon PLUGIN_MODULE_ICON = AllIcons.Modules.PluginModule; + private static final Icon PLUGIN_MODULE_NODE_ICON = AllIcons.Nodes.Plugin; private static final Icon ADD_PLUGIN_MODULE_ICON = IconLoader.getIcon("/add_plugin_modulewizard.png"); @NonNls private static final String ID = "PLUGIN_MODULE"; @@ -165,4 +166,4 @@ public class PluginModuleType extends ModuleType { } return modules.toArray(new Module[modules.size()]); } -} \ No newline at end of file +} diff --git a/plugins/devkit/src/run/PluginConfigurationType.java b/plugins/devkit/src/run/PluginConfigurationType.java index a40431a6604b..cff562b229a9 100644 --- a/plugins/devkit/src/run/PluginConfigurationType.java +++ b/plugins/devkit/src/run/PluginConfigurationType.java @@ -19,10 +19,10 @@ import com.intellij.diagnostic.VMOptions; 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.application.PathManager; import com.intellij.openapi.module.Module; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.io.FileUtil; import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.devkit.DevKitBundle; @@ -60,7 +60,7 @@ public class PluginConfigurationType implements ConfigurationType { } }; } - private static final Icon ICON = IconLoader.getIcon("/nodes/plugin.png"); + private static final Icon ICON = AllIcons.Nodes.Plugin; public String getDisplayName() { return DevKitBundle.message("run.configuration.title"); @@ -98,4 +98,4 @@ public class PluginConfigurationType implements ConfigurationType { return myVmParameters; } -} \ No newline at end of file +} diff --git a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/SelectEclipseImportedProjectsStep.java b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/SelectEclipseImportedProjectsStep.java index f752efa0b326..3b542bf61a83 100644 --- a/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/SelectEclipseImportedProjectsStep.java +++ b/plugins/eclipse/src/org/jetbrains/idea/eclipse/importWizard/SelectEclipseImportedProjectsStep.java @@ -20,10 +20,10 @@ */ package org.jetbrains.idea.eclipse.importWizard; +import com.intellij.icons.AllIcons; import com.intellij.ide.util.ElementsChooser; import com.intellij.ide.util.projectWizard.WizardContext; import com.intellij.openapi.options.ConfigurationException; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.text.StringUtil; import com.intellij.projectImport.SelectImportedProjectsStep; import com.intellij.util.ArrayUtil; @@ -36,7 +36,7 @@ import java.util.HashSet; import java.util.Set; class SelectEclipseImportedProjectsStep extends SelectImportedProjectsStep { - private static final Icon ICON_CONFLICT = IconLoader.getIcon("/actions/cancel.png"); + private static final Icon ICON_CONFLICT = AllIcons.Actions.Cancel; Set duplicateNames; diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/BasePopupAction.java b/plugins/git4idea/src/git4idea/history/wholeTree/BasePopupAction.java index 6b22418eeca4..10e8158ef423 100644 --- a/plugins/git4idea/src/git4idea/history/wholeTree/BasePopupAction.java +++ b/plugins/git4idea/src/git4idea/history/wholeTree/BasePopupAction.java @@ -15,6 +15,7 @@ */ package git4idea.history.wholeTree; +import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.actionSystem.ex.CustomComponentAction; @@ -23,7 +24,6 @@ import com.intellij.openapi.project.DumbAwareAction; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.popup.JBPopup; import com.intellij.openapi.ui.popup.JBPopupFactory; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.awt.RelativePoint; import com.intellij.util.Consumer; import com.intellij.util.ui.UIUtil; @@ -37,7 +37,7 @@ import java.awt.event.MouseEvent; * @author irengrig */ public abstract class BasePopupAction extends DumbAwareAction implements CustomComponentAction { - private static final Icon ARROWS_ICON = IconLoader.getIcon("/ide/statusbar_arrows.png"); + private static final Icon ARROWS_ICON = AllIcons.Ide.Statusbar_arrows; protected final JLabel myLabel; protected final JPanel myPanel; protected final Project myProject; diff --git a/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java b/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java index 93e2f165cc58..33bc36b807b6 100644 --- a/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java +++ b/plugins/git4idea/src/git4idea/history/wholeTree/GitLogUI.java @@ -12,6 +12,7 @@ */ package git4idea.history.wholeTree; +import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.ide.actions.ContextHelpAction; import com.intellij.openapi.Disposable; @@ -869,7 +870,7 @@ public class GitLogUI implements Disposable { group.add(myRootsAction); group.add(myMyShowTreeAction); - group.add(new ToggleAction("Show Details", "Display details panel", IconLoader.getIcon("/actions/showSource.png")) { + group.add(new ToggleAction("Show Details", "Display details panel", AllIcons.Actions.ShowSource) { @Override public boolean isSelected(AnActionEvent e) { return GitLogSettings.getInstance(myProject).isShowDetails(); @@ -1453,7 +1454,7 @@ public class GitLogUI implements Disposable { private class MyRefreshAction extends DumbAwareAction { private MyRefreshAction() { - super("Refresh", "Refresh", IconLoader.getIcon("/actions/sync.png")); + super("Refresh", "Refresh", AllIcons.Actions.Sync); } @Override @@ -1826,7 +1827,7 @@ public class GitLogUI implements Disposable { private final JComponent myComponent; private MyRootsAction(final Getter> rootsGetter, final JComponent component) { - super("Show roots", "Show roots", IconLoader.getIcon("/general/balloonInformation.png")); + super("Show roots", "Show roots", AllIcons.General.BalloonInformation); myRootsGetter = rootsGetter; myComponent = component; myEnabled = false; @@ -1913,7 +1914,7 @@ public class GitLogUI implements Disposable { private final Icon myMarkIcon; public MyTreeSettings() { - myIcon = IconLoader.getIcon("/general/comboArrow.png"); + myIcon = AllIcons.General.ComboArrow; myMarkIcon = PlatformIcons.CHECK_ICON; myMultiColorAction = new DumbAwareAction("Multicolour") { @@ -2451,7 +2452,7 @@ public class GitLogUI implements Disposable { public class MyGotoCommitAction extends DumbAwareAction { public MyGotoCommitAction() { - super("Find Commit", "Find commit by hash, reference or description fragment (in loaded part)", IconLoader.getIcon("/actions/menu-find.png")); + super("Find Commit", "Find commit by hash, reference or description fragment (in loaded part)", AllIcons.Actions.Menu_find); } @Override diff --git a/plugins/git4idea/src/git4idea/push/GitManualPushToBranch.java b/plugins/git4idea/src/git4idea/push/GitManualPushToBranch.java index e2272b1aef74..e7fc1f2a282f 100644 --- a/plugins/git4idea/src/git4idea/push/GitManualPushToBranch.java +++ b/plugins/git4idea/src/git4idea/push/GitManualPushToBranch.java @@ -15,11 +15,11 @@ */ package git4idea.push; +import com.intellij.icons.AllIcons; import com.intellij.ide.ui.ListCellRendererWrapper; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.actionSystem.impl.ActionButton; import com.intellij.openapi.project.DumbAwareAction; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.components.JBLabel; import com.intellij.util.ui.GridBag; import com.intellij.util.ui.UIUtil; @@ -238,7 +238,7 @@ class GitManualPushToBranch extends JPanel { private abstract static class GitPushLogRefreshAction extends DumbAwareAction { GitPushLogRefreshAction() { - super("Refresh commit list", "Refresh commit list", IconLoader.getIcon("/actions/sync.png")); + super("Refresh commit list", "Refresh commit list", AllIcons.Actions.Sync); } } diff --git a/plugins/git4idea/src/git4idea/ui/branch/GitCompareBranchesDialog.java b/plugins/git4idea/src/git4idea/ui/branch/GitCompareBranchesDialog.java index 373d675503b0..06b9d0b9560d 100644 --- a/plugins/git4idea/src/git4idea/ui/branch/GitCompareBranchesDialog.java +++ b/plugins/git4idea/src/git4idea/ui/branch/GitCompareBranchesDialog.java @@ -15,6 +15,7 @@ */ package git4idea.ui.branch; +import com.intellij.icons.AllIcons; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.util.IconLoader; @@ -67,7 +68,7 @@ public class GitCompareBranchesDialog extends DialogWrapper { TabbedPaneImpl tabbedPane = new TabbedPaneImpl(SwingConstants.TOP); tabbedPane.addTab("Log", IconLoader.getIcon("/icons/branch.png"), myLogPanel); - tabbedPane.addTab("Diff", IconLoader.getIcon("/actions/diff.png"), diffPanel); + tabbedPane.addTab("Diff", AllIcons.Actions.Diff, diffPanel); tabbedPane.setKeyboardNavigation(TabbedPaneImpl.DEFAULT_PREV_NEXT_SHORTCUTS); return tabbedPane; } diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleIcons.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleIcons.java index 40f0878625e0..c30f4d5771d2 100644 --- a/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleIcons.java +++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/ui/GradleIcons.java @@ -1,5 +1,6 @@ package org.jetbrains.plugins.gradle.ui; +import com.intellij.icons.AllIcons; import com.intellij.openapi.application.ex.ApplicationInfoEx; import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NotNull; @@ -13,10 +14,10 @@ import javax.swing.*; public class GradleIcons { public static final Icon GRADLE_ICON = IconLoader.getIcon("/icons/gradle.png"); - public static final Icon LIB_ICON = IconLoader.getIcon("/nodes/ppLib.png"); - public static final Icon MODULE_ICON = IconLoader.getIcon("/nodes/ModuleOpen.png"); - public static final Icon CONTENT_ROOT_ICON = IconLoader.getIcon("/modules/addContentEntry.png"); - public static final Icon JAR_ICON = IconLoader.getIcon("/nodes/ppJar.png"); + public static final Icon LIB_ICON = AllIcons.Nodes.PpLib; + public static final Icon MODULE_ICON = AllIcons.Nodes.ModuleOpen; + public static final Icon CONTENT_ROOT_ICON = AllIcons.Modules.AddContentEntry; + public static final Icon JAR_ICON = AllIcons.Nodes.PpJar; public static final Icon PROJECT_ICON = getProjectIcon(); private GradleIcons() { diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/actions/GroovyDocReducePackageAction.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/actions/GroovyDocReducePackageAction.java index 5d7fdd95097a..a1068516ec8d 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/actions/GroovyDocReducePackageAction.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/doc/actions/GroovyDocReducePackageAction.java @@ -15,11 +15,11 @@ */ package org.jetbrains.plugins.groovy.doc.actions; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.Presentation; import com.intellij.openapi.project.DumbAware; -import com.intellij.openapi.util.IconLoader; import javax.swing.*; @@ -32,7 +32,7 @@ public class GroovyDocReducePackageAction extends AnAction implements DumbAware private final DefaultListModel myDataModel; public GroovyDocReducePackageAction(final JList packagesList, final DefaultListModel dataModel) { - super("Remove package from list", "Remove package from list", IconLoader.getIcon("/general/remove.png")); + super("Remove package from list", "Remove package from list", AllIcons.General.Remove); myPackagesList = packagesList; myDataModel = dataModel; } @@ -51,4 +51,4 @@ public class GroovyDocReducePackageAction extends AnAction implements DumbAware } super.update(e); } -} \ No newline at end of file +} diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcConsole.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcConsole.java index 9fcac25c4a34..59d84211d487 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcConsole.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcConsole.java @@ -16,7 +16,6 @@ package org.jetbrains.plugins.groovy.mvc; -import com.intellij.execution.ExecutionException; import com.intellij.execution.configurations.GeneralCommandLine; import com.intellij.execution.filters.TextConsoleBuilderFactory; import com.intellij.execution.impl.ConsoleViewImpl; @@ -24,6 +23,7 @@ import com.intellij.execution.process.*; import com.intellij.execution.ui.ConsoleViewContentType; import com.intellij.execution.ui.RunnerLayoutUi; import com.intellij.execution.ui.layout.PlaceInGrid; +import com.intellij.icons.AllIcons; import com.intellij.openapi.Disposable; import com.intellij.openapi.actionSystem.ActionPlaces; import com.intellij.openapi.actionSystem.AnAction; @@ -38,7 +38,10 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.progress.ProgressIndicator; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; -import com.intellij.openapi.util.*; +import com.intellij.openapi.util.Computable; +import com.intellij.openapi.util.Disposer; +import com.intellij.openapi.util.Key; +import com.intellij.openapi.util.Ref; import com.intellij.openapi.vfs.LocalFileSystem; import com.intellij.openapi.wm.ToolWindow; import com.intellij.openapi.wm.ToolWindowAnchor; @@ -77,7 +80,7 @@ public class MvcConsole implements Disposable { private final MyKillProcessAction myKillAction = new MyKillProcessAction(); private boolean myExecuting = false; private final Content myContent; - private static final Icon KILL_PROCESS_ICON = IconLoader.getIcon("/debugger/killProcess.png"); + private static final Icon KILL_PROCESS_ICON = AllIcons.Debugger.KillProcess; public MvcConsole(Project project, TextConsoleBuilderFactory consoleBuilderFactory) { myProject = project; diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcIcons.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcIcons.java index 9f35bc10b748..fd3966da0aa4 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcIcons.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcIcons.java @@ -1,5 +1,6 @@ package org.jetbrains.plugins.groovy.mvc; +import com.intellij.icons.AllIcons; import com.intellij.openapi.util.IconLoader; import javax.swing.*; @@ -15,7 +16,7 @@ public interface MvcIcons { Icon DOMAIN_CLASS = IconLoader.getIcon(ICONS_PATH + "domain_class.png"); Icon CONFIG_FOLDER = IconLoader.getIcon(ICONS_PATH + "config_folder_closed.png"); Icon ACTION_NODE = IconLoader.getIcon(ICONS_PATH + "action_method.png"); - Icon CONTROLLERS_FOLDER = IconLoader.getIcon("/nodes/keymapTools.png"); + Icon CONTROLLERS_FOLDER = AllIcons.Nodes.KeymapTools; Icon DOMAIN_CLASSES_FOLDER = IconLoader.getIcon(ICONS_PATH + "modelsNode.png"); Icon PLUGINS_REFRESH = IconLoader.getIcon(ICONS_PATH + "refresh.png"); Icon PLUGIN = IconLoader.getIcon(ICONS_PATH + "groovy_mvc_plugin.png"); diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/projectView/MvcProjectViewPane.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/projectView/MvcProjectViewPane.java index 747e3399e63d..f65b937dd4a2 100644 --- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/projectView/MvcProjectViewPane.java +++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/projectView/MvcProjectViewPane.java @@ -16,6 +16,7 @@ package org.jetbrains.plugins.groovy.mvc.projectView; +import com.intellij.icons.AllIcons; import com.intellij.ide.*; import com.intellij.ide.projectView.BaseProjectTreeBuilder; import com.intellij.ide.projectView.ViewSettings; @@ -36,7 +37,6 @@ import com.intellij.openapi.module.ModuleUtil; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; import com.intellij.openapi.roots.ui.configuration.actions.ModuleDeleteProvider; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.wm.ToolWindow; @@ -165,7 +165,7 @@ public class MvcProjectViewPane extends AbstractProjectViewPSIPane implements Id TreeExpander expander = new DefaultTreeExpander(myTree); CommonActionsManager actionsManager = CommonActionsManager.getInstance(); AnAction collapseAction = actionsManager.createCollapseAllAction(expander, myTree); - collapseAction.getTemplatePresentation().setIcon(IconLoader.getIcon("/general/collapseAll.png")); + collapseAction.getTemplatePresentation().setIcon(AllIcons.General.CollapseAll); toolWindow.setTitleActions(new AnAction[]{new ScrollFromSourceAction(), collapseAction}); } @@ -446,7 +446,7 @@ public class MvcProjectViewPane extends AbstractProjectViewPSIPane implements Id private class ScrollFromSourceAction extends AnAction implements DumbAware { private ScrollFromSourceAction() { - super("Scroll from Source", "Select the file open in the active editor", IconLoader.getIcon("/general/locate.png")); + super("Scroll from Source", "Select the file open in the active editor", AllIcons.General.Locate); } @Override @@ -482,7 +482,7 @@ public class MvcProjectViewPane extends AbstractProjectViewPSIPane implements Id private class HideEmptyMiddlePackagesAction extends ToggleAction implements DumbAware { private HideEmptyMiddlePackagesAction() { super("Compact Empty Middle Packages", "Show/Compact Empty Middle Packages", - IconLoader.getIcon("/objectBrowser/compactEmptyPackages.png")); + AllIcons.ObjectBrowser.CompactEmptyPackages); } @Override diff --git a/plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationType.java b/plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationType.java index 6a018d006d63..f9e9570599dd 100644 --- a/plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationType.java +++ b/plugins/junit/src/com/intellij/execution/junit/JUnitConfigurationType.java @@ -22,9 +22,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; import org.jetbrains.annotations.Nullable; @@ -32,7 +32,7 @@ import org.jetbrains.annotations.Nullable; import javax.swing.*; public class JUnitConfigurationType implements ConfigurationType { - public static final Icon ICON = IconLoader.getIcon("/runConfigurations/junit.png"); + public static final Icon ICON = AllIcons.RunConfigurations.Junit; private final ConfigurationFactory myFactory; /**reflection*/ diff --git a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java index 80f14b1af5fb..ad0b539edff8 100644 --- a/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java +++ b/plugins/junit/src/com/intellij/execution/junit2/configuration/JUnitConfigurable.java @@ -30,6 +30,7 @@ import com.intellij.execution.ui.AlternativeJREPanel; import com.intellij.execution.ui.ClassBrowser; import com.intellij.execution.ui.CommonJavaParametersPanel; import com.intellij.execution.ui.ConfigurationModuleSelector; +import com.intellij.icons.AllIcons; import com.intellij.ide.ui.ListCellRendererWrapper; import com.intellij.ide.util.ClassFilter; import com.intellij.ide.util.PackageChooserDialog; @@ -42,7 +43,6 @@ import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.*; import com.intellij.openapi.ui.ex.MessagesEx; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.*; @@ -181,7 +181,7 @@ public class JUnitConfigurable extends SettingsEditor implem myPatternTextField.setButtonIcon(IconUtil.getAddIcon()); panel.add(myPatternTextField, BorderLayout.CENTER); final FixedSizeButton editBtn = new FixedSizeButton(); - editBtn.setIcon(IconLoader.getIcon("/actions/showViewer.png")); + editBtn.setIcon(AllIcons.Actions.ShowViewer); editBtn.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { Messages.showTextAreaDialog(myPatternTextField.getTextField(), "Configure suite tests", "EditParametersPopupWindow"); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenResumeAction.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenResumeAction.java index 6371106883f2..43885c5a6ecc 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenResumeAction.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/execution/MavenResumeAction.java @@ -26,13 +26,13 @@ import com.intellij.execution.process.ProcessHandler; import com.intellij.execution.process.ProcessOutputTypes; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.runners.ProgramRunner; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.Messages; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Key; import com.intellij.util.containers.CollectionFactory; import org.jetbrains.annotations.NotNull; @@ -78,7 +78,7 @@ public class MavenResumeAction extends AnAction { ProgramRunner runner, Executor executor, ExecutionEnvironment environment) { - super("Resume build from specified module", null, IconLoader.getIcon("/runConfigurations/rerunFailedTests.png")); + super("Resume build from specified module", null, AllIcons.RunConfigurations.RerunFailedTests); myRunner = runner; myExecutor = executor; myEnvironment = environment; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchPanel.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchPanel.java index cc506704623d..a68d7183e909 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchPanel.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenArtifactSearchPanel.java @@ -15,10 +15,10 @@ */ package org.jetbrains.idea.maven.indices; +import com.intellij.icons.AllIcons; import com.intellij.openapi.editor.colors.EditorColorsManager; import com.intellij.openapi.editor.colors.EditorFontType; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.DocumentAdapter; import com.intellij.ui.ScrollPaneFactory; import com.intellij.ui.SimpleColoredComponent; @@ -335,7 +335,7 @@ public class MavenArtifactSearchPanel extends JPanel { } private static class MyClassCellRenderer extends MyArtifactCellRenderer { - public static final Icon CLASS_ICON = IconLoader.getIcon("/nodes/class.png"); + public static final Icon CLASS_ICON = AllIcons.Nodes.Class; private MyClassCellRenderer(Tree tree) { super(tree); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenRepositoriesConfigurable.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenRepositoriesConfigurable.java index 01bed087383f..9dc12ea15fb4 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenRepositoriesConfigurable.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/indices/MavenRepositoriesConfigurable.java @@ -15,6 +15,7 @@ */ package org.jetbrains.idea.maven.indices; +import com.intellij.icons.AllIcons; import com.intellij.openapi.options.BaseConfigurable; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; @@ -23,7 +24,6 @@ import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.InputValidator; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.text.StringUtil; import com.intellij.ui.CollectionListModel; import com.intellij.ui.ListUtil; @@ -69,7 +69,7 @@ public class MavenRepositoriesConfigurable extends BaseConfigurable implements S private JButton myEditButton; private AnimatedIcon myUpdatingIcon; - private final Icon myWaitingIcon = IconLoader.getIcon("/process/step_passive.png"); + private final Icon myWaitingIcon = AllIcons.Process.Step_passive; private Timer myRepaintTimer; private ActionListener myTimerListener; private final Project myProject; diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenIcons.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenIcons.java index aedb0a68bebb..60856cd211c4 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenIcons.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenIcons.java @@ -15,6 +15,7 @@ */ package org.jetbrains.idea.maven.utils; +import com.intellij.icons.AllIcons; import com.intellij.openapi.util.IconLoader; import javax.swing.*; @@ -33,9 +34,9 @@ public class MavenIcons { public static final Icon PLUGIN_ICON = IconLoader.getIcon("/images/mavenPlugin.png"); public static final Icon REPOSITORY_ICON = IconLoader.getIcon("/images/mavenPlugin.png"); public static final Icon PLUGIN_GOAL_ICON = IconLoader.getIcon("/images/pluginGoal.png"); - public static final Icon OPEN_DEPENDENCIES_ICON = IconLoader.getIcon("/nodes/ppLibOpen.png"); - public static final Icon CLOSED_DEPENDENCIES_ICON = IconLoader.getIcon("/nodes/ppLibClosed.png"); - public static final Icon DEPENDENCY_ICON = IconLoader.getIcon("/nodes/ppLib.png"); + public static final Icon OPEN_DEPENDENCIES_ICON = AllIcons.Nodes.PpLibOpen; + public static final Icon CLOSED_DEPENDENCIES_ICON = AllIcons.Nodes.PpLibClosed; + public static final Icon DEPENDENCY_ICON = AllIcons.Nodes.PpLib; public static final Icon OPEN_MODULES_ICON = IconLoader.getIcon("/images/modulesOpen.png"); public static final Icon CLOSED_MODULES_ICON = IconLoader.getIcon("/images/modulesClosed.png"); diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenSettings.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenSettings.java index 35dd4303a134..a5d3e6ac2b23 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenSettings.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/MavenSettings.java @@ -15,11 +15,11 @@ */ package org.jetbrains.idea.maven.utils; +import com.intellij.icons.AllIcons; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; import org.jetbrains.idea.maven.execution.MavenRunner; @@ -110,7 +110,7 @@ public class MavenSettings implements SearchableConfigurable.Parent { } public Icon getIcon() { - return IconLoader.getIcon("/general/configurableEditor.png"); + return AllIcons.General.ConfigurableEditor; } public String getHelpTopic() { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/RepositoryAttachDialog.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/RepositoryAttachDialog.java index 7776c490de18..d28d69e34379 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/RepositoryAttachDialog.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/utils/RepositoryAttachDialog.java @@ -15,6 +15,7 @@ */ package org.jetbrains.idea.maven.utils; +import com.intellij.icons.AllIcons; import com.intellij.ide.util.PropertiesComponent; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.fileChooser.FileChooserDescriptor; @@ -25,7 +26,10 @@ import com.intellij.openapi.project.ProjectBundle; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.openapi.ui.ValidationInfo; -import com.intellij.openapi.util.*; +import com.intellij.openapi.util.Comparing; +import com.intellij.openapi.util.Condition; +import com.intellij.openapi.util.Disposer; +import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.vfs.VirtualFile; @@ -88,7 +92,7 @@ public class RepositoryAttachDialog extends DialogWrapper { myInfoLabel.setPreferredSize( new Dimension(myInfoLabel.getFontMetrics(myInfoLabel.getFont()).stringWidth("Showing: 1000"), myInfoLabel.getPreferredSize().height)); - myComboComponent.setButtonIcon(IconLoader.findIcon("/actions/menu-find.png")); + myComboComponent.setButtonIcon(AllIcons.Actions.Menu_find); myComboComponent.getButton().addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java index 8b14c49ab562..1cca2564225f 100644 --- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java +++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/wizards/MavenModuleBuilder.java @@ -15,6 +15,7 @@ */ package org.jetbrains.idea.maven.wizards; +import com.intellij.icons.AllIcons; import com.intellij.ide.util.projectWizard.*; import com.intellij.openapi.module.ModuleType; import com.intellij.openapi.module.StdModuleTypes; @@ -25,7 +26,6 @@ import com.intellij.openapi.projectRoots.JavaSdk; import com.intellij.openapi.projectRoots.Sdk; import com.intellij.openapi.roots.ModifiableRootModel; import com.intellij.openapi.roots.ui.configuration.ModulesProvider; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Pair; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.LocalFileSystem; @@ -44,7 +44,7 @@ import java.util.List; import java.util.Map; public class MavenModuleBuilder extends ModuleBuilder implements SourcePathsBuilder { - private static final Icon BIG_ICON = IconLoader.getIcon("/modules/javaModule.png"); + private static final Icon BIG_ICON = AllIcons.Modules.JavaModule; private MavenProject myAggregatorProject; private MavenProject myParentProject; diff --git a/plugins/properties/src/com/intellij/lang/properties/PropertiesFileType.java b/plugins/properties/src/com/intellij/lang/properties/PropertiesFileType.java index 6bcbc49e3553..3ff5e5707a45 100644 --- a/plugins/properties/src/com/intellij/lang/properties/PropertiesFileType.java +++ b/plugins/properties/src/com/intellij/lang/properties/PropertiesFileType.java @@ -15,8 +15,8 @@ */ package com.intellij.lang.properties; +import com.intellij.icons.AllIcons; import com.intellij.openapi.fileTypes.LanguageFileType; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.encoding.EncodingManager; @@ -30,7 +30,7 @@ import java.nio.charset.Charset; * @author max */ public class PropertiesFileType extends LanguageFileType { - public static final Icon FILE_ICON = IconLoader.getIcon("/fileTypes/properties.png"); + public static final Icon FILE_ICON = AllIcons.FileTypes.Properties; public static final LanguageFileType INSTANCE = new PropertiesFileType(); @NonNls public static final String DEFAULT_EXTENSION = "properties"; @NonNls public static final String DOT_DEFAULT_EXTENSION = "."+DEFAULT_EXTENSION; diff --git a/plugins/properties/src/com/intellij/lang/properties/ResourceBundle.java b/plugins/properties/src/com/intellij/lang/properties/ResourceBundle.java index dffc3a48d903..6994ff77908f 100644 --- a/plugins/properties/src/com/intellij/lang/properties/ResourceBundle.java +++ b/plugins/properties/src/com/intellij/lang/properties/ResourceBundle.java @@ -22,10 +22,10 @@ */ package com.intellij.lang.properties; +import com.intellij.icons.AllIcons; import com.intellij.lang.properties.psi.PropertiesFile; import com.intellij.openapi.actionSystem.DataKey; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; @@ -35,8 +35,8 @@ import java.util.List; public interface ResourceBundle { DataKey ARRAY_DATA_KEY = DataKey.create("resource.bundle.array"); - Icon ICON_CLOSED = IconLoader.getIcon("/nodes/resourceBundleClosed.png"); - Icon ICON_OPEN = IconLoader.getIcon("/nodes/resourceBundleOpen.png"); + Icon ICON_CLOSED = AllIcons.Nodes.ResourceBundleClosed; + Icon ICON_OPEN = AllIcons.Nodes.ResourceBundleOpen; @NotNull List getPropertiesFiles(final Project project); @@ -49,4 +49,4 @@ public interface ResourceBundle { @NotNull VirtualFile getBaseDirectory(); -} \ No newline at end of file +} diff --git a/plugins/properties/src/com/intellij/lang/properties/structureView/GroupByWordPrefixes.java b/plugins/properties/src/com/intellij/lang/properties/structureView/GroupByWordPrefixes.java index 39ae15bddeb8..5b351239b641 100644 --- a/plugins/properties/src/com/intellij/lang/properties/structureView/GroupByWordPrefixes.java +++ b/plugins/properties/src/com/intellij/lang/properties/structureView/GroupByWordPrefixes.java @@ -15,6 +15,7 @@ */ package com.intellij.lang.properties.structureView; +import com.intellij.icons.AllIcons; import com.intellij.ide.util.treeView.AbstractTreeNode; import com.intellij.ide.util.treeView.smartTree.*; import com.intellij.lang.properties.IProperty; @@ -22,7 +23,6 @@ import com.intellij.lang.properties.PropertiesBundle; import com.intellij.lang.properties.editor.ResourceBundlePropertyStructureViewElement; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -150,7 +150,7 @@ public class GroupByWordPrefixes implements Grouper, Sorter { public ActionPresentation getPresentation() { return new ActionPresentationData(PropertiesBundle.message("structure.view.group.by.prefixes.action.name"), PropertiesBundle.message("structure.view.group.by.prefixes.action.description"), - IconLoader.getIcon("/actions/fileStatus.png")); + AllIcons.Actions.FileStatus); } @NotNull diff --git a/plugins/properties/src/com/intellij/lang/properties/structureView/PropertiesFileStructureViewModel.java b/plugins/properties/src/com/intellij/lang/properties/structureView/PropertiesFileStructureViewModel.java index f8944ace7517..3fecc9f1209f 100644 --- a/plugins/properties/src/com/intellij/lang/properties/structureView/PropertiesFileStructureViewModel.java +++ b/plugins/properties/src/com/intellij/lang/properties/structureView/PropertiesFileStructureViewModel.java @@ -15,6 +15,7 @@ */ package com.intellij.lang.properties.structureView; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.ide.structureView.StructureViewTreeElement; import com.intellij.ide.structureView.TextEditorBasedStructureViewModel; @@ -25,7 +26,6 @@ import com.intellij.ide.util.treeView.smartTree.Sorter; import com.intellij.lang.properties.editor.PropertiesGroupingStructureViewModel; import com.intellij.lang.properties.psi.Property; import com.intellij.lang.properties.psi.impl.PropertiesFileImpl; -import com.intellij.openapi.util.IconLoader; import com.intellij.psi.PsiFile; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -57,7 +57,7 @@ public class PropertiesFileStructureViewModel extends TextEditorBasedStructureVi @NotNull public ActionPresentation getPresentation() { String name = IdeBundle.message("action.sort.by.type"); - return new ActionPresentationData(name, name, IconLoader.getIcon("/objectBrowser/sortByType.png")); + return new ActionPresentationData(name, name, AllIcons.ObjectBrowser.SortByType); } @NotNull diff --git a/plugins/properties/src/com/intellij/lang/properties/structureView/PropertiesPrefixGroup.java b/plugins/properties/src/com/intellij/lang/properties/structureView/PropertiesPrefixGroup.java index 9cb411edba21..01a0591be634 100644 --- a/plugins/properties/src/com/intellij/lang/properties/structureView/PropertiesPrefixGroup.java +++ b/plugins/properties/src/com/intellij/lang/properties/structureView/PropertiesPrefixGroup.java @@ -15,14 +15,13 @@ */ package com.intellij.lang.properties.structureView; +import com.intellij.icons.AllIcons; import com.intellij.ide.util.treeView.smartTree.Group; import com.intellij.ide.util.treeView.smartTree.TreeElement; import com.intellij.lang.properties.IProperty; import com.intellij.lang.properties.editor.ResourceBundlePropertyStructureViewElement; import com.intellij.navigation.ItemPresentation; -import com.intellij.openapi.editor.colors.TextAttributesKey; import com.intellij.openapi.util.Comparing; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.annotations.NotNull; @@ -58,7 +57,7 @@ public class PropertiesPrefixGroup implements Group { } public Icon getIcon(boolean open) { - return IconLoader.getIcon("/nodes/advice.png"); + return AllIcons.Nodes.Advice; } }; } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopyDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopyDialog.java index 4c2461cfddb0..ca4f55f4761f 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopyDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/CopyDialog.java @@ -15,6 +15,7 @@ */ package org.jetbrains.idea.svn.dialogs; +import com.intellij.icons.AllIcons; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory; import com.intellij.openapi.help.HelpManager; @@ -22,7 +23,6 @@ import com.intellij.openapi.options.ConfigurationException; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.TextFieldWithBrowseButton; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.ProjectLevelVcsManager; import com.intellij.openapi.vcs.VcsException; import com.intellij.openapi.vfs.LocalFileSystem; @@ -93,7 +93,7 @@ public class CopyDialog extends DialogWrapper { setResizable(true); setTitle(SvnBundle.message("dialog.title.branch")); getHelpAction().setEnabled(true); - myProjectButton.setIcon(IconLoader.getIcon("/nodes/ideaProject.png")); + myProjectButton.setIcon(AllIcons.Nodes.IdeaProject); myBranchTagBaseComboBox.setPreferredSize(new Dimension(myBranchTagBaseComboBox.getPreferredSize().width, myWorkingCopyField.getPreferredSize().height)); diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PagedListWithActions.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PagedListWithActions.java index 97fa5109c56f..4efaf23b77a7 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PagedListWithActions.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PagedListWithActions.java @@ -15,8 +15,8 @@ */ package org.jetbrains.idea.svn.dialogs; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.ScrollPaneFactory; import javax.swing.*; @@ -63,7 +63,7 @@ public class PagedListWithActions { private class MyNext extends AnAction { private MyNext() { - super("Next Page", "Next Page", IconLoader.getIcon("/actions/nextfile.png")); + super("Next Page", "Next Page", AllIcons.Actions.Nextfile); } @Override @@ -83,7 +83,7 @@ public class PagedListWithActions { private class MyPrevious extends AnAction { private MyPrevious() { - super("Previous Page", "Previous Page", IconLoader.getIcon("/actions/prevfile.png")); + super("Previous Page", "Previous Page", AllIcons.Actions.Prevfile); } @Override diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java index 3adf1b2f79c0..148845c59565 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java @@ -15,11 +15,11 @@ */ package org.jetbrains.idea.svn.dialogs; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.keymap.KeymapManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.MessageType; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.changes.VcsDirtyScopeManager; import com.intellij.openapi.vcs.ui.VcsBalloonProblemNotifier; import com.intellij.openapi.vfs.VirtualFile; @@ -228,7 +228,7 @@ public class PropertiesComponent extends JPanel { public void update(AnActionEvent e) { e.getPresentation().setText("Close"); e.getPresentation().setDescription("Close this tool window"); - e.getPresentation().setIcon(IconLoader.getIcon("/actions/cancel.png")); + e.getPresentation().setIcon(AllIcons.Actions.Cancel); } public void actionPerformed(AnActionEvent e) { @@ -241,7 +241,7 @@ public class PropertiesComponent extends JPanel { public void update(AnActionEvent e) { e.getPresentation().setText("Refresh"); e.getPresentation().setDescription("Reload properties"); - e.getPresentation().setIcon(IconLoader.getIcon("/actions/sync.png")); + e.getPresentation().setIcon(AllIcons.Actions.Sync); e.getPresentation().setEnabled(myFile != null); } @@ -257,7 +257,7 @@ public class PropertiesComponent extends JPanel { e.getPresentation().setText("Edit Keywords"); e.getPresentation().setDescription("Manage svn:keywords property"); if (!CONTEXT_ID.equals(e.getPlace())) { - e.getPresentation().setIcon(IconLoader.getIcon("/actions/properties.png")); + e.getPresentation().setIcon(AllIcons.Actions.Properties); } e.getPresentation().setEnabled(myFile != null && myFile.isFile()); } @@ -295,7 +295,7 @@ public class PropertiesComponent extends JPanel { e.getPresentation().setText("Delete Property"); e.getPresentation().setDescription("Delete selected property"); if (!CONTEXT_ID.equals(e.getPlace())) { - e.getPresentation().setIcon(IconLoader.getIcon("/general/remove.png")); + e.getPresentation().setIcon(AllIcons.General.Remove); } e.getPresentation().setEnabled(myFile != null && getSelectedPropertyName() != null); } @@ -352,7 +352,7 @@ public class PropertiesComponent extends JPanel { e.getPresentation().setText("Edit Property"); e.getPresentation().setDescription("Edit selected property value"); if (!CONTEXT_ID.equals(e.getPlace())) { - e.getPresentation().setIcon(IconLoader.getIcon("/actions/editSource.png")); + e.getPresentation().setIcon(AllIcons.Actions.EditSource); } e.getPresentation().setEnabled(myFile != null && getSelectedPropertyName() != null); } @@ -394,7 +394,7 @@ public class PropertiesComponent extends JPanel { public void update(final AnActionEvent e) { super.update(e); - e.getPresentation().setIcon(IconLoader.getIcon("/general/autoscrollFromSource.png")); + e.getPresentation().setIcon(AllIcons.General.AutoscrollFromSource); e.getPresentation().setText("Follow Selection"); e.getPresentation().setDescription("Follow Selection"); // change file diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java index c618c6831126..1caea5c299e9 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java @@ -16,6 +16,7 @@ package org.jetbrains.idea.svn.dialogs; import com.intellij.CommonBundle; +import com.intellij.icons.AllIcons; import com.intellij.ide.CommonActionsManager; import com.intellij.ide.TreeExpander; import com.intellij.openapi.actionSystem.*; @@ -33,7 +34,6 @@ import com.intellij.openapi.ui.DialogWrapper; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.Comparing; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.*; import com.intellij.openapi.vcs.actions.VcsContextFactory; import com.intellij.openapi.vcs.changes.Change; @@ -374,7 +374,7 @@ public class RepositoryBrowserDialog extends DialogWrapper { public void update(AnActionEvent e) { e.getPresentation().setText(SvnBundle.message("action.name.refresh")); e.getPresentation().setDescription(SvnBundle.message("repository.browser.refresh.action")); - e.getPresentation().setIcon(IconLoader.getIcon("/actions/sync.png")); + e.getPresentation().setIcon(AllIcons.Actions.Sync); e.getPresentation().setEnabled(getRepositoryBrowser().getSelectedNode() != null); } @@ -425,7 +425,7 @@ public class RepositoryBrowserDialog extends DialogWrapper { if (e.getPlace().equals(PLACE_TOOLBAR)) { e.getPresentation().setDescription(SvnBundle.message("repository.browser.edit.location.menu.item")); e.getPresentation().setText(SvnBundle.message("repository.browser.edit.location.menu.item")); - e.getPresentation().setIcon(IconLoader.getIcon("/actions/editSource.png")); + e.getPresentation().setIcon(AllIcons.Actions.EditSource); } e.getPresentation().setEnabled(node != null && node.getParent() instanceof RepositoryTreeRootNode); } @@ -467,7 +467,7 @@ public class RepositoryBrowserDialog extends DialogWrapper { public void update(AnActionEvent e) { RepositoryTreeNode node = getRepositoryBrowser().getSelectedNode(); e.getPresentation().setText(SvnBundle.message("repository.browser.discard.location.action"), true); - e.getPresentation().setIcon(IconLoader.getIcon("/general/remove.png")); + e.getPresentation().setIcon(AllIcons.General.Remove); e.getPresentation().setEnabled(node != null && node.getParent() instanceof RepositoryTreeRootNode); } @@ -916,7 +916,7 @@ public class RepositoryBrowserDialog extends DialogWrapper { public void update(final AnActionEvent e) { e.getPresentation().setDescription(SvnBundle.message("repository.browser.details.action")); e.getPresentation().setText(SvnBundle.message("repository.browser.details.action")); - e.getPresentation().setIcon(IconLoader.getIcon("/actions/annotate.png")); + e.getPresentation().setIcon(AllIcons.Actions.Annotate); super.update(e); } @@ -1202,7 +1202,7 @@ public class RepositoryBrowserDialog extends DialogWrapper { public void update(AnActionEvent e) { e.getPresentation().setText("Close"); e.getPresentation().setDescription("Close this tool window"); - e.getPresentation().setIcon(IconLoader.getIcon("/actions/cancel.png")); + e.getPresentation().setIcon(AllIcons.Actions.Cancel); } } diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java index ee05bb45841d..d4078dc4212a 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java @@ -15,13 +15,13 @@ */ package org.jetbrains.idea.svn.dialogs; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonShortcuts; import com.intellij.openapi.project.DumbAwareAction; 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.openapi.util.Pair; import com.intellij.openapi.vcs.ObjectsConvertor; import com.intellij.openapi.vcs.QuantitySelection; @@ -315,7 +315,7 @@ public class ToBeMergedDialog extends DialogWrapper { private class MySelectAll extends DumbAwareAction { private MySelectAll() { - super("Select All", "Select All", IconLoader.getIcon("/actions/selectall.png")); + super("Select All", "Select All", AllIcons.Actions.Selectall); } @Override @@ -327,7 +327,7 @@ public class ToBeMergedDialog extends DialogWrapper { private class MyUnselectAll extends DumbAwareAction { private MyUnselectAll() { - super("Unselect All", "Unselect All", IconLoader.getIcon("/actions/unselectall.png")); + super("Unselect All", "Unselect All", AllIcons.Actions.Unselectall); } @Override diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java index 5335e3b76b55..f5c90a4ddb8d 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/history/RootsAndBranches.java @@ -15,6 +15,7 @@ */ package org.jetbrains.idea.svn.history; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProgressIndicator; @@ -440,7 +441,7 @@ public class RootsAndBranches implements CommittedChangeListDecorator { private class MyRefresh extends AnAction { private MyRefresh() { super(SvnBundle.message("committed.changes.action.merge.highlighting.refresh.text"), - SvnBundle.message("committed.changes.action.merge.highlighting.refresh.description"), IconLoader.getIcon("/actions/sync.png")); + SvnBundle.message("committed.changes.action.merge.highlighting.refresh.description"), AllIcons.Actions.Sync); } @Override diff --git a/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/CopyDialog.java b/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/CopyDialog.java index ca9901f20fb2..b405d8e31d3c 100644 --- a/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/CopyDialog.java +++ b/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/CopyDialog.java @@ -15,6 +15,7 @@ */ package org.jetbrains.idea.svn.dialogs; +import com.intellij.icons.AllIcons; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.fileChooser.FileChooserDescriptorFactory; import com.intellij.openapi.help.HelpManager; @@ -93,7 +94,7 @@ public class CopyDialog extends DialogWrapper { setResizable(true); setTitle(SvnBundle.message("dialog.title.branch")); getHelpAction().setEnabled(true); - myProjectButton.setIcon(IconLoader.getIcon("/nodes/ideaProject.png")); + myProjectButton.setIcon(AllIcons.Nodes.IdeaProject); myBranchTagBaseComboBox.setPreferredSize(new Dimension(myBranchTagBaseComboBox.getPreferredSize().width, myWorkingCopyField.getPreferredSize().height)); diff --git a/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/PagedListWithActions.java b/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/PagedListWithActions.java index 97fa5109c56f..18f2790cf52a 100644 --- a/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/PagedListWithActions.java +++ b/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/PagedListWithActions.java @@ -15,6 +15,7 @@ */ package org.jetbrains.idea.svn.dialogs; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.util.IconLoader; import com.intellij.ui.ScrollPaneFactory; @@ -63,7 +64,7 @@ public class PagedListWithActions { private class MyNext extends AnAction { private MyNext() { - super("Next Page", "Next Page", IconLoader.getIcon("/actions/nextfile.png")); + super("Next Page", "Next Page", AllIcons.Actions.Nextfile); } @Override @@ -83,7 +84,7 @@ public class PagedListWithActions { private class MyPrevious extends AnAction { private MyPrevious() { - super("Previous Page", "Previous Page", IconLoader.getIcon("/actions/prevfile.png")); + super("Previous Page", "Previous Page", AllIcons.Actions.Prevfile); } @Override diff --git a/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java b/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java index 5097c8b8cdad..24a13e53b596 100644 --- a/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java +++ b/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/PropertiesComponent.java @@ -15,6 +15,7 @@ */ package org.jetbrains.idea.svn.dialogs; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.keymap.KeymapManager; import com.intellij.openapi.project.Project; @@ -228,7 +229,7 @@ public class PropertiesComponent extends JPanel { public void update(AnActionEvent e) { e.getPresentation().setText("Close"); e.getPresentation().setDescription("Close this tool window"); - e.getPresentation().setIcon(IconLoader.getIcon("/actions/cancel.png")); + e.getPresentation().setIcon(AllIcons.Actions.Cancel); } public void actionPerformed(AnActionEvent e) { @@ -241,7 +242,7 @@ public class PropertiesComponent extends JPanel { public void update(AnActionEvent e) { e.getPresentation().setText("Refresh"); e.getPresentation().setDescription("Reload properties"); - e.getPresentation().setIcon(IconLoader.getIcon("/actions/sync.png")); + e.getPresentation().setIcon(AllIcons.Actions.Sync); e.getPresentation().setEnabled(myFile != null); } @@ -257,7 +258,7 @@ public class PropertiesComponent extends JPanel { e.getPresentation().setText("Edit Keywords"); e.getPresentation().setDescription("Manage svn:keywords property"); if (!CONTEXT_ID.equals(e.getPlace())) { - e.getPresentation().setIcon(IconLoader.getIcon("/actions/properties.png")); + e.getPresentation().setIcon(AllIcons.Actions.Properties); } e.getPresentation().setEnabled(myFile != null && myFile.isFile()); } @@ -294,7 +295,7 @@ public class PropertiesComponent extends JPanel { e.getPresentation().setText("Delete Property"); e.getPresentation().setDescription("Delete selected property"); if (!CONTEXT_ID.equals(e.getPlace())) { - e.getPresentation().setIcon(IconLoader.getIcon("/general/remove.png")); + e.getPresentation().setIcon(AllIcons.General.Remove); } e.getPresentation().setEnabled(myFile != null && getSelectedPropertyName() != null); } @@ -316,7 +317,7 @@ public class PropertiesComponent extends JPanel { e.getPresentation().setText("Add Property"); e.getPresentation().setDescription("Add new property"); if (!CONTEXT_ID.equals(e.getPlace())) { - e.getPresentation().setIcon(IconLoader.getIcon("/general/add.png")); + e.getPresentation().setIcon(AllIcons.General.Add); } e.getPresentation().setEnabled(myFile != null); } @@ -349,7 +350,7 @@ public class PropertiesComponent extends JPanel { e.getPresentation().setText("Edit Property"); e.getPresentation().setDescription("Edit selected property value"); if (!CONTEXT_ID.equals(e.getPlace())) { - e.getPresentation().setIcon(IconLoader.getIcon("/actions/editSource.png")); + e.getPresentation().setIcon(AllIcons.Actions.EditSource); } e.getPresentation().setEnabled(myFile != null && getSelectedPropertyName() != null); } @@ -390,7 +391,7 @@ public class PropertiesComponent extends JPanel { public void update(final AnActionEvent e) { super.update(e); - e.getPresentation().setIcon(IconLoader.getIcon("/general/autoscrollFromSource.png")); + e.getPresentation().setIcon(AllIcons.General.AutoscrollFromSource); e.getPresentation().setText("Follow Selection"); e.getPresentation().setDescription("Follow Selection"); // change file diff --git a/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java b/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java index 46b01dd3699d..c880089c80d5 100644 --- a/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java +++ b/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/RepositoryBrowserDialog.java @@ -16,6 +16,7 @@ package org.jetbrains.idea.svn.dialogs; import com.intellij.CommonBundle; +import com.intellij.icons.AllIcons; import com.intellij.ide.CommonActionsManager; import com.intellij.ide.TreeExpander; import com.intellij.openapi.actionSystem.*; @@ -373,7 +374,7 @@ public class RepositoryBrowserDialog extends DialogWrapper { public void update(AnActionEvent e) { e.getPresentation().setText(SvnBundle.message("action.name.refresh")); e.getPresentation().setDescription(SvnBundle.message("repository.browser.refresh.action")); - e.getPresentation().setIcon(IconLoader.getIcon("/actions/sync.png")); + e.getPresentation().setIcon(AllIcons.Actions.Sync); e.getPresentation().setEnabled(getRepositoryBrowser().getSelectedNode() != null); } @@ -395,7 +396,7 @@ public class RepositoryBrowserDialog extends DialogWrapper { if (e.getPlace().equals(PLACE_TOOLBAR)) { e.getPresentation().setDescription(SvnBundle.message("repository.browser.add.location.action")); e.getPresentation().setText(SvnBundle.message("repository.browser.add.location.action")); - e.getPresentation().setIcon(IconLoader.getIcon("/general/add.png")); + e.getPresentation().setIcon(AllIcons.General.Add); } } @@ -424,7 +425,7 @@ public class RepositoryBrowserDialog extends DialogWrapper { if (e.getPlace().equals(PLACE_TOOLBAR)) { e.getPresentation().setDescription(SvnBundle.message("repository.browser.edit.location.menu.item")); e.getPresentation().setText(SvnBundle.message("repository.browser.edit.location.menu.item")); - e.getPresentation().setIcon(IconLoader.getIcon("/actions/editSource.png")); + e.getPresentation().setIcon(AllIcons.Actions.EditSource); } e.getPresentation().setEnabled(node != null && node.getParent() instanceof RepositoryTreeRootNode); } @@ -466,7 +467,7 @@ public class RepositoryBrowserDialog extends DialogWrapper { public void update(AnActionEvent e) { RepositoryTreeNode node = getRepositoryBrowser().getSelectedNode(); e.getPresentation().setText(SvnBundle.message("repository.browser.discard.location.action"), true); - e.getPresentation().setIcon(IconLoader.getIcon("/general/remove.png")); + e.getPresentation().setIcon(AllIcons.General.Remove); e.getPresentation().setEnabled(node != null && node.getParent() instanceof RepositoryTreeRootNode); } @@ -915,7 +916,7 @@ public class RepositoryBrowserDialog extends DialogWrapper { public void update(final AnActionEvent e) { e.getPresentation().setDescription(SvnBundle.message("repository.browser.details.action")); e.getPresentation().setText(SvnBundle.message("repository.browser.details.action")); - e.getPresentation().setIcon(IconLoader.getIcon("/actions/annotate.png")); + e.getPresentation().setIcon(AllIcons.Actions.Annotate); super.update(e); } @@ -1201,7 +1202,7 @@ public class RepositoryBrowserDialog extends DialogWrapper { public void update(AnActionEvent e) { e.getPresentation().setText("Close"); e.getPresentation().setDescription("Close this tool window"); - e.getPresentation().setIcon(IconLoader.getIcon("/actions/cancel.png")); + e.getPresentation().setIcon(AllIcons.Actions.Cancel); } } diff --git a/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java b/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java index ee05bb45841d..1cefce16cff5 100644 --- a/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java +++ b/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/dialogs/ToBeMergedDialog.java @@ -15,6 +15,7 @@ */ package org.jetbrains.idea.svn.dialogs; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.CommonShortcuts; import com.intellij.openapi.project.DumbAwareAction; @@ -315,7 +316,7 @@ public class ToBeMergedDialog extends DialogWrapper { private class MySelectAll extends DumbAwareAction { private MySelectAll() { - super("Select All", "Select All", IconLoader.getIcon("/actions/selectall.png")); + super("Select All", "Select All", AllIcons.Actions.Selectall); } @Override @@ -327,7 +328,7 @@ public class ToBeMergedDialog extends DialogWrapper { private class MyUnselectAll extends DumbAwareAction { private MyUnselectAll() { - super("Unselect All", "Unselect All", IconLoader.getIcon("/actions/unselectall.png")); + super("Unselect All", "Unselect All", AllIcons.Actions.Unselectall); } @Override diff --git a/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/history/RootsAndBranches.java b/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/history/RootsAndBranches.java index 15c8d5302923..4d320be13cee 100644 --- a/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/history/RootsAndBranches.java +++ b/plugins/svn4ideaOld/src/org/jetbrains/idea/svn/history/RootsAndBranches.java @@ -15,6 +15,7 @@ */ package org.jetbrains.idea.svn.history; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.progress.ProgressIndicator; @@ -442,7 +443,7 @@ public class RootsAndBranches implements CommittedChangeListDecorator { private class MyRefresh extends AnAction { private MyRefresh() { super(SvnBundle.message("committed.changes.action.merge.highlighting.refresh.text"), - SvnBundle.message("committed.changes.action.merge.highlighting.refresh.description"), IconLoader.getIcon("/actions/sync.png")); + SvnBundle.message("committed.changes.action.merge.highlighting.refresh.description"), AllIcons.Actions.Sync); } @Override diff --git a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java index e6ff279629d3..f8d919b70f2e 100644 --- a/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java +++ b/plugins/testng/src/com/theoryinpractice/testng/configuration/TestNGConfigurationEditor.java @@ -31,6 +31,7 @@ import com.intellij.execution.testframework.TestSearchScope; import com.intellij.execution.ui.AlternativeJREPanel; import com.intellij.execution.ui.CommonJavaParametersPanel; import com.intellij.execution.ui.ConfigurationModuleSelector; +import com.intellij.icons.AllIcons; import com.intellij.ide.util.TreeClassChooser; import com.intellij.ide.util.TreeClassChooserFactory; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -41,7 +42,6 @@ import com.intellij.openapi.module.Module; import com.intellij.openapi.options.SettingsEditor; import com.intellij.openapi.project.Project; import com.intellij.openapi.ui.*; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.JavaCodeFragment; import com.intellij.psi.PsiClass; @@ -148,7 +148,7 @@ public class TestNGConfigurationEditor extends SettingsEditor{ * My currently visible hint. May be null if there is no visible hint */ private LightweightHint myHint; - private final Icon myIcon = IconLoader.getIcon("/actions/intentionBulb.png"); + private final Icon myIcon = AllIcons.Actions.IntentionBulb; private Rectangle myLastHintBounds; public QuickFixManager(@Nullable final GuiEditor editor, @NotNull final T component, @NotNull final JViewport viewPort) { diff --git a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java index 8195e3e2ca88..518cf7c75b4c 100644 --- a/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java +++ b/plugins/ui-designer/src/com/intellij/uiDesigner/snapShooter/CreateSnapShotAction.java @@ -26,6 +26,7 @@ import com.intellij.execution.executors.DefaultRunExecutor; import com.intellij.execution.runners.ExecutionEnvironment; import com.intellij.execution.runners.ProgramRunner; import com.intellij.execution.util.JreVersionDetector; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeView; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; @@ -324,7 +325,7 @@ public class CreateSnapShotAction extends AnAction { @NonNls private static final String SWING_PACKAGE = "javax.swing."; private final Icon myUnknownComponentIcon = IconLoader.getIcon("/com/intellij/uiDesigner/icons/unknown.png"); - private final Icon myFormIcon = IconLoader.getIcon("/fileTypes/uiForm.png"); + private final Icon myFormIcon = AllIcons.FileTypes.UiForm; private MyDialog(Project project, final SnapShotClient client, final PsiDirectory dir) { super(project, true); diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerToolWindowManager.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerToolWindowManager.java index db44ebd075a2..c0819ebdf19c 100644 --- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerToolWindowManager.java +++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/DesignerToolWindowManager.java @@ -19,6 +19,7 @@ import com.intellij.designer.componentTree.ComponentTree; import com.intellij.designer.componentTree.ComponentTreeBuilder; import com.intellij.designer.designSurface.DesignerEditorPanel; import com.intellij.designer.propertyTable.PropertyTablePanel; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.components.ProjectComponent; @@ -231,7 +232,7 @@ public final class DesignerToolWindowManager implements ProjectComponent { } }; - AnAction collapseAll = new AnAction("Collapse All", null, IconLoader.getIcon("/general/collapseAll.png")) { + AnAction collapseAll = new AnAction("Collapse All", null, AllIcons.General.CollapseAll) { @Override public void actionPerformed(AnActionEvent e) { if (myTreeBuilder != null) { @@ -257,4 +258,4 @@ public final class DesignerToolWindowManager implements ProjectComponent { public String getComponentName() { return "UIDesignerToolWindowManager2"; } -} \ No newline at end of file +} diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/inspection/AbstractQuickFixManager.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/inspection/AbstractQuickFixManager.java index 306a03ddb570..86520c7eefef 100644 --- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/inspection/AbstractQuickFixManager.java +++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/inspection/AbstractQuickFixManager.java @@ -17,6 +17,7 @@ package com.intellij.designer.inspection; import com.intellij.designer.DesignerBundle; import com.intellij.designer.designSurface.DesignerEditorPanel; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.keymap.KeymapUtil; @@ -24,7 +25,6 @@ import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.ui.popup.ListPopup; import com.intellij.openapi.ui.popup.PopupStep; import com.intellij.openapi.ui.popup.util.BaseListPopupStep; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.wm.impl.VisibilityWatcher; import com.intellij.ui.HintHint; import com.intellij.ui.LightweightHint; @@ -319,10 +319,10 @@ public abstract class AbstractQuickFixManager { BorderFactory .createCompoundBorder(BorderFactory.createLineBorder(Color.orange, 2), BorderFactory.createEmptyBorder(2, 2, 2, 2)); - private static final Icon INTENTION_ICON = IconLoader.getIcon("/actions/realIntentionBulb.png"); - private static final Icon ARROW_ICON = IconLoader.getIcon("/general/arrowDown.png"); + private static final Icon INTENTION_ICON = AllIcons.Actions.RealIntentionBulb; + private static final Icon ARROW_ICON = AllIcons.General.ArrowDown; private static final Icon INACTIVE_ARROW_ICON = new EmptyIcon(ARROW_ICON.getIconWidth(), ARROW_ICON.getIconHeight()); - public static final Icon ICON = IconLoader.findIcon("/actions/intentionBulb.png"); + public static final Icon ICON = AllIcons.Actions.IntentionBulb; private class InspectionHint extends JLabel { private final RowIcon myInactiveIcon; @@ -368,4 +368,4 @@ public abstract class AbstractQuickFixManager { }); } } -} \ No newline at end of file +} diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/RestoreDefault.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/RestoreDefault.java index 3f36998c7a1e..278754346a57 100644 --- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/RestoreDefault.java +++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/RestoreDefault.java @@ -18,10 +18,10 @@ package com.intellij.designer.propertyTable.actions; import com.intellij.designer.DesignerBundle; import com.intellij.designer.propertyTable.Property; import com.intellij.designer.propertyTable.PropertyTable; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.Presentation; -import com.intellij.openapi.util.IconLoader; /** * @author Alexander Lobas @@ -36,7 +36,7 @@ public class RestoreDefault extends AnAction implements IPropertyTableAction { String text = DesignerBundle.message("designer.properties.restore_default"); presentation.setText(text); presentation.setDescription(text); - presentation.setIcon(IconLoader.getIcon("/actions/reset-to-default.png")); + presentation.setIcon(AllIcons.Actions.Reset_to_default); } @Override @@ -63,4 +63,4 @@ public class RestoreDefault extends AnAction implements IPropertyTableAction { public void actionPerformed(AnActionEvent e) { myTable.restoreDefaultValue(); } -} \ No newline at end of file +} diff --git a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/ShowJavadoc.java b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/ShowJavadoc.java index 06778d652f4d..150670bf138e 100644 --- a/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/ShowJavadoc.java +++ b/plugins/ui-designer/ui-designer-new/src/com/intellij/designer/propertyTable/actions/ShowJavadoc.java @@ -20,6 +20,7 @@ import com.intellij.codeInsight.documentation.DocumentationManager; import com.intellij.designer.DesignerBundle; import com.intellij.designer.propertyTable.Property; import com.intellij.designer.propertyTable.PropertyTable; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.Presentation; @@ -29,7 +30,6 @@ import com.intellij.openapi.ui.popup.JBPopupFactory; import com.intellij.openapi.util.ActionCallback; import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.text.StringUtil; import com.intellij.psi.PsiElement; import com.intellij.ui.awt.RelativePoint; @@ -50,7 +50,7 @@ public class ShowJavadoc extends AnAction implements IPropertyTableAction { String text = DesignerBundle.message("designer.properties.show.javadoc"); presentation.setText(text); presentation.setDescription(text); - presentation.setIcon(IconLoader.getIcon("/actions/help.png")); + presentation.setIcon(AllIcons.Actions.Help); } @Override @@ -115,4 +115,4 @@ public class ShowJavadoc extends AnAction implements IPropertyTableAction { callback.setDone(); } } -} \ No newline at end of file +} diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/AxisLookup.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/AxisLookup.java index c3708b1ce279..afdb00506643 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/AxisLookup.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/completion/AxisLookup.java @@ -15,7 +15,7 @@ */ package org.intellij.lang.xpath.completion; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.openapi.util.Iconable; import javax.swing.*; @@ -30,6 +30,6 @@ public class AxisLookup extends AbstractLookup implements Iconable { } public Icon getIcon(int flags) { - return IconLoader.getIcon("/nodes/j2eeParameter.png"); + return AllIcons.Nodes.J2eeParameter; } } diff --git a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java index f5db73c9ccd9..7bee604e2630 100644 --- a/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java +++ b/plugins/xpath/xpath-lang/src/org/intellij/lang/xpath/xslt/run/XsltRunSettingsEditor.java @@ -15,6 +15,7 @@ */ package org.intellij.lang.xpath.xslt.run; +import com.intellij.icons.AllIcons; import com.intellij.ide.ui.ListCellRendererWrapper; import com.intellij.openapi.actionSystem.LangDataKeys; import com.intellij.openapi.application.ApplicationManager; @@ -39,7 +40,6 @@ import com.intellij.openapi.ui.TextComponentAccessor; import com.intellij.openapi.ui.TextFieldWithBrowseButton; import com.intellij.openapi.util.Computable; import com.intellij.openapi.util.Condition; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Pair; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; @@ -222,7 +222,7 @@ class XsltRunSettingsEditor extends SettingsEditor { @Override public void customize(JList list, FileType type, int index, boolean selected, boolean hasFocus) { if (type == null) { - setIcon(IconLoader.getIcon("/actions/cancel.png")); + setIcon(AllIcons.Actions.Cancel); setText("Disabled"); } else { diff --git a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltDebuggerExtension.java b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltDebuggerExtension.java index 0ff1e04a7069..f48a5eadb601 100644 --- a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltDebuggerExtension.java +++ b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/XsltDebuggerExtension.java @@ -22,6 +22,7 @@ import com.intellij.execution.configurations.AdditionalTabComponentManager; import com.intellij.execution.configurations.SimpleJavaParameters; import com.intellij.execution.process.ProcessHandler; import com.intellij.execution.process.ProcessListener; +import com.intellij.icons.AllIcons; import com.intellij.ide.plugins.IdeaPluginDescriptor; import com.intellij.ide.plugins.PluginManager; import com.intellij.openapi.application.PathManager; @@ -30,7 +31,6 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.extensions.PluginId; import com.intellij.openapi.project.Project; import com.intellij.openapi.projectRoots.Sdk; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Key; import com.intellij.openapi.util.UserDataHolder; import com.intellij.openapi.vfs.JarFileSystem; @@ -88,7 +88,7 @@ public class XsltDebuggerExtension extends XsltRunnerExtension { ProcessHandler process) { if (manager instanceof DebuggerSessionTabBase) { final DebuggerSessionTabBase mgr = (DebuggerSessionTabBase)manager; - mgr.addAdditionalTabComponent(new OutputTabComponent(outputConsole), "XSLT-Output", IconLoader.getIcon("/debugger/console.png")); + mgr.addAdditionalTabComponent(new OutputTabComponent(outputConsole), "XSLT-Output", AllIcons.Debugger.Console); mgr.addAdditionalTabComponent(StructureTabComponent.create(process, outputConsole), "XSLT-Structure", PlatformIcons.FLATTEN_PACKAGES_ICON); } else { manager.addAdditionalTabComponent(new OutputTabComponent(outputConsole), "XSLT-Output"); diff --git a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/actions/OpenOutputAction.java b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/actions/OpenOutputAction.java index f4ad22123c9a..bae589cc01d0 100644 --- a/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/actions/OpenOutputAction.java +++ b/plugins/xslt-debugger/src/org/intellij/plugins/xsltDebugger/ui/actions/OpenOutputAction.java @@ -16,13 +16,13 @@ package org.intellij.plugins.xsltDebugger.ui.actions; import com.intellij.diagnostic.logging.AdditionalTabComponent; +import com.intellij.icons.AllIcons; import com.intellij.ide.DataManager; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.PlatformDataKeys; import com.intellij.openapi.editor.Editor; import com.intellij.openapi.fileEditor.FileEditorManager; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vcs.vfs.VcsFileSystem; import com.intellij.openapi.vcs.vfs.VcsVirtualFile; @@ -36,7 +36,7 @@ public class OpenOutputAction extends AnAction { public OpenOutputAction(AdditionalTabComponent console) { super("Open in Editor"); myConsole = console; - getTemplatePresentation().setIcon(IconLoader.getIcon("/actions/export.png")); + getTemplatePresentation().setIcon(AllIcons.Actions.Export); } public void actionPerformed(AnActionEvent e) { @@ -62,4 +62,4 @@ public class OpenOutputAction extends AnAction { final Editor editor = PlatformDataKeys.EDITOR.getData(DataManager.getInstance().getDataContext(myConsole.getComponent())); e.getPresentation().setEnabled(editor != null && editor.getDocument().getTextLength() > 0); } -} \ No newline at end of file +} diff --git a/resources/src/idea/JavaActions.xml b/resources/src/idea/JavaActions.xml index b510b4d4ce76..efc76f8b37cd 100644 --- a/resources/src/idea/JavaActions.xml +++ b/resources/src/idea/JavaActions.xml @@ -125,6 +125,11 @@ + + + + @@ -314,4 +319,4 @@ - \ No newline at end of file + diff --git a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementsErrorPanel.java b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementsErrorPanel.java index 0ba58cefa5cb..d9f1429edf54 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementsErrorPanel.java +++ b/xml/dom-impl/src/com/intellij/util/xml/highlighting/DomElementsErrorPanel.java @@ -18,12 +18,12 @@ package com.intellij.util.xml.highlighting; import com.intellij.codeInsight.daemon.impl.SeverityRegistrar; import com.intellij.codeInsight.daemon.impl.TrafficLightRenderer; +import com.intellij.icons.AllIcons; import com.intellij.lang.annotation.HighlightSeverity; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.Disposer; -import com.intellij.openapi.util.IconLoader; import com.intellij.psi.PsiDocumentManager; import com.intellij.psi.PsiFile; import com.intellij.util.Alarm; @@ -42,7 +42,7 @@ import java.awt.*; * User: Sergey.Vasiliev */ public class DomElementsErrorPanel extends JPanel implements CommittablePanel, Highlightable { - private static final Icon ERRORS_FOUND_ICON = IconLoader.getIcon("/general/errorsInProgress.png"); + private static final Icon ERRORS_FOUND_ICON = AllIcons.General.ErrorsInProgress; private static final int ALARM_PERIOD = 241; diff --git a/xml/dom-impl/src/com/intellij/util/xml/tree/actions/DeleteDomElement.java b/xml/dom-impl/src/com/intellij/util/xml/tree/actions/DeleteDomElement.java index ad0f561f699c..bbd2bf6c9a58 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/tree/actions/DeleteDomElement.java +++ b/xml/dom-impl/src/com/intellij/util/xml/tree/actions/DeleteDomElement.java @@ -16,12 +16,12 @@ package com.intellij.util.xml.tree.actions; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.application.ApplicationBundle; import com.intellij.openapi.application.Result; import com.intellij.openapi.command.WriteCommandAction; import com.intellij.openapi.ui.Messages; -import com.intellij.openapi.util.IconLoader; import com.intellij.ui.treeStructure.SimpleNode; import com.intellij.util.xml.DomElement; import com.intellij.util.xml.DomFileElement; @@ -93,7 +93,7 @@ public class DeleteDomElement extends BaseDomTreeAction { e.getPresentation().setText(ApplicationBundle.message("action.remove")); } - e.getPresentation().setIcon(IconLoader.getIcon("/general/remove.png")); + e.getPresentation().setIcon(AllIcons.General.Remove); } private static String getPresentationText(final SimpleNode selectedNode) { diff --git a/xml/dom-impl/src/com/intellij/util/xml/tree/actions/DomElementsToggleAction.java b/xml/dom-impl/src/com/intellij/util/xml/tree/actions/DomElementsToggleAction.java index 7e505339ed1c..9a1cb04e586c 100644 --- a/xml/dom-impl/src/com/intellij/util/xml/tree/actions/DomElementsToggleAction.java +++ b/xml/dom-impl/src/com/intellij/util/xml/tree/actions/DomElementsToggleAction.java @@ -16,12 +16,12 @@ package com.intellij.util.xml.tree.actions; +import com.intellij.icons.AllIcons; import com.intellij.ide.TypePresentationService; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.actionSystem.ToggleAction; -import com.intellij.openapi.util.IconLoader; -import com.intellij.util.xml.ElementPresentationManager; import com.intellij.util.xml.DomUtil; +import com.intellij.util.xml.ElementPresentationManager; import com.intellij.util.xml.tree.BaseDomElementNode; import com.intellij.util.xml.tree.DomModelTreeView; @@ -45,7 +45,7 @@ public class DomElementsToggleAction extends ToggleAction { Icon myIcon = ElementPresentationManager.getIcon(myClass); if (myIcon == null) { - myIcon = IconLoader.getIcon("/nodes/pointcut.png"); + myIcon = AllIcons.Nodes.Pointcut; } this.myIcon = myIcon; diff --git a/xml/dom-openapi/src/com/intellij/util/xml/ui/ErrorableTableCellRenderer.java b/xml/dom-openapi/src/com/intellij/util/xml/ui/ErrorableTableCellRenderer.java index 7c6806e39dfc..e1e504b78c19 100644 --- a/xml/dom-openapi/src/com/intellij/util/xml/ui/ErrorableTableCellRenderer.java +++ b/xml/dom-openapi/src/com/intellij/util/xml/ui/ErrorableTableCellRenderer.java @@ -16,8 +16,8 @@ package com.intellij.util.xml.ui; +import com.intellij.icons.AllIcons; import com.intellij.lang.annotation.HighlightSeverity; -import com.intellij.openapi.util.IconLoader; import com.intellij.util.xml.DomElement; import com.intellij.util.xml.DomUtil; import com.intellij.util.xml.highlighting.DomElementAnnotationsManager; @@ -117,6 +117,6 @@ public class ErrorableTableCellRenderer extends DefaultTab } private static Icon getErrorIcon() { - return IconLoader.getIcon("/general/exclMark.png"); + return AllIcons.General.ExclMark; } } diff --git a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNSRenderer.java b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNSRenderer.java index 1bb8183b07c3..e604ded6cca1 100644 --- a/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNSRenderer.java +++ b/xml/impl/src/com/intellij/codeInsight/daemon/impl/analysis/XmlNSRenderer.java @@ -15,11 +15,11 @@ */ package com.intellij.codeInsight.daemon.impl.analysis; +import com.intellij.icons.AllIcons; +import com.intellij.openapi.editor.colors.EditorColorsManager; +import com.intellij.openapi.editor.colors.EditorColorsScheme; import com.intellij.ui.ColoredListCellRenderer; import com.intellij.ui.SimpleTextAttributes; -import com.intellij.openapi.util.IconLoader; -import com.intellij.openapi.editor.colors.EditorColorsScheme; -import com.intellij.openapi.editor.colors.EditorColorsManager; import javax.swing.*; import java.awt.*; @@ -31,7 +31,7 @@ public class XmlNSRenderer extends ColoredListCellRenderer { public static final XmlNSRenderer INSTANCE = new XmlNSRenderer(); - private static final Icon ICON = IconLoader.getIcon("/nodes/static.png"); + private static final Icon ICON = AllIcons.Nodes.Static; public XmlNSRenderer() { EditorColorsScheme scheme = EditorColorsManager.getInstance().getGlobalScheme(); diff --git a/xml/impl/src/com/intellij/ide/browsers/BrowsersConfiguration.java b/xml/impl/src/com/intellij/ide/browsers/BrowsersConfiguration.java index 2755ad237d5b..c32835f38f73 100644 --- a/xml/impl/src/com/intellij/ide/browsers/BrowsersConfiguration.java +++ b/xml/impl/src/com/intellij/ide/browsers/BrowsersConfiguration.java @@ -16,6 +16,7 @@ package com.intellij.ide.browsers; import com.intellij.execution.util.ExecUtil; +import com.intellij.icons.AllIcons; import com.intellij.ide.BrowserUtil; import com.intellij.ide.browsers.chrome.ChromeSettings; import com.intellij.ide.browsers.firefox.FirefoxSettings; @@ -24,7 +25,6 @@ import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.ui.Messages; import com.intellij.openapi.util.Condition; import com.intellij.openapi.util.Conditions; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.SystemInfo; import com.intellij.openapi.util.io.FileUtil; import com.intellij.util.ArrayUtil; @@ -54,16 +54,16 @@ public class BrowsersConfiguration implements PersistentStateComponent private static final Logger LOG = Logger.getInstance("#com.intellij.ide.browsers.BrowsersConfiguration"); public static enum BrowserFamily { - EXPLORER(XmlBundle.message("browsers.explorer"), "iexplore", null, null, IconLoader.getIcon("/xml/browsers/explorer16.png")), - SAFARI(XmlBundle.message("browsers.safari"), "safari", null, "Safari", IconLoader.getIcon("/xml/browsers/safari16.png")), - OPERA(XmlBundle.message("browsers.opera"), "opera", "opera", "Opera", IconLoader.getIcon("/xml/browsers/opera16.png")), - FIREFOX(XmlBundle.message("browsers.firefox"), "firefox", "firefox", "Firefox", IconLoader.getIcon("/xml/browsers/firefox16.png")) { + EXPLORER(XmlBundle.message("browsers.explorer"), "iexplore", null, null, AllIcons.Xml.Browsers.Explorer16), + SAFARI(XmlBundle.message("browsers.safari"), "safari", null, "Safari", AllIcons.Xml.Browsers.Safari16), + OPERA(XmlBundle.message("browsers.opera"), "opera", "opera", "Opera", AllIcons.Xml.Browsers.Opera16), + FIREFOX(XmlBundle.message("browsers.firefox"), "firefox", "firefox", "Firefox", AllIcons.Xml.Browsers.Firefox16) { @Override public BrowserSpecificSettings createBrowserSpecificSettings() { return new FirefoxSettings(); } }, - CHROME(XmlBundle.message("browsers.chrome"), getWindowsPathToChrome(), "google-chrome", "Google Chrome", IconLoader.getIcon("/xml/browsers/chrome16.png")) { + CHROME(XmlBundle.message("browsers.chrome"), getWindowsPathToChrome(), "google-chrome", "Google Chrome", AllIcons.Xml.Browsers.Chrome16) { @Override public BrowserSpecificSettings createBrowserSpecificSettings() { return new ChromeSettings(); diff --git a/xml/impl/src/com/intellij/ide/highlighter/DTDFileType.java b/xml/impl/src/com/intellij/ide/highlighter/DTDFileType.java index 63b566166903..a22536242ec3 100644 --- a/xml/impl/src/com/intellij/ide/highlighter/DTDFileType.java +++ b/xml/impl/src/com/intellij/ide/highlighter/DTDFileType.java @@ -15,16 +15,16 @@ */ package com.intellij.ide.highlighter; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.lang.dtd.DTDLanguage; import com.intellij.openapi.fileTypes.LanguageFileType; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NotNull; import javax.swing.*; public class DTDFileType extends LanguageFileType { - private static final Icon ICON = IconLoader.getIcon("/fileTypes/dtd.png"); + private static final Icon ICON = AllIcons.FileTypes.Dtd; public static final DTDFileType INSTANCE = new DTDFileType(); public DTDFileType() { @@ -49,4 +49,4 @@ public class DTDFileType extends LanguageFileType { public Icon getIcon() { return ICON; } -} \ No newline at end of file +} diff --git a/xml/impl/src/com/intellij/ide/highlighter/HtmlFileType.java b/xml/impl/src/com/intellij/ide/highlighter/HtmlFileType.java index 9134b061f40d..6a59439be358 100644 --- a/xml/impl/src/com/intellij/ide/highlighter/HtmlFileType.java +++ b/xml/impl/src/com/intellij/ide/highlighter/HtmlFileType.java @@ -15,11 +15,11 @@ */ package com.intellij.ide.highlighter; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.lang.Language; import com.intellij.lang.html.HTMLLanguage; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.CharsetToolkit; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.xml.util.HtmlUtil; @@ -34,7 +34,7 @@ import java.nio.charset.Charset; public class HtmlFileType extends XmlLikeFileType { @NonNls public static final String DOT_DEFAULT_EXTENSION = ".html"; - private static final Icon ICON = IconLoader.getIcon("/fileTypes/html.png"); + private static final Icon ICON = AllIcons.FileTypes.Html; public final static HtmlFileType INSTANCE = new HtmlFileType(); @@ -88,4 +88,4 @@ public class HtmlFileType extends XmlLikeFileType { } return HtmlUtil.detectCharsetFromMetaHttpEquiv(content); } -} \ No newline at end of file +} diff --git a/xml/impl/src/com/intellij/ide/highlighter/XHtmlFileType.java b/xml/impl/src/com/intellij/ide/highlighter/XHtmlFileType.java index 3d96410ec2dc..6e388054a4af 100644 --- a/xml/impl/src/com/intellij/ide/highlighter/XHtmlFileType.java +++ b/xml/impl/src/com/intellij/ide/highlighter/XHtmlFileType.java @@ -15,15 +15,15 @@ */ package com.intellij.ide.highlighter; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.lang.xhtml.XHTMLLanguage; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NotNull; import javax.swing.*; public class XHtmlFileType extends HtmlFileType { - private static final Icon ICON = IconLoader.getIcon("/fileTypes/xhtml.png"); + private static final Icon ICON = AllIcons.FileTypes.Xhtml; public static final XHtmlFileType INSTANCE = new XHtmlFileType(); private XHtmlFileType() { @@ -48,4 +48,4 @@ public class XHtmlFileType extends HtmlFileType { public Icon getIcon() { return ICON; } -} \ No newline at end of file +} diff --git a/xml/impl/src/com/intellij/ide/highlighter/XmlFileType.java b/xml/impl/src/com/intellij/ide/highlighter/XmlFileType.java index d7d2c1cd39a7..b052e5e888ce 100644 --- a/xml/impl/src/com/intellij/ide/highlighter/XmlFileType.java +++ b/xml/impl/src/com/intellij/ide/highlighter/XmlFileType.java @@ -15,9 +15,9 @@ */ package com.intellij.ide.highlighter; +import com.intellij.icons.AllIcons; import com.intellij.ide.IdeBundle; import com.intellij.lang.xml.XMLLanguage; -import com.intellij.openapi.util.IconLoader; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -27,7 +27,7 @@ public class XmlFileType extends XmlLikeFileType implements DomSupportEnabled { public static final XmlFileType INSTANCE = new XmlFileType(); @NonNls public static final String DEFAULT_EXTENSION = "xml"; @NonNls public static final String DOT_DEFAULT_EXTENSION = "."+DEFAULT_EXTENSION; - private static final Icon ICON = IconLoader.getIcon("/fileTypes/xml.png"); + private static final Icon ICON = AllIcons.FileTypes.Xml; private XmlFileType() { super(XMLLanguage.INSTANCE); @@ -51,4 +51,4 @@ public class XmlFileType extends XmlLikeFileType implements DomSupportEnabled { public Icon getIcon() { return ICON; } -} \ No newline at end of file +} diff --git a/xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java b/xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java index fbb822b11055..e084fabdb6d7 100644 --- a/xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java +++ b/xml/impl/src/com/intellij/javaee/ExternalResourceConfigurable.java @@ -15,13 +15,13 @@ */ package com.intellij.javaee; +import com.intellij.icons.AllIcons; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.options.BaseConfigurable; import com.intellij.openapi.options.Configurable; import com.intellij.openapi.options.OptionalConfigurable; import com.intellij.openapi.options.SearchableConfigurable; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.vfs.JarFileSystem; import com.intellij.openapi.vfs.LocalFileSystem; @@ -151,7 +151,7 @@ public class ExternalResourceConfigurable extends BaseConfigurable implements Se } public Icon getIcon() { - return IconLoader.getIcon("/general/configurableExternalResources.png"); + return AllIcons.General.ConfigurableExternalResources; } public void apply() { diff --git a/xml/impl/src/com/intellij/xml/util/XmlIconProvider.java b/xml/impl/src/com/intellij/xml/util/XmlIconProvider.java index d2ab211ea2cb..5b24594f9ed7 100644 --- a/xml/impl/src/com/intellij/xml/util/XmlIconProvider.java +++ b/xml/impl/src/com/intellij/xml/util/XmlIconProvider.java @@ -15,9 +15,9 @@ */ package com.intellij.xml.util; +import com.intellij.icons.AllIcons; import com.intellij.ide.IconProvider; import com.intellij.openapi.project.DumbAware; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.psi.impl.ElementBase; @@ -32,8 +32,8 @@ import javax.swing.*; * @author peter */ public class XmlIconProvider extends IconProvider implements DumbAware { - private static final Icon ourXsdIcon = IconLoader.getIcon("/fileTypes/xsdFile.png"); - private static final Icon ourWsdlIcon = IconLoader.getIcon("/fileTypes/wsdlFile.png"); + private static final Icon ourXsdIcon = AllIcons.FileTypes.XsdFile; + private static final Icon ourWsdlIcon = AllIcons.FileTypes.WsdlFile; @NonNls private static final String XSD_FILE_EXTENSION = "xsd"; @NonNls private static final String WSDL_FILE_EXTENSION = "wsdl"; diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RncFileType.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RncFileType.java index c464eaf1af85..1b5906e89a4c 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RncFileType.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/RncFileType.java @@ -16,11 +16,11 @@ package org.intellij.plugins.relaxNG.compact; +import com.intellij.icons.AllIcons; import com.intellij.openapi.fileTypes.FileType; import com.intellij.openapi.fileTypes.FileTypeConsumer; import com.intellij.openapi.fileTypes.FileTypeFactory; import com.intellij.openapi.fileTypes.LanguageFileType; -import com.intellij.openapi.util.IconLoader; import com.intellij.util.PairConsumer; import org.jetbrains.annotations.NonNls; import org.jetbrains.annotations.NotNull; @@ -61,7 +61,7 @@ public class RncFileType extends LanguageFileType { @Nullable public Icon getIcon() { - return IconLoader.findIcon("/fileTypes/text.png"); + return AllIcons.FileTypes.Text; } public static synchronized FileType getInstance() { @@ -80,4 +80,4 @@ public class RncFileType extends LanguageFileType { consumer.consume(getInstance(), RNC_EXT); } } -} \ No newline at end of file +} diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncDefineImpl.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncDefineImpl.java index 55f5e45a90ea..b1516f207612 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncDefineImpl.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/compact/psi/impl/RncDefineImpl.java @@ -16,8 +16,8 @@ package org.intellij.plugins.relaxNG.compact.psi.impl; +import com.intellij.icons.AllIcons; import com.intellij.lang.ASTNode; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.util.Iconable; import com.intellij.openapi.util.TextRange; import com.intellij.psi.PsiElement; @@ -121,7 +121,7 @@ public class RncDefineImpl extends RncElementImpl implements RncDefine, PsiMetaO @Nullable public Icon getIcon(int flags) { - return IconLoader.findIcon("/nodes/property.png"); + return AllIcons.Nodes.Property; } public boolean isMetaEnough() { diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/convert/AdvancedDtdOptions.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/convert/AdvancedDtdOptions.java index 7c3c3e457863..9e72a15ec849 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/convert/AdvancedDtdOptions.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/convert/AdvancedDtdOptions.java @@ -16,9 +16,9 @@ package org.intellij.plugins.relaxNG.convert; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.*; import com.intellij.openapi.project.Project; -import com.intellij.openapi.util.IconLoader; import com.intellij.openapi.vfs.VirtualFile; import com.intellij.psi.PsiElement; import com.intellij.psi.PsiFile; @@ -88,7 +88,7 @@ public class AdvancedDtdOptions implements AdvancedOptions { myNamespaceMap.getColumnModel().getColumn(0).setMaxWidth((int)(new JLabel("Prefix").getPreferredSize().width * 1.2)); final DefaultActionGroup group = new DefaultActionGroup(); - group.add(new AnAction(null, "Remove Entry", IconLoader.findIcon("/general/remove.png")) { + group.add(new AnAction(null, "Remove Entry", AllIcons.General.Remove) { public void update(AnActionEvent e) { if (myNamespaceMap.getModel().getRowCount() == 0 || myNamespaceMap.getSelectedRow() == -1) { e.getPresentation().setEnabled(false); diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/model/annotation/OverriddenDefineRenderer.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/model/annotation/OverriddenDefineRenderer.java index e5a2dd9a4089..ff161075ebf6 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/model/annotation/OverriddenDefineRenderer.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/model/annotation/OverriddenDefineRenderer.java @@ -16,10 +16,10 @@ package org.intellij.plugins.relaxNG.model.annotation; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.editor.markup.GutterIconRenderer; -import com.intellij.openapi.util.IconLoader; import com.intellij.psi.PsiElement; import com.intellij.psi.search.PsiElementProcessor; import com.intellij.psi.xml.XmlFile; @@ -36,7 +36,7 @@ import java.util.Collection; import java.util.List; class OverriddenDefineRenderer extends GutterIconRenderer { - private static final Icon ICON = IconLoader.getIcon("/gutter/overridenMethod.png"); + private static final Icon ICON = AllIcons.Gutter.OverridenMethod; private final Define myDefine; @@ -101,4 +101,4 @@ class OverriddenDefineRenderer extends GutterIconRenderer { public int hashCode() { return myDefine.hashCode(); } -} \ No newline at end of file +} diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/model/annotation/OverridingDefineRenderer.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/model/annotation/OverridingDefineRenderer.java index 4ed7e873b82e..b60d1067fee8 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/model/annotation/OverridingDefineRenderer.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/model/annotation/OverridingDefineRenderer.java @@ -17,10 +17,10 @@ package org.intellij.plugins.relaxNG.model.annotation; import com.intellij.codeInsight.navigation.NavigationUtil; +import com.intellij.icons.AllIcons; import com.intellij.openapi.actionSystem.AnAction; import com.intellij.openapi.actionSystem.AnActionEvent; import com.intellij.openapi.editor.markup.GutterIconRenderer; -import com.intellij.openapi.util.IconLoader; import com.intellij.pom.Navigatable; import com.intellij.psi.PsiElement; import com.intellij.ui.awt.RelativePoint; @@ -37,7 +37,7 @@ import java.util.Collection; import java.util.Set; class OverridingDefineRenderer extends GutterIconRenderer { - private static final Icon ICON = IconLoader.getIcon("/gutter/overridingMethod.png"); + private static final Icon ICON = AllIcons.Gutter.OverridingMethod; private final Set mySet; private final String myMessage; @@ -105,4 +105,4 @@ class OverridingDefineRenderer extends GutterIconRenderer { result = 31 * result + (myMessage != null ? myMessage.hashCode() : 0); return result; } -} \ No newline at end of file +} diff --git a/xml/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/impl/RngDefineMetaData.java b/xml/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/impl/RngDefineMetaData.java index d0d0bdb6d32b..92d0c3db7ccd 100644 --- a/xml/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/impl/RngDefineMetaData.java +++ b/xml/relaxng/src/org/intellij/plugins/relaxNG/xml/dom/impl/RngDefineMetaData.java @@ -16,7 +16,7 @@ package org.intellij.plugins.relaxNG.xml.dom.impl; -import com.intellij.openapi.util.IconLoader; +import com.intellij.icons.AllIcons; import com.intellij.util.IncorrectOperationException; import com.intellij.util.xml.DomMetaData; import com.intellij.util.xml.GenericAttributeValue; @@ -47,7 +47,7 @@ public class RngDefineMetaData extends DomMetaData { } public Icon getIcon() { - return IconLoader.findIcon("/nodes/property.png"); + return AllIcons.Nodes.Property; } public String getTypeName() {