X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FSequenceAnnotationReport.java;h=6573a7f8ce9e49c3fd4b2230d72451ee31281129;hb=0b1c761dfaa8242f122cf868e8897a06ec6eb727;hp=d3a1d09e5f3a4654bfedc35a4445189fa78c0c77;hpb=8b9c85b131fbaa1b9b29c489b661089c0ea404bd;p=jalview.git diff --git a/src/jalview/io/SequenceAnnotationReport.java b/src/jalview/io/SequenceAnnotationReport.java index d3a1d09..6573a7f 100644 --- a/src/jalview/io/SequenceAnnotationReport.java +++ b/src/jalview/io/SequenceAnnotationReport.java @@ -26,8 +26,8 @@ import jalview.datamodel.SequenceI; import jalview.util.UrlLink; import java.util.ArrayList; -import java.util.Hashtable; import java.util.List; +import java.util.Map; /** * generate HTML reports for a sequence @@ -60,7 +60,7 @@ public class SequenceAnnotationReport } public void appendFeatures(final StringBuffer tooltipText2, int rpos, - List features, Hashtable minmax) + List features, Map map) { String tmpString; if (features != null) @@ -150,8 +150,8 @@ public class SequenceAnnotationReport // check score should be shown if (!Float.isNaN(feature.getScore())) { - float[][] rng = (minmax == null) ? null : ((float[][]) minmax - .get(feature.getType())); + float[][] rng = (map == null) ? null : (map.get(feature + .getType())); if (rng != null && rng[0] != null && rng[0][0] != rng[0][1]) { tooltipText2.append(" Score=" + feature.getScore()); @@ -321,7 +321,7 @@ public class SequenceAnnotationReport public void createSequenceAnnotationReport(final StringBuffer tip, SequenceI sequence, boolean showDbRefs, boolean showNpFeats, - Hashtable minmax) + Map minmax) { createSequenceAnnotationReport(tip, sequence, showDbRefs, showNpFeats, true, minmax); @@ -329,7 +329,7 @@ public class SequenceAnnotationReport public void createSequenceAnnotationReport(final StringBuffer tip, SequenceI sequence, boolean showDbRefs, boolean showNpFeats, - boolean tableWrap, Hashtable minmax) + boolean tableWrap, Map map) { String tmp; tip.append(""); @@ -369,7 +369,7 @@ public class SequenceAnnotationReport int sz = -tip.length(); List tfeat = new ArrayList(); tfeat.add(features[i]); - appendFeatures(tip, 0, tfeat, minmax); + appendFeatures(tip, 0, tfeat, map); sz += tip.length(); maxWidth = Math.max(maxWidth, sz); }