X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FAPopupMenu.java;h=51ecd889ee95e14910d9f4176542ab0c22f79fe1;hb=72b3f05a1157da32ada5aea139139996dddea219;hp=2c4eccb85ab54acab3874e59d0112b3826a71924;hpb=47168f025aefdaa044802bd5f8f510ffe43a4808;p=jalview.git

diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java
index 2c4eccb..51ecd88 100644
--- a/src/jalview/appletgui/APopupMenu.java
+++ b/src/jalview/appletgui/APopupMenu.java
@@ -89,15 +89,19 @@ public class APopupMenu extends java.awt.PopupMenu implements
 
   Menu editMenu = new Menu(MessageManager.getString("action.edit"));
 
-  MenuItem copy = new MenuItem(MessageManager.getString("label.jalview_copy"));
+  MenuItem copy = new MenuItem(
+          MessageManager.getString("label.jalview_copy"));
 
   MenuItem cut = new MenuItem(MessageManager.getString("label.jalview_cut"));
 
-  MenuItem toUpper = new MenuItem(MessageManager.getString("label.to_upper_case"));
+  MenuItem toUpper = new MenuItem(
+          MessageManager.getString("label.to_upper_case"));
 
-  MenuItem toLower = new MenuItem(MessageManager.getString("label.to_lower_case"));
+  MenuItem toLower = new MenuItem(
+          MessageManager.getString("label.to_lower_case"));
 
-  MenuItem toggleCase = new MenuItem(MessageManager.getString("label.toggle_case"));
+  MenuItem toggleCase = new MenuItem(
+          MessageManager.getString("label.toggle_case"));
 
   Menu outputmenu = new Menu();
 
@@ -109,15 +113,20 @@ public class APopupMenu extends java.awt.PopupMenu implements
 
   MenuItem repGroup = new MenuItem();
 
-  MenuItem sequenceName = new MenuItem(MessageManager.getString("label.edit_name_description"));
+  MenuItem sequenceName = new MenuItem(
+          MessageManager.getString("label.edit_name_description"));
 
-  MenuItem sequenceFeature = new MenuItem(MessageManager.getString("label.create_sequence_feature"));
+  MenuItem sequenceFeature = new MenuItem(
+          MessageManager.getString("label.create_sequence_feature"));
 
-  MenuItem editSequence = new MenuItem(MessageManager.getString("label.edit_sequence"));
+  MenuItem editSequence = new MenuItem(
+          MessageManager.getString("label.edit_sequence"));
 
-  MenuItem sequenceDetails = new MenuItem(MessageManager.getString("label.sequence_details") + "...");
+  MenuItem sequenceDetails = new MenuItem(
+          MessageManager.getString("label.sequence_details") + "...");
 
-  MenuItem selSeqDetails = new MenuItem(MessageManager.getString("label.sequence_details") + "...");
+  MenuItem selSeqDetails = new MenuItem(
+          MessageManager.getString("label.sequence_details") + "...");
 
   Sequence seq;
 
@@ -165,7 +174,9 @@ public class APopupMenu extends java.awt.PopupMenu implements
 
     if (sg != null && sg.getSize() > 0)
     {
-      editGroupName.setLabel(MessageManager.formatMessage("label.name_param", new String[]{sg.getName()}));
+      editGroupName.setLabel(MessageManager.formatMessage(
+              "label.name_param", new String[]
+              { sg.getName() }));
       showText.setState(sg.getDisplayText());
       showColourText.setState(sg.getColourText());
       showBoxes.setState(sg.getDisplayBoxes());
@@ -174,7 +185,9 @@ public class APopupMenu extends java.awt.PopupMenu implements
       {
         menu1.setLabel(MessageManager.getString("action.edit_new_group"));
         groupMenu.remove(unGroupMenuItem);
-      } else {
+      }
+      else
+      {
         menu1.setLabel(MessageManager.getString("action.edit_group"));
         groupMenu.remove(createGroupMenuItem);
       }
@@ -310,7 +323,9 @@ public class APopupMenu extends java.awt.PopupMenu implements
     if (seq != null)
     {
       seqMenu.setLabel(seq.getName());
-      repGroup.setLabel(MessageManager.formatMessage("label.represent_group_with", new String[]{seq.getName()}));
+      repGroup.setLabel(MessageManager.formatMessage(
+              "label.represent_group_with", new String[]
+              { seq.getName() }));
     }
     else
     {
@@ -632,7 +647,7 @@ public class APopupMenu extends java.awt.PopupMenu implements
               features, true, ap))
       {
         ap.alignFrame.sequenceFeatures.setState(true);
-        ap.av.showSequenceFeatures(true);
+        ap.av.setShowSequenceFeatures(true);;
         ap.highlightSearchResults(null);
       }
     }
@@ -649,8 +664,9 @@ public class APopupMenu extends java.awt.PopupMenu implements
 
     Frame frame = new Frame();
     frame.add(cap);
-    jalview.bin.JalviewLite.addFrame(frame,
-    		MessageManager.formatMessage("label.selection_output_command", new String[]{e.getActionCommand()}),600, 500);
+    jalview.bin.JalviewLite.addFrame(frame, MessageManager.formatMessage(
+            "label.selection_output_command", new String[]
+            { e.getActionCommand() }), 600, 500);
     // JBPNote: getSelectionAsNewSequence behaviour has changed - this method
     // now returns a full copy of sequence data
     // TODO consider using getSequenceSelection instead here
@@ -681,7 +697,9 @@ public class APopupMenu extends java.awt.PopupMenu implements
     StringBuffer contents = new StringBuffer();
     for (SequenceI seq : sequences)
     {
-      contents.append(MessageManager.formatMessage("label.annotation_for_displayid",new String[]{seq.getDisplayId(true)}));
+      contents.append(MessageManager.formatMessage(
+              "label.annotation_for_displayid", new String[]
+              { seq.getDisplayId(true) }));
       new SequenceAnnotationReport(null)
               .createSequenceAnnotationReport(
                       contents,
@@ -689,7 +707,7 @@ public class APopupMenu extends java.awt.PopupMenu implements
                       true,
                       true,
                       false,
-                      (ap.seqPanel.seqCanvas.fr != null) ? ap.seqPanel.seqCanvas.fr.minmax
+                      (ap.seqPanel.seqCanvas.fr != null) ? ap.seqPanel.seqCanvas.fr.getMinMax()
                               : null);
       contents.append("</p>");
     }
@@ -698,7 +716,9 @@ public class APopupMenu extends java.awt.PopupMenu implements
     jalview.bin.JalviewLite.addFrame(frame, "Sequence Details for "
             + (sequences.length == 1 ? sequences[0].getDisplayId(true)
                     : "Selection"), 600, 500);
-    cap.setText(MessageManager.formatMessage("label.html_content", new String[]{contents.toString()}));
+    cap.setText(MessageManager.formatMessage("label.html_content",
+            new String[]
+            { contents.toString() }));
   }
 
   void editName()
@@ -737,8 +757,9 @@ public class APopupMenu extends java.awt.PopupMenu implements
       cap.setPDBImport(seq);
       Frame frame = new Frame();
       frame.add(cap);
-      jalview.bin.JalviewLite.addFrame(frame,
-              MessageManager.formatMessage("label.paste_pdb_file_for_sequence",  new String[]{seq.getName()}), 400, 300);
+      jalview.bin.JalviewLite.addFrame(frame, MessageManager.formatMessage(
+              "label.paste_pdb_file_for_sequence", new String[]
+              { seq.getName() }), 400, 300);
     }
   }
 
@@ -748,13 +769,16 @@ public class APopupMenu extends java.awt.PopupMenu implements
     sequenceFeature.addActionListener(this);
 
     editGroupName.addActionListener(this);
-    unGroupMenuItem.setLabel(MessageManager.getString("action.remove_group"));
+    unGroupMenuItem.setLabel(MessageManager
+            .getString("action.remove_group"));
     unGroupMenuItem.addActionListener(this);
 
-    createGroupMenuItem.setLabel(MessageManager.getString("action.create_group"));
+    createGroupMenuItem.setLabel(MessageManager
+            .getString("action.create_group"));
     createGroupMenuItem.addActionListener(this);
 
-    nucleotideMenuItem.setLabel(MessageManager.getString("label.nucleotide"));
+    nucleotideMenuItem.setLabel(MessageManager
+            .getString("label.nucleotide"));
     nucleotideMenuItem.addActionListener(this);
     conservationMenuItem.addItemListener(this);
     abovePIDColour.addItemListener(this);
@@ -765,7 +789,8 @@ public class APopupMenu extends java.awt.PopupMenu implements
     sequenceName.addActionListener(this);
     sequenceDetails.addActionListener(this);
     selSeqDetails.addActionListener(this);
-    displayNonconserved.setLabel(MessageManager.getString("label.show_non_conversed"));
+    displayNonconserved.setLabel(MessageManager
+            .getString("label.show_non_conversed"));
     displayNonconserved.setState(false);
     displayNonconserved.addItemListener(this);
     showText.setLabel(MessageManager.getString("action.text"));
@@ -776,10 +801,12 @@ public class APopupMenu extends java.awt.PopupMenu implements
     seqMenu.setLabel(MessageManager.getString("label.sequence"));
     pdb.setLabel(MessageManager.getString("label.view_pdb_structure"));
     hideSeqs.setLabel(MessageManager.getString("action.hide_sequences"));
-    repGroup.setLabel(MessageManager.formatMessage("label.represent_group_with", new String[]{""}));
+    repGroup.setLabel(MessageManager.formatMessage(
+            "label.represent_group_with", new String[]
+            { "" }));
     revealAll.setLabel(MessageManager.getString("action.reveal_all"));
     revealSeq.setLabel(MessageManager.getString("action.reveal_sequences"));
-    menu1.setLabel(MessageManager.getString("label.group")+":");
+    menu1.setLabel(MessageManager.getString("label.group") + ":");
     add(groupMenu);
     this.add(seqMenu);
     this.add(hideSeqs);