X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=590140bb35e75e66a1604fa19c9b44856f603119;hb=5ba9b9ce2c9b6e887430d4ac80efde577ca434d4;hp=6dede646f839613548e400aa36d82dd872269fa6;hpb=87ea83af3e209a8c3a4b19f9530a9c05b4541148;p=jalview.git diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index 6dede64..590140b 100644 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8) - * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1) + * Copyright (C) 2014 The Jalview Authors * * This file is part of Jalview. * @@ -14,6 +14,7 @@ * PURPOSE. See the GNU General Public License for more details. * * You should have received a copy of the GNU General Public License along with Jalview. If not, see . + * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.gui; @@ -558,7 +559,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements void showPasteMenu(int x, int y) { JPopupMenu popup = new JPopupMenu(); - JMenuItem item = new JMenuItem("Paste To New Window"); + JMenuItem item = new JMenuItem(MessageManager.getString("label.paste_new_window")); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent evt) @@ -648,8 +649,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements // A HEADLESS STATE WHEN NO DESKTOP EXISTS. MUST RETURN // IF JALVIEW IS RUNNING HEADLESS // /////////////////////////////////////////////// - if (System.getProperty("java.awt.headless") != null - && System.getProperty("java.awt.headless").equals("true")) + if (instance == null || (System.getProperty("java.awt.headless") != null + && System.getProperty("java.awt.headless").equals("true"))) { return; } @@ -806,6 +807,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements */ public void drop(DropTargetDropEvent evt) { + boolean success=true; Transferable t = evt.getTransferable(); java.util.List files = null; java.util.List protocols = null; @@ -854,6 +856,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements } } catch (Exception e) { + success=false; } if (files != null) @@ -882,8 +885,10 @@ public class Desktop extends jalview.jbgui.GDesktop implements } } catch (Exception ex) { + success=false; } } + evt.dropComplete(success); // need this to ensure input focus is properly transfered to any new windows created } /** @@ -901,8 +906,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements jalview.bin.Cache.getProperty("DEFAULT_FILE_FORMAT")); chooser.setFileView(new JalviewFileView()); - chooser.setDialogTitle("Open local file"); - chooser.setToolTipText("Open"); + chooser.setDialogTitle(MessageManager.getString("label.open_local_file")); + chooser.setToolTipText(MessageManager.getString("action.open")); int value = chooser.showOpenDialog(this); @@ -913,7 +918,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements .getSelectedFile().getParent()); String format = null; - if (chooser.getSelectedFormat().equals("Jalview")) + if (chooser.getSelectedFormat()!=null && chooser.getSelectedFormat().equals("Jalview")) { format = "Jalview"; } @@ -969,7 +974,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements } int reply = JOptionPane.showInternalConfirmDialog(desktop, panel, - "Input Alignment From URL", JOptionPane.OK_CANCEL_OPTION); + MessageManager.getString("label.input_alignment_from_url"), JOptionPane.OK_CANCEL_OPTION); if (reply != JOptionPane.OK_OPTION) { @@ -1510,6 +1515,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements { if (progressPanel != null) { + synchronized(progressPanel) { progressPanel.remove(progbar); GridLayout gl = (GridLayout) progressPanel.getLayout(); gl.setRows(gl.getRows() - 1); @@ -1518,6 +1524,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements this.getContentPane().remove(progressPanel); progressPanel = null; } + } } validate(); } @@ -1527,9 +1534,9 @@ public class Desktop extends jalview.jbgui.GDesktop implements fileLoadingCount--; if (fileLoadingCount < 1) { - for (JPanel flp : fileLoadingPanels) + while (fileLoadingPanels.size()>0) { - removeProgressPanel(flp); + removeProgressPanel(fileLoadingPanels.remove(0)); } fileLoadingPanels.clear(); fileLoadingCount = 0; @@ -1712,7 +1719,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements chooser.setFileView(new JalviewFileView()); chooser.setDialogTitle("Open a saved VAMSAS session"); - chooser.setToolTipText("select a vamsas session to be opened as a new vamsas session."); + chooser.setToolTipText(MessageManager.getString("label.select_vamsas_session_opened_as_new_vamsas_session")); int value = chooser.showOpenDialog(this); @@ -1722,8 +1729,8 @@ public class Desktop extends jalview.jbgui.GDesktop implements if (!vamsasImport(chooser.getSelectedFile())) { JOptionPane.showInternalMessageDialog(Desktop.desktop, - "Couldn't import '" + fle + "' as a new vamsas session.", - "Vamsas Document Import Failed", + MessageManager.formatMessage("label.couldnt_import_as_vamsas_session", new String[]{fle}), + MessageManager.getString("label.vamsas_document_import_failed"), JOptionPane.ERROR_MESSAGE); } } @@ -1914,7 +1921,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements { JMenuItem sessit = new JMenuItem(); sessit.setText(sess[i]); - sessit.setToolTipText("Connect to session " + sess[i]); + sessit.setToolTipText(MessageManager.formatMessage("label.connect_to_session", new String[]{sess[i]})); final Desktop dsktp = this; final String mysesid = sess[i]; sessit.addActionListener(new ActionListener() @@ -2137,9 +2144,7 @@ public class Desktop extends jalview.jbgui.GDesktop implements if (fm != null) { g.drawString( - "Total Free Memory: " + df.format(totalFreeMemory) - + "MB; Max Memory: " + df.format(maxMemory) - + "MB; " + df.format(percentUsage) + "%", 10, + MessageManager.formatMessage("label.memory_stats", new String[]{df.format(totalFreeMemory),df.format(maxMemory),df.format(percentUsage)}), 10, getHeight() - fm.getHeight()); } } @@ -2437,7 +2442,9 @@ public class Desktop extends jalview.jbgui.GDesktop implements { boolean alive = true; Thread t0 = null, t1 = null, t2 = null; - + // JAL-940 - JALVIEW 1 services are now being EOLed as of JABA 2.1 release + if (true) + { // todo: changesupport handlers need to be transferred if (discoverer == null) { @@ -2447,28 +2454,31 @@ public class Desktop extends jalview.jbgui.GDesktop implements } // JAL-940 - disabled JWS1 service configuration - always start discoverer // until we phase out completely - if (true) - { (t0 = new Thread(discoverer)).start(); } - try + // ENFIN services are EOLed as of Jalview 2.8.1 release + if (false) { - if (Cache.getDefault("SHOW_ENFIN_SERVICES", true)) + try { - // 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(); + 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()); } - } 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())