You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@velocity.apache.org by nb...@apache.org on 2008/11/04 01:12:15 UTC
svn commit: r711136 - in /velocity/tools/trunk/src:
main/java/org/apache/velocity/tools/generic/ConversionTool.java
main/java/org/apache/velocity/tools/view/ParameterTool.java
test/java/org/apache/velocity/tools/ClassToolTests.java
Author: nbubna
Date: Mon Nov 3 16:12:15 2008
New Revision: 711136
URL: http://svn.apache.org/viewvc?rev=711136&view=rev
Log:
skip setters on ConversionTool and subclasses
Modified:
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java
velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ParameterTool.java
velocity/tools/trunk/src/test/java/org/apache/velocity/tools/ClassToolTests.java
Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java?rev=711136&r1=711135&r2=711136&view=diff
==============================================================================
--- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java (original)
+++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/generic/ConversionTool.java Mon Nov 3 16:12:15 2008
@@ -28,6 +28,7 @@
import java.util.TimeZone;
import org.apache.velocity.tools.ConversionUtils;
import org.apache.velocity.tools.config.DefaultKey;
+import org.apache.velocity.tools.config.SkipSetters;
/**
* <p>Utility class for easy conversion of String values to richer types.</p>
@@ -53,6 +54,7 @@
* @since VelocityTools 2.0
*/
@DefaultKey("convert")
+@SkipSetters
public class ConversionTool extends LocaleConfig
{
public static final String STRINGS_DELIMITER_FORMAT_KEY = "stringsDelimiter";
Modified: velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ParameterTool.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ParameterTool.java?rev=711136&r1=711135&r2=711136&view=diff
==============================================================================
--- velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ParameterTool.java (original)
+++ velocity/tools/trunk/src/main/java/org/apache/velocity/tools/view/ParameterTool.java Mon Nov 3 16:12:15 2008
@@ -78,6 +78,15 @@
setRequest(request);
}
+ @Override
+ protected void configure(ValueParser values)
+ {
+ super.configure(values);
+
+ ServletRequest req = (ServletRequest)values.get(ViewContext.REQUEST);
+ setRequest(req);
+ }
+
/**
* Sets the current {@link ServletRequest}
*
Modified: velocity/tools/trunk/src/test/java/org/apache/velocity/tools/ClassToolTests.java
URL: http://svn.apache.org/viewvc/velocity/tools/trunk/src/test/java/org/apache/velocity/tools/ClassToolTests.java?rev=711136&r1=711135&r2=711136&view=diff
==============================================================================
--- velocity/tools/trunk/src/test/java/org/apache/velocity/tools/ClassToolTests.java (original)
+++ velocity/tools/trunk/src/test/java/org/apache/velocity/tools/ClassToolTests.java Mon Nov 3 16:12:15 2008
@@ -107,7 +107,8 @@
classTool.setType(MyDeprecated.class);
assertEquals(1, classTool.getAnnotations().size());
classTool.setType(ValueParser.class);
- Annotation defaultKey = classTool.getAnnotations().get(0);
+ assertEquals(2, classTool.getAnnotations().size());
+ Annotation defaultKey = classTool.getAnnotations().get(1);
assertEquals(defaultKey.annotationType(), DefaultKey.class);
}