azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Members reordered to meet conventions

Browse Source
This commit is contained in:
Andrey Breslav
2012-07-19 14:36:44 +04:00
parent 77353d4a56
commit f73bd4fd1d
1 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
compiler/tests/org/jetbrains/jet/test/util/NamespaceComparator.java
+17 -17
View File
@@ -46,23 +46,14 @@ import java.util.*;
*/ */
public class NamespaceComparator { 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( public static void compareNamespaces(
@NotNull NamespaceDescriptor nsa, @NotNull NamespaceDescriptor nsa,
@NotNull NamespaceDescriptor nsb, @NotNull NamespaceDescriptor nsb,
boolean includeObject, boolean includeObject,
@NotNull File txtFile @NotNull File txtFile
) { ) {
compareNamespaces(nsa, nsb, includeObject, Predicates.<NamespaceDescriptor>alwaysTrue(), txtFile); compareNamespaces(nsa, nsb, includeObject, Predicates.<NamespaceDescriptor>alwaysTrue(), txtFile);
} }
public static void compareNamespaces( public static void compareNamespaces(
@NotNull NamespaceDescriptor nsa, @NotNull NamespaceDescriptor nsa,
@NotNull NamespaceDescriptor nsb, @NotNull NamespaceDescriptor nsb,
@@ -96,10 +87,13 @@ public class NamespaceComparator {
return new NamespaceComparator(includeObject, includeIntoOutput).doCompareNamespaces(nsa, nsb); return new NamespaceComparator(includeObject, includeIntoOutput).doCompareNamespaces(nsa, nsb);
} }
private static <T extends Comparable<T>> List<T> sorted(Collection<T> items) { private final boolean includeObject;
List<T> r = new ArrayList<T>(items);
Collections.sort(r); private final Predicate<NamespaceDescriptor> includeIntoOutput;
return r;
private NamespaceComparator(boolean includeObject, Predicate<NamespaceDescriptor> includeIntoOutput) {
this.includeObject = includeObject;
this.includeIntoOutput = includeIntoOutput;
} }
private String doCompareNamespaces(@NotNull NamespaceDescriptor nsa, @NotNull NamespaceDescriptor nsb) { private String doCompareNamespaces(@NotNull NamespaceDescriptor nsa, @NotNull NamespaceDescriptor nsb) {
@@ -767,4 +761,10 @@ public class NamespaceComparator {
} }
return r.toString(); 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;
}
} }