Author: hlship
Date: Sat Jul 23 16:56:52 2011
New Revision: 1150143
URL: http://svn.apache.org/viewvc?rev=1150143&view=rev
Log:
TAP5-1508: Rename EventHandlerMethodParameterSource to
EventMethodHandlerParameterProvider
Added:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/EventHandlerMethodParameterProvider.java
- copied, changed from r1149416,
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/EventHandlerMethodParameterSource.java
Removed:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/EventHandlerMethodParameterSource.java
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OnEventWorker.java
Copied:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/EventHandlerMethodParameterProvider.java
(from r1149416,
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/EventHandlerMethodParameterSource.java)
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/EventHandlerMethodParameterProvider.java?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/EventHandlerMethodParameterProvider.java&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/EventHandlerMethodParameterSource.java&r1=1149416&r2=1150143&rev=1150143&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/EventHandlerMethodParameterSource.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/EventHandlerMethodParameterProvider.java
Sat Jul 23 16:56:52 2011
@@ -1,4 +1,4 @@
-// Copyright 2010 The Apache Software Foundation
+// Copyright 2010, 2011 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.
@@ -15,23 +15,21 @@
package org.apache.tapestry5.internal.transform;
import org.apache.tapestry5.runtime.ComponentEvent;
-import org.apache.tapestry5.services.MethodAccess;
/**
* Supplies one parameter value when invoking a component event handler
method. In general,
* this involves extracting a value form the event's context and coercing it
to a type
* appropriate to the parameter.
- * <p>
- * These values are accumulated and used to invoke the event handler method via
- * {@link MethodAccess#invoke(Object, Object...)}.
- *
+ * <p/>
+ * These values are accumulated and used to invoke the event handler method.
+ *
* @since 5.2.0
*/
-public interface EventHandlerMethodParameterSource
+public interface EventHandlerMethodParameterProvider
{
/**
* Extract the value and coerce it to the correct type.
- *
+ *
* @return value that can be passed as a method parameter
*/
Object valueForEventHandlerMethodParameter(ComponentEvent event);
Modified:
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OnEventWorker.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OnEventWorker.java?rev=1150143&r1=1150142&r2=1150143&view=diff
==============================================================================
---
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OnEventWorker.java
(original)
+++
tapestry/tapestry5/trunk/tapestry-core/src/main/java/org/apache/tapestry5/internal/transform/OnEventWorker.java
Sat Jul 23 16:56:52 2011
@@ -46,11 +46,10 @@ import org.apache.tapestry5.services.tra
/**
* Provides implementations of the
* {@link
org.apache.tapestry5.runtime.Component#dispatchComponentEvent(org.apache.tapestry5.runtime.ComponentEvent)}
- * method, based on {@link org.apache.tapestry5.annotations.OnEvent}
annotations.
+ * method, based on {@link org.apache.tapestry5.annotations.OnEvent}
annotations and naming conventions.
*/
public class OnEventWorker implements ComponentClassTransformWorker2
{
-
private final Request request;
private final ValueEncoderSource valueEncoderSource;
@@ -61,12 +60,12 @@ public class OnEventWorker implements Co
* Stores a couple of special parameter type mappings that are used when
matching the entire event context
* (either as Object[] or EventContext).
*/
- private final Map<String, EventHandlerMethodParameterSource>
parameterTypeToSource = CollectionFactory.newMap();
+ private final Map<String, EventHandlerMethodParameterProvider>
parameterTypeToProvider = CollectionFactory.newMap();
{
// Object[] and List are out-dated and may be deprecated some day
- parameterTypeToSource.put("java.lang.Object[]", new
EventHandlerMethodParameterSource()
+ parameterTypeToProvider.put("java.lang.Object[]", new
EventHandlerMethodParameterProvider()
{
public Object valueForEventHandlerMethodParameter(ComponentEvent
event)
@@ -75,7 +74,7 @@ public class OnEventWorker implements Co
}
});
- parameterTypeToSource.put(List.class.getName(), new
EventHandlerMethodParameterSource()
+ parameterTypeToProvider.put(List.class.getName(), new
EventHandlerMethodParameterProvider()
{
public Object valueForEventHandlerMethodParameter(ComponentEvent
event)
@@ -86,9 +85,8 @@ public class OnEventWorker implements Co
// This is better, as the EventContext maintains the original objects
(or strings)
// and gives the event handler method access with coercion
- parameterTypeToSource.put(EventContext.class.getName(), new
EventHandlerMethodParameterSource()
+ parameterTypeToProvider.put(EventContext.class.getName(), new
EventHandlerMethodParameterProvider()
{
-
public Object valueForEventHandlerMethodParameter(ComponentEvent
event)
{
return event.getEventContext();
@@ -233,7 +231,7 @@ public class OnEventWorker implements Co
if (parameterTypes.length == 0)
return new BaseEventHandlerMethodInvoker(method, eventType,
componentId);
- final List<EventHandlerMethodParameterSource> sources =
CollectionFactory.newList();
+ final List<EventHandlerMethodParameterProvider> providers =
CollectionFactory.newList();
// I'd refactor a bit more of this if Java had covariant return types.
@@ -243,11 +241,11 @@ public class OnEventWorker implements Co
{
String type = parameterTypes[i];
- EventHandlerMethodParameterSource source =
parameterTypeToSource.get(type);
+ EventHandlerMethodParameterProvider provider =
parameterTypeToProvider.get(type);
- if (source != null)
+ if (provider != null)
{
- sources.add(source);
+ providers.add(provider);
continue;
}
@@ -257,7 +255,7 @@ public class OnEventWorker implements Co
{
String parameterName = parameterAnnotation.value();
- sources.add(createQueryParameterSource(componentClassName,
description, i, parameterName, type,
+ providers.add(createQueryParameterSource(componentClassName,
description, i, parameterName, type,
parameterAnnotation.allowBlank()));
continue;
}
@@ -267,17 +265,17 @@ public class OnEventWorker implements Co
final int parameterIndex = contextIndex++;
- sources.add(createEventContextSource(type, parameterIndex));
+ providers.add(createEventContextSource(type, parameterIndex));
}
- return createInvoker(method, eventType, componentId, contextIndex,
sources);
+ return createInvoker(method, eventType, componentId, contextIndex,
providers);
}
- private EventHandlerMethodParameterSource createQueryParameterSource(final
String componentClassName,
+ private EventHandlerMethodParameterProvider
createQueryParameterSource(final String componentClassName,
final MethodDescription description, final int parameterIndex,
final String parameterName,
final String parameterTypeName, final boolean allowBlank)
{
- return new EventHandlerMethodParameterSource()
+ return new EventHandlerMethodParameterProvider()
{
@SuppressWarnings("unchecked")
public Object valueForEventHandlerMethodParameter(ComponentEvent
event)
@@ -318,11 +316,11 @@ public class OnEventWorker implements Co
}
private EventHandlerMethodInvoker createInvoker(PlasticMethod method,
String eventType, String componentId,
- final int minContextCount, final
List<EventHandlerMethodParameterSource> sources)
+ final int minContextCount, final
List<EventHandlerMethodParameterProvider> providers)
{
return new BaseEventHandlerMethodInvoker(method, eventType,
componentId)
{
- final int count = sources.size();
+ final int count = providers.size();
@Override
public int getMinContextValueCount()
@@ -337,7 +335,7 @@ public class OnEventWorker implements Co
for (int i = 0; i < count; i++)
{
- parameters[i] =
sources.get(i).valueForEventHandlerMethodParameter(event);
+ parameters[i] =
providers.get(i).valueForEventHandlerMethodParameter(event);
}
return parameters;
@@ -345,9 +343,9 @@ public class OnEventWorker implements Co
};
}
- private EventHandlerMethodParameterSource createEventContextSource(final
String type, final int parameterIndex)
+ private EventHandlerMethodParameterProvider createEventContextSource(final
String type, final int parameterIndex)
{
- return new EventHandlerMethodParameterSource()
+ return new EventHandlerMethodParameterProvider()
{
public Object valueForEventHandlerMethodParameter(ComponentEvent
event)
{
