JAL-1863 allow RNA secondary structure rows exported by Jalview to be imported again
[jalview.git] / src / jalview / gui / Desktop.java
index 9e5bbff..2a360cc 100644 (file)
@@ -26,7 +26,6 @@ import jalview.bin.Cache;
 import jalview.io.FileLoader;
 import jalview.io.FormatAdapter;
 import jalview.io.IdentifyFile;
-import jalview.io.JSONFile;
 import jalview.io.JalviewFileChooser;
 import jalview.io.JalviewFileView;
 import jalview.jbgui.GSplitFrame;
@@ -168,8 +167,6 @@ public class Desktop extends jalview.jbgui.GDesktop implements
 
   static final int yOffset = 30;
 
-  private static final int THREE = 3;
-
   private static AlignFrame currentAlignFrame;
 
   public static jalview.ws.jws1.Discoverer discoverer;
@@ -266,10 +263,10 @@ public class Desktop extends jalview.jbgui.GDesktop implements
       delegate.openFrame(f);
     }
 
+    @Override
     public void resizeFrame(JComponent f, int newX, int newY, int newWidth,
             int newHeight)
     {
-      Rectangle b = desktop.getBounds();
       if (newY < 0)
       {
         newY = 0;
@@ -408,7 +405,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
       public void run()
       {
         Cache.log.debug("Filechooser init thread started.");
-        JalviewFileChooser chooser = new JalviewFileChooser(
+        new JalviewFileChooser(
                 jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
                 jalview.io.AppletFormatAdapter.READABLE_EXTENSIONS,
                 jalview.io.AppletFormatAdapter.READABLE_FNAMES,
@@ -472,6 +469,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
     });
   }
 
+  @Override
   protected void showNews_actionPerformed(ActionEvent e)
   {
     showNews(showNews.isSelected());
@@ -489,12 +487,11 @@ public class Desktop extends jalview.jbgui.GDesktop implements
           @Override
           public void run()
           {
-            long instance = System.currentTimeMillis();
+            long now = System.currentTimeMillis();
             Desktop.instance.setProgressBar(
-                    MessageManager.getString("status.refreshing_news"),
-                    instance);
+                    MessageManager.getString("status.refreshing_news"), now);
             jvnews.refreshNews();
-            Desktop.instance.setProgressBar(null, instance);
+            Desktop.instance.setProgressBar(null, now);
             jvnews.showNews();
           }
         }).start();
@@ -886,6 +883,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
   {
   }
 
+  @Override
   public void dropActionChanged(DropTargetDragEvent evt)
   {
   }
@@ -989,6 +987,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
    * @param e
    *          DOCUMENT ME!
    */
+  @Override
   public void inputLocalFileMenuItem_actionPerformed(AlignViewport viewport)
   {
     JalviewFileChooser chooser = new JalviewFileChooser(
@@ -1025,13 +1024,13 @@ public class Desktop extends jalview.jbgui.GDesktop implements
       {
         new FileLoader().LoadFile(viewport, choice, FormatAdapter.FILE,
                 format);
-        viewport.setShowSequenceFeatures(JSONFile.isSeqFeaturesEnabled());
-        AlignFrame af = viewport.getAlignPanel().alignFrame;
-        if (af != null)
-        {
-          af.changeColour(JSONFile.getColourScheme());
-          af.setMenusForViewport();
-        }
+        // viewport.setShowSequenceFeatures(JSONFile.isSeqFeaturesEnabled());
+        // AlignFrame af = viewport.getAlignPanel().alignFrame;
+        // if (af != null)
+        // {
+        // af.changeColour(JSONFile.getColourScheme());
+        // af.setMenusForViewport();
+        // }
       }
       else
       {
@@ -1046,6 +1045,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
    * @param e
    *          DOCUMENT ME!
    */
+  @Override
   public void inputURLMenuItem_actionPerformed(AlignViewport viewport)
   {
     // This construct allows us to have a wider textfield
@@ -1126,15 +1126,18 @@ public class Desktop extends jalview.jbgui.GDesktop implements
   }
 
   /**
-   * DOCUMENT ME!
+   * Opens the CutAndPaste window for the user to paste an alignment in to
    * 
-   * @param e
-   *          DOCUMENT ME!
+   * @param viewPanel
+   *          - if not null, the pasted alignment is added to the current
+   *          alignment; if null, to a new alignment window
    */
-  public void inputTextboxMenuItem_actionPerformed(AlignViewport viewport)
+  @Override
+  public void inputTextboxMenuItem_actionPerformed(
+          AlignmentViewPanel viewPanel)
   {
     CutAndPasteTransfer cap = new CutAndPasteTransfer();
-    cap.setForInput(viewport);
+    cap.setForInput(viewPanel);
     Desktop.addInternalFrame(cap,
             MessageManager.getString("label.cut_paste_alignmen_file"),
             true, 600, 500);
@@ -1143,6 +1146,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
   /*
    * Exit the program
    */
+  @Override
   public void quit()
   {
     Dimension screen = Toolkit.getDefaultToolkit().getScreenSize();
@@ -1167,7 +1171,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
     {
       dialogExecutor.shutdownNow();
     }
-
+    closeAll_actionPerformed(null);
     System.exit(0);
   }
 
@@ -1189,6 +1193,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
    * @param e
    *          DOCUMENT ME!
    */
+  @Override
   public void aboutMenuItem_actionPerformed(ActionEvent e)
   {
     // StringBuffer message = getAboutMessage(false);
@@ -1275,6 +1280,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
    * @param e
    *          DOCUMENT ME!
    */
+  @Override
   public void documentationMenuItem_actionPerformed(ActionEvent e)
   {
     try
@@ -1285,6 +1291,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
     }
   }
 
+  @Override
   public void closeAll_actionPerformed(ActionEvent e)
   {
     JInternalFrame[] frames = desktop.getAllFrames();
@@ -1301,15 +1308,27 @@ public class Desktop extends jalview.jbgui.GDesktop implements
     if (v_client != null)
     {
       // TODO clear binding to vamsas document objects on close_all
+    }
 
+    /*
+     * reset state of singleton objects as appropriate (clear down session state
+     * when all windows are closed)
+     */
+    StructureSelectionManager ssm = StructureSelectionManager
+            .getStructureSelectionManager(this);
+    if (ssm != null)
+    {
+      ssm.resetAll();
     }
   }
 
+  @Override
   public void raiseRelated_actionPerformed(ActionEvent e)
   {
     reorderAssociatedWindows(false, false);
   }
 
+  @Override
   public void minimizeAssociated_actionPerformed(ActionEvent e)
   {
     reorderAssociatedWindows(true, false);
@@ -1326,6 +1345,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
    * @seejalview.jbgui.GDesktop#garbageCollect_actionPerformed(java.awt.event.
    * ActionEvent)
    */
+  @Override
   protected void garbageCollect_actionPerformed(ActionEvent e)
   {
     // We simply collect the garbage
@@ -1341,6 +1361,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
    * jalview.jbgui.GDesktop#showMemusage_actionPerformed(java.awt.event.ActionEvent
    * )
    */
+  @Override
   protected void showMemusage_actionPerformed(ActionEvent e)
   {
     desktop.showMemoryUsage(showMemusage.isSelected());
@@ -1353,6 +1374,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
    * jalview.jbgui.GDesktop#showConsole_actionPerformed(java.awt.event.ActionEvent
    * )
    */
+  @Override
   protected void showConsole_actionPerformed(ActionEvent e)
   {
     showConsole(showConsole.isSelected());
@@ -1457,6 +1479,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
    * @param e
    *          DOCUMENT ME!
    */
+  @Override
   protected void preferences_actionPerformed(ActionEvent e)
   {
     new Preferences();
@@ -1468,6 +1491,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
    * @param e
    *          DOCUMENT ME!
    */
+  @Override
   public void saveState_actionPerformed(ActionEvent e)
   {
     JalviewFileChooser chooser = new JalviewFileChooser(
@@ -1486,14 +1510,11 @@ public class Desktop extends jalview.jbgui.GDesktop implements
       final java.io.File choice = chooser.getSelectedFile();
       setProjectFile(choice);
 
-      // TODO or move inside the new Thread?
-      saveChimeraSessions(choice.getAbsolutePath());
-
       new Thread(new Runnable()
       {
         public void run()
         {
-
+          // TODO: refactor to Jalview desktop session controller action.
           setProgressBar(MessageManager.formatMessage(
                   "label.saving_jalview_project", new Object[]
                   { choice.getName() }), choice.hashCode());
@@ -1526,32 +1547,6 @@ public class Desktop extends jalview.jbgui.GDesktop implements
     }
   }
 
-  /**
-   * Request any open, linked Chimera sessions to save their state.
-   * 
-   * @param jalviewProjectFilename
-   *          the filename of the Jalview project; Chimera session files should
-   *          be given distinct, but obviously related, names.
-   */
-  public void saveChimeraSessions(String jalviewProjectFilename)
-  {
-    int i = 0;
-    for (JInternalFrame frame : getAllFrames())
-    {
-      if (frame instanceof ChimeraViewFrame)
-      {
-        /*
-         * Construct a filename for the Chimera session by append _chimera<n>.py
-         * to the Jalview project file name.
-         */
-        String chimeraPath = jalviewProjectFilename + "_chimera_" + i
-                + ".py";
-        ((ChimeraViewFrame) frame).saveSession(chimeraPath);
-        i++;
-      }
-    }
-  }
-
   private void setProjectFile(File choice)
   {
     this.projectFile = choice;
@@ -1568,6 +1563,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
    * @param e
    *          DOCUMENT ME!
    */
+  @Override
   public void loadState_actionPerformed(ActionEvent e)
   {
     JalviewFileChooser chooser = new JalviewFileChooser(
@@ -1618,6 +1614,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
     }
   }
 
+  @Override
   public void inputSequence_actionPerformed(ActionEvent e)
   {
     new SequenceFetcher(this);
@@ -1870,6 +1867,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
 
   jalview.gui.VamsasApplication v_client = null;
 
+  @Override
   public void vamsasImport_actionPerformed(ActionEvent e)
   {
     if (v_client == null)
@@ -2015,6 +2013,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
     return (v_client.inSession());
   }
 
+  @Override
   public void vamsasStart_actionPerformed(ActionEvent e)
   {
     if (v_client == null)
@@ -2063,6 +2062,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
             .getString("label.new_vamsas_session"));
   }
 
+  @Override
   public void vamsasStop_actionPerformed(ActionEvent e)
   {
     if (v_client != null)
@@ -2143,6 +2143,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
     }
   }
 
+  @Override
   public void vamsasSave_actionPerformed(ActionEvent e)
   {
     if (v_client != null)
@@ -2268,10 +2269,10 @@ public class Desktop extends jalview.jbgui.GDesktop implements
       showMemoryUsage(showMemoryUsage);
     }
 
-    public void showMemoryUsage(boolean showMemoryUsage)
+    public void showMemoryUsage(boolean showMemory)
     {
-      this.showMemoryUsage = showMemoryUsage;
-      if (showMemoryUsage)
+      this.showMemoryUsage = showMemory;
+      if (showMemory)
       {
         Thread worker = new Thread(this);
         worker.start();
@@ -2316,6 +2317,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
       }
     }
 
+    @Override
     public void paintComponent(Graphics g)
     {
       if (showMemoryUsage && g != null && df != null)
@@ -2359,7 +2361,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
       {
         public void actionPerformed(ActionEvent e)
         {
-          groovyShell_actionPerformed(e);
+          groovyShell_actionPerformed();
         }
       });
       toolsMenu.add(groovyShell);
@@ -2446,7 +2448,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements
   /**
    * Add Groovy Support to Jalview
    */
-  public void groovyShell_actionPerformed(ActionEvent e)
+  public void groovyShell_actionPerformed()
   {
     // use reflection to avoid creating compilation dependency.
     if (!jalview.bin.Cache.groovyJarsPresent())
@@ -2501,12 +2503,12 @@ public class Desktop extends jalview.jbgui.GDesktop implements
 
     if (progressBars.get(new Long(id)) != null)
     {
-      JPanel progressPanel = progressBars.remove(new Long(id));
+      JPanel panel = progressBars.remove(new Long(id));
       if (progressBarHandlers.contains(new Long(id)))
       {
         progressBarHandlers.remove(new Long(id));
       }
-      removeProgressPanel(progressPanel);
+      removeProgressPanel(panel);
     }
     else
     {
@@ -2523,7 +2525,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements
   public void registerHandler(final long id,
           final IProgressIndicatorHandler handler)
   {
-    if (progressBarHandlers == null || !progressBars.contains(new Long(id)))
+    if (progressBarHandlers == null
+            || !progressBars.containsKey(new Long(id)))
     {
       throw new Error(
               MessageManager
@@ -2645,28 +2648,6 @@ public class Desktop extends jalview.jbgui.GDesktop implements
       (t0 = new Thread(discoverer)).start();
     }
 
-    // ENFIN services are EOLed as of Jalview 2.8.1 release
-    if (false)
-    {
-      try
-      {
-        if (Cache.getDefault("SHOW_ENFIN_SERVICES", true))
-        {
-          // EnfinEnvision web service menu entries are rebuild every time the
-          // menu is shown, so no changeSupport events are needed.
-          jalview.ws.EnfinEnvision2OneWay.getInstance();
-          (t1 = new Thread(jalview.ws.EnfinEnvision2OneWay.getInstance()))
-                  .start();
-        }
-      } catch (Exception e)
-      {
-        Cache.log
-                .info("Exception when trying to launch Envision2 workflow discovery.",
-                        e);
-        Cache.log.info(e.getStackTrace());
-      }
-    }
-
     if (Cache.getDefault("SHOW_JWS2_SERVICES", true))
     {
       if (jalview.ws.jws2.Jws2Discoverer.getDiscoverer().isRunning())