You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2014/04/24 06:58:36 UTC
svn commit: r1589585 -
/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/
Author: olamy
Date: Thu Apr 24 04:58:35 2014
New Revision: 1589585
URL: http://svn.apache.org/r1589585
Log:
format
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultAnnotationVisitor.java
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultClassVisitor.java
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultFieldVisitor.java
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultSignatureVisitor.java
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ResultCollector.java
Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultAnnotationVisitor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultAnnotationVisitor.java?rev=1589585&r1=1589584&r2=1589585&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultAnnotationVisitor.java (original)
+++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultAnnotationVisitor.java Thu Apr 24 04:58:35 2014
@@ -26,17 +26,18 @@ import org.objectweb.asm.Type;
/**
* Computes the set of classes referenced by visited code.
* Inspired by <code>org.objectweb.asm.depend.DependencyVisitor</code> in the ASM dependencies example.
- *
+ *
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
* @version $Id$
*/
-public class DefaultAnnotationVisitor extends AnnotationVisitor
+public class DefaultAnnotationVisitor
+ extends AnnotationVisitor
{
private final ResultCollector resultCollector;
- public DefaultAnnotationVisitor(ResultCollector resultCollector)
+ public DefaultAnnotationVisitor( ResultCollector resultCollector )
{
- super(Opcodes.ASM5);
+ super( Opcodes.ASM5 );
this.resultCollector = resultCollector;
}
@@ -44,18 +45,18 @@ public class DefaultAnnotationVisitor ex
{
if ( value instanceof Type )
{
- resultCollector.addType((Type) value);
+ resultCollector.addType( (Type) value );
}
}
public void visitEnum( final String name, final String desc, final String value )
{
- resultCollector.addDesc(desc);
+ resultCollector.addDesc( desc );
}
public AnnotationVisitor visitAnnotation( final String name, final String desc )
{
- resultCollector.addDesc(desc);
+ resultCollector.addDesc( desc );
return this;
}
Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultClassVisitor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultClassVisitor.java?rev=1589585&r1=1589584&r2=1589585&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultClassVisitor.java (original)
+++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultClassVisitor.java Thu Apr 24 04:58:35 2014
@@ -19,7 +19,12 @@ package org.apache.maven.shared.dependen
* under the License.
*/
-import org.objectweb.asm.*;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
import org.objectweb.asm.signature.SignatureReader;
import org.objectweb.asm.signature.SignatureVisitor;
@@ -31,7 +36,8 @@ import org.objectweb.asm.signature.Signa
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
* @version $Id$
*/
-public class DefaultClassVisitor extends ClassVisitor
+public class DefaultClassVisitor
+ extends ClassVisitor
{
// fields -----------------------------------------------------------------
@@ -47,9 +53,11 @@ public class DefaultClassVisitor extends
// constructors -----------------------------------------------------------
- public DefaultClassVisitor(SignatureVisitor signatureVisitor, AnnotationVisitor annotationVisitor, FieldVisitor fieldVisitor, MethodVisitor methodVisitor, ResultCollector resultCollector)
+ public DefaultClassVisitor( SignatureVisitor signatureVisitor, AnnotationVisitor annotationVisitor,
+ FieldVisitor fieldVisitor, MethodVisitor methodVisitor,
+ ResultCollector resultCollector )
{
- super(Opcodes.ASM5);
+ super( Opcodes.ASM5 );
this.signatureVisitor = signatureVisitor;
this.annotationVisitor = annotationVisitor;
this.fieldVisitor = fieldVisitor;
@@ -62,8 +70,8 @@ public class DefaultClassVisitor extends
{
if ( signature == null )
{
- resultCollector.addName(superName);
- resultCollector.addNames(interfaces);
+ resultCollector.addName( superName );
+ resultCollector.addNames( interfaces );
}
else
{
@@ -73,8 +81,8 @@ public class DefaultClassVisitor extends
public AnnotationVisitor visitAnnotation( final String desc, final boolean visible )
{
- resultCollector.addDesc(desc);
-
+ resultCollector.addDesc( desc );
+
return annotationVisitor;
}
@@ -83,16 +91,16 @@ public class DefaultClassVisitor extends
{
if ( signature == null )
{
- resultCollector.addDesc(desc);
+ resultCollector.addDesc( desc );
}
else
{
- addTypeSignature(signature);
+ addTypeSignature( signature );
}
if ( value instanceof Type )
{
- resultCollector.addType((Type) value);
+ resultCollector.addType( (Type) value );
}
return fieldVisitor;
@@ -103,11 +111,11 @@ public class DefaultClassVisitor extends
{
if ( signature == null )
{
- resultCollector.addMethodDesc(desc);
+ resultCollector.addMethodDesc( desc );
}
else
{
- addSignature(signature);
+ addSignature( signature );
}
resultCollector.addNames( exceptions );
@@ -115,7 +123,6 @@ public class DefaultClassVisitor extends
return methodVisitor;
}
-
// private methods --------------------------------------------------------
private void addSignature( final String signature )
Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultFieldVisitor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultFieldVisitor.java?rev=1589585&r1=1589584&r2=1589585&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultFieldVisitor.java (original)
+++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultFieldVisitor.java Thu Apr 24 04:58:35 2014
@@ -26,25 +26,28 @@ import org.objectweb.asm.Opcodes;
/**
* Computes the set of classes referenced by visited code.
* Inspired by <code>org.objectweb.asm.depend.DependencyVisitor</code> in the ASM dependencies example.
- *
+ *
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
* @version $Id$
*/
-public class DefaultFieldVisitor extends FieldVisitor
+public class DefaultFieldVisitor
+ extends FieldVisitor
{
private final AnnotationVisitor annotationVisitor;
+
private final ResultCollector resultCollector;
- public DefaultFieldVisitor(AnnotationVisitor annotationVisitor, ResultCollector resultCollector)
+ public DefaultFieldVisitor( AnnotationVisitor annotationVisitor, ResultCollector resultCollector )
{
- super(Opcodes.ASM5);
+ super( Opcodes.ASM5 );
this.annotationVisitor = annotationVisitor;
this.resultCollector = resultCollector;
}
+
public AnnotationVisitor visitAnnotation( final String desc, final boolean visible )
{
- resultCollector.addDesc(desc);
-
+ resultCollector.addDesc( desc );
+
return annotationVisitor;
}
Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java?rev=1589585&r1=1589584&r2=1589585&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java (original)
+++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultMethodVisitor.java Thu Apr 24 04:58:35 2014
@@ -19,7 +19,11 @@ package org.apache.maven.shared.dependen
* under the License.
*/
-import org.objectweb.asm.*;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.Type;
import org.objectweb.asm.signature.SignatureReader;
import org.objectweb.asm.signature.SignatureVisitor;
@@ -27,19 +31,23 @@ import org.objectweb.asm.signature.Signa
/**
* Computes the set of classes referenced by visited code.
* Inspired by <code>org.objectweb.asm.depend.DependencyVisitor</code> in the ASM dependencies example.
- *
+ *
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
* @version $Id$
*/
-public class DefaultMethodVisitor extends MethodVisitor
+public class DefaultMethodVisitor
+ extends MethodVisitor
{
private final AnnotationVisitor annotationVisitor;
+
private final SignatureVisitor signatureVisitor;
+
private final ResultCollector resultCollector;
- public DefaultMethodVisitor(AnnotationVisitor annotationVisitor, SignatureVisitor signatureVisitor, ResultCollector resultCollector)
+ public DefaultMethodVisitor( AnnotationVisitor annotationVisitor, SignatureVisitor signatureVisitor,
+ ResultCollector resultCollector )
{
- super(Opcodes.ASM5);
+ super( Opcodes.ASM5 );
this.annotationVisitor = annotationVisitor;
this.signatureVisitor = signatureVisitor;
this.resultCollector = resultCollector;
@@ -47,15 +55,15 @@ public class DefaultMethodVisitor extend
public AnnotationVisitor visitAnnotation( final String desc, final boolean visible )
{
- resultCollector.addDesc(desc);
-
+ resultCollector.addDesc( desc );
+
return annotationVisitor;
}
public AnnotationVisitor visitParameterAnnotation( final int parameter, final String desc, final boolean visible )
{
- resultCollector.addDesc(desc);
+ resultCollector.addDesc( desc );
return annotationVisitor;
}
@@ -74,7 +82,7 @@ public class DefaultMethodVisitor extend
public void visitFieldInsn( final int opcode, final String owner, final String name, final String desc )
{
- resultCollector.addName(owner);
+ resultCollector.addName( owner );
/*
* NOTE: Merely accessing a field does not impose a direct dependency on its type. For example, the code line
* <code>java.lang.Object var = bean.field;</code> does not directly depend on the type of the field. A direct
@@ -104,7 +112,7 @@ public class DefaultMethodVisitor extend
public void visitMultiANewArrayInsn( final String desc, final int dims )
{
- resultCollector.addDesc(desc);
+ resultCollector.addDesc( desc );
}
public void visitTryCatchBlock( final Label start, final Label end, final Label handler, final String type )
Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultSignatureVisitor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultSignatureVisitor.java?rev=1589585&r1=1589584&r2=1589585&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultSignatureVisitor.java (original)
+++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DefaultSignatureVisitor.java Thu Apr 24 04:58:35 2014
@@ -22,33 +22,31 @@ package org.apache.maven.shared.dependen
import org.objectweb.asm.Opcodes;
import org.objectweb.asm.signature.SignatureVisitor;
-import java.util.HashSet;
-import java.util.Set;
-
/**
* Computes the set of classes referenced by visited code.
* Inspired by <code>org.objectweb.asm.depend.DependencyVisitor</code> in the ASM dependencies example.
- *
+ *
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
* @version $Id$
*/
-public class DefaultSignatureVisitor extends SignatureVisitor
+public class DefaultSignatureVisitor
+ extends SignatureVisitor
{
private final ResultCollector resultCollector;
- public DefaultSignatureVisitor(ResultCollector resultCollector)
+ public DefaultSignatureVisitor( ResultCollector resultCollector )
{
- super(Opcodes.ASM5);
+ super( Opcodes.ASM5 );
this.resultCollector = resultCollector;
}
public void visitClassType( final String name )
{
- resultCollector.addName(name);
+ resultCollector.addName( name );
}
public void visitInnerClassType( final String name )
{
- resultCollector.addName(name);
+ resultCollector.addName( name );
}
}
Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java?rev=1589585&r1=1589584&r2=1589585&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java (original)
+++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyClassFileVisitor.java Thu Apr 24 04:58:35 2014
@@ -19,18 +19,22 @@ package org.apache.maven.shared.dependen
* under the License.
*/
+import org.apache.maven.shared.dependency.analyzer.ClassFileVisitor;
+import org.objectweb.asm.AnnotationVisitor;
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.FieldVisitor;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.signature.SignatureVisitor;
+
import java.io.IOException;
import java.io.InputStream;
import java.util.Set;
-import org.apache.maven.shared.dependency.analyzer.ClassFileVisitor;
-import org.objectweb.asm.*;
-import org.objectweb.asm.signature.SignatureVisitor;
-
/**
* Computes the set of classes referenced by visited class files, using
* <a href="DependencyVisitor.html">DependencyVisitor</a>.
- *
+ *
* @author <a href="mailto:markhobson@gmail.com">Mark Hobson</a>
* @version $Id$
* @see #getDependencies()
@@ -60,12 +64,12 @@ public class DependencyClassFileVisitor
{
ClassReader reader = new ClassReader( in );
- AnnotationVisitor annotationVisitor = new DefaultAnnotationVisitor(resultCollector);
- SignatureVisitor signatureVisitor = new DefaultSignatureVisitor(resultCollector);
- FieldVisitor fieldVisitor = new DefaultFieldVisitor(annotationVisitor, resultCollector);
- MethodVisitor mv = new DefaultMethodVisitor(annotationVisitor, signatureVisitor, resultCollector);
- ClassVisitor classVisitor = new DefaultClassVisitor(signatureVisitor, annotationVisitor,
- fieldVisitor, mv, resultCollector);
+ AnnotationVisitor annotationVisitor = new DefaultAnnotationVisitor( resultCollector );
+ SignatureVisitor signatureVisitor = new DefaultSignatureVisitor( resultCollector );
+ FieldVisitor fieldVisitor = new DefaultFieldVisitor( annotationVisitor, resultCollector );
+ MethodVisitor mv = new DefaultMethodVisitor( annotationVisitor, signatureVisitor, resultCollector );
+ ClassVisitor classVisitor =
+ new DefaultClassVisitor( signatureVisitor, annotationVisitor, fieldVisitor, mv, resultCollector );
reader.accept( classVisitor, 0 );
}
@@ -84,7 +88,6 @@ public class DependencyClassFileVisitor
// public methods ---------------------------------------------------------
/**
- *
* @return the set of classes referenced by visited class files
*/
public Set<String> getDependencies()
Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ResultCollector.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ResultCollector.java?rev=1589585&r1=1589584&r2=1589585&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ResultCollector.java (original)
+++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/ResultCollector.java Thu Apr 24 04:58:35 2014
@@ -27,9 +27,11 @@ import java.util.Set;
/**
* @author Kristian Rosenvold
*/
-public class ResultCollector {
+public class ResultCollector
+{
private final Set<String> classes = new HashSet<String>();
+
;
public Set<String> getDependencies()
@@ -56,12 +58,12 @@ public class ResultCollector {
classes.add( name );
}
- void addDesc(final String desc)
+ void addDesc( final String desc )
{
- addType( Type.getType(desc) );
+ addType( Type.getType( desc ) );
}
- void addType(final Type t)
+ void addType( final Type t )
{
switch ( t.getSort() )
{
@@ -75,11 +77,12 @@ public class ResultCollector {
}
}
- public void add(String name) {
- classes.add( name);
+ public void add( String name )
+ {
+ classes.add( name );
}
- void addNames(final String[] names)
+ void addNames( final String[] names )
{
if ( names == null )
{
@@ -88,19 +91,19 @@ public class ResultCollector {
for ( String name : names )
{
- addName(name);
+ addName( name );
}
}
- void addMethodDesc(final String desc)
+ void addMethodDesc( final String desc )
{
- addType(Type.getReturnType(desc));
+ addType( Type.getReturnType( desc ) );
Type[] types = Type.getArgumentTypes( desc );
for ( Type type : types )
{
- addType(type);
+ addType( type );
}
}
}