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/GridLayout.d

    r223 r238  
    2424import dwt.dwthelper.System; 
    2525 
    26 import tango.text.Util; 
    2726import tango.util.Convert; 
    2827import Math = tango.math.Math; 
     28import dwt.dwthelper.utils; 
    2929 
    3030 
    …… 
    727727} 
    728728 
    729 char[] getName () { 
    730     char[] string = this.classinfo.name; 
    731     int index = locatePrior( string, '.'); 
    732     if (index is string.length ) return string; 
     729String getName () { 
     730    String string = this.classinfo.name; 
     731    int index = string.lastIndexOf('.'); 
     732    if (index is -1 ) return string; 
    733733    return string[ index + 1 .. string.length ]; 
    734734} 
    …… 
    740740 * @return a string representation of the layout 
    741741 */ 
    742 override public char[] toString () { 
    743     char[] string = getName ()~" {"; 
    744     if (numColumns !is 1) string ~= "numColumns="~to!(char[])(numColumns)~" "; 
    745     if (makeColumnsEqualWidth) string ~= "makeColumnsEqualWidth="~to!(char[])(makeColumnsEqualWidth)~" "; 
    746     if (marginWidth !is 0) string ~= "marginWidth="~to!(char[])(marginWidth)~" "; 
    747     if (marginHeight !is 0) string ~= "marginHeight="~to!(char[])(marginHeight)~" "; 
    748     if (marginLeft !is 0) string ~= "marginLeft="~to!(char[])(marginLeft)~" "; 
    749     if (marginRight !is 0) string ~= "marginRight="~to!(char[])(marginRight)~" "; 
    750     if (marginTop !is 0) string ~= "marginTop="~to!(char[])(marginTop)~" "; 
    751     if (marginBottom !is 0) string ~= "marginBottom="~to!(char[])(marginBottom)~" "; 
    752     if (horizontalSpacing !is 0) string ~= "horizontalSpacing="~to!(char[])(horizontalSpacing)~" "; 
    753     if (verticalSpacing !is 0) string ~= "verticalSpacing="~to!(char[])(verticalSpacing)~" "; 
     742override public String toString () { 
     743    String string = getName ()~" {"; 
     744    if (numColumns !is 1) string ~= "numColumns="~to!(String)(numColumns)~" "; 
     745    if (makeColumnsEqualWidth) string ~= "makeColumnsEqualWidth="~to!(String)(makeColumnsEqualWidth)~" "; 
     746    if (marginWidth !is 0) string ~= "marginWidth="~to!(String)(marginWidth)~" "; 
     747    if (marginHeight !is 0) string ~= "marginHeight="~to!(String)(marginHeight)~" "; 
     748    if (marginLeft !is 0) string ~= "marginLeft="~to!(String)(marginLeft)~" "; 
     749    if (marginRight !is 0) string ~= "marginRight="~to!(String)(marginRight)~" "; 
     750    if (marginTop !is 0) string ~= "marginTop="~to!(String)(marginTop)~" "; 
     751    if (marginBottom !is 0) string ~= "marginBottom="~to!(String)(marginBottom)~" "; 
     752    if (horizontalSpacing !is 0) string ~= "horizontalSpacing="~to!(String)(horizontalSpacing)~" "; 
     753    if (verticalSpacing !is 0) string ~= "verticalSpacing="~to!(String)(verticalSpacing)~" "; 
    754754    string = string.trim(); 
    755755    string ~= "}";