--- a/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToNumberConverter.d	Sat Apr 18 09:25:29 2009 +0200
+++ b/org.eclipse.core.databinding/src/org/eclipse/core/internal/databinding/conversion/NumberToNumberConverter.d	Sat Apr 18 13:54:50 2009 +0200
@@ -13,6 +13,7 @@
 import org.eclipse.core.internal.databinding.conversion.StringToNumberParser;
 
 import java.lang.all;
+import java.nonstandard.RuntimeTraits;
 
 import org.eclipse.core.databinding.conversion.Converter;
 
@@ -34,10 +35,10 @@
     private String outOfRangeMessage;
 
     protected this(NumberFormat numberFormat,
-            ClassInfo fromType, ClassInfo toType) {
+            TypeInfo fromType, TypeInfo toType) {
         super(fromType, toType);
         this.numberFormat = numberFormat;
-        this.primitive = toType.isPrimitive();
+        this.primitive = isJavaPrimitive(toType);
     }
 
     /*
@@ -45,7 +46,8 @@
      * 
      * @see org.eclipse.core.databinding.conversion.IConverter#convert(java.lang.Object)
      */
-    public final Object convert(Object fromObject) {
+    // DWT not final, need to override to reimplement interface IConvert
+    public /+final+/ Object convert(Object fromObject) {
         if (fromObject is null) {
             if (primitive) {
                 throw new IllegalArgumentException(
@@ -70,8 +72,8 @@
         synchronized (this) {
             if (outOfRangeMessage is null) {
                 outOfRangeMessage = StringToNumberParser
-                        .createOutOfRangeMessage(new Shortcast(Short.MIN_VALUE),
-                                new Shortcast(Short.MAX_VALUE), numberFormat);
+                        .createOutOfRangeMessage(new Short(Short.MIN_VALUE),
+                                new Short(Short.MAX_VALUE), numberFormat);
             }
 
             throw new IllegalArgumentException(outOfRangeMessage);