Mercurial > projects > dwt2

diff base/src/java/util/ResourceBundle.d @ 120:536e43f63c81

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Comprehensive update for Win32/Linux32 dmd-2.053/dmd-1.068+Tango-r5661 ===D2=== * added [Try]Immutable/Const/Shared templates to work with differenses in D1/D2 instead of version statements used these templates to work with strict type storage rules of dmd-2.053 * com.ibm.icu now also compilable with D2, but not tested yet * small fixes Snippet288 - shared data is in TLS ===Phobos=== * fixed critical bugs in Phobos implemention completely incorrect segfault prone fromStringz (Linux's port ruthless killer) terrible, incorrect StringBuffer realization (StyledText killer) * fixed small bugs as well Snippet72 - misprint in the snippet * implemented missed functionality for Phobos ByteArrayOutputStream implemented (image loading available) formatting correctly works for all DWT's cases As a result, folowing snippets now works with Phobos (Snippet### - what is fixed): Snippet24, 42, 111, 115, 130, 235, 276 - bad string formatting Snippet48, 282 - crash on image loading Snippet163, 189, 211, 213, 217, 218, 222 - crash on copy/cut in StyledText Snippet244 - hang-up ===Tango=== * few changes for the latest Tango trunc-r5661 * few small performance improvments ===General=== * implMissing-s for only one version changed to implMissingInTango/InPhobos * incorrect calls to Format in toString-s fixed * fixed loading \uXXXX characters in ResourceBundle * added good UTF-8 support for StyledText, TextLayout (Win32) and friends UTF functions revised and tested. It is now in java.nonstandard.*Utf modules StyledText and TextLayout (Win32) modules revised for UTF-8 support * removed small diferences in most identical files in *.swt.* folders *.swt.internal.image, *.swt.events and *.swt.custom are identical in Win32/Linux32 now 179 of 576 (~31%) files in *.swt.* folders are fully identical * Win32: snippets now have right subsystem, pretty icons and native system style controls * small fixes in snippets Snippet44 - it's not Snippet44 Snippet212 - functions work with different images and offsets arrays Win32: Snippet282 - crash on close if the button has an image Snippet293 - setGrayed is commented and others Win32: As a result, folowing snippets now works Snippet68 - color doesn't change Snippet163, 189, 211, 213, 217, 218, 222 - UTF-8 issues (see above) Snippet193 - no tabel headers
author Denis Shelomovskij <verylonglogin.reg@gmail.com>
date Sat, 09 Jul 2011 15:50:20 +0300
parents 3daece18b48e
children
line wrap: on
line diff
--- a/base/src/java/util/ResourceBundle.d	Sun Apr 17 17:58:36 2011 +0200
+++ b/base/src/java/util/ResourceBundle.d	Sat Jul 09 15:50:20 2011 +0300
@@ -13,7 +13,7 @@
     //import tango.text.Util;
     import tango.io.device.File;
 } else { // Phobos
-    import std.file;
+    static import std.file;
 }
 
 
@@ -24,7 +24,7 @@
     /++
      + First entry is the default entry if no maching locale is found
      +/
-    public this( ImportData[] data ){
+    public this( in ImportData[] data ){
         char[] name = caltureName.dup;
         if( name.length is 5 && name[2] is '-' ){
             name[2] = '_';
@@ -48,7 +48,7 @@
         //Trace.formatln( "ResourceBundle default" );
         initialize( cast(String)data[0].data );
     }
-    public this( ImportData data ){
+    public this( in ImportData data ){
         initialize( cast(String)data.data );
     }
     public this( String data ){
@@ -101,7 +101,7 @@
                         case '\\': c = '\\'; break;
                         case '\"': c = '\"'; break;
                         case 'u' :
-                               dchar d = Integer.parseInt( line[ pos+1 .. pos+5 ], 16 );
+                               c = Integer.parseInt( line[ pos+1 .. pos+5 ], 16 );
                                pos += 4;
                                break;
                         default: break;
@@ -137,25 +137,17 @@
             key = java.lang.util.trim(key);
             value = java.lang.util.trim(value);
 
-            version(D_Version2){
-                map[ key.idup ] = value.idup;
-            } else {
-                map[ key.dup ] = value.dup;
-            }
+            map[ _idup(key) ] = _idup(value);
         }
     }
 
-    public bool hasString( CString key ){
+    public bool hasString( String key ){
         return ( key in map ) !is null;
     }
 
-    public String getString( CString key ){
+    public String getString( String key ){
         if( auto v = key in map ){
-            version(D_Version2){
-                return (*v).idup;
-            } else {
-                return (*v).dup;
-            }
+            return _idup(*v);
         }
         throw new MissingResourceException( "key not found", this.classinfo.name, key._idup() );
     }
@@ -168,13 +160,13 @@
         return map.keys;
     }
 
-    public static ResourceBundle getBundle( ImportData[] data ){
+    public static ResourceBundle getBundle( in ImportData[] data ){
         return new ResourceBundle( data );
     }
-    public static ResourceBundle getBundle( ImportData data ){
+    public static ResourceBundle getBundle( in ImportData data ){
         return new ResourceBundle( data );
     }
-    public static ResourceBundle getBundle( CString name ){
+    public static ResourceBundle getBundle( String name ){
         try{
             version(Tango){
                 return new ResourceBundle( cast(String) File.get(name) );