X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Futil%2FMapList.java;fp=src%2Fjalview%2Futil%2FMapList.java;h=4658724e0f58cbda48e61745e9263109a7e59fc6;hb=be762d8d9c71a7aa3121e845c45911c7192b7827;hp=58abdc3926c1bf1badddf8e83e4b0724c06b30da;hpb=d1bb7a31fc091606aedbc255a5766ac79e36fa91;p=jalview.git diff --git a/src/jalview/util/MapList.java b/src/jalview/util/MapList.java index 58abdc3..4658724 100644 --- a/src/jalview/util/MapList.java +++ b/src/jalview/util/MapList.java @@ -103,10 +103,9 @@ public class MapList { return false; } - return Arrays - .deepEquals(fromShifts.toArray(), obj.fromShifts.toArray()) - && Arrays - .deepEquals(toShifts.toArray(), obj.toShifts.toArray()); + return Arrays.deepEquals(fromShifts.toArray(), obj.fromShifts.toArray()) + && Arrays.deepEquals(toShifts.toArray(), + obj.toShifts.toArray()); } /** @@ -373,10 +372,12 @@ public class MapList * drop this range if it lies within the last range */ if ((lastDirection == 1 && range[0] >= lastRange[0] - && range[0] <= lastRange[1] && range[1] >= lastRange[0] && range[1] <= lastRange[1]) + && range[0] <= lastRange[1] && range[1] >= lastRange[0] + && range[1] <= lastRange[1]) || (lastDirection == -1 && range[0] <= lastRange[0] && range[0] >= lastRange[1] - && range[1] <= lastRange[0] && range[1] >= lastRange[1])) + && range[1] <= lastRange[0] + && range[1] >= lastRange[1])) { changed = true; continue; @@ -391,8 +392,10 @@ public class MapList boolean sameDirection = range[1] == range[0] || direction == lastDirection; boolean extending = range[0] == lastRange[1] + lastDirection; - boolean overlapping = (lastDirection == 1 && range[0] >= lastRange[0] && range[0] <= lastRange[1]) - || (lastDirection == -1 && range[0] <= lastRange[0] && range[0] >= lastRange[1]); + boolean overlapping = (lastDirection == 1 && range[0] >= lastRange[0] + && range[0] <= lastRange[1]) + || (lastDirection == -1 && range[0] <= lastRange[0] + && range[0] >= lastRange[1]); if (sameDirection && (overlapping || extending)) { lastRange[1] = range[1]; @@ -961,15 +964,17 @@ public class MapList // TODO not used - remove? if (local) { - return ((getFromLowest() >= map.getFromLowest() && getFromHighest() <= map - .getFromHighest()) || (getFromLowest() <= map.getFromLowest() && getFromHighest() >= map - .getFromHighest())); + return ((getFromLowest() >= map.getFromLowest() + && getFromHighest() <= map.getFromHighest()) + || (getFromLowest() <= map.getFromLowest() + && getFromHighest() >= map.getFromHighest())); } else { - return ((getToLowest() >= map.getToLowest() && getToHighest() <= map - .getToHighest()) || (getToLowest() <= map.getToLowest() && getToHighest() >= map - .getToHighest())); + return ((getToLowest() >= map.getToLowest() + && getToHighest() <= map.getToHighest()) + || (getToLowest() <= map.getToLowest() + && getToHighest() >= map.getToHighest())); } }