[JGIT PATCH 1/3] Extract RefComparator to sort collection of Refs
Signed-off-by: Charles O'Farrell <charleso@charleso.org>
---
.../src/org/spearce/jgit/lib/RefComparator.java | 72 ++++++++++++++++++++
.../src/org/spearce/jgit/lib/RefWriter.java | 14 +----
2 files changed, 73 insertions(+), 13 deletions(-)
create mode 100644 org.spearce.jgit/src/org/spearce/jgit/lib/RefComparator.java
Show changes to 2 files +73 −13
org.spearce.jgit/src/org/spearce/jgit/lib/RefComparator.java, org.spearce.jgit/src/org/spearce/jgit/lib/RefWriter.java
diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/RefComparator.java b/org.spearce.jgit/src/org/spearce/jgit/lib/RefComparator.java
new file mode 100644
index 0000000..6d994eb
--- /dev/null
+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/RefComparator.java
@@ -0,0 +1,72 @@
+/**
+ * Copyright (C) 2008, Charles O'Farrell <charleso@charleso.org>
+ *
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or
+ * without modification, are permitted provided that the following
+ * conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above
+ * copyright notice, this list of conditions and the following
+ * disclaimer in the documentation and/or other materials provided
+ * with the distribution.
+ *
+ * - Neither the name of the Git Development Community nor the
+ * names of its contributors may be used to endorse or promote
+ * products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package org.spearce.jgit.lib;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * Util for sorting (or comparing) Ref instances by name.
+ * <p>
+ * Useful for command line tools or writing out refs to file.
+ */
+public class RefComparator implements Comparator<Ref> {
+
+ /** Singleton instance of RefComparator */
+ public static final RefComparator INSTANCE = new RefComparator();
+
+ public int compare(Ref o1, Ref o2) {
+ return o1.getName().compareTo(o2.getName());
+ }
+
+ /**
+ * Sorts the collection of refs, returning a new collection.
+ *
+ * @param refs
+ * collection to be sorted
+ * @return sorted collection of refs
+ */
+ public static Collection<Ref> sort(final Collection<Ref> refs) {
+ final List<Ref> r = new ArrayList<Ref>(refs);
+ Collections.sort(r, INSTANCE);
+ return r;
+ }
+}
\ No newline at end of file
diff --git a/org.spearce.jgit/src/org/spearce/jgit/lib/RefWriter.java b/org.spearce.jgit/src/org/spearce/jgit/lib/RefWriter.java
index 9c784d5..2d39713 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/lib/RefWriter.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/lib/RefWriter.java
@@ -41,8 +41,6 @@
import java.io.IOException;
import java.io.StringWriter;
import java.util.Collection;
-import java.util.Comparator;
-import java.util.TreeSet;
/**
* Writes out refs to the {@link Constants#INFO_REFS} and
@@ -61,8 +59,7 @@
* by applying updates to the advertised refs already discovered.
*/
public RefWriter(Collection<Ref> refs) {
- this.refs = new TreeSet<Ref>(RefComparator.INSTANCE);
- this.refs.addAll(refs);
+ this.refs = RefComparator.sort(refs);
}
/**
@@ -163,13 +160,4 @@ public void writePackedRefs() throws IOException {
*/
protected abstract void writeFile(String file, byte[] content)
throws IOException;
-
- private static class RefComparator implements Comparator<Ref> {
-
- private static final RefComparator INSTANCE = new RefComparator();
-
- public int compare(Ref o1, Ref o2) {
- return o1.getName().compareTo(o2.getName());
- }
- }
}
--
1.6.0.2.g2ebc0
Charles O'Farrell