--- a/TypeConverter.st	Mon Nov 03 14:21:07 2008 +0100
+++ b/TypeConverter.st	Mon Nov 03 14:22:48 2008 +0100
@@ -310,7 +310,7 @@
 
                 |value s|
 
-                string isEmpty ifTrue:[
+                string isEmptyOrNil ifTrue:[
                     value := nil
                 ] ifFalse:[
                     s := string withoutSeparators.
@@ -362,7 +362,7 @@
 
                 |value s|
 
-                string isEmpty ifTrue:[
+                string isEmptyOrNil ifTrue:[
                     value := nil
                 ] ifFalse:[
                     s := string withoutSeparators.
@@ -534,7 +534,7 @@
 
                 |value|
 
-                string isEmpty ifTrue:[
+                string isEmptyOrNil ifTrue:[
                     value := defaultValue
                 ] ifFalse:[
                     stxFormat isNil ifTrue:[
@@ -591,7 +591,7 @@
 
                 |value|
 
-                string isEmpty ifTrue:[
+                string isEmptyOrNil ifTrue:[
                     value := 0
                 ] ifFalse:[     
                     value := Integer readFrom: string radix:16 onError:[0]
@@ -599,8 +599,6 @@
                 model value:value]
 
         updateBlock: [:m :a :p | true]
-
-   
 !
 
 integerToHexTextMinValue:minVal maxValue:maxVal format:formatStringOrNil
@@ -644,7 +642,7 @@
 
                 |value c|
 
-                string isEmpty ifTrue:[
+                string isEmptyOrNil ifTrue:[
                     value := 0
                 ] ifFalse:[
                     value := Integer readFromString:string radix:radix onError:[0]. 
@@ -806,7 +804,7 @@
 
                 |value c|
 
-                (string isEmpty or:[string isBlank]) ifTrue:[
+                (string isEmptyOrNil or:[string isBlank]) ifTrue:[
                     value := nil
                 ] ifFalse:[
                     value := Number readFromString:string onError:[nil]. 
@@ -885,7 +883,7 @@
 
                 |value s|
 
-                string isEmpty ifTrue:[
+                string isEmptyOrNil ifTrue:[
                     value := nil
                 ] ifFalse:[
                     value := Number readFrom:string onError:nil.
@@ -935,7 +933,7 @@
 
                 |value s|
 
-                string isEmpty ifTrue:[
+                string isEmptyOrNil ifTrue:[
                     value := nil
                 ] ifFalse:[
                     value := Number readFrom:string onError:nil.
@@ -977,7 +975,7 @@
 
                 |value|
 
-                string isEmpty ifTrue:[
+                string isEmptyOrNil ifTrue:[
                     value := 0
                 ] ifFalse:[
                     value := Number readFromString: string onError:[0]
@@ -1009,7 +1007,7 @@
 
                 |value|
 
-                string isEmpty ifTrue:[
+                string isEmptyOrNil ifTrue:[
                     value := 0
                 ] ifFalse:[     
                     value := Number readFromString:string onError:[0]
@@ -1044,7 +1042,7 @@
 
                 |value|
 
-                string isEmpty ifTrue:[
+                string isEmptyOrNil ifTrue:[
                     value := 0
                 ] ifFalse:[          
                     value := Number readFromString: string onError:[0]. "asNumberFromFormatString:formatString"
@@ -1077,7 +1075,7 @@
 
                 |value|
 
-                string isEmpty ifTrue:[
+                string isEmptyOrNil ifTrue:[
                     value := 0
                 ] ifFalse:[          
                     value := Number readFromString: string onError:[0]. "asNumberFromFormatString:formatString"
@@ -1119,7 +1117,7 @@
 
                 |value c|
 
-                string isEmpty ifTrue:[
+                string isEmptyOrNil ifTrue:[
                     value := 0
                 ] ifFalse:[
                     value := Number readFromString: string onError:[0]. 
@@ -1158,7 +1156,7 @@
 
                 |value|
 
-                string isEmpty ifTrue:[
+                string isEmptyOrNil ifTrue:[
                     value := nil
                 ] ifFalse:[
                     value := timeOrDateClass readFrom:string onError:nil
@@ -1415,7 +1413,7 @@
 
                 |value|
 
-                string isEmpty ifTrue:[
+                string isEmptyOrNil ifTrue:[
                     value := defaultValue
                 ] ifFalse:[
 "/                    aFormatString isNil ifTrue:[
@@ -1471,7 +1469,7 @@
 
                 |value|
 
-                string isEmpty ifTrue:[
+                string isEmptyOrNil ifTrue:[
                     value := Time now
                 ] ifFalse:[              
                     value := Time readFrom:string onError:[Time now]
@@ -1501,5 +1499,5 @@
 !TypeConverter class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/TypeConverter.st,v 1.56 2008-11-03 13:21:07 sr Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/TypeConverter.st,v 1.57 2008-11-03 13:22:48 sr Exp $'
 ! !