projects/dwt-win: dwt/dwthelper/utils.d annotate

annotate dwt/dwthelper/utils.d @ 292:708cbfe418e7

sync with dwt-linux

author	Frank Benoit <benoit@tionex.de>
date	Thu, 21 Aug 2008 17:33:44 +0200
parents	35d730fb5e9f
children	a401002c3a1f

rev	line source
22 5f2e72114476 Image in work, this revision does not compile Frank Benoit <benoit@tionex.de> parents: 15 diff changeset	1 /**
0 5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	2 * Authors: Frank Benoit <keinfarbton@googlemail.com>
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	3 */
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	4 module dwt.dwthelper.utils;
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	5
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	6 public import dwt.dwthelper.System;
15 1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	7 public import Math = tango.math.Math;
0 5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	8
98 ecba636b634e package dwt/ole Frank Benoit <benoit@tionex.de> parents: 97 diff changeset	9 public import tango.core.Exception : IllegalArgumentException, IOException;
97 2e6eb5bd2c16 starting OLE Frank Benoit <benoit@tionex.de> parents: 84 diff changeset	10
0 5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	11 import tango.io.Stdout;
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	12 import tango.io.Print;
248 d10ff1f47f84 Add: version TANGOSVN Frank Benoit <benoit@tionex.de> parents: 235 diff changeset	13 static import tango.stdc.stringz;
194 3afcd4ddcf90 Update to SWT 3.3.2 Frank Benoit <benoit@tionex.de> parents: 190 diff changeset	14 static import tango.text.Util;
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	15 static import tango.text.Text;
0 5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	16 import tango.text.Unicode;
15 1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	17 import tango.text.convert.Utf;
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	18 import tango.core.Exception;
0 5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	19 import tango.stdc.stdlib : exit;
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	20
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	21 import tango.util.log.Trace;
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	22 import tango.text.UnicodeData;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	23 static import tango.util.collection.model.Seq;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	24
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	25 alias char[] String;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	26 alias tango.text.Text.Text!(char) StringBuffer;
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	27
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	28 void implMissing( String file, uint line ){
0 5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	29 Stderr.formatln( "implementation missing in file {} line {}", file, line );
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	30 Stderr.formatln( "exiting ..." );
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	31 exit(1);
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	32 }
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	33
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	34 abstract class ArrayWrapper{
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	35 }
33 39a9959ef14d Display + ImageList Frank Benoit <benoit@tionex.de> parents: 30 diff changeset	36 abstract class ValueWrapper{
39a9959ef14d Display + ImageList Frank Benoit <benoit@tionex.de> parents: 30 diff changeset	37 }
0 5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	38
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	39 class ArrayWrapperT(T) : ArrayWrapper {
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	40 public T[] array;
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	41 public this( T[] data ){
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	42 array = data;
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	43 }
282 92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	44 public override int opEquals( Object o ){
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	45 if( auto other = cast(ArrayWrapperT!(T))o){
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	46 return array == other.array;
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	47 }
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	48 return false;
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	49 }
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	50 public override hash_t toHash(){
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	51 return (typeid(T[])).getHash(&array);
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	52 }
0 5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	53 }
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	54
33 39a9959ef14d Display + ImageList Frank Benoit <benoit@tionex.de> parents: 30 diff changeset	55 class ValueWrapperT(T) : ValueWrapper {
39a9959ef14d Display + ImageList Frank Benoit <benoit@tionex.de> parents: 30 diff changeset	56 public T value;
39a9959ef14d Display + ImageList Frank Benoit <benoit@tionex.de> parents: 30 diff changeset	57 public this( T data ){
39a9959ef14d Display + ImageList Frank Benoit <benoit@tionex.de> parents: 30 diff changeset	58 value = data;
39a9959ef14d Display + ImageList Frank Benoit <benoit@tionex.de> parents: 30 diff changeset	59 }
282 92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	60 static if( is(T==class) \|\| is(T==interface)){
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	61 public int opEquals( Object other ){
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	62 if( auto o = cast(ValueWrapperT!(T))other ){
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	63 return value == o.value;
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	64 }
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	65 if( auto o = cast(T)other ){
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	66 if( value is o ){
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	67 return true;
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	68 }
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	69 if( value is null \|\| o is null ){
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	70 return false;
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	71 }
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	72 return value == o;
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	73 }
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	74 return false;
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	75 }
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	76 }
282 92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	77 else{
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	78 public int opEquals( Object other ){
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	79 if( auto o = cast(ValueWrapperT!(T))other ){
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	80 return value == o.value;
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	81 }
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	82 return false;
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	83 }
282 92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	84 public int opEquals( T other ){
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	85 return value == other;
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	86 }
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	87 }
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	88 public override hash_t toHash(){
92e785261f30 Fix: missing opEquals, toHash for ArrayWrapper. Frank Benoit <benoit@tionex.de> parents: 280 diff changeset	89 return (typeid(T)).getHash(&value);
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	90 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	91 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	92
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	93 class Boolean : ValueWrapperT!(bool) {
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	94 public static Boolean TRUE;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	95 public static Boolean FALSE;
200 fef1e3b37378 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 199 diff changeset	96
fef1e3b37378 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 199 diff changeset	97 static this(){
fef1e3b37378 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 199 diff changeset	98 TRUE = new Boolean(true);
fef1e3b37378 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 199 diff changeset	99 FALSE = new Boolean(false);
fef1e3b37378 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 199 diff changeset	100 }
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	101 public this( bool v ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	102 super(v);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	103 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	104
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	105 alias ValueWrapperT!(bool).opEquals opEquals;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	106 public int opEquals( int other ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	107 return value == ( other !is 0 );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	108 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	109 public int opEquals( Object other ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	110 if( auto o = cast(Boolean)other ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	111 return value == o.value;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	112 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	113 return false;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	114 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	115 public bool booleanValue(){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	116 return value;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	117 }
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	118 public static Boolean valueOf( String s ){
201 6293c40673a4 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 200 diff changeset	119 if( s == "yes" \|\| s == "true" ){
6293c40673a4 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 200 diff changeset	120 return TRUE;
6293c40673a4 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 200 diff changeset	121 }
6293c40673a4 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 200 diff changeset	122 return FALSE;
6293c40673a4 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 200 diff changeset	123 }
6293c40673a4 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 200 diff changeset	124 public static Boolean valueOf( bool b ){
6293c40673a4 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 200 diff changeset	125 return b ? TRUE : FALSE;
6293c40673a4 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 200 diff changeset	126 }
33 39a9959ef14d Display + ImageList Frank Benoit <benoit@tionex.de> parents: 30 diff changeset	127 }
39a9959ef14d Display + ImageList Frank Benoit <benoit@tionex.de> parents: 30 diff changeset	128
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	129 alias Boolean ValueWrapperBool;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	130
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	131
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	132 class Byte : ValueWrapperT!(byte) {
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	133 public static byte parseByte( String s ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	134 try{
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	135 int res = tango.text.convert.Integer.parse( s );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	136 if( res < byte.min \|\| res > byte.max ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	137 throw new NumberFormatException( "out of range" );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	138 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	139 return res;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	140 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	141 catch( IllegalArgumentException e ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	142 throw new NumberFormatException( e );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	143 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	144 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	145 this( byte value ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	146 super( value );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	147 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	148 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	149 alias Byte ValueWrapperByte;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	150
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	151
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	152 class Integer : ValueWrapperT!(int) {
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	153
229 5ff96efb6f4b Additions for forms Frank Benoit <benoit@tionex.de> parents: 228 diff changeset	154 public static const int MIN_VALUE = 0x80000000;
5ff96efb6f4b Additions for forms Frank Benoit <benoit@tionex.de> parents: 228 diff changeset	155 public static const int MAX_VALUE = 0x7fffffff;
5ff96efb6f4b Additions for forms Frank Benoit <benoit@tionex.de> parents: 228 diff changeset	156 public static const int SIZE = 32;
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	157
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	158 public this ( int value ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	159 super( value );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	160 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	161
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	162 public this ( String s ){
200 fef1e3b37378 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 199 diff changeset	163 super(parseInt(s));
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	164 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	165
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	166 public static String toString( int i, int radix ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	167 switch( radix ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	168 case 2:
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	169 return toBinaryString(i);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	170 case 8:
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	171 return toOctalString(i);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	172 case 10:
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	173 return toString(i);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	174 case 16:
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	175 return toHexString(i);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	176 default:
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	177 implMissing( __FILE__, __LINE__ );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	178 return null;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	179 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	180 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	181
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	182 public static String toHexString( int i ){
248 d10ff1f47f84 Add: version TANGOSVN Frank Benoit <benoit@tionex.de> parents: 235 diff changeset	183 return tango.text.convert.Integer.toString(i, "x" );
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	184 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	185
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	186 public static String toOctalString( int i ){
248 d10ff1f47f84 Add: version TANGOSVN Frank Benoit <benoit@tionex.de> parents: 235 diff changeset	187 return tango.text.convert.Integer.toString(i, "o" );
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	188 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	189
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	190 public static String toBinaryString( int i ){
248 d10ff1f47f84 Add: version TANGOSVN Frank Benoit <benoit@tionex.de> parents: 235 diff changeset	191 return tango.text.convert.Integer.toString(i, "b" );
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	192 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	193
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	194 public static String toString( int i ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	195 return tango.text.convert.Integer.toString(i);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	196 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	197
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	198 public static int parseInt( String s, int radix ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	199 try{
292 708cbfe418e7 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 287 diff changeset	200 return tango.text.convert.Integer.toLong( s, radix );
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	201 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	202 catch( IllegalArgumentException e ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	203 throw new NumberFormatException( e );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	204 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	205 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	206
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	207 public static int parseInt( String s ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	208 try{
292 708cbfe418e7 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 287 diff changeset	209 return tango.text.convert.Integer.toLong( s );
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	210 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	211 catch( IllegalArgumentException e ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	212 throw new NumberFormatException( e );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	213 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	214 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	215
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	216 public static Integer valueOf( String s, int radix ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	217 implMissing( __FILE__, __LINE__ );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	218 return null;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	219 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	220
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	221 public static Integer valueOf( String s ){
200 fef1e3b37378 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 199 diff changeset	222 return valueOf( parseInt(s));
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	223 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	224
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	225 public static Integer valueOf( int i ){
200 fef1e3b37378 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 199 diff changeset	226 return new Integer(i);
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	227 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	228
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	229 public byte byteValue(){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	230 return cast(byte)value;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	231 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	232
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	233 public short shortValue(){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	234 return cast(short)value;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	235 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	236
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	237 public int intValue(){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	238 return value;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	239 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	240
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	241 public long longValue(){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	242 return cast(long)value;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	243 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	244
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	245 public float floatValue(){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	246 return cast(float)value;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	247 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	248
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	249 public double doubleValue(){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	250 return cast(double)value;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	251 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	252
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	253 public override hash_t toHash(){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	254 return intValue();
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	255 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	256
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	257 public override String toString(){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	258 return tango.text.convert.Integer.toString( value );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	259 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	260 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	261 alias Integer ValueWrapperInt;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	262
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	263 class Double : ValueWrapperT!(double) {
273 8632408a70aa Minimal adjustement for draw2d Frank Benoit <benoit@tionex.de> parents: 264 diff changeset	264 public static double MAX_VALUE = double.max;
8632408a70aa Minimal adjustement for draw2d Frank Benoit <benoit@tionex.de> parents: 264 diff changeset	265 public static double MIN_VALUE = double.min;
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	266 this( double value ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	267 super(value);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	268 }
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	269 this( String str ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	270 implMissing( __FILE__, __LINE__ );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	271 super(0.0);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	272 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	273 public double doubleValue(){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	274 return value;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	275 }
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	276 public static String toString( double value ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	277 implMissing( __FILE__, __LINE__ );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	278 return null;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	279 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	280 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	281
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	282 class Float : ValueWrapperT!(float) {
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	283
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	284 public static float POSITIVE_INFINITY = (1.0f / 0.0f);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	285 public static float NEGATIVE_INFINITY = ((-1.0f) / 0.0f);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	286 public static float NaN = (0.0f / 0.0f);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	287 public static float MAX_VALUE = 3.4028235e+38f;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	288 public static float MIN_VALUE = 1.4e-45f;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	289 public static int SIZE = 32;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	290
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	291 this( float value ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	292 super(value);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	293 }
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	294 this( String str ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	295 implMissing( __FILE__, __LINE__ );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	296 super(0.0);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	297 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	298 public float floatValue(){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	299 return value;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	300 }
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	301 public static String toString( float value ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	302 implMissing( __FILE__, __LINE__ );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	303 return null;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	304 }
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	305 public static float parseFloat( String s ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	306 try{
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	307 return tango.text.convert.Float.toFloat( s );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	308 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	309 catch( IllegalArgumentException e ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	310 throw new NumberFormatException( e );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	311 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	312 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	313
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	314 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	315 class Long : ValueWrapperT!(long) {
283 98fd89730a00 Add Long min/max value Frank Benoit <benoit@tionex.de> parents: 282 diff changeset	316 public static const long MIN_VALUE = long.min;
98fd89730a00 Add Long min/max value Frank Benoit <benoit@tionex.de> parents: 282 diff changeset	317 public static const long MAX_VALUE = long.max;
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	318 this( long value ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	319 super(value);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	320 }
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	321 this( String str ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	322 implMissing( __FILE__, __LINE__ );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	323 super(0);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	324 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	325 public long longValue(){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	326 return value;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	327 }
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	328 public static long parseLong(String s){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	329 implMissing( __FILE__, __LINE__ );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	330 return 0;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	331 }
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	332 public static String toString( double value ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	333 implMissing( __FILE__, __LINE__ );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	334 return null;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	335 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	336 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	337 alias Long ValueWrapperLong;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	338
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	339
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	340 // alias ValueWrapperT!(int) ValueWrapperInt;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	341
0 5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	342 alias ArrayWrapperT!(byte) ArrayWrapperByte;
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	343 alias ArrayWrapperT!(int) ArrayWrapperInt;
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	344 alias ArrayWrapperT!(Object) ArrayWrapperObject;
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	345 alias ArrayWrapperT!(char) ArrayWrapperString;
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	346 alias ArrayWrapperT!(String) ArrayWrapperString2;
0 5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	347
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	348 Object[] StringArrayToObjectArray( String[] strs ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	349 Object[] res = new Object[strs.length];
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	350 foreach( idx, str; strs ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	351 res[idx] = new ArrayWrapperString(str);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	352 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	353 return res;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	354 }
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	355 int codepointIndexToIndex( String str, int cpIndex ){
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	356 int cps = cpIndex;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	357 int res = 0;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	358 while( cps > 0 ){
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	359 cps--;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	360 if( str[res] < 0x80 ){
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	361 res+=1;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	362 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	363 else if( str[res] < 0xE0 ){
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	364 res+=2;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	365 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	366 else if( str[res] & 0xF0 ){
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	367 res+=3;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	368 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	369 else{
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	370 res+=4;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	371 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	372 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	373 return res;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	374 }
292 708cbfe418e7 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 287 diff changeset	375
708cbfe418e7 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 287 diff changeset	376 /++
708cbfe418e7 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 287 diff changeset	377 +
708cbfe418e7 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 287 diff changeset	378 +/
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	379 int indexToCodepointIndex( String str, int index ){
277 f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	380 if( index < 0 ) return index;
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	381 int i = 0;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	382 int res = 0;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	383 while( i < index ){
277 f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	384 if( i >= str.length ){
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	385 break;
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	386 }
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	387 if( str[i] < 0x80 ){
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	388 i+=1;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	389 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	390 else if( str[i] < 0xE0 ){
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	391 i+=2;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	392 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	393 else if( str[i] & 0xF0 ){
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	394 i+=3;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	395 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	396 else{
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	397 i+=4;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	398 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	399 res++;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	400 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	401 return res;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	402 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	403
292 708cbfe418e7 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 287 diff changeset	404 /++
708cbfe418e7 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 287 diff changeset	405 + Get that String, that contains the next codepoint of a String.
708cbfe418e7 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 287 diff changeset	406 +/
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	407 String firstCodePointStr( String str, out int consumed ){
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	408 dchar[1] buf;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	409 uint ate;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	410 dchar[] res = str.toString32( buf, &ate );
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	411 consumed = ate;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	412 return str[ 0 .. ate ];
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	413 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	414
292 708cbfe418e7 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 287 diff changeset	415 /++
708cbfe418e7 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 287 diff changeset	416 + Get first codepoint of a String. If an offset is needed, simply use a slice:
708cbfe418e7 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 287 diff changeset	417 + ---
708cbfe418e7 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 287 diff changeset	418 + dchar res = str[ offset .. $ ].firstCodePoint();
708cbfe418e7 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 287 diff changeset	419 + ---
708cbfe418e7 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 287 diff changeset	420 +/
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	421 dchar firstCodePoint( String str ){
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	422 int dummy;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	423 return firstCodePoint( str, dummy );
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	424 }
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	425 dchar firstCodePoint( String str, out int consumed ){
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	426 dchar[1] buf;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	427 uint ate;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	428 dchar[] res = str.toString32( buf, &ate );
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	429 consumed = ate;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	430 if( ate is 0 \|\| res.length is 0 ){
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	431 Trace.formatln( "dwthelper.utils {}: str.length={} str={:X2}", __LINE__, str.length, cast(ubyte[])str );
0 5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	432 }
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	433 assert( ate > 0 );
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	434 assert( res.length is 1 );
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	435 return res[0];
0 5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	436 }
287 35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	437 dchar firstCodePoint( wchar[] str, out int consumed ){
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	438 dchar[1] buf;
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	439 uint ate;
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	440 dchar[] res = str.toString32( buf, &ate );
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	441 consumed = ate;
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	442 if( ate is 0 \|\| res.length is 0 ){
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	443 Trace.formatln( "dwthelper.utils {}: str.length={} str={:X2}", __LINE__, str.length, cast(ubyte[])str );
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	444 }
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	445 assert( ate > 0 );
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	446 assert( res.length is 1 );
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	447 return res[0];
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	448 }
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	449
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	450 String dcharToString( dchar key ){
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	451 dchar[1] buf;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	452 buf[0] = key;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	453 return tango.text.convert.Utf.toString( buf );
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	454 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	455
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	456 int codepointCount( String str ){
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	457 scope dchar[] buf = new dchar[]( str.length );
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	458 uint ate;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	459 dchar[] res = tango.text.convert.Utf.toString32( str, buf, &ate );
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	460 assert( ate is str.length );
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	461 return res.length;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	462 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	463
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	464 alias tango.text.convert.Utf.toString16 toString16;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	465 alias tango.text.convert.Utf.toString toString;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	466
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	467 int getRelativeCodePointOffset( String str, int startIndex, int searchRelCp ){
287 35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	468 return getAbsoluteCodePointOffset( str, startIndex, searchRelCp ) - startIndex;
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	469 }
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	470 int getAbsoluteCodePointOffset( String str, int startIndex, int searchRelCp ){
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	471 int ignore;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	472 int i = startIndex;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	473 if( searchRelCp > 0 ){
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	474 while( searchRelCp !is 0 ){
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	475
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	476 if( ( i < str.length )
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	477 && ( str[i] & 0x80 ) is 0x00 )
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	478 {
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	479 i+=1;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	480 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	481 else if( ( i+1 < str.length )
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	482 && (( str[i+1] & 0xC0 ) is 0x80 )
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	483 && (( str[i ] & 0xE0 ) is 0xC0 ))
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	484 {
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	485 i+=2;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	486 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	487 else if( ( i+2 < str.length )
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	488 && (( str[i+2] & 0xC0 ) is 0x80 )
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	489 && (( str[i+1] & 0xC0 ) is 0x80 )
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	490 && (( str[i ] & 0xF0 ) is 0xE0 ))
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	491 {
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	492 i+=3;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	493 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	494 else if(( i+3 < str.length )
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	495 && (( str[i+3] & 0xC0 ) is 0x80 )
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	496 && (( str[i+2] & 0xC0 ) is 0x80 )
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	497 && (( str[i+1] & 0xC0 ) is 0x80 )
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	498 && (( str[i ] & 0xF8 ) is 0xF0 ))
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	499 {
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	500 i+=4;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	501 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	502 else{
277 f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	503 Trace.formatln( "invalid utf8 characters: {:X2}", cast(ubyte[]) str );
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	504 tango.text.convert.Utf.onUnicodeError( "invalid utf8 input", i );
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	505 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	506 searchRelCp--;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	507 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	508 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	509 else if( searchRelCp < 0 ){
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	510 while( searchRelCp !is 0 ){
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	511 do{
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	512 i--;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	513 if( i < 0 ){
287 35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	514 return startIndex-1;
277 f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	515 //Trace.formatln( "dwthelper.utils getRelativeCodePointOffset {}: str={}, startIndex={}, searchRelCp={}", __LINE__, str, startIndex, searchRelCp );
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	516 //tango.text.convert.Utf.onUnicodeError( "invalid utf8 input", i );
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	517 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	518 } while(( str[i] & 0xC0 ) is 0x80 );
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	519 searchRelCp++;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	520 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	521 }
287 35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	522 return i;
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	523 }
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	524 int getAbsoluteCodePointOffset( wchar[] str, int startIndex, int searchRelCp ){
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	525 int ignore;
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	526 int i = startIndex;
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	527 if( searchRelCp > 0 ){
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	528 while( searchRelCp !is 0 ){
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	529
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	530 if( ( i < str.length )
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	531 && ( str[i] & 0xD800 ) !is 0xD800 )
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	532 {
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	533 i+=1;
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	534 }
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	535 else if( ( i+1 < str.length )
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	536 && (( str[i+1] & 0xDC00 ) is 0xDC00 )
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	537 && (( str[i ] & 0xDC00 ) is 0xD800 ))
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	538 {
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	539 i+=2;
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	540 }
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	541 else{
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	542 Trace.formatln( "invalid utf8 characters: {:X2}", cast(ubyte[]) str );
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	543 tango.text.convert.Utf.onUnicodeError( "invalid utf8 input", i );
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	544 }
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	545 searchRelCp--;
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	546 }
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	547 }
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	548 else if( searchRelCp < 0 ){
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	549 while( searchRelCp !is 0 ){
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	550 do{
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	551 i--;
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	552 if( i < 0 ){
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	553 return startIndex-1;
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	554 //Trace.formatln( "dwthelper.utils getRelativeCodePointOffset {}: str={}, startIndex={}, searchRelCp={}", __LINE__, str, startIndex, searchRelCp );
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	555 //tango.text.convert.Utf.onUnicodeError( "invalid utf8 input", i );
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	556 }
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	557 } while(( str[i] & 0xDC00 ) is 0xDC00 );
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	558 searchRelCp++;
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	559 }
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	560 }
35d730fb5e9f TextLayout with wchar[] segments text and translation tables Frank Benoit <benoit@tionex.de> parents: 283 diff changeset	561 return i;
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	562 }
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	563 dchar getRelativeCodePoint( String str, int startIndex, int searchRelCp, out int relIndex ){
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	564 relIndex = getRelativeCodePointOffset( str, startIndex, searchRelCp );
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	565 int ignore;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	566 return firstCodePoint( str[ startIndex+relIndex .. $ ], ignore );
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	567 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	568
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	569 int utf8AdjustOffset( String str, int offset ){
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	570 if( str.length <= offset \|\| offset <= 0 ){
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	571 return offset;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	572 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	573 while(( str[offset] & 0xC0 ) is 0x80 ){
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	574 offset--;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	575 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	576 return offset;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	577 }
277 f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	578 int utf8OffsetIncr( String str, int offset ){
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	579 int res = offset +1;
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	580 if( str.length <= res \|\| res <= 0 ){
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	581 return res;
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	582 }
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	583 int tries = 4;
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	584 while(( str[res] & 0xC0 ) is 0x80 ){
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	585 res++;
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	586 assert( tries-- > 0 );
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	587 }
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	588 return res;
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	589 }
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	590 int utf8OffsetDecr( String str, int offset ){
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	591 int res = offset-1;
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	592 if( str.length <= res \|\| res <= 0 ){
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	593 return res;
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	594 }
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	595 int tries = 4;
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	596 while(( str[res] & 0xC0 ) is 0x80 ){
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	597 res--;
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	598 assert( tries-- > 0 );
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	599 }
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	600 Trace.formatln( "utf8OffsetDecr {}->{}", offset, res );
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	601 Trace.memory( str );
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	602 return res;
f18872e0f232 unicode utils Frank Benoit <benoit@tionex.de> parents: 273 diff changeset	603 }
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	604
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	605 bool CharacterIsDefined( dchar ch ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	606 return (ch in tango.text.UnicodeData.unicodeData) !is null;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	607 }
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	608 dchar CharacterFirstToLower( String str ){
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	609 int consumed;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	610 return CharacterFirstToLower( str, consumed );
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	611 }
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	612 dchar CharacterFirstToLower( String str, out int consumed ){
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	613 dchar[1] buf;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	614 buf[0] = firstCodePoint( str, consumed );
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	615 dchar[] r = tango.text.Unicode.toLower( buf );
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	616 return r[0];
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	617 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	618
0 5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	619 dchar CharacterToLower( dchar c ){
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	620 dchar[] r = tango.text.Unicode.toLower( [c] );
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	621 return r[0];
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	622 }
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	623 dchar CharacterToUpper( dchar c ){
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	624 dchar[] r = tango.text.Unicode.toUpper( [c] );
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	625 return r[0];
5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	626 }
52 0553f4e8ed93 Link Frank Benoit <benoit@tionex.de> parents: 40 diff changeset	627 bool CharacterIsWhitespace( dchar c ){
0553f4e8ed93 Link Frank Benoit <benoit@tionex.de> parents: 40 diff changeset	628 return tango.text.Unicode.isWhitespace( c );
0553f4e8ed93 Link Frank Benoit <benoit@tionex.de> parents: 40 diff changeset	629 }
65 66203354c9d3 Spinner Frank Benoit <benoit@tionex.de> parents: 57 diff changeset	630 bool CharacterIsDigit( dchar c ){
66203354c9d3 Spinner Frank Benoit <benoit@tionex.de> parents: 57 diff changeset	631 return tango.text.Unicode.isDigit( c );
66203354c9d3 Spinner Frank Benoit <benoit@tionex.de> parents: 57 diff changeset	632 }
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	633 bool CharacterIsLetter( dchar c ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	634 return tango.text.Unicode.isLetter( c );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	635 }
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	636 public String toUpperCase( String str ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	637 return tango.text.Unicode.toUpper( str );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	638 }
0 5406a8f6526d Add initial files John Reimer <terminal.node@gmail.com parents: diff changeset	639
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	640 public int indexOf( String str, char searched ){
15 1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	641 int res = tango.text.Util.locate( str, searched );
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	642 if( res is str.length ) res = -1;
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	643 return res;
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	644 }
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	645
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	646 public int indexOf( String str, char searched, int startpos ){
15 1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	647 int res = tango.text.Util.locate( str, searched, startpos );
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	648 if( res is str.length ) res = -1;
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	649 return res;
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	650 }
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	651
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	652 public int indexOf(String str, String ch){
65 66203354c9d3 Spinner Frank Benoit <benoit@tionex.de> parents: 57 diff changeset	653 return indexOf( str, ch, 0 );
66203354c9d3 Spinner Frank Benoit <benoit@tionex.de> parents: 57 diff changeset	654 }
66203354c9d3 Spinner Frank Benoit <benoit@tionex.de> parents: 57 diff changeset	655
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	656 public int indexOf(String str, String ch, int start){
15 1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	657 int res = tango.text.Util.locatePattern( str, ch, start );
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	658 if( res is str.length ) res = -1;
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	659 return res;
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	660 }
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	661
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	662 public int lastIndexOf(String str, char ch){
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	663 return lastIndexOf( str, ch, str.length );
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	664 }
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	665 public int lastIndexOf(String str, char ch, int formIndex){
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	666 int res = tango.text.Util.locatePrior( str, ch, formIndex );
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	667 if( res is str.length ) res = -1;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	668 return res;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	669 }
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	670 public int lastIndexOf(String str, String ch ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	671 return lastIndexOf( str, ch, str.length );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	672 }
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	673 public int lastIndexOf(String str, String ch, int start ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	674 int res = tango.text.Util.locatePatternPrior( str, ch, start );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	675 if( res is str.length ) res = -1;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	676 return res;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	677 }
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	678
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	679 public String replace( String str, char from, char to ){
84 00a333240696 FileDialog, sync dwthelper with dwt-linux, some TCHAR issues Frank Benoit <benoit@tionex.de> parents: 79 diff changeset	680 return tango.text.Util.replace( str.dup, from, to );
00a333240696 FileDialog, sync dwthelper with dwt-linux, some TCHAR issues Frank Benoit <benoit@tionex.de> parents: 79 diff changeset	681 }
00a333240696 FileDialog, sync dwthelper with dwt-linux, some TCHAR issues Frank Benoit <benoit@tionex.de> parents: 79 diff changeset	682
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	683 public String substring( String str, int start ){
15 1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	684 return str[ start .. $ ].dup;
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	685 }
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	686
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	687 public String substring( String str, int start, int end ){
15 1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	688 return str[ start .. end ].dup;
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	689 }
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	690
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	691 public wchar[] substring( wchar[] str, int start ){
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	692 return str[ start .. $ ].dup;
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	693 }
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	694
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	695 public wchar[] substring( wchar[] str, int start, int end ){
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	696 return str[ start .. end ].dup;
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	697 }
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	698
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	699 public char charAt( String str, int pos ){
15 1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	700 return str[ pos ];
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	701 }
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	702
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	703 public void getChars( String src, int srcBegin, int srcEnd, String dst, int dstBegin){
23 f5482da87ed8 Image, ImageData Frank Benoit <benoit@tionex.de> parents: 22 diff changeset	704 dst[ dstBegin .. dstBegin + srcEnd - srcBegin ] = src[ srcBegin .. srcEnd ];
22 5f2e72114476 Image in work, this revision does not compile Frank Benoit <benoit@tionex.de> parents: 15 diff changeset	705 }
5f2e72114476 Image in work, this revision does not compile Frank Benoit <benoit@tionex.de> parents: 15 diff changeset	706
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	707 public wchar[] toCharArray( String str ){
30 1e14cb29290a TextLayout Frank Benoit <benoit@tionex.de> parents: 28 diff changeset	708 return toString16( str );
28 b868bfa989cd Cursor Frank Benoit <benoit@tionex.de> parents: 23 diff changeset	709 }
b868bfa989cd Cursor Frank Benoit <benoit@tionex.de> parents: 23 diff changeset	710
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	711 public bool endsWith( String src, String pattern ){
22 5f2e72114476 Image in work, this revision does not compile Frank Benoit <benoit@tionex.de> parents: 15 diff changeset	712 if( src.length < pattern.length ){
5f2e72114476 Image in work, this revision does not compile Frank Benoit <benoit@tionex.de> parents: 15 diff changeset	713 return false;
5f2e72114476 Image in work, this revision does not compile Frank Benoit <benoit@tionex.de> parents: 15 diff changeset	714 }
5f2e72114476 Image in work, this revision does not compile Frank Benoit <benoit@tionex.de> parents: 15 diff changeset	715 return src[ $-pattern.length .. $ ] == pattern;
5f2e72114476 Image in work, this revision does not compile Frank Benoit <benoit@tionex.de> parents: 15 diff changeset	716 }
5f2e72114476 Image in work, this revision does not compile Frank Benoit <benoit@tionex.de> parents: 15 diff changeset	717
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	718 public bool equals( String src, String other ){
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	719 return src == other;
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	720 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	721
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	722 public bool equalsIgnoreCase( String src, String other ){
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	723 return tango.text.Unicode.toFold(src) == tango.text.Unicode.toFold(other);
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	724 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	725
224 679fb4a215dc Added the compareToIgnoreCase to utils Frank Benoit <benoit@tionex.de> parents: 212 diff changeset	726 public int compareToIgnoreCase( String src, String other ){
235 ec7da638647f Fix string compare in dwthelper/utils.d Frank Benoit <benoit@tionex.de> parents: 229 diff changeset	727 return compareTo( tango.text.Unicode.toFold(src), tango.text.Unicode.toFold(other));
224 679fb4a215dc Added the compareToIgnoreCase to utils Frank Benoit <benoit@tionex.de> parents: 212 diff changeset	728 }
229 5ff96efb6f4b Additions for forms Frank Benoit <benoit@tionex.de> parents: 228 diff changeset	729 public int compareTo( String src, String other ){
235 ec7da638647f Fix string compare in dwthelper/utils.d Frank Benoit <benoit@tionex.de> parents: 229 diff changeset	730 return typeid(String).compare( cast(void)&src, cast(void)&other );
229 5ff96efb6f4b Additions for forms Frank Benoit <benoit@tionex.de> parents: 228 diff changeset	731 }
224 679fb4a215dc Added the compareToIgnoreCase to utils Frank Benoit <benoit@tionex.de> parents: 212 diff changeset	732
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	733 public bool startsWith( String src, String pattern ){
98 ecba636b634e package dwt/ole Frank Benoit <benoit@tionex.de> parents: 97 diff changeset	734 if( src.length < pattern.length ){
ecba636b634e package dwt/ole Frank Benoit <benoit@tionex.de> parents: 97 diff changeset	735 return false;
ecba636b634e package dwt/ole Frank Benoit <benoit@tionex.de> parents: 97 diff changeset	736 }
ecba636b634e package dwt/ole Frank Benoit <benoit@tionex.de> parents: 97 diff changeset	737 return src[ 0 .. pattern.length ] == pattern;
ecba636b634e package dwt/ole Frank Benoit <benoit@tionex.de> parents: 97 diff changeset	738 }
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	739
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	740 public String toLowerCase( String src ){
22 5f2e72114476 Image in work, this revision does not compile Frank Benoit <benoit@tionex.de> parents: 15 diff changeset	741 return tango.text.Unicode.toLower( src );
5f2e72114476 Image in work, this revision does not compile Frank Benoit <benoit@tionex.de> parents: 15 diff changeset	742 }
5f2e72114476 Image in work, this revision does not compile Frank Benoit <benoit@tionex.de> parents: 15 diff changeset	743
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	744 public hash_t toHash( String src ){
ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	745 return typeid(String).getHash(&src);
177 6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	746 }
6bfa783ac0b4 Sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 98 diff changeset	747
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	748 public String trim( String str ){
190 72ef824d4983 dwt.program.Program Frank Benoit <benoit@tionex.de> parents: 187 diff changeset	749 return tango.text.Util.trim( str ).dup;
72ef824d4983 dwt.program.Program Frank Benoit <benoit@tionex.de> parents: 187 diff changeset	750 }
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	751 public String intern( String str ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	752 return str;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	753 }
190 72ef824d4983 dwt.program.Program Frank Benoit <benoit@tionex.de> parents: 187 diff changeset	754
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	755 public char* toStringzValidPtr( String src ){
187 bcdc37794717 Reverted changes from previous wrong reverting changes: Frank Benoit <benoit@tionex.de> parents: 183 diff changeset	756 if( src ){
bcdc37794717 Reverted changes from previous wrong reverting changes: Frank Benoit <benoit@tionex.de> parents: 183 diff changeset	757 return src.toStringz();
bcdc37794717 Reverted changes from previous wrong reverting changes: Frank Benoit <benoit@tionex.de> parents: 183 diff changeset	758 }
bcdc37794717 Reverted changes from previous wrong reverting changes: Frank Benoit <benoit@tionex.de> parents: 183 diff changeset	759 else{
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	760 static const String nullPtr = "\0";
187 bcdc37794717 Reverted changes from previous wrong reverting changes: Frank Benoit <benoit@tionex.de> parents: 183 diff changeset	761 return nullPtr.ptr;
bcdc37794717 Reverted changes from previous wrong reverting changes: Frank Benoit <benoit@tionex.de> parents: 183 diff changeset	762 }
bcdc37794717 Reverted changes from previous wrong reverting changes: Frank Benoit <benoit@tionex.de> parents: 183 diff changeset	763 }
bcdc37794717 Reverted changes from previous wrong reverting changes: Frank Benoit <benoit@tionex.de> parents: 183 diff changeset	764
248 d10ff1f47f84 Add: version TANGOSVN Frank Benoit <benoit@tionex.de> parents: 235 diff changeset	765 public alias tango.stdc.stringz.toStringz toStringz;
d10ff1f47f84 Add: version TANGOSVN Frank Benoit <benoit@tionex.de> parents: 235 diff changeset	766 public alias tango.stdc.stringz.toString16z toString16z;
d10ff1f47f84 Add: version TANGOSVN Frank Benoit <benoit@tionex.de> parents: 235 diff changeset	767 public alias tango.stdc.stringz.fromStringz fromStringz;
d10ff1f47f84 Add: version TANGOSVN Frank Benoit <benoit@tionex.de> parents: 235 diff changeset	768 public alias tango.stdc.stringz.fromString16z fromString16z;
d10ff1f47f84 Add: version TANGOSVN Frank Benoit <benoit@tionex.de> parents: 235 diff changeset	769
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	770 static String toHex(uint value, bool prefix = true, int radix = 8){
248 d10ff1f47f84 Add: version TANGOSVN Frank Benoit <benoit@tionex.de> parents: 235 diff changeset	771 return tango.text.convert.Integer.toString(
d10ff1f47f84 Add: version TANGOSVN Frank Benoit <benoit@tionex.de> parents: 235 diff changeset	772 value,
d10ff1f47f84 Add: version TANGOSVN Frank Benoit <benoit@tionex.de> parents: 235 diff changeset	773 radix is 10 ? "d" :
d10ff1f47f84 Add: version TANGOSVN Frank Benoit <benoit@tionex.de> parents: 235 diff changeset	774 radix is 8 ? "o" :
d10ff1f47f84 Add: version TANGOSVN Frank Benoit <benoit@tionex.de> parents: 235 diff changeset	775 radix is 16 ? "x" :
d10ff1f47f84 Add: version TANGOSVN Frank Benoit <benoit@tionex.de> parents: 235 diff changeset	776 "d" );
d10ff1f47f84 Add: version TANGOSVN Frank Benoit <benoit@tionex.de> parents: 235 diff changeset	777 }
15 1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	778
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	779 class RuntimeException : Exception {
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	780 this( String e = null){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	781 super(e);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	782 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	783 this( Exception e ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	784 super(e.toString);
199 3d5dbb27dec2 RuntimeException with getCause Frank Benoit <benoit@tionex.de> parents: 197 diff changeset	785 next = e;
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	786 }
199 3d5dbb27dec2 RuntimeException with getCause Frank Benoit <benoit@tionex.de> parents: 197 diff changeset	787 public Exception getCause() {
3d5dbb27dec2 RuntimeException with getCause Frank Benoit <benoit@tionex.de> parents: 197 diff changeset	788 return next;
3d5dbb27dec2 RuntimeException with getCause Frank Benoit <benoit@tionex.de> parents: 197 diff changeset	789 }
3d5dbb27dec2 RuntimeException with getCause Frank Benoit <benoit@tionex.de> parents: 197 diff changeset	790
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	791 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	792 class IndexOutOfBoundsException : Exception {
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	793 this( String e = null){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	794 super(e);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	795 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	796 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	797
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	798 class UnsupportedOperationException : RuntimeException {
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	799 this( String e = null){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	800 super(e);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	801 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	802 this( Exception e ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	803 super(e.toString);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	804 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	805 }
15 1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	806 class NumberFormatException : IllegalArgumentException {
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	807 this( String e ){
15 1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	808 super(e);
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	809 }
57 41dbc4d9faab Update to tango trunk -r3152. Thanks DavidLeon for the adjustment of TracedException to Exception and creating the patch. Frank Benoit <benoit@tionex.de> parents: 52 diff changeset	810 this( Exception e ){
15 1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	811 super(e.toString);
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	812 }
1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	813 }
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	814 class NullPointerException : Exception {
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	815 this( String e = null ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	816 super(e);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	817 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	818 this( Exception e ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	819 super(e.toString);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	820 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	821 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	822 class IllegalStateException : Exception {
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	823 this( String e = null ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	824 super(e);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	825 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	826 this( Exception e ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	827 super(e.toString);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	828 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	829 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	830 class InterruptedException : Exception {
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	831 this( String e = null ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	832 super(e);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	833 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	834 this( Exception e ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	835 super(e.toString);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	836 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	837 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	838 class InvocationTargetException : Exception {
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	839 Exception cause;
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	840 this( Exception e = null, String msg = null ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	841 super(msg);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	842 cause = e;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	843 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	844
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	845 alias getCause getTargetException;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	846 Exception getCause(){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	847 return cause;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	848 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	849 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	850 class MissingResourceException : Exception {
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	851 String classname;
ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	852 String key;
ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	853 this( String msg, String classname, String key ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	854 super(msg);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	855 this.classname = classname;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	856 this.key = key;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	857 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	858 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	859 class ParseException : Exception {
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	860 this( String e = null ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	861 super(e);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	862 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	863 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	864
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	865 interface Cloneable{
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	866 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	867
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	868 interface Comparable {
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	869 int compareTo(Object o);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	870 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	871 interface Comparator {
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	872 int compare(Object o1, Object o2);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	873 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	874 interface EventListener{
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	875 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	876
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	877 class EventObject {
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	878 protected Object source;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	879
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	880 public this(Object source) {
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	881 if (source is null)
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	882 throw new IllegalArgumentException( "null arg" );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	883 this.source = source;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	884 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	885
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	886 public Object getSource() {
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	887 return source;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	888 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	889
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	890 public override String toString() {
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	891 return this.classinfo.name ~ "[source=" ~ source.toString() ~ "]";
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	892 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	893 }
15 1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	894
79 67d24430822a Delayed DLL load Frank Benoit <benoit@tionex.de> parents: 78 diff changeset	895 private struct GCStats {
40 3052439af4b5 Shell Frank Benoit <benoit@tionex.de> parents: 33 diff changeset	896 size_t poolsize; // total size of pool
3052439af4b5 Shell Frank Benoit <benoit@tionex.de> parents: 33 diff changeset	897 size_t usedsize; // bytes allocated
3052439af4b5 Shell Frank Benoit <benoit@tionex.de> parents: 33 diff changeset	898 size_t freeblocks; // number of blocks marked FREE
3052439af4b5 Shell Frank Benoit <benoit@tionex.de> parents: 33 diff changeset	899 size_t freelistsize; // total of memory on free lists
3052439af4b5 Shell Frank Benoit <benoit@tionex.de> parents: 33 diff changeset	900 size_t pageblocks; // number of blocks marked PAGE
3052439af4b5 Shell Frank Benoit <benoit@tionex.de> parents: 33 diff changeset	901 }
79 67d24430822a Delayed DLL load Frank Benoit <benoit@tionex.de> parents: 78 diff changeset	902 private extern(C) GCStats gc_stats();
67d24430822a Delayed DLL load Frank Benoit <benoit@tionex.de> parents: 78 diff changeset	903
40 3052439af4b5 Shell Frank Benoit <benoit@tionex.de> parents: 33 diff changeset	904 size_t RuntimeTotalMemory(){
3052439af4b5 Shell Frank Benoit <benoit@tionex.de> parents: 33 diff changeset	905 GCStats s = gc_stats();
3052439af4b5 Shell Frank Benoit <benoit@tionex.de> parents: 33 diff changeset	906 return s.poolsize;
3052439af4b5 Shell Frank Benoit <benoit@tionex.de> parents: 33 diff changeset	907 }
15 1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	908
228 628e9518870e Fix ExceptionPrintStacktrace Frank Benoit <benoit@tionex.de> parents: 226 diff changeset	909 String ExceptionGetLocalizedMessage( Exception e ){
628e9518870e Fix ExceptionPrintStacktrace Frank Benoit <benoit@tionex.de> parents: 226 diff changeset	910 return e.msg;
628e9518870e Fix ExceptionPrintStacktrace Frank Benoit <benoit@tionex.de> parents: 226 diff changeset	911 }
15 1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	912
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	913 void ExceptionPrintStackTrace( Exception e ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	914 ExceptionPrintStackTrace( e, Stderr );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	915 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	916 void ExceptionPrintStackTrace( Exception e, Print!(char) print ){
206 cca980503056 sync with dwt-linux, removed the simple.d Frank Benoit <benoit@tionex.de> parents: 202 diff changeset	917 Exception exception = e;
cca980503056 sync with dwt-linux, removed the simple.d Frank Benoit <benoit@tionex.de> parents: 202 diff changeset	918 while( exception !is null ){
cca980503056 sync with dwt-linux, removed the simple.d Frank Benoit <benoit@tionex.de> parents: 202 diff changeset	919 print.formatln( "Exception in {}({}): {}", exception.file, exception.line, exception.msg );
228 628e9518870e Fix ExceptionPrintStacktrace Frank Benoit <benoit@tionex.de> parents: 226 diff changeset	920 if( exception.info !is null ){
628e9518870e Fix ExceptionPrintStacktrace Frank Benoit <benoit@tionex.de> parents: 226 diff changeset	921 foreach( msg; exception.info ){
628e9518870e Fix ExceptionPrintStacktrace Frank Benoit <benoit@tionex.de> parents: 226 diff changeset	922 print.formatln( "trc {}", msg );
628e9518870e Fix ExceptionPrintStacktrace Frank Benoit <benoit@tionex.de> parents: 226 diff changeset	923 }
206 cca980503056 sync with dwt-linux, removed the simple.d Frank Benoit <benoit@tionex.de> parents: 202 diff changeset	924 }
cca980503056 sync with dwt-linux, removed the simple.d Frank Benoit <benoit@tionex.de> parents: 202 diff changeset	925 exception = exception.next;
cca980503056 sync with dwt-linux, removed the simple.d Frank Benoit <benoit@tionex.de> parents: 202 diff changeset	926 }
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	927 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	928
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	929 interface Reader{
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	930 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	931 interface Writer{
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	932 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	933
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	934
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	935 class Collator : Comparator {
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	936 public static Collator getInstance(){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	937 implMissing( __FILE__, __LINE__ );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	938 return null;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	939 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	940 private this(){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	941 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	942 int compare(Object o1, Object o2){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	943 implMissing( __FILE__, __LINE__ );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	944 return 0;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	945 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	946 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	947
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	948 template arraycast(T) {
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	949 T[] arraycast(U) (U[] u) {
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	950 static if (
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	951 (is (T == interface ) && is (U == interface )) \|\|
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	952 (is (T == class ) && is (U == class ))) {
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	953 return(cast(T[])u);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	954 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	955 else {
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	956 int l = u.length;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	957 T[] res;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	958 res.length = l;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	959 for (int i = 0; i < l; i++) {
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	960 res[i] = cast(T)u[i];
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	961 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	962 return(res);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	963 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	964 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	965 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	966
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	967 String stringcast( Object o ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	968 if( auto str = cast(ArrayWrapperString) o ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	969 return str.array;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	970 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	971 return null;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	972 }
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	973 String[] stringcast( Object[] objs ){
ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	974 String[] res = new String[](objs.length);
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	975 foreach( idx, obj; objs ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	976 res[idx] = stringcast(obj);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	977 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	978 return res;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	979 }
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	980 ArrayWrapperString stringcast( String str ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	981 return new ArrayWrapperString( str );
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	982 }
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	983 ArrayWrapperString[] stringcast( String[] strs ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	984 ArrayWrapperString[] res = new ArrayWrapperString[ strs.length ];
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	985 foreach( idx, str; strs ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	986 res[idx] = stringcast(str);
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	987 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	988 return res;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	989 }
15 1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	990
280 4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	991 String[] stringArrayFromObject( Object obj ){
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	992 if( auto wrapper = cast(ArrayWrapperString2)obj ){
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	993 return wrapper.array;
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	994 }
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	995 if( auto wrapper = cast(ArrayWrapperObject)obj ){
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	996 String[] res = new String[ wrapper.array.length ];
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	997 foreach( idx, o; wrapper.array ){
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	998 if( auto swrapper = cast(ArrayWrapperString) o ){
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	999 res[idx] = swrapper.array;
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	1000 }
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	1001 }
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	1002 return res;
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	1003 }
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	1004 assert( obj is null ); // if not null, it was the wrong type
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	1005 return null;
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	1006 }
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	1007
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	1008 T[] arrayFromObject(T)( Object obj ){
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	1009 if( auto wrapper = cast(ArrayWrapperObject)obj ){
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	1010 T[] res = new T[ wrapper.array.length ];
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	1011 foreach( idx, o; wrapper.array ){
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	1012 res[idx] = cast(T)o;
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	1013 }
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	1014 return res;
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	1015 }
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	1016 assert( obj is null ); // if not null, it was the wrong type
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	1017 return null;
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	1018 }
4ec36c3a04a3 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 277 diff changeset	1019
15 1bea9f0c6f63 FontData, Font Frank Benoit <benoit@tionex.de> parents: 0 diff changeset	1020
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1021 bool ArrayEquals(T)( T[] a, T[] b ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1022 if( a.length !is b.length ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1023 return false;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1024 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1025 for( int i = 0; i < a.length; i++ ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1026 static if( is( T==class) \|\| is(T==interface)){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1027 if( a[i] !is null && b[i] !is null ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1028 if( a[i] != b[i] ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1029 return false;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1030 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1031 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1032 else if( a[i] is null && b[i] is null ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1033 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1034 else{
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1035 return false;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1036 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1037 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1038 else{
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1039 if( a[i] != b[i] ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1040 return false;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1041 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1042 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1043 }
200 fef1e3b37378 sync with dwt-linux Frank Benoit <benoit@tionex.de> parents: 199 diff changeset	1044 return true;
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1045 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1046
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1047 int SeqIndexOf(T)( tango.util.collection.model.Seq.Seq!(T) s, T src ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1048 int idx;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1049 foreach( e; s ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1050 if( e == src ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1051 return idx;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1052 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1053 idx++;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1054 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1055 return -1;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1056 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1057 int arrayIndexOf(T)( T[] arr, T v ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1058 int res = -1;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1059 int idx = 0;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1060 foreach( p; arr ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1061 if( p == v){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1062 res = idx;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1063 break;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1064 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1065 idx++;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1066 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1067 return res;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1068 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1069
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1070 int seqIndexOf( tango.util.collection.model.Seq.Seq!(Object) seq, Object v ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1071 int res = -1;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1072 int idx = 0;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1073 foreach( p; seq ){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1074 if( p == v){
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1075 res = idx;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1076 break;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1077 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1078 idx++;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1079 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1080 return res;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1081 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1082
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	1083 void PrintStackTrace( int deepth = 100, String prefix = "trc" ){
202 1d129e5f6aa6 extend PrintStackTrace Frank Benoit <benoit@tionex.de> parents: 201 diff changeset	1084 auto e = new Exception( null );
1d129e5f6aa6 extend PrintStackTrace Frank Benoit <benoit@tionex.de> parents: 201 diff changeset	1085 int idx = 0;
1d129e5f6aa6 extend PrintStackTrace Frank Benoit <benoit@tionex.de> parents: 201 diff changeset	1086 const start = 3;
1d129e5f6aa6 extend PrintStackTrace Frank Benoit <benoit@tionex.de> parents: 201 diff changeset	1087 foreach( msg; e.info ){
1d129e5f6aa6 extend PrintStackTrace Frank Benoit <benoit@tionex.de> parents: 201 diff changeset	1088 if( idx >= start && idx < start+deepth ) {
1d129e5f6aa6 extend PrintStackTrace Frank Benoit <benoit@tionex.de> parents: 201 diff changeset	1089 Trace.formatln( "{}: {}", prefix, msg );
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1090 }
202 1d129e5f6aa6 extend PrintStackTrace Frank Benoit <benoit@tionex.de> parents: 201 diff changeset	1091 idx++;
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1092 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1093 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1094
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1095 struct ImportData{
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1096 void[] data;
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	1097 String name;
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1098
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	1099 public static ImportData opCall( void[] data, String name ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1100 ImportData res;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1101 res.data = data;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1102 res.name = name;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1103 return res;
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1104 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1105 }
184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1106
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	1107 template getImportData(String name ){
197 184ab53b7785 Changes and fixes for jface Frank Benoit <benoit@tionex.de> parents: 194 diff changeset	1108 const ImportData getImportData = ImportData( import(name), name );
212 ab60f3309436 reverted the char[] to String and use the an alias. Frank Benoit <benoit@tionex.de> parents: 206 diff changeset	1109 }
273 8632408a70aa Minimal adjustement for draw2d Frank Benoit <benoit@tionex.de> parents: 264 diff changeset	1110

Mercurial > projects > dwt-win

annotate dwt/dwthelper/utils.d @ 292:708cbfe418e7