[jsword-svn] r2274 - in trunk: bibledesktop/src/main/java/org/crosswire/bibledesktop/book bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic common-swing/src/main/java/org/crosswire/common/config/swing common-swing/src/main/java/org/crosswire/common/swing common-swing/src/main/java/org/crosswire/common/swing/desktop
dmsmith at crosswire.org
dmsmith at crosswire.org
Thu Feb 21 11:56:36 MST 2013
Author: dmsmith
Date: 2013-02-21 11:56:36 -0700 (Thu, 21 Feb 2013)
New Revision: 2274
Modified:
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.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/display/basic/SplitBookDataDisplay.java
trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TextPaneBookDataDisplay.java
trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AbstractConfigEditor.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/FontStore.java
trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/LayoutPersistence.java
Log:
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-21 18:14:01 UTC (rev 2273)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/BibleComboBoxModel.java 2013-02-21 18:56:36 UTC (rev 2274)
@@ -229,11 +229,6 @@
is.defaultReadObject();
}
- /**
- * The log stream
- */
- private static final Logger log = Logger.getLogger(BibleComboBoxModel.class);
-
// AV11N(DMS): Is this right?
private transient Versification v11n = Versifications.instance().getDefaultVersification();
@@ -253,6 +248,11 @@
protected Level level;
/**
+ * The log stream
+ */
+ private static final Logger log = Logger.getLogger(BibleComboBoxModel.class);
+
+ /**
* Serialization ID
*/
private static final long serialVersionUID = 3616449020667442997L;
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-21 18:14:01 UTC (rev 2273)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/install/TextPaneBookMetaDataDisplay.java 2013-02-21 18:56:36 UTC (rev 2274)
@@ -94,11 +94,6 @@
}
/**
- * The log stream
- */
- protected static final Logger log = Logger.getLogger(TextPaneBookMetaDataDisplay.class);
-
- /**
* To convert OSIS to HTML
*/
private Converter converter;
@@ -108,4 +103,8 @@
*/
private JTextPane txtView;
+ /**
+ * The log stream
+ */
+ protected static final Logger log = Logger.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-21 18:14:01 UTC (rev 2273)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java 2013-02-21 18:56:36 UTC (rev 2274)
@@ -1309,11 +1309,6 @@
private static boolean reuseBibleView = true;
/**
- * The log stream
- */
- protected static final Logger log = Logger.getLogger(Desktop.class);
-
- /**
* The factory for actions that this class works with
*/
private transient volatile ActionFactory actions;
@@ -1338,6 +1333,11 @@
private PropertyChangeSupport changeSupport;
/**
+ * The log stream
+ */
+ protected static final Logger log = Logger.getLogger(Desktop.class);
+
+ /**
* Serialization ID
*/
private static final long serialVersionUID = 3977014029116191800L;
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-21 18:14:01 UTC (rev 2273)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/SplitBookDataDisplay.java 2013-02-21 18:56:36 UTC (rev 2274)
@@ -192,11 +192,6 @@
is.defaultReadObject();
}
- /**
- * The log stream
- */
- private static final Logger log = Logger.getLogger(SplitBookDataDisplay.class);
-
/*
* GUI Components
*/
@@ -205,6 +200,11 @@
private transient BookDataDisplay child;
/**
+ * The log stream
+ */
+ private static final Logger log = Logger.getLogger(SplitBookDataDisplay.class);
+
+ /**
* Serialization ID
*/
private static final long serialVersionUID = 3257283643176202806L;
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-21 18:14:01 UTC (rev 2273)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TextPaneBookDataDisplay.java 2013-02-21 18:56:36 UTC (rev 2274)
@@ -422,11 +422,6 @@
private static final String RELATIVE_URI_PROTOCOL = "";
/**
- * The log stream
- */
- protected static final Logger log = Logger.getLogger(TextPaneBookDataDisplay.class);
-
- /**
* The book data being shown.
*/
private BookData bdata;
@@ -471,4 +466,8 @@
*/
private EventListenerList listenerList = new EventListenerList();
+ /**
+ * The log stream
+ */
+ protected static final Logger log = Logger.getLogger(TextPaneBookDataDisplay.class);
}
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-21 18:14:01 UTC (rev 2273)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/AbstractConfigEditor.java 2013-02-21 18:56:36 UTC (rev 2274)
@@ -295,11 +295,6 @@
}
/**
- * The log stream
- */
- private static final Logger log = Logger.getLogger(AbstractConfigEditor.class);
-
- /**
* How many cards have we created - we only need a tree if there are 2 or
* more cards
*/
@@ -341,6 +336,11 @@
protected static final ImageIcon TASK_ICON_SMALL = GuiUtil.getIcon("toolbarButtonGraphics/general/Preferences16.gif");
/**
+ * The log stream
+ */
+ private static final Logger log = Logger.getLogger(AbstractConfigEditor.class);
+
+ /**
* Serialization ID
*/
private static final long serialVersionUID = 6004078142151397638L;
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-21 18:14:01 UTC (rev 2273)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/ActionFactory.java 2013-02-21 18:56:36 UTC (rev 2274)
@@ -325,12 +325,12 @@
private Object bean;
/**
- * The log stream
+ * The map of known CWActions
*/
- private static final Logger log = Logger.getLogger(ActionFactory.class);
+ private Map<String, CWAction> actions;
/**
- * The map of known CWActions
+ * The log stream
*/
- private Map<String, CWAction> actions;
+ private static final Logger log = Logger.getLogger(ActionFactory.class);
}
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-21 18:14:01 UTC (rev 2273)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/FontStore.java 2013-02-21 18:56:36 UTC (rev 2274)
@@ -316,5 +316,8 @@
private boolean loaded;
private PropertyMap fontMap;
+ /**
+ * The log stream
+ */
private static final Logger log = Logger.getLogger(FontStore.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-21 18:14:01 UTC (rev 2273)
+++ trunk/common-swing/src/main/java/org/crosswire/common/swing/desktop/LayoutPersistence.java 2013-02-21 18:56:36 UTC (rev 2274)
@@ -134,11 +134,6 @@
}
/**
- * Provide class logging capabilities
- */
- private static final Logger log = Logger.getLogger(LayoutPersistence.class);
-
- /**
* The persistence storage and retrieval object
*/
private PropertyMap settings;
@@ -173,4 +168,8 @@
*/
private static LayoutPersistence instance = new LayoutPersistence();
+ /**
+ * The log stream
+ */
+ private static final Logger log = Logger.getLogger(LayoutPersistence.class);
}
More information about the jsword-svn
mailing list