From 09a92fdc72b6bf9fe1fb8066fc99d644e4124c22 Mon Sep 17 00:00:00 2001
From: "Denis.Zhdanov" <denzhdanov@gmail.com>
Date: Sun, 26 Aug 2012 19:26:24 +0400
Subject: [PATCH] IDEA-19061 Integrate the Rearranger-plugin into core-IDE

'Add rule' actions is available via rule tree context menu now
---
 .../arrangement/action/AddArrangementRuleAction.java   |  2 --
 platform/platform-resources/src/idea/LangActions.xml   | 10 +++++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementRuleAction.java b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementRuleAction.java
index 2182f0244020..93470446ef3f 100644
--- a/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementRuleAction.java
+++ b/platform/lang-impl/src/com/intellij/application/options/codeStyle/arrangement/action/AddArrangementRuleAction.java
@@ -16,7 +16,6 @@
 package com.intellij.application.options.codeStyle.arrangement.action;
 
 import com.intellij.application.options.codeStyle.arrangement.ArrangementConstants;
-import com.intellij.icons.AllIcons;
 import com.intellij.openapi.actionSystem.AnAction;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.application.ApplicationBundle;
@@ -28,7 +27,6 @@ import com.intellij.openapi.application.ApplicationBundle;
 public class AddArrangementRuleAction extends AnAction {
   
   public AddArrangementRuleAction() {
-    getTemplatePresentation().setIcon(AllIcons.General.Add);
     getTemplatePresentation().setText(ApplicationBundle.message("arrangement.action.rule.add.text"));
     getTemplatePresentation().setDescription(ApplicationBundle.message("arrangement.action.rule.add.description"));
   }
diff --git a/platform/platform-resources/src/idea/LangActions.xml b/platform/platform-resources/src/idea/LangActions.xml
index 4072c2ce3ddf..7c0cf83ac90f 100644
--- a/platform/platform-resources/src/idea/LangActions.xml
+++ b/platform/platform-resources/src/idea/LangActions.xml
@@ -807,13 +807,17 @@
       <action id="DumpLookupElementWeights" internal="true" class="com.intellij.internal.DumpLookupElementWeights" text="Dump lookup element weights"/>
       <add-to-group group-id="Internal" anchor="last"/>
     </group>
+
+    <action id="Arrangement.Rule.Add"
+            class="com.intellij.application.options.codeStyle.arrangement.action.AddArrangementRuleAction"
+            icon="AllIcons.General.Add"/>
     
     <group id="Arrangement.RuleEditor.Context.Menu">
-      <!--TODO den implement-->
+      <reference ref="Arrangement.Rule.Add"/>
     </group>
-
+    
     <group id="Arrangement.RuleEditor.ToolWIndow">
-      <action id="Arrangement.Rule.Add" class="com.intellij.application.options.codeStyle.arrangement.action.AddArrangementRuleAction"/>
+      <reference ref="Arrangement.Rule.Add"/>
     </group>
     
   </actions>