From: <ni...@us...> - 2006-12-14 21:51:25
|
Revision: 6462 http://svn.sourceforge.net/jmol/?rev=6462&view=rev Author: nicove Date: 2006-12-14 13:51:17 -0800 (Thu, 14 Dec 2006) Log Message: ----------- Logger Modified Paths: -------------- trunk/Jmol/src/org/jmol/g3d/Line3D.java trunk/Jmol/src/org/jmol/util/JpegEncoder.java trunk/Jmol/src/org/openscience/jmol/app/AtomSetChooser.java trunk/Jmol/src/org/openscience/jmol/app/FileDropper.java trunk/Jmol/src/org/openscience/jmol/app/GuiMap.java trunk/Jmol/src/org/openscience/jmol/app/HelpDialog.java trunk/Jmol/src/org/openscience/jmol/app/ImageSelection.java trunk/Jmol/src/org/openscience/jmol/app/Jmol.java trunk/Jmol/src/org/openscience/jmol/app/PovrayDialog.java trunk/Jmol/src/org/openscience/jmol/app/PovraySaver.java trunk/Jmol/src/org/openscience/jmol/app/PreferencesDialog.java trunk/Jmol/src/org/openscience/jmol/app/ScriptWindow.java trunk/Jmol/src/org/openscience/jmol/app/WhatsNewDialog.java Modified: trunk/Jmol/src/org/jmol/g3d/Line3D.java =================================================================== --- trunk/Jmol/src/org/jmol/g3d/Line3D.java 2006-12-14 19:40:44 UTC (rev 6461) +++ trunk/Jmol/src/org/jmol/g3d/Line3D.java 2006-12-14 21:51:17 UTC (rev 6462) @@ -45,6 +45,8 @@ import java.util.BitSet; import java.util.Hashtable; +import org.jmol.util.Logger; + final class Line3D { Graphics3D g3d; @@ -100,7 +102,7 @@ lineBits = (BitSet) lineCache.get(slopeKey); nFound++; if (nFound == 1000000) - System.out.println("nCached/nFound lines: " + nCached + " " + nFound); + Logger.debug("nCached/nFound lines: " + nCached + " " + nFound); return true; } Modified: trunk/Jmol/src/org/jmol/util/JpegEncoder.java =================================================================== --- trunk/Jmol/src/org/jmol/util/JpegEncoder.java 2006-12-14 19:40:44 UTC (rev 6461) +++ trunk/Jmol/src/org/jmol/util/JpegEncoder.java 2006-12-14 21:51:17 UTC (rev 6462) @@ -91,7 +91,7 @@ try { outStream.flush(); } catch (IOException e) { - System.out.println("IO Error: " + e.getMessage()); + Logger.error("IO Error", e); } } @@ -320,7 +320,7 @@ try { out.write(data, 0, 2); } catch (IOException e) { - System.out.println("IO Error: " + e.getMessage()); + Logger.error("IO Error", e); } } @@ -330,7 +330,7 @@ length = ((data[2] & 0xFF) << 8) + (data[3] & 0xFF) + 2; out.write(data, 0, length); } catch (IOException e) { - System.out.println("IO Error: " + e.getMessage()); + Logger.error("IO Error", e); } } } @@ -977,7 +977,7 @@ outStream.write(c); } catch (IOException e) { - System.out.println("IO Error: " + e.getMessage()); + Logger.error("IO Error", e); } if (c == 0xFF) { try @@ -985,7 +985,7 @@ outStream.write(0); } catch (IOException e) { - System.out.println("IO Error: " + e.getMessage()); + Logger.error("IO Error", e); } } PutBuffer <<= 8; @@ -1006,14 +1006,14 @@ outStream.write(c); } catch (IOException e) { - System.out.println("IO Error: " + e.getMessage()); + Logger.error("IO Error", e); } if (c == 0xFF) { try { outStream.write(0); } catch (IOException e) { - System.out.println("IO Error: " + e.getMessage()); + Logger.error("IO Error", e); } } PutBuffer <<= 8; @@ -1026,7 +1026,7 @@ outStream.write(c); } catch (IOException e) { - System.out.println("IO Error: " + e.getMessage()); + Logger.error("IO Error", e); } } } Modified: trunk/Jmol/src/org/openscience/jmol/app/AtomSetChooser.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/AtomSetChooser.java 2006-12-14 19:40:44 UTC (rev 6461) +++ trunk/Jmol/src/org/openscience/jmol/app/AtomSetChooser.java 2006-12-14 21:51:17 UTC (rev 6462) @@ -489,7 +489,7 @@ } else if (FF.equals(cmd)) { findFrequency(indexes.length-1,-1); } else if (SAVE.equals(cmd)) { - System.out.println("Not implemented"); + Logger.warn("Not implemented"); // since I can not get to the vectors, I can't output this one (yet) // saveXYZVector(); } @@ -506,7 +506,7 @@ public void saveXYZCollection() { int nidx = indexes.length; if (nidx==0) { - System.out.println("No collection selected."); + Logger.warn("No collection selected."); return; } Modified: trunk/Jmol/src/org/openscience/jmol/app/FileDropper.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/FileDropper.java 2006-12-14 19:40:44 UTC (rev 6461) +++ trunk/Jmol/src/org/openscience/jmol/app/FileDropper.java 2006-12-14 21:51:17 UTC (rev 6462) @@ -54,162 +54,163 @@ * @author Billy <sim...@vi...> */ public class FileDropper implements DropTargetListener { - private String fd_oldFileName; - private PropertyChangeSupport fd_propSupport; + private String fd_oldFileName; + private PropertyChangeSupport fd_propSupport; - static public final String FD_PROPERTY_FILENAME = "filename"; - static public final String FD_PROPERTY_INLINE = "inline"; + static public final String FD_PROPERTY_FILENAME = "filename"; + static public final String FD_PROPERTY_INLINE = "inline"; - public FileDropper () { - fd_oldFileName = ""; - fd_propSupport = new PropertyChangeSupport (this); - } + public FileDropper() { + fd_oldFileName = ""; + fd_propSupport = new PropertyChangeSupport(this); + } - public synchronized void addPropertyChangeListener (PropertyChangeListener l) { - fd_propSupport.addPropertyChangeListener (l); - } + public synchronized void addPropertyChangeListener(PropertyChangeListener l) { + fd_propSupport.addPropertyChangeListener(l); + } - public synchronized void removePropertyChangeListener (PropertyChangeListener l) { - fd_propSupport.removePropertyChangeListener (l); - } + public synchronized void removePropertyChangeListener(PropertyChangeListener l) { + fd_propSupport.removePropertyChangeListener(l); + } - public void dragOver(DropTargetDragEvent dtde) { - System.out.println("DropOver detected..."); + public void dragOver(DropTargetDragEvent dtde) { + Logger.debug("DropOver detected..."); } - public void dragEnter(DropTargetDragEvent dtde) { - System.out.println("DropEnter detected..."); - dtde.acceptDrag (DnDConstants.ACTION_COPY_OR_MOVE); - } + public void dragEnter(DropTargetDragEvent dtde) { + Logger.debug("DropEnter detected..."); + dtde.acceptDrag(DnDConstants.ACTION_COPY_OR_MOVE); + } - public void dragExit(DropTargetEvent dtde) { - System.out.println("DropExit detected..."); - } + public void dragExit(DropTargetEvent dtde) { + Logger.debug("DropExit detected..."); + } - public void dropActionChanged(DropTargetDragEvent dtde) { - } + public void dropActionChanged(DropTargetDragEvent dtde) { } - public void drop (DropTargetDropEvent dtde) { - System.out.println("Drop detected..."); - Transferable t = dtde.getTransferable (); - if (t.isDataFlavorSupported (DataFlavor.javaFileListFlavor)) { - dtde.acceptDrop (DnDConstants.ACTION_COPY_OR_MOVE); - Object o = null; + public void drop (DropTargetDropEvent dtde) { + Logger.debug("Drop detected..."); + Transferable t = dtde.getTransferable(); + if (t.isDataFlavorSupported(DataFlavor.javaFileListFlavor)) { + dtde.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE); + Object o = null; - try { - o = t.getTransferData (DataFlavor.javaFileListFlavor); - } catch (UnsupportedFlavorException ufe) { - Logger.error(null, ufe); - } catch (IOException ioe) { - Logger.error(null, ioe); - } + try { + o = t.getTransferData(DataFlavor.javaFileListFlavor); + } catch (UnsupportedFlavorException ufe) { + Logger.error(null, ufe); + } catch (IOException ioe) { + Logger.error(null, ioe); + } - // if o is still null we had an exception - if ((o != null) && (o instanceof List)) { - List fileList = (List) o; - final int length = fileList.size (); + // if o is still null we had an exception + if ((o != null) && (o instanceof List)) { + List fileList = (List) o; + final int length = fileList.size (); - for (int i = 0; i < length; ++ i) { - File f = (File) fileList.get (i); - PropertyChangeEvent pce = new PropertyChangeEvent (this, FD_PROPERTY_FILENAME, fd_oldFileName, f.getAbsolutePath ()); - fd_propSupport.firePropertyChange (pce); - } + for (int i = 0; i < length; ++ i) { + File f = (File) fileList.get(i); + PropertyChangeEvent pce = new PropertyChangeEvent( + this, FD_PROPERTY_FILENAME, fd_oldFileName, f.getAbsolutePath()); + fd_propSupport.firePropertyChange(pce); + } - dtde.getDropTargetContext ().dropComplete (true); - } - } else { - System.out.println ("browsing supported flavours to find something useful..."); - DataFlavor [] df = t.getTransferDataFlavors (); + dtde.getDropTargetContext().dropComplete(true); + } + } else { + Logger.debug("browsing supported flavours to find something useful..."); + DataFlavor [] df = t.getTransferDataFlavors (); - if ((df != null) && (df.length > 0)) { - for (int i = 0; i < df.length; ++ i) { + if ((df != null) && (df.length > 0)) { + for (int i = 0; i < df.length; ++ i) { + DataFlavor flavor = df[i]; + Logger.debug("df " + i + " flavor " + flavor); + Logger.debug(" class: " + flavor.getRepresentationClass().getName()); + Logger.debug(" mime : " + flavor.getMimeType()); - DataFlavor flavor = df[i]; - System.out.println ("df " + i + " flavor " + flavor); - System.out.println (" class: " + flavor.getRepresentationClass().getName()); - System.out.println (" mime : " + flavor.getMimeType()); + if (flavor.getMimeType().startsWith("text/uri-list") && + flavor.getRepresentationClass().getName().equals("java.lang.String")) { - if (flavor.getMimeType().startsWith("text/uri-list") && - flavor.getRepresentationClass().getName().equals("java.lang.String")) { + /* This is one of the (many) flavors that KDE provides: + df 2 flavour java.awt.datatransfer.DataFlavor[mimetype=text/uri-list;representationclass=java.lang.String] + java.lang.String + String: file:/home/egonw/data/Projects/SourceForge/Jmol/Jmol-HEAD/samples/cml/methanol2.cml - /* This is one of the (many) flavors that KDE provides: + A later KDE version gave me the following. Note the mime!! hence the startsWith above - df 2 flavour java.awt.datatransfer.DataFlavor[mimetype=text/uri-list;representationclass=java.lang.String] - java.lang.String - String: file:/home/egonw/data/Projects/SourceForge/Jmol/Jmol-HEAD/samples/cml/methanol2.cml - - A later KDE version gave me the following. Note the mime!! hence the startsWith above - - df 3 flavor java.awt.datatransfer.DataFlavor[mimetype=text/uri-list;representationclass=java.lang.String] - class: java.lang.String - mime : text/uri-list; class=java.lang.String; charset=Unicode - */ + df 3 flavor java.awt.datatransfer.DataFlavor[mimetype=text/uri-list;representationclass=java.lang.String] + class: java.lang.String + mime : text/uri-list; class=java.lang.String; charset=Unicode + */ - dtde.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE); - Object o = null; + dtde.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE); + Object o = null; - try { - o = t.getTransferData(flavor); - } catch (UnsupportedFlavorException ufe) { - Logger.error(null, ufe); - } catch (IOException ioe) { - Logger.error(null, ioe); - } + try { + o = t.getTransferData(flavor); + } catch (UnsupportedFlavorException ufe) { + Logger.error(null, ufe); + } catch (IOException ioe) { + Logger.error(null, ioe); + } - if ((o != null) && (o instanceof String)) { - System.out.println(" String: " + o.toString()); + if ((o != null) && (o instanceof String)) { + Logger.debug(" String: " + o.toString()); - PropertyChangeEvent pce = new PropertyChangeEvent(this, FD_PROPERTY_FILENAME, fd_oldFileName, o.toString()); - fd_propSupport.firePropertyChange(pce); - dtde.getDropTargetContext().dropComplete(true); - } - return; - } else if (flavor.getMimeType().equals("application/x-java-serialized-object; class=java.lang.String")) { + PropertyChangeEvent pce = new PropertyChangeEvent( + this, FD_PROPERTY_FILENAME, fd_oldFileName, o.toString()); + fd_propSupport.firePropertyChange(pce); + dtde.getDropTargetContext().dropComplete(true); + } + return; + } else if (flavor.getMimeType().equals("application/x-java-serialized-object; class=java.lang.String")) { - /* This is one of the flavors that jEdit provides: - - df 0 flavor java.awt.datatransfer.DataFlavor[mimetype=application/x-java-serialized-object;representationclass=java.lang.String] - class: java.lang.String - mime : application/x-java-serialized-object; class=java.lang.String - String: <molecule title="benzene.mol" xmlns="http://www.xml-cml.org/schema/cml2/core" - - But KDE also provides: - - df 24 flavor java.awt.datatransfer.DataFlavor[mimetype=application/x-java-serialized-object;representationclass=java.lang.String] - class: java.lang.String - mime : application/x-java-serialized-object; class=java.lang.String - String: file:/home/egonw/Desktop/1PN8.pdb - */ + /* This is one of the flavors that jEdit provides: - dtde.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE); - Object o = null; + df 0 flavor java.awt.datatransfer.DataFlavor[mimetype=application/x-java-serialized-object;representationclass=java.lang.String] + class: java.lang.String + mime : application/x-java-serialized-object; class=java.lang.String + String: <molecule title="benzene.mol" xmlns="http://www.xml-cml.org/schema/cml2/core" - try { - o = t.getTransferData(df[i]); - } catch (UnsupportedFlavorException ufe) { - Logger.error(null, ufe); - } catch (IOException ioe) { - Logger.error(null, ioe); - } + But KDE also provides: - if ((o != null) && (o instanceof String)) { - String content = (String)o; - System.out.println(" String: " + content); - if (content.startsWith("file:/")) { - PropertyChangeEvent pce = new PropertyChangeEvent(this, FD_PROPERTY_FILENAME, fd_oldFileName, content); - fd_propSupport.firePropertyChange(pce); - } else { - PropertyChangeEvent pce = new PropertyChangeEvent(this, FD_PROPERTY_INLINE, fd_oldFileName, content); - fd_propSupport.firePropertyChange(pce); - } - dtde.getDropTargetContext().dropComplete(true); - } - return; - } - } - } + df 24 flavor java.awt.datatransfer.DataFlavor[mimetype=application/x-java-serialized-object;representationclass=java.lang.String] + class: java.lang.String + mime : application/x-java-serialized-object; class=java.lang.String + String: file:/home/egonw/Desktop/1PN8.pdb + */ - dtde.rejectDrop(); - } + dtde.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE); + Object o = null; + + try { + o = t.getTransferData(df[i]); + } catch (UnsupportedFlavorException ufe) { + Logger.error(null, ufe); + } catch (IOException ioe) { + Logger.error(null, ioe); + } + + if ((o != null) && (o instanceof String)) { + String content = (String)o; + Logger.debug(" String: " + content); + if (content.startsWith("file:/")) { + PropertyChangeEvent pce = new PropertyChangeEvent( + this, FD_PROPERTY_FILENAME, fd_oldFileName, content); + fd_propSupport.firePropertyChange(pce); + } else { + PropertyChangeEvent pce = new PropertyChangeEvent( + this, FD_PROPERTY_INLINE, fd_oldFileName, content); + fd_propSupport.firePropertyChange(pce); + } + dtde.getDropTargetContext().dropComplete(true); + } + return; + } + } + } + + dtde.rejectDrop(); + } } } Modified: trunk/Jmol/src/org/openscience/jmol/app/GuiMap.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/GuiMap.java 2006-12-14 19:40:44 UTC (rev 6461) +++ trunk/Jmol/src/org/openscience/jmol/app/GuiMap.java 2006-12-14 21:51:17 UTC (rev 6462) @@ -32,6 +32,7 @@ import javax.swing.JCheckBox; import org.jmol.i18n.GT; +import org.jmol.util.Logger; class GuiMap { @@ -190,7 +191,7 @@ if (label == null) // Use the previous system as backup if (label == null) { - System.out.println("Missing i18n menu resource, trying old scheme for: " +key); + Logger.warn("Missing i18n menu resource, trying old scheme for: " +key); JmolResourceHandler.getStringX(key+"Label"); } return label; Modified: trunk/Jmol/src/org/openscience/jmol/app/HelpDialog.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/HelpDialog.java 2006-12-14 19:40:44 UTC (rev 6461) +++ trunk/Jmol/src/org/openscience/jmol/app/HelpDialog.java 2006-12-14 21:51:17 UTC (rev 6462) @@ -45,6 +45,7 @@ import java.awt.event.ActionListener; import java.io.IOException; import org.jmol.i18n.GT; +import org.jmol.util.Logger; public class HelpDialog extends JDialog implements HyperlinkListener { @@ -80,9 +81,9 @@ html.setEditable(false); html.addHyperlinkListener(this); } catch (MalformedURLException e) { - System.out.println("Malformed URL: " + e); + Logger.error("Malformed URL", e); } catch (IOException e) { - System.out.println("IOException: " + e); + Logger.error("IOException", e); } JScrollPane scroller = new JScrollPane() { Modified: trunk/Jmol/src/org/openscience/jmol/app/ImageSelection.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/ImageSelection.java 2006-12-14 19:40:44 UTC (rev 6461) +++ trunk/Jmol/src/org/openscience/jmol/app/ImageSelection.java 2006-12-14 21:51:17 UTC (rev 6462) @@ -33,6 +33,8 @@ import java.io.IOException; import java.awt.datatransfer.Clipboard; +import org.jmol.util.Logger; + /** * This class is used to transfer an {@link Image} into the clipboard. * @@ -132,10 +134,10 @@ result = (String) contents.getTransferData(DataFlavor.stringFlavor); } catch (UnsupportedFlavorException ex) { //highly unlikely since we are using a standard DataFlavor - System.out.println(ex); + Logger.error("Clipboard problem", ex); ex.printStackTrace(); } catch (IOException ex) { - System.out.println(ex); + Logger.error("Clipboard problem", ex); ex.printStackTrace(); } } Modified: trunk/Jmol/src/org/openscience/jmol/app/Jmol.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-12-14 19:40:44 UTC (rev 6461) +++ trunk/Jmol/src/org/openscience/jmol/app/Jmol.java 2006-12-14 21:51:17 UTC (rev 6462) @@ -330,7 +330,7 @@ static void report(String str) { if (isSilent.booleanValue()) return; - System.out.println(str); + Logger.info(str); } public static Jmol getJmol(JFrame frame, int startupWidth, int startupHeight, @@ -932,7 +932,7 @@ // loop over these files and load them String macroName = macros[i].getName(); if (macroName.endsWith(".macro")) { - System.out.println("Possible macro found: " + macroName); + Logger.debug("Possible macro found: " + macroName); try { FileInputStream macro = new FileInputStream(macros[i]); Properties macroProps = new Properties(); @@ -1235,7 +1235,7 @@ try { job.print(); } catch (PrinterException e) { - System.out.println("" + e); + Logger.error("Error while printing", e); } } } @@ -1700,7 +1700,7 @@ status.setStatus(1, GT._("IO Exception:")); status.setStatus(2, exc.toString()); } - System.out.println(exc.toString()); + Logger.error("IO Exception", exc); } } } Modified: trunk/Jmol/src/org/openscience/jmol/app/PovrayDialog.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/PovrayDialog.java 2006-12-14 19:40:44 UTC (rev 6461) +++ trunk/Jmol/src/org/openscience/jmol/app/PovrayDialog.java 2006-12-14 21:51:17 UTC (rev 6462) @@ -25,6 +25,7 @@ import org.jmol.api.*; import org.jmol.i18n.GT; +import org.jmol.util.Logger; import java.awt.Dimension; import java.awt.event.ActionEvent; @@ -552,7 +553,7 @@ viewer, os, allFrames, width, height); povs.writeFile(); } catch (FileNotFoundException fnf) { - System.out.println("Povray Dialog FileNotFoundException:" + theFile); + Logger.error("Povray Dialog FileNotFoundException: " + theFile, fnf); return; } } @@ -567,10 +568,10 @@ saveIni(os); os.close(); } catch (FileNotFoundException fnf) { - System.out.println("Povray Dialog FileNotFoundException:" + theFile); + Logger.error("Povray Dialog FileNotFoundException: " + theFile, fnf); return; } catch (IOException ioe) { - System.out.println("Povray Dialog IOException:" + theFile); + Logger.error("Povray Dialog IOException: " + theFile, ioe); return; } } @@ -592,10 +593,10 @@ try { Runtime.getRuntime().exec(commandLineArgs); } catch (java.io.IOException e) { - System.out.println("Caught IOException in povray exec: " + e); - System.out.println("CmdLine:"); + Logger.error("Caught IOException in povray exec", e); + Logger.error("CmdLine:"); for (int i = 0; i < commandLineArgs.length; i++) { - System.out.println(" <" + commandLineArgs[i] + ">"); + Logger.error(" <" + commandLineArgs[i] + ">"); } } } Modified: trunk/Jmol/src/org/openscience/jmol/app/PovraySaver.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/PovraySaver.java 2006-12-14 19:40:44 UTC (rev 6461) +++ trunk/Jmol/src/org/openscience/jmol/app/PovraySaver.java 2006-12-14 21:51:17 UTC (rev 6462) @@ -24,6 +24,7 @@ package org.openscience.jmol.app; import org.jmol.api.*; +import org.jmol.util.Logger; import org.jmol.viewer.JmolConstants; import java.util.Date; @@ -220,7 +221,7 @@ writeFrame(); bw.close(); } catch (IOException e) { - System.out.println("Got IOException " + e + " trying to write frame."); + Logger.error("Got IOException trying to write frame.", e); } } Modified: trunk/Jmol/src/org/openscience/jmol/app/PreferencesDialog.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/PreferencesDialog.java 2006-12-14 19:40:44 UTC (rev 6461) +++ trunk/Jmol/src/org/openscience/jmol/app/PreferencesDialog.java 2006-12-14 21:51:17 UTC (rev 6462) @@ -25,6 +25,8 @@ import org.jmol.api.*; import org.jmol.i18n.GT; +import org.jmol.util.Logger; + import java.awt.GridLayout; import java.awt.Dimension; import java.awt.FlowLayout; @@ -568,7 +570,7 @@ currentProperties.store(fileOutputStream, "Jmol"); fileOutputStream.close(); } catch (Exception e) { - System.out.println("Error saving preferences" + e); + Logger.error("Error saving preferences", e); } viewer.refresh(0, "PreferencesDialog:save()"); } Modified: trunk/Jmol/src/org/openscience/jmol/app/ScriptWindow.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/ScriptWindow.java 2006-12-14 19:40:44 UTC (rev 6461) +++ trunk/Jmol/src/org/openscience/jmol/app/ScriptWindow.java 2006-12-14 21:51:17 UTC (rev 6462) @@ -458,11 +458,11 @@ * Removes all content of the script window, and add a new prompt. */ void clearContent() { - try { - super.remove(0, getLength()); - } catch (BadLocationException exception) { - System.out.println("Could not clear script window content: " + exception.getMessage()); - } + try { + super.remove(0, getLength()); + } catch (BadLocationException exception) { + Logger.error("Could not clear script window content", exception); + } } void setPrompt() { Modified: trunk/Jmol/src/org/openscience/jmol/app/WhatsNewDialog.java =================================================================== --- trunk/Jmol/src/org/openscience/jmol/app/WhatsNewDialog.java 2006-12-14 19:40:44 UTC (rev 6461) +++ trunk/Jmol/src/org/openscience/jmol/app/WhatsNewDialog.java 2006-12-14 21:51:17 UTC (rev 6462) @@ -46,6 +46,7 @@ import java.io.IOException; import org.jmol.i18n.GT; +import org.jmol.util.Logger; public class WhatsNewDialog extends JDialog implements HyperlinkListener { @@ -70,9 +71,9 @@ html.setEditable(false); html.addHyperlinkListener(this); } catch (MalformedURLException e) { - System.out.println("Malformed URL: " + e); + Logger.error("Malformed URL", e); } catch (IOException e) { - System.out.println("IOException: " + e); + Logger.error("IOException", e); } JScrollPane scroller = new JScrollPane() { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |