From 4fe1761413f731300c4fbb21d554be368837b5bf Mon Sep 17 00:00:00 2001
From: Alexey Kudravtsev <cdr@intellij.com>
Date: Tue, 29 Apr 2014 20:11:36 +0400
Subject: [PATCH] removed dependency on java-impl

---
 .../impl/JavaPsiImplementationHelperImpl.java | 25 +----------------
 .../typedef/GrTypeDefinitionImpl.java         | 27 +++++++++++++++++--
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java b/java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java
index 57884acea596..21280eeeaa55 100644
--- a/java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java
+++ b/java/java-impl/src/com/intellij/psi/impl/JavaPsiImplementationHelperImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2013 JetBrains s.r.o.
+ * Copyright 2000-2014 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.
@@ -235,29 +235,6 @@ public class JavaPsiImplementationHelperImpl extends JavaPsiImplementationHelper
     return null;
   }
 
-  // TODO remove as soon as an arrangement sub-system is provided for groovy.
-  public static int getMemberOrderWeight(PsiElement member, CodeStyleSettings settings) {
-    if (member instanceof PsiField) {
-      if (member instanceof PsiEnumConstant) {
-        return 1;
-      }
-      return ((PsiField)member).hasModifierProperty(PsiModifier.STATIC) ? settings.STATIC_FIELDS_ORDER_WEIGHT + 1
-                                                                        : settings.FIELDS_ORDER_WEIGHT + 1;
-    }
-    if (member instanceof PsiMethod) {
-      if (((PsiMethod)member).isConstructor()) {
-        return settings.CONSTRUCTORS_ORDER_WEIGHT + 1;
-      }
-      return ((PsiMethod)member).hasModifierProperty(PsiModifier.STATIC) ? settings.STATIC_METHODS_ORDER_WEIGHT + 1
-                                                                         : settings.METHODS_ORDER_WEIGHT + 1;
-    }
-    if (member instanceof PsiClass) {
-      return ((PsiClass)member).hasModifierProperty(PsiModifier.STATIC) ? settings.STATIC_INNER_CLASSES_ORDER_WEIGHT + 1
-                                                                        : settings.INNER_CLASSES_ORDER_WEIGHT + 1;
-    }
-    return -1;
-  }
-
   @Override
   public void setupCatchBlock(@NotNull String exceptionName, @NotNull PsiType exceptionType, PsiElement context, @NotNull PsiCatchSection catchSection) {
     final FileTemplate catchBodyTemplate = FileTemplateManager.getInstance().getCodeTemplate(JavaTemplateUtil.TEMPLATE_CATCH_BODY);
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java
index 5df6863d0a03..2eaff1df6c79 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/lang/psi/impl/statements/typedef/GrTypeDefinitionImpl.java
@@ -764,16 +764,39 @@ public abstract class GrTypeDefinitionImpl extends GrStubElementBase<GrTypeDefin
     return null;
   }
 
+    // TODO remove as soon as an arrangement sub-system is provided for groovy.
+  public static int getMemberOrderWeight(PsiElement member, CodeStyleSettings settings) {
+    if (member instanceof PsiField) {
+      if (member instanceof PsiEnumConstant) {
+        return 1;
+      }
+      return ((PsiField)member).hasModifierProperty(PsiModifier.STATIC) ? settings.STATIC_FIELDS_ORDER_WEIGHT + 1
+                                                                        : settings.FIELDS_ORDER_WEIGHT + 1;
+    }
+    if (member instanceof PsiMethod) {
+      if (((PsiMethod)member).isConstructor()) {
+        return settings.CONSTRUCTORS_ORDER_WEIGHT + 1;
+      }
+      return ((PsiMethod)member).hasModifierProperty(PsiModifier.STATIC) ? settings.STATIC_METHODS_ORDER_WEIGHT + 1
+                                                                         : settings.METHODS_ORDER_WEIGHT + 1;
+    }
+    if (member instanceof PsiClass) {
+      return ((PsiClass)member).hasModifierProperty(PsiModifier.STATIC) ? settings.STATIC_INNER_CLASSES_ORDER_WEIGHT + 1
+                                                                        : settings.INNER_CLASSES_ORDER_WEIGHT + 1;
+    }
+    return -1;
+  }
+
   @Nullable
   private PsiElement getDefaultAnchor(GrTypeDefinitionBody body, PsiMember member) {
     CodeStyleSettings settings = CodeStyleSettingsManager.getSettings(getProject());
 
-    int order = JavaPsiImplementationHelperImpl.getMemberOrderWeight(member, settings);
+    int order = getMemberOrderWeight(member, settings);
     if (order < 0) return null;
 
     PsiElement lastMember = null;
     for (PsiElement child = body.getFirstChild(); child != null; child = child.getNextSibling()) {
-      int order1 = JavaPsiImplementationHelperImpl.getMemberOrderWeight(getAnyMember(child), settings);
+      int order1 = getMemberOrderWeight(getAnyMember(child), settings);
       if (order1 < 0) continue;
       if (order1 > order) {
         final PsiElement lBrace = body.getLBrace();