JAL-1645 source formatting and organise imports

[jalview.git] / src / jalview / datamodel / Mapping.java

diff --git a/src/jalview/datamodel/Mapping.java b/src/jalview/datamodel/Mapping.java
index 559ae4c..1272538 100644 (file)
--- a/src/jalview/datamodel/Mapping.java
+++ b/src/jalview/datamodel/Mapping.java
@@ -163,7 +163,8 @@ public class Mapping
     {
       // TODO should ideally handle toRatio other than 1 as well...
       // i.e. code like getNextCodon()
-      if (toPosition <= currentToRange[1]) {
+      if (toPosition <= currentToRange[1])
+      {
         char pep = Mapping.this.to.getSequence()[toPosition - 1];
         toPosition++;
         return String.valueOf(pep);
@@ -466,8 +467,7 @@ public class Mapping
       int[] mp = map.shiftFrom(pos);
       if (mp != null)
       {
-        return new int[]
-        { mp[0], mp[0] + mp[2] * (map.getToRatio() - 1) };
+        return new int[] { mp[0], mp[0] + mp[2] * (map.getToRatio() - 1) };
       }
     }
     return null;
@@ -528,8 +528,7 @@ public class Mapping
       }
     }
     // give up and just return the feature.
-    return new SequenceFeature[]
-    { f };
+    return new SequenceFeature[] { f };
   }
 
   /**
@@ -565,8 +564,7 @@ public class Mapping
       }
       return map.locateInFrom(from, to);
     }
-    return new int[]
-    { from, to };
+    return new int[] { from, to };
   }
 
   /**
@@ -602,8 +600,7 @@ public class Mapping
       }
       return map.locateInTo(from, to);
     }
-    return new int[]
-    { from, to };
+    return new int[] { from, to };
   }
 
   /**
@@ -631,13 +628,11 @@ public class Mapping
         {
           for (int m = 0; m < mpr.length; m += 2)
           {
-            toRange.addElement(new int[]
-            { mpr[m], mpr[m + 1] });
+            toRange.addElement(new int[] { mpr[m], mpr[m + 1] });
             int[] xpos = locateRange(mpr[m], mpr[m + 1]);
             for (int x = 0; x < xpos.length; x += 2)
             {
-              fromRange.addElement(new int[]
-              { xpos[x], xpos[x + 1] });
+              fromRange.addElement(new int[] { xpos[x], xpos[x + 1] });
             }
           }
         }
@@ -663,24 +658,6 @@ public class Mapping
     return copy;
   }
 
-  public static void main(String[] args)
-  {
-    /**
-     * trite test of the intersectVisContigs method for a simple DNA -> Protein
-     * exon map and a range of visContigs
-     */
-    MapList fk = new MapList(new int[]
-    { 1, 6, 8, 13, 15, 23 }, new int[]
-    { 1, 7 }, 3, 1);
-    Mapping m = new Mapping(fk);
-    Mapping m_1 = m.intersectVisContigs(new int[]
-    { fk.getFromLowest(), fk.getFromHighest() });
-    Mapping m_2 = m.intersectVisContigs(new int[]
-    { 1, 7, 11, 20 });
-    System.out.println("" + m_1.map.getFromRanges());
-
-  }
-
   /**
    * get the sequence being mapped to - if any
    *