--- a/java/src/java/nonstandard/XmlTranscode.d	Wed Mar 18 12:10:17 2009 +0100
+++ b/java/src/java/nonstandard/XmlTranscode.d	Thu Mar 19 20:38:55 2009 +0100
@@ -1,8 +1,8 @@
 module java.nonstandard.XmlTranscode;
 
 import java.lang.util;
+import java.lang.exceptions;
 import java.lang.Math;
-import tango.core.Exception;
 
 /++
  + Decode XML entities into UTF8 string.
@@ -13,7 +13,7 @@
 String xmlUnescape( String str ){
 
     void error(){
-        throw new TextException( "xmlUnescape" );
+        throw new RuntimeException( "xmlUnescape" );
     }
     // < ...
     // Ӓ
@@ -22,7 +22,7 @@
     String trg = str;
     while( src.length ){
         if( src[0] !is '&' ){
-            trg[0] = src[0];
+            //trg[0] = src[0];
             trg = trg[1..$];
             src = src[1..$];
         }
@@ -32,8 +32,8 @@
 
             // search semi
             int len = Math.min( cast(int)src.length, 10 ); // limit semi search to possible longest entityname
-            int semi = tango.text.Util.locate( src[0 .. len ], ';' );
-            if( semi is len ) error(); // no semi found
+            int semi = java.lang.util.indexOf( src[0 .. len ], ';' );
+            if( semi is -1 ) error(); // no semi found
 
             String entityName = src[ 0 .. semi ]; // name without semi
             dchar entityValue = 0;
@@ -77,10 +77,7 @@
                         }
                     }
             }
-            dchar[1] arr;
-            arr[0] = entityValue;
-            uint ate = 0;
-            String res = tango.text.convert.Utf.toString( arr, trg, &ate );
+            String res = String_valueOf( entityValue );
             trg = trg[ res.length .. $ ];
             src = src[ semi +1 .. $ ]; // go past semi
         }
@@ -122,7 +119,7 @@
 Lprocess:
 
     // yes, do a new string, start with +20 chars
-    String res = new char[ xml.length + 20 ];
+    char[] res = new char[ xml.length + 20 ];
     res.length = 0;
 
     foreach( dchar c; xml ){