From b5a2040342ac91abeb861760469b3de0e02295a0 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Sat, 20 Sep 2014 23:29:59 +0400
Subject: [PATCH] Cleanup (formatting)

---
 .../AbstractJavaRearrangerTest.groovy         | 27 +++++++------------
 .../xml/arrangement/XmlRearrangerTest.groovy  | 17 ++++++++++++
 2 files changed, 26 insertions(+), 18 deletions(-)

diff --git a/java/java-tests/testSrc/com/intellij/psi/codeStyle/arrangement/AbstractJavaRearrangerTest.groovy b/java/java-tests/testSrc/com/intellij/psi/codeStyle/arrangement/AbstractJavaRearrangerTest.groovy
index 7ce8d402fba3..30ffda62b9dc 100644
--- a/java/java-tests/testSrc/com/intellij/psi/codeStyle/arrangement/AbstractJavaRearrangerTest.groovy
+++ b/java/java-tests/testSrc/com/intellij/psi/codeStyle/arrangement/AbstractJavaRearrangerTest.groovy
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2012 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.
@@ -18,30 +18,21 @@ package com.intellij.psi.codeStyle.arrangement
 import com.intellij.ide.highlighter.JavaFileType
 import com.intellij.lang.java.JavaLanguage
 
-import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.EntryType.CLASS
-import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.EntryType.FIELD
-import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.EntryType.FIELD
-import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.EntryType.FIELD
-import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.EntryType.INTERFACE
-import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.EntryType.METHOD
-import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.EntryType.METHOD
-import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.Modifier.PUBLIC
+import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.EntryType.*
 import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.Modifier.PUBLIC
 import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.Modifier.STATIC
 
 /**
  * @author Denis Zhdanov
- * @since 8/30/12 12:15 PM
  */
 abstract class AbstractJavaRearrangerTest extends AbstractRearrangerTest {
-
-  def classic = [rule(INTERFACE),
-                 rule(CLASS),
-                 rule(FIELD, STATIC),
-                 rule(FIELD, PUBLIC),
-                 rule(FIELD),
-                 rule(METHOD, PUBLIC),
-                 rule(METHOD)]
+  protected def classic = [rule(INTERFACE),
+                           rule(CLASS),
+                           rule(FIELD, STATIC),
+                           rule(FIELD, PUBLIC),
+                           rule(FIELD),
+                           rule(METHOD, PUBLIC),
+                           rule(METHOD)]
 
   AbstractJavaRearrangerTest() {
     fileType = JavaFileType.INSTANCE
diff --git a/xml/tests/src/com/intellij/xml/arrangement/XmlRearrangerTest.groovy b/xml/tests/src/com/intellij/xml/arrangement/XmlRearrangerTest.groovy
index a9c9d33b7b0c..fc4f5c29eaf4 100644
--- a/xml/tests/src/com/intellij/xml/arrangement/XmlRearrangerTest.groovy
+++ b/xml/tests/src/com/intellij/xml/arrangement/XmlRearrangerTest.groovy
@@ -1,4 +1,20 @@
+/*
+ * 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.
+ * 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.xml.arrangement
+
 import com.intellij.ide.highlighter.XmlFileType
 import com.intellij.lang.xml.XMLLanguage
 import com.intellij.psi.codeStyle.arrangement.AbstractRearrangerTest
@@ -9,6 +25,7 @@ import com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens
 import org.jetbrains.annotations.NotNull
 
 import static com.intellij.psi.codeStyle.arrangement.std.StdArrangementTokens.Order.BY_NAME
+
 /**
  * @author Eugene.Kudelevsky
  */