From f73bd4fd1d83d5eca270b37b0f676746d8983081 Mon Sep 17 00:00:00 2001
From: Andrey Breslav <andrey.breslav@jetbrains.com>
Date: Thu, 19 Jul 2012 14:36:44 +0400
Subject: [PATCH] Members reordered to meet conventions

---
 .../jet/test/util/NamespaceComparator.java    | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java b/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java
index 10ed275823a..969973cd99c 100644
--- a/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java
+++ b/compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java
@@ -46,23 +46,14 @@ import java.util.*;
  */
 public class NamespaceComparator {
 
-    private final boolean includeObject;
-    private final Predicate<NamespaceDescriptor> includeIntoOutput;
-
-    private NamespaceComparator(boolean includeObject, Predicate<NamespaceDescriptor> includeIntoOutput) {
-        this.includeObject = includeObject;
-        this.includeIntoOutput = includeIntoOutput;
-    }
-
     public static void compareNamespaces(
-        @NotNull NamespaceDescriptor nsa,
-        @NotNull NamespaceDescriptor nsb,
-        boolean includeObject,
-        @NotNull File txtFile
+            @NotNull NamespaceDescriptor nsa,
+            @NotNull NamespaceDescriptor nsb,
+            boolean includeObject,
+            @NotNull File txtFile
     ) {
         compareNamespaces(nsa, nsb, includeObject, Predicates.<NamespaceDescriptor>alwaysTrue(), txtFile);
     }
-
     public static void compareNamespaces(
             @NotNull NamespaceDescriptor nsa,
             @NotNull NamespaceDescriptor nsb,
@@ -96,10 +87,13 @@ public class NamespaceComparator {
         return new NamespaceComparator(includeObject, includeIntoOutput).doCompareNamespaces(nsa, nsb);
     }
 
-    private static <T extends Comparable<T>> List<T> sorted(Collection<T> items) {
-        List<T> r = new ArrayList<T>(items);
-        Collections.sort(r);
-        return r;
+    private final boolean includeObject;
+
+    private final Predicate<NamespaceDescriptor> includeIntoOutput;
+
+    private NamespaceComparator(boolean includeObject, Predicate<NamespaceDescriptor> includeIntoOutput) {
+        this.includeObject = includeObject;
+        this.includeIntoOutput = includeIntoOutput;
     }
 
     private String doCompareNamespaces(@NotNull NamespaceDescriptor nsa, @NotNull NamespaceDescriptor nsb) {
@@ -767,4 +761,10 @@ public class NamespaceComparator {
         }
         return r.toString();
     }
+
+    private static <T extends Comparable<T>> List<T> sorted(Collection<T> items) {
+        List<T> r = new ArrayList<T>(items);
+        Collections.sort(r);
+        return r;
+    }
 }