Author: markt
Date: Sat Nov 9 21:39:37 2013
New Revision: 1540404
URL: http://svn.apache.org/r1540404
Log:
chopit parameter is always false in remaining code. Simplify.
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java?rev=1540404&r1=1540403&r2=1540404&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/ConstantPool.java
Sat Nov 9 21:39:37 2013
@@ -87,7 +87,7 @@ public class ConstantPool implements Clo
case Constants.CONSTANT_Class:
i = ((ConstantClass) c).getNameIndex();
c = getConstant(i, Constants.CONSTANT_Utf8);
- str = Utility.compactClassName(((ConstantUtf8) c).getBytes(),
false);
+ str = Utility.compactClassName(((ConstantUtf8) c).getBytes());
break;
case Constants.CONSTANT_String:
i = ((ConstantString) c).getStringIndex();
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java?rev=1540404&r1=1540403&r2=1540404&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java Sat
Nov 9 21:39:37 2013
@@ -96,19 +96,19 @@ public class JavaClass extends AccessFla
* `ConstPool.getConstant' method.
*/
class_name = constant_pool.getConstantString(class_name_index,
Constants.CONSTANT_Class);
- class_name = Utility.compactClassName(class_name, false);
+ class_name = Utility.compactClassName(class_name);
if (superclass_name_index > 0) {
// May be zero -> class is java.lang.Object
superclass_name =
constant_pool.getConstantString(superclass_name_index,
Constants.CONSTANT_Class);
- superclass_name = Utility.compactClassName(superclass_name, false);
+ superclass_name = Utility.compactClassName(superclass_name);
} else {
superclass_name = "java.lang.Object";
}
interface_names = new String[interfaces.length];
for (int i = 0; i < interfaces.length; i++) {
String str = constant_pool.getConstantString(interfaces[i],
Constants.CONSTANT_Class);
- interface_names[i] = Utility.compactClassName(str, false);
+ interface_names[i] = Utility.compactClassName(str);
}
}
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java?rev=1540404&r1=1540403&r2=1540404&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Utility.java Sat
Nov 9 21:39:37 2013
@@ -39,35 +39,10 @@ public abstract class Utility {
* Slashes <em>/</em> are converted to dots <em>.</em>.
*
* @param str The long class name
- * @param prefix The prefix the get rid off
- * @param chopit Flag that determines whether chopping is executed or not
* @return Compacted class name
*/
- public static final String compactClassName( String str, String prefix,
boolean chopit ) {
- int len = prefix.length();
- str = str.replace('/', '.'); // Is `/' on all systems, even DOS
- if (chopit) {
- // If string starts with `prefix' and contains no further dots
- if (str.startsWith(prefix) && (str.substring(len).indexOf('.') ==
-1)) {
- str = str.substring(len);
- }
- }
- return str;
- }
-
-
- /**
- * Shorten long class names, <em>java/lang/String</em> becomes
- * <em>java.lang.String</em>,
- * e.g.. If <em>chopit</em> is <em>true</em> the prefix <em>java.lang</em>
- * is also removed.
- *
- * @param str The long class name
- * @param chopit Flag that determines whether chopping is executed or not
- * @return Compacted class name
- */
- public static final String compactClassName( String str, boolean chopit ) {
- return compactClassName(str, "java.lang.", chopit);
+ public static final String compactClassName(String str) {
+ return str.replace('/', '.'); // Is `/' on all systems, even DOS
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
