Mon Feb 25 08:51:23 MST 2013

Author: dmsmith
Date: 2013-02-25 08:51:23 -0700 (Mon, 25 Feb 2013)
New Revision: 2277

Modified:
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleViewPane.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BooksListModel.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/MultiBookPane.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/IndexResolver.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SiteEditorFactory.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/TextPaneBookMetaDataDisplay.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/DesktopActions.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/SplitBookDataDisplay.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TextPaneBookDataDisplay.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyTreeCellRenderer.java
   trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AbstractConfigEditor.java
   trunk/common-swing/src/main/java/org/crosswire/common/config/swing/FieldMap.java
   trunk/common-swing/src/main/java/org/crosswire/common/config/swing/MappedOptionsField.java
   trunk/common-swing/src/main/java/org/crosswire/common/config/swing/OptionsField.java
   trunk/common-swing/src/main/java/org/crosswire/common/progress/swing/JobsProgressBar.java
   trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java
   trunk/common-swing/src/main/java/org/crosswire/common/swing/CWAction.java
   trunk/common-swing/src/main/java/org/crosswire/common/swing/FontStore.java
   trunk/common-swing/src/main/java/org/crosswire/common/swing/GuiConvert.java
   trunk/common-swing/src/main/java/org/crosswire/common/swing/GuiUtil.java
   trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/LayoutPersistence.java
   trunk/jsword-web/etc/eclipse/jsword-web-ant-check.launch
   trunk/jsword-web/src/main/java/org/crosswire/jsword/view/web/DownloadSet.java
Log:
JS-242 Allow for alternate logging implementation.

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java
===================================================================

--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java	2013-02-25 15:51:23 UTC (rev 2277)
@@ -27,11 +27,12 @@
 import javax.swing.AbstractListModel;
 import javax.swing.ComboBoxModel;
 
-import org.crosswire.common.util.Logger;
 import org.crosswire.jsword.passage.Verse;
 import org.crosswire.jsword.versification.BibleBook;
 import org.crosswire.jsword.versification.Versification;
 import org.crosswire.jsword.versification.system.Versifications;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A ComboBoxModel for selecting book/chapter/verse.
@@ -250,7 +251,7 @@
     /**
      * The log stream
      */
-    private static final Logger log = Logger.getLogger(BibleComboBoxModel.class);
+    private static final Logger log = LoggerFactory.getLogger(BibleComboBoxModel.class);
 
     /**
      * Serialization ID

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleViewPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleViewPane.java	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleViewPane.java	2013-02-25 15:51:23 UTC (rev 2277)
@@ -48,12 +48,14 @@
 import org.crosswire.common.swing.desktop.event.TitleChangedEvent;
 import org.crosswire.common.swing.desktop.event.TitleChangedListener;
 import org.crosswire.common.util.CWProject;
-import org.crosswire.common.util.Logger;
 import org.crosswire.common.util.Reporter;
 import org.crosswire.jsword.passage.Key;
+import org.crosswire.jsword.passage.NoSuchKeyException;
 import org.crosswire.jsword.passage.NoSuchVerseException;
 import org.crosswire.jsword.passage.Passage;
 import org.crosswire.jsword.passage.PassageKeyFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A BibleViewPane consists of three areas for looking up passages, for
@@ -233,7 +235,7 @@
      * @throws IOException
      * @throws NoSuchVerseException
      */
-    public void open() throws NoSuchVerseException, IOException {
+    public void open() throws NoSuchKeyException, IOException {
         // TODO(DMS): make this sensitive to a version marker in the file!
         int reply = chooser.showOpenDialog(getRootPane());
         if (reply == JFileChooser.APPROVE_OPTION) {
@@ -393,7 +395,7 @@
     /**
      * The log stream
      */
-    protected static final Logger log = Logger.getLogger(BibleViewPane.class);
+    protected static final Logger log = LoggerFactory.getLogger(BibleViewPane.class);
 
     /**
      * Serialization ID

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BooksListModel.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BooksListModel.java	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BooksListModel.java	2013-02-25 15:51:23 UTC (rev 2277)
@@ -31,13 +31,14 @@
 import javax.swing.AbstractListModel;
 import javax.swing.event.ListDataListener;
 
-import org.crosswire.common.util.Logger;
 import org.crosswire.jsword.book.Book;
 import org.crosswire.jsword.book.BookFilter;
 import org.crosswire.jsword.book.BookList;
 import org.crosswire.jsword.book.Books;
 import org.crosswire.jsword.book.BooksEvent;
 import org.crosswire.jsword.book.BooksListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * BooksListModel creates a Swing ListModel from the available Bibles. I would
@@ -240,7 +241,7 @@
     /**
      * The log stream
      */
-    private static final Logger log = Logger.getLogger(BooksListModel.class);
+    private static final Logger log = LoggerFactory.getLogger(BooksListModel.class);
 
     /**
      * Serialization ID

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/MultiBookPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/MultiBookPane.java	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/MultiBookPane.java	2013-02-25 15:51:23 UTC (rev 2277)
@@ -53,7 +53,6 @@
 import org.crosswire.common.swing.CWScrollPane;
 import org.crosswire.common.swing.FixedSplitPane;
 import org.crosswire.common.swing.GuiUtil;
-import org.crosswire.common.util.Logger;
 import org.crosswire.jsword.book.Book;
 import org.crosswire.jsword.book.BookFilter;
 import org.crosswire.jsword.book.BookFilters;
@@ -64,6 +63,8 @@
 import org.crosswire.jsword.passage.Passage;
 import org.crosswire.jsword.passage.PreferredKey;
 import org.crosswire.jsword.passage.Verse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Builds a panel on which all the non-Bible books and their entries are
@@ -510,7 +511,7 @@
     /**
      * The log stream
      */
-    private static final Logger log = Logger.getLogger(MultiBookPane.class);
+    private static final Logger log = LoggerFactory.getLogger(MultiBookPane.class);
 
     /**
      * Serialization ID

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/IndexResolver.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/IndexResolver.java	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/IndexResolver.java	2013-02-25 15:51:23 UTC (rev 2277)
@@ -33,7 +33,6 @@
 
 import org.crosswire.bibledesktop.BDMsg;
 import org.crosswire.common.swing.CWOptionPane;
-import org.crosswire.common.util.Logger;
 import org.crosswire.jsword.book.Book;
 import org.crosswire.jsword.book.BookException;
 import org.crosswire.jsword.book.install.InstallException;
@@ -41,6 +40,8 @@
 import org.crosswire.jsword.book.install.Installer;
 import org.crosswire.jsword.index.IndexManagerFactory;
 import org.crosswire.jsword.util.IndexDownloader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A class to prompt the user to download or create a search index and to do
@@ -154,5 +155,5 @@
     /**
      * The log stream
      */
-    private static final Logger log = Logger.getLogger(IndexResolver.class);
+    private static final Logger log = LoggerFactory.getLogger(IndexResolver.class);
 }

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SiteEditorFactory.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SiteEditorFactory.java	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/SiteEditorFactory.java	2013-02-25 15:51:23 UTC (rev 2277)
@@ -25,7 +25,8 @@
 import java.util.MissingResourceException;
 
 import org.crosswire.common.config.swing.FieldMap;
-import org.crosswire.common.util.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.crosswire.common.util.PluginUtil;
 import org.crosswire.jsword.book.install.Installer;
 
@@ -81,5 +82,5 @@
     /**
      * The log stream
      */
-    private static final Logger log = Logger.getLogger(FieldMap.class);
+    private static final Logger log = LoggerFactory.getLogger(FieldMap.class);
 }

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/TextPaneBookMetaDataDisplay.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/TextPaneBookMetaDataDisplay.java	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/TextPaneBookMetaDataDisplay.java	2013-02-25 15:51:23 UTC (rev 2277)
@@ -29,7 +29,6 @@
 
 import org.crosswire.bibledesktop.desktop.XSLTProperty;
 import org.crosswire.common.swing.AntiAliasedTextPane;
-import org.crosswire.common.util.Logger;
 import org.crosswire.common.util.Reporter;
 import org.crosswire.common.xml.Converter;
 import org.crosswire.common.xml.JDOMSAXEventProvider;
@@ -38,6 +37,8 @@
 import org.crosswire.common.xml.XMLUtil;
 import org.crosswire.jsword.book.Book;
 import org.crosswire.jsword.util.ConverterFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
 
 /**
@@ -106,5 +107,5 @@
     /**
      * The log stream
      */
-    protected static final Logger log = Logger.getLogger(TextPaneBookMetaDataDisplay.class);
+    protected static final Logger log = LoggerFactory.getLogger(TextPaneBookMetaDataDisplay.class);
 }

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java	2013-02-25 15:51:23 UTC (rev 2277)
@@ -92,7 +92,6 @@
 import org.crosswire.common.util.CWClassLoader;
 import org.crosswire.common.util.CWProject;
 import org.crosswire.common.util.FileUtil;
-import org.crosswire.common.util.Logger;
 import org.crosswire.common.util.OSType;
 import org.crosswire.common.util.Reporter;
 import org.crosswire.common.util.ResourceUtil;
@@ -110,6 +109,8 @@
 import org.crosswire.jsword.util.ConverterFactory;
 import org.jdom.Document;
 import org.jdom.JDOMException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The Desktop is the user's view of BibleDesktop.
@@ -1335,7 +1336,7 @@
     /**
      * The log stream
      */
-    protected static final Logger log = Logger.getLogger(Desktop.class);
+    protected static final Logger log = LoggerFactory.getLogger(Desktop.class);
 
     /**
      * Serialization ID

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/DesktopActions.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/DesktopActions.java	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/DesktopActions.java	2013-02-25 15:51:23 UTC (rev 2277)
@@ -44,13 +44,14 @@
 import org.crosswire.common.util.CWProject;
 import org.crosswire.common.util.ClassUtil;
 import org.crosswire.common.util.FileUtil;
-import org.crosswire.common.util.Logger;
 import org.crosswire.common.util.OSType;
 import org.crosswire.common.util.ReflectionUtil;
 import org.crosswire.common.util.Reporter;
 import org.crosswire.jsword.passage.Key;
-import org.crosswire.jsword.passage.NoSuchVerseException;
+import org.crosswire.jsword.passage.NoSuchKeyException;
 import org.crosswire.jsword.util.WebWarning;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * DesktopAction is nothing more than a holder of the behavior of the Desktop.
@@ -157,7 +158,7 @@
         try {
             BibleViewPane view = (BibleViewPane) getDesktop().getViews().getSelected();
             view.open();
-        } catch (NoSuchVerseException e) {
+        } catch (NoSuchKeyException e) {
             Reporter.informUser(getDesktop(), e);
         } catch (IOException e) {
             Reporter.informUser(getDesktop(), e);
@@ -543,5 +544,5 @@
     /**
      * The log stream
      */
-    protected static final Logger log = Logger.getLogger(DesktopActions.class);
+    protected static final Logger log = LoggerFactory.getLogger(DesktopActions.class);
 }

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/SplitBookDataDisplay.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/SplitBookDataDisplay.java	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/SplitBookDataDisplay.java	2013-02-25 15:51:23 UTC (rev 2277)
@@ -35,10 +35,11 @@
 import org.crosswire.bibledesktop.passage.KeyChangeListener;
 import org.crosswire.bibledesktop.passage.KeySidebar;
 import org.crosswire.common.swing.FixedSplitPane;
-import org.crosswire.common.util.Logger;
 import org.crosswire.jsword.book.Book;
 import org.crosswire.jsword.book.BookProvider;
 import org.crosswire.jsword.passage.Key;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A SplitBookDataDisplay consists of a KeySidebar and a BookDataDisplay in a
@@ -202,7 +203,7 @@
     /**
      * The log stream
      */
-    private static final Logger log = Logger.getLogger(SplitBookDataDisplay.class);
+    private static final Logger log = LoggerFactory.getLogger(SplitBookDataDisplay.class);
 
     /**
      * Serialization ID

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TextPaneBookDataDisplay.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TextPaneBookDataDisplay.java	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TextPaneBookDataDisplay.java	2013-02-25 15:51:23 UTC (rev 2277)
@@ -50,7 +50,6 @@
 import org.crosswire.common.swing.AntiAliasedTextPane;
 import org.crosswire.common.swing.GuiConvert;
 import org.crosswire.common.swing.GuiUtil;
-import org.crosswire.common.util.Logger;
 import org.crosswire.common.util.Reporter;
 import org.crosswire.common.xml.Converter;
 import org.crosswire.common.xml.SAXEventProvider;
@@ -63,6 +62,8 @@
 import org.crosswire.jsword.book.BookMetaData;
 import org.crosswire.jsword.passage.Key;
 import org.crosswire.jsword.util.ConverterFactory;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.xml.sax.SAXException;
 
 /**
@@ -474,5 +475,5 @@
     /**
      * The log stream
      */
-    protected static final Logger log = Logger.getLogger(TextPaneBookDataDisplay.class);
+    protected static final Logger log = LoggerFactory.getLogger(TextPaneBookDataDisplay.class);
 }

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyTreeCellRenderer.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyTreeCellRenderer.java	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/passage/KeyTreeCellRenderer.java	2013-02-25 15:51:23 UTC (rev 2277)
@@ -26,8 +26,9 @@
 import javax.swing.JTree;
 import javax.swing.tree.DefaultTreeCellRenderer;
 
-import org.crosswire.common.util.Logger;
 import org.crosswire.jsword.passage.Key;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A specialization of DefaultTreeCellRenderer that knows how to get names from
@@ -61,7 +62,7 @@
     /**
      * The log stream
      */
-    private static final Logger log = Logger.getLogger(KeyTreeCellRenderer.class);
+    private static final Logger log = LoggerFactory.getLogger(KeyTreeCellRenderer.class);
 
     /**
      * Serialization ID

Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AbstractConfigEditor.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AbstractConfigEditor.java	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AbstractConfigEditor.java	2013-02-25 15:51:23 UTC (rev 2277)
@@ -43,7 +43,8 @@
 import org.crosswire.common.swing.FormPane;
 import org.crosswire.common.swing.GuiUtil;
 import org.crosswire.common.swing.desktop.LayoutPersistence;
-import org.crosswire.common.util.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * An abstract base of a Configuration Editor.
@@ -338,7 +339,7 @@
     /**
      * The log stream
      */
-    private static final Logger log = Logger.getLogger(AbstractConfigEditor.class);
+    private static final Logger log = LoggerFactory.getLogger(AbstractConfigEditor.class);
 
     /**
      * Serialization ID

Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/FieldMap.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/FieldMap.java	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/FieldMap.java	2013-02-25 15:51:23 UTC (rev 2277)
@@ -25,9 +25,10 @@
 
 import org.crosswire.common.config.Choice;
 import org.crosswire.common.config.MultipleChoice;
-import org.crosswire.common.util.Logger;
 import org.crosswire.common.util.PluginUtil;
 import org.crosswire.common.util.Reporter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * This class provides mapping between Choice types and Fields. There is an
@@ -105,5 +106,5 @@
     /**
      * The log stream
      */
-    private static final Logger log = Logger.getLogger(FieldMap.class);
+    private static final Logger log = LoggerFactory.getLogger(FieldMap.class);
 }

Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/MappedOptionsField.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/MappedOptionsField.java	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/MappedOptionsField.java	2013-02-25 15:51:23 UTC (rev 2277)
@@ -30,11 +30,12 @@
 
 import org.crosswire.common.config.Choice;
 import org.crosswire.common.config.MappedChoice;
+import org.crosswire.common.swing.CWOtherMsg;
 import org.crosswire.common.swing.GuiUtil;
 import org.crosswire.common.swing.MapComboBoxModel;
 import org.crosswire.common.swing.MapEntryRenderer;
-import org.crosswire.common.swing.CWOtherMsg;
-import org.crosswire.common.util.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Allow the user to choose from a combo box.
@@ -135,5 +136,5 @@
     /**
      * The log stream
      */
-    private static final Logger log = Logger.getLogger(MappedOptionsField.class);
+    private static final Logger log = LoggerFactory.getLogger(MappedOptionsField.class);
 }

Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/OptionsField.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/OptionsField.java	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/OptionsField.java	2013-02-25 15:51:23 UTC (rev 2277)
@@ -31,9 +31,10 @@
 import org.crosswire.common.config.Choice;
 import org.crosswire.common.config.MultipleChoice;
 import org.crosswire.common.diff.Distance;
+import org.crosswire.common.swing.CWOtherMsg;
 import org.crosswire.common.swing.GuiUtil;
-import org.crosswire.common.swing.CWOtherMsg;
-import org.crosswire.common.util.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Allow the user to choose from a combo box.
@@ -159,5 +160,5 @@
     /**
      * The log stream
      */
-    private static final Logger log = Logger.getLogger(OptionsField.class);
+    private static final Logger log = LoggerFactory.getLogger(OptionsField.class);
 }

Modified: trunk/common-swing/src/main/java/org/crosswire/common/progress/swing/JobsProgressBar.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/progress/swing/JobsProgressBar.java	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/common-swing/src/main/java/org/crosswire/common/progress/swing/JobsProgressBar.java	2013-02-25 15:51:23 UTC (rev 2277)
@@ -49,7 +49,8 @@
 import org.crosswire.common.swing.ActionFactory;
 import org.crosswire.common.swing.CWAction;
 import org.crosswire.common.swing.GuiUtil;
-import org.crosswire.common.util.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * JobsViewPane is a small JProgressBar based viewer for current jobs.
@@ -383,7 +384,7 @@
     /**
      * The log stream
      */
-    private static final Logger log = Logger.getLogger(JobsProgressBar.class);
+    private static final Logger log = LoggerFactory.getLogger(JobsProgressBar.class);
 
     /**
      * Serialization ID

Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java	2013-02-25 15:51:23 UTC (rev 2277)
@@ -32,9 +32,10 @@
 import javax.swing.JButton;
 import javax.swing.JLabel;
 
-import org.crosswire.common.util.Logger;
 import org.crosswire.common.util.OSType;
 import org.crosswire.common.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * The ActionFactory is being radically updated. Take the following with a grain of salt.
@@ -332,5 +333,5 @@
     /**
      * The log stream
      */
-    private static final Logger log = Logger.getLogger(ActionFactory.class);
+    private static final Logger log = LoggerFactory.getLogger(ActionFactory.class);
 }

Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/CWAction.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/CWAction.java	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/CWAction.java	2013-02-25 15:51:23 UTC (rev 2277)
@@ -32,8 +32,9 @@
 import javax.swing.KeyStroke;
 import javax.swing.event.EventListenerList;
 
-import org.crosswire.common.util.Logger;
 import org.crosswire.common.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A CrossWire Action is a generic extension of AbstractAction, that adds
@@ -260,7 +261,7 @@
     /**
      * The log stream
      */
-    private static final Logger log = Logger.getLogger(CWAction.class);
+    private static final Logger log = LoggerFactory.getLogger(CWAction.class);
 
     /**
      * Serialization ID

Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/FontStore.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/FontStore.java	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/FontStore.java	2013-02-25 15:51:23 UTC (rev 2277)
@@ -27,10 +27,11 @@
 
 import org.crosswire.common.util.FileUtil;
 import org.crosswire.common.util.Language;
-import org.crosswire.common.util.Logger;
 import org.crosswire.common.util.NetUtil;
 import org.crosswire.common.util.PropertyMap;
 import org.crosswire.common.util.ResourceUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Font Store maintains a persistent, hierarchical store of user font
@@ -319,5 +320,5 @@
     /**
      * The log stream
      */
-    private static final Logger log = Logger.getLogger(FontStore.class);
+    private static final Logger log = LoggerFactory.getLogger(FontStore.class);
 }

Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/GuiConvert.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/GuiConvert.java	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/GuiConvert.java	2013-02-25 15:51:23 UTC (rev 2277)
@@ -24,8 +24,9 @@
 import java.awt.Color;
 import java.awt.Font;
 
-import org.crosswire.common.util.Logger;
 import org.crosswire.common.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Conversions between various types and Strings.
@@ -167,5 +168,5 @@
     /**
      * The log stream
      */
-    private static final Logger log = Logger.getLogger(GuiConvert.class);
+    private static final Logger log = LoggerFactory.getLogger(GuiConvert.class);
 }

Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/GuiUtil.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/GuiUtil.java	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/GuiUtil.java	2013-02-25 15:51:23 UTC (rev 2277)
@@ -50,8 +50,9 @@
 import javax.swing.text.JTextComponent;
 
 import org.crosswire.common.util.Language;
-import org.crosswire.common.util.Logger;
 import org.crosswire.common.util.ResourceUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Various GUI Utilities.
@@ -582,6 +583,6 @@
     /**
      * The log stream
      */
-    private static final Logger log = Logger.getLogger(GuiUtil.class);
+    private static final Logger log = LoggerFactory.getLogger(GuiUtil.class);
 
 }

Modified: trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/LayoutPersistence.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/LayoutPersistence.java	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/LayoutPersistence.java	2013-02-25 15:51:23 UTC (rev 2277)
@@ -31,11 +31,12 @@
 
 import org.crosswire.common.util.CWProject;
 import org.crosswire.common.util.FileUtil;
-import org.crosswire.common.util.Logger;
 import org.crosswire.common.util.NetUtil;
 import org.crosswire.common.util.PropertyMap;
 import org.crosswire.common.util.ResourceUtil;
 import org.crosswire.common.util.StringUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Window layout persistence mechanism. Intended to be flexible enough to allow
@@ -171,5 +172,5 @@
     /**
      * The log stream
      */
-    private static final Logger log = Logger.getLogger(LayoutPersistence.class);
+    private static final Logger log = LoggerFactory.getLogger(LayoutPersistence.class);
 }

Modified: trunk/jsword-web/etc/eclipse/jsword-web-ant-check.launch
===================================================================
--- trunk/jsword-web/etc/eclipse/jsword-web-ant-check.launch	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/jsword-web/etc/eclipse/jsword-web-ant-check.launch	2013-02-25 15:51:23 UTC (rev 2277)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ant.AntLaunchConfigurationType">
-<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="true"/>
+<booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
 <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
 <listEntry value="/jsword-web/build.xml"/>
 </listAttribute>
@@ -15,10 +15,10 @@
 <stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_default"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/Java SE 6 (MacOS X Default)"/>
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.ant.internal.launching.remote.InternalAntRunner"/>
-<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-1.6.0-openjdk-1.6.0.0.x86_64"/>
 <stringAttribute key="org.eclipse.jdt.launching.WORKING_DIRECTORY" value="${workspace_loc:jsword-web}"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="tools,"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_ANT_TARGETS" value="checkstyle,"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/jsword-web/build.xml}"/>
 <intAttribute key="org.eclipse.ui.externaltoolsATTR_SORT_TARGETS" value="1"/>
 <stringAttribute key="process_factory_id" value="org.eclipse.ant.ui.remoteAntProcessFactory"/>

Modified: trunk/jsword-web/src/main/java/org/crosswire/jsword/view/web/DownloadSet.java
===================================================================
--- trunk/jsword-web/src/main/java/org/crosswire/jsword/view/web/DownloadSet.java	2013-02-24 00:19:58 UTC (rev 2276)
+++ trunk/jsword-web/src/main/java/org/crosswire/jsword/view/web/DownloadSet.java	2013-02-25 15:51:23 UTC (rev 2277)
@@ -11,7 +11,8 @@
 import java.util.SortedSet;
 import java.util.TreeSet;
 
-import org.crosswire.common.util.Logger;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * A helper for the download.jsp page.
@@ -146,5 +147,5 @@
     /**
      * The log stream
      */
-    protected static final Logger log = Logger.getLogger(DownloadSet.class);
+    protected static final Logger log = LoggerFactory.getLogger(DownloadSet.class);
 }


