Changeset 197:184ab53b7785

Timestamp:

04/10/08 05:19:49 (6 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

Changes and fixes for jface

Files:

• dwt/custom/BusyIndicator.d (modified) (1 diff)
• dwt/custom/CTabFolder.d (modified) (1 diff)
• dwt/custom/StyledText.d (modified) (2 diffs)
• dwt/dnd/HTMLTransfer.d (modified) (1 diff)
• dwt/dnd/RTFTransfer.d (modified) (1 diff)
• dwt/dnd/TextTransfer.d (modified) (1 diff)
• dwt/dnd/URLTransfer.d (modified) (1 diff)
• dwt/dwthelper/BufferedInputStream.d (modified) (1 diff)
• dwt/dwthelper/Float.d (deleted)
• dwt/dwthelper/Integer.d (deleted)
• dwt/dwthelper/ResourceBundle.d (modified) (5 diffs)
• dwt/dwthelper/System.d (modified) (1 diff)
• dwt/dwthelper/utils.d (modified) (12 diffs)
• dwt/graphics/Color.d (modified) (4 diffs)
• dwt/graphics/Cursor.d (modified) (1 diff)
• dwt/graphics/Device.d (modified) (2 diffs)
• dwt/graphics/Font.d (modified) (5 diffs)
• dwt/graphics/FontData.d (modified) (1 diff)
• dwt/graphics/GC.d (modified) (5 diffs)
• dwt/graphics/Image.d (modified) (14 diffs)
• dwt/internal/BidiUtil.d (modified) (1 diff)
• dwt/internal/DWTEventObject.d (modified) (3 diffs)
• dwt/internal/image/TIFFDirectory.d (modified) (1 diff)
• dwt/layout/GridLayout.d (modified) (1 diff)
• dwt/program/Program.d (modified) (1 diff)
• dwt/widgets/Display.d (modified) (2 diffs)
• dwt/widgets/Spinner.d (modified) (1 diff)

dwt/custom/BusyIndicator.d

@@ -19 +19 @@
-import dwt.widgets.Display;
-import dwt.widgets.Shell;
-Integer
+utils
-import dwt.dwthelper.Runnable;
-

dwt/custom/CTabFolder.d

@@ -50 +50 @@
-
-import dwt.dwthelper.utils;
-import dwt.dwthelper.Integer;
-import tango.util.Convert;
-static import tango.text.convert.Utf;

dwt/custom/StyledText.d

@@ -466 +466 @@
-        }
-    }
-
+_
-        Rectangle trim = printer.computeTrim(0, 0, 0, 0);
-        Point dpi = printer.getDPI();
@@ -695 +695 @@
-        }
-        if (printer.startJob(jobName)) {
-
+_
-            print();
-            dispose();

dwt/dnd/HTMLTransfer.d

@@ -21 +21 @@
-import dwt.dnd.DND;
-
-import dwt.dwthelper.Integer;
-import dwt.dwthelper.utils;
-static import tango.text.Text;

dwt/dnd/RTFTransfer.d

@@ -21 +21 @@
-import dwt.dnd.DND;
-
-import dwt.dwthelper.Integer;
-import dwt.dwthelper.utils;
-static import tango.text.Text;

dwt/dnd/TextTransfer.d

@@ -21 +21 @@
-import dwt.dnd.DND;
-
-import dwt.dwthelper.Integer;
-import dwt.dwthelper.utils;
-static import tango.text.Text;

dwt/dnd/URLTransfer.d

@@ -23 +23 @@
-import dwt.dnd.DND;
-
-import dwt.dwthelper.Integer;
-import dwt.dwthelper.utils;
-static import tango.text.Text;

dwt/dwthelper/BufferedInputStream.d

@@ -51 +51 @@
-        pos = 0;
-        count = 0;
-int 
+
-        if( count < 0 ){
-            count = 0;

dwt/dwthelper/ResourceBundle.d

@@ -7 +7 @@
-import tango.io.Stdout;
-
+import dwt.DWT;
+import dwt.dwthelper.utils;
-
-class ResourceBundle {
@@ -35 +37 @@
-            //tango.io.Stdout.Stdout.formatln( "properties put {} startline", __LINE__ );
-            readLine();
-line.trim(
+dwt.dwthelper.utils.trim(line
-            if( line.length is 0 ){
-                //tango.io.Stdout.Stdout.formatln( "properties put {} was 0 length", __LINE__ );
@@ -62 +64 @@
-                    case 'n': c = '\n'; break;
-                    case '\\': c = '\\'; break;
+                    case '\"': c = '\"'; break;
-                    default: break;
-                    }
@@ -90 +93 @@
-            }
-            if( iskeypart ){
-
+
+
-                continue;
-            }
-key.trim(
-value.trim(
+dwt.dwthelper.utils.trim(key
+dwt.dwthelper.utils.trim(value
-            //tango.io.Stdout.Stdout.formatln( "properties put {}=>{}", key, value );
-
@@ -110 +114 @@
-            return (*v).dup;
-        }
-
+
+
+
+
+
-    }
-

dwt/dwthelper/System.d

@@ -129 +129 @@
-        .exit(code);
-    }
+    public static int identityHashCode(Object x){
+        if( x is null ){
+            return 0;
+        }
+        return (*cast(Object *)&x).toHash();
+    }
-
+    public static char[] getProperty( char[] key ){
+        switch( key ){
+        case "os.name": return "windows";
+        default: return null;
+        }
+    }
-}
-

dwt/dwthelper/utils.d

@@ -10 +10 @@
-
-import tango.io.Stdout;
+import tango.io.Print;
-import tango.stdc.stringz;
-static import tango.text.Util;
+static import tango.text.Text;
-import tango.text.Unicode;
-import tango.text.convert.Utf;
@@ -18 +20 @@
-
-import tango.util.log.Trace;
+import tango.text.UnicodeData;
+static import tango.util.collection.model.Seq;
+// static import tango.util.collection.ArraySeq;
+// static import tango.util.collection.LinkSeq;
+// static import tango.util.collection.model.Map;
+// static import tango.util.collection.HashMap;
+//
+// alias tango.util.collection.model.Seq.Seq!(Object) List;
+// alias tango.util.collection.ArraySeq.ArraySeq!(Object) ArrayList;
+// alias tango.util.collection.LinkSeq.LinkSeq!(Object) LinkList;
+// alias tango.util.collection.model.Map.Map!(Object,Object) Map;
+// alias tango.util.collection.HashMap.HashMap!(Object,Object) HashMap;
+
+alias char[] String;
+alias tango.text.Text.Text!(char) StringBuffer;
-
-void implMissing( char[] file, uint line ){
@@ -42 +59 @@
-        value = data;
-    }
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-alias ArrayWrapperT!(byte)    ArrayWrapperByte;
-alias ArrayWrapperT!(int)     ArrayWrapperInt;
@@ -53 +310 @@
-alias ArrayWrapperT!(char[])  ArrayWrapperString2;
-
+Object[] StringArrayToObjectArray( String[] strs ){
+    Object[] res = new Object[strs.length];
+    foreach( idx, str; strs ){
+        res[idx] = new ArrayWrapperString(str);
+    }
+    return res;
+}
-int codepointIndexToIndex( char[] str, int cpIndex ){
-    int cps = cpIndex;
@@ -204 +468 @@
-}
-
+bool CharacterIsDefined( dchar ch ){
+    return (ch in tango.text.UnicodeData.unicodeData) !is null;
+}
-dchar CharacterFirstToLower( char[] str ){
-    int consumed;
@@ -229 +496 @@
-    return tango.text.Unicode.isDigit( c );
-}
+bool CharacterIsLetter( dchar c ){
+    return tango.text.Unicode.isLetter( c );
+}
+public char[] toUpperCase( char[] str ){
+    return tango.text.Unicode.toUpper( str );
+}
-
-public int indexOf( char[] str, char searched ){
@@ -260 +533 @@
-    return res;
-}
+public int lastIndexOf(char[] str, char[] ch ){
+    return lastIndexOf( str, ch, str.length );
+}
+public int lastIndexOf(char[] str, char[] ch, int start ){
+    int res = tango.text.Util.locatePatternPrior( str, ch, start );
+    if( res is str.length ) res = -1;
+    return res;
+}
-
-public char[] replace( char[] str, char from, char to ){
@@ -314 +595 @@
-    return src[ 0 .. pattern.length ] == pattern;
-}
+
-public char[] toLowerCase( char[] src ){
-    return tango.text.Unicode.toLower( src );
@@ -324 +606 @@
-public char[] trim( char[] str ){
-    return tango.text.Util.trim( str ).dup;
+}
+public char[] intern( char[] str ){
+    return str;
-}
-
@@ -347 +632 @@
-}
-
+class RuntimeException : Exception {
+    this( char[] e = null){
+        super(e);
+    }
+    this( Exception e ){
+        super(e.toString);
+    }
+}
+class IndexOutOfBoundsException : Exception {
+    this( char[] e = null){
+        super(e);
+    }
+}
+
+class UnsupportedOperationException : RuntimeException {
+    this( char[] e = null){
+        super(e);
+    }
+    this( Exception e ){
+        super(e.toString);
+    }
+}
-class NumberFormatException : IllegalArgumentException {
-    this( char[] e ){
@@ -353 +660 @@
-    this( Exception e ){
-        super(e.toString);
+    }
+}
+class NullPointerException : Exception {
+    this( char[] e = null ){
+        super(e);
+    }
+    this( Exception e ){
+        super(e.toString);
+    }
+}
+class IllegalStateException : Exception {
+    this( char[] e = null ){
+        super(e);
+    }
+    this( Exception e ){
+        super(e.toString);
+    }
+}
+class InterruptedException : Exception {
+    this( char[] e = null ){
+        super(e);
+    }
+    this( Exception e ){
+        super(e.toString);
+    }
+}
+class InvocationTargetException : Exception {
+    Exception cause;
+    this( Exception e = null, char[] msg = null ){
+        super(msg);
+        cause = e;
+    }
+
+    alias getCause getTargetException;
+    Exception getCause(){
+        return cause;
+    }
+}
+class MissingResourceException : Exception {
+    char[] classname;
+    char[] key;
+    this( char[] msg, char[] classname, char[] key ){
+        super(msg);
+        this.classname = classname;
+        this.key = key;
+    }
+}
+class ParseException : Exception {
+    this( char[] e = null ){
+        super(e);
+    }
+}
+
+interface Cloneable{
+}
+
+interface Comparable {
+    int compareTo(Object o);
+}
+interface Comparator {
+    int compare(Object o1, Object o2);
+}
+interface EventListener{
+}
+
+class EventObject {
+    protected Object source;
+
+    public this(Object source) {
+        if (source is null)
+        throw new IllegalArgumentException( "null arg" );
+        this.source = source;
+    }
+
+    public Object getSource() {
+        return source;
+    }
+
+    public override char[] toString() {
+        return this.classinfo.name ~ "[source=" ~ source.toString() ~ "]";
-    }
-}
@@ -371 +758 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

dwt/graphics/Color.d

@@ -12 +12 @@
- *******************************************************************************/
-module dwt.graphics.Color;
-
-
-import dwt.DWT;
@@ -86 +85 @@
-    if (device is null) device = Device.getDevice();
-    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-
+_
-    if (device.tracking) device.new_Object(this);
-}
@@ -116 +115 @@
-    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-    if (rgb is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-
+_
-    if (device.tracking) device.new_Object(this);
-}
@@ -250 +249 @@
- * @see #dispose
- */
-
+_
-    if (red > 255 || red < 0 || green > 255 || green < 0 || blue > 255 || blue < 0) {
-        DWT.error(DWT.ERROR_INVALID_ARGUMENT);

dwt/graphics/Cursor.d

@@ -348 +348 @@
-    }
-    ImageData mask = source.getTransparencyMask();
-
+_
-    auto hBitmap = cast(HBITMAP)result[0];
-    auto hMask = cast(HBITMAP)result[1];

dwt/graphics/Device.d

@@ -143 +143 @@
-        }
-        create (data);
-
+_
-        if (tracking) {
-            errors = new Exception [128];
@@ -656 +656 @@
- * @see #create
- */
-
+_
-    if (debug_) {
-        static if (!OS.IsWinCE) OS.GdiSetBatchLimit(1);

dwt/graphics/Font.d

@@ -81 +81 @@
-    if (device is null) device = Device.getDevice();
-    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-
+_
-    if (device.tracking) device.new_Object(this);
-}
@@ -116 +116 @@
-        if (fds[i] is null) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
-    }
-
+_
-    if (device.tracking) device.new_Object(this);
-}
@@ -146 +146 @@
-    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-    if (name is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-
+_
-    if (device.tracking) device.new_Object(this);
-}
@@ -154 +154 @@
-    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-    if (name is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-
+_
-    if (device.tracking) device.new_Object(this);
-}
@@ -223 +223 @@
-}
-
-
+_
-    if (fd is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-    this.device = device;

dwt/graphics/FontData.d

@@ -18 +18 @@
-
-import dwt.dwthelper.utils;
-import dwt.dwthelper.Float;
-import dwt.dwthelper.Integer;
-static import tango.text.Text;
-import tango.util.Convert;

dwt/graphics/GC.d

@@ -12 +12 @@
- *******************************************************************************/
-module dwt.graphics.GC;
-
-
-
-/+
-//PORTING_TYPE
-class GC{
-    void dispose();
-    bool isDisposed();
-    void flush ();
-    GCData data;
-    HDC handle;
-public void drawImage(Image image, int x, int y) ;
-public void drawImage(Image image, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight) ;
-void drawImage(Image srcImage, int srcX, int srcY, int srcWidth, int srcHeight, int destX, int destY, int destWidth, int destHeight, bool simple) ;
-}
-+/
-
-import dwt.DWT;
@@ -197 +181 @@
-    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-    this.device = data.device = device;
-
+_
-    if (device.tracking) device.new_Object(this);
-}
@@ -3700 +3684 @@
-}
-
-
+_
-    auto foreground = data.foreground;
-    if (foreground !is -1) {
@@ -4871 +4855 @@
-    auto hDC = drawable.internal_new_GC(data);
-    gc.device = data.device;
-
+_
-    return gc;
-}
@@ -4893 +4877 @@
-    GC gc = new GC();
-    gc.device = data.device;
-
+_
-    return gc;
-}

dwt/graphics/Image.d

@@ -193 +193 @@
-    if (device is null) device = Device.getDevice();
-    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-
+_
-    if (device.tracking) device.new_Object(this);
-}
@@ -270 +270 @@
-                case DWT.ICON:
-                    static if (OS.IsWinCE) {
-
+_
-                    } else {
-                        handle = OS.CopyImage(srcImage.handle, OS.IMAGE_ICON, rect.width, rect.height, 0);
@@ -338 +338 @@
-                }
-            }
-
+_
-            if (device.tracking) device.new_Object(this);
-            return;
@@ -403 +403 @@
-                }
-            }
-
+_
-            if (device.tracking) device.new_Object(this);
-            return;
@@ -446 +446 @@
-    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-    if (bounds is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-
+_
-    if (device.tracking) device.new_Object(this);
-}
@@ -471 +471 @@
-    if (device is null) device = Device.getDevice();
-    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-
+_
-    if (device.tracking) device.new_Object(this);
-}
@@ -509 +509 @@
-    }
-    mask = ImageData.convertMask(mask);
-
+_
-    if (device.tracking) device.new_Object(this);
-}
@@ -564 +564 @@
-    if (device is null) device = Device.getDevice();
-    if (device is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
-
+_
-    if (device.tracking) device.new_Object(this);
-}
@@ -742 +742 @@
-                  &nbs