You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2007/09/23 00:58:24 UTC
svn commit: r578520 [1/2] - in /tapestry/tapestry5/trunk/tapestry-core/src:
main/java/org/apache/tapestry/internal/services/
main/java/org/apache/tapestry/internal/structure/
main/java/org/apache/tapestry/internal/util/
main/java/org/apache/tapestry/se...
Author: hlship
Date: Sat Sep 22 15:58:22 2007
New Revision: 578520
URL: http://svn.apache.org/viewvc?rev=578520&view=rev
Log:
TAPESTRY-1730: Order of event handler method invocation should be greatest number of parameters to fewest
Added:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformMethodSignature.java
- copied, changed from r573901, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/MethodSignature.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/services/TransformMethodSignatureTest.java
- copied, changed from r573901, tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/services/MethodSignatureTest.java
Removed:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/MethodSignature.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/services/MethodSignatureTest.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnvironmentalWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InjectPageWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/OnEventWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLifecycleAnnotationWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ParameterWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderCommandWorker.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServicesMessages.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/MethodInvocationBuilder.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ClassTransformation.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/MethodFilter.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformConstants.java
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/TapestryTestCase.java
tapestry/tapestry5/trunk/tapestry-core/src/test/app1/WEB-INF/MultiBeanEditDemo.html
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MultiBeanEditDemo.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorkerTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java
tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/util/MethodInvocationBuilderTest.java
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateWorker.java?rev=578520&r1=578519&r2=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ApplicationStateWorker.java Sat Sep 22 15:58:22 2007
@@ -24,7 +24,7 @@
import org.apache.tapestry.services.ApplicationStateManager;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.MethodSignature;
+import org.apache.tapestry.services.TransformMethodSignature;
/**
* Looks for the {@link ApplicationState} annotation and converts read and write access on such
@@ -94,7 +94,7 @@
{
String readMethodName = transformation.newMemberName("read", booleanFieldName);
- MethodSignature sig = new MethodSignature(Modifier.PRIVATE, "boolean", readMethodName,
+ TransformMethodSignature sig = new TransformMethodSignature(Modifier.PRIVATE, "boolean", readMethodName,
null, null);
String body = format("return %s.exists(%s);", managerFieldName, typeFieldName);
@@ -111,7 +111,7 @@
{
String writeMethodName = transformation.newMemberName("write", fieldName);
- MethodSignature writeSignature = new MethodSignature(Modifier.PRIVATE, "void",
+ TransformMethodSignature writeSignature = new TransformMethodSignature(Modifier.PRIVATE, "void",
writeMethodName, new String[]
{ fieldType }, null);
@@ -128,7 +128,7 @@
String readMethodName = transformation.newMemberName("read", fieldName);
- MethodSignature readMethodSignature = new MethodSignature(Modifier.PRIVATE, fieldType,
+ TransformMethodSignature readMethodSignature = new TransformMethodSignature(Modifier.PRIVATE, fieldType,
readMethodName, null, null);
String body = format("return (%s) %s.get(%s);", fieldType, managerFieldName, typeFieldName);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorker.java?rev=578520&r1=578519&r2=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorker.java Sat Sep 22 15:58:22 2007
@@ -26,7 +26,7 @@
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ComponentClassTransformWorker;
import org.apache.tapestry.services.MethodFilter;
-import org.apache.tapestry.services.MethodSignature;
+import org.apache.tapestry.services.TransformMethodSignature;
/**
* Converts one of the methods of {@link org.apache.tapestry.runtime.Component} into a chain of
@@ -39,7 +39,7 @@
private final Class<? extends Annotation> _methodAnnotation;
- private final MethodSignature _lifecycleMethodSignature;
+ private final TransformMethodSignature _lifecycleMethodSignature;
private final String _lifecycleMethodName;
@@ -58,7 +58,7 @@
* @param reverse
* if true, the normal method invocation order is reversed
*/
- public ComponentLifecycleMethodWorker(MethodSignature lifecycleMethodSignature,
+ public ComponentLifecycleMethodWorker(TransformMethodSignature lifecycleMethodSignature,
Class<? extends Annotation> methodAnnotation, boolean reverse)
{
_lifecycleMethodSignature = lifecycleMethodSignature;
@@ -83,7 +83,7 @@
{
MethodFilter filter = new MethodFilter()
{
- public boolean accept(MethodSignature signature)
+ public boolean accept(TransformMethodSignature signature)
{
// These methods get added to base classes and otherwise fall into this filter. If
// we don't
@@ -100,7 +100,7 @@
}
};
- List<MethodSignature> methods = transformation.findMethods(filter);
+ List<TransformMethodSignature> methods = transformation.findMethods(filter);
// Except in the root class, don't bother to add a new method unless there's something to
// call (beside super).
@@ -118,7 +118,7 @@
builder.addln(CHECK_ABORT_FLAG);
}
- Iterator<MethodSignature> i = _reverse ? InternalUtils.reverseIterator(methods) : methods
+ Iterator<TransformMethodSignature> i = _reverse ? InternalUtils.reverseIterator(methods) : methods
.iterator();
while (i.hasNext())
@@ -137,7 +137,7 @@
transformation.addMethod(_lifecycleMethodSignature, builder.toString());
}
- private void addMethodCallToBody(BodyBuilder builder, MethodSignature sig,
+ private void addMethodCallToBody(BodyBuilder builder, TransformMethodSignature sig,
ClassTransformation transformation)
{
boolean isVoid = sig.getReturnType().equals("void");
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnvironmentalWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnvironmentalWorker.java?rev=578520&r1=578519&r2=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnvironmentalWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/EnvironmentalWorker.java Sat Sep 22 15:58:22 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -22,11 +22,11 @@
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ComponentClassTransformWorker;
import org.apache.tapestry.services.Environment;
-import org.apache.tapestry.services.MethodSignature;
+import org.apache.tapestry.services.TransformMethodSignature;
/**
* Obtains a value from the {@link Environment} service based on the field type. This is triggered
- * by the presense of the {@link Environmental} annotation.
+ * by the presence of the {@link Environmental} annotation.
*/
public class EnvironmentalWorker implements ComponentClassTransformWorker
{
@@ -65,7 +65,7 @@
String methodName = transformation.newMemberName("environment_read", name);
- MethodSignature sig = new MethodSignature(Modifier.PRIVATE, type, methodName, null,
+ TransformMethodSignature sig = new TransformMethodSignature(Modifier.PRIVATE, type, methodName, null,
null);
String body = String.format(
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InjectPageWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InjectPageWorker.java?rev=578520&r1=578519&r2=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InjectPageWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InjectPageWorker.java Sat Sep 22 15:58:22 2007
@@ -25,7 +25,7 @@
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ComponentClassResolver;
import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.MethodSignature;
+import org.apache.tapestry.services.TransformMethodSignature;
/**
* Peforms transformations that allow pages to be injected into components.
@@ -73,7 +73,7 @@
String injectedPageName = InternalUtils.isBlank(pageName) ? _resolver
.resolvePageClassNameToPageName(fieldType) : pageName;
- MethodSignature sig = new MethodSignature(Modifier.PRIVATE, fieldType, methodName, null,
+ TransformMethodSignature sig = new TransformMethodSignature(Modifier.PRIVATE, fieldType, methodName, null,
null);
BodyBuilder builder = new BodyBuilder();
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java?rev=578520&r1=578519&r2=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/InternalClassTransformationImpl.java Sat Sep 22 15:58:22 2007
@@ -53,7 +53,7 @@
import org.apache.tapestry.runtime.Component;
import org.apache.tapestry.services.FieldFilter;
import org.apache.tapestry.services.MethodFilter;
-import org.apache.tapestry.services.MethodSignature;
+import org.apache.tapestry.services.TransformMethodSignature;
import org.apache.tapestry.services.TransformUtils;
import org.slf4j.Logger;
@@ -96,7 +96,7 @@
private Map<CtMethod, List<Annotation>> _methodAnnotations = newMap();
- private Map<CtMethod, MethodSignature> _methodSignatures = newMap();
+ private Map<CtMethod, TransformMethodSignature> _methodSignatures = newMap();
// Key is field name, value is expression used to replace read access
@@ -151,7 +151,7 @@
"resources",
null);
- MethodSignature sig = new MethodSignature(Modifier.PUBLIC | Modifier.FINAL,
+ TransformMethodSignature sig = new TransformMethodSignature(Modifier.PUBLIC | Modifier.FINAL,
ComponentResources.class.getName(), "getComponentResources", null, null);
addMethod(sig, "return " + _resourcesFieldName + ";");
@@ -280,7 +280,7 @@
return findAnnotationInList(annotationClass, annotations);
}
- public <T extends Annotation> T getMethodAnnotation(MethodSignature signature,
+ public <T extends Annotation> T getMethodAnnotation(TransformMethodSignature signature,
Class<T> annotationClass)
{
failIfFrozen();
@@ -485,7 +485,7 @@
_ctClass.addMethod(newMethod);
- MethodSignature sig = getMethodSignature(newMethod);
+ TransformMethodSignature sig = getMethodSignature(newMethod);
addMethodToDescription("add default", sig, "<default>");
}
@@ -543,7 +543,7 @@
_claimedFields.put(fieldName, tag);
}
- public void addMethod(MethodSignature signature, String methodBody)
+ public void addMethod(TransformMethodSignature signature, String methodBody)
{
failIfFrozen();
@@ -626,7 +626,7 @@
}
}
- public void extendMethod(MethodSignature methodSignature, String methodBody)
+ public void extendMethod(TransformMethodSignature methodSignature, String methodBody)
{
failIfFrozen();
@@ -649,7 +649,7 @@
_addedMethods.add(method);
}
- private void addMethodToDescription(String operation, MethodSignature methodSignature,
+ private void addMethodToDescription(String operation, TransformMethodSignature methodSignature,
String methodBody)
{
_formatter.format("%s method: %s %s %s(", operation, Modifier.toString(methodSignature
@@ -679,7 +679,7 @@
_formatter.format("\n%s\n\n", methodBody);
}
- private CtMethod findMethod(MethodSignature methodSignature)
+ private CtMethod findMethod(TransformMethodSignature methodSignature)
{
CtMethod method = findDeclaredMethod(methodSignature);
@@ -694,7 +694,7 @@
methodSignature));
}
- private CtMethod findDeclaredMethod(MethodSignature methodSignature)
+ private CtMethod findDeclaredMethod(TransformMethodSignature methodSignature)
{
for (CtMethod method : _ctClass.getDeclaredMethods())
{
@@ -704,7 +704,7 @@
return null;
}
- private CtMethod addOverrideOfSuperclassMethod(MethodSignature methodSignature)
+ private CtMethod addOverrideOfSuperclassMethod(TransformMethodSignature methodSignature)
{
try
{
@@ -739,7 +739,7 @@
return null;
}
- private boolean match(CtMethod method, MethodSignature sig)
+ private boolean match(CtMethod method, TransformMethodSignature sig)
{
if (!sig.getMethodName().equals(method.getName())) return false;
@@ -829,12 +829,12 @@
return findFields(filter);
}
- public List<MethodSignature> findMethodsWithAnnotation(
+ public List<TransformMethodSignature> findMethodsWithAnnotation(
Class<? extends Annotation> annotationClass)
{
failIfFrozen();
- List<MethodSignature> result = newList();
+ List<TransformMethodSignature> result = newList();
for (CtMethod method : _ctClass.getDeclaredMethods())
{
@@ -842,7 +842,7 @@
if (findAnnotationInList(annotationClass, annotations) != null)
{
- MethodSignature sig = getMethodSignature(method);
+ TransformMethodSignature sig = getMethodSignature(method);
result.add(sig);
}
}
@@ -852,15 +852,15 @@
return result;
}
- public List<MethodSignature> findMethods(MethodFilter filter)
+ public List<TransformMethodSignature> findMethods(MethodFilter filter)
{
notNull(filter, "filter");
- List<MethodSignature> result = newList();
+ List<TransformMethodSignature> result = newList();
for (CtMethod method : _ctClass.getDeclaredMethods())
{
- MethodSignature sig = getMethodSignature(method);
+ TransformMethodSignature sig = getMethodSignature(method);
if (filter.accept(sig)) result.add(sig);
}
@@ -870,9 +870,9 @@
return result;
}
- private MethodSignature getMethodSignature(CtMethod method)
+ private TransformMethodSignature getMethodSignature(CtMethod method)
{
- MethodSignature result = _methodSignatures.get(method);
+ TransformMethodSignature result = _methodSignatures.get(method);
if (result == null)
{
try
@@ -881,7 +881,7 @@
String[] parameters = toTypeNames(method.getParameterTypes());
String[] exceptions = toTypeNames(method.getExceptionTypes());
- result = new MethodSignature(method.getModifiers(), type, method.getName(),
+ result = new TransformMethodSignature(method.getModifiers(), type, method.getName(),
parameters, exceptions);
_methodSignatures.put(method, result);
@@ -1331,7 +1331,7 @@
String fieldType = getFieldType(fieldName);
- MethodSignature sig = new MethodSignature(Modifier.PRIVATE, "void", methodName,
+ TransformMethodSignature sig = new TransformMethodSignature(Modifier.PRIVATE, "void", methodName,
new String[]
{ fieldType }, null);
@@ -1491,7 +1491,7 @@
_constructor.append("\n");
}
- public String getMethodIdentifier(MethodSignature signature)
+ public String getMethodIdentifier(TransformMethodSignature signature)
{
notNull(signature, "signature");
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/OnEventWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/OnEventWorker.java?rev=578520&r1=578519&r2=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/OnEventWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/OnEventWorker.java Sat Sep 22 15:58:22 2007
@@ -24,7 +24,7 @@
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ComponentClassTransformWorker;
import org.apache.tapestry.services.MethodFilter;
-import org.apache.tapestry.services.MethodSignature;
+import org.apache.tapestry.services.TransformMethodSignature;
import org.apache.tapestry.services.TransformConstants;
import org.apache.tapestry.services.TransformUtils;
@@ -43,14 +43,14 @@
{
MethodFilter filter = new MethodFilter()
{
- public boolean accept(MethodSignature signature)
+ public boolean accept(TransformMethodSignature signature)
{
return signature.getMethodName().startsWith("on")
|| transformation.getMethodAnnotation(signature, OnEvent.class) != null;
};
};
- List<MethodSignature> methods = transformation.findMethods(filter);
+ List<TransformMethodSignature> methods = transformation.findMethods(filter);
// No methods, no work.
@@ -61,7 +61,7 @@
builder.addln("if ($1.isAborted()) return $_;");
- for (MethodSignature method : methods)
+ for (TransformMethodSignature method : methods)
addCodeForMethod(builder, method, transformation);
builder.end();
@@ -69,7 +69,7 @@
transformation.extendMethod(TransformConstants.HANDLE_COMPONENT_EVENT, builder.toString());
}
- private void addCodeForMethod(BodyBuilder builder, MethodSignature method,
+ private void addCodeForMethod(BodyBuilder builder, TransformMethodSignature method,
ClassTransformation transformation)
{
// $1 is the event
@@ -136,7 +136,7 @@
builder.end();
}
- private String extractComponentId(MethodSignature method, OnEvent annotation)
+ private String extractComponentId(TransformMethodSignature method, OnEvent annotation)
{
if (annotation != null) return annotation.component();
@@ -151,7 +151,7 @@
return name.substring(fromx + 4);
}
- private String extractEventType(MethodSignature method, OnEvent annotation)
+ private String extractEventType(TransformMethodSignature method, OnEvent annotation)
{
if (annotation != null) return annotation.value();
@@ -170,7 +170,7 @@
return eventName;
}
- private int getParameterCount(MethodSignature method)
+ private int getParameterCount(TransformMethodSignature method)
{
String[] types = method.getParameterTypes();
@@ -184,7 +184,7 @@
return types.length;
}
- private void buildMethodParameters(BodyBuilder builder, MethodSignature method)
+ private void buildMethodParameters(BodyBuilder builder, TransformMethodSignature method)
{
int contextIndex = 0;
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLifecycleAnnotationWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLifecycleAnnotationWorker.java?rev=578520&r1=578519&r2=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLifecycleAnnotationWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PageLifecycleAnnotationWorker.java Sat Sep 22 15:58:22 2007
@@ -21,7 +21,7 @@
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ComponentClassTransformWorker;
import org.apache.tapestry.services.MethodFilter;
-import org.apache.tapestry.services.MethodSignature;
+import org.apache.tapestry.services.TransformMethodSignature;
/**
* Similar to {@link ComponentLifecycleMethodWorker} but applies to annotations/methods related to
@@ -31,14 +31,14 @@
{
private final Class<? extends Annotation> _methodAnnotationClass;
- private final MethodSignature _lifecycleMethodSignature;
+ private final TransformMethodSignature _lifecycleMethodSignature;
private final String _methodAlias;
private final MethodInvocationBuilder _invocationBuilder = new MethodInvocationBuilder();
public PageLifecycleAnnotationWorker(final Class<? extends Annotation> methodAnnotationClass,
- final MethodSignature lifecycleMethodSignature, final String methodAlias)
+ final TransformMethodSignature lifecycleMethodSignature, final String methodAlias)
{
_methodAnnotationClass = methodAnnotationClass;
_lifecycleMethodSignature = lifecycleMethodSignature;
@@ -49,7 +49,7 @@
{
MethodFilter filter = new MethodFilter()
{
- public boolean accept(MethodSignature signature)
+ public boolean accept(TransformMethodSignature signature)
{
if (signature.getMethodName().equals(_methodAlias))
return true;
@@ -62,7 +62,7 @@
// If I expected lots of signatures, I'd build up a BodyBuilder in the loop and extend the
// method outside the loop.
- for (MethodSignature signature : transformation.findMethods(filter))
+ for (TransformMethodSignature signature : transformation.findMethods(filter))
{
// TODO: Filter out the non-void methods (with a non-fatal warning/error?) For the
// moment, we just invoke the method anyway, and ignore the result. Also, MethodInvocationBuilder
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ParameterWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ParameterWorker.java?rev=578520&r1=578519&r2=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ParameterWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ParameterWorker.java Sat Sep 22 15:58:22 2007
@@ -29,7 +29,7 @@
import org.apache.tapestry.services.ComponentClassTransformWorker;
import org.apache.tapestry.services.FieldFilter;
import org.apache.tapestry.services.MethodFilter;
-import org.apache.tapestry.services.MethodSignature;
+import org.apache.tapestry.services.TransformMethodSignature;
import org.apache.tapestry.services.TransformConstants;
import org.apache.tapestry.services.TransformUtils;
@@ -224,7 +224,7 @@
MethodFilter filter = new MethodFilter()
{
- public boolean accept(MethodSignature signature)
+ public boolean accept(TransformMethodSignature signature)
{
return signature.getParameterTypes().length == 0
&& signature.getMethodName().equals(methodName);
@@ -234,7 +234,7 @@
// This will match exactly 0 or 1 methods, and if it matches, we know the name
// of the method.
- List<MethodSignature> signatures = transformation.findMethods(filter);
+ List<TransformMethodSignature> signatures = transformation.findMethods(filter);
if (signatures.isEmpty())
return;
@@ -281,7 +281,7 @@
String methodName = transformation.newMemberName("update_parameter", parameterName);
- MethodSignature signature = new MethodSignature(Modifier.PRIVATE, "void", methodName,
+ TransformMethodSignature signature = new TransformMethodSignature(Modifier.PRIVATE, "void", methodName,
new String[]
{ fieldType }, null);
@@ -341,7 +341,7 @@
String methodName = transformation.newMemberName("read_parameter", parameterName);
- MethodSignature signature = new MethodSignature(Modifier.PRIVATE, fieldType, methodName,
+ TransformMethodSignature signature = new TransformMethodSignature(Modifier.PRIVATE, fieldType, methodName,
null, null);
transformation.addMethod(signature, builder.toString());
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistWorker.java?rev=578520&r1=578519&r2=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/PersistWorker.java Sat Sep 22 15:58:22 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.MethodSignature;
+import org.apache.tapestry.services.TransformMethodSignature;
import org.apache.tapestry.services.PersistentFieldBundle;
import org.apache.tapestry.services.TransformConstants;
import org.apache.tapestry.services.TransformUtils;
@@ -93,7 +93,7 @@
builder.addln("%s = $1;", fieldName);
builder.end();
- transformation.addMethod(new MethodSignature(Modifier.PRIVATE, "void", writeMethodName,
+ transformation.addMethod(new TransformMethodSignature(Modifier.PRIVATE, "void", writeMethodName,
new String[]
{ fieldType }, null), builder.toString());
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderCommandWorker.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderCommandWorker.java?rev=578520&r1=578519&r2=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderCommandWorker.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/RenderCommandWorker.java Sat Sep 22 15:58:22 2007
@@ -23,7 +23,7 @@
import org.apache.tapestry.runtime.RenderQueue;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.MethodSignature;
+import org.apache.tapestry.services.TransformMethodSignature;
/**
* Ensures that all components implement {@link RenderCommand} by delegating to
@@ -31,7 +31,7 @@
*/
public class RenderCommandWorker implements ComponentClassTransformWorker
{
- private final MethodSignature RENDER_SIGNATURE = new MethodSignature(Modifier.PUBLIC, "void",
+ private final TransformMethodSignature RENDER_SIGNATURE = new TransformMethodSignature(Modifier.PUBLIC, "void",
"render", new String[]
{ MarkupWriter.class.getName(), RenderQueue.class.getName() }, null);
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServicesMessages.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServicesMessages.java?rev=578520&r1=578519&r2=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServicesMessages.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/services/ServicesMessages.java Sat Sep 22 15:58:22 2007
@@ -29,7 +29,7 @@
import org.apache.tapestry.ioc.services.ClassFabUtils;
import org.apache.tapestry.runtime.Component;
import org.apache.tapestry.runtime.RenderCommand;
-import org.apache.tapestry.services.MethodSignature;
+import org.apache.tapestry.services.TransformMethodSignature;
class ServicesMessages
{
@@ -72,7 +72,7 @@
{ fieldName, ctClass.getName(), existingTag, newTag });
}
- static String noDeclaredMethod(CtClass ctClass, MethodSignature methodSignature)
+ static String noDeclaredMethod(CtClass ctClass, TransformMethodSignature methodSignature)
{
return MESSAGES.format("no-declared-method", ctClass.getName(), methodSignature);
}
@@ -113,7 +113,7 @@
return MESSAGES.format("may-not-nest-elements-inside-body", elementName);
}
- static String methodCompileError(MethodSignature signature, String methodBody, Throwable cause)
+ static String methodCompileError(TransformMethodSignature signature, String methodBody, Throwable cause)
{
return MESSAGES.format("method-compile-error", signature, methodBody, cause);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java?rev=578520&r1=578519&r2=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/structure/ComponentPageElementImpl.java Sat Sep 22 15:58:22 2007
@@ -101,7 +101,7 @@
}
};
- // For the momement, every component will have a template, even if it consists of
+ // For the moment, every component will have a template, even if it consists of
// just a page element to queue up a BeforeRenderBody phase.
private static void pushElements(RenderQueue queue, List<PageElement> list)
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/MethodInvocationBuilder.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/MethodInvocationBuilder.java?rev=578520&r1=578519&r2=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/MethodInvocationBuilder.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/internal/util/MethodInvocationBuilder.java Sat Sep 22 15:58:22 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -12,89 +12,86 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-package org.apache.tapestry.internal.util;
-
-import java.util.Map;
-
+package org.apache.tapestry.internal.util;
+
+import java.util.Map;
+
import org.apache.tapestry.ioc.internal.util.CollectionFactory;
-import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.MethodSignature;
-import org.apache.tapestry.services.TransformUtils;
-
-/**
- * A utility class for building part of a method body to invoke a method. Analyzes the method and
- * matches parameter types to ParameterBuilders.
- *
- *
- */
-public final class MethodInvocationBuilder
-{
- private final Map<String, ParameterBuilder> _builders = CollectionFactory.newMap();
-
- /**
- * Maps a parameter type to a {@link ParameterBuilder}.
- */
- public void addParameter(String parameterType, ParameterBuilder builder)
- {
- // TODO: Name conflicts
-
- _builders.put(parameterType, builder);
- }
-
- /**
- * Maps a parameter type to a literal string to be used for the parameter expression.
- *
- * @see StringParameterBuilder
- */
- public void addParameter(String parameterType, String expression)
- {
- addParameter(parameterType, new StringParameterBuilder(expression));
- }
-
- /**
- * Builds the method invocation. Analyzes the type of each parameter to the method, and uses a
- * {@link ParameterBuilder} to provide the expression. Supplies a default value (usually null)
- * for any parameters that do not have parameter builders.
- *
- * @param signature
- * of the method to invoke
- * @param transformation
- * @return method invocation expression
- * @see TransformUtils#getDefaultValue(String)
- */
- public String buildMethodInvocation(MethodSignature signature,
- ClassTransformation transformation)
- {
- StringBuilder builder = new StringBuilder(signature.getMethodName());
-
- builder.append("(");
-
- String[] parameterTypes = signature.getParameterTypes();
-
- for (int i = 0; i < parameterTypes.length; i++)
- {
- if (i > 0)
- builder.append(", ");
-
- String type = parameterTypes[i];
-
- ParameterBuilder parameterBuilder = _builders.get(type);
-
- if (parameterBuilder == null)
- {
- // TODO: Log an error
-
- builder.append(TransformUtils.getDefaultValue(type));
- }
- else
- {
- builder.append(parameterBuilder.buildParameter(transformation));
- }
- }
-
- builder.append(")");
-
- return builder.toString();
- }
-
-}
+import org.apache.tapestry.services.ClassTransformation;
+import org.apache.tapestry.services.TransformMethodSignature;
+import org.apache.tapestry.services.TransformUtils;
+
+/**
+ * A utility class for building part of a method body to invoke a method. Analyzes the method and
+ * matches parameter types to ParameterBuilders.
+ */
+public final class MethodInvocationBuilder
+{
+ private final Map<String, ParameterBuilder> _builders = CollectionFactory.newMap();
+
+ /**
+ * Maps a parameter type to a {@link ParameterBuilder}.
+ */
+ public void addParameter(String parameterType, ParameterBuilder builder)
+ {
+ // TODO: Name conflicts
+
+ _builders.put(parameterType, builder);
+ }
+
+ /**
+ * Maps a parameter type to a literal string to be used for the parameter expression.
+ *
+ * @see StringParameterBuilder
+ */
+ public void addParameter(String parameterType, String expression)
+ {
+ addParameter(parameterType, new StringParameterBuilder(expression));
+ }
+
+ /**
+ * Builds the method invocation. Analyzes the type of each parameter to the method, and uses a
+ * {@link ParameterBuilder} to provide the expression. Supplies a default value (usually null)
+ * for any parameters that do not have parameter builders.
+ *
+ * @param signature
+ * of the method to invoke
+ * @param transformation
+ * @return method invocation expression
+ * @see TransformUtils#getDefaultValue(String)
+ */
+ public String buildMethodInvocation(TransformMethodSignature signature,
+ ClassTransformation transformation)
+ {
+ StringBuilder builder = new StringBuilder(signature.getMethodName());
+
+ builder.append("(");
+
+ String[] parameterTypes = signature.getParameterTypes();
+
+ for (int i = 0; i < parameterTypes.length; i++)
+ {
+ if (i > 0) builder.append(", ");
+
+ String type = parameterTypes[i];
+
+ ParameterBuilder parameterBuilder = _builders.get(type);
+
+ if (parameterBuilder == null)
+ {
+ // TODO: Log an error
+
+ builder.append(TransformUtils.getDefaultValue(type));
+ }
+ else
+ {
+ builder.append(parameterBuilder.buildParameter(transformation));
+ }
+ }
+
+ builder.append(")");
+
+ return builder.toString();
+ }
+
+}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ClassTransformation.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ClassTransformation.java?rev=578520&r1=578519&r2=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ClassTransformation.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/ClassTransformation.java Sat Sep 22 15:58:22 2007
@@ -88,17 +88,20 @@
*
* @param annotationClass
* @return a list of method signature (which may be empty) in ascending order
+ * @see #findMethods(MethodFilter)
*/
- List<MethodSignature> findMethodsWithAnnotation(Class<? extends Annotation> annotationClass);
+ List<TransformMethodSignature> findMethodsWithAnnotation(Class<? extends Annotation> annotationClass);
/**
* Finds all methods matched by the provided filter.
*
* @param filter
* Passed each method signature, it may include or exclude each potential
- * @return a list of matching method signatures (which may be empty) in ascending order
+ * @return a list of matching method signatures (which may be empty) in ascending order (by
+ * method name), but descending order (by parameter count) within overrides of a single
+ * method name.
*/
- List<MethodSignature> findMethods(MethodFilter filter);
+ List<TransformMethodSignature> findMethods(MethodFilter filter);
/**
* Finds all unclaimed fields matched by the provided filter. Only considers unclaimed, private,
@@ -138,7 +141,7 @@
* @throws IllegalArgumentException
* if the method signature does not correspond to a declared method
*/
- <T extends Annotation> T getMethodAnnotation(MethodSignature method, Class<T> annotationClass);
+ <T extends Annotation> T getMethodAnnotation(TransformMethodSignature method, Class<T> annotationClass);
/**
* Claims a field so as to ensure that only a single annotation is applied to any single field.
@@ -256,7 +259,7 @@
* <p>
* The method may be declared in the class, or may be inherited from a super-class. For
* inherited methods, a method is added that first invokes the super implementation. Use
- * {@link #addMethod(MethodSignature, String)} when it is necessary to control when the
+ * {@link #addMethod(TransformMethodSignature, String)} when it is necessary to control when the
* super-class method is invoked.
*
* @param signature
@@ -266,7 +269,7 @@
* @throws IllegalArgumentException
* if the provided Javassist method body can not be compiled
*/
- void extendMethod(MethodSignature methodSignature, String methodBody);
+ void extendMethod(TransformMethodSignature methodSignature, String methodBody);
/**
* Returns the name of a field that provides the {@link org.apache.tapestry.ComponentResources}
@@ -280,11 +283,11 @@
/**
* Adds a new method to the transformed class. Replaces any existing method declared for the
* class. When overriding a super-class method, you should use
- * {@link #extendMethod(MethodSignature, String)}, or you should remember to invoke the super
+ * {@link #extendMethod(TransformMethodSignature, String)}, or you should remember to invoke the super
* class implemetation explicitly. Use this method to control when the super-class
* implementation is invoked.
*/
- void addMethod(MethodSignature signature, String methodBody);
+ void addMethod(TransformMethodSignature signature, String methodBody);
/**
* Adds a statement to the constructor. The statement is added as is, though a newline is added.
@@ -297,15 +300,15 @@
/**
* Replaces all read-references to the specified field with invocations of the specified method
* name. Replacements do not occur in methods added via
- * {@link #addMethod(MethodSignature, String)} or {@link #extendMethod(MethodSignature, String)}.
+ * {@link #addMethod(TransformMethodSignature, String)} or {@link #extendMethod(TransformMethodSignature, String)}.
*/
void replaceReadAccess(String fieldName, String methodName);
/**
* Replaces all write accesses to the specified field with invocations of the specified method
* name. The method should take a single parameter of the same type as the field. Replacements
- * do not occur in methods added via {@link #addMethod(MethodSignature, String)} or
- * {@link #extendMethod(MethodSignature, String)}.
+ * do not occur in methods added via {@link #addMethod(TransformMethodSignature, String)} or
+ * {@link #extendMethod(TransformMethodSignature, String)}.
*/
void replaceWriteAccess(String fieldName, String methodName);
@@ -338,12 +341,12 @@
/**
* Converts a signature to a string used to identify the method; this consists of the
- * {@link MethodSignature#getMediumDescription()} appended with source file information and line
+ * {@link TransformMethodSignature#getMediumDescription()} appended with source file information and line
* number information (when available).
*
* @param signature
* @return a string that identifies the class, method name, types of parameters, source file and
* source line number
*/
- String getMethodIdentifier(MethodSignature signature);
+ String getMethodIdentifier(TransformMethodSignature signature);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/MethodFilter.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/MethodFilter.java?rev=578520&r1=578519&r2=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/MethodFilter.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/MethodFilter.java Sat Sep 22 15:58:22 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -23,5 +23,5 @@
* Passed each signature in turn, only signatures for which this method returns true will be
* included in the final result.
*/
- boolean accept(MethodSignature signature);
+ boolean accept(TransformMethodSignature signature);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java?rev=578520&r1=578519&r2=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TapestryModule.java Sat Sep 22 15:58:22 2007
@@ -828,7 +828,7 @@
}
private static void add(OrderedConfiguration<ComponentClassTransformWorker> configuration,
- Class<? extends Annotation> annotationClass, MethodSignature lifecycleMethodSignature,
+ Class<? extends Annotation> annotationClass, TransformMethodSignature lifecycleMethodSignature,
String methodAlias)
{
ComponentClassTransformWorker worker = new PageLifecycleAnnotationWorker(annotationClass,
@@ -840,7 +840,7 @@
}
private static void add(OrderedConfiguration<ComponentClassTransformWorker> configuration,
- MethodSignature signature, Class<? extends Annotation> annotationClass, boolean reverse)
+ TransformMethodSignature signature, Class<? extends Annotation> annotationClass, boolean reverse)
{
// make the name match the annotation class name.
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformConstants.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformConstants.java?rev=578520&r1=578519&r2=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformConstants.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformConstants.java Sat Sep 22 15:58:22 2007
@@ -1,4 +1,4 @@
-// Copyright 2006 The Apache Software Foundation
+// Copyright 2006, 2007 The Apache Software Foundation
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@
*
* @see org.apache.tapestry.annotations.OnEvent
*/
- public static final MethodSignature HANDLE_COMPONENT_EVENT = new MethodSignature(
+ public static final TransformMethodSignature HANDLE_COMPONENT_EVENT = new TransformMethodSignature(
Modifier.PUBLIC, "boolean", "handleComponentEvent", new String[]
{ ComponentEvent.class.getName() }, null);
@@ -44,25 +44,25 @@
* Signature for
* {@link org.apache.tapestry.runtime.PageLifecycleListener#containingPageDidLoad()}.
*/
- public static final MethodSignature CONTAINING_PAGE_DID_LOAD_SIGNATURE = new MethodSignature(
+ public static final TransformMethodSignature CONTAINING_PAGE_DID_LOAD_SIGNATURE = new TransformMethodSignature(
"containingPageDidLoad");
/** Signature for {@link org.apache.tapestry.runtime.Component#postRenderCleanup()}. */
- public static final MethodSignature POST_RENDER_CLEANUP_SIGNATURE = new MethodSignature(
+ public static final TransformMethodSignature POST_RENDER_CLEANUP_SIGNATURE = new TransformMethodSignature(
"postRenderCleanup");
/**
* Signature for
* {@link org.apache.tapestry.runtime.PageLifecycleListener#containingPageDidDetach()}.
*/
- public static final MethodSignature CONTAINING_PAGE_DID_DETACH_SIGNATURE = new MethodSignature(
+ public static final TransformMethodSignature CONTAINING_PAGE_DID_DETACH_SIGNATURE = new TransformMethodSignature(
"containingPageDidDetach");
/**
* Signature for
* {@link org.apache.tapestry.runtime.PageLifecycleListener#containingPageDidAttach()}.
*/
- public static final MethodSignature CONTAINING_PAGE_DID_ATTACH_SIGNATURE = new MethodSignature(
+ public static final TransformMethodSignature CONTAINING_PAGE_DID_ATTACH_SIGNATURE = new TransformMethodSignature(
"containingPageDidAttach");
/**
@@ -70,14 +70,14 @@
*
* @see org.apache.tapestry.annotations.SetupRender
*/
- public static final MethodSignature SETUP_RENDER_SIGNATURE = renderPhaseSignature("setupRender");
+ public static final TransformMethodSignature SETUP_RENDER_SIGNATURE = renderPhaseSignature("setupRender");
/**
* Signature for {@link org.apache.tapestry.runtime.Component#beginRender(MarkupWriter, Event)}.
*
* @see org.apache.tapestry.annotations.BeginRender
*/
- public static final MethodSignature BEGIN_RENDER_SIGNATURE = renderPhaseSignature("beginRender");
+ public static final TransformMethodSignature BEGIN_RENDER_SIGNATURE = renderPhaseSignature("beginRender");
/**
* Signature for
@@ -85,7 +85,7 @@
*
* @see org.apache.tapestry.annotations.BeforeRenderTemplate
*/
- public static MethodSignature BEFORE_RENDER_TEMPLATE_SIGNATURE = renderPhaseSignature("beforeRenderTemplate");
+ public static TransformMethodSignature BEFORE_RENDER_TEMPLATE_SIGNATURE = renderPhaseSignature("beforeRenderTemplate");
/**
* Signature for
@@ -93,7 +93,7 @@
*
* @see org.apache.tapestry.annotations.BeforeRenderTemplate
*/
- public static MethodSignature AFTER_RENDER_TEMPLATE_SIGNATURE = renderPhaseSignature("afterRenderTemplate");
+ public static TransformMethodSignature AFTER_RENDER_TEMPLATE_SIGNATURE = renderPhaseSignature("afterRenderTemplate");
/**
* Signature for
@@ -101,7 +101,7 @@
*
* @see org.apache.tapestry.annotations.BeforeRenderBody
*/
- public static final MethodSignature BEFORE_RENDER_BODY_SIGNATURE = renderPhaseSignature("beforeRenderBody");
+ public static final TransformMethodSignature BEFORE_RENDER_BODY_SIGNATURE = renderPhaseSignature("beforeRenderBody");
/**
* Signature for
@@ -109,14 +109,14 @@
*
* @see org.apache.tapestry.annotations.AfterRenderBody
*/
- public static final MethodSignature AFTER_RENDER_BODY_SIGNATURE = renderPhaseSignature("afterRenderBody");
+ public static final TransformMethodSignature AFTER_RENDER_BODY_SIGNATURE = renderPhaseSignature("afterRenderBody");
/**
* Signature for {@link org.apache.tapestry.runtime.Component#afterRender(MarkupWriter, Event)}
*
* @see org.apache.tapestry.annotations.AfterRender
*/
- public static final MethodSignature AFTER_RENDER_SIGNATURE = renderPhaseSignature("afterRender");
+ public static final TransformMethodSignature AFTER_RENDER_SIGNATURE = renderPhaseSignature("afterRender");
/**
* Signature for
@@ -124,15 +124,15 @@
*
* @see org.apache.tapestry.annotations.CleanupRender
*/
- public static final MethodSignature CLEANUP_RENDER_SIGNATURE = renderPhaseSignature("cleanupRender");
+ public static final TransformMethodSignature CLEANUP_RENDER_SIGNATURE = renderPhaseSignature("cleanupRender");
private TransformConstants()
{
}
- private static MethodSignature renderPhaseSignature(String name)
+ private static TransformMethodSignature renderPhaseSignature(String name)
{
- return new MethodSignature(Modifier.PUBLIC, "void", name, RENDER_PHASE_METHOD_PARAMETERS,
+ return new TransformMethodSignature(Modifier.PUBLIC, "void", name, RENDER_PHASE_METHOD_PARAMETERS,
null);
}
}
Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformMethodSignature.java (from r573901, tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/MethodSignature.java)
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformMethodSignature.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformMethodSignature.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/MethodSignature.java&r1=573901&r2=578520&rev=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/MethodSignature.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/services/TransformMethodSignature.java Sat Sep 22 15:58:22 2007
@@ -22,12 +22,10 @@
* A representation of a method signature, which consists of its name, modifiers (primarily,
* visibility), return type, parameter types, and declared exception types.
* <p>
- * Types are stored as class names (or primitive names) because the MethodSignature is often used in
- * situations where the actual class has not been loaded yet. When classes are already loaded (such
- * as, for use with {@link org.apache.hivemind.service.ClassFab}), then a different implementation
- * with the same name, {@link org.apache.tapestry.ioc.services.MethodSignature} is used.
+ * Types are stored as class names (or primitive names) because the signature is used with
+ * {@link ClassTransformation} (which operates on as-yet unloaded classes).
*/
-public class MethodSignature implements Comparable<MethodSignature>
+public class TransformMethodSignature implements Comparable<TransformMethodSignature>
{
private int _hashCode = -1;
@@ -43,15 +41,15 @@
private static final String[] EMPTY_STRINGS = new String[0];
- /** Convienience for adding a public void method with no parameters or exception types. */
+ /** Convenience for adding a public void method with no parameters or exception types. */
- public MethodSignature(String name)
+ public TransformMethodSignature(String name)
{
this(Modifier.PUBLIC, "void", name, EMPTY_STRINGS, EMPTY_STRINGS);
}
- public MethodSignature(int modifiers, String type, String name, String[] parameterTypes,
- String[] exceptionTypes)
+ public TransformMethodSignature(int modifiers, String type, String name,
+ String[] parameterTypes, String[] exceptionTypes)
{
_modifiers = modifiers;
@@ -136,10 +134,9 @@
@Override
public boolean equals(Object other)
{
- if (other == null || !(other instanceof MethodSignature))
- return false;
+ if (other == null || !(other instanceof TransformMethodSignature)) return false;
- MethodSignature ms = (MethodSignature) other;
+ TransformMethodSignature ms = (TransformMethodSignature) other;
return _modifiers == ms._modifiers && _returnType.equals(ms._returnType)
&& _methodName.equals(ms._methodName)
@@ -149,13 +146,11 @@
private boolean matches(String[] values, String[] otherValues)
{
- if (values.length != otherValues.length)
- return false;
+ if (values.length != otherValues.length) return false;
for (int i = 0; i < values.length; i++)
{
- if (!values[i].equals(otherValues[i]))
- return false;
+ if (!values[i].equals(otherValues[i])) return false;
}
return true;
@@ -204,8 +199,7 @@
for (int i = 0; i < _parameterTypes.length; i++)
{
- if (i > 0)
- builder.append(", ");
+ if (i > 0) builder.append(", ");
builder.append(_parameterTypes[i]);
}
@@ -215,14 +209,14 @@
/**
* Sorting is primarily via method name. For methods with the same name, the second level of
- * sorting is by parameter count (ascending).
+ * sorting is by parameter count (descending).
*/
- public int compareTo(MethodSignature o)
+ public int compareTo(TransformMethodSignature o)
{
int result = _methodName.compareTo(o._methodName);
- if (result == 0)
- result = _parameterTypes.length - o._parameterTypes.length;
+ // Sort descending
+ if (result == 0) result = o._parameterTypes.length - _parameterTypes.length;
return result;
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/TapestryTestCase.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/TapestryTestCase.java?rev=578520&r1=578519&r2=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/TapestryTestCase.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry/test/TapestryTestCase.java Sat Sep 22 15:58:22 2007
@@ -86,7 +86,7 @@
import org.apache.tapestry.services.Heartbeat;
import org.apache.tapestry.services.InjectionProvider;
import org.apache.tapestry.services.MethodFilter;
-import org.apache.tapestry.services.MethodSignature;
+import org.apache.tapestry.services.TransformMethodSignature;
import org.apache.tapestry.services.Request;
import org.apache.tapestry.services.RequestHandler;
import org.apache.tapestry.services.ResourceDigestGenerator;
@@ -385,7 +385,7 @@
}
protected final void train_addMethod(ClassTransformation transformation,
- MethodSignature signature, String... body)
+ TransformMethodSignature signature, String... body)
{
transformation.addMethod(eq(signature), codeEq(join(body)));
}
@@ -443,7 +443,7 @@
}
protected final void train_extendMethod(ClassTransformation transformation,
- MethodSignature signature, String... body)
+ TransformMethodSignature signature, String... body)
{
transformation.extendMethod(eq(signature), codeEq(join(body)));
}
@@ -473,19 +473,19 @@
}
protected final void train_findMethods(ClassTransformation transformation,
- final MethodSignature... signatures)
+ final TransformMethodSignature... signatures)
{
- IAnswer<List<MethodSignature>> answer = new IAnswer<List<MethodSignature>>()
+ IAnswer<List<TransformMethodSignature>> answer = new IAnswer<List<TransformMethodSignature>>()
{
- public List<MethodSignature> answer() throws Throwable
+ public List<TransformMethodSignature> answer() throws Throwable
{
// Can't think of a way to do this without duplicating some code out of
// InternalClassTransformationImpl
- List<MethodSignature> result = newList();
+ List<TransformMethodSignature> result = newList();
MethodFilter filter = (MethodFilter) EasyMock.getCurrentArguments()[0];
- for (MethodSignature sig : signatures)
+ for (TransformMethodSignature sig : signatures)
{
if (filter.accept(sig)) result.add(sig);
}
@@ -502,7 +502,7 @@
}
protected final void train_findMethodsWithAnnotation(ClassTransformation tf,
- Class<? extends Annotation> annotationType, List<MethodSignature> sigs)
+ Class<? extends Annotation> annotationType, List<TransformMethodSignature> sigs)
{
expect(tf.findMethodsWithAnnotation(annotationType)).andReturn(sigs);
}
@@ -681,14 +681,14 @@
}
protected final <T extends Annotation> void train_getMethodAnnotation(ClassTransformation ct,
- MethodSignature signature, Class<T> annotationClass, T annotation)
+ TransformMethodSignature signature, Class<T> annotationClass, T annotation)
{
expect(ct.getMethodAnnotation(signature, annotationClass)).andReturn(annotation)
.atLeastOnce();
}
protected final void train_getMethodIdentifier(ClassTransformation transformation,
- MethodSignature signature, String id)
+ TransformMethodSignature signature, String id)
{
expect(transformation.getMethodIdentifier(signature)).andReturn(id);
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/app1/WEB-INF/MultiBeanEditDemo.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/app1/WEB-INF/MultiBeanEditDemo.html?rev=578520&r1=578519&r2=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/app1/WEB-INF/MultiBeanEditDemo.html (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/app1/WEB-INF/MultiBeanEditDemo.html Sat Sep 22 15:58:22 2007
@@ -3,7 +3,7 @@
<h1>MultiBean Edit</h1>
- <t:form>
+ <form t:id="form">
<t:errors />
@@ -21,7 +21,7 @@
</div>
- </t:form>
+ </form>
<p>
[
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java?rev=578520&r1=578519&r2=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/IntegrationTests.java Sat Sep 22 15:58:22 2007
@@ -848,16 +848,16 @@
clickAndWait(clear);
clickAndWait("barney");
- assertTextPresent("[parent.eventHandlerOne(String), parent.eventHandlerZero(), parent.onAction(), parent.onAction(String), child.eventHandlerOneChild(), child.eventHandlerZeroChild(), child.onAction(), child.onAction(String)]");
+ assertTextPresent("[parent.eventHandlerOne(String), parent.eventHandlerZero(), parent.onAction(String), parent.onAction(), child.eventHandlerOneChild(), child.eventHandlerZeroChild(), child.onAction(String), child.onAction()]");
clickAndWait(clear);
clickAndWait("betty");
- assertTextPresent("[parent.eventHandlerOne(String), parent.eventHandlerZero(), parent.onAction(), parent.onAction(String), child.eventHandlerOneChild(), child.eventHandlerZeroChild(), child.onAction(), child.onAction(String)]");
+ assertTextPresent("[parent.eventHandlerOne(String), parent.eventHandlerZero(), parent.onAction(String), parent.onAction(), child.eventHandlerOneChild(), child.eventHandlerZeroChild(), child.onAction(String), child.onAction()]");
clickAndWait(clear);
clickAndWait("fred");
- assertTextPresent("[parent.eventHandlerOne(String), parent.eventHandlerZero(), parent.onAction(), parent.onAction(String), child.eventHandlerForFred(), child.eventHandlerOneChild(), child.eventHandlerZeroChild(), child.onAction(), child.onAction(String), child.onActionFromFred(), child.onActionFromFred(String), child.onAnyEventFromFred(), child.onAnyEventFromFred(String)]");
+ assertTextPresent("[parent.eventHandlerOne(String), parent.eventHandlerZero(), parent.onAction(String), parent.onAction(), child.eventHandlerForFred(), child.eventHandlerOneChild(), child.eventHandlerZeroChild(), child.onAction(String), child.onAction(), child.onActionFromFred(String), child.onActionFromFred(), child.onAnyEventFromFred(String), child.onAnyEventFromFred()]");
}
@Test
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MultiBeanEditDemo.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MultiBeanEditDemo.java?rev=578520&r1=578519&r2=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MultiBeanEditDemo.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/integration/app1/pages/MultiBeanEditDemo.java Sat Sep 22 15:58:22 2007
@@ -15,7 +15,9 @@
package org.apache.tapestry.integration.app1.pages;
import org.apache.tapestry.annotations.ApplicationState;
+import org.apache.tapestry.annotations.Component;
import org.apache.tapestry.annotations.InjectPage;
+import org.apache.tapestry.corelib.components.Form;
import org.apache.tapestry.integration.app1.data.RolePath;
import org.apache.tapestry.integration.app1.data.UserCredentials;
@@ -30,6 +32,9 @@
@InjectPage
private MultiBeanDemoResult _resultPage;
+ @Component
+ private Form _form;
+
public UserCredentials getCredentials()
{
return _credentials;
@@ -60,5 +65,7 @@
// Force these to be re-created.
_credentials = null;
_rolePath = null;
+
+ _form.clearErrors();
}
}
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorkerTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorkerTest.java?rev=578520&r1=578519&r2=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorkerTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/ComponentLifecycleMethodWorkerTest.java Sat Sep 22 15:58:22 2007
@@ -21,7 +21,7 @@
import org.apache.tapestry.model.MutableComponentModel;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.ComponentClassTransformWorker;
-import org.apache.tapestry.services.MethodSignature;
+import org.apache.tapestry.services.TransformMethodSignature;
import org.apache.tapestry.services.TransformConstants;
import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.Test;
@@ -39,7 +39,7 @@
ClassTransformation tf = mockClassTransformation();
MutableComponentModel model = mockMutableComponentModel();
- MethodSignature sig = new MethodSignature("someRandomMethod");
+ TransformMethodSignature sig = new TransformMethodSignature("someRandomMethod");
train_findMethods(tf, sig);
@@ -80,7 +80,7 @@
MutableComponentModel model = mockMutableComponentModel();
SetupRender annotation = newSetupRender();
- MethodSignature sig = new MethodSignature("aMethod");
+ TransformMethodSignature sig = new TransformMethodSignature("aMethod");
train_findMethods(tf, sig);
@@ -109,7 +109,7 @@
ClassTransformation tf = mockClassTransformation();
MutableComponentModel model = mockMutableComponentModel();
- MethodSignature sig = new MethodSignature("setupRender");
+ TransformMethodSignature sig = new TransformMethodSignature("setupRender");
train_findMethods(tf, sig);
@@ -142,8 +142,8 @@
MutableComponentModel model = mockMutableComponentModel();
SetupRender annotation = newSetupRender();
- MethodSignature siga = new MethodSignature("aMethod");
- MethodSignature sigb = new MethodSignature("bMethod");
+ TransformMethodSignature siga = new TransformMethodSignature("aMethod");
+ TransformMethodSignature sigb = new TransformMethodSignature("bMethod");
train_findMethods(tf, siga, sigb);
@@ -174,8 +174,8 @@
MutableComponentModel model = mockMutableComponentModel();
SetupRender annotation = newSetupRender();
- MethodSignature siga = new MethodSignature("aMethod");
- MethodSignature sigb = new MethodSignature("bMethod");
+ TransformMethodSignature siga = new TransformMethodSignature("aMethod");
+ TransformMethodSignature sigb = new TransformMethodSignature("bMethod");
train_findMethods(tf, siga, sigb);
@@ -204,7 +204,7 @@
MutableComponentModel model = mockMutableComponentModel();
SetupRender annotation = newSetupRender();
- MethodSignature sig = new MethodSignature("aMethod");
+ TransformMethodSignature sig = new TransformMethodSignature("aMethod");
train_findMethods(tf, sig);
@@ -232,7 +232,7 @@
MutableComponentModel model = mockMutableComponentModel();
SetupRender annotation = newSetupRender();
- MethodSignature sig = new MethodSignature(Modifier.PUBLIC, "void", "aMethod", new String[]
+ TransformMethodSignature sig = new TransformMethodSignature(Modifier.PUBLIC, "void", "aMethod", new String[]
{ MarkupWriter.class.getName() }, null);
train_findMethods(tf, sig);
@@ -264,7 +264,7 @@
MutableComponentModel model = mockMutableComponentModel();
SetupRender annotation = newSetupRender();
- MethodSignature sig = new MethodSignature(Modifier.PROTECTED, "boolean", "aMethod", null,
+ TransformMethodSignature sig = new TransformMethodSignature(Modifier.PROTECTED, "boolean", "aMethod", null,
null);
train_findMethods(tf, sig);
@@ -301,9 +301,9 @@
MutableComponentModel model = mockMutableComponentModel();
SetupRender annotation = newSetupRender();
- MethodSignature siga = new MethodSignature(Modifier.PROTECTED, "boolean", "aMethod", null,
+ TransformMethodSignature siga = new TransformMethodSignature(Modifier.PROTECTED, "boolean", "aMethod", null,
null);
- MethodSignature sigb = new MethodSignature(Modifier.PUBLIC, "void", "bMethod", new String[]
+ TransformMethodSignature sigb = new TransformMethodSignature(Modifier.PUBLIC, "void", "bMethod", new String[]
{ MarkupWriter.class.getName() }, null);
String ida = "aMethod()";
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java?rev=578520&r1=578519&r2=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/services/InternalClassTransformationImplTest.java Sat Sep 22 15:58:22 2007
@@ -56,7 +56,7 @@
import org.apache.tapestry.runtime.ComponentResourcesAware;
import org.apache.tapestry.services.ClassTransformation;
import org.apache.tapestry.services.MethodFilter;
-import org.apache.tapestry.services.MethodSignature;
+import org.apache.tapestry.services.TransformMethodSignature;
import org.slf4j.Logger;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
@@ -591,7 +591,7 @@
// This proves the the field is protected and can be used in subclasses.
- ct.addMethod(new MethodSignature(Modifier.PUBLIC, "java.lang.String", "getValue", null,
+ ct.addMethod(new TransformMethodSignature(Modifier.PUBLIC, "java.lang.String", "getValue", null,
null), "return " + subclassFieldName + ";");
ct.finish();
@@ -889,7 +889,7 @@
String fieldName = "_" + baseName;
String readMethodName = "_read_" + baseName;
- MethodSignature readMethodSignature = new MethodSignature(Modifier.PRIVATE,
+ TransformMethodSignature readMethodSignature = new TransformMethodSignature(Modifier.PRIVATE,
STRING_CLASS_NAME, readMethodName, null, null);
ct.addMethod(readMethodSignature, String.format(
@@ -900,7 +900,7 @@
String writeMethodName = "_write_" + baseName;
- MethodSignature writeMethodSignature = new MethodSignature(Modifier.PRIVATE, "void",
+ TransformMethodSignature writeMethodSignature = new TransformMethodSignature(Modifier.PRIVATE, "void",
writeMethodName, new String[]
{ STRING_CLASS_NAME }, null);
ct.addMethod(writeMethodSignature, String.format(
@@ -919,7 +919,7 @@
ClassTransformation ct = createClassTransformation(AnnotatedPage.class, logger);
- List<MethodSignature> l = ct.findMethodsWithAnnotation(SetupRender.class);
+ List<TransformMethodSignature> l = ct.findMethodsWithAnnotation(SetupRender.class);
// Check order
@@ -951,13 +951,13 @@
MethodFilter filter = new MethodFilter()
{
- public boolean accept(MethodSignature signature)
+ public boolean accept(TransformMethodSignature signature)
{
return ct.getMethodAnnotation(signature, SetupRender.class) != null;
}
};
- List<MethodSignature> l = ct.findMethods(filter);
+ List<TransformMethodSignature> l = ct.findMethods(filter);
// Check order
@@ -1045,7 +1045,7 @@
ClassTransformation ct = createClassTransformation(EventHandlerTarget.class, logger);
- OnEvent annotation = ct.getMethodAnnotation(new MethodSignature("handler"), OnEvent.class);
+ OnEvent annotation = ct.getMethodAnnotation(new TransformMethodSignature("handler"), OnEvent.class);
// Check that the attributes of the annotation match the expectation.
@@ -1066,7 +1066,7 @@
try
{
- ct.getMethodAnnotation(new MethodSignature("foo"), OnEvent.class);
+ ct.getMethodAnnotation(new TransformMethodSignature("foo"), OnEvent.class);
unreachable();
}
catch (IllegalArgumentException ex)
@@ -1115,11 +1115,11 @@
ClassTransformation ct = createClassTransformation(MethodIdentifier.class, logger);
- List<MethodSignature> sigs = ct.findMethodsWithAnnotation(OnEvent.class);
+ List<TransformMethodSignature> sigs = ct.findMethodsWithAnnotation(OnEvent.class);
assertEquals(sigs.size(), 1);
- MethodSignature sig = sigs.get(0);
+ TransformMethodSignature sig = sigs.get(0);
assertEquals(
ct.getMethodIdentifier(sig),
Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/util/MethodInvocationBuilderTest.java
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/util/MethodInvocationBuilderTest.java?rev=578520&r1=578519&r2=578520&view=diff
==============================================================================
--- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/util/MethodInvocationBuilderTest.java (original)
+++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry/internal/util/MethodInvocationBuilderTest.java Sat Sep 22 15:58:22 2007
@@ -19,7 +19,7 @@
import org.apache.tapestry.MarkupWriter;
import org.apache.tapestry.internal.util.MethodInvocationBuilder;
import org.apache.tapestry.services.ClassTransformation;
-import org.apache.tapestry.services.MethodSignature;
+import org.apache.tapestry.services.TransformMethodSignature;
import org.apache.tapestry.test.TapestryTestCase;
import org.testng.annotations.Test;
@@ -36,7 +36,7 @@
replay();
- MethodSignature sig = new MethodSignature(Modifier.PUBLIC, "void", "myMethod", new String[]
+ TransformMethodSignature sig = new TransformMethodSignature(Modifier.PUBLIC, "void", "myMethod", new String[]
{ MARKUP_WRITER_CLASS_NAME }, null);
MethodInvocationBuilder invoker = new MethodInvocationBuilder();
@@ -55,7 +55,7 @@
replay();
- MethodSignature sig = new MethodSignature(Modifier.PUBLIC, "void", "myMethod", new String[]
+ TransformMethodSignature sig = new TransformMethodSignature(Modifier.PUBLIC, "void", "myMethod", new String[]
{ MARKUP_WRITER_CLASS_NAME }, null);
MethodInvocationBuilder invoker = new MethodInvocationBuilder();
@@ -72,7 +72,7 @@
replay();
- MethodSignature sig = new MethodSignature(Modifier.PUBLIC, "void", "myMethod", new String[]
+ TransformMethodSignature sig = new TransformMethodSignature(Modifier.PUBLIC, "void", "myMethod", new String[]
{ MARKUP_WRITER_CLASS_NAME, LOCALE_CLASS_NAME }, null);
MethodInvocationBuilder invoker = new MethodInvocationBuilder();