Mercurial > projects > dwt2
view base/src/java/io/BufferedInputStream.d @ 120:536e43f63c81
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 source
/** * Authors: Frank Benoit <keinfarbton@googlemail.com> */ module java.io.BufferedInputStream; import java.io.InputStream; import java.lang.all; public class BufferedInputStream : java.io.InputStream.InputStream { alias java.io.InputStream.InputStream.read read; private const int defaultSize = 8192; protected byte[] buf; protected int count = 0; /// The index one greater than the index of the last valid byte in the buffer. protected int pos = 0; /// The current position in the buffer. protected int markpos = (-1); protected int marklimit; java.io.InputStream.InputStream istr; public this ( java.io.InputStream.InputStream istr ){ this( istr, defaultSize ); } public this ( java.io.InputStream.InputStream istr, int size ){ this.istr = istr; if( size <= 0 ){ throw new IllegalArgumentException( "Buffer size <= 0" ); } buf.length = size; } private InputStream getAndCheckIstr(){ InputStream res = istr; if( res is null ){ throw new IOException( "Stream closed" ); } return res; } private byte[] getAndCheckBuf(){ byte[] res = buf; if( res is null ){ throw new IOException( "Stream closed" ); } return res; } private void fill(){ assert( pos == count ); pos = 0; count = 0; count = getAndCheckIstr().read( buf ); if( count < 0 ){ count = 0; istr = null; } } public int read(){ synchronized { if( pos >= count ){ fill(); if( pos >= count ){ return -1; } } return getAndCheckBuf()[pos++] & 0xFF; } } public int read( byte[] b, int off, int len ){ synchronized return super.read( b, off, len ); } public long skip( long n ){ synchronized return this.istr.skip(n); } public int available(){ synchronized { int istr_avail = 0; if( istr !is null ){ istr_avail = istr.available(); } return istr_avail + (count - pos); } } public synchronized void mark( int readlimit ){ implMissing( __FILE__, __LINE__ ); this.istr.mark( readlimit ); } public synchronized void reset(){ implMissing( __FILE__, __LINE__ ); this.istr.reset(); } public bool markSupported(){ implMissing( __FILE__, __LINE__ ); return false; } public void close(){ if (this.istr !is null) { this.istr.close(); } } }