Mercurial > projects > dwt2

diff base/src/java/io/ByteArrayOutputStream.d @ 120:536e43f63c81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Comprehensive update for Win32/Linux32 dmd-2.053/dmd-1.068+Tango-r5661 ===D2=== * added [Try]Immutable/Const/Shared templates to work with differenses in D1/D2 instead of version statements used these templates to work with strict type storage rules of dmd-2.053 * com.ibm.icu now also compilable with D2, but not tested yet * small fixes Snippet288 - shared data is in TLS ===Phobos=== * fixed critical bugs in Phobos implemention completely incorrect segfault prone fromStringz (Linux's port ruthless killer) terrible, incorrect StringBuffer realization (StyledText killer) * fixed small bugs as well Snippet72 - misprint in the snippet * implemented missed functionality for Phobos ByteArrayOutputStream implemented (image loading available) formatting correctly works for all DWT's cases As a result, folowing snippets now works with Phobos (Snippet### - what is fixed): Snippet24, 42, 111, 115, 130, 235, 276 - bad string formatting Snippet48, 282 - crash on image loading Snippet163, 189, 211, 213, 217, 218, 222 - crash on copy/cut in StyledText Snippet244 - hang-up ===Tango=== * few changes for the latest Tango trunc-r5661 * few small performance improvments ===General=== * implMissing-s for only one version changed to implMissingInTango/InPhobos * incorrect calls to Format in toString-s fixed * fixed loading \uXXXX characters in ResourceBundle * added good UTF-8 support for StyledText, TextLayout (Win32) and friends UTF functions revised and tested. It is now in java.nonstandard.*Utf modules StyledText and TextLayout (Win32) modules revised for UTF-8 support * removed small diferences in most identical files in *.swt.* folders *.swt.internal.image, *.swt.events and *.swt.custom are identical in Win32/Linux32 now 179 of 576 (~31%) files in *.swt.* folders are fully identical * Win32: snippets now have right subsystem, pretty icons and native system style controls * small fixes in snippets Snippet44 - it's not Snippet44 Snippet212 - functions work with different images and offsets arrays Win32: Snippet282 - crash on close if the button has an image Snippet293 - setGrayed is commented and others Win32: As a result, folowing snippets now works Snippet68 - color doesn't change Snippet163, 189, 211, 213, 217, 218, 222 - UTF-8 issues (see above) Snippet193 - no tabel headers
author Denis Shelomovskij <verylonglogin.reg@gmail.com>
date Sat, 09 Jul 2011 15:50:20 +0300
parents 9f4c18c268b2
children
line wrap: on
line diff
--- a/base/src/java/io/ByteArrayOutputStream.d	Sun Apr 17 17:58:36 2011 +0200
+++ b/base/src/java/io/ByteArrayOutputStream.d	Sat Jul 09 15:50:20 2011 +0300
@@ -9,6 +9,7 @@
 version(Tango){
     import tango.io.device.Array;
 } else { // Phobos
+    import std.outbuffer;
 }
 
 public class ByteArrayOutputStream : java.io.OutputStream.OutputStream {
@@ -16,13 +17,14 @@
     version(Tango){
         protected Array buffer;
     } else { // Phobos
+        protected OutBuffer buffer;
     }
 
     public this (){
         version(Tango){
             buffer = new Array(0);
         } else { // Phobos
-            implMissing( __FILE__, __LINE__ );
+            buffer = new OutBuffer();
         }
     }
 
@@ -30,38 +32,38 @@
         version(Tango){
             buffer = new Array(par_size);
         } else { // Phobos
-            implMissing( __FILE__, __LINE__ );
+            buffer = new OutBuffer();
+            buffer.reserve(par_size);
         }
     }
 
     public override void write( int b ){
         synchronized {
             version(Tango){
-                byte[1] a;
-                a[0] = b & 0xFF;
+                byte[1] a = b & 0xFF;
                 buffer.append(a);
             } else { // Phobos
-                implMissing( __FILE__, __LINE__ );
+                buffer.write(cast(ubyte)(b & 0xFF));
             }
         }
     }
 
-    public override void write( byte[] b, int off, int len ){
+    public override void write( in byte[] b, int off, int len ){
         synchronized {
             version(Tango){
-                buffer.append( b[ off .. off + len ]);
+                buffer.append( b[ off .. off + len ] );
             } else { // Phobos
-                implMissing( __FILE__, __LINE__ );
+                buffer.write( cast(ubyte[]) b[ off .. off + len ]);
             }
         }
     }
 
-    public override void write( byte[] b ){
+    public override void write( in byte[] b ){
         synchronized {
             version(Tango){
                 buffer.append( b );
             } else { // Phobos
-                implMissing( __FILE__, __LINE__ );
+                buffer.write( cast(ubyte[]) b );
             }
         }
     }
@@ -79,10 +81,9 @@
     public byte[] toByteArray(){
         synchronized {
             version(Tango){
-                return cast(byte[])buffer.slice();
+                return cast(byte[]) buffer.slice();
             } else { // Phobos
-                implMissing( __FILE__, __LINE__ );
-                return null;
+                return cast(byte[]) buffer.toBytes();
             }
         }
     }
@@ -107,7 +108,7 @@
         return null;
     }
 
-    public  override void close(){
+    public override void close(){
         implMissing( __FILE__, __LINE__ );
     }
 }