diff org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/AbstractStringToNumberValidator.d @ 85:6be48cf9f95c

Work on databinding
author Frank Benoit <benoit@tionex.de>
date Sat, 18 Apr 2009 13:54:50 +0200
parents 383ce7bd736b
children 9e0ab372d5d8
line wrap: on
line diff
--- a/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/AbstractStringToNumberValidator.d	Sat Apr 18 09:25:29 2009 +0200
+++ b/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/validation/AbstractStringToNumberValidator.d	Sat Apr 18 13:54:50 2009 +0200
@@ -13,11 +13,11 @@
 import org.eclipse.core.internal.databinding.validation.NumberFormatConverter;
 
 import java.lang.all;
+import java.nonstandard.RuntimeTraits;
 
 import org.eclipse.core.databinding.validation.IValidator;
 import org.eclipse.core.databinding.validation.ValidationStatus;
 import org.eclipse.core.internal.databinding.conversion.StringToNumberParser;
-import org.eclipse.core.internal.databinding.conversion.StringToNumberParser.ParseResult;
 import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 
@@ -49,9 +49,9 @@
         this.min = min;
         this.max = max;
 
-        if (null !is cast(ClassInfo)converter.getToType()) {
-            ClassInfo clazz = cast(ClassInfo) converter.getToType();
-            toPrimitive = clazz.isPrimitive();
+        if (null !is cast(TypeInfo)converter.getToType()) {
+            TypeInfo clazz = cast(TypeInfo) converter.getToType();
+            toPrimitive = isJavaPrimitive(clazz);
         } else {
             toPrimitive = false;
         }
@@ -67,7 +67,7 @@
      * @see org.eclipse.core.databinding.validation.IValidator#validate(java.lang.Object)
      */
     public final IStatus validate(Object value) {
-        ParseResult result = StringToNumberParser.parse(value, converter
+        StringToNumberParser.ParseResult result = StringToNumberParser.parse(value, converter
                 .getNumberFormat(), toPrimitive);
 
         if (result.getNumber() !is null) {
@@ -82,7 +82,7 @@
             }
         } else if (result.getPosition() !is null) {
             String parseErrorMessage = StringToNumberParser.createParseErrorMessage(
-                    cast(String) value, result.getPosition());
+                    stringcast(value), result.getPosition());
 
             return ValidationStatus.error(parseErrorMessage);
         }