JAL-2480 more efficient contains check on add; tidied comparators

[jalview.git] / src / jalview / datamodel / features / RangeComparator.java

diff --git a/src/jalview/datamodel/features/RangeComparator.java b/src/jalview/datamodel/features/RangeComparator.java
index 57e9b5f..05d3f0a 100644 (file)
--- a/src/jalview/datamodel/features/RangeComparator.java
+++ b/src/jalview/datamodel/features/RangeComparator.java
@@ -4,15 +4,33 @@ import java.util.Comparator;
 
 /**
  * A comparator that orders ranges by either start position or end position
- * ascending. If the position matches,
+ * ascending. If the position matches, ordering is resolved by end position (or
+ * start position).
  * 
  * @author gmcarstairs
  *
  */
 public class RangeComparator implements Comparator<ContiguousI>
 {
+  public static final Comparator<ContiguousI> BY_START_POSITION = new RangeComparator(
+          true);
+
+  public static final Comparator<ContiguousI> BY_END_POSITION = new RangeComparator(
+          false);
+
   boolean byStart;
 
+  /**
+   * Constructor
+   * 
+   * @param byStartPosition
+   *          if true, order based on start position, if false by end position
+   */
+  RangeComparator(boolean byStartPosition)
+  {
+    byStart = byStartPosition;
+  }
+
   @Override
   public int compare(ContiguousI o1, ContiguousI o2)
   {
@@ -55,15 +73,4 @@ public class RangeComparator implements Comparator<ContiguousI>
     }
     return order;
   }
-
-  /**
-   * Constructor
-   * 
-   * @param byStartPosition
-   *          if true, order based on start position, if false by end position
-   */
-  public RangeComparator(boolean byStartPosition)
-  {
-    byStart = byStartPosition;
-  }
 }