[commit-cp] classpath ChangeLog javax/swing/plaf/basic/Basi...

[Lillian Angel]

CVSROOT:        /cvsroot/classpath
Module name:    classpath
Changes by:     Lillian Angel <langel>  06/06/09 14:08:39

Modified files:
        .              : ChangeLog 
        javax/swing/plaf/basic: BasicComboBoxRenderer.java 

Log message:
        2006-06-09  Francis Kung  <address@hidden>
        
                * javax/swing/plaf/basic/BasicComboBoxRenderer.java:
                (getPreferredSize): Return correct height for null or empty
                items.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7735&r2=1.7736
http://cvs.savannah.gnu.org/viewcvs/classpath/javax/swing/plaf/basic/BasicComboBoxRenderer.java?cvsroot=classpath&r1=1.9&r2=1.10

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7735
retrieving revision 1.7736
diff -u -b -r1.7735 -r1.7736
--- ChangeLog   9 Jun 2006 13:09:14 -0000       1.7735
+++ ChangeLog   9 Jun 2006 14:08:38 -0000       1.7736
@@ -1,3 +1,9 @@
+2006-06-09  Francis Kung  <address@hidden>
+
+       * javax/swing/plaf/basic/BasicComboBoxRenderer.java:
+       (getPreferredSize): Return correct height for null or empty 
+       items.
+
 2006-06-09  David Gilbert  <address@hidden>
 
        * java/awt/datatransfer/DataFlavor.java

Index: javax/swing/plaf/basic/BasicComboBoxRenderer.java
===================================================================
RCS file: 
/cvsroot/classpath/classpath/javax/swing/plaf/basic/BasicComboBoxRenderer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- javax/swing/plaf/basic/BasicComboBoxRenderer.java   17 Mar 2006 15:18:24 
-0000      1.9
+++ javax/swing/plaf/basic/BasicComboBoxRenderer.java   9 Jun 2006 14:08:39 
-0000       1.10
@@ -80,7 +80,19 @@
    */
   public Dimension getPreferredSize()
   {
+    if (this.getText() != null && ! this.getText().equals(""))
     return super.getPreferredSize();
+    else
+      {
+        // If the combo box option's text is empty or null, it won't size
+        // properly (ie, it'll be way too short)... so we throw in a dummy
+        // space to trick the superclass's sizing methods.
+        String oldText = this.getText();
+        this.setText(" ");
+        Dimension d = super.getPreferredSize();
+        this.setText(oldText);
+        return d;
+      }
   }
 
   /**