Index: ActionEvent.java
===================================================================
RCS file: /home/cvspublic/jakarta-turbine-2/src/java/org/apache/turbine/modules/ActionEvent.java,v
retrieving revision 1.1.1.1
diff -b -u -r1.1.1.1 ActionEvent.java
--- ActionEvent.java	16 Aug 2001 05:08:29 -0000	1.1.1.1
+++ ActionEvent.java	4 Mar 2002 21:10:34 -0000
@@ -104,7 +104,7 @@
  * method naming in your Action class.
  *
  * @author <a href="mailto:jon@latchkey.com">Jon S. Stevens </a>
- * @version $Id: ActionEvent.java,v 1.1.1.1 2001/08/16 05:08:29 jvanzyl Exp $
+ * @version $Id: ActionEvent.java,v 1.11 2001/05/05 15:55:30 mpoeschl Exp $
  */
 public abstract class ActionEvent extends Action
 {
@@ -198,28 +198,30 @@
      */
     protected final String formatString(String input)
     {
+        String methodName = input;
+       
+        // Chop off suffixes (for image type)
+        if (input.endsWith(".x") || input.endsWith(".y"))
+        {
+           methodName = methodName.substring(0, input.length() - 2);
+        }
+
         String fold =
             TurbineResources.getString(ParameterParser.URL_CASE_FOLDING, "")
             .toLowerCase();
+        
         if ((fold == null) ||
             (fold.length()==0) ||
             (! fold.equals(ParameterParser.URL_CASE_FOLDING_NONE)))
         {
-            String tmp = input;
-
-            // Chop off suffixes (for image type)
-            if (input.endsWith(".x") || input.endsWith(".y"))
-            {
-               tmp = tmp.substring(0, input.length() - 2);
-            }
             // Chop off the prefixes.
-            tmp = tmp.substring(BUTTON_LENGTH + METHOD_NAME_LENGTH);
+            methodName = methodName.substring(BUTTON_LENGTH + METHOD_NAME_LENGTH);
 
-            return (METHOD_NAME_PREFIX + firstLetterCaps(tmp));
+            return (METHOD_NAME_PREFIX + firstLetterCaps(methodName));
         }
         else
         {
-            return input.substring(BUTTON_LENGTH);
+            return methodName.substring(BUTTON_LENGTH);
         }
     }