peterreilly 2003/07/25 01:37:50 Modified: src/main/org/apache/tools/ant RuntimeConfigurable.java UnknownElement.java Log: checkstyle Revision Changes Path 1.42 +5 -5 ant/src/main/org/apache/tools/ant/RuntimeConfigurable.java Index: RuntimeConfigurable.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/RuntimeConfigurable.java,v retrieving revision 1.41 retrieving revision 1.42 diff -u -r1.41 -r1.42 --- RuntimeConfigurable.java 23 Jul 2003 12:06:03 -0000 1.41 +++ RuntimeConfigurable.java 25 Jul 2003 08:37:50 -0000 1.42 @@ -79,7 +79,7 @@ /** Polymorphic attribute (May be XML NS attribute later) */ private static final String ANT_TYPE = "ant-type"; - + /** Name of the element to configure. */ private String elementTag = null; @@ -94,7 +94,7 @@ /** the creator used to make the wrapped object */ private transient IntrospectionHelper.Creator creator; - /** + /** * @deprecated * XML attributes for the element. */ @@ -120,7 +120,7 @@ /** the polymorphic type */ private String polyType = null; - + /** * Sole constructor creating a wrapper for the specified object. * @@ -157,7 +157,7 @@ void setCreator(IntrospectionHelper.Creator creator) { this.creator = creator; } - + /** * Get the object for which this RuntimeConfigurable holds the configuration * information @@ -170,6 +170,7 @@ /** * get the polymorphic type for this element + * @return the ant component type name, null if not set */ public String getPolyType() { return polyType; @@ -419,7 +420,6 @@ childTask.setRuntimeConfigurableWrapper(child); } - if ((child.creator != null) && configureChildren) { child.maybeConfigure(p); child.creator.store(); 1.59 +2 -2 ant/src/main/org/apache/tools/ant/UnknownElement.java Index: UnknownElement.java =================================================================== RCS file: /home/cvs/ant/src/main/org/apache/tools/ant/UnknownElement.java,v retrieving revision 1.58 retrieving revision 1.59 diff -u -r1.58 -r1.59 --- UnknownElement.java 23 Jul 2003 12:06:03 -0000 1.58 +++ UnknownElement.java 25 Jul 2003 08:37:50 -0000 1.59 @@ -318,7 +318,7 @@ for (int i = 0; it.hasNext(); i++) { RuntimeConfigurable childWrapper = parentWrapper.getChild(i); UnknownElement child = (UnknownElement) it.next(); - if (!handleChild(ih, parent, child, + if (!handleChild(ih, parent, child, childWrapper)) { if (!(parent instanceof TaskContainer)) { ih.throwNotSupported(getProject(), parent, @@ -480,7 +480,7 @@ IntrospectionHelper.Creator creator = ih.getElementCreator(getProject(), parent, childName); creator.setPolyType(childWrapper.getPolyType()); - Object realChild=creator.create(); + Object realChild = creator.create(); childWrapper.setCreator(creator); childWrapper.setProxy(realChild); if (realChild instanceof Task) {
--------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]