Changeset 262:e10de397beb1

Timestamp:

07/06/08 09:33:12 (3 months ago)

Author:

Frank Benoit <benoit@tionex.de>

branch:

default

Message:

ADD version TANGOSVN

Files:

• dwt/dwthelper/ByteArrayOutputStream.d (modified) (1 diff)
• dwt/dwthelper/File.d (modified) (2 diffs)
• dwt/dwthelper/InflaterInputStream.d (modified) (2 diffs)
• dwt/dwthelper/utils.d (modified) (3 diffs)

dwt/dwthelper/ByteArrayOutputStream.d

@@ -6 +6 @@
-public import dwt.dwthelper.OutputStream;
-import dwt.dwthelper.utils;
-
+
+
+
+
+
+
+
-
-public class ByteArrayOutputStream : dwt.dwthelper.OutputStream.OutputStream {

dwt/dwthelper/File.d

@@ -6 +6 @@
-import dwt.dwthelper.utils;
-
-
+
+
+
+
+
+
-static import tango.io.FilePath;
-static import tango.io.FileSystem;
@@ -20 +25 @@
-
-    static this(){
+version(TANGOSVN)
+        separator = tango.io.model.IFile.FileConst.PathSeparatorString;
+        separatorChar = tango.io.model.IFile.FileConst.PathSeparatorChar;
+        pathSeparator = tango.io.model.IFile.FileConst.SystemPathString;
+        pathSeparatorChar = tango.io.model.IFile.FileConst.SystemPathChar;
+}
+else{
-        separator = tango.io.FileConst.FileConst.PathSeparatorString;
-        separatorChar = tango.io.FileConst.FileConst.PathSeparatorChar;
-        pathSeparator = tango.io.FileConst.FileConst.SystemPathString;
-        pathSeparatorChar = tango.io.FileConst.FileConst.SystemPathChar;
+}
-    }
-

dwt/dwthelper/InflaterInputStream.d

@@ -8 +8 @@
-import tango.io.Stdout;
-import tango.io.compress.ZlibStream;
-
+
+
+
-class InputStreamWrapper : tango.io.model.IConduit.InputStream {
-
@@ -21 +23 @@
-        return res;
-    }
+version(TANGOSVN)
+    void[] load (void[] dst = null) {
+            return Conduit.load (this, dst);
+    }
+}
+
-
-    tango.io.model.IConduit.InputStream clear (){

dwt/dwthelper/utils.d

@@ -150 +150 @@
-
-    public static String toHexString( int i ){
+version(TANGOSVN)
+        return tango.text.convert.Integer.toString(i, "x" );
+}
+else{
-        return tango.text.convert.Integer.toString(i, tango.text.convert.Integer.Style.Hex );
+}
-    }
-
-    public static String toOctalString( int i ){
+version(TANGOSVN)
+        return tango.text.convert.Integer.toString(i, "o" );
+}
+else{
-        return tango.text.convert.Integer.toString(i, tango.text.convert.Integer.Style.Octal );
+}
-    }
-
-    public static String toBinaryString( int i ){
+version(TANGOSVN)
+        return tango.text.convert.Integer.toString(i, "b" );
+}
+else{
-        return tango.text.convert.Integer.toString(i, tango.text.convert.Integer.Style.Binary );
+}
-    }
-
@@ -636 +651 @@
-
-static String toHex(uint value, bool prefix = true, int radix = 8){
+version(TANGOSVN)
+    return tango.text.convert.Integer.toString(
+            value,
+            radix is 10 ? "d" :
+            radix is  8 ? "o" :
+            radix is 16 ? "x" :
+                          "d" );
+}
+else{
-    return tango.text.convert.Integer.toString(
-            value,
@@ -645 +669 @@
-            );
-}
+}
-
-class RuntimeException : Exception {