From 419591a5a4e49501035cc1a0406d27953e2ab18b Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Wed, 27 Feb 2013 18:52:04 +0100
Subject: [PATCH 1/6] jsf file type

---
 platform/icons/src/actions/addFacesSupport.png  | Bin 544 -> 249 bytes
 .../icons/src/actions/addFacesSupport@2x.png    | Bin 0 -> 620 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 platform/icons/src/actions/addFacesSupport@2x.png

diff --git a/platform/icons/src/actions/addFacesSupport.png b/platform/icons/src/actions/addFacesSupport.png
index e2ddb5f5539756ec35eded30c99c66ee6fa8ee82..d0b6cd31c9c1ef5201662d770daf6e7559c65b62 100644
GIT binary patch
delta 232
zcmV<E02lwD1o;7w8Gi-<001BJ|6u?C02y>eSaefwW^{L9a%BKPWN%_+AW3auXJt}l
zVPtu6$z?nM005gwL_t(|+G70w|33pIfCWT!c6O3$3L_H(g@7Uh7+p&sUI2k@J9aUW
zqS?#Ctzv7j8^Qn(@b2A3QdoGqmbA0rk_4F!G?3x;uEh+uc401tSpXJCvXFs=kS!q1
zAcbfyB|Z?*ZH2jxq*%b_bd-dI&2&|_Sgd@kDG`_dh~YD#NiY(N|L^Xp1ksG3%tT3E
iV5BrRQk<Cp0t^67xIgbjnj)|O0000<MNUMnLSTYn0bdmW

delta 530
zcmV+t0`2|z0iXns8Gi!+001a04^sdD0TED4R7L;)|1U#eFGFB2LtrmMU`=C+PHvS+
zTYoN0ghgYQM|P=7Yn)AQpHzCLR%nn{fvR1HuVsd?ZIH5ljjn)?uYj1cgORY2pRzAQ
zU|(>Z+~4Wa*W}aK<a~*qGe>4VQEWd^Y(G(LKT>T%Rc}L8Z-3P3_1Wz7-thD1@$l;L
z@bB>O_WS$z`1pIZ`H#*2kgMjMx9Xz3?4-Z#r@!v1!tlMs&AsFQ&D{3T*yqsS_R;3{
z(&Y9#P;Nhc&p=ae<Lmk4>-*&F`Q-8O<?-+4?)&HO`z>F)=k)*R@cTJ($n5a&?eOsJ
z^Zo7h`%#$U?|<|C@Amxg@bK~Y{Pg<#Sg7px`1tqx`e(TK`1|_#`}_U<{l<KdN&o-=
zBXm+uQvf<UK84lQ+1}pX-rnBc-rnBc-rnBc-sb1^`1t(&{{H^{AXvkK0001+Nkl<Z
zcwUXl)eZtN5J1u5?p7$Uz`Ee>?(XvcA3|wgc-))JB!6=<Kv&j4EE4qlJZ_i6Lcp0{
zHVV(%p}$_(2}HZvS=q>vDAc?J!fj32%F;yOs}w@bJHDqP->FbY96#^ZL%m*3<sU$p
z+toQvWm$G#q957OptYL!X5(RzLMF+i5K1!$#cc#20A`3cje_wHAT;1HVbIwZ`^FR?
UNG_SS01E&B07*qoM6N<$f(ZyYSO5S3

diff --git a/platform/icons/src/actions/addFacesSupport@2x.png b/platform/icons/src/actions/addFacesSupport@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..7d76d3557b0f200aaad4cb94ffdc03b14963412d
GIT binary patch
literal 620
zcmV-y0+aoTP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!4oO5oRCwBA{Qv(y!$1Nih5-gFFh*x*
zC%uD$aZrT7r~^hFz=ADxGP;(~%)<Y>d%(F3W(UgvczPkB5P&<DCYc`*y77ZH4d4Vn
zUOi&CJ*${O+AEzw$jF7^|KC3hFAuC>cz1p;!{47@8JIbE7z7O*8AMDx8Cdy67%sPj
zVweHbOO^xB!K*{789rP+${=dx$H1p)#qj6TTLvaJ4hCjU9=IA&OMjrFoPdtw0`r+U
zxXBLzbnyA!1qLo@6$TzfJqC6`aWKY+a~3uR7A`&%M^UXD;1E|}`1bTR5Z__=_v;7k
z(*Qb<bdF_s`2Hos^W6&=K3+Qtj9XU*UR7fTW_B(_DBV8G@csE+26iDy20=q-1`bhK
z>V*I(Se0TM7!)EZ!L{p?&C|f?;x{lYAk=U(u<?sBu<{8pFae{3q7eB1?=MzyP#OT?
zC!41-e7bp>flEf6fuBzpEXO6I!60JhMV&P8=gWI=DrRJ1#VQZ7`2XMEK!^UJZW{Rc
z<|#POzdpW+fn7v~ft5!PEdKV)PGAb>1t-S8-##(CIkB06Lrji=jZcKS4tTJ#o#EGq
zSKx#sY8A-9C94i~*b|1ASC26K{r&}<@IWCTYVFU!DXmI;(F|)9Bee-(wIN;Fh=aN=
zV5CudpbA<mw&9Ed8haYW9u|7F0|spxU>xy%!%+tS1Q-C1_M8PPcn2W>0000<MNUMn
GLSTY&0s@Bs

literal 0
HcmV?d00001


From a91d63365b5fdce74b19b9d0d82e6cb516c14017 Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Wed, 27 Feb 2013 18:53:06 +0100
Subject: [PATCH 2/6] reset to empty icon

---
 platform/icons/src/actions/Reset_to_empty.png     | Bin 0 -> 379 bytes
 platform/icons/src/actions/Reset_to_empty@2x.png  | Bin 0 -> 650 bytes
 .../icons/src/actions/Reset_to_empty@2x_dark.png  | Bin 0 -> 652 bytes
 .../icons/src/actions/Reset_to_empty_dark.png     | Bin 0 -> 384 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 platform/icons/src/actions/Reset_to_empty.png
 create mode 100644 platform/icons/src/actions/Reset_to_empty@2x.png
 create mode 100644 platform/icons/src/actions/Reset_to_empty@2x_dark.png
 create mode 100644 platform/icons/src/actions/Reset_to_empty_dark.png

diff --git a/platform/icons/src/actions/Reset_to_empty.png b/platform/icons/src/actions/Reset_to_empty.png
new file mode 100644
index 0000000000000000000000000000000000000000..825d4e433c4c88add6f55f00d2a767baefb7a4a0
GIT binary patch
literal 379
zcmV->0fhdEP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUz9Z5t%RCwBA{Qv(y10{e3pQPvHz4bt<
z0hj#WUq7mG8W1$|U_B=r3r@{HzkjX%`r(ZmRs-S}9joW%WW}lZ>z6MjpWnXj0Wzm!
z7?8i_Y`p*%J5J3XK7Pu5_5Ar{DEA7A0S()))C+Rs*8J-2`;_|+9?d}#x&}9(Z~x7D
zJ`UW@e)j5J%$1w>mY@k=Wh4}hcC`yZ6ekdWLz8L*Iht|$(L16b*Woea^|I|pLV@%F
zbj{#&@a^XxEdpuf8W3w?(+oD?(~sZ87@&hqGuVLlUw`TlFyIOhhhozVHsHgzpTxLe
z4G>SonioEQ|E*2HfU9T$hyoZX&W$B$X~-sg1>#RY{1zIuAp8=DUm)?{K;=II@n?Vl
Z0|1_PbkKpUnOOh;002ovPDHLkV1g>TrR)Fz

literal 0
HcmV?d00001

diff --git a/platform/icons/src/actions/Reset_to_empty@2x.png b/platform/icons/src/actions/Reset_to_empty@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b76c24b3a87ddf215a9a9bf5047f661e42b4e026
GIT binary patch
literal 650
zcmV;50(Jd~P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!EJ;K`RCwCVm%C2GFcgN#4VV~^82Sp7
z2Z1+$2ViDEY?!u~5ebQlgm?fZb|xew5Cak{sE9i#Y8zTYdZCw;q!c@(RR}h9;-C`g
z$my}2@9(jXFG9QB9_Z&I4)pnvNzSQ_1J?c!*<x6Dt7$F}1<0cK=Wxrc1GB78k_AXY
zul~zC@Mfb1>Lnfjfpww)MV5NOL0Gt1tAeWG!0~fQ6fi^=zy+^W-#|$(K#wa;7N8IX
zq<G+Ol?u@F&(P<lL_iTq@TIWua=8MuT+R>IkQqb)!-^ak+$ffSs%9Xe>XNz+49VRH
zBzfSvQ3CgmDx_4WsRD+-<^YB#!ou@<5nSCp!C#vE5&=cxf@?1ZxVV0RJ(`gtuy%Np
z7?h;Y@ND4~oTu*~L(`uEHji!-iX<e%!ZZ0-aC&jW0>|lG#4iGAJKjFI4-DVkKOVsu
z#|U5fwi_Z~3>7(!T@~l_3`4smFT5+jZhee%ZtHkPk2Am_@jUQuf5bTj;0ZMm6y6ok
zv|CX`V46~wpus%?B8fnp0$=WVBs1S_t_Y}Et$>QLpm0aP+};_^fKi?d$Y_O_&zEF@
zI|58AlJSrG;3?))v1!>+j(;GyBcN$TmI0}ta7REyYrr0|txy*eD;fdEVLJ=`z8ebj
zv$K8$__vMMCuDWJQsYA{vIeq>>nnT8np;+V{!aUb+uvN>*{QQ!P6gLQccGHpvhz+d
kk>V3Q-xB`i5PS+S0F+<f53ZY#r~m)}07*qoM6N<$g0pTNlK=n!

literal 0
HcmV?d00001

diff --git a/platform/icons/src/actions/Reset_to_empty@2x_dark.png b/platform/icons/src/actions/Reset_to_empty@2x_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..f37a675a304897de31f209fe51718b5e0151cf30
GIT binary patch
literal 652
zcmV;70(1R|P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!E=fc|RCwCNm&s1TKp4mAro@8>6G?mp
z@j>(r^x`Xc^5zIQ-c4K*pTHA$PbMZB4<>ps7#Cd9AQdcShhmF3Q!A-;#x7ICBwwa{
zGt=Lnud{vJU@(Y{vhcAH7m?&#*g5h$9wJ){3-9;zRiXfq=l>mU=pCTf)p@c2f%6)_
z!2<7f+n`fZ@gLYG3Xnv>3l74<^>z!iGz*T)HBrDgT>ulj-D-lGT80i+jx0bT3dpd)
zn~ergORv!7rbIyEN$~Zs@Or%glw#2hSCDB$0dYx;46apcK$Z)T&~#1R2gb!=1kx;U
zRjYxACmB+jb5sHGuQ`C>sj%>pS_L=xXZS~#KO!IrOmO8*16Q|?(4!kU0$ay-sWCwa
z4Sy+Dz-2BEeRTaTVE5!cB?(+QEWA*vfb*+6KXAO9tN4K<9mo4;4}swaho_Tx#rcG9
z{x}U0a0XRHhEo-<=_Mci)}8R70JHxw%XqBg89nO*4vF`Hck?63C;(5WxuEc&fS%cp
zA_9w)wiFHS5D-ZOk`(xc=ao!<H<=<JzbIu?O$UWr0#>pYcm+(ctbl@2o^kooe&Ch>
z-H7D-CtdK2?_05Mm{ETJKyXVy&xmXVWP-vi0TJy1S!8>m5)&gD0jHreqveD;6=N-l
z38vJ{eH`N7Cf=Wrb?{D&FSW?J$Qrh<?x@>#-E#TA`*-c}y4~iPoN~7Dwm`wIzn@9Q
mQ+&MRUBq;Y8+CgADZl{w{MxOv`VAfc0000<MNUMnLSTYS4kUU2

literal 0
HcmV?d00001

diff --git a/platform/icons/src/actions/Reset_to_empty_dark.png b/platform/icons/src/actions/Reset_to_empty_dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..d270cf05915dc0495365e97ff957df144fa4732d
GIT binary patch
literal 384
zcmV-`0e}99P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzB1uF+RCwBA{Qv(y10{e3pQPvHz4bt<
z0hj#WUq7mG8W1$|U_B=r3r@{HzkjX%`r(ZmRs-S}9joW%WW}lZ>z6MjpWnXj0Wzm!
z7?8i_Y`p*%J5J3XK7Pu5_5Ar{DEA7A0S()))C+Rs*8J-2`;_|+9?d}#x&}9(Z~x7D
zJ`UW@e)j5J%$1w>mY@k=Wh4}hcC`yZ6ekdWLz8L*Iht|$(L16b*Woea^|I|pLV@%F
zbj{#&@a^XxEdpuf8W3w?(+oD?(~sZ87@&hqGuVLlUw`TlFyIOhhhozVHsHgzpTxLe
z4G>SonioEQ|E*2HfU9T$h-yFx?^7{?Sx%D`Z*D|R2w#Et6A-_JMlA@x1mYJ+{5Mef
ek3jqxAiw~SW^y1z!Ji}m0000<MNUMnLSTYVzNVM}

literal 0
HcmV?d00001


From 84bd50994a8d462c94d1db4852865665adbd4482 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Wed, 27 Feb 2013 18:16:55 +0100
Subject: [PATCH 3/6] javafx: accept no params handlers (IDEA-102017)

---
 .../plugins/javaFX/fxml/JavaFXHighlightingTest.java          | 5 +++++
 .../javaFX/fxml/refs/JavaFxEventHandlerReference.java        | 1 +
 plugins/javaFX/testData/highlighting/NoParamsHandler.java    | 4 ++++
 plugins/javaFX/testData/highlighting/noParamsHandler.fxml    | 5 +++++
 4 files changed, 15 insertions(+)
 create mode 100644 plugins/javaFX/testData/highlighting/NoParamsHandler.java
 create mode 100644 plugins/javaFX/testData/highlighting/noParamsHandler.fxml

diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
index f66c68429f01..f6a1a408a01c 100644
--- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
+++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java
@@ -93,6 +93,11 @@ public class JavaFXHighlightingTest extends DaemonAnalyzerTestCase {
     doDoTest(false, false);
   }
 
+  public void testNoParamsHandler() throws Exception {
+    configureByFiles(null, getTestName(true) + ".fxml", getTestName(false) + ".java");
+    doDoTest(false, false);
+  }
+
   private void doTestIdController() throws Exception {
     final String controllerClassName = getTestName(false) + "Controller";
     configureByFiles(null, getTestName(true) + ".fxml", controllerClassName + ".java");
diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReference.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReference.java
index ed34c51a9cb5..432e3eeabe25 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReference.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/refs/JavaFxEventHandlerReference.java
@@ -79,6 +79,7 @@ public class JavaFxEventHandlerReference extends PsiReferenceBase<XmlAttributeVa
           return true;
         }
       }
+      return parameters.length == 0;
     }
     return false;
   }
diff --git a/plugins/javaFX/testData/highlighting/NoParamsHandler.java b/plugins/javaFX/testData/highlighting/NoParamsHandler.java
new file mode 100644
index 000000000000..c96768e76861
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/NoParamsHandler.java
@@ -0,0 +1,4 @@
+public class Controller {
+  public void sayHelloWorld() {
+  }
+}
\ No newline at end of file
diff --git a/plugins/javaFX/testData/highlighting/noParamsHandler.fxml b/plugins/javaFX/testData/highlighting/noParamsHandler.fxml
new file mode 100644
index 000000000000..a4fc85b8606b
--- /dev/null
+++ b/plugins/javaFX/testData/highlighting/noParamsHandler.fxml
@@ -0,0 +1,5 @@
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.GridPane?>
+<GridPane xmlns:fx="http://javafx.com/fxml" fx:controller="Controller">
+    <Button onAction="#sayHelloWorld"/>
+</GridPane>
\ No newline at end of file

From fc04a028106037b592d2c68c8b4c90b0db1664a9 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Wed, 27 Feb 2013 18:23:44 +0100
Subject: [PATCH 4/6] logging for EA-44045 - assert:
 JspTextSyntheticBlock.getSpacing

---
 .../javaFX/fxml/codeInsight/inspections/UnwrapTagFix.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/UnwrapTagFix.java b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/UnwrapTagFix.java
index 1723db0a79fd..2e20e6f720c8 100644
--- a/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/UnwrapTagFix.java
+++ b/plugins/javaFX/src/org/jetbrains/plugins/javaFX/fxml/codeInsight/inspections/UnwrapTagFix.java
@@ -17,18 +17,22 @@ package org.jetbrains.plugins.javaFX.fxml.codeInsight.inspections;
 
 import com.intellij.codeInspection.LocalQuickFix;
 import com.intellij.codeInspection.ProblemDescriptor;
+import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.project.Project;
 import com.intellij.psi.PsiElement;
+import com.intellij.psi.PsiFile;
 import com.intellij.psi.codeStyle.CodeStyleManager;
 import com.intellij.psi.util.PsiTreeUtil;
 import com.intellij.psi.xml.XmlTag;
 import com.intellij.psi.xml.XmlTagChild;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.plugins.javaFX.fxml.JavaFxFileTypeFactory;
 
 /**
 * User: anna
 */
 public class UnwrapTagFix implements LocalQuickFix {
+  private static final Logger LOG = Logger.getInstance("#" + UnwrapTagFix.class.getName());
   private final String myTagName;
 
   public UnwrapTagFix(String tagName) {
@@ -51,6 +55,8 @@ public class UnwrapTagFix implements LocalQuickFix {
   public void applyFix(@NotNull Project project, @NotNull ProblemDescriptor descriptor) {
     final PsiElement element = descriptor.getPsiElement();
     if (element != null) {
+      final PsiFile containingFile = element.getContainingFile();
+      LOG.assertTrue(containingFile != null && JavaFxFileTypeFactory.isFxml(containingFile), containingFile == null ? "no containing file found" : "containing file: " + containingFile.getName());
       final XmlTag xmlTag = PsiTreeUtil.getParentOfType(element, XmlTag.class);
       if (xmlTag != null) {
         final XmlTag parentTag = xmlTag.getParentTag();

From 531ce3d49d5a05eab8c8500c2fa9396d52a9fc94 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Wed, 27 Feb 2013 19:29:01 +0100
Subject: [PATCH 5/6] icons

---
 .../codeInspection/ui/SingleInspectionProfilePanel.java       | 4 ++--
 platform/util/src/com/intellij/icons/AllIcons.java            | 1 +
 .../designer/propertyTable/actions/RestoreDefault.java        | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java
index b9c796e9c4b1..63e1664912b9 100644
--- a/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java
+++ b/platform/lang-impl/src/com/intellij/profile/codeInspection/ui/SingleInspectionProfilePanel.java
@@ -337,7 +337,7 @@ public class SingleInspectionProfilePanel extends JPanel {
     actions.add(actionManager.createCollapseAllAction(myTreeExpander, myTree));
 
     actions.add(new AnAction(CommonBundle.message("button.reset.to.default"), CommonBundle.message("button.reset.to.default"),
-                             AllIcons.Actions.Reset_to_default) {
+                             AllIcons.General.Reset) {
       {
         registerCustomShortcutSet(new CustomShortcutSet(KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.CTRL_MASK)), myTree);
       }
@@ -353,7 +353,7 @@ public class SingleInspectionProfilePanel extends JPanel {
       }
     });
 
-    actions.add(new AnAction("Reset to Empty", "Reset to empty", AllIcons.General.Reset){
+    actions.add(new AnAction("Reset to Empty", "Reset to empty", AllIcons.Actions.Reset_to_empty){
 
       @Override
       public void update(AnActionEvent e) {
diff --git a/platform/util/src/com/intellij/icons/AllIcons.java b/platform/util/src/com/intellij/icons/AllIcons.java
index 84cd93886b38..322fda10be06 100644
--- a/platform/util/src/com/intellij/icons/AllIcons.java
+++ b/platform/util/src/com/intellij/icons/AllIcons.java
@@ -122,6 +122,7 @@ public class AllIcons {
     public static final Icon Rerun = IconLoader.getIcon("/actions/rerun.png"); // 16x16
     public static final Icon Reset_to_default = IconLoader.getIcon("/actions/reset-to-default.png"); // 16x16
     public static final Icon Reset = IconLoader.getIcon("/actions/reset.png"); // 16x16
+    public static final Icon Reset_to_empty = IconLoader.getIcon("/actions/Reset_to_empty.png"); // 16x16
     public static final Icon Restart = IconLoader.getIcon("/actions/restart.png"); // 16x16
     public static final Icon Resume = IconLoader.getIcon("/actions/resume.png"); // 16x16
     public static final Icon Right = IconLoader.getIcon("/actions/right.png"); // 16x16
diff --git a/plugins/ui-designer-core/src/com/intellij/designer/propertyTable/actions/RestoreDefault.java b/plugins/ui-designer-core/src/com/intellij/designer/propertyTable/actions/RestoreDefault.java
index 54303b0e6b67..fa4527a64e53 100644
--- a/plugins/ui-designer-core/src/com/intellij/designer/propertyTable/actions/RestoreDefault.java
+++ b/plugins/ui-designer-core/src/com/intellij/designer/propertyTable/actions/RestoreDefault.java
@@ -36,7 +36,7 @@ public class RestoreDefault extends AnAction implements IPropertyTableAction {
     String text = DesignerBundle.message("designer.properties.restore_default");
     presentation.setText(text);
     presentation.setDescription(text);
-    presentation.setIcon(AllIcons.Actions.Reset_to_default);
+    presentation.setIcon(AllIcons.General.Reset);
   }
 
   @Override

From f0b0af783f8dd0d4bf6cd486f8cff1a9fb03e2b6 Mon Sep 17 00:00:00 2001
From: anna <Anna.Kozlova@jetbrains.com>
Date: Wed, 27 Feb 2013 19:32:00 +0100
Subject: [PATCH 6/6] icons

---
 .../lang/properties/structureView/GroupByWordPrefixes.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/properties/src/com/intellij/lang/properties/structureView/GroupByWordPrefixes.java b/plugins/properties/src/com/intellij/lang/properties/structureView/GroupByWordPrefixes.java
index 5b351239b641..bd3393591167 100644
--- a/plugins/properties/src/com/intellij/lang/properties/structureView/GroupByWordPrefixes.java
+++ b/plugins/properties/src/com/intellij/lang/properties/structureView/GroupByWordPrefixes.java
@@ -150,7 +150,7 @@ public class GroupByWordPrefixes implements Grouper, Sorter {
   public ActionPresentation getPresentation() {
     return new ActionPresentationData(PropertiesBundle.message("structure.view.group.by.prefixes.action.name"),
                                       PropertiesBundle.message("structure.view.group.by.prefixes.action.description"),
-                                      AllIcons.Actions.FileStatus);
+                                      AllIcons.Actions.GroupByPrefix);
   }
 
   @NotNull