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/layout/GridData.d

    r201 r238  
    1717import dwt.widgets.Control; 
    1818 
    19 import tango.text.Util; 
    2019import tango.util.Convert; 
     20import dwt.dwthelper.utils; 
    2121 
    2222/** 
    …… 
    504504} 
    505505 
    506 char[] getName () { 
    507     char[] string = this.classinfo.name; 
    508     int index = locatePrior( string, '.'); 
    509     if (index is string.length ) return string; 
     506String getName () { 
     507    String string = this.classinfo.name; 
     508    int index = string.lastIndexOf('.'); 
     509    if (index is -1 ) return string; 
    510510    return string[ index + 1 .. string.length ]; 
    511511} 
    …… 
    517517 * @return a string representation of the GridData object 
    518518 */ 
    519 override public char[] toString () { 
    520     char[] hAlign = ""; 
     519override public String toString () { 
     520    String hAlign = ""; 
    521521    switch (horizontalAlignment) { 
    522522        case DWT.FILL: hAlign = "DWT.FILL"; break; 
    …… 
    528528        case DWT.CENTER: hAlign = "DWT.CENTER"; break; 
    529529        case CENTER: hAlign = "GridData.CENTER"; break; 
    530         default: hAlign = "Undefined "~to!(char[])(horizontalAlignment); break; 
     530        default: hAlign = "Undefined "~to!(String)(horizontalAlignment); break; 
    531531    } 
    532     char[] vAlign = ""; 
     532    String vAlign = ""; 
    533533    switch (verticalAlignment) { 
    534534        case DWT.FILL: vAlign = "DWT.FILL"; break; 
    …… 
    540540        case DWT.CENTER: vAlign = "DWT.CENTER"; break; 
    541541        case CENTER: vAlign = "GridData.CENTER"; break; 
    542         default: vAlign = "Undefined "~to!(char[])(verticalAlignment); break; 
     542        default: vAlign = "Undefined "~to!(String)(verticalAlignment); break; 
    543543    } 
    544     char[] string = getName()~" {"; 
    545     string ~= "horizontalAlignment="~to!(char[])(hAlign)~" "; 
    546     if (horizontalIndent !is 0) string ~= "horizontalIndent="~to!(char[])(horizontalIndent)~" "; 
    547     if (horizontalSpan !is 1) string ~= "horizontalSpan="~to!(char[])(horizontalSpan)~" "; 
    548     if (grabExcessHorizontalSpace) string ~= "grabExcessHorizontalSpace="~to!(char[])(grabExcessHorizontalSpace)~" "; 
    549     if (widthHint !is DWT.DEFAULT) string ~= "widthHint="~to!(char[])(widthHint)~" "; 
    550     if (minimumWidth !is 0) string ~= "minimumWidth="~to!(char[])(minimumWidth)~" "; 
     544    String string = getName()~" {"; 
     545    string ~= "horizontalAlignment="~to!(String)(hAlign)~" "; 
     546    if (horizontalIndent !is 0) string ~= "horizontalIndent="~to!(String)(horizontalIndent)~" "; 
     547    if (horizontalSpan !is 1) string ~= "horizontalSpan="~to!(String)(horizontalSpan)~" "; 
     548    if (grabExcessHorizontalSpace) string ~= "grabExcessHorizontalSpace="~to!(String)(grabExcessHorizontalSpace)~" "; 
     549    if (widthHint !is DWT.DEFAULT) string ~= "widthHint="~to!(String)(widthHint)~" "; 
     550    if (minimumWidth !is 0) string ~= "minimumWidth="~to!(String)(minimumWidth)~" "; 
    551551    string ~= "verticalAlignment="~vAlign~" "; 
    552     if (verticalIndent !is 0) string ~= "verticalIndent="~to!(char[])(verticalIndent)~" "; 
    553     if (verticalSpan !is 1) string ~= "verticalSpan="~to!(char[])(verticalSpan)~" "; 
    554     if (grabExcessVerticalSpace) string ~= "grabExcessVerticalSpace="~to!(char[])(grabExcessVerticalSpace)~" "; 
    555     if (heightHint !is DWT.DEFAULT) string ~= "heightHint="~to!(char[])(heightHint)~" "; 
    556     if (minimumHeight !is 0) string ~= "minimumHeight="~to!(char[])(minimumHeight)~" "; 
    557     if (exclude) string ~= "exclude="~to!(char[])(exclude)~" "; 
     552    if (verticalIndent !is 0) string ~= "verticalIndent="~to!(String)(verticalIndent)~" "; 
     553    if (verticalSpan !is 1) string ~= "verticalSpan="~to!(String)(verticalSpan)~" "; 
     554    if (grabExcessVerticalSpace) string ~= "grabExcessVerticalSpace="~to!(String)(grabExcessVerticalSpace)~" "; 
     555    if (heightHint !is DWT.DEFAULT) string ~= "heightHint="~to!(String)(heightHint)~" "; 
     556    if (minimumHeight !is 0) string ~= "minimumHeight="~to!(String)(minimumHeight)~" "; 
     557    if (exclude) string ~= "exclude="~to!(String)(exclude)~" "; 
    558558    string = string.trim(); 
    559559    string ~= "}";