bodewig 2004/10/22 02:15:11
Modified: src/main/org/apache/tools/ant Tag: ANT_16_BRANCH
IntrospectionHelper.java
Log:
Merge the patch that allows this branch to compile
Revision Changes Path
No revision
No revision
1.65.2.19 +3 -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.65.2.18
retrieving revision 1.65.2.19
diff -u -r1.65.2.18 -r1.65.2.19
--- IntrospectionHelper.java 13 Sep 2004 09:12:29 -0000 1.65.2.18
+++ IntrospectionHelper.java 22 Oct 2004 09:15:11 -0000 1.65.2.19
@@ -1335,7 +1335,7 @@
* Internal interface used to create nested elements. Not documented
* in detail for reasons of source code readability.
*/
- private abstract class NestedCreator {
+ private abstract static class NestedCreator {
Method method; // the method called to add/create the nested element
NestedCreator(Method m) {
this.method = m;
@@ -1365,7 +1365,7 @@
* Internal interface used to setting element attributes. Not documented
* in detail for reasons of source code readability.
*/
- private abstract class AttributeSetter {
+ private abstract static class AttributeSetter {
Method method; // the method called to set the attribute
AttributeSetter(Method m) {
this.method = m;
@@ -1468,11 +1468,10 @@
rObject = ((PreSetDef.PreSetDefinition)
addedObject).createObject(
project);
}
- final Method method = addMethod;
final Object nestedObject = addedObject;
final Object realObject = rObject;
- return new NestedCreator(method) {
+ return new NestedCreator(addMethod) {
Object create(Project project, Object parent, Object ignore)
throws InvocationTargetException, IllegalAccessException {
if (!method.getName().endsWith("Configured")) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
