Author: markt
Date: Thu Sep 11 09:21:43 2014
New Revision: 1624235
URL: http://svn.apache.org/r1624235
Log:
Remove unused code (BCELComparator)
Removed:
tomcat/trunk/java/org/apache/tomcat/util/bcel/util/
Modified:
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/JavaClass.java
Modified: tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java?rev=1624235&r1=1624234&r2=1624235&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java
(original)
+++ tomcat/trunk/java/org/apache/tomcat/util/bcel/classfile/Constant.java Thu
Sep 11 09:21:43 2014
@@ -22,7 +22,6 @@ import java.io.IOException;
import java.io.Serializable;
import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.util.BCELComparator;
/**
* Abstract superclass for classes to represent the different constant types
@@ -34,22 +33,7 @@ import org.apache.tomcat.util.bcel.util.
public abstract class Constant implements Serializable {
private static final long serialVersionUID = 2827409182154809454L;
- private static BCELComparator _cmp = new BCELComparator() {
- @Override
- public boolean equals( Object o1, Object o2 ) {
- Constant THIS = (Constant) o1;
- Constant THAT = (Constant) o2;
- return THIS.toString().equals(THAT.toString());
- }
-
-
- @Override
- public int hashCode( Object o ) {
- Constant THIS = (Constant) o;
- return THIS.toString().hashCode();
- }
- };
/* In fact this tag is redundant since we can distinguish different
* `Constant' objects by their type, i.e., via `instanceof'. In some
* places we will use the tag for switch()es anyway.
@@ -128,29 +112,4 @@ public abstract class Constant implement
public String toString() {
return "[" + tag + "]";
}
-
-
- /**
- * Return value as defined by given BCELComparator strategy.
- * By default two Constant objects are said to be equal when
- * the result of toString() is equal.
- *
- * @see java.lang.Object#equals(java.lang.Object)
- */
- @Override
- public boolean equals( Object obj ) {
- return _cmp.equals(this, obj);
- }
-
-
- /**
- * Return value as defined by given BCELComparator strategy.
- * By default return the hashcode of the result of toString().
- *
- * @see java.lang.Object#hashCode()
- */
- @Override
- public int hashCode() {
- return _cmp.hashCode(this);
- }
}
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=1624235&r1=1624234&r2=1624235&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 Thu
Sep 11 09:21:43 2014
@@ -21,7 +21,6 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.tomcat.util.bcel.Constants;
-import org.apache.tomcat.util.bcel.util.BCELComparator;
/**
* Represents a Java class, i.e., the data structures, constant pool,
@@ -33,7 +32,7 @@ import org.apache.tomcat.util.bcel.util.
* @author <A HREF="mailto:m.d...@gmx.de";>M. Dahm</A>
*/
-public class JavaClass extends AccessFlags implements Comparable<JavaClass> {
+public class JavaClass extends AccessFlags {
private static final long serialVersionUID = 7029227708237523236L;
private String class_name;
@@ -46,23 +45,6 @@ public class JavaClass extends AccessFla
// Annotations are collected from certain attributes, don't do it more
than necessary!
private boolean annotationsOutOfDate = true;
- private static BCELComparator _cmp = new BCELComparator() {
-
- @Override
- public boolean equals( Object o1, Object o2 ) {
- JavaClass THIS = (JavaClass) o1;
- JavaClass THAT = (JavaClass) o2;
- return THIS.getClassName().equals(THAT.getClassName());
- }
-
-
- @Override
- public int hashCode( Object o ) {
- JavaClass THIS = (JavaClass) o;
- return THIS.getClassName().hashCode();
- }
- };
-
/**
* Constructor gets all contents as arguments.
@@ -154,39 +136,4 @@ public class JavaClass extends AccessFla
public String getSuperclassName() {
return superclass_name;
}
-
-
- /**
- * Return value as defined by given BCELComparator strategy.
- * By default two JavaClass objects are said to be equal when
- * their class names are equal.
- *
- * @see java.lang.Object#equals(java.lang.Object)
- */
- @Override
- public boolean equals( Object obj ) {
- return _cmp.equals(this, obj);
- }
-
-
- /**
- * Return the natural ordering of two JavaClasses.
- * This ordering is based on the class name
- */
- @Override
- public int compareTo(JavaClass obj) {
- return getClassName().compareTo(obj.getClassName());
- }
-
-
- /**
- * Return value as defined by given BCELComparator strategy.
- * By default return the hashcode of the class name.
- *
- * @see java.lang.Object#hashCode()
- */
- @Override
- public int hashCode() {
- return _cmp.hashCode(this);
- }
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
