dion 2004/09/06 19:07:40
Modified:
jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/converters
PointConverter.java ColorConverter.java
jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt
SwtHelper.java
Log:
Fix JDK 1.5 compile issues
Revision Changes Path
1.4 +5 -5
jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/converters/PointConverter.java
Index: PointConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/converters/PointConverter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- PointConverter.java 25 Feb 2004 01:31:59 -0000 1.3
+++ PointConverter.java 7 Sep 2004 02:07:40 -0000 1.4
@@ -41,14 +41,14 @@
* @return Point
*/
public Point parse(String text) {
- StringTokenizer enum = new StringTokenizer( text, "," );
+ StringTokenizer items = new StringTokenizer( text, "," );
int x = 0;
int y = 0;
- if ( enum.hasMoreTokens() ) {
- x = parseNumber( enum.nextToken() );
+ if ( items.hasMoreTokens() ) {
+ x = parseNumber( items.nextToken() );
}
if ( enum.hasMoreTokens() ) {
- y = parseNumber( enum.nextToken() );
+ y = parseNumber( items.nextToken() );
}
return new Point( x, y );
}
1.4 +8 -8
jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/converters/ColorConverter.java
Index: ColorConverter.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/converters/ColorConverter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ColorConverter.java 25 Feb 2004 01:31:59 -0000 1.3
+++ ColorConverter.java 7 Sep 2004 02:07:40 -0000 1.4
@@ -43,18 +43,18 @@
* @return RGB
*/
protected RGB parseRGB(String value) {
- StringTokenizer enum = new StringTokenizer(value, ",");
+ StringTokenizer items = new StringTokenizer(value, ",");
int red = 0;
int green = 0;
int blue = 0;
- if (enum.hasMoreTokens()) {
- red = parseNumber(enum.nextToken());
+ if (items.hasMoreTokens()) {
+ red = parseNumber(items.nextToken());
}
- if (enum.hasMoreTokens()) {
- green = parseNumber(enum.nextToken());
+ if (items.hasMoreTokens()) {
+ green = parseNumber(items.nextToken());
}
- if (enum.hasMoreTokens()) {
- blue = parseNumber(enum.nextToken());
+ if (items.hasMoreTokens()) {
+ blue = parseNumber(items.nextToken());
}
return new RGB(red, green, blue);
}
1.6 +3 -3
jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/SwtHelper.java
Index: SwtHelper.java
===================================================================
RCS file:
/home/cvs/jakarta-commons/jelly/jelly-tags/swt/src/java/org/apache/commons/jelly/tags/swt/SwtHelper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- SwtHelper.java 25 Feb 2004 01:31:55 -0000 1.5
+++ SwtHelper.java 7 Sep 2004 02:07:40 -0000 1.6
@@ -65,9 +65,9 @@
if (toUpperCase) {
text = text.toUpperCase();
}
- StringTokenizer enum = new StringTokenizer(text, ",");
- while (enum.hasMoreTokens()) {
- String token = enum.nextToken().trim();
+ StringTokenizer items = new StringTokenizer(text, ",");
+ while (items.hasMoreTokens()) {
+ String token = items.nextToken().trim();
answer |= getStyleCode(constantClass, token);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
