Mercurial > projects > dwt2
view base/src/java/util/zip/InflaterInputStream.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.util.zip.InflaterInputStream; import java.lang.all; import java.io.InputStream; version(Tango){ import tango.io.stream.Zlib; import tango.io.device.Conduit; version(Windows){ pragma(lib,"zlib.lib"); } else{ pragma(lib,"zlib"); } } else { // Phobos import std.zlib; } version(Tango){ class InputStreamWrapper : tango.io.model.IConduit.InputStream { java.io.InputStream.InputStream istr; this( java.io.InputStream.InputStream istr ){ this.istr = istr; } size_t read (void[] dst){ int res = istr.read( cast(byte[])dst ); return res; } tango.io.model.IConduit.IConduit conduit (){ implMissing(__FILE__,__LINE__); return null; } void close (){ istr.close(); } tango.io.model.IConduit.InputStream input (){ implMissing(__FILE__,__LINE__); return null; } long seek (long offset, Anchor anchor = Anchor.Begin){ implMissing(__FILE__,__LINE__); return 0; } void[] load (size_t max = -1){ implMissing(__FILE__,__LINE__); return null; } IOStream flush (){ implMissing(__FILE__,__LINE__); return null; } } } else { // Phobos } public class InflaterInputStream : java.io.InputStream.InputStream { alias java.io.InputStream.InputStream.read read; alias java.io.InputStream.InputStream.skip skip; alias java.io.InputStream.InputStream.available available; alias java.io.InputStream.InputStream.close close; alias java.io.InputStream.InputStream.mark mark; alias java.io.InputStream.InputStream.reset reset; alias java.io.InputStream.InputStream.markSupported markSupported; protected byte[] buf; protected int len; package bool usesDefaultInflater = false; version(Tango){ ZlibInput tangoIstr; } else { // Phobos } public this ( java.io.InputStream.InputStream istr ){ version(Tango){ tangoIstr = new ZlibInput( new InputStreamWrapper(istr )); } else { // Phobos implMissingInPhobos(); } } public int read(){ version(Tango){ ubyte[1] data; uint res = tangoIstr.read( data ); if( res !is 1 ){ return data[0] & 0xFF; } return -1; } else { // Phobos implMissingInPhobos(); return -1; } } public int read( byte[] b, int off, int len ){ implMissing( __FILE__, __LINE__ ); return 0; } public int available(){ implMissing( __FILE__, __LINE__ ); return 0; } public long skip( long n ){ implMissing( __FILE__, __LINE__ ); return 0L; } public void close(){ implMissing( __FILE__, __LINE__ ); } public void fill(){ implMissing( __FILE__, __LINE__ ); } public bool markSupported(){ implMissing( __FILE__, __LINE__ ); return false; } public synchronized void mark( int readlimit ){ implMissing( __FILE__, __LINE__ ); } public synchronized void reset(){ implMissing( __FILE__, __LINE__ ); } }