JAL-3783 Updated groovy jars. Requires javaparser-core library to run too

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

diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index 9d62976..109c140 100644 (file)
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -906,6 +906,7 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
     if (Platform.isJS())
     {
       details = new JInternalFrame();
+      details.setFrameIcon(null);
       JPanel panel = new JPanel(new BorderLayout());
       panel.setOpaque(true);
       panel.setBackground(Color.white);
@@ -1734,10 +1735,9 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
   protected void addReferenceAnnotations_actionPerformed(
           Map<SequenceI, List<AlignmentAnnotation>> candidates)
   {
-    final SequenceGroup selectionGroup = this.ap.av.getSelectionGroup();
     final AlignmentI alignment = this.ap.getAlignment();
     AlignmentUtils.addReferenceAnnotations(candidates, alignment,
-            selectionGroup);
+            null);
     refresh();
   }
 
@@ -1835,6 +1835,7 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
       pane.setBackground(Color.WHITE);
       pane.add(textLabel, BorderLayout.NORTH);
       frame = new JInternalFrame();
+      frame.setFrameIcon(null);
       frame.getContentPane().add(new JScrollPane(pane));
     }
     else
@@ -1990,7 +1991,6 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
               sg.setName(dialog.getName());
               sg.setDescription(dialog.getDescription());
               refresh();
-              return null;
             });
   }
 
@@ -2028,11 +2028,15 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
               {
                 if (dialog.getName().indexOf(" ") > -1)
                 {
-                  JvOptionPane.frameDialog(
-                          MessageManager.getString(
-                                  "label.spaces_converted_to_underscores"),
-                          MessageManager.getString(
-                                  "label.no_spaces_allowed_sequence_name"),
+                  String ok = MessageManager.getString("action.ok");
+                  String cancel = MessageManager.getString("action.cancel");
+                  String message = MessageManager.getString(
+                          "label.spaces_converted_to_underscores");
+                  String title = MessageManager.getString(
+                          "label.no_spaces_allowed_sequence_name");
+                  Object[] options = new Object[] { ok, cancel };
+
+                  JvOptionPane.frameDialog(message, title,
                           JvOptionPane.WARNING_MESSAGE, null, null, null,
                           false);
                 }
@@ -2042,7 +2046,6 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
               sequence.setDescription(dialog.getDescription());
               ap.av.firePropertyChange("alignment", null,
                       ap.av.getAlignment().getSequences());
-              return null;
             });
   }
 
@@ -2188,7 +2191,7 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
 
     String[] omitHidden = null;
 
-    System.out.println("PROMPT USER HERE"); // TODO: decide if a prompt happens
+    jalview.bin.Console.outPrintln("PROMPT USER HERE"); // TODO: decide if a prompt happens
     // or we simply trust the user wants
     // wysiwig behaviour
 
@@ -2277,7 +2280,6 @@ public class PopupMenu extends JPopupMenu implements ColourChangeListener
                 ap.alignFrame.addHistoryItem(editCommand);
                 ap.av.firePropertyChange("alignment", null,
                         ap.av.getAlignment().getSequences());
-                return null;
               });
     }
   }