X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fjbgui%2FGDesktop.java;h=4b4d28d4964271018753c812fca1699fef4de133;hb=cbe8877688ba73d591239cf9a654eb2582f771b8;hp=11a558cd370c66b2aae8db534644277fb39ea17a;hpb=2893b63c9072d9296596f9320703ab8814b4e730;p=jalview.git

diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java
index 11a558c..4b4d28d 100755
--- a/src/jalview/jbgui/GDesktop.java
+++ b/src/jalview/jbgui/GDesktop.java
@@ -21,6 +21,7 @@
 package jalview.jbgui;
 
 import jalview.api.AlignmentViewPanel;
+import jalview.bin.Jalview;
 import jalview.io.FileFormatException;
 import jalview.util.MessageManager;
 import jalview.util.Platform;
@@ -44,6 +45,23 @@ import javax.swing.JMenuItem;
  */
 public class GDesktop extends JFrame
 {
+
+  public static javax.swing.JTabbedPane createTabbedPane()
+  {
+    // now just always return JTabbedPane
+   return new javax.swing.JTabbedPane();
+//    // BH 2018 coercing jalview.jbgui.swing.JTabbedPane() for now
+//    if (/** @j2sNative false && */
+//    true)
+//    {
+//      // Java
+//      return new javax.swing.JTabbedPane();
+//    }
+//    // JavaScript
+//    return (javax.swing.JTabbedPane) (Object) new jalview.jbgui.swing.JTabbedPane();
+  }
+
+  
   protected static JMenu windowMenu = new JMenu();
 
   JMenuBar desktopMenubar = new JMenuBar();
@@ -225,7 +243,7 @@ public class GDesktop extends JFrame
               @Override
               public void actionPerformed(ActionEvent e)
               {
-                documentationMenuItem_actionPerformed(e);
+                documentationMenuItem_actionPerformed();
               }
             });
     this.getContentPane().setLayout(flowLayout1);
@@ -246,7 +264,7 @@ public class GDesktop extends JFrame
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        saveState_actionPerformed(e);
+        saveState_actionPerformed();
       }
     });
     loadState.setText(MessageManager.getString("action.load_project"));
@@ -255,7 +273,7 @@ public class GDesktop extends JFrame
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        loadState_actionPerformed(e);
+        loadState_actionPerformed();
       }
     });
     inputMenu.setText(MessageManager.getString("label.input_alignment"));
@@ -423,9 +441,12 @@ public class GDesktop extends JFrame
     desktopMenubar.add(windowMenu);
     FileMenu.add(inputMenu);
     FileMenu.add(inputSequence);
-    FileMenu.addSeparator();
-    FileMenu.add(saveState);
-    FileMenu.add(loadState);
+    if (!Jalview.isJS())
+    {
+      FileMenu.addSeparator();
+      FileMenu.add(saveState);
+      FileMenu.add(loadState);
+    }
     FileMenu.addSeparator();
     FileMenu.add(quit);
     HelpMenu.add(aboutMenuItem);
@@ -437,11 +458,17 @@ public class GDesktop extends JFrame
     VamsasMenu.add(vamsasSave);
     VamsasMenu.add(vamsasStop);
     toolsMenu.add(preferences);
-    toolsMenu.add(showMemusage);
-    toolsMenu.add(showConsole);
-    toolsMenu.add(showNews);
-    toolsMenu.add(garbageCollect);
-    toolsMenu.add(groovyShell);
+    if (!Jalview.isJS())
+    {
+      toolsMenu.add(showMemusage);
+      toolsMenu.add(showConsole);
+    }
+    if (!Jalview.isJS())
+    {
+      toolsMenu.add(showNews);
+      toolsMenu.add(garbageCollect);
+      toolsMenu.add(groovyShell);
+    }
     toolsMenu.add(experimentalFeatures);
     // toolsMenu.add(snapShotWindow);
     inputMenu.add(inputLocalFileMenuItem);
@@ -551,13 +578,7 @@ public class GDesktop extends JFrame
   {
   }
 
-  /**
-   * DOCUMENT ME!
-   * 
-   * @param e
-   *          DOCUMENT ME!
-   */
-  protected void documentationMenuItem_actionPerformed(ActionEvent e)
+  protected void documentationMenuItem_actionPerformed()
   {
   }
 
@@ -581,33 +602,11 @@ public class GDesktop extends JFrame
   {
   }
 
-  /**
-   * DOCUMENT ME!
-   * 
-   * @param e
-   *          DOCUMENT ME!
-   */
-  public void saveState_actionPerformed(ActionEvent e)
-  {
-  }
-
-  /**
-   * DOCUMENT ME!
-   * 
-   * @param e
-   *          DOCUMENT ME!
-   */
-  public void loadState_actionPerformed(ActionEvent e)
+  public void saveState_actionPerformed()
   {
   }
 
-  /**
-   * DOCUMENT ME!
-   * 
-   * @param e
-   *          DOCUMENT ME!
-   */
-  public void loadJalviewAlign_actionPerformed(ActionEvent e)
+  public void loadState_actionPerformed()
   {
   }