Author: jkuhnert
Date: Fri Dec 15 11:16:04 2006
New Revision: 487624
URL: http://svn.apache.org/viewvc?view=rev&rev=487624
Log:
Resolves TAPESTRY-1182.
Simple patch applied to make ComponentAnnotationWorker extendable. I'm
generally against opening these things
up (now that I've seen the wisdom of Howards ways) , but this one doesn't look
like it's opening us up to anything
too horrible.
Modified:
tapestry/tapestry4/trunk/tapestry-annotations/src/java/org/apache/tapestry/annotations/ComponentAnnotationWorker.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/AbstractEngine.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/error/StaleLinkExceptionPresenter.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/error/StaleLinkExceptionPresenterImpl.java
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/error/StaleSessionExceptionPresenter.java
Modified:
tapestry/tapestry4/trunk/tapestry-annotations/src/java/org/apache/tapestry/annotations/ComponentAnnotationWorker.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-annotations/src/java/org/apache/tapestry/annotations/ComponentAnnotationWorker.java?view=diff&rev=487624&r1=487623&r2=487624
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-annotations/src/java/org/apache/tapestry/annotations/ComponentAnnotationWorker.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-annotations/src/java/org/apache/tapestry/annotations/ComponentAnnotationWorker.java
Fri Dec 15 11:16:04 2006
@@ -59,11 +59,11 @@
if (type.equals(""))
{
Class retTypeClazz = method.getReturnType();
- type = retTypeClazz.getSimpleName();
+ type = resolveComponentType(retTypeClazz);
}
copyOf = null;
- }
-
+ }
+
IContainedComponent cc = new ContainedComponent();
cc.setInheritInformalParameters(component.inheritInformalParameters());
@@ -91,6 +91,11 @@
AnnotationUtils.copyBindings(source, cc);
}
}
+
+ protected String resolveComponentType(Class retTypeClass)
+ {
+ return retTypeClass.getSimpleName();
+ }
void addBinding(IContainedComponent component, String binding, Location
location)
{
@@ -113,7 +118,7 @@
component.setBinding(name, bs);
}
- private void invalidBinding(String binding)
+ protected void invalidBinding(String binding)
{
throw new
ApplicationRuntimeException(AnnotationMessages.bindingWrongFormat(binding));
}
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.java?view=diff&rev=487624&r1=487623&r2=487624
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/dojo/html/Dialog.java
Fri Dec 15 11:16:04 2006
@@ -73,7 +73,7 @@
Map parms = new HashMap();
parms.put("component", this);
parms.put("props", json.toString());
-
+
getScript().execute(this, cycle,
TapestryUtils.getPageRenderSupport(cycle, this), parms);
}
}
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/AbstractEngine.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/AbstractEngine.java?view=diff&rev=487624&r1=487623&r2=487624
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/AbstractEngine.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/engine/AbstractEngine.java
Fri Dec 15 11:16:04 2006
@@ -360,8 +360,7 @@
protected void handleStaleLinkException(IRequestCycle cycle,
StaleLinkException exception)
throws IOException
{
- _infrastructure.getStaleLinkExceptionPresenter()
- .presentStaleLinkException(cycle, exception);
+
_infrastructure.getStaleLinkExceptionPresenter().presentStaleLinkException(cycle,
exception);
}
/**
@@ -380,9 +379,7 @@
protected void handleStaleSessionException(IRequestCycle cycle,
StaleSessionException exception)
throws IOException
{
-
_infrastructure.getStaleSessionExceptionPresenter().presentStaleSessionException(
- cycle,
- exception);
+
_infrastructure.getStaleSessionExceptionPresenter().presentStaleSessionException(cycle,
exception);
}
/**
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/error/StaleLinkExceptionPresenter.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/error/StaleLinkExceptionPresenter.java?view=diff&rev=487624&r1=487623&r2=487624
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/error/StaleLinkExceptionPresenter.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/error/StaleLinkExceptionPresenter.java
Fri Dec 15 11:16:04 2006
@@ -37,7 +37,6 @@
* @param cause
* the exception that was caught
*/
- void presentStaleLinkException(IRequestCycle cycle,
- StaleLinkException cause)
+ void presentStaleLinkException(IRequestCycle cycle, StaleLinkException
cause)
throws IOException;
}
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/error/StaleLinkExceptionPresenterImpl.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/error/StaleLinkExceptionPresenterImpl.java?view=diff&rev=487624&r1=487623&r2=487624
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/error/StaleLinkExceptionPresenterImpl.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/error/StaleLinkExceptionPresenterImpl.java
Fri Dec 15 11:16:04 2006
@@ -31,16 +31,13 @@
* @author Howard M. Lewis Ship
* @since 4.0
*/
-public class StaleLinkExceptionPresenterImpl implements
- StaleLinkExceptionPresenter
+public class StaleLinkExceptionPresenterImpl implements
StaleLinkExceptionPresenter
{
-
private ResponseRenderer _responseRenderer;
-
+
private String _pageName;
-
- public void presentStaleLinkException(IRequestCycle cycle,
- StaleLinkException cause)
+
+ public void presentStaleLinkException(IRequestCycle cycle,
StaleLinkException cause)
throws IOException
{
IPage exceptionPage = cycle.getPage(_pageName);
Modified:
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/error/StaleSessionExceptionPresenter.java
URL:
http://svn.apache.org/viewvc/tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/error/StaleSessionExceptionPresenter.java?view=diff&rev=487624&r1=487623&r2=487624
==============================================================================
---
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/error/StaleSessionExceptionPresenter.java
(original)
+++
tapestry/tapestry4/trunk/tapestry-framework/src/java/org/apache/tapestry/error/StaleSessionExceptionPresenter.java
Fri Dec 15 11:16:04 2006
@@ -36,7 +36,6 @@
* @param cause
* the exception that was caught
*/
- void presentStaleSessionException(IRequestCycle cycle,
- StaleSessionException cause)
+ void presentStaleSessionException(IRequestCycle cycle,
StaleSessionException cause)
throws IOException;
}
