diff org.eclipse.jface.databinding/src/org/eclipse/jface/internal/databinding/swt/SWTObservableList.d @ 85:6be48cf9f95c

Work on databinding
author Frank Benoit <benoit@tionex.de>
date Sat, 18 Apr 2009 13:54:50 +0200
parents 0a55d2d5a946
children
line wrap: on
line diff
--- a/org.eclipse.jface.databinding/src/org/eclipse/jface/internal/databinding/swt/SWTObservableList.d	Sat Apr 18 09:25:29 2009 +0200
+++ b/org.eclipse.jface.databinding/src/org/eclipse/jface/internal/databinding/swt/SWTObservableList.d	Sat Apr 18 13:54:50 2009 +0200
@@ -53,7 +53,7 @@
             index = size;
         String[] newItems = new String[size + 1];
         System.arraycopy(getItems(), 0, newItems, 0, index);
-        newItems[index] = cast(String) element;
+        newItems[index] = stringcast( element);
         System.arraycopy(getItems(), index, newItems, index + 1, size - index);
         setItems(newItems);
         fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(index,
@@ -66,11 +66,11 @@
 
     public Object get(int index) {
         getterCalled();
-        return getItem(index);
+        return stringcast(getItem(index));
     }
 
     public Object getElementType() {
-        return String.classinfo;
+        return Class.fromType!(String);
     }
 
     /**
@@ -111,17 +111,17 @@
         }
         setItems(newItems);
         fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(index,
-                false, oldElement)));
-        return oldElement;
+                false, stringcast(oldElement))));
+        return stringcast(oldElement);
     }
 
     public Object set(int index, Object element) {
         String oldElement = getItem(index);
-        setItem(index, cast(String) element);
+        setItem(index, stringcast( element));
         fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(index,
-                false, oldElement), Diffs.createListDiffEntry(index, true,
+                false, stringcast(oldElement)), Diffs.createListDiffEntry(index, true,
                 element)));
-        return oldElement;
+        return stringcast(oldElement);
     }
 
     public Object move(int oldIndex, int newIndex) {
@@ -131,10 +131,10 @@
         int size = doGetSize();
         if (oldIndex < 0 || oldIndex >= size)
             throw new IndexOutOfBoundsException(
-                    "oldIndex: " + oldIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$
+                    Format("oldIndex: {}, size:{}", oldIndex, size)); //$NON-NLS-1$ //$NON-NLS-2$
         if (newIndex < 0 || newIndex >= size)
             throw new IndexOutOfBoundsException(
-                    "newIndex: " + newIndex + ", size:" + size); //$NON-NLS-1$ //$NON-NLS-2$
+                    Format("newIndex: {}, size:{}", newIndex, size)); //$NON-NLS-1$ //$NON-NLS-2$
 
         String[] items = getItems();
         String[] newItems = new String[size];
@@ -152,9 +152,9 @@
         }
         setItems(newItems);
         fireListChange(Diffs.createListDiff(Diffs.createListDiffEntry(oldIndex,
-                false, element), Diffs.createListDiffEntry(newIndex, true,
-                element)));
-        return element;
+                false, stringcast(element)), Diffs.createListDiffEntry(newIndex, true,
+                stringcast(element))));
+        return stringcast(element);
     }
 
     public bool removeAll(Collection c) {