smalltalkObject conversion fixed (allow nil)
authorClaus Gittinger <cg@exept.de>
Thu, 14 Sep 2000 14:49:25 +0200
changeset 1406 7cd10ca1a425
parent 1405 c7775c10e8fd
child 1407 7b671df42e1a
smalltalkObject conversion fixed (allow nil)
TypeConverter.st
--- a/TypeConverter.st	Tue Sep 12 15:03:54 2000 +0200
+++ b/TypeConverter.st	Thu Sep 14 14:49:25 2000 +0200
@@ -12,6 +12,8 @@
 
 
 
+"{ Package: 'stx:libview2' }"
+
 PluggableAdaptor subclass:#TypeConverter
 	instanceVariableNames:''
 	classVariableNames:''
@@ -801,7 +803,7 @@
         getBlock:[:model | |v s|
                      v := model value.
                      v isNil ifTrue:[
-                        s := ''
+                        s := 'nil'
                      ] ifFalse:[
                             s := v storeString.
                             (v isString or:[v isNumber]) ifFalse:[
@@ -817,12 +819,11 @@
                     |value|
 
                     string size > 0 ifTrue:[
-                        value := Object readFrom:string onError:nil.
-                        value isNil ifTrue:[
-                            string size > 0 ifTrue:[
-                                value := string
-                            ]
-                        ].
+                        value := Object readFrom:string onError:[
+                                                                   string size > 0 ifTrue:[
+                                                                       value := string
+                                                                   ]
+                                                                ].
                     ].
                     model value:value
                 ]
@@ -965,5 +966,5 @@
 !TypeConverter class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/TypeConverter.st,v 1.32 2000-02-18 14:40:19 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/TypeConverter.st,v 1.33 2000-09-14 12:49:25 cg Exp $'
 ! !