dion 2004/09/06 19:03:02 Modified: jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/converters DimensionConverter.java PointConverter.java jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/demos HomepageBuilder.java Log: Fix JDK 1.5 compile issues Revision Changes Path 1.5 +5 -5 jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/converters/DimensionConverter.java Index: DimensionConverter.java =================================================================== RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/converters/DimensionConverter.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- DimensionConverter.java 25 Feb 2004 01:31:51 -0000 1.4 +++ DimensionConverter.java 7 Sep 2004 02:03:02 -0000 1.5 @@ -31,14 +31,14 @@ public Object convert(Class type, Object value) { if ( value != null ) { String text = value.toString(); - StringTokenizer enum = new StringTokenizer( text, "," ); + StringTokenizer dimensionEnum = new StringTokenizer( text, "," ); int width = 0; int height = 0; - if ( enum.hasMoreTokens() ) { - width = parseNumber( enum.nextToken() ); + if ( dimensionEnum.hasMoreTokens() ) { + width = parseNumber( dimensionEnum.nextToken() ); } - if ( enum.hasMoreTokens() ) { - height = parseNumber( enum.nextToken() ); + if ( dimensionEnum.hasMoreTokens() ) { + height = parseNumber( dimensionEnum.nextToken() ); } // now lets parse the dimension... 1.5 +5 -5 jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/converters/PointConverter.java Index: PointConverter.java =================================================================== RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swing/src/java/org/apache/commons/jelly/tags/swing/converters/PointConverter.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- PointConverter.java 25 Feb 2004 01:31:51 -0000 1.4 +++ PointConverter.java 7 Sep 2004 02:03:02 -0000 1.5 @@ -31,14 +31,14 @@ public Object convert(Class type, Object value) { if ( value != null ) { String text = value.toString(); - StringTokenizer enum = new StringTokenizer( text, "," ); + StringTokenizer pointEnum = new StringTokenizer( text, "," ); int x = 0; int y = 0; - if ( enum.hasMoreTokens() ) { - x = parseNumber( enum.nextToken() ); + if ( pointEnum.hasMoreTokens() ) { + x = parseNumber( pointEnum.nextToken() ); } - if ( enum.hasMoreTokens() ) { - y = parseNumber( enum.nextToken() ); + if ( pointEnum.hasMoreTokens() ) { + y = parseNumber( pointEnum.nextToken() ); } // now lets parse the Point... 1.4 +3 -3 jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/demos/HomepageBuilder.java Index: HomepageBuilder.java =================================================================== RCS file: /home/cvs/jakarta-commons/jelly/jelly-tags/swing/src/test/org/apache/commons/jelly/demos/HomepageBuilder.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- HomepageBuilder.java 25 Feb 2004 01:32:00 -0000 1.3 +++ HomepageBuilder.java 7 Sep 2004 02:03:02 -0000 1.4 @@ -159,9 +159,9 @@ context.setVariable("url",urlField.getText()); Vector v = new Vector(); - Enumeration enum= listModel.elements(); - while (enum.hasMoreElements()) { - v.add(enum.nextElement()); + Enumeration items = listModel.elements(); + while (items.hasMoreElements()) { + v.add(items.nextElement()); } context.setVariable("hobbies", v);
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]