X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FDesktop.java;h=c229f9a6f566ea2dc3715561b68cfee0ec76f275;hp=0f80dd52f4b9f47cebcd7b87c920b52cc62e0ab7;hb=a1984b1c8c273ed33c7ce9283039f4027dcae2de;hpb=c4e814d2930b175c789c2a004801b7b8a1dacd32 diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index 0f80dd5..c229f9a 100644 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -382,7 +382,7 @@ public class Desktop extends jalview.jbgui.GDesktop awtAppClassNameField.setAccessible(true); awtAppClassNameField.set(xToolkit, title); } else { - Cache.log.debug("XToolkit: awtAppClassName not found"); + Cache.debug("XToolkit: awtAppClassName not found"); } } catch (Exception e) { Cache.debug("Error setting awtAppClassName"); @@ -487,10 +487,10 @@ public class Desktop extends jalview.jbgui.GDesktop new Thread(new Runnable() { @Override public void run() { - Cache.log.debug("Filechooser init thread started."); + Cache.debug("Filechooser init thread started."); String fileFormat = Cache.getProperty("DEFAULT_FILE_FORMAT"); JalviewFileChooser.forRead(Cache.getProperty("LAST_DIRECTORY"), fileFormat); - Cache.log.debug("Filechooser init thread finished."); + Cache.debug("Filechooser init thread finished."); } }).start(); // Add the service change listener @@ -498,7 +498,7 @@ public class Desktop extends jalview.jbgui.GDesktop @Override public void propertyChange(PropertyChangeEvent evt) { - Cache.log.debug("Firing service changed event for " + evt.getNewValue()); + Cache.debug("Firing service changed event for " + evt.getNewValue()); JalviewServicesChanged(evt); } }); @@ -566,10 +566,10 @@ public class Desktop extends jalview.jbgui.GDesktop new Thread(new Runnable() { @Override public void run() { - Cache.log.debug("Starting news thread."); + Cache.debug("Starting news thread."); jvnews = new BlogReader(me); showNews.setVisible(true); - Cache.log.debug("Completed news thread."); + Cache.debug("Completed news thread."); } }).start(); } @@ -580,11 +580,11 @@ public class Desktop extends jalview.jbgui.GDesktop new Thread(new Runnable() { @Override public void run() { - Cache.log.debug("Downloading data from identifiers.org"); + Cache.debug("Downloading data from identifiers.org"); try { UrlDownloadClient.download(IdOrgSettings.getUrl(), IdOrgSettings.getDownloadLocation()); } catch (IOException e) { - Cache.log.debug("Exception downloading identifiers.org data" + e.getMessage()); + Cache.debug("Exception downloading identifiers.org data" + e.getMessage()); } } }).start(); @@ -597,7 +597,7 @@ public class Desktop extends jalview.jbgui.GDesktop } void showNews(boolean visible) { - Cache.log.debug((visible ? "Showing" : "Hiding") + " news."); + Cache.debug((visible ? "Showing" : "Hiding") + " news."); showNews.setSelected(visible); if (visible && !jvnews.isVisible()) { new Thread(new Runnable() { @@ -643,14 +643,14 @@ public class Desktop extends jalview.jbgui.GDesktop iy = (int) (iy * sh); ih = (int) (ih * sh); while (ix >= screenSize.width) { - Cache.log.debug("Window geometry location recall error: shifting horizontal to within screenbounds."); + Cache.debug("Window geometry location recall error: shifting horizontal to within screenbounds."); ix -= screenSize.width; } while (iy >= screenSize.height) { - Cache.log.debug("Window geometry location recall error: shifting vertical to within screenbounds."); + Cache.debug("Window geometry location recall error: shifting vertical to within screenbounds."); iy -= screenSize.height; } - Cache.log.debug("Got last known dimensions for " + windowName + ": x:" + ix + " y:" + iy + " width:" + iw + Cache.debug("Got last known dimensions for " + windowName + ": x:" + ix + " y:" + iy + " width:" + iw + " height:" + ih); } // return dimensions for new instance @@ -852,7 +852,7 @@ public class Desktop extends jalview.jbgui.GDesktop frame.requestFocus(); } catch (java.beans.PropertyVetoException ve) { } catch (java.lang.ClassCastException cex) { - Cache.log.warn( + Cache.warn( "Squashed a possible GUI implementation error. If you can recreate this, please look at https://issues.jalview.org/browse/JAL-869", cex); } @@ -1140,7 +1140,7 @@ public class Desktop extends jalview.jbgui.GDesktop } private void storeLastKnownDimensions(String string, Rectangle jc) { - Cache.log.debug("Storing last known dimensions for " + string + ": x:" + jc.x + " y:" + jc.y + " width:" + jc.width + Cache.debug("Storing last known dimensions for " + string + ": x:" + jc.x + " y:" + jc.y + " width:" + jc.width + " height:" + jc.height); Cache.setProperty(string + "SCREEN_X", jc.x + ""); @@ -1275,9 +1275,9 @@ public class Desktop extends jalview.jbgui.GDesktop @Override protected void garbageCollect_actionPerformed(ActionEvent e) { // We simply collect the garbage - Cache.log.debug("Collecting garbage..."); + Cache.debug("Collecting garbage..."); System.gc(); - Cache.log.debug("Finished garbage collection."); + Cache.debug("Finished garbage collection."); } /* @@ -1441,7 +1441,7 @@ public class Desktop extends jalview.jbgui.GDesktop } catch (OutOfMemoryError oom) { new OOMWarning("Whilst saving current state to " + chosenFile.getName(), oom); } catch (Exception ex) { - Cache.log.error("Problems whilst trying to save to " + chosenFile.getName(), ex); + Cache.error("Problems whilst trying to save to " + chosenFile.getName(), ex); JvOptionPane.showMessageDialog(me, MessageManager.formatMessage("label.error_whilst_saving_current_state_to", new Object[] { chosenFile.getName() }), @@ -1496,7 +1496,7 @@ public class Desktop extends jalview.jbgui.GDesktop } catch (OutOfMemoryError oom) { new OOMWarning("Whilst loading project from " + choice, oom); } catch (Exception ex) { - Cache.log.error("Problems whilst loading project from " + choice, ex); + Cache.error("Problems whilst loading project from " + choice, ex); JvOptionPane.showMessageDialog(Desktop.desktop, MessageManager.formatMessage("label.error_whilst_loading_project_from", new Object[] { choice }), MessageManager.getString("label.couldnt_load_project"), JvOptionPane.WARNING_MESSAGE); @@ -1983,7 +1983,7 @@ public class Desktop extends jalview.jbgui.GDesktop try { openGroovyConsole(); } catch (Exception ex) { - Cache.log.error("Groovy Shell Creation failed.", ex); + Cache.error("Groovy Shell Creation failed.", ex); JvOptionPane.showInternalMessageDialog(Desktop.desktop, MessageManager.getString("label.couldnt_create_groovy_shell"), @@ -2294,7 +2294,7 @@ public class Desktop extends jalview.jbgui.GDesktop }); } } else { - Cache.log.error("Errors reported by JABA discovery service. Check web services preferences.\n" + ermsg); + Cache.error("Errors reported by JABA discovery service. Check web services preferences.\n" + ermsg); } } } @@ -2365,11 +2365,7 @@ public class Desktop extends jalview.jbgui.GDesktop Desktop.showUrl(url); } catch (Exception x) { if (url != null) { - if (Cache.log != null) { - Cache.log.error("Couldn't handle string " + url + " as a URL."); - } else { - System.err.println("Couldn't handle string " + url + " as a URL."); - } + Cache.error("Couldn't handle string " + url + " as a URL."); } // ignore any exceptions due to dud links. } @@ -2415,7 +2411,7 @@ public class Desktop extends jalview.jbgui.GDesktop try { SwingUtilities.invokeAndWait(prompter); } catch (Exception q) { - Cache.log.warn("Unexpected Exception in dialog thread.", q); + Cache.warn("Unexpected Exception in dialog thread.", q); } } }); @@ -2449,7 +2445,7 @@ public class Desktop extends jalview.jbgui.GDesktop @Override public void exportImage(Graphics g) throws Exception { paintAll(g); - Cache.log.info("Successfully written snapshot to file " + of.getAbsolutePath()); + Cache.info("Successfully written snapshot to file " + of.getAbsolutePath()); } }; String title = "View of desktop"; @@ -2608,7 +2604,7 @@ public class Desktop extends jalview.jbgui.GDesktop try { urlFlavour = new DataFlavor("application/x-java-url; class=java.net.URL"); } catch (ClassNotFoundException cfe) { - Cache.log.debug("Couldn't instantiate the URL dataflavor.", cfe); + Cache.debug("Couldn't instantiate the URL dataflavor.", cfe); } if (urlFlavour != null && t.isDataFlavorSupported(urlFlavour)) { @@ -2620,7 +2616,7 @@ public class Desktop extends jalview.jbgui.GDesktop if (url != null) { protocols.add(DataSourceType.URL); files.add(url.toString()); - Cache.log.debug("Drop handled as URL dataflavor " + files.get(files.size() - 1)); + Cache.debug("Drop handled as URL dataflavor " + files.get(files.size() - 1)); return; } else { if (Platform.isAMacAndNotJS()) { @@ -2628,12 +2624,12 @@ public class Desktop extends jalview.jbgui.GDesktop } } } catch (Throwable ex) { - Cache.log.debug("URL drop handler failed.", ex); + Cache.debug("URL drop handler failed.", ex); } } if (t.isDataFlavorSupported(DataFlavor.javaFileListFlavor)) { // Works on Windows and MacOSX - Cache.log.debug("Drop handled as javaFileListFlavor"); + Cache.debug("Drop handled as javaFileListFlavor"); for (Object file : (List) t.getTransferData(DataFlavor.javaFileListFlavor)) { files.add(file); protocols.add(DataSourceType.FILE); @@ -2643,25 +2639,25 @@ public class Desktop extends jalview.jbgui.GDesktop boolean added = false; String data = null; if (t.isDataFlavorSupported(uriListFlavor)) { - Cache.log.debug("Drop handled as uriListFlavor"); + Cache.debug("Drop handled as uriListFlavor"); // This is used by Unix drag system data = (String) t.getTransferData(uriListFlavor); } if (data == null) { // fallback to text: workaround - on OSX where there's a JVM bug - Cache.log.debug("standard URIListFlavor failed. Trying text"); + Cache.debug("standard URIListFlavor failed. Trying text"); // try text fallback DataFlavor textDf = new DataFlavor("text/plain;class=java.lang.String"); if (t.isDataFlavorSupported(textDf)) { data = (String) t.getTransferData(textDf); } - Cache.log.debug("Plain text drop content returned " + (data == null ? "Null - failed" : data)); + Cache.debug("Plain text drop content returned " + (data == null ? "Null - failed" : data)); } if (data != null) { while (protocols.size() < files.size()) { - Cache.log.debug("Adding missing FILE protocol for " + files.get(protocols.size())); + Cache.debug("Adding missing FILE protocol for " + files.get(protocols.size())); protocols.add(DataSourceType.FILE); } for (java.util.StringTokenizer st = new java.util.StringTokenizer(data, "\r\n"); st.hasMoreTokens();) { @@ -2684,28 +2680,28 @@ public class Desktop extends jalview.jbgui.GDesktop } } - if (Cache.log.isDebugEnabled()) { + if (Cache.isDebugEnabled()) { if (data == null || !added) { if (t.getTransferDataFlavors() != null && t.getTransferDataFlavors().length > 0) { - Cache.log.debug("Couldn't resolve drop data. Here are the supported flavors:"); + Cache.debug("Couldn't resolve drop data. Here are the supported flavors:"); for (DataFlavor fl : t.getTransferDataFlavors()) { - Cache.log.debug("Supported transfer dataflavor: " + fl.toString()); + Cache.debug("Supported transfer dataflavor: " + fl.toString()); Object df = t.getTransferData(fl); if (df != null) { - Cache.log.debug("Retrieves: " + df); + Cache.debug("Retrieves: " + df); } else { - Cache.log.debug("Retrieved nothing"); + Cache.debug("Retrieved nothing"); } } } else { - Cache.log.debug("Couldn't resolve dataflavor for drop: " + t.toString()); + Cache.debug("Couldn't resolve dataflavor for drop: " + t.toString()); } } } } if (Platform.isWindowsAndNotJS()) { - Cache.log.debug("Scanning dropped content for Windows Link Files"); + Cache.debug("Scanning dropped content for Windows Link Files"); // resolve any .lnk files in the file drop for (int f = 0; f < files.size(); f++) { @@ -2716,14 +2712,14 @@ public class Desktop extends jalview.jbgui.GDesktop Object obj = files.get(f); File lf = (obj instanceof File ? (File) obj : new File((String) obj)); // process link file to get a URL - Cache.log.debug("Found potential link file: " + lf); + Cache.debug("Found potential link file: " + lf); WindowsShortcut wscfile = new WindowsShortcut(lf); String fullname = wscfile.getRealFilename(); protocols.set(f, FormatAdapter.checkProtocol(fullname)); files.set(f, fullname); - Cache.log.debug("Parsed real filename " + fullname + " to extract protocol: " + protocols.get(f)); + Cache.debug("Parsed real filename " + fullname + " to extract protocol: " + protocols.get(f)); } catch (Exception ex) { - Cache.log.error("Couldn't parse " + files.get(f) + " as a link file.", ex); + Cache.error("Couldn't parse " + files.get(f) + " as a link file.", ex); } } }