JAL-1486 fix: pass selected region to jalview.io via alignment view and align viewpor...

[jalview.git] / src / jalview / gui / PopupMenu.java

diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index e256b33..25cad0a 100644 (file)
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -2071,23 +2071,21 @@ public class PopupMenu extends JPopupMenu
     System.out.println("PROMPT USER HERE"); // TODO: decide if a prompt happens
     // or we simply trust the user wants
     // wysiwig behaviour
-    SequenceGroup sg = ap.av.getSelectionGroup();
-    ColumnSelection csel = new ColumnSelection(ap.av.getColumnSelection());
-    omitHidden = ap.av.getViewAsString(true);
-    Alignment oal = new Alignment(ap.av.getSequenceSelection());
-    AlignmentAnnotation[] nala = ap.av.getAlignment()
-            .getAlignmentAnnotation();
-    if (nala != null)
+
+    AlignmentView selvew = ap.av.getAlignmentView(true, false);
+    AlignmentI aselview = selvew.getVisibleAlignment(ap.av
+            .getGapCharacter());
+    List<AlignmentAnnotation> ala = (ap.av
+            .getVisibleAlignmentAnnotation(true));
+    if (ala != null)
     {
-      for (int i = 0; i < nala.length; i++)
+      for (AlignmentAnnotation aa : ala)
       {
-        AlignmentAnnotation na = nala[i];
-        oal.addAnnotation(na);
+        aselview.addAnnotation(aa);
       }
     }
     cap.setText(new FormatAdapter().formatSequences(e.getActionCommand(),
-            oal, omitHidden, csel, sg));
-    oal = null;
+            aselview, null, null, null));
   }
 
   public void pdbFromFile_actionPerformed()
@@ -2100,7 +2098,7 @@ public class PopupMenu extends JPopupMenu
             { sequence.getDisplayId(false) }));
     chooser.setToolTipText(MessageManager.formatMessage(
             "label.load_pdb_file_associate_with_sequence", new String[]
-            { new Integer(sequence.getDisplayId(false)).toString() }));
+            { sequence.getDisplayId(false) }));
 
     int value = chooser.showOpenDialog(null);