Author: markt
Date: Sun Jul 11 16:29:25 2010
New Revision: 963103
URL: http://svn.apache.org/viewvc?rev=963103&view=rev
Log:
Remove unnecessary code since Class.getCanonicalName() is available
Modified:
tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java
Modified: tomcat/trunk/java/org/apache/jasper/compiler/Generator.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/Generator.java?rev=963103&r1=963102&r2=963103&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/Generator.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/Generator.java Sun Jul 11
16:29:25 2010
@@ -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("
Modified: tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java?rev=963103&r1=963102&r2=963103&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java (original)
+++ tomcat/trunk/java/org/apache/jasper/compiler/JspUtil.java Sun Jul 11
16:29:25 2010
@@ -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();
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
