Changeset 244:a59d51c12b42

Timestamp:

06/28/08 14:27:21 (4 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

work on allow null strings and arrays

Files:

• dwt/custom/CCombo.d (modified) (13 diffs)
• dwt/custom/CTabItem.d (modified) (1 diff)
• dwt/custom/PopupList.d (modified) (1 diff)
• dwt/custom/StyledText.d (modified) (10 diffs)
• dwt/custom/TableTree.d (modified) (2 diffs)
• dwt/custom/TableTreeItem.d (modified) (2 diffs)

dwt/custom/CCombo.d

@@ -193 +193 @@
- * @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>
@@ -205 +202 @@
-public void add (String string) {
-    checkWidget();
-
+
+
-    list.add (string);
-}
@@ -221 +219 @@
- *
- * @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>
@@ -233 +230 @@
-public void add (String string, int index) {
-    checkWidget();
-
+
+
-    list.add (string, index);
-}
@@ -870 +868 @@
- * @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>
@@ -880 +875 @@
-public int indexOf (String string) {
-    checkWidget ();
-
+
+
-    return list.indexOf (string);
-}
@@ -894 +890 @@
- * @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>
@@ -904 +897 @@
-public int indexOf (String string, int start) {
-    checkWidget ();
-
+
+
-    return list.indexOf (string, start);
-}
@@ -1238 +1232 @@
- *
- * @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>
@@ -1248 +1241 @@
-public void remove (String string) {
-    checkWidget();
-
+
+
-    list.remove (string);
-}
@@ -1422 +1416 @@
- * @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>
@@ -1531 +1524 @@
- * @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>
@@ -1541 +1531 @@
-public void setText (String string) {
-    checkWidget();
-
+
+
-    int index = list.indexOf (string);
-    if (index is -1) {

dwt/custom/CTabItem.d

@@ -1040 +1040 @@
-public override void setText (String string) {
-    checkWidget();
-
+
+
-    if (string==getText()) return;
-    super.setText(string);

dwt/custom/PopupList.d

@@ -264 +264 @@
-*
-* @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>

dwt/custom/StyledText.d

@@ -1606 +1606 @@
-public void append(String string) {
-    checkWidget();
-
-
-
+
+
+
+
-    int lastChar = Math.max(getCharCount(), 0);
-    replaceTextRange(lastChar, 0, string);
@@ -4937 +4938 @@
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT when string is null</li>
- * </ul>
- */
-public void insert(String string) {
-    checkWidget();
-
-
-
+
+
+
+
-    Point sel = getSelectionRange();
-    replaceTextRange(sel.x, sel.y, string);
@@ -6461 +6460 @@
- * @exception IllegalArgumentException <ul>
- *   <li>ERROR_INVALID_RANGE when either start or end is outside the valid range (0 <= offset <= getCharCount())</li>
- *   <li>ERROR_NULL_ARGUMENT when ranges is null</li>
- * </ul>
- *
@@ -6471 +6469 @@
-    checkWidget();
-    if (isListening(LineGetStyle)) return;
-
+
+
-    setStyleRanges(start, length, null, ranges, false);
-}
@@ -6504 +6503 @@
- *   <li>ERROR_INVALID_ARGUMENT when either start or end is inside a multi byte line delimiter.
- *      Splitting a line delimiter for example by inserting text in between the CR and LF and deleting part of a line delimiter is not supported</li>
- *   <li>ERROR_NULL_ARGUMENT when string is null</li>
- * </ul>
- */
-public void replaceTextRange(int start, int length, String text) {
-    checkWidget();
-
-
-
+
+
+
+
-    int contentLength = getCharCount();
-    int end = start + length;
@@ -7927 +7926 @@
- * </ul>
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT when an element in the styles array is null</li>
- *    <li>ERROR_INVALID_RANGE when the number of ranges and style do not match (ranges.length * 2 is styles.length)</li>
- *    <li>ERROR_INVALID_RANGE when a range is outside the valid range (> getCharCount() or less than zero)</li>
@@ -7969 +7967 @@
- * </ul>
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT when an element in the styles array is null</li>
- *    <li>ERROR_INVALID_RANGE when the number of ranges and style do not match (ranges.length * 2 is styles.length)</li>
- *    <li>ERROR_INVALID_RANGE when a range is outside the valid range (> getCharCount() or less than zero)</li>
@@ -8097 +8094 @@
- * </ul>
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT when the list of ranges is null</li>
- *    <li>ERROR_INVALID_RANGE when the last of the style ranges is outside the valid range (> getCharCount())</li>
- * </ul>
@@ -8106 +8102 @@
-    checkWidget();
-    if (isListening(LineGetStyle)) return;
-
+
+
-    setStyleRanges(0, 0, null, ranges, true);
-}
@@ -8144 +8141 @@
- *    <li>ERROR_THREAD_INVALID_ACCESS - if not called from the thread that created the receiver</li>
- * </ul>
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT when string is null</li>
- * </ul>
- */
-public void setText(String text) {
-    checkWidget();
-
-
-
+
+
+
+
-    Event event = new Event();
-    event.start = 0;

dwt/custom/TableTree.d

@@ -766 +766 @@
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the array of items is null</li>
- *    <li>ERROR_INVALID_ARGUMENT - if one of the item has been disposed</li>
- * </ul>
@@ -778 +777 @@
-public void setSelection (TableTreeItem[] items) {
-    checkWidget ();
-
+
+
-    int length = items.length;
-    if (length is 0 || ((table.getStyle() & DWT.SINGLE) !is 0 && length > 1)) {

dwt/custom/TableTreeItem.d

@@ -820 +820 @@
- * @param text the new text
- *
- * @exception IllegalArgumentException <ul>
- *    <li>ERROR_NULL_ARGUMENT - if the text is null</li>
- * </ul>
- * @exception DWTException <ul>
- *      <li>ERROR_THREAD_INVALID_ACCESS when called from the wrong thread</li>
@@ -830 +827 @@
-public void setText(int index, String text) {
-    checkWidget();
-
+
+
-    int columnCount = Math.max(parent.getTable().getColumnCount(), 1);
-    if (index < 0 || index >= columnCount) return;