[jsword-svn] r2276 - in trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop: book desktop display/basic

[dmsmith at crosswire.org]

Author: dmsmith
Date: 2013-02-23 17:19:58 -0700 (Sat, 23 Feb 2013)
New Revision: 2276

Modified:
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TextPaneBookDataDisplay.java
Log:
Checkstyle cleanup.
Made the showing of module content catch Exception to make reporting a bit nicer.

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java	2013-02-24 00:18:05 UTC (rev 2275)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/book/DisplaySelectPane.java	2013-02-24 00:19:58 UTC (rev 2276)
@@ -826,7 +826,7 @@
     /**
      * The current passage.
      */
-    private Key key;
+    protected Key key;
 
     /**
      * Who is interested in things this DisplaySelectPane does

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:18:05 UTC (rev 2275)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/desktop/Desktop.java	2013-02-24 00:19:58 UTC (rev 2276)
@@ -1311,7 +1311,7 @@
     /**
      * The factory for actions that this class works with
      */
-    private transient volatile ActionFactory actions;
+    protected transient volatile ActionFactory actions;
     /**
      * The DesktopActions is the holder for the actions, merely to keep the size of this file smaller.
      */

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:18:05 UTC (rev 2275)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TextPaneBookDataDisplay.java	2013-02-24 00:19:58 UTC (rev 2276)
@@ -180,6 +180,11 @@
             Reporter.informUser(this, e);
         } catch (TransformerException e) {
             Reporter.informUser(this, e);
+        } catch (Exception e) {
+            // Generally it is bad to catch exception
+            // However, this prevents the AWT exception handler from catching it
+            // Allowing us to manage it better.
+            Reporter.informUser(this, e);
         }
     }