Changeset 243:ecb80b2a89e1

Timestamp:

06/28/08 14:18:36 (4 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

work on allow null strings and arrays

Files:

• dwt/widgets/Table.d (modified) (14 diffs)
• dwt/widgets/TableColumn.d (modified) (1 diff)
• dwt/widgets/Text.d (modified) (8 diffs)
• dwt/widgets/ToolItem.d (modified) (2 diffs)
• dwt/widgets/ToolTip.d (modified) (4 diffs)
• dwt/widgets/Tracker.d (modified) (2 diffs)
• dwt/widgets/Tree.d (modified) (4 diffs)
• dwt/widgets/TreeColumn.d (modified) (1 diff)
• dwt/widgets/TreeItem.d (modified) (6 diffs)
• dwt/widgets/Widget.d (modified) (4 diffs)

dwt/widgets/Table.d

@@ -1124 +1124 @@
- * @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 indices array is null</li>
- * </ul>
- * @exception DWTException <ul>
@@ -1138 +1137 @@
-public void clear (int [] indices) {
-    checkWidget ();
-
+
+
-    if (indices.length is 0) return;
-    int count = OS.SendMessage (handle, OS.LVM_GETITEMCOUNT, 0, 0);
@@ -1678 +1678 @@
- * @param indices the array of indices for the items to deselect
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the set of indices is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -1688 +1685 @@
-public void deselect (int [] indices) {
-    checkWidget ();
-
+
+
-    if (indices.length is 0) return;
-    LVITEM lvItem;
@@ -2914 +2912 @@
- * @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 indices array is null</li>
- * </ul>
- * @exception DWTException <ul>
@@ -2923 +2920 @@
-public void remove (int [] indices) {
-    checkWidget ();
-
+
+
-    if (indices.length is 0) return;
-    int [] newIndices = new int [indices.length];
@@ -3135 +3133 @@
- * @param indices the array of indices for the items to select
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the array of indices is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -3147 +3142 @@
-public void select (int [] indices) {
-    checkWidget ();
-
+
+
-    int length = indices.length;
-    if (length is 0 || ((style & DWT.SINGLE) !is 0 && length > 1)) return;
@@ -3963 +3959 @@
- * </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>
@@ -3976 +3971 @@
-public void setColumnOrder (int [] order) {
-    checkWidget ();
-
+
+
-    auto hwndHeader = cast(HWND) OS.SendMessage (handle, OS.LVM_GETHEADER, 0, 0);
-    if (columnCount is 0) {
@@ -4699 +4695 @@
- * @param indices the indices of the items to select
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the array of indices is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -4712 +4705 @@
-public void setSelection (int [] indices) {
-    checkWidget ();
-
+
+
-    deselectAll ();
-    int length = indices.length;
@@ -4760 +4754 @@
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the array of items is null</li>
- *    <li>ERROR_INVALID_ARGUMENT - if one of the items has been disposed</li>
- * </ul>
@@ -4774 +4767 @@
-public void setSelection (TableItem [] items) {
-    checkWidget ();
-
+
+
-    deselectAll ();
-    int length = items.length;

dwt/widgets/TableColumn.d

@@ -781 +781 @@
-override public void setText (String string) {
-    checkWidget ();
-
-
+
+
+
-    int index = parent.indexOf (this);
-    if (index is -1) return;

dwt/widgets/Text.d

@@ -337 +337 @@
- * @param string the string to be appended
- *
- * @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>
@@ -347 +344 @@
-public void append (String string) {
-    checkWidget ();
-
+
+
-    string = Display.withCrLf (string);
-    int length = OS.GetWindowTextLength (handle);
@@ -1210 +1208 @@
- * @param string the string
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the string is <code>null</code></li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -1220 +1215 @@
-public void insert (String string) {
-    checkWidget ();
-
+
+
-    string = Display.withCrLf (string);
-    if (hooks (DWT.Verify) || filters (DWT.Verify)) {
@@ -1658 +1654 @@
- * @param message the new message
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the message is null</li>
- * </ul>
- * @exception DWTException <ul>
- *    <li>ERROR_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -1670 +1663 @@
-public void setMessage (String message) {
-    checkWidget ();
-
+
+
-    this.message = message;
-    if (OS.COMCTL32_MAJOR >= 6) {
@@ -1878 +1872 @@
- * @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>
@@ -1888 +1879 @@
-public void setText (String string) {
-    checkWidget ();
-
+
+
-    string = Display.withCrLf (string);
-    if (hooks (DWT.Verify) || filters (DWT.Verify)) {

dwt/widgets/ToolItem.d

@@ -761 +761 @@
- * @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>
@@ -771 +768 @@
-override public void setText (String string) {
-    checkWidget();
-
+
+
-    if ((style & DWT.SEPARATOR) !is 0) return;
-==/*eq*/text
+.equals(text)
-    super.setText (string);
-    auto hwnd = parent.handle;

dwt/widgets/ToolTip.d

@@ -395 +395 @@
- * @param string the new message
- *
- * @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>
@@ -405 +402 @@
-public void setMessage (String string) {
-    checkWidget ();
-
+
+
-    message = string;
-    //TODO - update when visible
@@ -415 +413 @@
- * @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>
@@ -425 +420 @@
-public void setText (String string) {
-    checkWidget ();
-
+
+
-    text = string;
-    //TODO - update when visible

dwt/widgets/Tracker.d

@@ -803 +803 @@
- *
- * @exception IllegalArgumentException <ul>
-is null or 
+
- * </ul>
- * @exception DWTException <ul>
@@ -812 +812 @@
-public void setRectangles (Rectangle [] rectangles) {
-    checkWidget ();
-
+
+
-    this.rectangles = new Rectangle [rectangles.length];
-    for (int i = 0; i < rectangles.length; i++) {

dwt/widgets/Tree.d

@@ -4521 +4521 @@
- * </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>
@@ -4534 +4533 @@
-public void setColumnOrder (int [] order) {
-    checkWidget ();
-
+
+
-    if (columnCount is 0) {
-        if (order.length !is 0) error (DWT.ERROR_INVALID_ARGUMENT);
@@ -4901 +4901 @@
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the array of items is null</li>
- *    <li>ERROR_INVALID_ARGUMENT - if one of the items has been disposed</li>
- * </ul>
@@ -4913 +4912 @@
-public void setSelection (TreeItem [] items) {
-    checkWidget ();
-
+
+
-    int length = items.length;
-    if (length is 0 || ((style & DWT.SINGLE) !is 0 && length > 1)) {

dwt/widgets/TreeColumn.d

@@ -659 +659 @@
-override public void setText (String string) {
-    checkWidget ();
-
+
+
-    if (string.equals (text)) return;
-    int index = parent.indexOf (this);

dwt/widgets/TreeItem.d

@@ -1631 +1631 @@
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the array of images is null</li>
- *    <li>ERROR_INVALID_ARGUMENT - if one of the images has been disposed</li>
- * </ul>
@@ -1643 +1642 @@
-public void setImage (Image [] images) {
-    checkWidget();
-
+
+
-    for (int i=0; i<images.length; i++) {
-        setImage (i, images [i]);
@@ -1751 +1751 @@
- * @param strings the array of new strings
- *
- * @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>
@@ -1763 +1760 @@
-public void setText (String[] strings) {
-    checkWidget();
-
+
+
-    for (int i=0; i<strings.length; i++) {
-        String string = strings [i];
@@ -1776 +1774 @@
- * @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>
@@ -1788 +1783 @@
-public void setText (int index, String string) {
-    checkWidget();
-
+
+
-    if (index is 0) {
-        if (string==/*eq*/text) return;

dwt/widgets/Widget.d

@@ -569 +569 @@
- * @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_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -581 +578 @@
-public Object getData (String key) {
-    checkWidget();
-
+
+
-    if ((state & KEYED_DATA) !is 0) {
-        Object [] table = (cast(ArrayWrapperObject) data).array;
@@ -1144 +1142 @@
- * @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_WIDGET_DISPOSED - if the receiver has been disposed</li>
@@ -1156 +1151 @@
-public void setData (String key, Object value) {
-    checkWidget();
-
+
+
-    int index = 1;
-    Object [] table = null;