Author: mbenson
Date: Mon Mar 3 16:55:35 2014
New Revision: 1573610
URL: http://svn.apache.org/r1573610
Log:
checkstyle/PMD
Modified:
commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/ActionGenerator.java
commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/InlineNestedPrivilegedCalls.java
commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/Weavable.java
Modified:
commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
URL:
http://svn.apache.org/viewvc/commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java?rev=1573610&r1=1573609&r2=1573610&view=diff
==============================================================================
---
commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
(original)
+++
commons/proper/weaver/trunk/modules/normalizer/weaver/src/main/java/org/apache/commons/weaver/normalizer/Normalizer.java
Mon Mar 3 16:55:35 2014
@@ -97,7 +97,8 @@ public class Normalizer {
}
@Override
- public void visit(final int version, final int access, final String
name, final String signature, final String superName, final String[] intrfces) {
+ public void visit(final int version, final int access, final String
name, final String signature,
+ final String superName, final String[] intrfces) {
super.visit(version, access, name, signature, superName, intrfces);
className = name;
}
@@ -242,20 +243,22 @@ public class Normalizer {
new RemappingClassAdapter(new WriteClass(reader),
remapper) {
@Override
- public void visitInnerClass(final String name, final
String outerName, final String innerName, final int access) {
+ public void visitInnerClass(final String name, final
String outerName, final String innerName,
+ final int access) {
if (!classMap.containsKey(name)) {
super.visitInnerClass(name, outerName, innerName,
access);
}
}
@Override
- public MethodVisitor visitMethod(final int access, final
String name, final String desc, final String signature,
- final String[] exceptions) {
+ public MethodVisitor visitMethod(final int access, final
String name, final String desc,
+ final String signature, final String[] exceptions) {
final MethodVisitor mv = // NOPMD
super.visitMethod(access, name, desc,
signature, exceptions);
return new MethodVisitor(Opcodes.ASM4, mv) {
@Override
- public void visitMethodInsn(final int opcode,
final String owner, final String name, final String desc) {
+ public void visitMethodInsn(final int opcode,
final String owner, final String name,
+ final String desc) {
String useDescriptor = desc;
if (INIT.equals(name)) {
final ClassWrapper wrapper =
entry.getValue().get(owner);
@@ -496,7 +499,8 @@ public class Normalizer {
{
final GeneratorAdapter mgen =
- new GeneratorAdapter(Opcodes.ACC_PUBLIC,
staticCtor, signature, exceptionTypes, writeClass);
+ new GeneratorAdapter(Opcodes.ACC_PUBLIC,
staticCtor, signature, exceptionTypes,
+ writeClass);
mgen.visitCode();
mgen.loadThis();
for (int i = 0; i < argumentTypes.length; i++) {
@@ -516,7 +520,8 @@ public class Normalizer {
final Method instanceCtor =
new Method(INIT, Type.VOID_TYPE,
ArrayUtils.add(argumentTypes, 0, OBJECT_TYPE));
final GeneratorAdapter mgen =
- new GeneratorAdapter(Opcodes.ACC_PUBLIC,
instanceCtor, signature, exceptionTypes, writeClass);
+ new GeneratorAdapter(Opcodes.ACC_PUBLIC,
instanceCtor, signature, exceptionTypes,
+ writeClass);
mgen.visitCode();
mgen.loadThis();
for (int i = 0; i < argumentTypes.length; i++) {
Modified:
commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/ActionGenerator.java
URL:
http://svn.apache.org/viewvc/commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/ActionGenerator.java?rev=1573610&r1=1573609&r2=1573610&view=diff
==============================================================================
---
commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/ActionGenerator.java
(original)
+++
commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/ActionGenerator.java
Mon Mar 3 16:55:35 2014
@@ -85,7 +85,8 @@ class ActionGenerator extends Privilizer
this.impl = new Method(implName, methd.getDescriptor());
this.implIsStatic = Modifier.isStatic(access);
- final Type[] args = implIsStatic ? methd.getArgumentTypes() :
ArrayUtils.add(methd.getArgumentTypes(), 0, owner.target);
+ final Type[] args =
+ implIsStatic ? methd.getArgumentTypes() :
ArrayUtils.add(methd.getArgumentTypes(), 0, owner.target);
this.helper = new Method(privilizer().generateName("access$" + index),
methd.getReturnType(), args);
this.result = privilizer().wrap(methd.getReturnType());
this.fields = fields(args);
Modified:
commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/InlineNestedPrivilegedCalls.java
URL:
http://svn.apache.org/viewvc/commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/InlineNestedPrivilegedCalls.java?rev=1573610&r1=1573609&r2=1573610&view=diff
==============================================================================
---
commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/InlineNestedPrivilegedCalls.java
(original)
+++
commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/InlineNestedPrivilegedCalls.java
Mon Mar 3 16:55:35 2014
@@ -71,7 +71,8 @@ class InlineNestedPrivilegedCalls extend
}
return new MethodVisitor(Opcodes.ASM4, orig) {
@Override
- public void visitMethodInsn(final int opcode, final String
owner, final String name, final String desc) {
+ public void visitMethodInsn(final int opcode, final String
owner, final String name,
+ final String desc) {
String useName = name;
if
(owner.equals(InlineNestedPrivilegedCalls.this.name)) {
final Method methd = new Method(name, desc);
Modified:
commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
URL:
http://svn.apache.org/viewvc/commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java?rev=1573610&r1=1573609&r2=1573610&view=diff
==============================================================================
---
commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
(original)
+++
commons/proper/weaver/trunk/modules/privilizer/weaver/src/main/java/org/apache/commons/weaver/privilizer/Privilizer.java
Mon Mar 3 16:55:35 2014
@@ -65,8 +65,8 @@ public class Privilizer {
}
@Override
- public void visit(final int version, final int access, final String
name, final String signature, final String superName,
- final String[] interfaces) {
+ public void visit(final int version, final int access, final String
name, final String signature,
+ final String superName, final String[] interfaces) {
super.visit(version, access, name, signature, superName,
interfaces);
className = name;
target = Type.getObjectType(name);
@@ -237,7 +237,8 @@ public class Privilizer {
final Set<String> innerNames = new HashSet<String>();
@Override
- public void visitInnerClass(final String name, final String
outerName, final String innerName, final int access) {
+ public void visitInnerClass(final String name, final String
outerName, final String innerName,
+ final int access) {
super.visitInnerClass(name, outerName, innerName, access);
Validate.validState(innerNames.add(innerName), "%s already
defined", innerName);
}
Modified:
commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/Weavable.java
URL:
http://svn.apache.org/viewvc/commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/Weavable.java?rev=1573610&r1=1573609&r2=1573610&view=diff
==============================================================================
---
commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/Weavable.java
(original)
+++
commons/proper/weaver/trunk/processor/src/main/java/org/apache/commons/weaver/model/Weavable.java
Mon Mar 3 16:55:35 2014
@@ -160,7 +160,7 @@ public abstract class Weavable<SELF exte
* {@inheritDoc}
*/
@Override
- public boolean equals(Object obj) {
+ public boolean equals(final Object obj) {
if (obj == this) {
return true;
}
