Author: ggregory
Date: Tue Jun 21 20:43:38 2016
New Revision: 1749600
URL: http://svn.apache.org/viewvc?rev=1749600&view=rev
Log:
Formatting "){" -> ") {".
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELFactory.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/AssertionViolatedException.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/ClassConstraintException.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/CodeConstraintException.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/InvalidMethodException.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/LoadingException.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/LocalVariableInfoInconsistentException.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeConstraintException.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeInstructionConstraintException.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeInstructionOperandConstraintException.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StructuralCodeConstraintException.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/Utility.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/VerificationException.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/VerifierConstraintViolatedException.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/DOUBLE_Upper.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/IntList.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LONG_Upper.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LocalVariableInfo.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LocalVariablesInfo.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass1Verifier.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass2Verifier.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass3aVerifier.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/ControlFlowGraph.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/ExceptionHandler.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/ExceptionHandlers.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/ExecutionVisitor.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Frame.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/LocalVariables.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/OperandStack.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Pass3bVerifier.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/Subroutines.java
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/structurals/UninitializedObjectType.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/AbstractTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestArray01.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestArrayAccess01.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeInterface01.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeSpecial01.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeSpecial02.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeVirtual01.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestLegalInvokeVirtual02.java
commons/proper/bcel/trunk/src/test/java/org/apache/bcel/verifier/tests/TestReturn02.java
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java?rev=1749600&r1=1749599&r2=1749600&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java
(original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/bcel/generic/Type.java
Tue Jun 21 20:43:38 2016
@@ -115,8 +115,8 @@ public abstract class Type {
* returns the given type.
* @since 6.0
*/
- public Type normalizeForStackOrLocal(){
- if (this == Type.BOOLEAN || this == Type.BYTE || this == Type.SHORT ||
this == Type.CHAR){
+ public Type normalizeForStackOrLocal() {
+ if (this == Type.BOOLEAN || this == Type.BYTE || this == Type.SHORT ||
this == Type.CHAR) {
return Type.INT;
}
return this;
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELFactory.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELFactory.java?rev=1749600&r1=1749599&r2=1749600&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELFactory.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/util/BCELFactory.java
Tue Jun 21 20:43:38 2016
@@ -212,7 +212,7 @@ class BCELFactory extends EmptyVisitor {
embed += "f";
} else if (value instanceof Long) {
embed += "L";
- } else if (value instanceof ObjectType){
+ } else if (value instanceof ObjectType) {
ObjectType ot = (ObjectType) value;
embed = "new ObjectType(\""+ot.getClassName()+"\")";
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/AssertionViolatedException.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/AssertionViolatedException.java?rev=1749600&r1=1749599&r2=1749600&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/AssertionViolatedException.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/AssertionViolatedException.java
Tue Jun 21 20:43:38 2016
@@ -29,14 +29,14 @@ public final class AssertionViolatedExce
/** The error message. */
private String detailMessage;
/** Constructs a new AssertionViolatedException with null as its error
message string. */
- public AssertionViolatedException(){
+ public AssertionViolatedException() {
super();
}
/**
* Constructs a new AssertionViolatedException with the specified error
message preceded
* by "INTERNAL ERROR: ".
*/
- public AssertionViolatedException(String message){
+ public AssertionViolatedException(String message) {
super(message = "INTERNAL ERROR: "+message); // Thanks to Java, the
constructor call here must be first.
detailMessage=message;
}
@@ -53,7 +53,7 @@ public final class AssertionViolatedExce
is always replaced by the empty string (""). In particular, after
invoking this
method, the error message of this object can no longer be null.
*/
- public void extendMessage(String pre, String post){
+ public void extendMessage(String pre, String post) {
if (pre == null) {
pre="";
}
@@ -70,14 +70,14 @@ public final class AssertionViolatedExce
* @return the error message string of this AssertionViolatedException.
*/
@Override
- public String getMessage(){
+ public String getMessage() {
return detailMessage;
}
/**
* DO NOT USE. It's for experimental testing during development only.
*/
- public static void main(final String[] args){
+ public static void main(final String[] args) {
AssertionViolatedException ave = new
AssertionViolatedException("Oops!");
ave.extendMessage("\nFOUND:\n\t","\nExiting!!\n");
throw ave;
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/ClassConstraintException.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/ClassConstraintException.java?rev=1749600&r1=1749599&r2=1749600&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/ClassConstraintException.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/ClassConstraintException.java
Tue Jun 21 20:43:38 2016
@@ -31,14 +31,14 @@ public class ClassConstraintException ex
/**
* Constructs a new ClassConstraintException with null as its error
message string.
*/
- public ClassConstraintException(){
+ public ClassConstraintException() {
super();
}
/**
* Constructs a new ClassConstraintException with the specified error
message.
*/
- public ClassConstraintException(final String message){
+ public ClassConstraintException(final String message) {
super (message);
}
@@ -46,7 +46,7 @@ public class ClassConstraintException ex
* Constructs a new ClassConstraintException with the specified error
message and cause
* @since 6.0
*/
- public ClassConstraintException(final String message, final Throwable
initCause){
+ public ClassConstraintException(final String message, final Throwable
initCause) {
super(message, initCause);
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/CodeConstraintException.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/CodeConstraintException.java?rev=1749600&r1=1749599&r2=1749600&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/CodeConstraintException.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/CodeConstraintException.java
Tue Jun 21 20:43:38 2016
@@ -29,13 +29,13 @@ public abstract class CodeConstraintExce
/**
* Constructs a new CodeConstraintException with null as its error message
string.
*/
- CodeConstraintException(){
+ CodeConstraintException() {
super();
}
/**
* Constructs a new CodeConstraintException with the specified error
message.
*/
- CodeConstraintException(final String message){
+ CodeConstraintException(final String message) {
super(message);
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/InvalidMethodException.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/InvalidMethodException.java?rev=1749600&r1=1749599&r2=1749600&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/InvalidMethodException.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/InvalidMethodException.java
Tue Jun 21 20:43:38 2016
@@ -28,7 +28,7 @@ public class InvalidMethodException exte
private static final long serialVersionUID = -7060302743724808051L;
/** Constructs an InvalidMethodException with the specified detail
message. */
- public InvalidMethodException(final String message){
+ public InvalidMethodException(final String message) {
super(message);
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/LoadingException.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/LoadingException.java?rev=1749600&r1=1749599&r2=1749600&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/LoadingException.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/LoadingException.java
Tue Jun 21 20:43:38 2016
@@ -31,14 +31,14 @@ public class LoadingException extends Ve
/**
* Constructs a new LoadingException with null as its error message string.
*/
- public LoadingException(){
+ public LoadingException() {
super();
}
/**
* Constructs a new LoadingException with the specified error message.
*/
- public LoadingException(final String message){
+ public LoadingException(final String message) {
super (message);
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/LocalVariableInfoInconsistentException.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/LocalVariableInfoInconsistentException.java?rev=1749600&r1=1749599&r2=1749600&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/LocalVariableInfoInconsistentException.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/LocalVariableInfoInconsistentException.java
Tue Jun 21 20:43:38 2016
@@ -33,14 +33,14 @@ public class LocalVariableInfoInconsiste
/**
* Constructs a new LocalVariableInfoInconsistentException with null as
its error message string.
*/
- public LocalVariableInfoInconsistentException(){
+ public LocalVariableInfoInconsistentException() {
super();
}
/**
* Constructs a new LocalVariableInfoInconsistentException with the
specified error message.
*/
- public LocalVariableInfoInconsistentException(final String message){
+ public LocalVariableInfoInconsistentException(final String message) {
super (message);
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeConstraintException.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeConstraintException.java?rev=1749600&r1=1749599&r2=1749600&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeConstraintException.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeConstraintException.java
Tue Jun 21 20:43:38 2016
@@ -30,7 +30,7 @@ package org.apache.bcel.verifier.exc;
public abstract class StaticCodeConstraintException extends
CodeConstraintException{
private static final long serialVersionUID = 3858523065007725128L;
- public StaticCodeConstraintException(final String message){
+ public StaticCodeConstraintException(final String message) {
super(message);
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeInstructionConstraintException.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeInstructionConstraintException.java?rev=1749600&r1=1749599&r2=1749600&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeInstructionConstraintException.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeInstructionConstraintException.java
Tue Jun 21 20:43:38 2016
@@ -33,7 +33,7 @@ package org.apache.bcel.verifier.exc;
public class StaticCodeInstructionConstraintException extends
StaticCodeConstraintException{
private static final long serialVersionUID = 4987255974346614794L;
- public StaticCodeInstructionConstraintException(final String message){
+ public StaticCodeInstructionConstraintException(final String message) {
super(message);
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeInstructionOperandConstraintException.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeInstructionOperandConstraintException.java?rev=1749600&r1=1749599&r2=1749600&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeInstructionOperandConstraintException.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StaticCodeInstructionOperandConstraintException.java
Tue Jun 21 20:43:38 2016
@@ -33,7 +33,7 @@ package org.apache.bcel.verifier.exc;
public class StaticCodeInstructionOperandConstraintException extends
StaticCodeConstraintException{
private static final long serialVersionUID = 4780787099381933487L;
- public StaticCodeInstructionOperandConstraintException(final String
message){
+ public StaticCodeInstructionOperandConstraintException(final String
message) {
super(message);
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StructuralCodeConstraintException.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StructuralCodeConstraintException.java?rev=1749600&r1=1749599&r2=1749600&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StructuralCodeConstraintException.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/StructuralCodeConstraintException.java
Tue Jun 21 20:43:38 2016
@@ -34,13 +34,13 @@ public class StructuralCodeConstraintExc
/**
* Constructs a new StructuralCodeConstraintException with the specified
error message.
*/
- public StructuralCodeConstraintException(final String message){
+ public StructuralCodeConstraintException(final String message) {
super(message);
}
/**
* Constructs a new StructuralCodeConstraintException with null as its
error message string.
*/
- public StructuralCodeConstraintException(){
+ public StructuralCodeConstraintException() {
super();
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/Utility.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/Utility.java?rev=1749600&r1=1749599&r2=1749600&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/Utility.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/Utility.java
Tue Jun 21 20:43:38 2016
@@ -28,10 +28,10 @@ import java.io.StringWriter;
*/
public final class Utility{
/** This class is not instantiable. */
- private Utility(){}
+ private Utility() {}
/** This method returns the stack trace of a Throwable instance as a
String. */
- public static String getStackTrace(final Throwable t){
+ public static String getStackTrace(final Throwable t) {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
t.printStackTrace(pw);
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/VerificationException.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/VerificationException.java?rev=1749600&r1=1749599&r2=1749600&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/VerificationException.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/VerificationException.java
Tue Jun 21 20:43:38 2016
@@ -35,20 +35,20 @@ public abstract class VerificationExcept
/**
* Constructs a new VerificationException with null as its error message
string.
*/
- VerificationException(){
+ VerificationException() {
super();
}
/**
* Constructs a new VerificationException with the specified error message.
*/
- VerificationException(final String message){
+ VerificationException(final String message) {
super(message);
}
/**
* Constructs a new VerificationException with the specified error message
and exception
*/
- VerificationException(final String message, final Throwable initCause){
+ VerificationException(final String message, final Throwable initCause) {
super(message, initCause);
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/VerifierConstraintViolatedException.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/VerifierConstraintViolatedException.java?rev=1749600&r1=1749599&r2=1749600&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/VerifierConstraintViolatedException.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/exc/VerifierConstraintViolatedException.java
Tue Jun 21 20:43:38 2016
@@ -38,20 +38,20 @@ public abstract class VerifierConstraint
/**
* Constructs a new VerifierConstraintViolatedException with null as its
error message string.
*/
- VerifierConstraintViolatedException(){
+ VerifierConstraintViolatedException() {
super();
}
/**
* Constructs a new VerifierConstraintViolatedException with the specified
error message.
*/
- VerifierConstraintViolatedException(final String message){
+ VerifierConstraintViolatedException(final String message) {
super(message); // Not that important
detailMessage = message;
}
/**
* Constructs a new VerifierConstraintViolationException with the
specified error message and cause
*/
- VerifierConstraintViolatedException(final String message, final Throwable
initCause){
+ VerifierConstraintViolatedException(final String message, final Throwable
initCause) {
super(message, initCause);
detailMessage = message;
}
@@ -62,7 +62,7 @@ public abstract class VerifierConstraint
is always replaced by the empty string (""). In particular, after
invoking this
method, the error message of this object can no longer be null.
*/
- public void extendMessage(String pre, String post){
+ public void extendMessage(String pre, String post) {
if (pre == null) {
pre="";
}
@@ -79,7 +79,7 @@ public abstract class VerifierConstraint
* @return the error message string of this
VerifierConstraintViolatedException.
*/
@Override
- public String getMessage(){
+ public String getMessage() {
return detailMessage;
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/DOUBLE_Upper.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/DOUBLE_Upper.java?rev=1749600&r1=1749599&r2=1749600&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/DOUBLE_Upper.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/DOUBLE_Upper.java
Tue Jun 21 20:43:38 2016
@@ -31,12 +31,12 @@ public final class DOUBLE_Upper extends
private static final DOUBLE_Upper singleton = new DOUBLE_Upper();
/** The constructor; this class must not be instantiated from the outside.
*/
- private DOUBLE_Upper(){
+ private DOUBLE_Upper() {
super(Const.T_UNKNOWN, "Long_Upper");
}
/** Use this method to get the single instance of this class. */
- public static DOUBLE_Upper theInstance(){
+ public static DOUBLE_Upper theInstance() {
return singleton;
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/IntList.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/IntList.java?rev=1749600&r1=1749599&r2=1749600&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/IntList.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/IntList.java
Tue Jun 21 20:43:38 2016
@@ -30,15 +30,15 @@ public class IntList{
/** The int are stored as Integer objects here. */
private final List<Integer> theList;
/** This constructor creates an empty list. */
- IntList(){
+ IntList() {
theList = new ArrayList<>();
}
/** Adds an element to the list. */
- void add(final int i){
+ void add(final int i) {
theList.add(Integer.valueOf(i));
}
/** Checks if the specified int is already in the list. */
- boolean contains(final int i){
+ boolean contains(final int i) {
Integer[] ints = new Integer[theList.size()];
theList.toArray(ints);
for (Integer k : ints) {
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LONG_Upper.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LONG_Upper.java?rev=1749600&r1=1749599&r2=1749600&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LONG_Upper.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LONG_Upper.java
Tue Jun 21 20:43:38 2016
@@ -31,12 +31,12 @@ public final class LONG_Upper extends Ty
private static final LONG_Upper singleton = new LONG_Upper();
/** The constructor; this class must not be instantiated from the outside.
*/
- private LONG_Upper(){
+ private LONG_Upper() {
super(Const.T_UNKNOWN, "Long_Upper");
}
/** Use this method to get the single instance of this class. */
- public static LONG_Upper theInstance(){
+ public static LONG_Upper theInstance() {
return singleton;
}
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LocalVariableInfo.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LocalVariableInfo.java?rev=1749600&r1=1749599&r2=1749600&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LocalVariableInfo.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LocalVariableInfo.java
Tue Jun 21 20:43:38 2016
@@ -42,14 +42,14 @@ public class LocalVariableInfo{
* Adds a name of a local variable and a certain slot to our 'names'
* (Hashtable) database.
*/
- private void setName(final int offset, final String name){
+ private void setName(final int offset, final String name) {
names.put(Integer.toString(offset), name);
}
/**
* Adds a type of a local variable and a certain slot to our 'types'
* (Hashtable) database.
*/
- private void setType(final int offset, final Type t){
+ private void setType(final int offset, final Type t) {
types.put(Integer.toString(offset), t);
}
@@ -61,7 +61,7 @@ public class LocalVariableInfo{
* May return 'null' if nothing is known about the type of this local
* variable slot at the given bytecode offset.
*/
- public Type getType(final int offset){
+ public Type getType(final int offset) {
return types.get(Integer.toString(offset));
}
/**
@@ -72,7 +72,7 @@ public class LocalVariableInfo{
* May return 'null' if nothing is known about the type of this local
* variable slot at the given bytecode offset.
*/
- public String getName(final int offset){
+ public String getName(final int offset) {
return names.get(Integer.toString(offset));
}
/**
@@ -81,7 +81,7 @@ public class LocalVariableInfo{
* with already gathered information.
*/
public void add(final String name, final int startpc, final int length,
final Type t) throws LocalVariableInfoInconsistentException{
- for (int i=startpc; i<=startpc+length; i++){ // incl/incl-notation!
+ for (int i=startpc; i<=startpc+length; i++) { // incl/incl-notation!
add(i,name,t);
}
}
@@ -92,14 +92,14 @@ public class LocalVariableInfo{
* with already gathered information.
*/
private void add(final int offset, final String name, final Type t) throws
LocalVariableInfoInconsistentException{
- if (getName(offset) != null){
- if (! getName(offset).equals(name)){
+ if (getName(offset) != null) {
+ if (! getName(offset).equals(name)) {
throw new LocalVariableInfoInconsistentException("At bytecode
offset '"+offset+
"' a local variable has two different names:
'"+getName(offset)+"' and '"+name+"'.");
}
}
- if (getType(offset) != null){
- if (! getType(offset).equals(t)){
+ if (getType(offset) != null) {
+ if (! getType(offset).equals(t)) {
throw new LocalVariableInfoInconsistentException("At bytecode
offset '"+offset+
"' a local variable has two different types:
'"+getType(offset)+"' and '"+t+"'.");
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LocalVariablesInfo.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LocalVariablesInfo.java?rev=1749600&r1=1749599&r2=1749600&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LocalVariablesInfo.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/LocalVariablesInfo.java
Tue Jun 21 20:43:38 2016
@@ -35,16 +35,16 @@ public class LocalVariablesInfo{
private final LocalVariableInfo[] localVariableInfos;
/** The constructor. */
- LocalVariablesInfo(final int max_locals){
+ LocalVariablesInfo(final int max_locals) {
localVariableInfos = new LocalVariableInfo[max_locals];
- for (int i=0; i<max_locals; i++){
+ for (int i=0; i<max_locals; i++) {
localVariableInfos[i] = new LocalVariableInfo();
}
}
/** Returns the LocalVariableInfo for the given slot. */
- public LocalVariableInfo getLocalVariableInfo(final int slot){
- if (slot < 0 || slot >= localVariableInfos.length){
+ public LocalVariableInfo getLocalVariableInfo(final int slot) {
+ if (slot < 0 || slot >= localVariableInfos.length) {
throw new AssertionViolatedException("Slot number for local
variable information out of range.");
}
return localVariableInfos[slot];
@@ -59,7 +59,7 @@ public class LocalVariablesInfo{
public void add(final int slot, final String name, final int startpc,
final int length, final Type t) throws LocalVariableInfoInconsistentException{
// The add operation on LocalVariableInfo may throw the
'...Inconsistent...' exception, we don't throw it explicitely here.
- if (slot < 0 || slot >= localVariableInfos.length){
+ if (slot < 0 || slot >= localVariableInfos.length) {
throw new AssertionViolatedException("Slot number for local
variable information out of range.");
}
Modified:
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass1Verifier.java
URL:
http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass1Verifier.java?rev=1749600&r1=1749599&r2=1749600&view=diff
==============================================================================
---
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass1Verifier.java
(original)
+++
commons/proper/bcel/trunk/src/main/java/org/apache/bcel/verifier/statics/Pass1Verifier.java
Tue Jun 21 20:43:38 2016
@@ -52,8 +52,8 @@ public final class Pass1Verifier extends
* Used to load in and return the myOwner-matching JavaClass object when
needed.
* Avoids loading in a class file when it's not really needed!
*/
- private JavaClass getJavaClass(){
- if (jc == null){
+ private JavaClass getJavaClass() {
+ if (jc == null) {
try {
jc = Repository.lookupClass(myOwner.getClassName());
} catch (ClassNotFoundException e) {
@@ -71,7 +71,7 @@ public final class Pass1Verifier extends
*
* @see Verifier
*/
- public Pass1Verifier(final Verifier owner){
+ public Pass1Verifier(final Verifier owner) {
myOwner = owner;
}
@@ -144,14 +144,14 @@ public final class Pass1Verifier extends
* @see org.apache.bcel.Const#JVM_CLASSFILE_MAGIC
*/
@Override
- public VerificationResult do_verify(){
+ public VerificationResult do_verify() {
JavaClass jc;
try{
jc = getJavaClass(); //loads in the class file if not already
done.
- if (jc != null){
+ if (jc != null) {
/* If we find more constraints to check, we should do this in
an own method. */
- if (! myOwner.getClassName().equals(jc.getClassName())){
+ if (! myOwner.getClassName().equals(jc.getClassName())) {
// This should maybe caught by BCEL: In case of renamed
.class files we get wrong
// JavaClass objects here.
throw new LoadingException("Wrong name: the internal name
of the .class file '"+jc.getClassName()+
@@ -160,20 +160,20 @@ public final class Pass1Verifier extends
}
}
- catch(LoadingException e){
+ catch(LoadingException e) {
return new
VerificationResult(VerificationResult.VERIFIED_REJECTED, e.getMessage());
}
- catch(ClassFormatException e){
+ catch(ClassFormatException e) {
return new
VerificationResult(VerificationResult.VERIFIED_REJECTED, e.getMessage());
}
- catch(RuntimeException e){
+ catch(RuntimeException e) {
// BCEL does not catch every possible RuntimeException; e.g. if
// a constant pool index is referenced that does not exist.
return new
VerificationResult(VerificationResult.VERIFIED_REJECTED, "Parsing via BCEL did
not succeed. "+
e.getClass().getName()+" occured:\n"+Utility.getStackTrace(e));
}
- if (jc != null){
+ if (jc != null) {
return VerificationResult.VR_OK;
}
//TODO: Maybe change Repository's behaviour to throw a
LoadingException instead of just returning "null"
@@ -192,7 +192,7 @@ public final class Pass1Verifier extends
* <B>TODO</B>.
*/
@Override
- public String[] getMessages(){
+ public String[] getMessages() {
// This method is only here to override the javadoc-comment.
return super.getMessages();
}
