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 604c703d930f..e6dffa28d0fe 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,7 +15,6 @@ */ 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; @@ -44,7 +43,6 @@ 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 = AllIcons.Modules.Annotation; public AnnotationsEditor(final ModuleConfigurationState state) { super(state); 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 0c85f1056a9c..fdac928793ca 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,7 +16,6 @@ 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; @@ -45,7 +44,6 @@ 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 = AllIcons.Modules.Classpath; private ClasspathPanelImpl myPanel; 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 480851327017..211a71c90aa2 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,7 +15,6 @@ */ 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; @@ -46,8 +45,7 @@ import java.util.List; public class JavadocEditor extends ModuleElementsEditor { private JTable myTable; - public static final String NAME = ProjectBundle.message("module.javadoc.title"); - public static final Icon ICON = AllIcons.Modules.Javadoc; + private static final String NAME = ProjectBundle.message("module.javadoc.title"); public JavadocEditor(ModuleConfigurationState state) { super(state); diff --git a/platform/icons/src/modules/CenterGeneralTitleBar.png b/platform/icons/src/modules/CenterGeneralTitleBar.png deleted file mode 100644 index 02df149bf1d5..000000000000 Binary files a/platform/icons/src/modules/CenterGeneralTitleBar.png and /dev/null differ diff --git a/platform/icons/src/modules/addExistingModule.png b/platform/icons/src/modules/addExistingModule.png deleted file mode 100644 index 76848904b9a8..000000000000 Binary files a/platform/icons/src/modules/addExistingModule.png and /dev/null differ diff --git a/platform/icons/src/modules/addLibraries.png b/platform/icons/src/modules/addLibraries.png deleted file mode 100644 index d4848c203344..000000000000 Binary files a/platform/icons/src/modules/addLibraries.png and /dev/null differ diff --git a/platform/icons/src/modules/bottomCenter.png b/platform/icons/src/modules/bottomCenter.png deleted file mode 100644 index 88588016fd39..000000000000 Binary files a/platform/icons/src/modules/bottomCenter.png and /dev/null differ diff --git a/platform/icons/src/modules/bottomLeftCorner.png b/platform/icons/src/modules/bottomLeftCorner.png deleted file mode 100644 index a3aa6c37f17f..000000000000 Binary files a/platform/icons/src/modules/bottomLeftCorner.png and /dev/null differ diff --git a/platform/icons/src/modules/bottomRightCorner.png b/platform/icons/src/modules/bottomRightCorner.png deleted file mode 100644 index 1bcdae5362fd..000000000000 Binary files a/platform/icons/src/modules/bottomRightCorner.png and /dev/null differ diff --git a/platform/icons/src/modules/classpath.png b/platform/icons/src/modules/classpath.png deleted file mode 100644 index 487b7c80f93b..000000000000 Binary files a/platform/icons/src/modules/classpath.png and /dev/null differ diff --git a/platform/icons/src/modules/createNewModule.png b/platform/icons/src/modules/createNewModule.png deleted file mode 100644 index 2ffbe0a8b4a6..000000000000 Binary files a/platform/icons/src/modules/createNewModule.png and /dev/null differ diff --git a/platform/icons/src/modules/dependencies.png b/platform/icons/src/modules/dependencies.png deleted file mode 100644 index cb2033c58b72..000000000000 Binary files a/platform/icons/src/modules/dependencies.png and /dev/null differ diff --git a/platform/icons/src/modules/edit.png b/platform/icons/src/modules/edit.png deleted file mode 100644 index bd9bca941726..000000000000 Binary files a/platform/icons/src/modules/edit.png and /dev/null differ diff --git a/platform/icons/src/modules/editLibraries.png b/platform/icons/src/modules/editLibraries.png deleted file mode 100644 index 2d16bf4a9d6e..000000000000 Binary files a/platform/icons/src/modules/editLibraries.png and /dev/null differ diff --git a/platform/icons/src/modules/javadoc.png b/platform/icons/src/modules/javadoc.png deleted file mode 100644 index 20255eb973f8..000000000000 Binary files a/platform/icons/src/modules/javadoc.png and /dev/null differ diff --git a/platform/icons/src/modules/libraries.png b/platform/icons/src/modules/libraries.png deleted file mode 100644 index 4544dd9d5361..000000000000 Binary files a/platform/icons/src/modules/libraries.png and /dev/null differ diff --git a/platform/icons/src/modules/order.png b/platform/icons/src/modules/order.png deleted file mode 100644 index fb80bd0084de..000000000000 Binary files a/platform/icons/src/modules/order.png and /dev/null differ diff --git a/platform/icons/src/modules/paths.png b/platform/icons/src/modules/paths.png deleted file mode 100644 index 4285ad82dc89..000000000000 Binary files a/platform/icons/src/modules/paths.png and /dev/null differ diff --git a/platform/icons/src/modules/remove.png b/platform/icons/src/modules/remove.png deleted file mode 100644 index aa2ea96ec66c..000000000000 Binary files a/platform/icons/src/modules/remove.png and /dev/null differ diff --git a/platform/icons/src/modules/unmarkSource.png b/platform/icons/src/modules/unmarkSource.png deleted file mode 100644 index 0e25ad6864ef..000000000000 Binary files a/platform/icons/src/modules/unmarkSource.png and /dev/null differ diff --git a/platform/icons/src/modules/unmarkTests.png b/platform/icons/src/modules/unmarkTests.png deleted file mode 100644 index 7c2c8ddba4da..000000000000 Binary files a/platform/icons/src/modules/unmarkTests.png and /dev/null differ diff --git a/platform/lang-impl/src/com/intellij/openapi/module/EmptyModuleType.java b/platform/lang-impl/src/com/intellij/openapi/module/EmptyModuleType.java index e53f4db3e997..8d9e51455985 100644 --- a/platform/lang-impl/src/com/intellij/openapi/module/EmptyModuleType.java +++ b/platform/lang-impl/src/com/intellij/openapi/module/EmptyModuleType.java @@ -24,8 +24,6 @@ import javax.swing.*; public class EmptyModuleType extends ModuleType { 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(); @@ -59,6 +57,6 @@ public class EmptyModuleType extends ModuleType { } public Icon getNodeIcon(boolean isOpened) { - return isOpened ? NODE_ICON_OPEN : NODE_ICON_CLOSED; + return isOpened ? AllIcons.Nodes.ModuleOpen : AllIcons.Nodes.ModuleClosed; } } diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java index 0c9b4579c80e..70f462893e2b 100644 --- a/platform/util/src/com/intellij/icons/AllIcons.java +++ b/platform/util/src/com/intellij/icons/AllIcons.java @@ -8,8 +8,8 @@ public class AllIcons { public static class Actions { public static final Icon AddFacesSupport = IconLoader.getIcon("/actions/addFacesSupport.png"); - public static final Icon Annotate = IconLoader.getIcon("/actions/annotate.png"); - public static final Icon Back = IconLoader.getIcon("/actions/back.png"); + public static final Icon Annotate = IconLoader.getIcon("/actions/annotate.png"); + public static final Icon Back = IconLoader.getIcon("/actions/back.png"); public static final Icon Browser_externalJavaDoc = IconLoader.getIcon("/actions/browser-externalJavaDoc.png"); public static final Icon Cancel = IconLoader.getIcon("/actions/cancel.png"); public static final Icon Checked = IconLoader.getIcon("/actions/checked.png"); @@ -56,8 +56,8 @@ public class AllIcons { public static final Icon GC = IconLoader.getIcon("/actions/gc.png"); public static final Icon Get = IconLoader.getIcon("/actions/get.png"); public static final Icon GroupByMethod = IconLoader.getIcon("/actions/groupByMethod.png"); - public static final Icon Help = IconLoader.getIcon("/actions/help.png"); - public static final Icon Import = IconLoader.getIcon("/actions/import.png"); + public static final Icon Help = IconLoader.getIcon("/actions/help.png"); + public static final Icon Import = IconLoader.getIcon("/actions/import.png"); public static final Icon Install = IconLoader.getIcon("/actions/install.png"); public static final Icon IntentionBulb = IconLoader.getIcon("/actions/intentionBulb.png"); public static final Icon IntentionOffBulb = IconLoader.getIcon("/actions/intentionOffBulb.png"); @@ -68,20 +68,20 @@ public class AllIcons { public static final Icon Menu_open = IconLoader.getIcon("/actions/menu-open.png"); public static final Icon Menu_paste = IconLoader.getIcon("/actions/menu-paste.png"); public static final Icon Menu_replace = IconLoader.getIcon("/actions/menu-replace.png"); - public static final Icon Menu_saveall = IconLoader.getIcon("/actions/menu-saveall.png"); - public static final Icon Minimize = IconLoader.getIcon("/actions/minimize.png"); + public static final Icon Menu_saveall = IconLoader.getIcon("/actions/menu-saveall.png"); + public static final Icon Minimize = IconLoader.getIcon("/actions/minimize.png"); public static final Icon Modul = IconLoader.getIcon("/actions/modul.png"); public static final Icon Move_to_button_top = IconLoader.getIcon("/actions/move-to-button-top.png"); public static final Icon Move_to_button = IconLoader.getIcon("/actions/move-to-button.png"); public static final Icon MoveDown = IconLoader.getIcon("/actions/moveDown.png"); - public static final Icon MoveUp = IconLoader.getIcon("/actions/moveUp.png"); - public static final Icon New = IconLoader.getIcon("/actions/new.png"); + public static final Icon MoveUp = IconLoader.getIcon("/actions/moveUp.png"); + public static final Icon New = IconLoader.getIcon("/actions/new.png"); public static final Icon NewFolder = IconLoader.getIcon("/actions/newFolder.png"); public static final Icon Nextfile = IconLoader.getIcon("/actions/nextfile.png"); - public static final Icon NextOccurence = IconLoader.getIcon("/actions/nextOccurence.png"); - public static final Icon Pause = IconLoader.getIcon("/actions/pause.png"); - public static final Icon PopFrame = IconLoader.getIcon("/actions/popFrame.png"); - public static final Icon Prevfile = IconLoader.getIcon("/actions/prevfile.png"); + public static final Icon NextOccurence = IconLoader.getIcon("/actions/nextOccurence.png"); + public static final Icon Pause = IconLoader.getIcon("/actions/pause.png"); + public static final Icon PopFrame = IconLoader.getIcon("/actions/popFrame.png"); + public static final Icon Prevfile = IconLoader.getIcon("/actions/prevfile.png"); public static final Icon Preview = IconLoader.getIcon("/actions/preview.png"); public static final Icon PreviousOccurence = IconLoader.getIcon("/actions/previousOccurence.png"); public static final Icon ProfileCPU = IconLoader.getIcon("/actions/profileCPU.png"); @@ -118,11 +118,11 @@ public class AllIcons { public static final Icon SortAsc = IconLoader.getIcon("/actions/sortAsc.png"); public static final Icon SortDesc = IconLoader.getIcon("/actions/sortDesc.png"); public static final Icon SplitHorizontally = IconLoader.getIcon("/actions/splitHorizontally.png"); - public static final Icon SplitVertically = IconLoader.getIcon("/actions/splitVertically.png"); - public static final Icon StartDebugger = IconLoader.getIcon("/actions/startDebugger.png"); + public static final Icon SplitVertically = IconLoader.getIcon("/actions/splitVertically.png"); + public static final Icon StartDebugger = IconLoader.getIcon("/actions/startDebugger.png"); public static final Icon StepOut = IconLoader.getIcon("/actions/stepOut.png"); - public static final Icon Submit1 = IconLoader.getIcon("/actions/submit1.png"); - public static final Icon Suspend = IconLoader.getIcon("/actions/suspend.png"); + public static final Icon Submit1 = IconLoader.getIcon("/actions/submit1.png"); + public static final Icon Suspend = IconLoader.getIcon("/actions/suspend.png"); public static final Icon SwapPanels = IconLoader.getIcon("/actions/swapPanels.png"); public static final Icon Sync = IconLoader.getIcon("/actions/sync.png"); public static final Icon SyncPanels = IconLoader.getIcon("/actions/syncPanels.png"); @@ -135,18 +135,6 @@ public class AllIcons { public static final Icon Unshare = IconLoader.getIcon("/actions/unshare.png"); } - - public static class Providers { - public static final Icon Apache = IconLoader.getIcon("/providers/apache.png"); - public static final Icon Ibm = IconLoader.getIcon("/providers/ibm.png"); - public static final Icon Microsoft = IconLoader.getIcon("/providers/microsoft.png"); - public static final Icon Oracle = IconLoader.getIcon("/providers/oracle.png"); - public static final Icon Sqlite = IconLoader.getIcon("/providers/sqlite.png"); - public static final Icon Sun = IconLoader.getIcon("/providers/sun.png"); - public static final Icon Mysql = IconLoader.getIcon("/providers/mysql.png"); - public static final Icon Postgresql = IconLoader.getIcon("/providers/postgresql.png"); - public static final Icon Hibernate = IconLoader.getIcon("/providers/hibernate.png"); - } public static class Ant { public static final Icon AllJarsInDir = IconLoader.getIcon("/ant/allJarsInDir.png"); @@ -715,37 +703,21 @@ public class AllIcons { public static class Modules { public static final Icon AddContentEntry = IconLoader.getIcon("/modules/addContentEntry.png"); - public static final Icon AddExistingModule = IconLoader.getIcon("/modules/addExistingModule.png"); - public static final Icon AddLibraries = IconLoader.getIcon("/modules/addLibraries.png"); public static final Icon Annotation = IconLoader.getIcon("/modules/annotation.png"); - public static final Icon BottomCenter = IconLoader.getIcon("/modules/bottomCenter.png"); - public static final Icon BottomLeftCorner = IconLoader.getIcon("/modules/bottomLeftCorner.png"); - public static final Icon BottomRightCorner = IconLoader.getIcon("/modules/bottomRightCorner.png"); - public static final Icon CenterGeneralTitleBar = IconLoader.getIcon("/modules/CenterGeneralTitleBar.png"); - public static final Icon Classpath = IconLoader.getIcon("/modules/classpath.png"); - public static final Icon CreateNewModule = IconLoader.getIcon("/modules/createNewModule.png"); public static final Icon DeleteContentFolder = IconLoader.getIcon("/modules/deleteContentFolder.png"); public static final Icon DeleteContentFolderRollover = IconLoader.getIcon("/modules/deleteContentFolderRollover.png"); public static final Icon DeleteContentRoot = IconLoader.getIcon("/modules/deleteContentRoot.png"); public static final Icon DeleteContentRootRollover = IconLoader.getIcon("/modules/deleteContentRootRollover.png"); - public static final Icon Dependencies = IconLoader.getIcon("/modules/dependencies.png"); - public static final Icon Edit = IconLoader.getIcon("/modules/edit.png"); - public static final Icon EditLibraries = IconLoader.getIcon("/modules/editLibraries.png"); public static final Icon EmptyProjectType = IconLoader.getIcon("/modules/emptyProjectType.png"); public static final Icon ExcludeFolder = IconLoader.getIcon("/modules/excludeFolder.png"); public static final Icon ExcludeRootClosed = IconLoader.getIcon("/modules/excludeRootClosed.png"); public static final Icon ExcludeRootOpened = IconLoader.getIcon("/modules/excludeRootOpened.png"); - public static final Icon Javadoc = IconLoader.getIcon("/modules/javadoc.png"); public static final Icon JavaModule = IconLoader.getIcon("/modules/javaModule.png"); - public static final Icon Libraries = IconLoader.getIcon("/modules/libraries.png"); public static final Icon Library = IconLoader.getIcon("/modules/library.png"); public static final Icon Merge = IconLoader.getIcon("/modules/merge.png"); public static final Icon ModulesNode = IconLoader.getIcon("/modules/modulesNode.png"); - public static final Icon Order = IconLoader.getIcon("/modules/order.png"); public static final Icon Output = IconLoader.getIcon("/modules/output.png"); - public static final Icon Paths = IconLoader.getIcon("/modules/paths.png"); public static final Icon PluginModule = IconLoader.getIcon("/modules/pluginModule.png"); - public static final Icon Remove = IconLoader.getIcon("/modules/remove.png"); public static final Icon SetPackagePrefix = IconLoader.getIcon("/modules/setPackagePrefix.png"); public static final Icon SetPackagePrefixRollover = IconLoader.getIcon("/modules/setPackagePrefixRollover.png"); public static final Icon SourceClosed = IconLoader.getIcon("/modules/sourceClosed.png"); @@ -758,8 +730,6 @@ public class AllIcons { public static final Icon TestRootOpened = IconLoader.getIcon("/modules/testRootOpened.png"); public static final Icon TestSourceClosed = IconLoader.getIcon("/modules/testSourceClosed.png"); public static final Icon TestSourceOpened = IconLoader.getIcon("/modules/testSourceOpened.png"); - public static final Icon UnmarkSource = IconLoader.getIcon("/modules/unmarkSource.png"); - public static final Icon UnmarkTests = IconLoader.getIcon("/modules/unmarkTests.png"); public static final Icon UnmarkWebroot = IconLoader.getIcon("/modules/unmarkWebroot.png"); public static final Icon WebRoot = IconLoader.getIcon("/modules/webRoot.png"); @@ -772,8 +742,8 @@ public class AllIcons { public static final Icon AddLocalWeblogicInstance = IconLoader.getIcon("/nodes/addLocalWeblogicInstance.png"); public static final Icon AddRemoteWeblogicInstance = IconLoader.getIcon("/nodes/addRemoteWeblogicInstance.png"); public static final Icon Advice = IconLoader.getIcon("/nodes/advice.png"); - public static final Icon Annotationtype = IconLoader.getIcon("/nodes/annotationtype.png"); - public static final Icon AnonymousClass = IconLoader.getIcon("/nodes/anonymousClass.png"); + public static final Icon Annotationtype = IconLoader.getIcon("/nodes/annotationtype.png"); + public static final Icon AnonymousClass = IconLoader.getIcon("/nodes/anonymousClass.png"); public static final Icon Artifact = IconLoader.getIcon("/nodes/artifact.png"); public static final Icon Aspect = IconLoader.getIcon("/nodes/aspect.png"); public static final Icon BeaSmall = IconLoader.getIcon("/nodes/beaSmall.png"); @@ -1023,6 +993,19 @@ public class AllIcons { } + public static class Providers { + public static final Icon Apache = IconLoader.getIcon("/providers/apache.png"); + public static final Icon Hibernate = IconLoader.getIcon("/providers/hibernate.png"); + public static final Icon Ibm = IconLoader.getIcon("/providers/ibm.png"); + public static final Icon Microsoft = IconLoader.getIcon("/providers/microsoft.png"); + public static final Icon Mysql = IconLoader.getIcon("/providers/mysql.png"); + public static final Icon Oracle = IconLoader.getIcon("/providers/oracle.png"); + public static final Icon Postgresql = IconLoader.getIcon("/providers/postgresql.png"); + public static final Icon Sqlite = IconLoader.getIcon("/providers/sqlite.png"); + public static final Icon Sun = IconLoader.getIcon("/providers/sun.png"); + + } + public static class RunConfigurations { public static final Icon Applet = IconLoader.getIcon("/runConfigurations/applet.png"); public static final Icon Application = IconLoader.getIcon("/runConfigurations/application.png");