You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@turbine.apache.org by tv...@apache.org on 2010/07/25 17:18:10 UTC
svn commit: r979050 - in /turbine/core/trunk:
src/java/org/apache/turbine/modules/ src/java/org/apache/turbine/util/parser/
src/java/org/apache/turbine/util/uri/
src/java/org/apache/turbine/util/velocity/ xdocs/
Author: tv
Date: Sun Jul 25 15:18:09 2010
New Revision: 979050
URL: http://svn.apache.org/viewvc?rev=979050&view=rev
Log:
Remove remains of old parser management: ParserUtils
Removed:
turbine/core/trunk/src/java/org/apache/turbine/util/parser/
Modified:
turbine/core/trunk/src/java/org/apache/turbine/modules/ActionEvent.java
turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java
turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java
turbine/core/trunk/xdocs/changes.xml
Modified: turbine/core/trunk/src/java/org/apache/turbine/modules/ActionEvent.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/modules/ActionEvent.java?rev=979050&r1=979049&r2=979050&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/modules/ActionEvent.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/modules/ActionEvent.java Sun Jul 25 15:18:09 2010
@@ -24,16 +24,14 @@ import java.lang.reflect.Method;
import java.util.Iterator;
import org.apache.commons.lang.StringUtils;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-
+import org.apache.fulcrum.parser.ParameterParser;
+import org.apache.fulcrum.parser.ParserService;
import org.apache.turbine.Turbine;
import org.apache.turbine.TurbineConstants;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.util.RunData;
-import org.apache.fulcrum.parser.ParameterParser;
-import org.apache.turbine.util.parser.ParserUtils;
/**
* <p>
@@ -228,7 +226,7 @@ public abstract class ActionEvent extend
{
if (considerKey(key, pp))
{
- theButton = formatString(key);
+ theButton = formatString(key, pp);
break;
}
}
@@ -292,7 +290,7 @@ public abstract class ActionEvent extend
{
if (considerKey(key, pp))
{
- theButton = formatString(key);
+ theButton = formatString(key, pp);
break;
}
}
@@ -335,9 +333,10 @@ public abstract class ActionEvent extend
* into the proper case.
*
* @param input The unconverted method name.
+ * @param pp The parameter parser (for correct folding)
* @return A string with the method name in the proper case.
*/
- protected final String formatString(String input)
+ protected final String formatString(String input, ParameterParser pp)
{
String tmp = input;
@@ -350,8 +349,8 @@ public abstract class ActionEvent extend
? input.substring(0, input.length() - 2)
: input;
- if (ParserUtils.getUrlFolding()
- != ParserUtils.URL_CASE_FOLDING_NONE)
+ if (pp.getUrlFolding()
+ != ParserService.URL_CASE_FOLDING_NONE)
{
tmp = input.toLowerCase().substring(BUTTON_LENGTH + METHOD_NAME_LENGTH);
tmp = METHOD_NAME_PREFIX + StringUtils.capitalize(tmp);
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java?rev=979050&r1=979049&r2=979050&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/uri/TurbineURI.java Sun Jul 25 15:18:09 2010
@@ -20,21 +20,19 @@ package org.apache.turbine.util.uri;
*/
import java.net.URLEncoder;
-
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import org.apache.commons.lang.StringUtils;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.fulcrum.parser.ParameterParser;
-
+import org.apache.fulcrum.parser.ParserService;
+import org.apache.turbine.services.TurbineServices;
import org.apache.turbine.util.RunData;
import org.apache.turbine.util.ServerData;
-import org.apache.turbine.util.parser.ParserUtils;
/**
* This class allows you to keep all the information needed for a single
@@ -57,6 +55,9 @@ public class TurbineURI
/** Contains the PathInfo and QueryData vectors */
private List [] dataVectors = null;
+
+ /** Local reference to the parser service for URI parameter folding */
+ private ParserService parserService;
/*
* ========================================================================
@@ -257,6 +258,7 @@ public class TurbineURI
dataVectors = new List[2];
dataVectors[PATH_INFO] = new ArrayList();
dataVectors[QUERY_DATA] = new ArrayList();
+ parserService = (ParserService)TurbineServices.getInstance().getService(ParserService.ROLE);
}
/**
@@ -822,7 +824,7 @@ public class TurbineURI
String name,
String value)
{
- URIParam uriParam = new URIParam(ParserUtils.convertAndTrim(name), value);
+ URIParam uriParam = new URIParam(parserService.convertAndTrim(name), value);
dataVectors[type].add(uriParam); // Code so clean you can eat from...
}
@@ -906,7 +908,7 @@ public class TurbineURI
String name)
{
Collection c = dataVectors[type];
- String key = ParserUtils.convertAndTrim(name);
+ String key = parserService.convertAndTrim(name);
for (Iterator it = c.iterator(); it.hasNext();)
{
Modified: turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java
URL: http://svn.apache.org/viewvc/turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java?rev=979050&r1=979049&r2=979050&view=diff
==============================================================================
--- turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java (original)
+++ turbine/core/trunk/src/java/org/apache/turbine/util/velocity/VelocityActionEvent.java Sun Jul 25 15:18:09 2010
@@ -23,15 +23,13 @@ package org.apache.turbine.util.velocity
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
-
import java.util.Iterator;
+import org.apache.fulcrum.parser.ParameterParser;
import org.apache.turbine.modules.ActionEvent;
import org.apache.turbine.pipeline.PipelineData;
import org.apache.turbine.services.velocity.TurbineVelocity;
import org.apache.turbine.util.RunData;
-import org.apache.fulcrum.parser.ParameterParser;
-
import org.apache.velocity.context.Context;
/**
@@ -171,7 +169,7 @@ public abstract class VelocityActionEven
{
if (considerKey(key, pp))
{
- theButton = formatString(key);
+ theButton = formatString(key, pp);
break;
}
}
@@ -248,7 +246,7 @@ public abstract class VelocityActionEven
{
if (considerKey(key, pp))
{
- theButton = formatString(key);
+ theButton = formatString(key, pp);
break;
}
}
Modified: turbine/core/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/turbine/core/trunk/xdocs/changes.xml?rev=979050&r1=979049&r2=979050&view=diff
==============================================================================
--- turbine/core/trunk/xdocs/changes.xml (original)
+++ turbine/core/trunk/xdocs/changes.xml Sun Jul 25 15:18:09 2010
@@ -25,6 +25,9 @@
<body>
<release version="4.0-M1" date="in Subversion">
+ <action type="remove" dev="tv">
+ Remove remains of old parser management: ParserUtils
+ </action>
<action type="fix" dev="tv">
RunData.getContentType() was returning an empty string when it shouldn't
</action>