temp push

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

diff --git a/src/jalview/jbgui/GDesktop.java b/src/jalview/jbgui/GDesktop.java
index b301f6e..9e15eea 100755 (executable)
--- a/src/jalview/jbgui/GDesktop.java
+++ b/src/jalview/jbgui/GDesktop.java
@@ -38,31 +38,15 @@ import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
 
 /**
- * DOCUMENT ME!
+ * abstract class super to jalview.gui.Desktop
  * 
- * @author $author$
- * @version $Revision$
  */
-public class GDesktop extends JFrame
+@SuppressWarnings("serial")
+// BH made abstract
+public abstract 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();
+  protected JMenu windowMenu = new JMenu(); // BH 2019.05.07 was static
 
   JMenuBar desktopMenubar = new JMenuBar();
 
@@ -94,20 +78,23 @@ public class GDesktop extends JFrame
 
   JMenuItem saveState = new JMenuItem();
 
+  JMenuItem saveAsState = new JMenuItem();
+
   JMenuItem loadState = new JMenuItem();
 
   JMenu inputMenu = new JMenu();
 
+  // in JalviewJS
   protected JMenuItem vamsasStart = new JMenuItem();
 
   protected JMenuItem vamsasImport = new JMenuItem();
 
   protected JMenuItem vamsasSave = new JMenuItem();
 
-  JMenuItem inputSequence = new JMenuItem();
-
   protected JMenuItem vamsasStop = new JMenuItem();
 
+  JMenuItem inputSequence = new JMenuItem();
+
   JMenuItem closeAll = new JMenuItem();
 
   JMenuItem raiseRelated = new JMenuItem();
@@ -124,7 +111,8 @@ public class GDesktop extends JFrame
 
   protected JCheckBoxMenuItem showConsole = new JCheckBoxMenuItem();
 
-  protected JCheckBoxMenuItem showNews = new JCheckBoxMenuItem();
+  // BH public for Runnable
+  public JCheckBoxMenuItem showNews = new JCheckBoxMenuItem();
 
   protected JMenuItem snapShotWindow = new JMenuItem();
 
@@ -133,7 +121,6 @@ public class GDesktop extends JFrame
    */
   public GDesktop()
   {
-    super();
     try
     {
       jbInit();
@@ -167,7 +154,7 @@ public class GDesktop extends JFrame
    */
   private void jbInit() throws Exception
   {
-
+    setName(Jalview.getAppID("desktop"));
     FileMenu.setText(MessageManager.getString("action.file"));
     HelpMenu.setText(MessageManager.getString("action.help"));
     VamsasMenu.setText("Vamsas");
@@ -266,16 +253,16 @@ public class GDesktop extends JFrame
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        saveState_actionPerformed(true);
+        saveState_actionPerformed();
       }
     });
-    JMenuItem saveAsJaxb = new JMenuItem("Save Project as JAXB");
-    saveAsJaxb.addActionListener(new ActionListener()
+    saveAsState.setText(MessageManager.getString("action.save_project_as"));
+    saveAsState.addActionListener(new ActionListener()
     {
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        saveState_actionPerformed(false);
+        saveAsState_actionPerformed(e);
       }
     });
     loadState.setText(MessageManager.getString("action.load_project"));
@@ -284,16 +271,7 @@ public class GDesktop extends JFrame
       @Override
       public void actionPerformed(ActionEvent e)
       {
-        loadState_actionPerformed(true);
-      }
-    });
-    JMenuItem loadAsJaxb = new JMenuItem("Load Project as JAXB");
-    loadAsJaxb.addActionListener(new ActionListener()
-    {
-      @Override
-      public void actionPerformed(ActionEvent e)
-      {
-        loadState_actionPerformed(false);
+        loadState_actionPerformed();
       }
     });
     inputMenu.setText(MessageManager.getString("label.input_alignment"));
@@ -462,13 +440,9 @@ public class GDesktop extends JFrame
     FileMenu.add(inputMenu);
     FileMenu.add(inputSequence);
     FileMenu.addSeparator();
-    FileMenu.add(saveAsJaxb);
-    FileMenu.add(loadAsJaxb);
-    if (!Jalview.isJS()) 
-    {
-      FileMenu.add(saveState);
-      FileMenu.add(loadState);
-    }
+    FileMenu.add(saveState);
+    FileMenu.add(saveAsState);
+    FileMenu.add(loadState);
     FileMenu.addSeparator();
     FileMenu.add(quit);
     HelpMenu.add(aboutMenuItem);
@@ -480,12 +454,12 @@ public class GDesktop extends JFrame
     VamsasMenu.add(vamsasSave);
     VamsasMenu.add(vamsasStop);
     toolsMenu.add(preferences);
-    if (!Jalview.isJS())
+    if (!Platform.isJS())
     {
       toolsMenu.add(showMemusage);
       toolsMenu.add(showConsole);
     }
-    if (!Jalview.isJS())
+    if (!Platform.isJS())
     {
       toolsMenu.add(showNews);
       toolsMenu.add(garbageCollect);
@@ -610,7 +584,7 @@ public class GDesktop extends JFrame
    * @param e
    *          DOCUMENT ME!
    */
-  public void SaveState_actionPerformed(ActionEvent e)
+  protected void preferences_actionPerformed(ActionEvent e)
   {
   }
 
@@ -620,17 +594,11 @@ public class GDesktop extends JFrame
    * @param e
    *          DOCUMENT ME!
    */
-  protected void preferences_actionPerformed(ActionEvent e)
+  public void saveState_actionPerformed()
   {
   }
 
-  /**
-   * DOCUMENT ME!
-   * 
-   * @param e
-   *          DOCUMENT ME!
-   */
-  public void saveState_actionPerformed(boolean asCastor)
+  public void saveAsState_actionPerformed(ActionEvent e)
   {
   }
 
@@ -640,7 +608,7 @@ public class GDesktop extends JFrame
    * @param e
    *          DOCUMENT ME!
    */
-  public void loadState_actionPerformed(boolean asCastor)
+  public void loadState_actionPerformed()
   {
   }