Changeset 239:43b41c7fe84a

Timestamp:

06/20/08 10:27:36 (3 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

work on allow null strings and arrays

Files:

• dwt/graphics/GC.d (modified) (15 diffs)
• dwt/program/Program.d (modified) (1 diff)
• dwt/widgets/Button.d (modified) (3 diffs)
• dwt/widgets/Combo.d (modified) (16 diffs)
• dwt/widgets/CoolBar.d (modified) (3 diffs)
• dwt/widgets/Decorations.d (modified) (4 diffs)
• dwt/widgets/Dialog.d (modified) (2 diffs)
• dwt/widgets/DirectoryDialog.d (modified) (1 diff)
• dwt/widgets/Display.d (modified) (4 diffs)

dwt/graphics/GC.d

@@ -1799 +1799 @@
- * @param pointArray an array of alternating x and y values which are the vertices of the polygon
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT if pointArray is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
@@ -1808 +1805 @@
-public void drawPolygon( int[] pointArray) {
-    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-
+
+
-    checkGC(DRAW);
-    auto gdipGraphics = data.gdipGraphics;
@@ -1844 +1842 @@
- * @param pointArray an array of alternating x and y values which are the corners of the polyline
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the point array is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
@@ -1853 +1848 @@
-public void drawPolyline(int[] pointArray) {
-    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-
+
+
-    checkGC(DRAW);
-    auto gdipGraphics = data.gdipGraphics;
@@ -2092 +2088 @@
- * @param y the y coordinate of the top left corner of the rectangular area where the string is to be drawn
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
@@ -2116 +2109 @@
- * @param isTransparent if <code>true</code> the background will be transparent, otherwise it will be opaque
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
@@ -2125 +2115 @@
-public void drawString (String string, int x, int y, bool isTransparent) {
-    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-
+
+
-//  TCHAR buffer = new TCHAR (getCodePage(), string, false);
-    wchar[] wstr = StrToWCHARs( string );
@@ -2248 +2239 @@
- * @param y the y coordinate of the top left corner of the rectangular area where the text is to be drawn
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
@@ -2272 +2260 @@
- * @param isTransparent if <code>true</code> the background will be transparent, otherwise it will be opaque
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
@@ -2312 +2297 @@
- * @param flags the flags specifying how to process the text
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
@@ -2321 +2303 @@
-public void drawText (String string, int x, int y, int flags) {
-    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-
+
+
-    if (string.length is 0) return;
-    auto gdipGraphics = data.gdipGraphics;
@@ -2772 +2755 @@
- * @param pointArray an array of alternating x and y values which are the vertices of the polygon
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT if pointArray is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
@@ -2783 +2763 @@
-public void fillPolygon(int[] pointArray) {
-    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-
+
+
-    checkGC(FILL);
-    if (data.gdipGraphics !is null) {
@@ -4737 +4718 @@
- * @return a point containing the extent of the string
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_GRAPHIC_DISPOSED - if the receiver has been disposed</li>
@@ -4746 +4724 @@
-public Point stringExtent(String string) {
-    if (handle is null) DWT.error(DWT.ERROR_GRAPHIC_DISPOSED);
-
+
+
-    checkGC(FONT);
-    int length_ = string.length;

dwt/program/Program.d

@@ -75 +75 @@
- * @return the program or <code>null</code>
- *
- * @exception IllegalArgumentException <ul>
- *      <li>ERROR_NULL_ARGUMENT when extension is null</li>
- *  </ul>
- */
-public static Program findProgram (String extension) {
-
+
+
-    if (extension.length is 0) return null;
-    if (extension.charAt (0) !is '.') extension = "." ~ extension; //$NON-NLS-1$

dwt/widgets/Button.d

@@ -1025 +1025 @@
-/*public*/ void setMessage (String message) {
-    checkWidget ();
-
+
+
-    this.message = message;
-    if (OS.COMCTL32_VERSION >= OS.VERSION (6, 1)) {
@@ -1110 +1111 @@
- * @param string the new text
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the text is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -1120 +1118 @@
-public void setText (String string) {
-    checkWidget ();
-
+
+
-    if ((style & DWT.ARROW) !is 0) return;
-    text = string;

dwt/widgets/Combo.d

@@ -175 +175 @@
- * @param string the new item
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -187 +184 @@
-public void add (String string) {
-    checkWidget ();
-
+
+
-    auto buffer = StrToTCHARs( getCodePage(), string, true );
-    int result = OS.SendMessage (handle, OS.CB_ADDSTRING, 0, buffer.ptr );
@@ -208 +206 @@
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list (inclusive)</li>
- * </ul>
@@ -220 +217 @@
-public void add (String string, int index) {
-    checkWidget ();
-
+
+
-    int count = OS.SendMessage (handle, OS.CB_GETCOUNT, 0, 0);
-    if (!(0 <= index && index <= count)) {
@@ -980 +978 @@
- * @return the index of the item
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -1003 +998 @@
- * @return the index of the item
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -1013 +1005 @@
-public int indexOf (String string, int start) {
-    checkWidget ();
-
+
+
-
-    /*
@@ -1024 +1017 @@
-        int count = getItemCount ();
-        for (int i=start; i<count; i++) {
-==/*eq*/getItem (i
+.equals (getItem (i)
-        }
-        return -1;
@@ -1226 +1219 @@
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- *    <li>ERROR_INVALID_ARGUMENT - if the string is not found in the list</li>
- * </ul>
@@ -1236 +1228 @@
-public void remove (String string) {
-    checkWidget ();
-
+
+
-    int index = indexOf (string, 0);
-    if (index is -1) error (DWT.ERROR_INVALID_ARGUMENT);
@@ -1531 +1524 @@
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_INVALID_RANGE - if the index is not between 0 and the number of elements in the list minus 1 (inclusive)</li>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception DWTException <ul>
@@ -1540 +1532 @@
-public void setItem (int index, String string) {
-    checkWidget ();
-
+
+
-    int selection = getSelectionIndex ();
-    remove (index, false);
@@ -1554 +1547 @@
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the items array is null</li>
- *    <li>ERROR_INVALID_ARGUMENT - if an item in the items array is null</li>
- * </ul>
@@ -1564 +1556 @@
-public void setItems (String [] items) {
-    checkWidget ();
-
+
+
-    for (int i=0; i<items.length; i++) {
-        if (items [i] is null) error (DWT.ERROR_INVALID_ARGUMENT);
@@ -1805 +1798 @@
- * @param string the new text
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -1815 +1805 @@
-public void setText (String string) {
-    checkWidget ();
-
+
+
-    if ((style & DWT.READ_ONLY) !is 0) {
-        int index = indexOf (string);

dwt/widgets/CoolBar.d

@@ -816 +816 @@
- * </ul>
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if item order or sizes is null</li>
- *    <li>ERROR_INVALID_ARGUMENT - if item order or sizes is not the same length as the number of items</li>
- * </ul>
@@ -842 +841 @@
- * </ul>
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the item order is null</li>
- *    <li>ERROR_INVALID_ARGUMENT - if the item order is not the same length as the number of items</li>
- * </ul>
- */
-void setItemOrder (int [] itemOrder) {
-
+
+
-    int itemCount = OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0);
-    if (itemOrder.length !is itemCount) error (DWT.ERROR_INVALID_ARGUMENT);
@@ -906 +905 @@
- */
-void setItemSizes (Point [] sizes) {
-
+
+
-    int count = OS.SendMessage (handle, OS.RB_GETBANDCOUNT, 0, 0);
-    if (sizes.length !is count) error (DWT.ERROR_INVALID_ARGUMENT);

dwt/widgets/Decorations.d

@@ -1061 +1061 @@
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the array of images is null</li>
- *    <li>ERROR_INVALID_ARGUMENT - if one of the images is null or has been disposed</li>
- * </ul>
@@ -1073 +1072 @@
-public void setImages (Image [] images) {
-    checkWidget ();
-
+
+
-    for (int i = 0; i < images.length; i++) {
-        if (images [i] is null || images [i].isDisposed ()) error (DWT.ERROR_INVALID_ARGUMENT);
@@ -1329 +1329 @@
- * @param string the new text
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the text is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -1339 +1336 @@
-public void setText (String string) {
-    checkWidget ();
-
+
+
-    /* Use the character encoding for the default locale */
-    TCHAR[] buffer = StrToTCHARs (string, true);

dwt/widgets/Dialog.d

@@ -256 +256 @@
- * @param string the new text
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the text is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -265 +262 @@
- */
-public void setText (String string) {
-
+
+
-    title = string;
-}

dwt/widgets/DirectoryDialog.d

@@ -309 +309 @@
- * @param string the message
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is null</li>
- * </ul>
- */
-public void setMessage (String string) {
-
+
+
-    message = string;
-}

dwt/widgets/Display.d

@@ -1627 +1627 @@
- * @return the value of the property or null if it has not been set
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the key is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
@@ -1640 +1637 @@
-public Object getData (String key) {
-    checkDevice ();
-
+
+
-    if (key ==/*eq*/RUN_MESSAGES_IN_IDLE_KEY) {
-        return new ValueWrapperBool(runMessagesInIdle);
@@ -4082 +4080 @@
- * @param value the new value for the property
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the key is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
@@ -4095 +4090 @@
-public void setData (String key, Object value) {
-    checkDevice ();
-
+
+
-
-    if (key ==/*eq*/RUN_MESSAGES_IN_IDLE_KEY) {