X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Fio%2Fvamsas%2FRangetype.java;h=64a07e13fa80a89b935ed822a498e39bfa281761;hp=08b1b52cea989eb33f4864469f4d7b9d3c9b70ae;hb=67b3acb8df1438ef37a756c04e14f5a3b8406808;hpb=aa91e8c4561c2dd0f18760e18fb0052979733bf8 diff --git a/src/jalview/io/vamsas/Rangetype.java b/src/jalview/io/vamsas/Rangetype.java index 08b1b52..64a07e1 100644 --- a/src/jalview/io/vamsas/Rangetype.java +++ b/src/jalview/io/vamsas/Rangetype.java @@ -20,7 +20,9 @@ */ package jalview.io.vamsas; +import jalview.bin.Cache; import jalview.io.VamsasAppDatastore; +import jalview.util.MapList; import jalview.util.MessageManager; import java.util.List; @@ -246,26 +248,26 @@ public abstract class Rangetype extends DatastoreItem * @param default unit for mapped * @return MapList */ - protected jalview.util.MapList parsemapType(MapType maprange, int localu, + protected MapList parsemapType(MapType maprange, int localu, int mappedu) { - jalview.util.MapList ml = null; + MapList ml = null; int[] localRange = getIntervals(maprange.getLocal()); int[] mappedRange = getIntervals(maprange.getMapped()); long lu = maprange.getLocal().hasUnit() ? maprange.getLocal().getUnit() : localu; long mu = maprange.getMapped().hasUnit() ? maprange.getMapped() .getUnit() : mappedu; - ml = new jalview.util.MapList(localRange, mappedRange, (int) lu, + ml = new MapList(localRange, mappedRange, (int) lu, (int) mu); return ml; } - protected jalview.util.MapList parsemapType(MapType map) + protected MapList parsemapType(MapType map) { if (!map.getLocal().hasUnit() || map.getMapped().hasUnit()) { - jalview.bin.Cache.log + Cache.log .warn("using default mapping length of 1:1 for map " + (map.isRegistered() ? map.getVorbaId().toString() : (" " + map.toString()))); @@ -280,7 +282,7 @@ public abstract class Rangetype extends DatastoreItem * @param ml * @param setUnits */ - protected void initMapType(MapType maprange, jalview.util.MapList ml, + protected void initMapType(MapType maprange, MapList ml, boolean setUnits) { initMapType(maprange, ml, setUnits, false); @@ -294,7 +296,7 @@ public abstract class Rangetype extends DatastoreItem * @param reverse * - reverse MapList mapping for Local and Mapped ranges and units */ - protected void initMapType(MapType maprange, jalview.util.MapList ml, + protected void initMapType(MapType maprange, MapList ml, boolean setUnits, boolean reverse) { if (ml == null)