From 5c14653daccde729d5eff4c0cdef7a6cf38a98c5 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Tue, 12 Nov 2013 19:37:26 +0100
Subject: [PATCH] moving ant-related icons under ant plugin; IDEA-34889 Provide
 dedicated icon for ANT build.xml files

---
 .idea/codeStyleSettings.xml                   |  26 ++++++++
 .idea/libraries/asm4.xml                      |   2 +-
 .idea/modules.xml                             |   4 +-
 .../src/com/intellij/util/PlatformIcons.java  |   1 -
 .../src/{ant => actions}/shortcutFilter.png   | Bin
 .../{ant => actions}/shortcutFilter@2x.png    | Bin
 .../shortcutFilter@2x_dark.png                | Bin
 .../{ant => actions}/shortcutFilter_dark.png  | Bin
 .../keymap/impl/ui/ChooseActionsDialog.java   |   2 +-
 .../openapi/keymap/impl/ui/KeymapPanel.java   |   2 +-
 .../util/src/com/intellij/icons/AllIcons.java |  15 +----
 plugins/ant/ant.iml                           |   1 +
 plugins/ant/resources/icons/AntBuildXml.png   | Bin 0 -> 475 bytes
 .../ant/resources/icons/AntBuildXml@2x.png    | Bin 0 -> 1236 bytes
 .../resources/icons/AntBuildXml@2x_dark.png   | Bin 0 -> 1244 bytes
 .../ant/resources/icons/AntBuildXml_dark.png  | Bin 0 -> 475 bytes
 .../ant/resources/icons}/antInstallation.png  | Bin
 .../resources/icons}/antInstallation@2x.png   | Bin
 .../icons}/antInstallation@2x_dark.png        | Bin
 .../resources/icons}/antInstallation_dark.png | Bin
 .../ant/resources/icons}/build.png            | Bin
 .../ant/resources/icons}/build@2x.png         | Bin
 .../ant/resources/icons}/build@2x_dark.png    | Bin
 .../ant/resources/icons}/build_dark.png       | Bin
 .../ant/resources/icons}/changeView.png       | Bin
 .../ant/resources/icons}/changeView@2x.png    | Bin
 .../resources/icons}/changeView@2x_dark.png   | Bin
 .../ant/resources/icons}/changeView_dark.png  | Bin
 .../ant/resources/icons}/message.png          | Bin
 .../ant/resources/icons}/message@2x.png       | Bin
 .../ant/resources/icons}/metaTarget.png       | Bin
 .../ant/resources/icons}/metaTarget@2x.png    | Bin
 .../resources/icons}/metaTarget@2x_dark.png   | Bin
 .../ant/resources/icons}/metaTarget_dark.png  | Bin
 .../ant/resources/icons}/properties.png       | Bin
 .../ant/resources/icons}/properties@2x.png    | Bin
 .../resources/icons}/properties@2x_dark.png   | Bin
 .../ant/resources/icons}/properties_dark.png  | Bin
 .../ant/resources/icons}/target.png           | Bin
 .../ant/resources/icons}/target@2x.png        | Bin
 .../ant/resources/icons}/target@2x_dark.png   | Bin
 .../ant/resources/icons}/target_dark.png      | Bin
 .../ant/resources/icons}/task.png             | Bin
 .../ant/resources/icons}/task@2x.png          | Bin
 .../ant/resources/icons}/task@2x_dark.png     | Bin
 .../ant/resources/icons}/task_dark.png        | Bin
 .../ant/resources/icons}/verbose.png          | Bin
 .../ant/resources/icons}/verbose@2x.png       | Bin
 .../ant/resources/icons}/verbose@2x_dark.png  | Bin
 .../ant/resources/icons}/verbose_dark.png     | Bin
 .../com/intellij/lang/ant/AntElementRole.java |  52 ----------------
 .../com/intellij/lang/ant/AntFileType.java    |  57 ------------------
 .../com/intellij/lang/ant/AntLanguage.java    |  28 ---------
 .../intellij/lang/ant/AntNamesValidator.java  |  33 ----------
 .../actions/AntBuildFilePropertiesAction.java |   4 +-
 .../ant/config/actions/ChangeViewAction.java  |   4 +-
 .../ant/config/actions/VerboseAction.java     |   4 +-
 .../config/execution/MessageTreeRenderer.java |  10 +--
 .../explorer/AntBuildFileNodeDescriptor.java  |   4 +-
 .../explorer/AntTargetNodeDescriptor.java     |   4 +-
 .../config/impl/AntBeforeRunTaskProvider.java |   6 +-
 .../ant/config/impl/TargetChooserDialog.java  |   4 +-
 .../config/impl/configuration/AntUIUtil.java  |   3 +-
 .../lang/ant/dom/AntDomFileDescription.java   |   9 +++
 .../lang/ant/misc/AntStringInterner.java      |  30 ---------
 plugins/ant/src/icons/AntIcons.java           |  26 ++++++++
 66 files changed, 90 insertions(+), 241 deletions(-)
 rename platform/icons/src/{ant => actions}/shortcutFilter.png (100%)
 rename platform/icons/src/{ant => actions}/shortcutFilter@2x.png (100%)
 rename platform/icons/src/{ant => actions}/shortcutFilter@2x_dark.png (100%)
 rename platform/icons/src/{ant => actions}/shortcutFilter_dark.png (100%)
 create mode 100644 plugins/ant/resources/icons/AntBuildXml.png
 create mode 100644 plugins/ant/resources/icons/AntBuildXml@2x.png
 create mode 100644 plugins/ant/resources/icons/AntBuildXml@2x_dark.png
 create mode 100644 plugins/ant/resources/icons/AntBuildXml_dark.png
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/antInstallation.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/antInstallation@2x.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/antInstallation@2x_dark.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/antInstallation_dark.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/build.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/build@2x.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/build@2x_dark.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/build_dark.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/changeView.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/changeView@2x.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/changeView@2x_dark.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/changeView_dark.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/message.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/message@2x.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/metaTarget.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/metaTarget@2x.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/metaTarget@2x_dark.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/metaTarget_dark.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/properties.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/properties@2x.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/properties@2x_dark.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/properties_dark.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/target.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/target@2x.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/target@2x_dark.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/target_dark.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/task.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/task@2x.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/task@2x_dark.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/task_dark.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/verbose.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/verbose@2x.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/verbose@2x_dark.png (100%)
 rename {platform/icons/src/ant => plugins/ant/resources/icons}/verbose_dark.png (100%)
 delete mode 100644 plugins/ant/src/com/intellij/lang/ant/AntElementRole.java
 delete mode 100644 plugins/ant/src/com/intellij/lang/ant/AntFileType.java
 delete mode 100644 plugins/ant/src/com/intellij/lang/ant/AntLanguage.java
 delete mode 100644 plugins/ant/src/com/intellij/lang/ant/AntNamesValidator.java
 delete mode 100644 plugins/ant/src/com/intellij/lang/ant/misc/AntStringInterner.java
 create mode 100644 plugins/ant/src/icons/AntIcons.java

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 @@
         <codeStyleSettings language="SQL">
           <option name="PARENT_SETTINGS_INSTALLED" value="true" />
         </codeStyleSettings>
+        <codeStyleSettings language="TypeScript">
+          <option name="KEEP_LINE_BREAKS" value="false" />
+          <option name="ELSE_ON_NEW_LINE" value="true" />
+          <option name="WHILE_ON_NEW_LINE" value="true" />
+          <option name="CATCH_ON_NEW_LINE" value="true" />
+          <option name="FINALLY_ON_NEW_LINE" value="true" />
+          <option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
+          <option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
+          <option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
+          <option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
+          <option name="CALL_PARAMETERS_WRAP" value="1" />
+          <option name="METHOD_PARAMETERS_WRAP" value="5" />
+          <option name="EXTENDS_LIST_WRAP" value="1" />
+          <option name="EXTENDS_KEYWORD_WRAP" value="1" />
+          <option name="BINARY_OPERATION_WRAP" value="5" />
+          <option name="TERNARY_OPERATION_WRAP" value="5" />
+          <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
+          <option name="FOR_STATEMENT_WRAP" value="5" />
+          <option name="ARRAY_INITIALIZER_WRAP" value="1" />
+          <option name="ASSIGNMENT_WRAP" value="1" />
+          <option name="IF_BRACE_FORCE" value="1" />
+          <option name="DOWHILE_BRACE_FORCE" value="1" />
+          <option name="WHILE_BRACE_FORCE" value="1" />
+          <option name="FOR_BRACE_FORCE" value="1" />
+          <option name="PARENT_SETTINGS_INSTALLED" value="true" />
+        </codeStyleSettings>
         <codeStyleSettings language="XML">
           <indentOptions>
             <option name="INDENT_SIZE" value="2" />
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 @@
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/lib/src/asm4-src.zip!/"/>
+      <root url="jar://$PROJECT_DIR$/lib/src/asm4-src.zip!/" />
     </SOURCES>
   </library>
 </component>
\ 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 @@
       <module fileurl="file://$PROJECT_DIR$/platform/xdebugger-api/xdebugger-api.iml" filepath="$PROJECT_DIR$/platform/xdebugger-api/xdebugger-api.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/platform/xdebugger-impl/xdebugger-impl.iml" filepath="$PROJECT_DIR$/platform/xdebugger-impl/xdebugger-impl.iml" group="platform" />
       <module fileurl="file://$PROJECT_DIR$/xml/impl/xml.iml" filepath="$PROJECT_DIR$/xml/impl/xml.iml" group="xml" />
+      <module fileurl="file://$PROJECT_DIR$/xml/xml-analysis-api/xml-analysis-api.iml" filepath="$PROJECT_DIR$/xml/xml-analysis-api/xml-analysis-api.iml" group="xml" />
+      <module fileurl="file://$PROJECT_DIR$/xml/xml-analysis-impl/xml-analysis-impl.iml" filepath="$PROJECT_DIR$/xml/xml-analysis-impl/xml-analysis-impl.iml" group="xml" />
       <module fileurl="file://$PROJECT_DIR$/xml/openapi/xml-openapi.iml" filepath="$PROJECT_DIR$/xml/openapi/xml-openapi.iml" group="xml" />
       <module fileurl="file://$PROJECT_DIR$/xml/xml-psi-api/xml-psi-api.iml" filepath="$PROJECT_DIR$/xml/xml-psi-api/xml-psi-api.iml" group="xml" />
       <module fileurl="file://$PROJECT_DIR$/xml/xml-psi-impl/xml-psi-impl.iml" filepath="$PROJECT_DIR$/xml/xml-psi-impl/xml-psi-impl.iml" group="xml" />
@@ -182,8 +184,6 @@
       <module fileurl="file://$PROJECT_DIR$/plugins/xslt-debugger/engine/xslt-debugger-engine.iml" filepath="$PROJECT_DIR$/plugins/xslt-debugger/engine/xslt-debugger-engine.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/xslt-debugger/engine/impl/xslt-debugger-engine-impl.iml" filepath="$PROJECT_DIR$/plugins/xslt-debugger/engine/impl/xslt-debugger-engine-impl.iml" group="plugins" />
       <module fileurl="file://$PROJECT_DIR$/plugins/xpath/xslt-rt/xslt-rt.iml" filepath="$PROJECT_DIR$/plugins/xpath/xslt-rt/xslt-rt.iml" group="plugins" />
-      <module fileurl="file://$PROJECT_DIR$/xml/xml-analysis-api/xml-analysis-api.iml" filepath="$PROJECT_DIR$/xml/xml-analysis-api/xml-analysis-api.iml" group="xml" />
-      <module fileurl="file://$PROJECT_DIR$/xml/xml-analysis-impl/xml-analysis-impl.iml" filepath="$PROJECT_DIR$/xml/xml-analysis-impl/xml-analysis-impl.iml" group="xml" />
     </modules>
   </component>
 </project>
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 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/tests/src" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/resources" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
diff --git a/plugins/ant/resources/icons/AntBuildXml.png b/plugins/ant/resources/icons/AntBuildXml.png
new file mode 100644
index 0000000000000000000000000000000000000000..83438d6123f50917eb581669bf8b902df26300ca
GIT binary patch
literal 475
zcmV<10VMv3P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzeMv+?RCwBA{Qv(y0|?BWI~T&h4H|&B
z5ynYQP6pFV48(&dAg)IjWWl145sMheb&f#17s`jbgcKJ%1!4`TS8%)F^5x46xLl>H
ztNR~a4GRNlAOc+gpBMgPqk*=sAQXr&(5UpwE|rCa`3@r^<9A?m-}!m}yE8X8_nNO?
zzY=r-D7qTBIN2Nd`FT_Xg?Kpx1b9@~e(;1VDJiW%j!qUliH3oRnaPQjjim(Wits;w
z{;pt@{(SBJ{re$6sSsFH;&K5f&K)oP+Ijuw_n#)efBohG(ngmbp6vVa<A)Yh9<K}b
z!x%q*{(8y8#0aKA{6ByGXhG!}@wosb$teB7-230(|BiqE{9^#puF5<{oxrpZft*?~
z3;-$!=i%X54T`qUJdc+%GBU7&G8~X*dHvx<7Bm{`@y5cJFJD4HHVOYx{Lcuq?BCyi
z3`{^1KzyhR8n79_2s9mpS3(oa%71_U`Tza<_dGBLegN@#Am0xr4+8)J1^__$pHHxv
RXea;x002ovPDHLkV1ivf(SZN}

literal 0
HcmV?d00001

diff --git a/plugins/ant/resources/icons/AntBuildXml@2x.png b/plugins/ant/resources/icons/AntBuildXml@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a2f5ef1a202c59adb841094b6258c7216ab2555
GIT binary patch
literal 1236
zcmV;_1S|WAP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$c1c7*RCwCFS8ZrpRT#eCH{Z?HG}WXj
zL78hsab=9rf^6y^^@l(F0EKOWMNx3bq#FgtJ{$vK{WD~KQvERplhu!34jpVd{V`;l
zieN`vr0rso8O@rcNp6z+;q%^|vdmUVc2f^L<lJ-4d+u}J^StkS!dsTbHMhyh$(sk-
zZ+n5)mzx+J9bGaeaGh`afjzA*UI_wLJ0w<u!1i`XNG)v0xAEoFjsOPm79+v^n<iGu
z1JvFDUTDP=E2RO#`%T{4|9^X+<;J&=2l(mf>9#i>92~r9AM9a!V`5^WZ4usTd%BfH
zw?g1NPyrqT=KpJ9tyc5S&CTtEmwkBrxKkQ93EWR!X3uAU%}w*0fUl`jE|(*^t`A6(
zl<1@gKLm8(_9lhzZJOW5z}4&ZApHgcfwP@Fg5Q9xz!tZ@>Rh;f_XbfE{DL5qY0@;!
zX~Qr#YUQg1cwjgf3?2@JLYH#6Tt^680agRvSZVmXy64*W{(vW{s4^!>*PW^B=K6ZA
zu|78|<>P&8cZ&f%j|ezQ0RY6D9>F;}TI#4S`B20cj|KuB&gXS;ZntWK`ZN~t#8+FH
zz*aksdA`bQ9c$nlz(XCETZz*PC0XKl;YPWjzN|<#8C6z8Y*=NsjtQJ(1O|DIC!uK^
z5}9Q#1zN)jRHll>VgzBRFk43iL?Fpjf8uBT)a6P=yAS7mMAwZ3gjXX_pT-Kl)UJY>
zx|+>qU-f#upD<g|34zl<FC(yvzUW8o%Xpzs-d?TN-o=aOfvQ%me~Pgk+44*{olcK;
zb#)!<@9&>t;yvvo3I<quJq&!oHvFhmDZVWV!99{7+O@AyZ;UTgORjuA{~Y4~Xm4-t
z56u2a;4UW~I1U`3_$Lk0%YmOtYWii7LXf{+dyo^jqVoGTWWU)+B=RjXp`6KNhB0+;
zxpdr)2Mz(x0u<Blv4kWP#Ed_wYqglTRwWl)(J$2&#A`m$6jmh?i3!6n=-6adH{NhU
zAO$=Kya-T=T>uc@R<vrC&MJoYUihF`F^iWm_K+;gzmWPxQA{BZlu?*SH(95d@FKfv
zQ5yk{@s@Zdstt|kyxBuni)dxYn{r?H3Uy!;Qt+GI-Q5XxAGp}5VnjB(fzK!!dj4A1
zr3h*dzLGK?CkyHwp+DDIq<-Z8F_h!S;R)VJF|u&GnZ)lY2uhimnc0DJjraBSy=JBZ
z8zi@~SwZF#@N$X*7wUrEP@dwn$Uc9}Kb}gZ4knYyHL(BOPFzkrfVh67(P#{z!hL|`
zk~ijMoHbH0FQ5uqHpmN#B6E$L@-VHTwPXYHR~#RKrfDN2sBk!Z!45f79uN@!bgx__
zKsumM6b$(uT0?7LLpP{r920=+Z$sVBVnfq57DW1Bn?N&Y5F|ua2~F5!&|TB229^k>
z=~jFkB>up&ols)N#z#?jw*Aw>CSq787T2Ne1nz8!z;b_~$HvAMyAJ@*-?((vUy>v-
yjjZ<szBJBWJ`1r<VeUZF7QfOq%MtinfB^uyT<c-nOHMxk0000<MNUMnLSTY=#zLF`

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..e7d8f8dd25ba6e7209b4b8e6f68a90de7fcae87e
GIT binary patch
literal 1244
zcmV<21S9*2P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU$en~_@RCwCFmu+ZURT#(5x$k+oO_rKu
zZC#hClU5WNqsR)f=_sfl6m)`u+XsuH;FLip1;^Go_DR1C@eQedn1jjc%cm6$Y&vC3
z(T#y`bep(t*e<n6ZkCtZ+~i*W=jH@rS4YyD`oNFebI;3t&U60fIVaR{9MWjx<KzE+
z(YoyeuP;?GJUo2EJAt&{_Jh66HeLw_oK~Dz2?utz;)K-1fV72~GkY6U!8_au@?V-*
zsR%H84?N#YBvwiTj1L;3xBvf+K-1QY21svjFKJaP)6>(=;xUrRBpDhSYTbcl+EZ<d
zz#{t*6v3k)d$WeJEC*t-*ltQ`5XDd0rGZIsKj`P>lVD3j{bukrd+_;u-J&S=Rjbvh
zc8c&LPyt;H3g6dIKgJ>Wc$obb3WZbcT!KHqcJNH;8ab0bPX|Ov)CEB(uu9vuf2&ri
z_sMsuhNfwo^7;IsTrT%}I2>+^16M!<1g0m+cj2|t4;^7&kE$v}l4`-MRP2ol3+0V=
zt~)(*eP#~{m}%^Q!>D=_tns=8XIMmQ>#M$@mi3-+I7svk9|;6C7xo-p6(m}@Bci2O
zZ+A13<CJ(`&l>m!_+1D5O2X&Yh$M>yDktn(!C=p_ED=_xsp>6mf}m98eLXuc$sOny
zs4ylFYEqVe9C8B~*s}b_L?968#v6tA^`rq2T;i%f<{vN~E1VPW)qKj!q9_bumTP&q
zFITH}@|rYtQHYhD$g0SQX_}uxkeB!v)#XOu1c-A7US%^<H>49rHovn}T6iCOJ&O;Q
z%u@L?BU{*|#Yij?iHu?k9!aHA6I{F}yhNanr`JQ^I3Mt1(=y)`O>wUz*0fMATcc*h
z)S|lnY_V88oXKR)@&4PuonAC>6dYjtA8733;Jm)hd8sZ$cSfQ_^n|?w`QY;W{QS2_
zMlvF?2~`J|O2@Q`TQTLQ;jQ3j5CSEhkOT<s4yPd7!r!{;CZg!|1?sn`?bs=IhJwJB
zP3GrDKTgBh<u1Wh@E~{ru(XzU9igO$sFhP?gWiL3PFhpBh<95nR^?YjML{I4Vv+?M
zOiVYkUNhlYe$`?&2#(kmIhpxh9`tK=ltt4xEeARW%U|Jxn+?Nw3u$<Y-v`dN>o8({
z_JGgXZn*NL6B39VWg0-ZiQq`L{dwGWnEFGZ&<Kv>$7x+4%gh4~Za3rjO+rvgJRaYL
z-^AS9+-vy@@__D-Z_!klh(hffnkFLysZXYU$&3Zp6-T4d=)tb8uJx$;0+^m6(AnAf
zup~(vaKe3v<dT+(`c_p{i9ki-*u+H?M3#bylnXt?+OW2)54ykNc?lFn8DxUWX0t!J
zWuo;V3$pBoW4H#}REQ8{uinktu(qgYH>jsQJAgG_jlpJt?XI7M6M-#n{UqYB<&c>d
zwbX2b89c6URs-}Vx8kF4B89S>P*PLm5sbcLafezo$gz4m*luupQw}Wk7n)tCxjg`$
zs~2$bcu|(czp&+=fY1~5!^pC%3Dg~E7~%pLS;~Qb1Q-CHF}HAEOJXAc0000<MNUMn
GLSTYY8&s(P

literal 0
HcmV?d00001

diff --git a/plugins/ant/resources/icons/AntBuildXml_dark.png b/plugins/ant/resources/icons/AntBuildXml_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..06bf3d6d2564004c668616d57adcddb85d427438
GIT binary patch
literal 475
zcmV<10VMv3P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzeMv+?RCwByQ@u(9K@i@%-AyheR|s;V
zMG6s-*oiN2ij|;EAi*|hVQrtJwDAp6o1m{CTG$60g^((sAqiFrS#sH3XU|=ccy}=a
z!|eRr%r`%0Nhy({Mx*ilh^HEG-6)kxC6qS$Kb-(qXN@Ex(2B4rbUyH%)_;&Jg5VW+
zOSck_AfL~pI8?n}PtL{=v>26V4M{D?C<)b@^M+`s{{EObC4_Ws+ZqcYyXn;0KJ(bE
z<2Z8@sCCt{ZsslPI;(_WG@bH|&ky1ahfimKqG~ol5{?E@g7=(s>Vi^S3Ig67pw6@B
zc|~v)O@g=?sGa+Gd-TG_!R}-tav*n>*K=2t(t`FUws3DA!6X;}f>5ez7~_KWTS*9%
z(;7WEhcJ5|iEsx8{r310ZlV19TK^<~fD&WuMt$OLPOoi@sf2itWNF1c*K4dM-T|zs
zs4DS(P7)hJ;EyF3BLTWbP>V`nL3YJ0eK0M_(J>dY&ADK}ZNbrz@f-RQU;qP{hku#N
R?>Ybg002ovPDHLkV1g8*&8YwY

literal 0
HcmV?d00001

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<AntBeforeRun
 
   @Override
   public Icon getIcon() {
-    return AllIcons.Ant.Target;
+    return AntIcons.Target;
   }
 
   @Override
   public Icon getTaskIcon(AntBeforeRunTask task) {
     AntBuildTarget antTarget = findTargetToExecute(task);
-    return antTarget instanceof MetaTarget ? AllIcons.Ant.MetaTarget : AllIcons.Ant.Target;
+    return antTarget instanceof MetaTarget ? AntIcons.MetaTarget : AntIcons.Target;
   }
 
   @Override
diff --git a/plugins/ant/src/com/intellij/lang/ant/config/impl/TargetChooserDialog.java b/plugins/ant/src/com/intellij/lang/ant/config/impl/TargetChooserDialog.java
index 11f78cd28499..69dd43266b3a 100644
--- a/plugins/ant/src/com/intellij/lang/ant/config/impl/TargetChooserDialog.java
+++ b/plugins/ant/src/com/intellij/lang/ant/config/impl/TargetChooserDialog.java
@@ -22,7 +22,6 @@
  */
 package com.intellij.lang.ant.config.impl;
 
-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;
@@ -34,6 +33,7 @@ import com.intellij.ui.*;
 import com.intellij.ui.treeStructure.Tree;
 import com.intellij.util.containers.Convertor;
 import com.intellij.util.ui.tree.TreeUtil;
+import icons.AntIcons;
 import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.Nullable;
 
@@ -209,7 +209,7 @@ public class TargetChooserDialog extends DialogWrapper {
           final String antTargetName = antTarget.getName();
           append(antTargetName, SimpleTextAttributes.REGULAR_ATTRIBUTES);
           boolean isMeta = antTarget instanceof MetaTarget;
-          setIcon(isMeta ? AllIcons.Ant.MetaTarget : AllIcons.Ant.Target);
+          setIcon(isMeta ? AntIcons.MetaTarget : AntIcons.Target);
         }
       }
     }
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 d252433b4399..82b633d70ed7 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
@@ -36,6 +36,7 @@ import com.intellij.util.PlatformIcons;
 import com.intellij.util.config.AbstractProperty;
 import com.intellij.util.ui.AbstractTableCellEditor;
 import com.intellij.util.ui.CellEditorComponentWithBrowseButton;
+import icons.AntIcons;
 
 import javax.swing.*;
 import javax.swing.text.BadLocationException;
@@ -96,7 +97,7 @@ public class AntUIUtil {
   }
 
   public static void customizeAnt(AbstractProperty.AbstractPropertyContainer antProperties, SimpleColoredComponent component) {
-    component.setIcon(AllIcons.Ant.AntInstallation);
+    component.setIcon(AntIcons.AntInstallation);
     String name = AntInstallation.NAME.get(antProperties);
     component.append(name, SimpleTextAttributes.REGULAR_ATTRIBUTES);
     String versionString = AntInstallation.VERSION.get(antProperties);
diff --git a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomFileDescription.java b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomFileDescription.java
index feff55d1ef19..60ea637beb80 100644
--- a/plugins/ant/src/com/intellij/lang/ant/dom/AntDomFileDescription.java
+++ b/plugins/ant/src/com/intellij/lang/ant/dom/AntDomFileDescription.java
@@ -17,13 +17,17 @@ package com.intellij.lang.ant.dom;
 
 import com.intellij.lang.ant.ForcedAntFileAttribute;
 import com.intellij.openapi.module.Module;
+import com.intellij.openapi.util.Iconable;
 import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.xml.XmlDocument;
 import com.intellij.psi.xml.XmlFile;
 import com.intellij.psi.xml.XmlTag;
+import icons.AntIcons;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import javax.swing.*;
+
 /**
  * @author Eugene Zhuravlev
  *         Date: Apr 6, 2010
@@ -39,6 +43,11 @@ public class AntDomFileDescription extends AntFileDescription<AntDomProject> {
     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
+}