[Jmol-commits] SF.net SVN: jmol: [5484] branches/v10_9/Jmol

[<ni...@us...>]

Revision: 5484
          http://svn.sourceforge.net/jmol/?rev=5484&view=rev
Author:   nicove
Date:     2006-09-11 11:32:33 -0700 (Mon, 11 Sep 2006)

Log Message:
-----------
Logger

Modified Paths:
--------------
    branches/v10_9/Jmol/src/org/jmol/adapter/smarter/AtomSetCollectionReader.java
    branches/v10_9/Jmol/test/org/jmol/adapter/smarter/TestSmarterJmolAdapter.java

Added Paths:
-----------
    branches/v10_9/Jmol/test/org/jmol/util/JUnitLogger.java

Modified: branches/v10_9/Jmol/src/org/jmol/adapter/smarter/AtomSetCollectionReader.java
===================================================================
--- branches/v10_9/Jmol/src/org/jmol/adapter/smarter/AtomSetCollectionReader.java	2006-09-11 18:01:23 UTC (rev 5483)
+++ branches/v10_9/Jmol/src/org/jmol/adapter/smarter/AtomSetCollectionReader.java	2006-09-11 18:32:33 UTC (rev 5484)
@@ -242,7 +242,7 @@
     if (ignoreFileUnitCell)
       return;
     notionalUnitCell[i] = x;
-    System.out.println("setunitcellitem" + i + " " + x);
+    if (logger != null) logger.log("setunitcellitem " + i + " " + x);
     if (i < 6)
       iHaveUnitCell = checkUnitCell(6);
     if (i == 17 && iHaveUnitCell)

Modified: branches/v10_9/Jmol/test/org/jmol/adapter/smarter/TestSmarterJmolAdapter.java
===================================================================
--- branches/v10_9/Jmol/test/org/jmol/adapter/smarter/TestSmarterJmolAdapter.java	2006-09-11 18:01:23 UTC (rev 5483)
+++ branches/v10_9/Jmol/test/org/jmol/adapter/smarter/TestSmarterJmolAdapter.java	2006-09-11 18:32:33 UTC (rev 5484)
@@ -14,6 +14,7 @@
 import java.util.zip.GZIPInputStream;
 
 import org.jmol.api.JmolAdapter;
+import org.jmol.util.JUnitLogger;
 
 import junit.framework.TestCase;
 
@@ -287,6 +288,7 @@
     // Open file
     Object result = null;
     try {
+      JUnitLogger.activateLogger();
       SmarterJmolAdapter adapter = new SmarterJmolAdapter(null);
       adapter.logger = new TestLogger(adapter);
       File file = new File(new File("../Jmol-datafiles", directory), filename);
@@ -321,6 +323,7 @@
     // Open file 
     Object result = null;
     try {
+      JUnitLogger.activateLogger();
       SmarterJmolAdapter adapter = new SmarterJmolAdapter(null);
       adapter.logger = new TestLogger(adapter);
       File file = new File(new File("../Jmol-datafiles", directory), filename);

Added: branches/v10_9/Jmol/test/org/jmol/util/JUnitLogger.java
===================================================================
--- branches/v10_9/Jmol/test/org/jmol/util/JUnitLogger.java	                        (rev 0)
+++ branches/v10_9/Jmol/test/org/jmol/util/JUnitLogger.java	2006-09-11 18:32:33 UTC (rev 5484)
@@ -0,0 +1,117 @@
+/* $RCSfile$
+ * $Author$
+ * $Date$
+ * $Revision$
+ *
+ * Copyright (C) 2005  The Jmol Development Team
+ *
+ * Contact: jmo...@li...
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 2.1 of the License, or (at your option) any later version.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+ *  02110-1301, USA.
+ */
+
+package org.jmol.util;
+
+/**
+ * Implementation of Logger for JUnit tests 
+ */
+public class JUnitLogger implements LoggerInterface {
+
+  /**
+   * Activate the JUnit logger.
+   */
+  public static void activateLogger() {
+    Logger.setLogger(new JUnitLogger());
+  }
+
+  /**
+   * Private constructor, use activateLogger() instead. 
+   */
+  private JUnitLogger() {
+    //
+  }
+
+  /**
+   * Log errors.
+   * 
+   * @param txt Text to log
+   * @param e Exception
+   */
+  private void logError(String txt, Throwable e) {
+    System.err.println(
+        "Error: " +
+        ((txt != null) ? (txt + " - ") : "") +
+        ((e != null) ? e.getClass().getName() : "") +
+        ((e != null) && (e.getMessage() != null) ? (" - " + e.getMessage()) : ""));
+  }
+
+  /* (non-Javadoc)
+   * @see org.jmol.util.LoggerInterface#debug(java.lang.String)
+   */
+  public void debug(String txt) {
+    //
+  }
+
+  /* (non-Javadoc)
+   * @see org.jmol.util.LoggerInterface#info(java.lang.String)
+   */
+  public void info(String txt) {
+    //
+  }
+
+  /* (non-Javadoc)
+   * @see org.jmol.util.LoggerInterface#warn(java.lang.String)
+   */
+  public void warn(String txt) {
+    //
+  }
+
+  /* (non-Javadoc)
+   * @see org.jmol.util.LoggerInterface#warn(java.lang.String, java.lang.Throwable)
+   */
+  public void warn(String txt, Throwable e) {
+    logError(txt, e);
+  }
+
+  /* (non-Javadoc)
+   * @see org.jmol.util.LoggerInterface#error(java.lang.String)
+   */
+  public void error(String txt) {
+    //
+  }
+
+  /* (non-Javadoc)
+   * @see org.jmol.util.LoggerInterface#error(java.lang.String, java.lang.Throwable)
+   */
+  public void error(String txt, Throwable e) {
+    logError(txt, e);
+  }
+
+  /* (non-Javadoc)
+   * @see org.jmol.util.LoggerInterface#fatal(java.lang.String)
+   */
+  public void fatal(String txt) {
+    //
+  }
+
+  /* (non-Javadoc)
+   * @see org.jmol.util.LoggerInterface#fatal(java.lang.String, java.lang.Throwable)
+   */
+  public void fatal(String txt, Throwable e) {
+    logError(txt, e);
+  }
+
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.