Merge branch 'develop' into releases/Release_2_10_2_Branch

[jalview.git] / src / jalview / io / vamsas / Rangetype.java

diff --git a/src/jalview/io/vamsas/Rangetype.java b/src/jalview/io/vamsas/Rangetype.java
index 96820d3..ee4fa83 100644 (file)
--- a/src/jalview/io/vamsas/Rangetype.java
+++ b/src/jalview/io/vamsas/Rangetype.java
@@ -53,7 +53,8 @@ public abstract class Rangetype extends DatastoreItem
     super(datastore);
   }
 
-  public Rangetype(VamsasAppDatastore datastore, Vobject vobj, Class jvClass)
+  public Rangetype(VamsasAppDatastore datastore, Vobject vobj,
+          Class jvClass)
   {
     super(datastore, vobj, jvClass);
   }
@@ -78,9 +79,8 @@ public abstract class Rangetype extends DatastoreItem
       int[] se = null;
       if (dseta.getSegCount() > 0 && dseta.getPosCount() > 0)
       {
-        throw new Error(
-                MessageManager
-                        .getString("error.invalid_vamsas_rangetype_cannot_resolve_lists"));
+        throw new Error(MessageManager.getString(
+                "error.invalid_vamsas_rangetype_cannot_resolve_lists"));
       }
       if (dseta.getSegCount() > 0)
       {
@@ -137,9 +137,8 @@ public abstract class Rangetype extends DatastoreItem
       int[] se = null;
       if (dseta.getSegCount() > 0 && dseta.getPosCount() > 0)
       {
-        throw new Error(
-                MessageManager
-                        .getString("error.invalid_vamsas_rangetype_cannot_resolve_lists"));
+        throw new Error(MessageManager.getString(
+                "error.invalid_vamsas_rangetype_cannot_resolve_lists"));
       }
       if (dseta.getSegCount() > 0)
       {
@@ -186,9 +185,8 @@ public abstract class Rangetype extends DatastoreItem
       int[] se = null;
       if (range.getSegCount() > 0 && range.getPosCount() > 0)
       {
-        throw new Error(
-                MessageManager
-                        .getString("error.invalid_vamsas_rangetype_cannot_resolve_lists"));
+        throw new Error(MessageManager.getString(
+                "error.invalid_vamsas_rangetype_cannot_resolve_lists"));
       }
       if (range.getSegCount() > 0)
       {
@@ -247,8 +245,10 @@ public abstract class Rangetype extends DatastoreItem
    * @param maprange
    *          where the from range is the local mapped range, and the to range
    *          is the 'mapped' range in the MapRangeType
-   * @param default unit for local
-   * @param default unit for mapped
+   * @param default
+   *          unit for local
+   * @param default
+   *          unit for mapped
    * @return MapList
    */
   protected jalview.util.MapList parsemapType(MapType maprange, int localu,
@@ -259,8 +259,9 @@ public abstract class Rangetype extends DatastoreItem
     int[] mappedRange = getIntervals(maprange.getMapped());
     long lu = maprange.getLocal().hasUnit() ? maprange.getLocal().getUnit()
             : localu;
-    long mu = maprange.getMapped().hasUnit() ? maprange.getMapped()
-            .getUnit() : mappedu;
+    long mu = maprange.getMapped().hasUnit()
+            ? maprange.getMapped().getUnit()
+            : mappedu;
     ml = new jalview.util.MapList(localRange, mappedRange, (int) lu,
             (int) mu);
     return ml;
@@ -304,9 +305,8 @@ public abstract class Rangetype extends DatastoreItem
   {
     if (ml == null)
     {
-      throw new Error(
-              MessageManager
-                      .getString("error.implementation_error_maplist_is_null"));
+      throw new Error(MessageManager
+              .getString("error.implementation_error_maplist_is_null"));
     }
     maprange.setLocal(new Local());
     maprange.setMapped(new Mapped());