annotate base/src/java/lang/wrappers.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 fcf926c91ca4
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
23
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
1 module java.lang.wrappers;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
2
120
536e43f63c81 Comprehensive update for Win32/Linux32 dmd-2.053/dmd-1.068+Tango-r5661
Denis Shelomovskij <verylonglogin.reg@gmail.com>
parents: 84
diff changeset
3 import java.lang.util;
23
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
4 import java.lang.String;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
5
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
6 abstract class ArrayWrapper{
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
7 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
8 abstract class ValueWrapper{
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
9 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
10
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
11 class ArrayWrapperT(T) : ArrayWrapper {
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
12 public T[] array;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
13 public this( T[] data ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
14 array = data;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
15 }
38
2e09b0e6857a work on phobosfication
Frank Benoit <benoit@tionex.de>
parents: 27
diff changeset
16 version(D_Version2){
2e09b0e6857a work on phobosfication
Frank Benoit <benoit@tionex.de>
parents: 27
diff changeset
17 static if( is(T == char )){
2e09b0e6857a work on phobosfication
Frank Benoit <benoit@tionex.de>
parents: 27
diff changeset
18 public this( String data ){
2e09b0e6857a work on phobosfication
Frank Benoit <benoit@tionex.de>
parents: 27
diff changeset
19 array = data.dup;
2e09b0e6857a work on phobosfication
Frank Benoit <benoit@tionex.de>
parents: 27
diff changeset
20 }
2e09b0e6857a work on phobosfication
Frank Benoit <benoit@tionex.de>
parents: 27
diff changeset
21 }
2e09b0e6857a work on phobosfication
Frank Benoit <benoit@tionex.de>
parents: 27
diff changeset
22 }
23
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
23 public override equals_t opEquals( Object o ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
24 if( auto other = cast(ArrayWrapperT!(T))o){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
25 return array == other.array;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
26 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
27 return false;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
28 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
29 public override hash_t toHash(){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
30 return (typeid(T[])).getHash(&array);
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
31 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
32 static if( is( T == char )){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
33 public override String toString(){
120
536e43f63c81 Comprehensive update for Win32/Linux32 dmd-2.053/dmd-1.068+Tango-r5661
Denis Shelomovskij <verylonglogin.reg@gmail.com>
parents: 84
diff changeset
34 return _idup(array);
23
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
35 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
36 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
37 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
38
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
39 class ValueWrapperT(T) : ValueWrapper {
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
40 public T value;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
41 public this( T data ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
42 value = data;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
43 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
44 static if( is(T==class) || is(T==interface)){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
45 public equals_t opEquals( Object other ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
46 if( auto o = cast(ValueWrapperT!(T))other ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
47 return value == o.value;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
48 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
49 if( auto o = cast(T)other ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
50 if( value is o ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
51 return true;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
52 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
53 if( value is null || o is null ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
54 return false;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
55 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
56 return value == o;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
57 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
58 return false;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
59 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
60 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
61 else{
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
62 public equals_t opEquals( Object other ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
63 if( auto o = cast(ValueWrapperT!(T))other ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
64 return value == o.value;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
65 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
66 return false;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
67 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
68 public equals_t opEquals( T other ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
69 return value == other;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
70 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
71 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
72 public override hash_t toHash(){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
73 return (typeid(T)).getHash(&value);
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
74 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
75 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
76
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
77 alias ArrayWrapperT!(byte) ArrayWrapperByte;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
78 alias ArrayWrapperT!(int) ArrayWrapperInt;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
79 alias ArrayWrapperT!(Object) ArrayWrapperObject;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
80 alias ArrayWrapperT!(char) ArrayWrapperString;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
81 alias ArrayWrapperT!(String) ArrayWrapperString2;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
82
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
83 Object[] StringArrayToObjectArray( String[] strs ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
84 Object[] res = new Object[strs.length];
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
85 foreach( idx, str; strs ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
86 res[idx] = new ArrayWrapperString(cast(char[])str);
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
87 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
88 return res;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
89 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
90
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
91 String stringcast( Object o ){
120
536e43f63c81 Comprehensive update for Win32/Linux32 dmd-2.053/dmd-1.068+Tango-r5661
Denis Shelomovskij <verylonglogin.reg@gmail.com>
parents: 84
diff changeset
92 if( auto swrapper = cast(ArrayWrapperString) o ){
536e43f63c81 Comprehensive update for Win32/Linux32 dmd-2.053/dmd-1.068+Tango-r5661
Denis Shelomovskij <verylonglogin.reg@gmail.com>
parents: 84
diff changeset
93 return swrapper.toString();
23
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
94 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
95 return null;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
96 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
97 String[] stringcast( Object[] objs ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
98 String[] res = new String[](objs.length);
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
99 foreach( idx, obj; objs ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
100 res[idx] = stringcast(obj);
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
101 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
102 return res;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
103 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
104 ArrayWrapperString stringcast( String str ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
105 return new ArrayWrapperString( cast(char[])str );
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
106 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
107 ArrayWrapperString[] stringcast( String[] strs ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
108 ArrayWrapperString[] res = new ArrayWrapperString[ strs.length ];
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
109 foreach( idx, str; strs ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
110 res[idx] = stringcast(str);
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
111 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
112 return res;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
113 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
114
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
115 String[] stringArrayFromObject( Object obj ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
116 if( auto wrapper = cast(ArrayWrapperString2)obj ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
117 return wrapper.array;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
118 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
119 if( auto wrapper = cast(ArrayWrapperObject)obj ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
120 String[] res = new String[ wrapper.array.length ];
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
121 foreach( idx, o; wrapper.array ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
122 if( auto swrapper = cast(ArrayWrapperString) o ){
120
536e43f63c81 Comprehensive update for Win32/Linux32 dmd-2.053/dmd-1.068+Tango-r5661
Denis Shelomovskij <verylonglogin.reg@gmail.com>
parents: 84
diff changeset
123 res[idx] = swrapper.toString();
23
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
124 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
125 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
126 return res;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
127 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
128 assert( obj is null ); // if not null, it was the wrong type
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
129 return null;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
130 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
131
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
132 T[] arrayFromObject(T)( Object obj ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
133 if( auto wrapper = cast(ArrayWrapperObject)obj ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
134 T[] res = new T[ wrapper.array.length ];
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
135 foreach( idx, o; wrapper.array ){
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
136 res[idx] = cast(T)o;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
137 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
138 return res;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
139 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
140 assert( obj is null ); // if not null, it was the wrong type
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
141 return null;
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
142 }
aaa0a4e20edf Added missing files to repository
Frank Benoit <benoit@tionex.de>
parents:
diff changeset
143
84
fcf926c91ca4 Added base classes
Frank Benoit <benoit@tionex.de>
parents: 38
diff changeset
144