Revision: 1195
http://stripes.svn.sourceforge.net/stripes/?rev=1195&view=rev
Author: bengunter
Date: 2009-10-27 18:51:29 +0000 (Tue, 27 Oct 2009)
Log Message:
-----------
Applied fix for STS-696 from trunk
Modified Paths:
--------------
branches/1.5.x/stripes/src/net/sourceforge/stripes/controller/AnnotatedClassActionResolver.java
branches/1.5.x/tests/src/net/sourceforge/stripes/controller/BasicResolverTests.java
Modified:
branches/1.5.x/stripes/src/net/sourceforge/stripes/controller/AnnotatedClassActionResolver.java
===================================================================
---
branches/1.5.x/stripes/src/net/sourceforge/stripes/controller/AnnotatedClassActionResolver.java
2009-10-27 18:48:21 UTC (rev 1194)
+++
branches/1.5.x/stripes/src/net/sourceforge/stripes/controller/AnnotatedClassActionResolver.java
2009-10-27 18:51:29 UTC (rev 1195)
@@ -217,7 +217,7 @@
Method[] methods = clazz.getDeclaredMethods();
for (Method method : methods) {
- if ( Modifier.isPublic(method.getModifiers()) ) {
+ if ( Modifier.isPublic(method.getModifiers()) &&
!method.isBridge() ) {
String eventName = getHandledEvent(method);
// look for duplicate event names within the current class
Modified:
branches/1.5.x/tests/src/net/sourceforge/stripes/controller/BasicResolverTests.java
===================================================================
---
branches/1.5.x/tests/src/net/sourceforge/stripes/controller/BasicResolverTests.java
2009-10-27 18:48:21 UTC (rev 1194)
+++
branches/1.5.x/tests/src/net/sourceforge/stripes/controller/BasicResolverTests.java
2009-10-27 18:51:29 UTC (rev 1195)
@@ -1,12 +1,16 @@
package net.sourceforge.stripes.controller;
-import net.sourceforge.stripes.action.UrlBinding;
+import java.lang.reflect.Method;
+import java.util.HashMap;
+import java.util.Map;
+import net.sourceforge.stripes.StripesTestFixture;
import net.sourceforge.stripes.action.ActionBean;
import net.sourceforge.stripes.action.ActionBeanContext;
-import net.sourceforge.stripes.action.Resolution;
import net.sourceforge.stripes.action.DefaultHandler;
+import net.sourceforge.stripes.action.ForwardResolution;
import net.sourceforge.stripes.action.HandlesEvent;
-import net.sourceforge.stripes.StripesTestFixture;
+import net.sourceforge.stripes.action.Resolution;
+import net.sourceforge.stripes.action.UrlBinding;
import net.sourceforge.stripes.mock.MockRoundtrip;
import org.testng.annotations.Test;
import org.testng.Assert;
@@ -39,6 +43,10 @@
return null;
}
+ public Resolution process() {
+ return null;
+ }
+
// Start of Test Methods
@Test(groups="fast")
@@ -88,4 +96,18 @@
Assert.assertEquals(bean.getNumber(), 2);
Assert.assertEquals(bean.getContext().getEventName(), "two");
}
+
+ @Test(groups="fast")
+ public void testOverrideHandlerMethodReturnsSubtype() throws
SecurityException, NoSuchMethodException {
+ NameBasedActionResolver resolver = new NameBasedActionResolver();
+ Map<String, Method> classMappings = new HashMap<String, Method>();
+ resolver.processMethods(ExtendedBaseAction.class, classMappings);
+ }
+
+ public static class ExtendedBaseAction extends BasicResolverTests {
+ @Override
+ public ForwardResolution process() {
+ return null;
+ }
+ }
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
