X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAPopupMenu.java;h=e1bfbde2ee8527a16385350fc119ced2d9028e15;hb=775fa10f6afa3da6dd105e9528a7039ac1d9089f;hp=46bd4fd37730ed5cf4a75f48fecc0544d7859049;hpb=a57976ba40e1abe6d7c1940386e1a25419ef9c9d;p=jalview.git diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java index 46bd4fd..e1bfbde 100644 --- a/src/jalview/appletgui/APopupMenu.java +++ b/src/jalview/appletgui/APopupMenu.java @@ -20,6 +20,25 @@ */ package jalview.appletgui; +import java.awt.CheckboxMenuItem; +import java.awt.Frame; +import java.awt.Menu; +import java.awt.MenuItem; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.SortedMap; +import java.util.TreeMap; +import java.util.Vector; + import jalview.analysis.AAFrequency; import jalview.analysis.AlignmentAnnotationUtils; import jalview.analysis.AlignmentUtils; @@ -57,25 +76,6 @@ import jalview.schemes.ZappoColourScheme; import jalview.util.MessageManager; import jalview.util.UrlLink; -import java.awt.CheckboxMenuItem; -import java.awt.Frame; -import java.awt.Menu; -import java.awt.MenuItem; -import java.awt.event.ActionEvent; -import java.awt.event.ActionListener; -import java.awt.event.ItemEvent; -import java.awt.event.ItemListener; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.Collections; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.SortedMap; -import java.util.TreeMap; -import java.util.Vector; - public class APopupMenu extends java.awt.PopupMenu implements ActionListener, ItemListener { @@ -900,11 +900,8 @@ public class APopupMenu extends java.awt.PopupMenu contents.append(MessageManager .formatMessage("label.annotation_for_displayid", new Object[] { seq.getDisplayId(true) })); - new SequenceAnnotationReport(null).createSequenceAnnotationReport( - contents, seq, true, true, - (ap.seqPanel.seqCanvas.fr != null) - ? ap.seqPanel.seqCanvas.fr.getMinMax() - : null); + new SequenceAnnotationReport(false).createSequenceAnnotationReport( + contents, seq, true, true, ap.seqPanel.seqCanvas.fr); contents.append("

"); } Frame frame = new Frame(); @@ -948,7 +945,7 @@ public class APopupMenu extends java.awt.PopupMenu } else { - new MCview.AppletPDBViewer(entry, new SequenceI[] { seq }, null, ap, + new mc_view.AppletPDBViewer(entry, new SequenceI[] { seq }, null, ap, DataSourceType.URL); }