Revision: 1312
http://stripes.svn.sourceforge.net/stripes/?rev=1312&view=rev
Author: bengunter
Date: 2010-11-10 15:45:23 +0000 (Wed, 10 Nov 2010)
Log Message:
-----------
Applied fix for STS-741 from 1.5.x branch
Modified Paths:
--------------
trunk/stripes/src/net/sourceforge/stripes/action/ForwardResolution.java
trunk/stripes/src/net/sourceforge/stripes/action/RedirectResolution.java
trunk/stripes/src/net/sourceforge/stripes/controller/FlashScope.java
trunk/stripes/src/net/sourceforge/stripes/tag/ErrorsFooterTag.java
trunk/stripes/src/net/sourceforge/stripes/tag/ErrorsHeaderTag.java
trunk/stripes/src/net/sourceforge/stripes/tag/FormTag.java
trunk/stripes/src/net/sourceforge/stripes/tag/IndividualErrorTag.java
trunk/stripes/src/net/sourceforge/stripes/tag/InputFileTag.java
trunk/stripes/src/net/sourceforge/stripes/tag/InputOptionsCollectionTag.java
trunk/stripes/src/net/sourceforge/stripes/tag/StripesTagSupport.java
trunk/tests/src/net/sourceforge/stripes/extensions/MyIntegerTypeConverter.java
Modified:
trunk/stripes/src/net/sourceforge/stripes/action/ForwardResolution.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/action/ForwardResolution.java
2010-11-10 15:43:24 UTC (rev 1311)
+++ trunk/stripes/src/net/sourceforge/stripes/action/ForwardResolution.java
2010-11-10 15:45:23 UTC (rev 1312)
@@ -41,7 +41,7 @@
* @see RedirectResolution
* @author Tim Fennell
*/
-public class ForwardResolution extends OnwardResolution<ForwardResolution>
implements Resolution {
+public class ForwardResolution extends OnwardResolution<ForwardResolution> {
private boolean autoInclude = true;
private static final Log log = Log.getInstance(ForwardResolution.class);
private String event;
Modified:
trunk/stripes/src/net/sourceforge/stripes/action/RedirectResolution.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/action/RedirectResolution.java
2010-11-10 15:43:24 UTC (rev 1311)
+++ trunk/stripes/src/net/sourceforge/stripes/action/RedirectResolution.java
2010-11-10 15:45:23 UTC (rev 1312)
@@ -43,7 +43,7 @@
* @see ForwardResolution
* @author Tim Fennell
*/
-public class RedirectResolution extends OnwardResolution<RedirectResolution>
implements Resolution {
+public class RedirectResolution extends OnwardResolution<RedirectResolution> {
private static final Log log = Log.getInstance(RedirectResolution.class);
private boolean prependContext = true;
private boolean includeRequestParameters;
Modified: trunk/stripes/src/net/sourceforge/stripes/controller/FlashScope.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/controller/FlashScope.java
2010-11-10 15:43:24 UTC (rev 1311)
+++ trunk/stripes/src/net/sourceforge/stripes/controller/FlashScope.java
2010-11-10 15:45:23 UTC (rev 1312)
@@ -22,7 +22,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.HttpSession;
-import java.io.Serializable;
import java.lang.reflect.Proxy;
import java.util.Collection;
import java.util.Collections;
@@ -81,7 +80,7 @@
* @author Tim Fennell
* @since Stripes 1.2
*/
-public class FlashScope extends HashMap<String,Object> implements Serializable
{
+public class FlashScope extends HashMap<String,Object> {
private static final long serialVersionUID = 1L;
/** The default timeout for a flash scope. */
Modified: trunk/stripes/src/net/sourceforge/stripes/tag/ErrorsFooterTag.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/tag/ErrorsFooterTag.java
2010-11-10 15:43:24 UTC (rev 1311)
+++ trunk/stripes/src/net/sourceforge/stripes/tag/ErrorsFooterTag.java
2010-11-10 15:45:23 UTC (rev 1312)
@@ -14,7 +14,6 @@
*/
package net.sourceforge.stripes.tag;
-import javax.servlet.jsp.tagext.Tag;
import javax.servlet.jsp.JspException;
/**
@@ -24,7 +23,7 @@
*
* @author Greg Hinkle
*/
-public class ErrorsFooterTag extends HtmlTagSupport implements Tag {
+public class ErrorsFooterTag extends HtmlTagSupport {
@Override
public int doStartTag() throws JspException {
Modified: trunk/stripes/src/net/sourceforge/stripes/tag/ErrorsHeaderTag.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/tag/ErrorsHeaderTag.java
2010-11-10 15:43:24 UTC (rev 1311)
+++ trunk/stripes/src/net/sourceforge/stripes/tag/ErrorsHeaderTag.java
2010-11-10 15:45:23 UTC (rev 1312)
@@ -15,7 +15,6 @@
package net.sourceforge.stripes.tag;
import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.Tag;
/**
* Can be used within a stripes:errors tag to show a header on an error list.
@@ -24,7 +23,7 @@
*
* @author Greg Hinkle
*/
-public class ErrorsHeaderTag extends HtmlTagSupport implements Tag {
+public class ErrorsHeaderTag extends HtmlTagSupport {
@Override
public int doStartTag() throws JspException {
Modified: trunk/stripes/src/net/sourceforge/stripes/tag/FormTag.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/tag/FormTag.java 2010-11-10
15:43:24 UTC (rev 1311)
+++ trunk/stripes/src/net/sourceforge/stripes/tag/FormTag.java 2010-11-10
15:45:23 UTC (rev 1312)
@@ -156,7 +156,7 @@
/** Sets the form encoding. */
public void setEnctype(String enctype) { this.enctype = enctype; }
/** Gets the form encoding. */
- public String getEnctype() { return enctype; };
+ public String getEnctype() { return enctype; }
/** Sets the HTTP method to use when the form is submitted. */
public void setMethod(String method) { this.method = method; }
Modified: trunk/stripes/src/net/sourceforge/stripes/tag/IndividualErrorTag.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/tag/IndividualErrorTag.java
2010-11-10 15:43:24 UTC (rev 1311)
+++ trunk/stripes/src/net/sourceforge/stripes/tag/IndividualErrorTag.java
2010-11-10 15:45:23 UTC (rev 1312)
@@ -19,7 +19,6 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.Tag;
import java.io.IOException;
import java.util.Locale;
@@ -31,7 +30,7 @@
*
* @author Greg Hinkle
*/
-public class IndividualErrorTag extends HtmlTagSupport implements Tag {
+public class IndividualErrorTag extends HtmlTagSupport {
private static final Log log = Log.getInstance(IndividualErrorTag.class);
Modified: trunk/stripes/src/net/sourceforge/stripes/tag/InputFileTag.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/tag/InputFileTag.java
2010-11-10 15:43:24 UTC (rev 1311)
+++ trunk/stripes/src/net/sourceforge/stripes/tag/InputFileTag.java
2010-11-10 15:45:23 UTC (rev 1312)
@@ -15,7 +15,6 @@
package net.sourceforge.stripes.tag;
import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.Tag;
/**
* <p>Tag that generates HTML form fields of type {...@literal <input
type="file" ... />}. The only
@@ -32,7 +31,7 @@
*
* @author Tim Fennell
*/
-public class InputFileTag extends InputTagSupport implements Tag {
+public class InputFileTag extends InputTagSupport {
/** Basic constructor that sets the input tag's type attribute to "file".
*/
public InputFileTag() {
Modified:
trunk/stripes/src/net/sourceforge/stripes/tag/InputOptionsCollectionTag.java
===================================================================
---
trunk/stripes/src/net/sourceforge/stripes/tag/InputOptionsCollectionTag.java
2010-11-10 15:43:24 UTC (rev 1311)
+++
trunk/stripes/src/net/sourceforge/stripes/tag/InputOptionsCollectionTag.java
2010-11-10 15:45:23 UTC (rev 1312)
@@ -24,7 +24,6 @@
import javax.servlet.jsp.JspException;
import javax.servlet.jsp.JspWriter;
-import javax.servlet.jsp.tagext.Tag;
import java.util.Collection;
import java.util.Locale;
import java.util.Collections;
@@ -93,7 +92,7 @@
*
* @author Tim Fennell
*/
-public class InputOptionsCollectionTag extends HtmlTagSupport implements Tag {
+public class InputOptionsCollectionTag extends HtmlTagSupport {
private Collection<? extends Object> collection;
private String value;
private String label;
Modified: trunk/stripes/src/net/sourceforge/stripes/tag/StripesTagSupport.java
===================================================================
--- trunk/stripes/src/net/sourceforge/stripes/tag/StripesTagSupport.java
2010-11-10 15:43:24 UTC (rev 1311)
+++ trunk/stripes/src/net/sourceforge/stripes/tag/StripesTagSupport.java
2010-11-10 15:45:23 UTC (rev 1312)
@@ -143,7 +143,7 @@
// If we can't find it by the normal way, try our own tag stack!
Stack<StripesTagSupport> stack = getTagStack();
ListIterator<StripesTagSupport> iterator =
stack.listIterator(stack.size());
- while (iterator.hasPrevious() && iterator.previous() != this);
+ while (iterator.hasPrevious() && iterator.previous() != this) continue;
while (iterator.hasPrevious()) {
StripesTagSupport tag = iterator.previous();
if (tagType.isAssignableFrom(tag.getClass())) {
Modified:
trunk/tests/src/net/sourceforge/stripes/extensions/MyIntegerTypeConverter.java
===================================================================
---
trunk/tests/src/net/sourceforge/stripes/extensions/MyIntegerTypeConverter.java
2010-11-10 15:43:24 UTC (rev 1311)
+++
trunk/tests/src/net/sourceforge/stripes/extensions/MyIntegerTypeConverter.java
2010-11-10 15:45:23 UTC (rev 1312)
@@ -3,7 +3,6 @@
import java.util.Collection;
import net.sourceforge.stripes.validation.IntegerTypeConverter;
-import net.sourceforge.stripes.validation.TypeConverter;
import net.sourceforge.stripes.validation.ValidationError;
/**
@@ -12,7 +11,7 @@
*
* @author Freddy Daoud
*/
-public class MyIntegerTypeConverter extends IntegerTypeConverter implements
TypeConverter<Integer> {
+public class MyIntegerTypeConverter extends IntegerTypeConverter {
@Override
public Integer convert(String input, Class<? extends Integer> targetType,
Collection<ValidationError> errors)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The Next 800 Companies to Lead America's Growth: New Video Whitepaper
David G. Thomson, author of the best-selling book "Blueprint to a
Billion" shares his insights and actions to help propel your
business during the next growth cycle. Listen Now!
http://p.sf.net/sfu/SAP-dev2dev
_______________________________________________
Stripes-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/stripes-development
