diff --git a/main/src/mockit/external/asm/AnnotationVisitor.java b/main/src/mockit/external/asm/AnnotationVisitor.java index f231eb4b8..2a15b8957 100644 --- a/main/src/mockit/external/asm/AnnotationVisitor.java +++ b/main/src/mockit/external/asm/AnnotationVisitor.java @@ -1,32 +1,3 @@ -/* - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2011 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ package mockit.external.asm; import javax.annotation.*; @@ -40,12 +11,12 @@ public abstract class AnnotationVisitor /** * Next annotation visitor. This field is used to store annotation lists. */ - @Nullable AnnotationWriter next; + @SuppressWarnings("ClassReferencesSubclass") @Nullable AnnotationWriter next; /** * Previous annotation visitor. This field is used to store annotation lists. */ - @Nullable AnnotationWriter prev; + @SuppressWarnings("ClassReferencesSubclass") @Nullable AnnotationWriter prev; /** * Constructs a new AnnotationVisitor. diff --git a/main/src/mockit/external/asm/AnnotationWriter.java b/main/src/mockit/external/asm/AnnotationWriter.java index 957d0738b..d60b98e99 100644 --- a/main/src/mockit/external/asm/AnnotationWriter.java +++ b/main/src/mockit/external/asm/AnnotationWriter.java @@ -1,32 +1,3 @@ -/* - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2011 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ package mockit.external.asm; import java.lang.reflect.*; diff --git a/main/src/mockit/external/asm/ArrayType.java b/main/src/mockit/external/asm/ArrayType.java index ef0022edc..eef5c837c 100644 --- a/main/src/mockit/external/asm/ArrayType.java +++ b/main/src/mockit/external/asm/ArrayType.java @@ -9,6 +9,12 @@ public static ArrayType create(@Nonnull String typeDesc) { return new ArrayType(typeDesc.toCharArray()); } + /** + * Constructs an array type. + * + * @param buf a buffer containing the descriptor of the array type. + * @param off the offset of the descriptor in the buffer. + */ @Nonnull static ArrayType create(@Nonnull char[] buf, @Nonnegative int off) { int len = findNumberOfDimensions(buf, off); @@ -31,16 +37,9 @@ private static int findNumberOfDimensions(@Nonnull char[] buf, @Nonnegative int return dimensions; } - ArrayType(@Nonnull char[] buf) { super(buf); } + private ArrayType(@Nonnull char[] buf, @Nonnegative int off, @Nonnegative int len) { super(buf, off, len); } - /** - * Constructs an array type. - * - * @param buf a buffer containing the descriptor of the array type. - * @param off the offset of the descriptor in the buffer. - * @param len the length of the descriptor. - */ - ArrayType(@Nonnull char[] buf, @Nonnegative int off, @Nonnegative int len) { super(buf, off, len); } + ArrayType(@Nonnull char[] buf) { super(buf); } /** * Returns the number of dimensions of this array type. diff --git a/main/src/mockit/external/asm/ByteVector.java b/main/src/mockit/external/asm/ByteVector.java index a66b4c977..db61f670b 100644 --- a/main/src/mockit/external/asm/ByteVector.java +++ b/main/src/mockit/external/asm/ByteVector.java @@ -1,32 +1,3 @@ -/* - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2011 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ package mockit.external.asm; import javax.annotation.*; diff --git a/main/src/mockit/external/asm/ClassReader.java b/main/src/mockit/external/asm/ClassReader.java index a0ac19492..4dfd0eb96 100644 --- a/main/src/mockit/external/asm/ClassReader.java +++ b/main/src/mockit/external/asm/ClassReader.java @@ -1,32 +1,3 @@ -/* - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2011 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ package mockit.external.asm; import javax.annotation.*; @@ -38,8 +9,7 @@ */ public final class ClassReader extends AnnotatedReader { - public interface Flags - { + public interface Flags { /** * Flag to skip method code. If this class is set CODE attribute won't be visited. * This can be used, for example, to retrieve annotations for methods and method parameters. diff --git a/main/src/mockit/external/asm/ClassVisitor.java b/main/src/mockit/external/asm/ClassVisitor.java index 2172ccb44..93298cfb5 100644 --- a/main/src/mockit/external/asm/ClassVisitor.java +++ b/main/src/mockit/external/asm/ClassVisitor.java @@ -1,32 +1,3 @@ -/* - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2011 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ package mockit.external.asm; import javax.annotation.*; @@ -58,8 +29,8 @@ protected ClassVisitor() {} * @param interfaces the internal names of the class's interfaces. */ public void visit( - int version, int access, @Nonnull String name, @Nullable String signature, @Nullable String superName, - @Nullable String[] interfaces) {} + int version, int access, @Nonnull String name, @Nullable String signature, @Nullable String superName, @Nullable String[] interfaces + ) {} /** * Visits the source of the class. @@ -89,8 +60,7 @@ public void visitOuterClass(@Nonnull String owner, @Nullable String name, @Nulla * anonymous inner classes. * @param access the access flags of the inner class as originally declared in the enclosing class. */ - public void visitInnerClass(@Nonnull String name, @Nullable String outerName, @Nullable String innerName, int access) - {} + public void visitInnerClass(@Nonnull String name, @Nullable String outerName, @Nullable String innerName, int access) {} /** * Visits a field of the class. diff --git a/main/src/mockit/external/asm/ClassWriter.java b/main/src/mockit/external/asm/ClassWriter.java index 6a2d2bfb2..23682ec23 100644 --- a/main/src/mockit/external/asm/ClassWriter.java +++ b/main/src/mockit/external/asm/ClassWriter.java @@ -1,32 +1,3 @@ -/* - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2011 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ package mockit.external.asm; import java.util.*; diff --git a/main/src/mockit/external/asm/Edge.java b/main/src/mockit/external/asm/Edge.java index be562c7de..c4a422ff8 100644 --- a/main/src/mockit/external/asm/Edge.java +++ b/main/src/mockit/external/asm/Edge.java @@ -1,32 +1,3 @@ -/* - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2011 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ package mockit.external.asm; import javax.annotation.*; diff --git a/main/src/mockit/external/asm/ExceptionHandler.java b/main/src/mockit/external/asm/ExceptionHandler.java index 54d3a3c34..f21c2f4ed 100644 --- a/main/src/mockit/external/asm/ExceptionHandler.java +++ b/main/src/mockit/external/asm/ExceptionHandler.java @@ -1,32 +1,3 @@ -/* - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2011 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ package mockit.external.asm; import javax.annotation.*; @@ -67,9 +38,7 @@ final class ExceptionHandler */ @Nullable ExceptionHandler next; - ExceptionHandler( - @Nonnull Label start, @Nonnull Label end, @Nonnull Label handler, @Nullable String desc, @Nonnegative int type - ) { + ExceptionHandler(@Nonnull Label start, @Nonnull Label end, @Nonnull Label handler, @Nullable String desc, @Nonnegative int type) { this.start = start; this.end = end; this.handler = handler; diff --git a/main/src/mockit/external/asm/FieldVisitor.java b/main/src/mockit/external/asm/FieldVisitor.java index d69713712..e06458d65 100644 --- a/main/src/mockit/external/asm/FieldVisitor.java +++ b/main/src/mockit/external/asm/FieldVisitor.java @@ -1,32 +1,3 @@ -/* - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2011 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ package mockit.external.asm; /** @@ -35,5 +6,5 @@ */ public class FieldVisitor extends BaseWriter { - protected FieldVisitor() {} + FieldVisitor() {} } diff --git a/main/src/mockit/external/asm/FieldWriter.java b/main/src/mockit/external/asm/FieldWriter.java index 2a9059d71..3297d7945 100644 --- a/main/src/mockit/external/asm/FieldWriter.java +++ b/main/src/mockit/external/asm/FieldWriter.java @@ -1,32 +1,3 @@ -/* - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2011 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ package mockit.external.asm; import javax.annotation.*; @@ -64,8 +35,7 @@ final class FieldWriter extends FieldVisitor * @param value the field's constant value. */ FieldWriter( - @Nonnull ClassWriter cw, int access, @Nonnull String name, @Nonnull String desc, @Nullable String signature, - @Nullable Object value + @Nonnull ClassWriter cw, int access, @Nonnull String name, @Nonnull String desc, @Nullable String signature, @Nullable Object value ) { cp = cw.cp; this.access = access; diff --git a/main/src/mockit/external/asm/Frame.java b/main/src/mockit/external/asm/Frame.java index 36ae32c01..615e03de2 100644 --- a/main/src/mockit/external/asm/Frame.java +++ b/main/src/mockit/external/asm/Frame.java @@ -1,32 +1,3 @@ -/* - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2011 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ package mockit.external.asm; import javax.annotation.*; @@ -75,8 +46,7 @@ public final class Frame // whose effect would be dependent on the actual type values if types were always represented by a single slot in the // stack (and this is not possible, since actual type values are not always known - cf LOCAL and STACK type kinds). - interface TypeMask - { + interface TypeMask { /** * Mask to get the dimension of a frame type. This dimension is a signed integer between -8 and 7. */ diff --git a/main/src/mockit/external/asm/FrameAndStackComputation.java b/main/src/mockit/external/asm/FrameAndStackComputation.java index 450eda153..10c8f3ee8 100644 --- a/main/src/mockit/external/asm/FrameAndStackComputation.java +++ b/main/src/mockit/external/asm/FrameAndStackComputation.java @@ -253,9 +253,7 @@ else if (currentFrameLocalsSize == localsSize && currentFrameStackSize == 1) { } } - private void writeFrameForOldVersionOfJava( - @Nonnegative int currentFrameLocalsSize, @Nonnegative int currentFrameStackSize - ) { + private void writeFrameForOldVersionOfJava(@Nonnegative int currentFrameLocalsSize, @Nonnegative int currentFrameStackSize) { stackMap.putShort(getInstructionOffset()).putShort(currentFrameLocalsSize); writeFrameTypes(3, 3 + currentFrameLocalsSize); diff --git a/main/src/mockit/external/asm/Item.java b/main/src/mockit/external/asm/Item.java index bec9ac510..ad179a3fc 100644 --- a/main/src/mockit/external/asm/Item.java +++ b/main/src/mockit/external/asm/Item.java @@ -1,32 +1,3 @@ -/* - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2011 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ package mockit.external.asm; import javax.annotation.*; @@ -39,8 +10,7 @@ abstract class Item /** * Constants for types of items in the constant pool of a class. */ - interface Type - { + interface Type { int CLASS = 7; // CONSTANT_Class int FIELD = 9; // CONSTANT_Fieldref int METH = 10; // CONSTANT_Methodref diff --git a/main/src/mockit/external/asm/JavaType.java b/main/src/mockit/external/asm/JavaType.java index 053859402..3200f5b93 100644 --- a/main/src/mockit/external/asm/JavaType.java +++ b/main/src/mockit/external/asm/JavaType.java @@ -6,6 +6,7 @@ /** * A Java field or method type. This class can be used to make it easier to manipulate type and method descriptors. */ +@SuppressWarnings("ClassReferencesSubclass") public abstract class JavaType { /** diff --git a/main/src/mockit/external/asm/Label.java b/main/src/mockit/external/asm/Label.java index 9f09eee6b..b87fc8917 100644 --- a/main/src/mockit/external/asm/Label.java +++ b/main/src/mockit/external/asm/Label.java @@ -1,32 +1,3 @@ -/* - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2011 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ package mockit.external.asm; import javax.annotation.*; @@ -42,8 +13,7 @@ public final class Label /** * Constants for the current status of a label. */ - interface Status - { + interface Status { /** * Indicates if this label is only used for debug attributes. Such a label is not the start of a basic block, the * target of a jump instruction, or an exception handler. It can be safely ignored in control flow graph analysis @@ -85,7 +55,7 @@ interface Status /** * Flags that indicate the {@link Status} of this label. */ - int status; + private int status; /** * The line number corresponding to this label, if known. @@ -193,10 +163,6 @@ interface Status void markAsTarget(@Nonnull Label target) { status |= target.status & Status.TARGET; } - // ------------------------------------------------------------------------ - // Methods to compute offsets and to manage forward references - // ------------------------------------------------------------------------ - /** * Puts a reference to this label in the bytecode of a method. If the position of the label is known, the offset is * computed and written directly. Otherwise, a null offset is written and a new forward reference is declared for @@ -209,24 +175,24 @@ interface Status * @throws IllegalArgumentException if this label has not been created by the given code writer. */ void put(@Nonnull ByteVector out, @Nonnegative int source, boolean wideOffset) { - if (!isResolved()) { + if (isResolved()) { + int reference = position - source; + if (wideOffset) { - addReference(-1 - source, out.length); - out.putInt(-1); + out.putInt(reference); } else { - addReference(source, out.length); - out.putShort(-1); + out.putShort(reference); } } else { - int reference = position - source; - if (wideOffset) { - out.putInt(reference); + addReference(-1 - source, out.length); + out.putInt(-1); } else { - out.putShort(reference); + addReference(source, out.length); + out.putShort(-1); } } } @@ -301,10 +267,6 @@ Label getFirst() { return frame == null ? this : frame.owner; } - // ------------------------------------------------------------------------ - // Overridden Object methods - // ------------------------------------------------------------------------ - @Override public String toString() { return "L" + System.identityHashCode(this); diff --git a/main/src/mockit/external/asm/LocalVariables.java b/main/src/mockit/external/asm/LocalVariables.java index 55d8441cd..5f2fe4520 100644 --- a/main/src/mockit/external/asm/LocalVariables.java +++ b/main/src/mockit/external/asm/LocalVariables.java @@ -48,8 +48,8 @@ int addLocalVariable( @Nonnull private ByteVector addAttribute( - @Nullable ByteVector attribute, @Nonnull String name, @Nonnull String desc, - @Nonnull Label start, @Nonnull Label end, @Nonnegative int index + @Nullable ByteVector attribute, @Nonnull String name, @Nonnull String desc, @Nonnull Label start, @Nonnull Label end, + @Nonnegative int index ) { if (attribute == null) { attribute = new ByteVector(); @@ -93,10 +93,7 @@ void put(@Nonnull ByteVector out) { put(out, "LocalVariableTypeTable", localVarTypeTable, localVarTypeCount); } - private void put( - @Nonnull ByteVector out, @Nonnull String attributeName, @Nullable ByteVector attribute, - @Nonnegative int numEntries - ) { + private void put(@Nonnull ByteVector out, @Nonnull String attributeName, @Nullable ByteVector attribute, @Nonnegative int numEntries) { if (attribute != null) { out.putShort(cp.newUTF8(attributeName)); out.putInt(attribute.length + 2).putShort(numEntries); diff --git a/main/src/mockit/external/asm/MethodHandle.java b/main/src/mockit/external/asm/MethodHandle.java index 12ecc8fb5..ea24d68d4 100644 --- a/main/src/mockit/external/asm/MethodHandle.java +++ b/main/src/mockit/external/asm/MethodHandle.java @@ -1,32 +1,3 @@ -/* - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2011 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ package mockit.external.asm; import javax.annotation.*; diff --git a/main/src/mockit/external/asm/MethodReader.java b/main/src/mockit/external/asm/MethodReader.java index 71d73641a..bade6cf56 100644 --- a/main/src/mockit/external/asm/MethodReader.java +++ b/main/src/mockit/external/asm/MethodReader.java @@ -15,8 +15,7 @@ final class MethodReader extends AnnotatedReader * short), on whether it takes a local variable index, a jump target label, etc. Some types contain a single * instruction, such as LDC and IINC. */ - interface InstructionType - { + interface InstructionType { int NOARG = 0; // instructions without any argument int SBYTE = 1; // instructions with a signed byte argument int SHORT = 2; // instructions with a signed short argument diff --git a/main/src/mockit/external/asm/MethodVisitor.java b/main/src/mockit/external/asm/MethodVisitor.java index b59ebaac8..074c00b5e 100644 --- a/main/src/mockit/external/asm/MethodVisitor.java +++ b/main/src/mockit/external/asm/MethodVisitor.java @@ -1,32 +1,3 @@ -/* - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2011 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ package mockit.external.asm; import javax.annotation.*; @@ -138,8 +109,7 @@ public void visitFieldInsn(int opcode, @Nonnull String owner, @Nonnull String na * @param desc the method's descriptor (see {@link JavaType}). * @param itf whether the method's owner class is an interface or not. */ - public void visitMethodInsn( - int opcode, @Nonnull String owner, @Nonnull String name, @Nonnull String desc, boolean itf) {} + public void visitMethodInsn(int opcode, @Nonnull String owner, @Nonnull String name, @Nonnull String desc, boolean itf) {} /** * Visits an {@link Opcodes#INVOKEDYNAMIC INVOKEDYNAMIC} instruction. @@ -150,8 +120,7 @@ public void visitMethodInsn( * @param bsmArgs the bootstrap method constant arguments. Each argument must be an {@link Integer}, {@link Float}, * {@link Long}, {@link Double}, {@link String}, {@link JavaType}, or {@link MethodHandle} value. */ - public void visitInvokeDynamicInsn( - @Nonnull String name, @Nonnull String desc, @Nonnull MethodHandle bsm, @Nonnull Object... bsmArgs) {} + public void visitInvokeDynamicInsn(@Nonnull String name, @Nonnull String desc, @Nonnull MethodHandle bsm, @Nonnull Object... bsmArgs) {} /** * Visits a jump instruction. A jump instruction is an instruction that may jump to another instruction. diff --git a/main/src/mockit/external/asm/ObjectType.java b/main/src/mockit/external/asm/ObjectType.java index 009f4d8ed..6ac8116ab 100644 --- a/main/src/mockit/external/asm/ObjectType.java +++ b/main/src/mockit/external/asm/ObjectType.java @@ -9,22 +9,21 @@ public static ObjectType create(@Nonnull String internalName) { return new ObjectType(internalName.toCharArray()); } + /** + * Constructs an object reference type. + * + * @param buf a buffer containing the descriptor of the type. + * @param off the offset of the descriptor in the buffer. + */ @Nonnull static ObjectType create(@Nonnull char[] buf, @Nonnegative int off) { int len = findTypeNameLength(buf, off, 0); return new ObjectType(buf, off + 1, len - 1); } - ObjectType(@Nonnull char[] buf) { super(buf); } + private ObjectType(@Nonnull char[] buf, @Nonnegative int off, @Nonnegative int len) { super(buf, off, len); } - /** - * Constructs an object reference type. - * - * @param buf a buffer containing the descriptor of the type. - * @param off the offset of the descriptor in the buffer. - * @param len the length of the descriptor. - */ - ObjectType(@Nonnull char[] buf, @Nonnegative int off, @Nonnegative int len) { super(buf, off, len); } + ObjectType(@Nonnull char[] buf) { super(buf); } @Override void getDescriptor(@Nonnull StringBuilder buf) { diff --git a/main/src/mockit/external/asm/Opcodes.java b/main/src/mockit/external/asm/Opcodes.java index 7f9e4db70..0ef3b7a6f 100644 --- a/main/src/mockit/external/asm/Opcodes.java +++ b/main/src/mockit/external/asm/Opcodes.java @@ -1,32 +1,3 @@ -/* - * ASM: a very small and fast Java bytecode manipulation framework - * Copyright (c) 2000-2011 INRIA, France Telecom - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. Neither the name of the copyright holders nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - * THE POSSIBILITY OF SUCH DAMAGE. - */ package mockit.external.asm; /** diff --git a/main/src/mockit/external/asm/OuterClassWriter.java b/main/src/mockit/external/asm/OuterClassWriter.java index 289e85b7a..df9e8ef91 100644 --- a/main/src/mockit/external/asm/OuterClassWriter.java +++ b/main/src/mockit/external/asm/OuterClassWriter.java @@ -14,9 +14,7 @@ final class OuterClassWriter extends AttributeWriter */ @Nonnegative private final int enclosingMethod; - OuterClassWriter( - @Nonnull ConstantPoolGeneration cp, @Nonnull String owner, @Nullable String name, @Nullable String desc - ) { + OuterClassWriter(@Nonnull ConstantPoolGeneration cp, @Nonnull String owner, @Nullable String name, @Nullable String desc) { super(cp, "EnclosingMethod"); enclosingMethodOwner = cp.newClass(owner); enclosingMethod = name != null && desc != null ? cp.newNameType(name, desc) : 0; diff --git a/main/src/mockit/external/asm/TypeTableItem.java b/main/src/mockit/external/asm/TypeTableItem.java index 58d9ad3e2..941ec8b83 100644 --- a/main/src/mockit/external/asm/TypeTableItem.java +++ b/main/src/mockit/external/asm/TypeTableItem.java @@ -10,8 +10,7 @@ abstract class TypeTableItem extends Item * constant pool, in order to avoid clashes with normal constant pool items in the * {@linkplain ConstantPoolGeneration#items constant pool's hash table}. */ - interface SpecialType - { + interface SpecialType { int NORMAL = 30; int UNINIT = 31; int MERGED = 32; diff --git a/main/src/mockit/external/asm/WrappingClassVisitor.java b/main/src/mockit/external/asm/WrappingClassVisitor.java index 1822441a0..89ab4dae1 100644 --- a/main/src/mockit/external/asm/WrappingClassVisitor.java +++ b/main/src/mockit/external/asm/WrappingClassVisitor.java @@ -21,8 +21,7 @@ public class WrappingClassVisitor extends ClassVisitor @Override public void visit( - int version, int access, @Nonnull String name, @Nullable String signature, @Nullable String superName, - @Nullable String[] interfaces + int version, int access, @Nonnull String name, @Nullable String signature, @Nullable String superName, @Nullable String[] interfaces ) { cw.visit(version, access, name, signature, superName, interfaces); } @@ -43,9 +42,7 @@ public AnnotationVisitor visitAnnotation(@Nonnull String desc) { } @Override - public void visitInnerClass( - @Nonnull String name, @Nullable String outerName, @Nullable String innerName, int access - ) { + public void visitInnerClass(@Nonnull String name, @Nullable String outerName, @Nullable String innerName, int access) { cw.visitInnerClass(name, outerName, innerName, access); }