bodewig 2004/05/13 00:06:49 Modified: src/main/org/apache/tools/ant DirectoryScanner.java IntrospectionHelper.java ProjectHelper.java Log: cosmetics Revision Changes Path 1.72 +1 -1 ant/src/main/org/apache/tools/ant/DirectoryScanner.java Index: DirectoryScanner.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/DirectoryScanner.java,v retrieving revision 1.71 retrieving revision 1.72 diff -u -r1.71 -r1.72 --- DirectoryScanner.java 15 Mar 2004 17:33:09 -0000 1.71 +++ DirectoryScanner.java 13 May 2004 07:06:49 -0000 1.72 @@ -422,7 +422,7 @@ * @since Ant 1.6 */ public static void resetDefaultExcludes() { - defaultExcludes = new Vector(); + defaultExcludes = new Vector(); for (int i = 0; i < DEFAULTEXCLUDES.length; i++) { defaultExcludes.add(DEFAULTEXCLUDES[i]); 1.80 +4 -4 ant/src/main/org/apache/tools/ant/IntrospectionHelper.java Index: IntrospectionHelper.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/IntrospectionHelper.java,v retrieving revision 1.79 retrieving revision 1.80 diff -u -r1.79 -r1.80 --- IntrospectionHelper.java 15 Mar 2004 17:33:09 -0000 1.79 +++ IntrospectionHelper.java 13 May 2004 07:06:49 -0000 1.80 @@ -414,7 +414,7 @@ return true; } - if ("setTaskType".equals(name) + if ("setTaskType".equals(name) && java.lang.String.class.equals(type)) { return true; } @@ -453,7 +453,8 @@ * * @return a helper for the specified class */ - public static synchronized IntrospectionHelper getHelper(Project p, Class c) { + public static synchronized IntrospectionHelper getHelper(Project p, + Class c) { IntrospectionHelper ih = (IntrospectionHelper) helpers.get(c); if (ih == null) { ih = new IntrospectionHelper(c); @@ -1113,8 +1114,7 @@ Class elementClass = nestedCreator.getElementClass(); ComponentHelper helper = ComponentHelper.getComponentHelper(project); - nestedObject = ComponentHelper.getComponentHelper(project) - .createComponent(polyType); + nestedObject = helper.createComponent(polyType); if (nestedObject == null) { throw new BuildException( "Unable to create object of type " + polyType); 1.112 +1 -1 ant/src/main/org/apache/tools/ant/ProjectHelper.java Index: ProjectHelper.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/ProjectHelper.java,v retrieving revision 1.111 retrieving revision 1.112 diff -u -r1.111 -r1.112 --- ProjectHelper.java 15 Mar 2004 17:33:09 -0000 1.111 +++ ProjectHelper.java 13 May 2004 07:06:49 -0000 1.112 @@ -309,7 +309,7 @@ for (int i = 0; i < attrs.getLength(); i++) { // reflect these into the target String value = replaceProperties(project, attrs.getValue(i), - project.getProperties()); + project.getProperties()); try { ih.setAttribute(project, target, attrs.getName(i).toLowerCase(Locale.US), value);
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]