projects/dwt-linux: dwt/graphics/FontData.d comparison

comparison dwt/graphics/FontData.d @ 238:380bad9f6852

reverted char[] to String

author	Frank Benoit <benoit@tionex.de>
date	Mon, 05 May 2008 00:42:55 +0200
parents	08789b28bdf3
children	c0d810de7093

comparison

equal deleted inserted replaced

-:98b80b00af79
+:380bad9f6852
 import tango.text.convert.Format;
 import tango.text.Util : locate;
 import tango.util.Convert;
 import dwt.dwthelper.utils;
+import tango.util.log.Trace;
 /**
 * Instances of this class describe operating system fonts.
 * <p>
 * For platform-independent behaviour, use the get and set methods
 * public API. It is marked public only so that it can be shared
 * within the packages provided by DWT. It is not available on all
 * platforms and should never be accessed from application code.
 * </p>
 */
-public char[] name;
+public String name;
 /**
 * The height of the font data in points
 * (Warning: This field is platform dependent)
 * <p>
 * public API. It is marked public only so that it can be shared
 * within the packages provided by DWT. It is not available on all
 * platforms and should never be accessed from application code.
 * </p>
 */
-public char[] str;
+public String str;
 /**
 * The locales of the font
 */
-char[] lang, country, variant;
+String lang, country, variant;
 /**
 * Constructs a new uninitialized font data.
 */
 public this () {
 *    <li>ERROR_INVALID_ARGUMENT - if the argument does not represent a valid description</li>
 * </ul>
 *
 * @see #toString
 */
-public this(char[] str) {
+public this(String str) {
 if (str is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
 int start = 0;
 int end = locate( str, '|' );
 if (end is str.length ) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
-char[] version1 = str[ start .. end ];
+String version1 = str[ start .. end ];
 try {
 if (to!(int)(version1) !is 1) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
 } catch (ConversionException e) {
 DWT.error(DWT.ERROR_INVALID_ARGUMENT);
 }
 start = end + 1;
 end = locate( str, '|', start );
 if (end is str.length ) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
-char[] name = str[start .. end ];
+String name = str[start .. end ];
 start = end + 1;
 end = locate( str, '|', start );
 if (end is str.length ) DWT.error(DWT.ERROR_INVALID_ARGUMENT);
 float height = 0;
 end = locate( str, '|', start );
 setName(name);
 setHeight(height);
 setStyle(style);
 if (end is str.length) return;
-char[] platform = str[ start .. end ];
+String platform = str[ start .. end ];
 start = end + 1;
 end = locate( str, '|', start );
 if (end is str.length) return;
-char[] version2 = str[ start .. end ];
+String version2 = str[ start .. end ];
 if (platform.equals("GTK") && version2.equals("1")) {
 return;
 }
 }
 * @exception IllegalArgumentException <ul>
 *    <li>ERROR_NULL_ARGUMENT - when the font name is null</li>
 *    <li>ERROR_INVALID_ARGUMENT - if the height is negative</li>
 * </ul>
 */
-public this(char[] name, int height, int style) {
+public this(String name, int height, int style) {
 setName(name);
 setHeight(height);
 setStyle(style);
 }
-/*public*/ this(char[] name, float height, int style) {
+/*public*/ this(String name, float height, int style) {
 setName(name);
 setHeight(height);
 setStyle(style);
 }
 * </p>
 *
 * @return the <code>String</code> representing a Locale object
 * @since 3.0
 */
-public char[] getLocale () {
+public String getLocale () {
-char[] result;
+String result;
 const char sep = '_';
 if (lang !is null) {
 result ~= lang;
 result ~= sep;
 }
 if (result) {
 if (result[$-1] is sep) {
 result = result[0 .. $ - 1];
 }
 }
+Trace.formatln( "getLocal {}", result );
 return result;
 }
 /**
 * Returns the name of the receiver.
 *
 * @return the name of this <code>FontData</code>
 *
 * @see #setName
 */
-public char[] getName() {
+public String getName() {
 return name;
 }
 /**
 * Returns the style of the receiver which is a bitwise OR of
 * @return the receiver's hash
 *
 * @see #equals
 */
 public override hash_t toHash () {
-return typeid(char[]).getHash(&name) ^ getHeight() ^ style;
+return typeid(String).getHash(&name) ^ getHeight() ^ style;
 }
 /**
 * Sets the height of the receiver. The parameter is
 * specified in terms of points, where a point is one
 * </p>
 *
 * @param locale the <code>String</code> representing a Locale object
 * @see java.util.Locale#toString
 */
-public void setLocale(char[] locale) {
+public void setLocale(String locale) {
+Trace.formatln( "setLocal {}", locale );
 lang = country = variant = null;
 if (locale !is null) {
 char sep = '_';
 int length = locale.length;
 int firstSep, secondSep;
 *    <li>ERROR_NULL_ARGUMENT - when the font name is null</li>
 * </ul>
 *
 * @see #getName
 */
-public void setName(char[] name) {
+public void setName(String name) {
 if (name is null) DWT.error(DWT.ERROR_NULL_ARGUMENT);
 this.name = name;
 this.str = null;
 }
 *
 * @return a string representation of the FontData
 *
 * @see FontData
 */
-public override char[] toString() {
+public override String toString() {
 return Format( "1|{}|{}|{}|GTK|1|", getName, getHeightF, getStyle );
 }
 }

Mercurial > projects > dwt-linux

comparison dwt/graphics/FontData.d @ 238:380bad9f6852