merge from 2_4_Release branch

[jalview.git] / src / org / biojava / dasobert / feature / FeatureComparator.java

diff --git a/src/org/biojava/dasobert/feature/FeatureComparator.java b/src/org/biojava/dasobert/feature/FeatureComparator.java
index 900d196..2b75c22 100644 (file)
--- a/src/org/biojava/dasobert/feature/FeatureComparator.java
+++ b/src/org/biojava/dasobert/feature/FeatureComparator.java
@@ -22,60 +22,66 @@
  *
  */
 
+package org.biojava.dasobert.feature;
 
-package org.biojava.dasobert.feature ;
-
-import java.util.Comparator ;
+import java.util.Comparator;
 import java.util.Iterator;
 import java.util.List;
 
-
-/** a comparator to sort Features byt type
+/**
+ * a comparator to sort Features byt type
+ * 
  * @author Andreas Prlic
  */
 
-public class FeatureComparator 
-implements Comparator
+public class FeatureComparator implements Comparator
 {
 
-       public FeatureComparator() {
-       }
+  public FeatureComparator()
+  {
+  }
 
-       public int compare(Object a, Object b) {
-               FeatureTrack x = (FeatureTrack) a;
-               FeatureTrack y = (FeatureTrack) b;
+  public int compare(Object a, Object b)
+  {
+    FeatureTrack x = (FeatureTrack) a;
+    FeatureTrack y = (FeatureTrack) b;
 
-               String typea = x.getType();
-               String typeb = y.getType();
+    String typea = x.getType();
+    String typeb = y.getType();
 
-               if ( ! typea.equals(typeb))
-                       return typea.compareTo(typeb);
+    if (!typea.equals(typeb))
+      return typea.compareTo(typeb);
 
-               List s1 = x.getSegments();
-               List s2 = y.getSegments();
+    List s1 = x.getSegments();
+    List s2 = y.getSegments();
 
-               Iterator iter1 = s1.iterator();
-               Iterator iter2 = s2.iterator();
+    Iterator iter1 = s1.iterator();
+    Iterator iter2 = s2.iterator();
 
-               while (iter1.hasNext()){
-                       Segment seg1 = (Segment)iter1.next();
-                       int start1 = seg1.getStart();
+    while (iter1.hasNext())
+    {
+      Segment seg1 = (Segment) iter1.next();
+      int start1 = seg1.getStart();
 
-                       while (iter2.hasNext()){
-                               Segment seg2 = (Segment)iter2.next();
-                               int start2 = seg2.getStart();
+      while (iter2.hasNext())
+      {
+        Segment seg2 = (Segment) iter2.next();
+        int start2 = seg2.getStart();
 
-                               if ( start1 < start2){
-                                       return -1;
-                               } if ( start1 > start2){
-                                       return 1;
-                               }
+        if (start1 < start2)
+        {
+          return -1;
+        }
+        if (start1 > start2)
+        {
+          return 1;
+        }
 
-                       }
-               }
+      }
+    }
 
-               return 0;
+    return 0;
 
-       }
+  }
 
 }