diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml
index d8fe919d6501..67bfbb237141 100644
--- a/.idea/codeStyleSettings.xml
+++ b/.idea/codeStyleSettings.xml
@@ -255,6 +255,32 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/.idea/libraries/asm4.xml b/.idea/libraries/asm4.xml
index 5fa4ef1ddb66..3ed48ba9daf5 100644
--- a/.idea/libraries/asm4.xml
+++ b/.idea/libraries/asm4.xml
@@ -5,7 +5,7 @@
-
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index b01a3db7ff6b..19b7a7e3a5b5 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -173,6 +173,8 @@
+
+
@@ -182,8 +184,6 @@
-
-
diff --git a/platform/core-api/src/com/intellij/util/PlatformIcons.java b/platform/core-api/src/com/intellij/util/PlatformIcons.java
index e068cf66c207..bf0abc2091d3 100644
--- a/platform/core-api/src/com/intellij/util/PlatformIcons.java
+++ b/platform/core-api/src/com/intellij/util/PlatformIcons.java
@@ -93,7 +93,6 @@ public interface PlatformIcons {
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 CLOSED_MODULE_GROUP_ICON = AllIcons.Nodes.ModuleGroup;
diff --git a/platform/icons/src/ant/shortcutFilter.png b/platform/icons/src/actions/shortcutFilter.png
similarity index 100%
rename from platform/icons/src/ant/shortcutFilter.png
rename to platform/icons/src/actions/shortcutFilter.png
diff --git a/platform/icons/src/ant/shortcutFilter@2x.png b/platform/icons/src/actions/shortcutFilter@2x.png
similarity index 100%
rename from platform/icons/src/ant/shortcutFilter@2x.png
rename to platform/icons/src/actions/shortcutFilter@2x.png
diff --git a/platform/icons/src/ant/shortcutFilter@2x_dark.png b/platform/icons/src/actions/shortcutFilter@2x_dark.png
similarity index 100%
rename from platform/icons/src/ant/shortcutFilter@2x_dark.png
rename to platform/icons/src/actions/shortcutFilter@2x_dark.png
diff --git a/platform/icons/src/ant/shortcutFilter_dark.png b/platform/icons/src/actions/shortcutFilter_dark.png
similarity index 100%
rename from platform/icons/src/ant/shortcutFilter_dark.png
rename to platform/icons/src/actions/shortcutFilter_dark.png
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 619fdb985f8e..5bc7d5663677 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
@@ -181,7 +181,7 @@ public class ChooseActionsDialog extends DialogWrapper {
group.add(new AnAction(KeyMapBundle.message("filter.shortcut.action.text"),
KeyMapBundle.message("filter.shortcut.action.text"),
- AllIcons.Ant.ShortcutFilter) {
+ AllIcons.Actions.ShortcutFilter) {
public void actionPerformed(AnActionEvent e) {
myFilterComponent.reset();
if (myPopup == null || myPopup.getContent() == null) {
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 1ce3b0f9bdd6..388e31e1fa9f 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
@@ -437,7 +437,7 @@ public class KeymapPanel extends JPanel implements SearchableConfigurable, Confi
group.add(new DumbAwareAction(KeyMapBundle.message("filter.shortcut.action.text"),
KeyMapBundle.message("filter.shortcut.action.text"),
- AllIcons.Ant.ShortcutFilter) {
+ AllIcons.Actions.ShortcutFilter) {
public void actionPerformed(AnActionEvent e) {
myFilterComponent.reset();
if (myPopup == null || myPopup.getContent() == null){
diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java
index ce668f48be11..4b1718e3f82f 100644
--- a/platform/util/src/com/intellij/icons/AllIcons.java
+++ b/platform/util/src/com/intellij/icons/AllIcons.java
@@ -133,6 +133,7 @@ public class AllIcons {
public static final Icon Search = IconLoader.getIcon("/actions/search.png"); // 16x16
public static final Icon Selectall = IconLoader.getIcon("/actions/selectall.png"); // 16x16
public static final Icon Share = IconLoader.getIcon("/actions/share.png"); // 14x14
+ public static final Icon ShortcutFilter = IconLoader.getIcon("/actions/shortcutFilter.png"); // 16x16
public static final Icon ShowAsTree = IconLoader.getIcon("/actions/showAsTree.png"); // 16x16
public static final Icon ShowChangesOnly = IconLoader.getIcon("/actions/showChangesOnly.png"); // 16x16
public static final Icon ShowHiddens = IconLoader.getIcon("/actions/showHiddens.png"); // 16x16
@@ -161,20 +162,6 @@ public class AllIcons {
}
- public static class Ant {
- public static final Icon AntInstallation = IconLoader.getIcon("/ant/antInstallation.png"); // 16x16
- public static final Icon Build = IconLoader.getIcon("/ant/build.png"); // 16x16
- public static final Icon ChangeView = IconLoader.getIcon("/ant/changeView.png"); // 16x16
- public static final Icon Message = IconLoader.getIcon("/ant/message.png"); // 16x16
- public static final Icon MetaTarget = IconLoader.getIcon("/ant/metaTarget.png"); // 16x16
- public static final Icon Properties = IconLoader.getIcon("/ant/properties.png"); // 16x16
- public static final Icon ShortcutFilter = IconLoader.getIcon("/ant/shortcutFilter.png"); // 16x16
- public static final Icon Target = IconLoader.getIcon("/ant/target.png"); // 16x16
- public static final Icon Task = IconLoader.getIcon("/ant/task.png"); // 16x16
- public static final Icon Verbose = IconLoader.getIcon("/ant/verbose.png"); // 16x16
-
- }
-
public static class Css {
public static final Icon Atrule = IconLoader.getIcon("/css/atrule.png"); // 16x16
public static final Icon Import = IconLoader.getIcon("/css/import.png"); // 16x16
diff --git a/plugins/ant/ant.iml b/plugins/ant/ant.iml
index be08ab558305..ecff373cdfbd 100644
--- a/plugins/ant/ant.iml
+++ b/plugins/ant/ant.iml
@@ -5,6 +5,7 @@
+
diff --git a/plugins/ant/resources/icons/AntBuildXml.png b/plugins/ant/resources/icons/AntBuildXml.png
new file mode 100644
index 000000000000..83438d6123f5
Binary files /dev/null and b/plugins/ant/resources/icons/AntBuildXml.png differ
diff --git a/plugins/ant/resources/icons/AntBuildXml@2x.png b/plugins/ant/resources/icons/AntBuildXml@2x.png
new file mode 100644
index 000000000000..3a2f5ef1a202
Binary files /dev/null and b/plugins/ant/resources/icons/AntBuildXml@2x.png differ
diff --git a/plugins/ant/resources/icons/AntBuildXml@2x_dark.png b/plugins/ant/resources/icons/AntBuildXml@2x_dark.png
new file mode 100644
index 000000000000..e7d8f8dd25ba
Binary files /dev/null and b/plugins/ant/resources/icons/AntBuildXml@2x_dark.png differ
diff --git a/plugins/ant/resources/icons/AntBuildXml_dark.png b/plugins/ant/resources/icons/AntBuildXml_dark.png
new file mode 100644
index 000000000000..06bf3d6d2564
Binary files /dev/null and b/plugins/ant/resources/icons/AntBuildXml_dark.png differ
diff --git a/platform/icons/src/ant/antInstallation.png b/plugins/ant/resources/icons/antInstallation.png
similarity index 100%
rename from platform/icons/src/ant/antInstallation.png
rename to plugins/ant/resources/icons/antInstallation.png
diff --git a/platform/icons/src/ant/antInstallation@2x.png b/plugins/ant/resources/icons/antInstallation@2x.png
similarity index 100%
rename from platform/icons/src/ant/antInstallation@2x.png
rename to plugins/ant/resources/icons/antInstallation@2x.png
diff --git a/platform/icons/src/ant/antInstallation@2x_dark.png b/plugins/ant/resources/icons/antInstallation@2x_dark.png
similarity index 100%
rename from platform/icons/src/ant/antInstallation@2x_dark.png
rename to plugins/ant/resources/icons/antInstallation@2x_dark.png
diff --git a/platform/icons/src/ant/antInstallation_dark.png b/plugins/ant/resources/icons/antInstallation_dark.png
similarity index 100%
rename from platform/icons/src/ant/antInstallation_dark.png
rename to plugins/ant/resources/icons/antInstallation_dark.png
diff --git a/platform/icons/src/ant/build.png b/plugins/ant/resources/icons/build.png
similarity index 100%
rename from platform/icons/src/ant/build.png
rename to plugins/ant/resources/icons/build.png
diff --git a/platform/icons/src/ant/build@2x.png b/plugins/ant/resources/icons/build@2x.png
similarity index 100%
rename from platform/icons/src/ant/build@2x.png
rename to plugins/ant/resources/icons/build@2x.png
diff --git a/platform/icons/src/ant/build@2x_dark.png b/plugins/ant/resources/icons/build@2x_dark.png
similarity index 100%
rename from platform/icons/src/ant/build@2x_dark.png
rename to plugins/ant/resources/icons/build@2x_dark.png
diff --git a/platform/icons/src/ant/build_dark.png b/plugins/ant/resources/icons/build_dark.png
similarity index 100%
rename from platform/icons/src/ant/build_dark.png
rename to plugins/ant/resources/icons/build_dark.png
diff --git a/platform/icons/src/ant/changeView.png b/plugins/ant/resources/icons/changeView.png
similarity index 100%
rename from platform/icons/src/ant/changeView.png
rename to plugins/ant/resources/icons/changeView.png
diff --git a/platform/icons/src/ant/changeView@2x.png b/plugins/ant/resources/icons/changeView@2x.png
similarity index 100%
rename from platform/icons/src/ant/changeView@2x.png
rename to plugins/ant/resources/icons/changeView@2x.png
diff --git a/platform/icons/src/ant/changeView@2x_dark.png b/plugins/ant/resources/icons/changeView@2x_dark.png
similarity index 100%
rename from platform/icons/src/ant/changeView@2x_dark.png
rename to plugins/ant/resources/icons/changeView@2x_dark.png
diff --git a/platform/icons/src/ant/changeView_dark.png b/plugins/ant/resources/icons/changeView_dark.png
similarity index 100%
rename from platform/icons/src/ant/changeView_dark.png
rename to plugins/ant/resources/icons/changeView_dark.png
diff --git a/platform/icons/src/ant/message.png b/plugins/ant/resources/icons/message.png
similarity index 100%
rename from platform/icons/src/ant/message.png
rename to plugins/ant/resources/icons/message.png
diff --git a/platform/icons/src/ant/message@2x.png b/plugins/ant/resources/icons/message@2x.png
similarity index 100%
rename from platform/icons/src/ant/message@2x.png
rename to plugins/ant/resources/icons/message@2x.png
diff --git a/platform/icons/src/ant/metaTarget.png b/plugins/ant/resources/icons/metaTarget.png
similarity index 100%
rename from platform/icons/src/ant/metaTarget.png
rename to plugins/ant/resources/icons/metaTarget.png
diff --git a/platform/icons/src/ant/metaTarget@2x.png b/plugins/ant/resources/icons/metaTarget@2x.png
similarity index 100%
rename from platform/icons/src/ant/metaTarget@2x.png
rename to plugins/ant/resources/icons/metaTarget@2x.png
diff --git a/platform/icons/src/ant/metaTarget@2x_dark.png b/plugins/ant/resources/icons/metaTarget@2x_dark.png
similarity index 100%
rename from platform/icons/src/ant/metaTarget@2x_dark.png
rename to plugins/ant/resources/icons/metaTarget@2x_dark.png
diff --git a/platform/icons/src/ant/metaTarget_dark.png b/plugins/ant/resources/icons/metaTarget_dark.png
similarity index 100%
rename from platform/icons/src/ant/metaTarget_dark.png
rename to plugins/ant/resources/icons/metaTarget_dark.png
diff --git a/platform/icons/src/ant/properties.png b/plugins/ant/resources/icons/properties.png
similarity index 100%
rename from platform/icons/src/ant/properties.png
rename to plugins/ant/resources/icons/properties.png
diff --git a/platform/icons/src/ant/properties@2x.png b/plugins/ant/resources/icons/properties@2x.png
similarity index 100%
rename from platform/icons/src/ant/properties@2x.png
rename to plugins/ant/resources/icons/properties@2x.png
diff --git a/platform/icons/src/ant/properties@2x_dark.png b/plugins/ant/resources/icons/properties@2x_dark.png
similarity index 100%
rename from platform/icons/src/ant/properties@2x_dark.png
rename to plugins/ant/resources/icons/properties@2x_dark.png
diff --git a/platform/icons/src/ant/properties_dark.png b/plugins/ant/resources/icons/properties_dark.png
similarity index 100%
rename from platform/icons/src/ant/properties_dark.png
rename to plugins/ant/resources/icons/properties_dark.png
diff --git a/platform/icons/src/ant/target.png b/plugins/ant/resources/icons/target.png
similarity index 100%
rename from platform/icons/src/ant/target.png
rename to plugins/ant/resources/icons/target.png
diff --git a/platform/icons/src/ant/target@2x.png b/plugins/ant/resources/icons/target@2x.png
similarity index 100%
rename from platform/icons/src/ant/target@2x.png
rename to plugins/ant/resources/icons/target@2x.png
diff --git a/platform/icons/src/ant/target@2x_dark.png b/plugins/ant/resources/icons/target@2x_dark.png
similarity index 100%
rename from platform/icons/src/ant/target@2x_dark.png
rename to plugins/ant/resources/icons/target@2x_dark.png
diff --git a/platform/icons/src/ant/target_dark.png b/plugins/ant/resources/icons/target_dark.png
similarity index 100%
rename from platform/icons/src/ant/target_dark.png
rename to plugins/ant/resources/icons/target_dark.png
diff --git a/platform/icons/src/ant/task.png b/plugins/ant/resources/icons/task.png
similarity index 100%
rename from platform/icons/src/ant/task.png
rename to plugins/ant/resources/icons/task.png
diff --git a/platform/icons/src/ant/task@2x.png b/plugins/ant/resources/icons/task@2x.png
similarity index 100%
rename from platform/icons/src/ant/task@2x.png
rename to plugins/ant/resources/icons/task@2x.png
diff --git a/platform/icons/src/ant/task@2x_dark.png b/plugins/ant/resources/icons/task@2x_dark.png
similarity index 100%
rename from platform/icons/src/ant/task@2x_dark.png
rename to plugins/ant/resources/icons/task@2x_dark.png
diff --git a/platform/icons/src/ant/task_dark.png b/plugins/ant/resources/icons/task_dark.png
similarity index 100%
rename from platform/icons/src/ant/task_dark.png
rename to plugins/ant/resources/icons/task_dark.png
diff --git a/platform/icons/src/ant/verbose.png b/plugins/ant/resources/icons/verbose.png
similarity index 100%
rename from platform/icons/src/ant/verbose.png
rename to plugins/ant/resources/icons/verbose.png
diff --git a/platform/icons/src/ant/verbose@2x.png b/plugins/ant/resources/icons/verbose@2x.png
similarity index 100%
rename from platform/icons/src/ant/verbose@2x.png
rename to plugins/ant/resources/icons/verbose@2x.png
diff --git a/platform/icons/src/ant/verbose@2x_dark.png b/plugins/ant/resources/icons/verbose@2x_dark.png
similarity index 100%
rename from platform/icons/src/ant/verbose@2x_dark.png
rename to plugins/ant/resources/icons/verbose@2x_dark.png
diff --git a/platform/icons/src/ant/verbose_dark.png b/plugins/ant/resources/icons/verbose_dark.png
similarity index 100%
rename from platform/icons/src/ant/verbose_dark.png
rename to plugins/ant/resources/icons/verbose_dark.png
diff --git a/plugins/ant/src/com/intellij/lang/ant/AntElementRole.java b/plugins/ant/src/com/intellij/lang/ant/AntElementRole.java
deleted file mode 100644
index 0338ab76b8e6..000000000000
--- a/plugins/ant/src/com/intellij/lang/ant/AntElementRole.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright 2000-2009 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.
- */
-package com.intellij.lang.ant;
-
-import com.intellij.icons.AllIcons;
-import com.intellij.util.PlatformIcons;
-import org.jetbrains.annotations.NonNls;
-
-import javax.swing.*;
-
-/**
- * @author dyoma
- */
-public enum AntElementRole implements PlatformIcons {
- TARGET_ROLE(AntBundle.message("ant.role.ant.target"), AllIcons.Ant.Target),
- PROPERTY_ROLE(AntBundle.message("ant.role.ant.property"), PROPERTY_ICON),
- TASK_ROLE(AntBundle.message("ant.role.ant.task"), TASK_ICON),
- USER_TASK_ROLE(AntBundle.message("ant.element.role.user.task"), TASK_ICON),
- PROJECT_ROLE(AntBundle.message("ant.element.role.ant.project.name"), PROPERTY_ICON),
- MACRODEF_ROLE(AntBundle.message("ant.element.role.macrodef.element"), TASK_ICON),
- SCRIPTDEF_ROLE(AntBundle.message("ant.element.role.scriptdef.element"), TASK_ICON),
- @NonNls NULL_ROLE("Ant element", null);
-
- AntElementRole(String name, Icon icon) {
- myName = name;
- myIcon = icon;
- }
-
- private final String myName;
- private final Icon myIcon;
-
- public String getName() {
- return myName;
- }
-
- public Icon getIcon() {
- return myIcon;
- }
-}
diff --git a/plugins/ant/src/com/intellij/lang/ant/AntFileType.java b/plugins/ant/src/com/intellij/lang/ant/AntFileType.java
deleted file mode 100644
index af457c0f27ff..000000000000
--- a/plugins/ant/src/com/intellij/lang/ant/AntFileType.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright 2000-2009 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.
- */
-package com.intellij.lang.ant;
-
-import com.intellij.icons.AllIcons;
-import com.intellij.ide.IdeBundle;
-import com.intellij.openapi.fileTypes.LanguageFileType;
-import org.jetbrains.annotations.NonNls;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import javax.swing.*;
-
-public class AntFileType extends LanguageFileType {
-
- @NonNls public static final String DEFAULT_EXTENSION = "ant";
- @NonNls public static final String DOT_DEFAULT_EXTENSION = ".ant";
-
- public AntFileType() {
- super(new AntLanguage());
- }
-
- @NotNull
- @NonNls
- public String getName() {
- return "ANT";
- }
-
- @NotNull
- public String getDescription() {
- return IdeBundle.message("filetype.description.ant");
- }
-
- @NotNull
- @NonNls
- public String getDefaultExtension() {
- return DEFAULT_EXTENSION;
- }
-
- @Nullable
- public Icon getIcon() {
- return AllIcons.FileTypes.Xml;
- }
-}
diff --git a/plugins/ant/src/com/intellij/lang/ant/AntLanguage.java b/plugins/ant/src/com/intellij/lang/ant/AntLanguage.java
deleted file mode 100644
index fe89dd7ea2d4..000000000000
--- a/plugins/ant/src/com/intellij/lang/ant/AntLanguage.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2000-2009 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.
- */
-package com.intellij.lang.ant;
-
-import com.intellij.lang.DependentLanguage;
-import com.intellij.lang.Language;
-import com.intellij.lang.StdLanguages;
-
-public class AntLanguage extends Language implements DependentLanguage{
-
- public AntLanguage() {
- super("ANT");
- StdLanguages.ANT = this;
- }
-}
diff --git a/plugins/ant/src/com/intellij/lang/ant/AntNamesValidator.java b/plugins/ant/src/com/intellij/lang/ant/AntNamesValidator.java
deleted file mode 100644
index e881c7d93482..000000000000
--- a/plugins/ant/src/com/intellij/lang/ant/AntNamesValidator.java
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright 2000-2009 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.lang.ant;
-
-import com.intellij.lang.refactoring.NamesValidator;
-import com.intellij.openapi.project.Project;
-
-public class AntNamesValidator implements NamesValidator {
- public boolean isKeyword(String name, Project project) {
- return false;
- }
-
- public boolean isIdentifier(String name, Project project) {
- return true;
- }
-}
\ No newline at end of file
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 5df01e8ec22b..bb22e7ff2150 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 icons.AntIcons;
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"),
- AllIcons.Ant.Properties);
+ AntIcons.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 210bbe1b13dc..e13ac6fab401 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 icons.AntIcons;
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, AllIcons.Ant.ChangeView);
+ super(AntBundle.message("ant.view.toggle.tree.text.action.name"),null, AntIcons.ChangeView);
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 8c2ac15c89b7..30acb79403eb 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 icons.AntIcons;
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"), AllIcons.Ant.Verbose);
+ AntBundle.message("ant.verbose.show.all.messages.action.description"), AntIcons.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 67f691433390..c26068cf2180 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
@@ -19,7 +19,7 @@ import com.intellij.icons.AllIcons;
import com.intellij.ui.IdeBorderFactory;
import com.intellij.ui.MultilineTreeCellRenderer;
import com.intellij.ui.SideBorder;
-import com.intellij.util.PlatformIcons;
+import icons.AntIcons;
import javax.swing.*;
@@ -53,20 +53,20 @@ final class MessageTreeRenderer extends MultilineTreeCellRenderer {
MessageNode node = (MessageNode)value;
AntBuildMessageView.MessageType type = node.getType();
if (type == AntBuildMessageView.MessageType.BUILD) {
- icon = AllIcons.Ant.Build;
+ icon = AntIcons.Build;
}
else if (type == AntBuildMessageView.MessageType.TARGET) {
- icon = AllIcons.Ant.Target;
+ icon = AntIcons.Target;
}
else if (type == AntBuildMessageView.MessageType.TASK) {
- icon = PlatformIcons.TASK_ICON;
+ icon = AntIcons.Task;
}
else if (type == AntBuildMessageView.MessageType.MESSAGE) {
if (node.getPriority() == AntBuildMessageView.PRIORITY_WARN) {
icon = AllIcons.General.Warning;
}
else {
- icon = AllIcons.Ant.Message;
+ icon = AntIcons.Message;
}
}
else if (type == AntBuildMessageView.MessageType.ERROR) {
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 6e109130a410..1e9c57f44a93 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,7 +15,6 @@
*/
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;
@@ -26,6 +25,7 @@ import com.intellij.openapi.util.Comparing;
import com.intellij.ui.HtmlListCellRenderer;
import com.intellij.ui.SimpleColoredComponent;
import com.intellij.ui.SimpleTextAttributes;
+import icons.AntIcons;
import org.jetbrains.annotations.NotNull;
final class AntBuildFileNodeDescriptor extends AntNodeDescriptor {
@@ -54,7 +54,7 @@ final class AntBuildFileNodeDescriptor extends AntNodeDescriptor {
if (buildModel != null) {
AntTargetNodeDescriptor.addShortcutText(buildModel.getDefaultTargetActionId(), myAppearance);
}
- setIcon(AllIcons.Ant.Build);
+ myAppearance.setIcon(AntIcons.Build);
myName = myBuildFile.getPresentableName();
return !Comparing.equal(myAppearance, oldAppearance);
}
diff --git a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntTargetNodeDescriptor.java b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntTargetNodeDescriptor.java
index 31cbeeb4ceaf..93a9220576c5 100644
--- a/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntTargetNodeDescriptor.java
+++ b/plugins/ant/src/com/intellij/lang/ant/config/explorer/AntTargetNodeDescriptor.java
@@ -16,7 +16,6 @@
package com.intellij.lang.ant.config.explorer;
import com.intellij.execution.RunManagerEx;
-import com.intellij.icons.AllIcons;
import com.intellij.ide.util.treeView.NodeDescriptor;
import com.intellij.lang.ant.config.*;
import com.intellij.lang.ant.config.impl.AntBeforeRunTask;
@@ -39,6 +38,7 @@ import com.intellij.ui.JBColor;
import com.intellij.ui.SimpleColoredComponent;
import com.intellij.ui.SimpleTextAttributes;
import com.intellij.util.ui.UIUtil;
+import icons.AntIcons;
import org.jetbrains.annotations.NotNull;
import java.awt.*;
@@ -68,7 +68,7 @@ final class AntTargetNodeDescriptor extends AntNodeDescriptor {
final CompositeAppearance oldText = myHighlightedText;
final boolean isMeta = myTarget instanceof MetaTarget;
- setIcon(isMeta ? AllIcons.Ant.MetaTarget : AllIcons.Ant.Target);
+ setIcon(isMeta ? AntIcons.MetaTarget : AntIcons.Target);
myHighlightedText = new CompositeAppearance();
diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBeforeRunTaskProvider.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBeforeRunTaskProvider.java
index 12c9e1849b5f..0201736f89ea 100644
--- a/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBeforeRunTaskProvider.java
+++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/AntBeforeRunTaskProvider.java
@@ -19,7 +19,6 @@ import com.intellij.execution.BeforeRunTaskProvider;
import com.intellij.execution.RunManagerEx;
import com.intellij.execution.configurations.RunConfiguration;
import com.intellij.execution.runners.ExecutionEnvironment;
-import com.intellij.icons.AllIcons;
import com.intellij.lang.ant.AntBundle;
import com.intellij.lang.ant.config.AntBuildFile;
import com.intellij.lang.ant.config.AntBuildTarget;
@@ -29,6 +28,7 @@ import com.intellij.openapi.project.Project;
import com.intellij.openapi.util.Key;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.openapi.vfs.VirtualFileManager;
+import icons.AntIcons;
import org.jetbrains.annotations.Nullable;
import javax.swing.*;
@@ -55,13 +55,13 @@ public class AntBeforeRunTaskProvider extends BeforeRunTaskProvider {
return super.isMyFile(file, module) && isAntFile(file);
}
+ @Nullable
+ public Icon getFileIcon(@Iconable.IconFlags int flags) {
+ return AntIcons.AntBuildXml;
+ }
+
public static boolean isAntFile(final XmlFile xmlFile) {
final XmlDocument document = xmlFile.getDocument();
if (document != null) {
diff --git a/plugins/ant/src/com/intellij/lang/ant/misc/AntStringInterner.java b/plugins/ant/src/com/intellij/lang/ant/misc/AntStringInterner.java
deleted file mode 100644
index 1fe1702d626f..000000000000
--- a/plugins/ant/src/com/intellij/lang/ant/misc/AntStringInterner.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright 2000-2009 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.
- */
-package com.intellij.lang.ant.misc;
-
-import com.intellij.util.containers.StringInterner;
-
-public class AntStringInterner {
-
- private static final StringInterner ourInterner = new StringInterner();
-
- public static String intern(final String str) {
- return ourInterner.intern(str);
- }
-
- private AntStringInterner() {
- }
-}
diff --git a/plugins/ant/src/icons/AntIcons.java b/plugins/ant/src/icons/AntIcons.java
new file mode 100644
index 000000000000..aa1b100c287a
--- /dev/null
+++ b/plugins/ant/src/icons/AntIcons.java
@@ -0,0 +1,26 @@
+package icons;
+
+import com.intellij.openapi.util.IconLoader;
+
+import javax.swing.*;
+
+/**
+ * NOTE THIS FILE IS AUTO-GENERATED
+ * DO NOT EDIT IT BY HAND, run build/scripts/icons.gant instead
+ */
+public class AntIcons {
+ private static Icon load(String path) {
+ return IconLoader.getIcon(path, AntIcons.class);
+ }
+
+ public static final Icon AntBuildXml = load("/icons/AntBuildXml.png"); // 16x16
+ public static final Icon AntInstallation = load("/icons/antInstallation.png"); // 16x16
+ public static final Icon Build = load("/icons/build.png"); // 16x16
+ public static final Icon ChangeView = load("/icons/changeView.png"); // 16x16
+ public static final Icon Message = load("/icons/message.png"); // 16x16
+ public static final Icon MetaTarget = load("/icons/metaTarget.png"); // 16x16
+ public static final Icon Properties = load("/icons/properties.png"); // 16x16
+ public static final Icon Target = load("/icons/target.png"); // 16x16
+ public static final Icon Task = load("/icons/task.png"); // 16x16
+ public static final Icon Verbose = load("/icons/verbose.png"); // 16x16
+}