This fixes the MaskFormatter regression.

2006-02-28  Lillian Angel  <[EMAIL PROTECTED]>

        * javax/swing/text/DefaultFormatter.java
        (stringToValue): Added NPE check.

Index: javax/swing/text/DefaultFormatter.java
===================================================================
RCS file: /sources/classpath/classpath/javax/swing/text/DefaultFormatter.java,v
retrieving revision 1.7
diff -u -r1.7 DefaultFormatter.java
--- javax/swing/text/DefaultFormatter.java	20 Jan 2006 12:06:24 -0000	1.7
+++ javax/swing/text/DefaultFormatter.java	28 Feb 2006 20:25:17 -0000
@@ -367,7 +367,11 @@
     Object value = string;
     Class valueClass = getValueClass();
     if (valueClass == null)
-      valueClass = getFormattedTextField().getValue().getClass();
+      {
+        JFormattedTextField jft = getFormattedTextField();
+        if (jft != null)
+          valueClass = jft.getValue().getClass();
+      }
     if (valueClass != null)
       try
         {

Reply via email to