Show
Ignore:
Timestamp:
05/04/08 18:42:55 (4 years ago)
Author:
Frank Benoit <benoit@tionex.de>
branch:
default
Message:

reverted char[] to String

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • dwt/widgets/Display.d

    r221 r238  
    145145    CallbackData  filterProcCallbackData; 
    146146    EventTable eventTable, filterTable; 
    147     static char[] APP_NAME = "DWT"; 
    148     static const char[] DISPATCH_EVENT_KEY = "dwt.internal.gtk.dispatchEvent"; 
    149     static const char[] ADD_WIDGET_KEY = "dwt.internal.addWidget"; 
     147    static String APP_NAME = "DWT"; 
     148    static const String DISPATCH_EVENT_KEY = "dwt.internal.gtk.dispatchEvent"; 
     149    static const String ADD_WIDGET_KEY = "dwt.internal.addWidget"; 
    150150    GClosure*[] closures; 
    151151    int [] signalIds; 
    …… 
    213213    CallbackData idleProcCallbackData; 
    214214    int idleHandle; 
    215     static const char[] ADD_IDLE_PROC_KEY = "dwt.internal.gtk2.addIdleProc"; 
    216     static const char[] REMOVE_IDLE_PROC_KEY = "dwt.internal.gtk2.removeIdleProc"; 
     215    static const String ADD_IDLE_PROC_KEY = "dwt.internal.gtk2.addIdleProc"; 
     216    static const String REMOVE_IDLE_PROC_KEY = "dwt.internal.gtk2.removeIdleProc"; 
    217217 
    218218    Object idleLock; 
    …… 
    382382 
    383383    /* Package name */ 
    384     static const char[] PACKAGE_PREFIX = "dwt.widgets."; 
     384    static const String PACKAGE_PREFIX = "dwt.widgets."; 
    385385    /* This code is intentionally commented. 
    386386     * ".class" can not be used on CLDC. 
    387387     */ 
    388388//  static { 
    389 //      char[] name = Display.class.getName (); 
     389//      String name = Display.class.getName (); 
    390390//      int index = name.lastIndexOf ('.'); 
    391391//      PACKAGE_NAME = name.substring (0, index + 1); 
    …… 
    413413    /* Display Data */ 
    414414    Object data; 
    415     char[] [] keys; 
     415    String [] keys; 
    416416    Object [] values; 
    417417 
    …… 
    425425 
    426426    /* Window Manager */ 
    427     char[] windowManager; 
     427    String windowManager; 
    428428 
    429429    /* 
    …… 
    984984} 
    985985 
    986 Image createImage (char[] name) { 
     986Image createImage (String name) { 
    987987    auto style = OS.gtk_widget_get_default_style (); 
    988     char[] buffer = name; 
     988    String buffer = name; 
    989989    auto pixbuf = OS.gtk_icon_set_render_icon ( 
    990990        OS.gtk_icon_factory_lookup_default (buffer.ptr), style, 
    …… 
    15851585 * @see #disposeExec(Runnable) 
    15861586 */ 
    1587 public Object getData (char[] key) { 
     1587public Object getData (String key) { 
    15881588    checkDevice (); 
    15891589    if (key is null) error (DWT.ERROR_NULL_ARGUMENT); 
    …… 
    16741674 
    16751675// /+static bool isValidClass (Class clazz) { 
    1676 // //PORTING_TODO   char[] name = clazz.getName (); 
     1676// //PORTING_TODO   String name = clazz.getName (); 
    16771677// //PORTING_TODO   int index = name.lastIndexOf ('.'); 
    16781678// //PORTING_TODO   return name.substring (0, index + 1)==/*eq*/ PACKAGE_PREFIX; 
    …… 
    33703370 * @param name the new app name or <code>null</code> 
    33713371 */ 
    3372 public static void setAppName (char[] name) { 
     3372public static void setAppName (String name) { 
    33733373    APP_NAME = name; 
    33743374} 
    …… 
    34443444 * @see #disposeExec(Runnable) 
    34453445 */ 
    3446 public void setData (char[] key, Object value) { 
     3446public void setData (String key, Object value) { 
    34473447    checkDevice (); 
    34483448    if (key is null) error (DWT.ERROR_NULL_ARGUMENT); 
    …… 
    34893489            values = null; 
    34903490        } else { 
    3491             char[] [] newKeys = new char[] [keys.length - 1]; 
     3491            String [] newKeys = new String [keys.length - 1]; 
    34923492            Object [] newValues = new Object [values.length - 1]; 
    34933493            System.arraycopy (keys, 0, newKeys, 0, index); 
    …… 
    35133513        } 
    35143514    } 
    3515     char[] [] newKeys = new char[] [keys.length + 1]; 
     3515    String [] newKeys = new String [keys.length + 1]; 
    35163516    Object [] newValues = new Object [values.length + 1]; 
    35173517    System.arraycopy (keys, 0, newKeys, 0, keys.length);