You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by db...@apache.org on 2015/08/24 00:34:57 UTC
svn commit: r1697270 - in
/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6:
classfile/ generic/ util/
Author: dbrosius
Date: Sun Aug 23 22:34:57 2015
New Revision: 1697270
URL: http://svn.apache.org/r1697270
Log:
avoid possible NPEs in toStrings, and simplify
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ArrayElementValue.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Code.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Field.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumberTable.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTable.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Method.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMap.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Utility.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUSH.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPath.java
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ArrayElementValue.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ArrayElementValue.java?rev=1697270&r1=1697269&r2=1697270&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ArrayElementValue.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/ArrayElementValue.java Sun Aug 23 22:34:57 2015
@@ -35,7 +35,7 @@ public class ArrayElementValue extends E
sb.append("{");
for (int i = 0; i < evalues.length; i++)
{
- sb.append(evalues[i].toString());
+ sb.append(evalues[i]);
if ((i + 1) < evalues.length) {
sb.append(",");
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Code.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Code.java?rev=1697270&r1=1697269&r2=1697270&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Code.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Code.java Sun Aug 23 22:34:57 2015
@@ -313,7 +313,7 @@ public final class Code extends Attribut
if (attributes.length > 0) {
buf.append("\nAttribute(s) = ");
for (Attribute attribute : attributes) {
- buf.append("\n").append(attribute.toString());
+ buf.append("\n").append(attribute);
}
}
return buf.toString();
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Field.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Field.java?rev=1697270&r1=1697269&r2=1697270&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Field.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Field.java Sun Aug 23 22:34:57 2015
@@ -134,7 +134,7 @@ public final class Field extends FieldOr
}
for (Attribute attribute : super.getAttributes()) {
if (!(attribute instanceof ConstantValue)) {
- buf.append(" [").append(attribute.toString()).append("]");
+ buf.append(" [").append(attribute).append("]");
}
}
return buf.toString();
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumberTable.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumberTable.java?rev=1697270&r1=1697269&r2=1697270&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumberTable.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LineNumberTable.java Sun Aug 23 22:34:57 2015
@@ -139,7 +139,7 @@ public final class LineNumberTable exten
}
if ((line.length() > MAX_LINE_LENGTH) && (i < line_number_table.length - 1)) {
line.append(newLine);
- buf.append(line.toString());
+ buf.append(line);
line.setLength(0);
}
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTable.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTable.java?rev=1697270&r1=1697269&r2=1697270&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTable.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/LocalVariableTable.java Sun Aug 23 22:34:57 2015
@@ -147,7 +147,7 @@ public class LocalVariableTable extends
public final String toString() {
StringBuilder buf = new StringBuilder();
for (int i = 0; i < local_variable_table.length; i++) {
- buf.append(local_variable_table[i].toString());
+ buf.append(local_variable_table[i]);
if (i < local_variable_table.length - 1) {
buf.append('\n');
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Method.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Method.java?rev=1697270&r1=1697269&r2=1697270&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Method.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Method.java Sun Aug 23 22:34:57 2015
@@ -179,7 +179,7 @@ public final class Method extends FieldO
StringBuilder buf = new StringBuilder(signature);
for (Attribute attribute : super.getAttributes()) {
if (!((attribute instanceof Code) || (attribute instanceof ExceptionTable))) {
- buf.append(" [").append(attribute.toString()).append("]");
+ buf.append(" [").append(attribute).append("]");
}
}
ExceptionTable e = getExceptionTable();
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMap.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMap.java?rev=1697270&r1=1697269&r2=1697270&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMap.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMap.java Sun Aug 23 22:34:57 2015
@@ -117,7 +117,7 @@ public final class StackMap extends Attr
public final String toString() {
StringBuilder buf = new StringBuilder("StackMap(");
for (int i = 0; i < map.length; i++) {
- buf.append(map[i].toString());
+ buf.append(map[i]);
if (i < map.length - 1) {
buf.append(", ");
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Utility.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Utility.java?rev=1697270&r1=1697269&r2=1697270&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Utility.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Utility.java Sun Aug 23 22:34:57 2015
@@ -1223,7 +1223,7 @@ public abstract class Utility {
}
for (int i = 0; i < obj.length; i++) {
if (obj[i] != null) {
- buf.append(quote ? "\"" : "").append(obj[i].toString()).append(quote ? "\"" : "");
+ buf.append(quote ? "\"" : "").append(obj[i]).append(quote ? "\"" : "");
} else {
buf.append("null");
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java?rev=1697270&r1=1697269&r2=1697270&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/MethodGen.java Sun Aug 23 22:34:57 2015
@@ -1038,7 +1038,7 @@ public class MethodGen extends FieldGenO
for (int i = 0; i < getAttributes().length; i++) {
Attribute a = getAttributes()[i];
if (!((a instanceof Code) || (a instanceof ExceptionTable))) {
- buf.append(" [").append(a.toString()).append("]");
+ buf.append(" [").append(a).append("]");
}
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUSH.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUSH.java?rev=1697270&r1=1697269&r2=1697270&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUSH.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/PUSH.java Sun Aug 23 22:34:57 2015
@@ -187,6 +187,6 @@ public final class PUSH implements Compo
*/
@Override
public String toString() {
- return instruction.toString() + " (PUSH)";
+ return instruction + " (PUSH)";
}
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPath.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPath.java?rev=1697270&r1=1697269&r2=1697270&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPath.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/util/ClassPath.java Sun Aug 23 22:34:57 2015
@@ -98,7 +98,7 @@ public class ClassPath {
@Override
public String toString() {
if (parent != null) {
- return parent.toString() + File.pathSeparator + class_path;
+ return parent + File.pathSeparator + class_path;
}
return class_path;
}