Mercurial > projects > dwt2
view base/src/java/io/FileInputStream.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.FileInputStream; import java.lang.all; import java.io.File; import java.io.InputStream; version(Tango){ import TangoFile = tango.io.device.File; } else { // Phobos static import std.stream; } public class FileInputStream : java.io.InputStream.InputStream { alias java.io.InputStream.InputStream.read read; version(Tango){ private TangoFile.File conduit; } else { // Phobos private std.stream.File conduit; } private ubyte[] buffer; private int buf_pos; private int buf_size; private const int BUFFER_SIZE = 0x10000; private bool eof; public this ( String name ){ version(Tango){ conduit = new TangoFile.File( name ); } else { // Phobos conduit = new std.stream.File( name ); } buffer = new ubyte[]( BUFFER_SIZE ); } public this ( java.io.File.File file ){ implMissing( __FILE__, __LINE__ ); version(Tango){ conduit = new TangoFile.File( file.getAbsolutePath(), TangoFile.File.ReadExisting ); } else { // Phobos conduit = new std.stream.File( file.getAbsolutePath(), std.stream.FileMode.In ); } buffer = new ubyte[]( BUFFER_SIZE ); } public override int read(){ version(Tango){ if( eof ){ return -1; } try{ if( buf_pos == buf_size ){ buf_pos = 0; buf_size = conduit.input.read( buffer ); } if( buf_size <= 0 ){ eof = true; return -1; } assert( buf_pos < BUFFER_SIZE, Format( "{0} {1}", buf_pos, buf_size ) ); assert( buf_size <= BUFFER_SIZE ); int res = cast(int) buffer[ buf_pos ]; buf_pos++; return res; } catch( IOException e ){ eof = true; return -1; } } else { // Phobos if( eof ){ return -1; } try{ if( buf_pos == buf_size ){ buf_pos = 0; buf_size = conduit.read( buffer ); } if( buf_size <= 0 ){ eof = true; return -1; } assert( buf_pos < BUFFER_SIZE, Format( "{} {}", buf_pos, buf_size ) ); assert( buf_size <= BUFFER_SIZE ); int res = cast(int) buffer[ buf_pos ]; buf_pos++; return res; } catch( IOException e ){ eof = true; return -1; } } } public long skip( long n ){ implMissing( __FILE__, __LINE__ ); return 0L; } public int available(){ implMissing( __FILE__, __LINE__ ); return 0; } public override void close(){ conduit.close(); } }