X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fdatamodel%2FMapping.java;h=4d90e3e0b6c042533ef42f020ccbb232c9b7094c;hb=HEAD;hp=66425d222f38bb7ee4d888dbf51b0ff9cba8ac26;hpb=ff450fad8709ae81919af7a15ea382af7292794c;p=jalview.git diff --git a/src/jalview/datamodel/Mapping.java b/src/jalview/datamodel/Mapping.java index 66425d2..4d90e3e 100644 --- a/src/jalview/datamodel/Mapping.java +++ b/src/jalview/datamodel/Mapping.java @@ -20,13 +20,13 @@ */ package jalview.datamodel; -import jalview.util.Comparison; -import jalview.util.MapList; - import java.util.Iterator; import java.util.NoSuchElementException; import java.util.Vector; +import jalview.util.Comparison; +import jalview.util.MapList; + public class Mapping { /** @@ -182,8 +182,8 @@ public class Mapping } if (!toRanges.hasNext()) { - throw new NoSuchElementException("Ran out of peptide at position " - + toPosition); + throw new NoSuchElementException( + "Ran out of peptide at position " + toPosition); } currentToRange = toRanges.next(); toPosition = currentToRange[0]; @@ -433,23 +433,6 @@ public class Mapping } /** - * gets boundary in direction of mapping - * - * @param position - * in mapped reference frame - * @return int{start, end} positions in associated sequence (in direction of - * mapped word) - */ - public int[] getWord(int mpos) - { - if (map != null) - { - return map.getToWord(mpos); - } - return null; - } - - /** * width of mapped unit in associated sequence * */ @@ -667,8 +650,8 @@ public class Mapping to[f * 2] = r[0]; to[f * 2 + 1] = r[1]; } - copy.setMap(new MapList(from, to, map.getFromRatio(), map - .getToRatio())); + copy.setMap( + new MapList(from, to, map.getFromRatio(), map.getToRatio())); } return copy; } @@ -693,19 +676,6 @@ public class Mapping to = tto; } - /* - * (non-Javadoc) - * - * @see java.lang.Object#finalize() - */ - @Override - protected void finalize() throws Throwable - { - map = null; - to = null; - super.finalize(); - } - /** * Returns an iterator which can serve up the aligned codon column positions * and their corresponding peptide products @@ -715,7 +685,8 @@ public class Mapping * @param gapChar * @return */ - public Iterator getCodonIterator(SequenceI seq, char gapChar) + public Iterator getCodonIterator(SequenceI seq, + char gapChar) { return new AlignedCodonIterator(seq, gapChar); } @@ -726,8 +697,8 @@ public class Mapping @Override public String toString() { - return String.format("%s %s", this.map.toString(), this.to == null ? "" - : this.to.getName()); + return String.format("%s %s", this.map.toString(), + this.to == null ? "" : this.to.getName()); } /**