Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' into trialMerge

[jalview.git] / src / jalview / jbgui / GAlignFrame.java

diff --git a/src/jalview/jbgui/GAlignFrame.java b/src/jalview/jbgui/GAlignFrame.java
index 3a6e603..4fb5a44 100755 (executable)
--- a/src/jalview/jbgui/GAlignFrame.java
+++ b/src/jalview/jbgui/GAlignFrame.java
@@ -285,16 +285,7 @@ public class GAlignFrame extends JInternalFrame
     addMenuActionAndAccelerator(keyStroke, closeMenuItem, al);
 
     JMenu editMenu = new JMenu(MessageManager.getString("action.edit"));
-    JMenu viewMenu = new JMenu(MessageManager.getString("action.view")) {
-      
-      public void setPopupMenuVisible(boolean b) {
-        if (b) {
-          openFeatureSettings.setEnabled(haveAlignmentFeatures());
-        }
-        super.setPopupMenuVisible(b);
-      }
-
-    };
+    JMenu viewMenu = new JMenu(MessageManager.getString("action.view"));
     JMenu annotationsMenu = new JMenu(
             MessageManager.getString("action.annotations"));
     JMenu showMenu = new JMenu(MessageManager.getString("action.show"));
@@ -1293,7 +1284,6 @@ public class GAlignFrame extends JInternalFrame
 
     openFeatureSettings = new JMenuItem(
             MessageManager.getString("action.feature_settings"));
-    openFeatureSettings.setEnabled(false);
     openFeatureSettings.addActionListener(new ActionListener()
     {
       @Override
@@ -1302,6 +1292,10 @@ public class GAlignFrame extends JInternalFrame
         featureSettings_actionPerformed(e);
       }
     });
+
+    /*
+     * add sub-menu of database we can fetch from
+     */
     JMenuItem fetchSequence = new JMenuItem(
             MessageManager.getString("label.fetch_sequences"));
     fetchSequence.addActionListener(new ActionListener()
@@ -1309,7 +1303,7 @@ public class GAlignFrame extends JInternalFrame
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        fetchSequence_actionPerformed(e);
+        fetchSequence_actionPerformed();
       }
     });
 
@@ -1775,11 +1769,8 @@ public class GAlignFrame extends JInternalFrame
     hideMenu.add(hideAllSelection);
     hideMenu.add(hideAllButSelection);
     viewMenu.add(newView);
-    if (!Jalview.isJS())
-    {
-      viewMenu.add(expandViews);
-      viewMenu.add(gatherViews);
-    }
+    viewMenu.add(expandViews);
+    viewMenu.add(gatherViews);
     viewMenu.addSeparator();
     viewMenu.add(showMenu);
     viewMenu.add(hideMenu);
@@ -1899,12 +1890,6 @@ public class GAlignFrame extends JInternalFrame
     // selectMenu.add(listenToViewSelections);
   }
 
-  protected boolean haveAlignmentFeatures()
-  {
-    // because gAlignFrame is not an abstract class  -- see AlignFrame
-    return false;
-  }
-
   protected void loadVcf_actionPerformed()
   {
   }
@@ -2487,7 +2472,7 @@ public class GAlignFrame extends JInternalFrame
 
   }
 
-  public void fetchSequence_actionPerformed(ActionEvent e)
+  public void fetchSequence_actionPerformed()
   {
 
   }