X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAPopupMenu.java;fp=src%2Fjalview%2Fappletgui%2FAPopupMenu.java;h=46bd4fd37730ed5cf4a75f48fecc0544d7859049;hp=9d4447987b010d3b423eb2e15506098da0c2d4a7;hb=5a61b641bd85504fff7e4d68b215188fffc19a00;hpb=98558735e9208afa98bb155bd5350ad0a680ca24 diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java index 9d44479..46bd4fd 100644 --- a/src/jalview/appletgui/APopupMenu.java +++ b/src/jalview/appletgui/APopupMenu.java @@ -383,7 +383,7 @@ public class APopupMenu extends java.awt.PopupMenu void addFeatureLinks(final SequenceI seq, List links) { Menu linkMenu = new Menu(MessageManager.getString("action.link")); - Map> linkset = new LinkedHashMap>(); + Map> linkset = new LinkedHashMap<>(); for (String link : links) { @@ -485,8 +485,8 @@ public class APopupMenu extends java.awt.PopupMenu * Temporary store to hold distinct calcId / type pairs for the tooltip. * Using TreeMap means calcIds are shown in alphabetical order. */ - SortedMap tipEntries = new TreeMap(); - final Map> candidates = new LinkedHashMap>(); + SortedMap tipEntries = new TreeMap<>(); + final Map> candidates = new LinkedHashMap<>(); AlignmentI al = this.ap.av.getAlignment(); AlignmentUtils.findAddableReferenceAnnotations(forSequences, tipEntries, candidates, al); @@ -825,8 +825,8 @@ public class APopupMenu extends java.awt.PopupMenu } int gSize = sg.getSize(); - List seqs = new ArrayList(); - List features = new ArrayList(); + List seqs = new ArrayList<>(); + List features = new ArrayList<>(); for (int i = 0; i < gSize; i++) { @@ -930,7 +930,7 @@ public class APopupMenu extends java.awt.PopupMenu { seq.setName(dialog.getName()); seq.setDescription(dialog.getDescription()); - ap.paintAlignment(false); + ap.paintAlignment(false, false); } } @@ -1163,7 +1163,7 @@ public class APopupMenu extends java.awt.PopupMenu void refresh() { - ap.paintAlignment(true); + ap.paintAlignment(true, true); } protected void clustalColour_actionPerformed() @@ -1339,7 +1339,7 @@ public class APopupMenu extends java.awt.PopupMenu SequenceGroup sg = ap.av.getSelectionGroup(); ap.av.getAlignment().deleteGroup(sg); ap.av.setSelectionGroup(null); - ap.paintAlignment(true); + ap.paintAlignment(true, true); } void createGroupMenuItem_actionPerformed() @@ -1440,8 +1440,8 @@ public class APopupMenu extends java.awt.PopupMenu * the insertion order, which is the order of the annotations on the * alignment. */ - Map>> shownTypes = new LinkedHashMap>>(); - Map>> hiddenTypes = new LinkedHashMap>>(); + Map>> shownTypes = new LinkedHashMap<>(); + Map>> hiddenTypes = new LinkedHashMap<>(); AlignmentAnnotationUtils.getShownHiddenTypes(shownTypes, hiddenTypes, AlignmentAnnotationUtils.asList(annotations), forSequences);