--- a/dwtx/jface/text/TextUtilities.d	Wed Aug 27 02:07:22 2008 +0200
+++ b/dwtx/jface/text/TextUtilities.d	Wed Aug 27 14:49:30 2008 +0200
@@ -60,7 +60,7 @@
 import dwtx.jface.text.IDocumentExtension4; // packageimport
 import dwtx.jface.text.IDocumentExtension2; // packageimport
 import dwtx.jface.text.IDocumentPartitionerExtension2; // packageimport
-import dwtx.jface.text.Assert; // packageimport
+// import dwtx.jface.text.Assert; // packageimport
 import dwtx.jface.text.DefaultInformationControl; // packageimport
 import dwtx.jface.text.IWidgetTokenOwnerExtension; // packageimport
 import dwtx.jface.text.DocumentClone; // packageimport
@@ -221,7 +221,7 @@
      */
     public static int[] indexOf(String[] searchStrings, String text, int offset) {
 
-        int[] result= { -1, -1 };
+        int[] result= [ -1, -1 ];
         int zeroIndex= -1;
 
         for (int i= 0; i < searchStrings.length; i++) {
@@ -233,7 +233,7 @@
                 continue;
             }
 
-            int index= text.indexOf(searchStrings[i], offset);
+            int index= .indexOf( text, searchStrings[i], offset);
             if (index >= 0) {
 
                 if (result[0] is -1) {
@@ -242,7 +242,7 @@
                 } else if (index < result[0]) {
                     result[0]= index;
                     result[1]= i;
-                } else if (index is result[0] && length > searchStrings[result[1]].length()) {
+                } else if (index is result[0] && length > searchStrings[result[1]].length) {
                     result[0]= index;
                     result[1]= i;
                 }
@@ -270,7 +270,7 @@
         int index= -1;
 
         for (int i= 0; i < searchStrings.length; i++) {
-            if (text.endsWith(searchStrings[i])) {
+            if (.endsWith(text, searchStrings[i])) {
                 if (index is -1 || searchStrings[i].length() > searchStrings[index].length())
                     index= i;
             }
@@ -292,7 +292,7 @@
         int index= -1;
 
         for (int i= 0; i < searchStrings.length; i++) {
-            if (text.startsWith(searchStrings[i])) {
+            if (.startsWith(text, searchStrings[i])) {
                 if (index is -1 || searchStrings[i].length() > searchStrings[index].length())
                     index= i;
             }
@@ -311,7 +311,7 @@
      */
     public static int equals(String[] compareStrings, String text) {
         for (int i= 0; i < compareStrings.length; i++) {
-            if (text.equals(compareStrings[i]))
+            if (.equals(text,compareStrings[i]))
                 return i;
         }
         return -1;
@@ -361,8 +361,10 @@
             // event is left from merged event
             } else if (eventOffset + eventLength < offset) {
                 final String string= document.get(eventOffset + eventLength, offset - (eventOffset + eventLength));
-                text.insert(0, string);
-                text.insert(0, eventText);
+                text.select(0,0);
+                text.replace(string);
+                text.select(0,0);
+                text.replace(eventText);
 
                 length= offset + length - eventOffset;
                 offset= eventOffset;
@@ -371,10 +373,11 @@
             } else {
                 final int start= Math.max(0, eventOffset - offset);
                 final int end= Math.min(text.length(), eventLength + eventOffset - offset);
-                text.replace(start, end, eventText);
+                text.select(start, end);
+                text.replace(eventText);
 
                 offset= Math.min(offset, eventOffset);
-                final int totalDelta= delta + eventText.length() - eventLength;
+                final int totalDelta= delta + eventText.length - eventLength;
                 length= text.length() - totalDelta;
             }
         }
@@ -404,7 +407,7 @@
         final IDocument document= firstEvent.getDocument();
         int offset= firstEvent.getOffset();
         int length= firstEvent.getLength();
-        int textLength= firstEvent.getText() is null ? 0 : firstEvent.getText().length();
+        int textLength= firstEvent.getText() is null ? 0 : firstEvent.getText().length;
 
         while (iterator.hasPrevious()) {
 
@@ -413,7 +416,7 @@
             final DocumentEvent event= cast(DocumentEvent) iterator.previous();
             final int eventOffset= event.getOffset();
             final int eventLength= event.getLength();
-            final int eventTextLength= event.getText() is null ? 0 : event.getText().length();
+            final int eventTextLength= event.getText() is null ? 0 : event.getText().length;
 
             // event is right from merged event
             if (eventOffset > offset + textLength + delta) {
@@ -460,7 +463,7 @@
                 if (partitioner !is null) {
                     extension3.setDocumentPartitioner(partitionings[i], null);
                     partitioner.disconnect();
-                    partitioners.put(partitionings[i], partitioner);
+                    partitioners.put(stringcast(partitionings[i]), cast(Object)partitioner);
                 }
             }
         } else {
@@ -468,7 +471,7 @@
             if (partitioner !is null) {
                 document.setDocumentPartitioner(null);
                 partitioner.disconnect();
-                partitioners.put(IDocumentExtension3.DEFAULT_PARTITIONING, partitioner);
+                partitioners.put(stringcast(IDocumentExtension3.DEFAULT_PARTITIONING), cast(Object)partitioner);
             }
         }
         return partitioners;
@@ -487,7 +490,7 @@
             IDocumentExtension3 extension3= cast(IDocumentExtension3) document;
             Iterator e= partitioners.keySet().iterator();
             while (e.hasNext()) {
-                String partitioning= cast(String) e.next();
+                String partitioning= stringcast( e.next() );
                 IDocumentPartitioner partitioner= cast(IDocumentPartitioner) partitioners.get(partitioning);
                 partitioner.connect(document);
                 extension3.setDocumentPartitioner(partitioning, partitioner);
@@ -606,9 +609,7 @@
                         }
                     }
                 }
-                String[] result= new String[categories.size()];
-                categories.toArray(result);
-                return result;
+                return stringcast(categories.toArray());
             }
         }
         return null;
@@ -642,7 +643,7 @@
         String[] delimiters= document.getLegalLineDelimiters();
         Assert.isTrue(delimiters.length > 0);
         for (int i= 0; i < delimiters.length; i++) {
-            if (delimiters[i].equals(sysLineDelimiter)) {
+            if (.equals(delimiters[i], sysLineDelimiter)) {
                 lineDelimiter= sysLineDelimiter;
                 break;
             }