From 7a2df7d113e49131c0af1473250d05a78ee5730c Mon Sep 17 00:00:00 2001
From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sun, 11 Jul 2010 16:29:25 +0000
Subject: [PATCH] Remove unnecessary code since Class.getCanonicalName() is
 available

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

diff --git a/java/org/apache/jasper/compiler/Generator.java b/java/org/apache/jasper/compiler/Generator.java
index a3375a1b8..7ab94965b 100644
--- a/java/org/apache/jasper/compiler/Generator.java
+++ b/java/org/apache/jasper/compiler/Generator.java
@@ -1057,7 +1057,7 @@ class Generator {
             if (beanInfo.checkVariable(name)) {
                 // Bean is defined using useBean, introspect at compile time
                 Class<?> bean = beanInfo.getBeanType(name);
-                String beanName = JspUtil.getCanonicalName(bean);
+                String beanName = bean.getCanonicalName();
                 java.lang.reflect.Method meth = JspRuntimeLibrary
                         .getReadMethod(bean, property);
                 String methodName = meth.getName();
@@ -1199,7 +1199,7 @@ class Generator {
                     Class<?> bean = ctxt.getClassLoader().loadClass(klass);
                     if (klass.indexOf('$') >= 0) {
                         // Obtain the canonical type name
-                        canonicalName = JspUtil.getCanonicalName(bean);
+                        canonicalName = bean.getCanonicalName();
                     } else {
                         canonicalName = klass;
                     }
@@ -2200,8 +2200,7 @@ class Generator {
             declareScriptingVars(n, VariableInfo.AT_BEGIN);
             saveScriptingVars(n, VariableInfo.AT_BEGIN);
 
-            String tagHandlerClassName = JspUtil
-                    .getCanonicalName(tagHandlerClass);
+            String tagHandlerClassName = tagHandlerClass.getCanonicalName();
             if (isPoolingEnabled && !(n.implementsJspIdConsumer())) {
                 out.printin(tagHandlerClassName);
                 out.print(" ");
@@ -2468,8 +2467,7 @@ class Generator {
             declareScriptingVars(n, VariableInfo.AT_BEGIN);
             saveScriptingVars(n, VariableInfo.AT_BEGIN);
 
-            String tagHandlerClassName = JspUtil
-                    .getCanonicalName(tagHandlerClass);
+            String tagHandlerClassName = tagHandlerClass.getCanonicalName();
             writeNewInstance(tagHandlerVar, tagHandlerClassName);
 
             generateSetters(n, tagHandlerVar, handlerInfo, true);
@@ -3100,13 +3098,12 @@ class Generator {
             }
 
             if (propEditorClass != null) {
-                String className = JspUtil.getCanonicalName(c);
+                String className = c.getCanonicalName();
                 return "("
                         + className
                         + ")org.apache.jasper.runtime.JspRuntimeLibrary.getValueFromBeanInfoPropertyEditor("
                         + className + ".class, \"" + attrName + "\", " + quoted
-                        + ", " + JspUtil.getCanonicalName(propEditorClass)
-                        + ".class)";
+                        + ", " + propEditorClass.getCanonicalName() + ".class)";
             } else if (c == String.class) {
                 return quoted;
             } else if (c == boolean.class) {
@@ -3144,7 +3141,7 @@ class Generator {
             } else if (c == Object.class) {
                 return "new String(" + quoted + ")";
             } else {
-                String className = JspUtil.getCanonicalName(c);
+                String className = c.getCanonicalName();
                 return "("
                         + className
                         + ")org.apache.jasper.runtime.JspRuntimeLibrary.getValueFromPropertyEditorManager("
diff --git a/java/org/apache/jasper/compiler/JspUtil.java b/java/org/apache/jasper/compiler/JspUtil.java
index a3ed18f7a..14761ff47 100644
--- a/java/org/apache/jasper/compiler/JspUtil.java
+++ b/java/org/apache/jasper/compiler/JspUtil.java
@@ -378,7 +378,7 @@ public class JspUtil {
          * Determine whether to use the expected type's textual name or, if it's
          * a primitive, the name of its correspondent boxed type.
          */
-        String targetType = getCanonicalName(expectedType);
+        String targetType = expectedType.getCanonicalName();
         String primitiveConverterMethod = null;
         if (expectedType.isPrimitive()) {
             if (expectedType.equals(Boolean.TYPE)) {
@@ -943,31 +943,4 @@ public class JspUtil {
         }
         return resultType.toString();
     }
-
-    /**
-     * Compute the canonical name from a Class instance. Note that a simple
-     * replacement of '$' with '.' of a binary name would not work, as '$' is a
-     * legal Java Identifier character.
-     * 
-     * @param c
-     *            A instance of java.lang.Class
-     * @return The canonical name of c.
-     */
-    public static String getCanonicalName(Class<?> c) {
-
-        String binaryName = c.getName();
-        c = c.getDeclaringClass();
-
-        if (c == null) {
-            return binaryName;
-        }
-
-        StringBuilder buf = new StringBuilder(binaryName);
-        do {
-            buf.setCharAt(c.getName().length(), '.');
-            c = c.getDeclaringClass();
-        } while (c != null);
-
-        return buf.toString();
-    }
 }
-- 
2.11.0