[jsword-svn] r1916 - in trunk: common/src/main/java/org/crosswire/common/config common-swing/src/main/java/org/crosswire/common/config/swing

[dmsmith at www.crosswire.org]

Author: dmsmith
Date: 2008-07-28 20:25:16 -0700 (Mon, 28 Jul 2008)
New Revision: 1916

Modified:
   trunk/common-swing/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java
   trunk/common/src/main/java/org/crosswire/common/config/MappedOptionsChoice.java
Log:
Changed missing option reporting to log rather than nag.
fixed an macosx option bug that caused truncation in tree.

Modified: trunk/common/src/main/java/org/crosswire/common/config/MappedOptionsChoice.java
===================================================================
--- trunk/common/src/main/java/org/crosswire/common/config/MappedOptionsChoice.java	2008-07-28 20:51:44 UTC (rev 1915)
+++ trunk/common/src/main/java/org/crosswire/common/config/MappedOptionsChoice.java	2008-07-29 03:25:16 UTC (rev 1916)
@@ -26,7 +26,7 @@
 import java.util.ResourceBundle;
 import java.util.TreeMap;
 
-import org.crosswire.common.util.Reporter;
+import org.crosswire.common.util.Logger;
 import org.jdom.Element;
 
 /**
@@ -107,9 +107,9 @@
                 return mapEntry.getKey().toString();
             }
         }
-        Reporter.informUser(this, Msg.IGNORE, new Object[] { orig });
+        logger.warn(Msg.IGNORE.toString(orig));
         return ""; //$NON-NLS-1$
     }
-
+    private static Logger logger = Logger.getLogger(MappedOptionsChoice.class);
     private Map options;
 }

Modified: trunk/common-swing/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java
===================================================================
--- trunk/common-swing/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java	2008-07-28 20:51:44 UTC (rev 1915)
+++ trunk/common-swing/src/main/java/org/crosswire/common/config/swing/TreeConfigEditor.java	2008-07-29 03:25:16 UTC (rev 1916)
@@ -24,6 +24,7 @@
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
 import java.awt.Color;
+import java.awt.Dimension;
 import java.awt.Font;
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -72,7 +73,8 @@
         JPanel panel = new JPanel();
         JPanel blank = new JPanel();
         DefaultTreeCellRenderer dtcr = new DefaultTreeCellRenderer();
-
+        // prevent truncation (This is a hack!)
+        dtcr.setPreferredSize(new Dimension(1200, 100));
         ctm = new ConfigureTreeModel();
         tree = new JTree();
         title = new JLabel();