X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fanalysis%2FAlignmentAnnotationUtils.java;h=5c2d9364b92f3947b991fd9bf6f4e190b2a5c1f8;hb=841485c28403b4a8e00c9bddae9caa9411667b8a;hp=194ef80354b4d32827db3c08ce40ce7c5b2c9477;hpb=c7bc2d0abe568732fd9249c56b98370944a6e43f;p=jalview.git diff --git a/src/jalview/analysis/AlignmentAnnotationUtils.java b/src/jalview/analysis/AlignmentAnnotationUtils.java index 194ef80..5c2d936 100644 --- a/src/jalview/analysis/AlignmentAnnotationUtils.java +++ b/src/jalview/analysis/AlignmentAnnotationUtils.java @@ -75,11 +75,11 @@ public class AlignmentAnnotationUtils * Build a lookup, by calcId (annotation source), of all annotation types in * each graph group. */ - Map>> groupLabels = new HashMap>>(); + Map>> groupLabels = new HashMap<>(); // trackers for which calcId!label combinations we have dealt with - List addedToShown = new ArrayList(); - List addedToHidden = new ArrayList(); + List addedToShown = new ArrayList<>(); + List addedToHidden = new ArrayList<>(); for (AlignmentAnnotation aa : annotations) { @@ -99,7 +99,7 @@ public class AlignmentAnnotationUtils /* * Build a 'composite label' for types in line graph groups. */ - final List labelAsList = new ArrayList(); + final List labelAsList = new ArrayList<>(); final String displayLabel = aa.label; labelAsList.add(displayLabel); if (aa.graph == AlignmentAnnotation.LINE_GRAPH @@ -245,8 +245,8 @@ public class AlignmentAnnotationUtils * association as necessary. * * @param newAnnot - * - annotation row associated with an alignment sequence to be - * propagated to its dataset sequence. + * - annotation row associated with a sequence to be propagated to + * its reference annotation * @param typeName * - label used to match existing row * @param calcId @@ -257,7 +257,7 @@ public class AlignmentAnnotationUtils { if (newAnnot.sequenceRef != null) { - SequenceI dsseq = newAnnot.sequenceRef.getDatasetSequence(); + SequenceI dsseq = newAnnot.sequenceRef; while (dsseq.getDatasetSequence() != null) { dsseq = dsseq.getDatasetSequence();