From d5edad54b16699cde9d30d053eeb0932479d2ab3 Mon Sep 17 00:00:00 2001
From: kkolinko <kkolinko@13f79535-47bb-0310-9956-ffa450edef68>
Date: Fri, 1 Jul 2011 19:46:00 +0000
Subject: [PATCH] Followup to r1140693 Declare a separate public method for the
 new use case of makeJavaIdentifier(), instead of passing the "false" flag as
 an argument.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1142043 13f79535-47bb-0310-9956-ffa450edef68
---
 java/org/apache/jasper/compiler/Generator.java |  6 +++---
 java/org/apache/jasper/compiler/JspUtil.java   | 17 +++++++++++++++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index 075a6df01..1e4c191d1 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -3675,8 +3675,8 @@ class Generator {
                 out.print(JspUtil.toJavaSourceType(attrInfos[i].getTypeName()));
                 out.print(" ");
             }
-            out.print(JspUtil.makeJavaIdentifier(
-                    attrInfos[i].getName(), false));
+            out.print(JspUtil.makeJavaIdentifierForAttribute(
+                    attrInfos[i].getName()));
             out.println(";");
         }
         out.println();
@@ -3684,7 +3684,7 @@ class Generator {
         // Define attribute getter and setter methods
         for (int i = 0; i < attrInfos.length; i++) {
             String javaName =
-                JspUtil.makeJavaIdentifier(attrInfos[i].getName(), false);
+                JspUtil.makeJavaIdentifierForAttribute(attrInfos[i].getName());
 
             // getter method
             out.printin("public ");
diff --git a/java/org/apache/jasper/compiler/JspUtil.java b/java/org/apache/jasper/compiler/JspUtil.java
index 0fd2b8837..822a13477 100644
--- a/java/org/apache/jasper/compiler/JspUtil.java
+++ b/java/org/apache/jasper/compiler/JspUtil.java
@@ -806,7 +806,20 @@ public class JspUtil {
     public static final String makeJavaIdentifier(String identifier) {
         return makeJavaIdentifier(identifier, true);
     }
-    
+
+    /**
+     * Converts the given identifier to a legal Java identifier
+     * to be used for JSP Tag file attribute names. 
+     * 
+     * @param identifier
+     *            Identifier to convert
+     * 
+     * @return Legal Java identifier corresponding to the given identifier
+     */
+    public static final String makeJavaIdentifierForAttribute(String identifier) {
+        return makeJavaIdentifier(identifier, false);
+    }
+
     /**
      * Converts the given identifier to a legal Java identifier.
      * 
@@ -815,7 +828,7 @@ public class JspUtil {
      * 
      * @return Legal Java identifier corresponding to the given identifier
      */
-    public static final String makeJavaIdentifier(String identifier,
+    private static final String makeJavaIdentifier(String identifier,
             boolean periodToUnderscore) {
         StringBuilder modifiedIdentifier = new StringBuilder(identifier.length());
         if (!Character.isJavaIdentifierStart(identifier.charAt(0))) {
-- 
2.11.0