# HG changeset patch
# User Frank Benoit <benoit@tionex.de>
# Date 1236206762 -3600
# Node ID 6bf2837c50fe7d9a37336ecfe351f992098550e9
# Parent  4c0057e7193617e58b09c5876b5d747f5525dfa0
Created own class for Math

diff -r 4c0057e71936 -r 6bf2837c50fe java/src/java/lang/Math.d
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/java/src/java/lang/Math.d	Wed Mar 04 23:46:02 2009 +0100
@@ -0,0 +1,34 @@
+module java.lang.Math;
+
+static import tango.math.Math;
+
+class Math {
+    public const double PI = tango.math.Math.PI;
+    static double abs(double a){ return a > 0 ? a : -a; }
+    static float  abs(float  a){ return a > 0 ? a : -a; }
+    static int    abs(int    a){ return a > 0 ? a : -a; }
+    static long   abs(long   a){ return a > 0 ? a : -a; }
+    static double min(double a, double b){ return a < b ? a : b; }
+    static float  min(float  a, float  b){ return a < b ? a : b; }
+    static int    min(int    a, int    b){ return a < b ? a : b; }
+    static int    min(uint   a, int    b){ return a < b ? a : b; }
+    static int    min(int    a, uint   b){ return a < b ? a : b; }
+    static int    min(uint   a, uint   b){ return a < b ? a : b; }
+    static long   min(long   a, long   b){ return a < b ? a : b; }
+    static double max(double a, double b){ return a > b ? a : b; }
+    static float  max(float  a, float  b){ return a > b ? a : b; }
+    static int    max(int    a, int    b){ return a > b ? a : b; }
+    static int    max(uint   a, int    b){ return a > b ? a : b; }
+    static int    max(int    a, uint   b){ return a > b ? a : b; }
+    static int    max(uint   a, uint   b){ return a > b ? a : b; }
+    static long   max(long   a, long   b){ return a > b ? a : b; }
+    static long   round(double a) { return cast(long)tango.math.Math.round(a); }
+    static int    round(float a)  { return cast(int)tango.math.Math.round(a); }
+    static double sin(double a)  { return tango.math.Math.sin(a); }
+    static double ceil(double a) { return tango.math.Math.ceil(a); }
+    static double cos(double a)  { return tango.math.Math.cos(a); }
+    static double floor(double a) { return tango.math.Math.floor(a); }
+    static double rint(double a) { return tango.math.Math.rndint(a); }
+}
+
+
diff -r 4c0057e71936 -r 6bf2837c50fe java/src/java/lang/all.d
--- a/java/src/java/lang/all.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/java/src/java/lang/all.d	Wed Mar 04 23:46:02 2009 +0100
@@ -10,6 +10,7 @@
 public import java.lang.Double;
 public import java.lang.Runnable;
 public import java.lang.StringBuffer;
+public import java.lang.Math;
 
 public import java.lang.util;
 public import java.lang.exceptions;
diff -r 4c0057e71936 -r 6bf2837c50fe java/src/java/lang/util.d
--- a/java/src/java/lang/util.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/java/src/java/lang/util.d	Wed Mar 04 23:46:02 2009 +0100
@@ -7,12 +7,12 @@
 }
 
 alias char[] String;
-public import Math = tango.math.Math;
 
 public import tango.core.Exception : IllegalArgumentException, IOException;
 
 import tango.io.Stdout;
 import tango.io.stream.Format;
+static import tango.text.convert.Format;
 static import tango.stdc.stringz;
 static import tango.text.Util;
 static import tango.text.Text;
@@ -29,6 +29,7 @@
     return Log.lookup( "org.eclipse.swt" );
 }
 
+public alias tango.text.convert.Format.Format Format;
 alias ArrayBoundsException ArrayIndexOutOfBoundsException;
 
 abstract class ArrayWrapper{
diff -r 4c0057e71936 -r 6bf2837c50fe java/src/java/nonstandard/XmlTranscode.d
--- a/java/src/java/nonstandard/XmlTranscode.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/java/src/java/nonstandard/XmlTranscode.d	Wed Mar 04 23:46:02 2009 +0100
@@ -1,6 +1,7 @@
 module java.nonstandard.XmlTranscode;
 
 import java.lang.util;
+import java.lang.Math;
 import tango.core.Exception;
 
 /++
@@ -30,7 +31,7 @@
             if( src.length < 2 ) error();
 
             // search semi
-            int len = Math.min( src.length, 10 ); // limit semi search to possible longest entityname
+            int len = Math.min( cast(int)src.length, 10 ); // limit semi search to possible longest entityname
             int semi = tango.text.Util.locate( src[0 .. len ], ';' );
             if( semi is len ) error(); // no semi found
 
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/accessibility/AccessibleControlEvent.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/accessibility/AccessibleControlEvent.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/accessibility/AccessibleControlEvent.d	Wed Mar 04 23:46:02 2009 +0100
@@ -15,7 +15,6 @@
 import org.eclipse.swt.accessibility.Accessible;
 
 import org.eclipse.swt.internal.SWTEventObject;
-import tango.text.convert.Format;
 import java.lang.all;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/accessibility/AccessibleEvent.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/accessibility/AccessibleEvent.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/accessibility/AccessibleEvent.d	Wed Mar 04 23:46:02 2009 +0100
@@ -14,7 +14,6 @@
 
 
 import org.eclipse.swt.internal.SWTEventObject;
-import tango.text.convert.Format;
 import java.lang.all;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/accessibility/AccessibleTextEvent.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/accessibility/AccessibleTextEvent.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/accessibility/AccessibleTextEvent.d	Wed Mar 04 23:46:02 2009 +0100
@@ -14,7 +14,6 @@
 
 
 import org.eclipse.swt.internal.SWTEventObject;
-import tango.text.convert.Format;
 import java.lang.all;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/custom/CBanner.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/custom/CBanner.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/custom/CBanner.d	Wed Mar 04 23:46:02 2009 +0100
@@ -12,7 +12,7 @@
  *******************************************************************************/
 module org.eclipse.swt.custom.CBanner;
 
-
+import java.lang.all;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.SWTException;
@@ -29,7 +29,6 @@
 import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.custom.CBannerLayout;
 
-import Math = tango.math.Math;
 
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/custom/CBannerLayout.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/custom/CBannerLayout.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/custom/CBannerLayout.d	Wed Mar 04 23:46:02 2009 +0100
@@ -12,6 +12,7 @@
  *******************************************************************************/
 module org.eclipse.swt.custom.CBannerLayout;
 
+import java.lang.all;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Point;
@@ -23,7 +24,6 @@
 import org.eclipse.swt.custom.CBanner;
 import org.eclipse.swt.custom.CLayoutData;
 
-import Math = tango.math.Math;
 
 /**
  * This class provides the layout for CBanner
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/custom/ScrolledCompositeLayout.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/custom/ScrolledCompositeLayout.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/custom/ScrolledCompositeLayout.d	Wed Mar 04 23:46:02 2009 +0100
@@ -12,6 +12,7 @@
  *******************************************************************************/
 module org.eclipse.swt.custom.ScrolledCompositeLayout;
 
+import java.lang.all;
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Point;
@@ -22,7 +23,6 @@
 import org.eclipse.swt.widgets.ScrollBar;
 import org.eclipse.swt.custom.ScrolledComposite;
 
-import Math = tango.math.Math;
 
 /**
  * This class provides the layout for ScrolledComposite
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/KeyEvent.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/KeyEvent.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/KeyEvent.d	Wed Mar 04 23:46:02 2009 +0100
@@ -16,7 +16,6 @@
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.events.TypedEvent;
 
-import tango.text.convert.Format;
 import java.lang.all;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/MenuDetectEvent.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/MenuDetectEvent.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/MenuDetectEvent.d	Wed Mar 04 23:46:02 2009 +0100
@@ -16,7 +16,6 @@
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.events.TypedEvent;
 
-import tango.text.convert.Format;
 import java.lang.all;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/MouseEvent.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/MouseEvent.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/MouseEvent.d	Wed Mar 04 23:46:02 2009 +0100
@@ -16,7 +16,6 @@
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.events.TypedEvent;
 
-import tango.text.convert.Format;
 import java.lang.all;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/PaintEvent.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/PaintEvent.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/PaintEvent.d	Wed Mar 04 23:46:02 2009 +0100
@@ -18,7 +18,6 @@
 
 import org.eclipse.swt.events.TypedEvent;
 
-import tango.text.convert.Format;
 import java.lang.all;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/SelectionEvent.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/SelectionEvent.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/SelectionEvent.d	Wed Mar 04 23:46:02 2009 +0100
@@ -17,7 +17,6 @@
 import org.eclipse.swt.widgets.Widget;
 import org.eclipse.swt.events.TypedEvent;
 
-import tango.text.convert.Format;
 import java.lang.all;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/ShellEvent.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/ShellEvent.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/ShellEvent.d	Wed Mar 04 23:46:02 2009 +0100
@@ -16,7 +16,6 @@
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.events.TypedEvent;
 
-import tango.text.convert.Format;
 import java.lang.all;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/TraverseEvent.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/TraverseEvent.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/TraverseEvent.d	Wed Mar 04 23:46:02 2009 +0100
@@ -16,7 +16,6 @@
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.events.KeyEvent;
 
-import tango.text.convert.Format;
 import java.lang.all;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/TypedEvent.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/TypedEvent.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/TypedEvent.d	Wed Mar 04 23:46:02 2009 +0100
@@ -18,7 +18,6 @@
 import org.eclipse.swt.widgets.Widget;
 import org.eclipse.swt.internal.SWTEventObject;
 
-import tango.text.convert.Format;
 import tango.text.Util : split;
 import java.lang.all;
 
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/VerifyEvent.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/VerifyEvent.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/events/VerifyEvent.d	Wed Mar 04 23:46:02 2009 +0100
@@ -16,7 +16,6 @@
 import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.events.KeyEvent;
 
-import tango.text.convert.Format;
 import java.lang.all;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Color.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Color.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Color.d	Wed Mar 04 23:46:02 2009 +0100
@@ -20,7 +20,6 @@
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.graphics.Device;
 
-import tango.text.convert.Format;
 import java.lang.all;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Cursor.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Cursor.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Cursor.d	Wed Mar 04 23:46:02 2009 +0100
@@ -24,7 +24,6 @@
 import org.eclipse.swt.graphics.PaletteData;
 import org.eclipse.swt.graphics.Image;
 
-import tango.text.convert.Format;
 import java.lang.all;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Font.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Font.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Font.d	Wed Mar 04 23:46:02 2009 +0100
@@ -21,7 +21,6 @@
 import org.eclipse.swt.graphics.FontData;
 import org.eclipse.swt.graphics.Device;
 
-import tango.text.convert.Format;
 import java.lang.all;
 //import tango.stdc.stringz;
 
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/GC.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/GC.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/GC.d	Wed Mar 04 23:46:02 2009 +0100
@@ -39,7 +39,6 @@
 import org.eclipse.swt.graphics.LineAttributes;
 
 import java.lang.all;
-import tango.text.convert.Format;
 
 /**
  * Class <code>GC</code> is where all of the drawing capabilities that are
@@ -256,10 +255,10 @@
                 case SWT.LINE_DASHDOTDOT: dashStyle = Gdip.DashStyleDashDotDot; if (width is 0) dashes = LINE_DASHDOTDOT_ZERO; break;
                 case SWT.LINE_CUSTOM: {
                     if (data.lineDashes !is null) {
-                        dashOffset = data.lineDashesOffset / Math.max (1, width);
+                        dashOffset = data.lineDashesOffset / Math.max (1.0f, width);
                         dashes = new float[data.lineDashes.length * 2];
                         for (int i = 0; i < data.lineDashes.length; i++) {
-                            float dash = data.lineDashes[i] / Math.max (1, width);
+                            float dash = data.lineDashes[i] / Math.max (1.0f, width);
                             dashes[i] = dash;
                             dashes[i + data.lineDashes.length] = dash;
                         }
@@ -2139,7 +2138,7 @@
         if (!isTransparent) {
             Gdip.RectF bounds;
             Gdip.Graphics_MeasureString(gdipGraphics, buffer, length_, data.gdipFont, pt, format, bounds);
-            Gdip.Graphics_FillRectangle(gdipGraphics, data.gdipBrush, x, y, Math.rndint(bounds.Width), Math.rndint(bounds.Height));
+            Gdip.Graphics_FillRectangle(gdipGraphics, data.gdipBrush, x, y, cast(int)Math.rint(bounds.Width), cast(int)Math.rint(bounds.Height));
         }
         int gstate = 0;
         auto brush = getFgBrush();
@@ -2331,7 +2330,7 @@
         if ((flags & SWT.DRAW_TRANSPARENT) is 0) {
             Gdip.RectF bounds;
             Gdip.Graphics_MeasureString(gdipGraphics, buffer, length_, data.gdipFont, pt, format, bounds);
-            Gdip.Graphics_FillRectangle(gdipGraphics, data.gdipBrush, x, y, Math.rndint(bounds.Width), Math.rndint(bounds.Height));
+            Gdip.Graphics_FillRectangle(gdipGraphics, data.gdipBrush, x, y, cast(int)Math.rint(bounds.Width), cast(int)Math.rint(bounds.Height));
         }
         int gstate = 0;
         auto brush = getFgBrush();
@@ -4753,7 +4752,7 @@
         Gdip.StringFormat_SetFormatFlags(format, formatFlags);
         Gdip.Graphics_MeasureString(data.gdipGraphics, buffer, length_, data.gdipFont, pt, format, bounds);
         Gdip.StringFormat_delete(format);
-        return new Point(length_ is 0 ? 0 : Math.rndint(bounds.Width), Math.rndint(bounds.Height));
+        return new Point(length_ is 0 ? 0 : cast(int)Math.rint(bounds.Width), cast(int)Math.rint(bounds.Height));
     }
     SIZE size;
     if (length_ is 0) {
@@ -4844,7 +4843,7 @@
         Gdip.StringFormat_SetHotkeyPrefix(format, (flags & SWT.DRAW_MNEMONIC) !is 0 ? Gdip.HotkeyPrefixShow : Gdip.HotkeyPrefixNone);
         Gdip.Graphics_MeasureString(data.gdipGraphics, buffer, length_, data.gdipFont, pt, format, bounds);
         Gdip.StringFormat_delete(format);
-        return new Point(length_ is 0 ? 0 : Math.rndint(bounds.Width), Math.rndint(bounds.Height));
+        return new Point(length_ is 0 ? 0 : cast(int)Math.rint(bounds.Width), cast(int)Math.rint(bounds.Height));
     }
     if (string.length is 0) {
         SIZE size;
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/GlyphMetrics.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/GlyphMetrics.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/GlyphMetrics.d	Wed Mar 04 23:46:02 2009 +0100
@@ -13,7 +13,6 @@
 module org.eclipse.swt.graphics.GlyphMetrics;
 
 import org.eclipse.swt.SWT;
-import tango.text.convert.Format;
 import java.lang.all;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Image.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Image.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Image.d	Wed Mar 04 23:46:02 2009 +0100
@@ -33,7 +33,6 @@
 import java.io.InputStream;
 import java.lang.all;
 
-import tango.text.convert.Format;
 //import tango.stdc.string;
 //import tango.stdc.stringz;
 
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/ImageLoaderEvent.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/ImageLoaderEvent.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/ImageLoaderEvent.d	Wed Mar 04 23:46:02 2009 +0100
@@ -18,7 +18,6 @@
 public import org.eclipse.swt.graphics.ImageData;
 import java.lang.all;
 
-import tango.text.convert.Format;
 
 /**
  * Instances of this class are sent as a result of the incremental
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Path.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Path.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Path.d	Wed Mar 04 23:46:02 2009 +0100
@@ -28,7 +28,6 @@
 import org.eclipse.swt.graphics.PathData;
 
 import java.lang.System;
-import tango.text.convert.Format;
 import java.lang.all;
 
 /**
@@ -135,7 +134,7 @@
     super(device);
     if (path is null) SWT.error(SWT.ERROR_NULL_ARGUMENT);
     if (path.isDisposed()) SWT.error(SWT.ERROR_INVALID_ARGUMENT);
-    flatness = Math.max(0, flatness);
+    flatness = Math.max(0.0f, flatness);
     handle = Gdip.GraphicsPath_Clone(path.handle);
     if (flatness !is 0) Gdip.GraphicsPath_Flatten(handle, null, flatness);
     if (handle is null) SWT.error(SWT.ERROR_NO_HANDLES);
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Pattern.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Pattern.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Pattern.d	Wed Mar 04 23:46:02 2009 +0100
@@ -24,7 +24,6 @@
 import org.eclipse.swt.graphics.Device;
 import org.eclipse.swt.graphics.Image;
 
-import tango.text.convert.Format;
 import java.lang.all;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Point.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Point.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Point.d	Wed Mar 04 23:46:02 2009 +0100
@@ -15,7 +15,6 @@
 
 public import org.eclipse.swt.internal.SerializableCompatibility;
 
-import tango.text.convert.Format;
 import java.lang.all;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/RGB.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/RGB.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/RGB.d	Wed Mar 04 23:46:02 2009 +0100
@@ -15,8 +15,6 @@
 public import org.eclipse.swt.internal.SerializableCompatibility;
 
 import org.eclipse.swt.SWT;
-import Math = tango.math.Math : min, max;
-import tango.text.convert.Format;
 import java.lang.all;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Rectangle.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Rectangle.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Rectangle.d	Wed Mar 04 23:46:02 2009 +0100
@@ -17,7 +17,6 @@
 
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.SWTError;
-import tango.text.convert.Format;
 import java.lang.all;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Region.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Region.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Region.d	Wed Mar 04 23:46:02 2009 +0100
@@ -23,7 +23,6 @@
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.graphics.Device;
 
-import tango.text.convert.Format;
 import java.lang.all;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/TextLayout.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/TextLayout.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/TextLayout.d	Wed Mar 04 23:46:02 2009 +0100
@@ -45,7 +45,6 @@
 import org.eclipse.swt.graphics.Resource;
 import org.eclipse.swt.graphics.TextStyle;
 
-import tango.text.convert.Format;
 import Utf = tango.text.convert.Utf;
 import java.lang.all;
 import java.lang.System;
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Transform.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Transform.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/graphics/Transform.d	Wed Mar 04 23:46:02 2009 +0100
@@ -20,7 +20,6 @@
 import org.eclipse.swt.graphics.Resource;
 import org.eclipse.swt.graphics.Device;
 
-import tango.text.convert.Format;
 import java.lang.all;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/Compatibility.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/Compatibility.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/Compatibility.d	Wed Mar 04 23:46:02 2009 +0100
@@ -24,13 +24,11 @@
 public import java.io.FileInputStream;
 public import java.io.FileOutputStream;
 
-import Math = tango.math.Math;
 import Unicode = tango.text.Unicode;
 import tango.sys.Process;
 import java.lang.all;
 import java.util.ResourceBundle;
 import tango.io.Path;
-import tango.text.convert.Format;
 
 /**
  * This class is a placeholder for utility methods commonly
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/image/JPEGDecoder.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/image/JPEGDecoder.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/image/JPEGDecoder.d	Wed Mar 04 23:46:02 2009 +0100
@@ -24,7 +24,6 @@
 
 import tango.core.Exception;
 import tango.util.Convert;
-import Math = tango.math.Math;
 
 public class JPEGDecoder {
 
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/image/PngChunk.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/image/PngChunk.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/image/PngChunk.d	Wed Mar 04 23:46:02 2009 +0100
@@ -24,7 +24,6 @@
 import java.lang.all;
 
 import tango.core.Exception;
-import tango.text.convert.Format;
 
 class PngChunk {
     byte[] reference;
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/image/PngIhdrChunk.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/image/PngIhdrChunk.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/image/PngIhdrChunk.d	Wed Mar 04 23:46:02 2009 +0100
@@ -14,14 +14,12 @@
 
 import java.lang.all;
 
-
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.PaletteData;
 import org.eclipse.swt.graphics.RGB;
 import org.eclipse.swt.internal.image.PngFileReadState;
 import org.eclipse.swt.internal.image.PngIhdrChunk;
 import org.eclipse.swt.internal.image.PngChunk;
-import tango.text.convert.Format;
 
 class PngIhdrChunk : PngChunk {
     static const int IHDR_DATA_LENGTH = 13;
@@ -350,7 +348,7 @@
             return 24;
         case COLOR_TYPE_GRAYSCALE:
         case COLOR_TYPE_PALETTE:
-            return Math.min(bitDepth, 8);
+            return Math.min(cast(int)bitDepth, 8);
         default:
             SWT.error(SWT.ERROR_INVALID_IMAGE);
             return 0;
@@ -375,7 +373,7 @@
 }
 
 PaletteData createGrayscalePalette() {
-    int depth = Math.min(bitDepth, 8);
+    int depth = Math.min(cast(int)bitDepth, 8);
     int max = (1 << depth) - 1;
     int delta = 255 / max;
     int gray = 0;
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/image/PngInputStream.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/image/PngInputStream.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/image/PngInputStream.d	Wed Mar 04 23:46:02 2009 +0100
@@ -19,7 +19,7 @@
 import org.eclipse.swt.internal.image.PngChunk;
 
 import tango.core.Exception;
-import Math = tango.math.Math;
+import java.lang.all;
 
 public class PngInputStream : InputStream {
 
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/image/PngPlteChunk.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/image/PngPlteChunk.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/image/PngPlteChunk.d	Wed Mar 04 23:46:02 2009 +0100
@@ -22,7 +22,6 @@
 import org.eclipse.swt.internal.image.PngFileReadState;
 import org.eclipse.swt.internal.image.PngIhdrChunk;
 
-import tango.text.convert.Format;
 
 class PngPlteChunk : PngChunk {
 
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/image/TIFFFileFormat.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/image/TIFFFileFormat.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/image/TIFFFileFormat.d	Wed Mar 04 23:46:02 2009 +0100
@@ -19,6 +19,7 @@
 import org.eclipse.swt.graphics.ImageLoader;
 import org.eclipse.swt.internal.image.FileFormat;
 
+import java.lang.all;
 import tango.core.Exception;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/image/TIFFRandomFileAccess.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/image/TIFFRandomFileAccess.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/internal/image/TIFFRandomFileAccess.d	Wed Mar 04 23:46:02 2009 +0100
@@ -13,9 +13,8 @@
 module org.eclipse.swt.internal.image.TIFFRandomFileAccess;
 
 import org.eclipse.swt.internal.image.LEDataInputStream;
-import Math = tango.math.Math;
 import tango.core.Exception;
-import java.lang.System;
+import java.lang.all;
 
 final class TIFFRandomFileAccess {
 
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/layout/FormAttachment.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/layout/FormAttachment.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/layout/FormAttachment.d	Wed Mar 04 23:46:02 2009 +0100
@@ -17,7 +17,6 @@
 import org.eclipse.swt.layout.FormLayout;
 import org.eclipse.swt.layout.FormData;
 
-import tango.text.convert.Format;
 import java.lang.all;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/layout/FormLayout.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/layout/FormLayout.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/layout/FormLayout.d	Wed Mar 04 23:46:02 2009 +0100
@@ -23,7 +23,6 @@
 import org.eclipse.swt.widgets.Scrollable;
 
 import tango.util.Convert;
-import Math = tango.math.Math;
 import java.lang.all;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/layout/GridLayout.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/layout/GridLayout.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/layout/GridLayout.d	Wed Mar 04 23:46:02 2009 +0100
@@ -24,7 +24,6 @@
 import java.lang.System;
 
 import tango.util.Convert;
-import Math = tango.math.Math;
 import java.lang.all;
 
 
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/layout/RowLayout.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/layout/RowLayout.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/layout/RowLayout.d	Wed Mar 04 23:46:02 2009 +0100
@@ -20,7 +20,6 @@
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.layout.RowData;
 import tango.util.Convert;
-import Math = tango.math.Math;
 import java.lang.all;
 
 
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/ole/win32/Variant.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/ole/win32/Variant.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/ole/win32/Variant.d	Wed Mar 04 23:46:02 2009 +0100
@@ -24,7 +24,6 @@
 import org.eclipse.swt.ole.win32.OLE;
 
 import tango.util.Convert;
-import tango.text.convert.Format;
 import java.lang.all;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/printing/PrinterData.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/printing/PrinterData.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/printing/PrinterData.d	Wed Mar 04 23:46:02 2009 +0100
@@ -15,7 +15,6 @@
 
 import org.eclipse.swt.graphics.DeviceData;
 
-import tango.text.convert.Format;
 import java.lang.all;
 
 /**
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/widgets/DateTime.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/widgets/DateTime.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/widgets/DateTime.d	Wed Mar 04 23:46:02 2009 +0100
@@ -25,7 +25,6 @@
 import java.lang.all;
 
 import Integer = tango.text.convert.Integer;
-import tango.text.convert.Format;
 
 //TODO - features not yet implemented: read-only, drop-down calendar for date
 //TODO - font, colors, background image not yet implemented (works on some platforms)
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/widgets/Event.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/widgets/Event.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/widgets/Event.d	Wed Mar 04 23:46:02 2009 +0100
@@ -18,7 +18,6 @@
 import org.eclipse.swt.widgets.Widget;
 import org.eclipse.swt.widgets.Display;
 
-import tango.text.convert.Format;
 import java.lang.all;
 
 
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/widgets/ToolBar.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/widgets/ToolBar.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/widgets/ToolBar.d	Wed Mar 04 23:46:02 2009 +0100
@@ -233,7 +233,7 @@
                 info.cbSize = TBBUTTONINFO.sizeof;
                 info.dwMask = OS.TBIF_SIZE;
                 OS.SendMessage (handle, OS.TB_GETBUTTONINFO, lpButton.idCommand, &info);
-                width = Math.max (width, info.cx);
+                width = Math.max (width, cast(int)info.cx);
             } else {
                 width = Math.max (width, rect.right);
             }
diff -r 4c0057e71936 -r 6bf2837c50fe org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/widgets/Widget.d
--- a/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/widgets/Widget.d	Wed Mar 04 22:35:46 2009 +0100
+++ b/org.eclipse.swt.win32.win32.x86/src/org/eclipse/swt/widgets/Widget.d	Wed Mar 04 23:46:02 2009 +0100
@@ -26,7 +26,6 @@
 import org.eclipse.swt.widgets.Menu;
 import org.eclipse.swt.widgets.TypedListener;
 
-import tango.text.convert.Format;
 import tango.io.Stdout;
 import tango.core.Thread;
 import java.lang.all;