diff options
| author | Mark Wielaard <mark@klomp.org> | 2006-03-05 11:38:08 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2006-03-05 11:38:08 +0000 |
| commit | 151c7439c5d7ca440f17b408ea9e2b750cd42543 (patch) | |
| tree | e6eb1ec4bfeaa33e1a3936edd8c9b5d2dd862dfd /javax/swing/text/DefaultFormatter.java | |
| parent | cb35a91377f1dc2d7b1b5bc4c70ab91cbb36506f (diff) | |
| download | classpath-151c7439c5d7ca440f17b408ea9e2b750cd42543.tar.gz | |
* configure.ac (VERSION): Set to 0.90-pre-generics.
* Merge with CVS trunk from classpath-0_90-branch-point.
Diffstat (limited to 'javax/swing/text/DefaultFormatter.java')
| -rw-r--r-- | javax/swing/text/DefaultFormatter.java | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/javax/swing/text/DefaultFormatter.java b/javax/swing/text/DefaultFormatter.java index ec8969615..19994e21b 100644 --- a/javax/swing/text/DefaultFormatter.java +++ b/javax/swing/text/DefaultFormatter.java @@ -367,7 +367,11 @@ public class DefaultFormatter extends JFormattedTextField.AbstractFormatter 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 { |