You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by se...@apache.org on 2015/08/20 23:36:34 UTC
svn commit: r1696858 [1/3] - in /commons/proper/bcel/trunk: ./ src/examples/
src/examples/Mini/ src/main/java/org/apache/commons/bcel6/classfile/
src/main/java/org/apache/commons/bcel6/generic/
src/main/java/org/apache/commons/bcel6/verifier/ src/main/...
Author: sebb
Date: Thu Aug 20 21:36:33 2015
New Revision: 1696858
URL: http://svn.apache.org/r1696858
Log:
Checkstyle - line length
Added:
commons/proper/bcel/trunk/checkstyle_suppressions.xml (with props)
Modified:
commons/proper/bcel/trunk/checkstyle.xml
commons/proper/bcel/trunk/src/examples/Mini/MiniParser.java
commons/proper/bcel/trunk/src/examples/Mini/MiniParserTokenManager.java
commons/proper/bcel/trunk/src/examples/ProxyCreator.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Annotations.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethod.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethods.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameter.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameters.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapTableEntry.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/AnnotationEntryGen.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierAppFrame.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LocalVariableInfo.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass1Verifier.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass2Verifier.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass3aVerifier.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/StringRepresentation.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/ControlFlowGraph.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstConstraintVisitor.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/InstructionContext.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/LocalVariables.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/OperandStack.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Pass3bVerifier.java
commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/structurals/Subroutines.java
commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/classfile/UtilityTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/AbstractVerifierTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/VerifierArrayAccessTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/VerifierTestCase.java
commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArrayAccess02Creator.java
commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArrayAccess03Creator.java
commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestArrayAccess04Creator.java
commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestReturn01Creator.java
commons/proper/bcel/trunk/src/test/java/org/apache/commons/bcel6/verifier/tests/TestReturn03Creator.java
Modified: commons/proper/bcel/trunk/checkstyle.xml
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/checkstyle.xml?rev=1696858&r1=1696857&r2=1696858&view=diff
==============================================================================
--- commons/proper/bcel/trunk/checkstyle.xml (original)
+++ commons/proper/bcel/trunk/checkstyle.xml Thu Aug 20 21:36:33 2015
@@ -36,7 +36,7 @@ limitations under the License.
<!-- Checks for white space at the end of the line -->
<!-- See http://checkstyle.sourceforge.net/config_regexp.html -->
- <!--
+ <!-- 706
<module name="RegexpSingleline">
<property name="format" value="\s+$" />
<property name="message" value="Line has trailing spaces." />
@@ -55,10 +55,10 @@ limitations under the License.
<module name="TreeWalker">
<property name="cacheFile" value="target/cachefile" />
<!--
+ -->
<module name="LineLength">
<property name="max" value="135"/>
</module>
- -->
<!-- Checks for Naming Conventions. -->
<!-- See http://checkstyle.sf.net/config_naming.html -->
@@ -175,5 +175,9 @@ limitations under the License.
<module name="SuppressionCommentFilter"/>
+ <module name="SuppressionFilter">
+ <property name="file" value="checkstyle_suppressions.xml"/>
+ </module>
+
</module>
Added: commons/proper/bcel/trunk/checkstyle_suppressions.xml
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/checkstyle_suppressions.xml?rev=1696858&view=auto
==============================================================================
--- commons/proper/bcel/trunk/checkstyle_suppressions.xml (added)
+++ commons/proper/bcel/trunk/checkstyle_suppressions.xml Thu Aug 20 21:36:33 2015
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements. See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You under the Apache License, Version 2.0
+(the "License"); you may not use this file except in compliance with
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+-->
+
+<!DOCTYPE suppressions PUBLIC
+ "-//Puppy Crawl//DTD Suppressions 1.1//EN"
+ "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+<!-- SEE: http://checkstyle.sourceforge.net/config.html#Examples -->
+<suppressions>
+ <suppress checks="LineLength" files="InstructionFinder.java"/>
+</suppressions>
Propchange: commons/proper/bcel/trunk/checkstyle_suppressions.xml
------------------------------------------------------------------------------
svn:eol-style = native
Modified: commons/proper/bcel/trunk/src/examples/Mini/MiniParser.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/MiniParser.java?rev=1696858&r1=1696857&r2=1696858&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/examples/Mini/MiniParser.java (original)
+++ commons/proper/bcel/trunk/src/examples/Mini/MiniParser.java Thu Aug 20 21:36:33 2015
@@ -831,7 +831,8 @@ public class MiniParser/*@bgen(jjtree)*/
// static private boolean jj_semLA;
static private int jj_gen;
static final private int[] jj_la1 = new int[17];
- static final private int[] jj_la1_0 = {0x200,0x0,0x1800000,0x1c000000,0x11c04400,0x1000,0x1800000,0x0,0x11c04400,0xe2000000,0x3f0000,0x1800000,0x1800000,0x1c000000,0xe2000000,0x3f0000,0x10400000,};
+ static final private int[] jj_la1_0 = {0x200,0x0,0x1800000,0x1c000000,0x11c04400,0x1000,0x1800000,0x0,0x11c04400,
+ 0xe2000000,0x3f0000,0x1800000,0x1800000,0x1c000000,0xe2000000,0x3f0000,0x10400000,};
static final private int[] jj_la1_1 = {0x0,0x8,0x130,0x0,0x331,0x0,0x130,0x8,0x331,0x0,0x0,0x331,0x130,0x0,0x0,0x0,0x0,};
static final private JJCalls[] jj_2_rtns = new JJCalls[1];
static private boolean jj_rescan = false;
Modified: commons/proper/bcel/trunk/src/examples/Mini/MiniParserTokenManager.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/Mini/MiniParserTokenManager.java?rev=1696858&r1=1696857&r2=1696858&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/examples/Mini/MiniParserTokenManager.java (original)
+++ commons/proper/bcel/trunk/src/examples/Mini/MiniParserTokenManager.java Thu Aug 20 21:36:33 2015
@@ -593,7 +593,9 @@ static protected char curChar;
public MiniParserTokenManager(ASCII_CharStream stream)
{
if (input_stream != null) {
- throw new TokenMgrError("ERROR: Second call to constructor of static lexer. You must use ReInit() to initialize the static variables.", TokenMgrError.STATIC_LEXER_ERROR);
+ throw new TokenMgrError(
+ "ERROR: Second call to constructor of static lexer. You must use ReInit() to initialize the static variables.",
+ TokenMgrError.STATIC_LEXER_ERROR);
}
input_stream = stream;
}
@@ -625,7 +627,8 @@ static public void ReInit(ASCII_CharStre
static public void SwitchTo(int lexState)
{
if (lexState >= 2 || lexState < 0) {
- throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.", TokenMgrError.INVALID_LEXICAL_STATE);
+ throw new TokenMgrError("Error: Ignoring invalid lexical state : " + lexState + ". State unchanged.",
+ TokenMgrError.INVALID_LEXICAL_STATE);
} else {
curLexState = lexState;
}
Modified: commons/proper/bcel/trunk/src/examples/ProxyCreator.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/examples/ProxyCreator.java?rev=1696858&r1=1696857&r2=1696858&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/examples/ProxyCreator.java (original)
+++ commons/proper/bcel/trunk/src/examples/ProxyCreator.java Thu Aug 20 21:36:33 2015
@@ -75,7 +75,8 @@ public class ProxyCreator {
ClassLoader loader = ProxyCreator.class.getClassLoader();
// instanceof won't work here ...
- if (loader.getClass().toString().equals("class org.apache.commons.bcel6.util.ClassLoader")) { // TODO this is broken; cannot ever be true
+ // TODO this is broken; cannot ever be true now that ClassLoader has been dropped
+ if (loader.getClass().toString().equals("class org.apache.commons.bcel6.util.ClassLoader")) {
// Real class name will be set by the class loader
ClassGen cg = new ClassGen("foo", "java.lang.Object", "", Constants.ACC_PUBLIC,
new String[]{"java.awt.event.ActionListener"});
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java?rev=1696858&r1=1696857&r2=1696858&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/AnnotationEntry.java Thu Aug 20 21:36:33 2015
@@ -55,7 +55,8 @@ public class AnnotationEntry implements
final int num_element_value_pairs = (input.readUnsignedShort());
annotationEntry.element_value_pairs = new ArrayList<>();
for (int i = 0; i < num_element_value_pairs; i++) {
- annotationEntry.element_value_pairs.add(new ElementValuePair(input.readUnsignedShort(), ElementValue.readElementValue(input, constant_pool),
+ annotationEntry.element_value_pairs.add(
+ new ElementValuePair(input.readUnsignedShort(), ElementValue.readElementValue(input, constant_pool),
constant_pool));
}
return annotationEntry;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Annotations.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Annotations.java?rev=1696858&r1=1696857&r2=1696858&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Annotations.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/Annotations.java Thu Aug 20 21:36:33 2015
@@ -39,7 +39,8 @@ public abstract class Annotations extend
* @param input Input stream
* @param constant_pool Array of constants
*/
- Annotations(byte annotation_type, int name_index, int length, DataInput input, ConstantPool constant_pool, boolean isRuntimeVisible) throws IOException {
+ Annotations(byte annotation_type, int name_index, int length, DataInput input,
+ ConstantPool constant_pool, boolean isRuntimeVisible) throws IOException {
this(annotation_type, name_index, length, (AnnotationEntry[]) null, constant_pool, isRuntimeVisible);
final int annotation_table_length = (input.readUnsignedShort());
annotation_table = new AnnotationEntry[annotation_table_length];
@@ -55,7 +56,8 @@ public abstract class Annotations extend
* @param annotation_table the actual annotations
* @param constant_pool Array of constants
*/
- public Annotations(byte annotation_type, int name_index, int length, AnnotationEntry[] annotation_table, ConstantPool constant_pool, boolean isRuntimeVisible) {
+ public Annotations(byte annotation_type, int name_index, int length, AnnotationEntry[] annotation_table,
+ ConstantPool constant_pool, boolean isRuntimeVisible) {
super(annotation_type, name_index, length, constant_pool);
this.annotation_table = annotation_table;
this.isRuntimeVisible = isRuntimeVisible;
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethod.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethod.java?rev=1696858&r1=1696857&r2=1696858&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethod.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethod.java Thu Aug 20 21:36:33 2015
@@ -28,7 +28,8 @@ import org.apache.commons.bcel6.Constant
* method ref, the number of bootstrap arguments and an array of the
* bootstrap arguments.
*
- * @see <a href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.23">The class File Format : The BootstrapMethods Attribute</a>
+ * @see <a href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.23">
+ * The class File Format : The BootstrapMethods Attribute</a>
* @since 6.0
*/
public class BootstrapMethod implements Cloneable {
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethods.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethods.java?rev=1696858&r1=1696857&r2=1696858&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethods.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/BootstrapMethods.java Thu Aug 20 21:36:33 2015
@@ -26,7 +26,8 @@ import org.apache.commons.bcel6.Constant
/**
* This class represents a BootstrapMethods attribute.
*
- * @see <a href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.23">The class File Format : The BootstrapMethods Attribute</a>
+ * @see <a href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.23">
+ * The class File Format : The BootstrapMethods Attribute</a>
* @since 6.0
*/
public class BootstrapMethods extends Attribute {
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameter.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameter.java?rev=1696858&r1=1696857&r2=1696858&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameter.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameter.java Thu Aug 20 21:36:33 2015
@@ -26,7 +26,8 @@ import org.apache.commons.bcel6.Constant
/**
* Entry of the parameters table.
*
- * @see <a href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.24">The class File Format : The MethodParameters Attribute</a>
+ * @see <a href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.24">
+ * The class File Format : The MethodParameters Attribute</a>
* @since 6.0
*/
public class MethodParameter implements Cloneable {
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameters.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameters.java?rev=1696858&r1=1696857&r2=1696858&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameters.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/MethodParameters.java Thu Aug 20 21:36:33 2015
@@ -26,7 +26,8 @@ import org.apache.commons.bcel6.Constant
/**
* This class represents a MethodParameters attribute.
*
- * @see <a href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.24">The class File Format : The MethodParameters Attribute</a>
+ * @see <a href="http://docs.oracle.com/javase/specs/jvms/se8/html/jvms-4.html#jvms-4.7.24">
+ * The class File Format : The MethodParameters Attribute</a>
* @since 6.0
*/
public class MethodParameters extends Attribute {
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapTableEntry.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapTableEntry.java?rev=1696858&r1=1696857&r2=1696858&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapTableEntry.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/classfile/StackMapTableEntry.java Thu Aug 20 21:36:33 2015
@@ -53,7 +53,8 @@ public final class StackMapTableEntry im
if (frame_type >= Constants.SAME_FRAME && frame_type <= Constants.SAME_FRAME_MAX) {
byte_code_offset = frame_type - Constants.SAME_FRAME;
- } else if (frame_type >= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME && frame_type <= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) {
+ } else if (frame_type >= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME &&
+ frame_type <= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) {
byte_code_offset = frame_type - Constants.SAME_LOCALS_1_STACK_ITEM_FRAME;
types_of_stack_items = new StackMapType[1];
types_of_stack_items[0] = new StackMapType(input, constant_pool);
@@ -112,7 +113,8 @@ public final class StackMapTableEntry im
file.write(frame_type);
if (frame_type >= Constants.SAME_FRAME && frame_type <= Constants.SAME_FRAME_MAX) {
// nothing to be done
- } else if (frame_type >= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME && frame_type <= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) {
+ } else if (frame_type >= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME &&
+ frame_type <= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) {
types_of_stack_items[0].dump(file);
} else if (frame_type == Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) {
file.writeShort(byte_code_offset);
@@ -152,7 +154,8 @@ public final class StackMapTableEntry im
buf.append("(");
if (frame_type >= Constants.SAME_FRAME && frame_type <= Constants.SAME_FRAME_MAX) {
buf.append("SAME");
- } else if (frame_type >= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME && frame_type <= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) {
+ } else if (frame_type >= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME &&
+ frame_type <= Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_MAX) {
buf.append("SAME_LOCALS_1_STACK");
} else if (frame_type == Constants.SAME_LOCALS_1_STACK_ITEM_FRAME_EXTENDED) {
buf.append("SAME_LOCALS_1_STACK_EXTENDED");
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/AnnotationEntryGen.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/AnnotationEntryGen.java?rev=1696858&r1=1696857&r2=1696858&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/AnnotationEntryGen.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/AnnotationEntryGen.java Thu Aug 20 21:36:33 2015
@@ -250,11 +250,13 @@ public class AnnotationEntryGen {
List<Attribute> newAttributes = new ArrayList<>();
if (rvaData.length > 2) {
newAttributes.add(
- new RuntimeVisibleAnnotations(rvaIndex, rvaData.length, new DataInputStream(new ByteArrayInputStream(rvaData)), cp.getConstantPool()));
+ new RuntimeVisibleAnnotations(rvaIndex, rvaData.length,
+ new DataInputStream(new ByteArrayInputStream(rvaData)), cp.getConstantPool()));
}
if (riaData.length > 2) {
newAttributes.add(
- new RuntimeInvisibleAnnotations(riaIndex, riaData.length, new DataInputStream(new ByteArrayInputStream(riaData)), cp.getConstantPool()));
+ new RuntimeInvisibleAnnotations(riaIndex, riaData.length,
+ new DataInputStream(new ByteArrayInputStream(riaData)), cp.getConstantPool()));
}
return newAttributes.toArray(new Attribute[newAttributes.size()]);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java?rev=1696858&r1=1696857&r2=1696858&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/generic/Select.java Thu Aug 20 21:36:33 2015
@@ -67,7 +67,8 @@ public abstract class Select extends Bra
}
this.match = match;
if ((match_length = match.length) != targets.length) {
- throw new ClassGenException("Match and target array have not the same length: Match length: " + match.length + " Target length: " + targets.length);
+ throw new ClassGenException("Match and target array have not the same length: Match length: " +
+ match.length + " Target length: " + targets.length);
}
indices = new int[match_length];
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierAppFrame.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierAppFrame.java?rev=1696858&r1=1696857&r2=1696858&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierAppFrame.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/VerifierAppFrame.java Thu Aug 20 21:36:33 2015
@@ -392,7 +392,8 @@ public class VerifierAppFrame extends JF
JOptionPane
.showMessageDialog(
this,
- "JustIce is a Java class file verifier.\nIt was implemented by Enver Haase in 2001, 2002.\n<http://commons.apache.org/bcel/>",
+ "JustIce is a Java class file verifier.\n"+
+ "It was implemented by Enver Haase in 2001, 2002.\n<http://commons.apache.org/bcel/>",
JUSTICE_VERSION, JOptionPane.INFORMATION_MESSAGE);
}
@@ -401,7 +402,10 @@ public class VerifierAppFrame extends JF
JOptionPane
.showMessageDialog(
this,
- "The upper four boxes to the right reflect verification passes according to The Java Virtual Machine Specification.\nThese are (in that order): Pass one, Pass two, Pass three (before data flow analysis), Pass three (data flow analysis).\nThe bottom box to the right shows (warning) messages; warnings do not cause a class to be rejected.",
+ "The upper four boxes to the right reflect verification passes according to"+
+ " The Java Virtual Machine Specification.\nThese are (in that order):"+
+ " Pass one, Pass two, Pass three (before data flow analysis), Pass three (data flow analysis).\n"+
+ "The bottom box to the right shows (warning) messages; warnings do not cause a class to be rejected.",
JUSTICE_VERSION, JOptionPane.INFORMATION_MESSAGE);
}
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LocalVariableInfo.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LocalVariableInfo.java?rev=1696858&r1=1696857&r2=1696858&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LocalVariableInfo.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/LocalVariableInfo.java Thu Aug 20 21:36:33 2015
@@ -94,12 +94,14 @@ public class LocalVariableInfo{
private void add(int offset, String name, Type t) throws LocalVariableInfoInconsistentException{
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+"'.");
+ 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)){
- throw new LocalVariableInfoInconsistentException("At bytecode offset '"+offset+"' a local variable has two different types: '"+getType(offset)+"' and '"+t+"'.");
+ throw new LocalVariableInfoInconsistentException("At bytecode offset '"+offset+
+ "' a local variable has two different types: '"+getType(offset)+"' and '"+t+"'.");
}
}
setName(offset, name);
Modified: commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass1Verifier.java
URL: http://svn.apache.org/viewvc/commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass1Verifier.java?rev=1696858&r1=1696857&r2=1696858&view=diff
==============================================================================
--- commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass1Verifier.java (original)
+++ commons/proper/bcel/trunk/src/main/java/org/apache/commons/bcel6/verifier/statics/Pass1Verifier.java Thu Aug 20 21:36:33 2015
@@ -48,7 +48,10 @@ public final class Pass1Verifier extends
*/
private final Verifier myOwner;
- /** 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! */
+ /**
+ * 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){
try {
@@ -99,9 +102,14 @@ public final class Pass1Verifier extends
* <LI> there are exactly interfaces_count many entries in the interfaces array of the class file.
* <LI> there are exactly fields_count many entries in the fields array of the class file.
* <LI> there are exactly methods_count many entries in the methods array of the class file.
- * <LI> there are exactly attributes_count many entries in the attributes array of the class file, fields, methods, and code attribute.
- * <LI> there should be exactly attribute_length many bytes in each attribute. Inconsistency between attribute_length and the actually size of the attribute content should be uncovered. For example, in an Exceptions attribute, the actual number of exceptions as required by the number_of_exceptions field might yeild an attribute size that doesn't match the attribute_length. Such an anomaly should be detected.
- * <LI> all attributes should have proper length. In particular, under certain context (e.g. while parsing method_info), recognizable attributes (e.g. "Code" attribute) should have correct format (e.g. attribute_length is 2).
+ * <LI> there are exactly attributes_count many entries in the attributes array of the class file,
+ * fields, methods, and code attribute.
+ * <LI> there should be exactly attribute_length many bytes in each attribute.
+ * Inconsistency between attribute_length and the actually size of the attribute content should be uncovered.
+ * For example, in an Exceptions attribute, the actual number of exceptions as required by the number_of_exceptions field
+ * might yeild an attribute size that doesn't match the attribute_length. Such an anomaly should be detected.
+ * <LI> all attributes should have proper length. In particular, under certain context (e.g. while parsing method_info),
+ * recognizable attributes (e.g. "Code" attribute) should have correct format (e.g. attribute_length is 2).
* </UL>
* <LI> Also, certain constant values are checked for validity:
* <UL>
@@ -109,9 +117,12 @@ public final class Pass1Verifier extends
* <LI> The major and minor version numbers are valid.
* <LI> All the constant pool type tags are recognizable.
* <LI> All undocumented access flags are masked off before use. Strictly speaking, this is not really a check.
- * <LI> The field this_class should point to a string that represents a legal non-array class name, and this name should be the same as the class file being loaded.
+ * <LI> The field this_class should point to a string that represents a legal non-array class name,
+ * and this name should be the same as the class file being loaded.
* <LI> the field super_class should point to a string that represents a legal non-array class name.
- * <LI> Because some of the above checks require cross referencing the constant pool entries, guards are set up to make sure that the referenced entries are of the right type and the indices are within the legal range (0 < index < constant_pool_count).
+ * <LI> Because some of the above checks require cross referencing the constant pool entries,
+ * guards are set up to make sure that the referenced entries are of the right type and the indices
+ * are within the legal range (0 < index < constant_pool_count).
* </UL>
* <LI> Extra checks done in pass 1:
* <UL>
@@ -120,13 +131,14 @@ public final class Pass1Verifier extends
* <LI> the name and signature of fields and methods are verified to be of legal format.
* </UL>
* </UL>
- * (From the Paper <A HREF=http://www.cs.sfu.ca/people/GradStudents/pwfong/personal/JVM/pass1/>The Mysterious Pass One, first draft, September 2, 1997</A>.)
+ * (From the Paper <A HREF="http://www.cs.sfu.ca/people/GradStudents/pwfong/personal/JVM/pass1/">
+ * The Mysterious Pass One, first draft, September 2, 1997</A>.)
*
* <P>However, most of this is done by parsing a class file or generating a class file into BCEL's internal data structure.
* <B>Therefore, all that is really done here is look up the class file from BCEL's repository.</B>
* This is also motivated by the fact that some omitted things
- * (like the check for extra bytes at the end of the class file) are handy when actually using BCEL to repair a class file (otherwise you would not be
- * able to load it into BCEL).</P>
+ * (like the check for extra bytes at the end of the class file) are handy when actually using BCEL to repair a class file
+ * (otherwise you would not be able to load it into BCEL).</P>
*
* @see org.apache.commons.bcel6.Repository
*/
@@ -141,7 +153,8 @@ public final class Pass1Verifier extends
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()+"' does not match the file's name '"+myOwner.getClassName()+"'.");
+ throw new LoadingException("Wrong name: the internal name of the .class file '"+jc.getClassName()+
+ "' does not match the file's name '"+myOwner.getClassName()+"'.");
}
}
@@ -155,7 +168,8 @@ public final class Pass1Verifier extends
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));
+ return new VerificationResult(VerificationResult.VERIFIED_REJECTED, "Parsing via BCEL did not succeed. "+
+ e.getClass().getName()+" occured:\n"+Utility.getStackTrace(e));
}
if (jc != null){