[jsword-svn] r1426 - in trunk: bibledesktop/etc/eclipse bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic common/src/main/java/org/crosswire/common/util

[dmsmith at www.crosswire.org]

Author: dmsmith
Date: 2007-06-21 19:46:03 -0700 (Thu, 21 Jun 2007)
New Revision: 1426

Modified:
   trunk/bibledesktop/etc/eclipse/bibledesktop-app-desktop15.launch
   trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TabbedBookDataDisplay.java
   trunk/common/src/main/java/org/crosswire/common/util/Msg.java
   trunk/common/src/main/java/org/crosswire/common/util/Msg.properties
   trunk/common/src/main/java/org/crosswire/common/util/Reporter.java
Log:
Working on an AWT bug.

Modified: trunk/bibledesktop/etc/eclipse/bibledesktop-app-desktop15.launch
===================================================================
--- trunk/bibledesktop/etc/eclipse/bibledesktop-app-desktop15.launch	2007-06-21 20:18:19 UTC (rev 1425)
+++ trunk/bibledesktop/etc/eclipse/bibledesktop-app-desktop15.launch	2007-06-22 02:46:03 UTC (rev 1426)
@@ -2,14 +2,21 @@
 <launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
 <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.crosswire.bibledesktop.desktop.Desktop"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_TYPE_ID" value="org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="4"/>
+</listAttribute>
 <stringAttribute key="org.eclipse.jdt.launching.VM_INSTALL_NAME" value="jdk-1.5.0"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="bibledesktop"/>
 <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx512m -ea"/>
+<stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.launching.macosx.MacOSXType/jdk-1.5.0"/>
 <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
 <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
 <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
 </listAttribute>
 <stringAttribute key="org.eclipse.debug.ui.target_debug_perspective" value="perspective_default"/>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/bibledesktop"/>
+</listAttribute>
 <booleanAttribute key="org.eclipse.debug.core.appendEnvironmentVariables" value="true"/>
 <stringAttribute key="org.eclipse.debug.ui.target_run_perspective" value="perspective_default"/>
 </launchConfiguration>

Modified: trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TabbedBookDataDisplay.java
===================================================================
--- trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TabbedBookDataDisplay.java	2007-06-21 20:18:19 UTC (rev 1425)
+++ trunk/bibledesktop/src/main/java/org/crosswire/bibledesktop/display/basic/TabbedBookDataDisplay.java	2007-06-22 02:46:03 UTC (rev 1426)
@@ -166,7 +166,6 @@
         }
 
         // Since we changed the contents of the page we need to cause it to repaint
-        GuiUtil.refresh(scrMain);
         GuiUtil.refresh(pnlMain);
     }
 

Modified: trunk/common/src/main/java/org/crosswire/common/util/Msg.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/Msg.java	2007-06-21 20:18:19 UTC (rev 1425)
+++ trunk/common/src/main/java/org/crosswire/common/util/Msg.java	2007-06-22 02:46:03 UTC (rev 1426)
@@ -45,6 +45,7 @@
     static final Msg NOT_ASSIGNABLE = new Msg("ResourceUtil.NotAssignable"); //$NON-NLS-1$
     static final Msg UNAVILABLE = new Msg("ThreadUtil.Unavailable"); //$NON-NLS-1$
     static final Msg MISSING_FILE = new Msg("WebResource.MissingFile"); //$NON-NLS-1$
+    static final Msg UNEXPECTED_ERROR = new Msg("Reporter.Unexpected"); //$NON-NLS-1$
 
     /**
      * Passthrough ctor

Modified: trunk/common/src/main/java/org/crosswire/common/util/Msg.properties
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/Msg.properties	2007-06-21 20:18:19 UTC (rev 1425)
+++ trunk/common/src/main/java/org/crosswire/common/util/Msg.properties	2007-06-22 02:46:03 UTC (rev 1426)
@@ -19,3 +19,4 @@
 ResourceUtil.NotAssignable=Class {0} does not implement {1}
 ThreadUtil.Unavailable=<Unavailable>
 WebResource.MissingFile=Unable to find: {0}
+Reporter.Unexpected=Unexpected problem
\ No newline at end of file

Modified: trunk/common/src/main/java/org/crosswire/common/util/Reporter.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/util/Reporter.java	2007-06-21 20:18:19 UTC (rev 1425)
+++ trunk/common/src/main/java/org/crosswire/common/util/Reporter.java	2007-06-22 02:46:03 UTC (rev 1426)
@@ -40,7 +40,7 @@
  *     still valid.)</li>
  * However in many of the times this class is used, this is the reason:
  * <li>Within UI specific code - to throw up a dialog box (or whatever). Now
- *     this use is currently tollerated, however it is probably a poor idea to
+ *     this use is currently tolerated, however it is probably a poor idea to
  *     use GUI agnostic messaging in a GUI specific context. But I'm not
  *     bothered enough to change it now. Specifically this use is deprecated
  *     because it makes the app more susceptible to the configuration of the
@@ -298,7 +298,15 @@
          */
         public void handle(Throwable ex)
         {
-            Reporter.informUser(this, ex);
+            // Only allow one to be reported.
+            // TODO(DMS): change this to be once with in an interval.
+            if (!handled)
+            {
+                handled = true;
+                Reporter.informUser(this, new LucidException(Msg.UNEXPECTED_ERROR, ex));
+            }
         }
+
+        private static boolean handled;
     }
 }