You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2011/09/20 23:47:42 UTC
svn commit: r1173398 - in
/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer:
ClassFileVisitorUtils.java DefaultProjectDependencyAnalyzer.java
ProjectDependencyAnalysis.java asm/DependencyVisitor.java
Author: hboutemy
Date: Tue Sep 20 21:47:42 2011
New Revision: 1173398
URL: http://svn.apache.org/viewvc?rev=1173398&view=rev
Log:
fixed code style
Modified:
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtils.java
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java
maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitor.java
Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtils.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtils.java?rev=1173398&r1=1173397&r2=1173398&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtils.java (original)
+++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ClassFileVisitorUtils.java Tue Sep 20 21:47:42 2011
@@ -101,7 +101,9 @@ public final class ClassFileVisitorUtils
String name = entry.getName();
if ( name.endsWith( ".class" ) )
+ {
visitClass( name, in, visitor );
+ }
}
in.close();
@@ -111,7 +113,9 @@ public final class ClassFileVisitorUtils
throws IOException
{
if ( !directory.isDirectory() )
+ {
throw new IllegalArgumentException( "File is not a directory" );
+ }
DirectoryScanner scanner = new DirectoryScanner();
@@ -122,9 +126,9 @@ public final class ClassFileVisitorUtils
String[] paths = scanner.getIncludedFiles();
- for ( int i = 0; i < paths.length; i++ )
+ for ( String path : paths )
{
- String path = paths[i].replace( File.separatorChar, '/' );
+ path = path.replace( File.separatorChar, '/' );
File file = new File( directory, path );
FileInputStream in = new FileInputStream( file );
@@ -138,7 +142,9 @@ public final class ClassFileVisitorUtils
private static void visitClass( String path, InputStream in, ClassFileVisitor visitor )
{
if ( !path.endsWith( ".class" ) )
+ {
throw new IllegalArgumentException( "Path is not a class" );
+ }
String className = path.substring( 0, path.length() - 6 );
Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java?rev=1173398&r1=1173397&r2=1173398&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java (original)
+++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/DefaultProjectDependencyAnalyzer.java Tue Sep 20 21:47:42 2011
@@ -73,9 +73,9 @@ public class DefaultProjectDependencyAna
Set<String> dependencyClasses = buildDependencyClasses( project, artifactClassMap );
Set<Artifact> declaredArtifacts = buildDeclaredArtifacts( project );
-
+
Set<Artifact> usedArtifacts = buildUsedArtifacts( artifactClassMap, dependencyClasses );
-
+
Set<Artifact> usedDeclaredArtifacts = new LinkedHashSet<Artifact>( declaredArtifacts );
usedDeclaredArtifacts.retainAll( usedArtifacts );
@@ -161,10 +161,10 @@ public class DefaultProjectDependencyAna
throws IOException
{
Set<String> dependencyClasses = new HashSet<String>();
-
+
String outputDirectory = project.getBuild().getOutputDirectory();
dependencyClasses.addAll( buildDependencyClasses( outputDirectory ) );
-
+
String testOutputDirectory = project.getBuild().getTestOutputDirectory();
dependencyClasses.addAll( buildDependencyClasses( testOutputDirectory ) );
@@ -182,12 +182,12 @@ public class DefaultProjectDependencyAna
private Set<Artifact> buildDeclaredArtifacts( MavenProject project )
{
Set<Artifact> declaredArtifacts = project.getDependencyArtifacts();
-
+
if ( declaredArtifacts == null )
{
declaredArtifacts = Collections.<Artifact>emptySet();
}
-
+
return declaredArtifacts;
}
@@ -204,7 +204,7 @@ public class DefaultProjectDependencyAna
usedArtifacts.add( artifact );
}
}
-
+
return usedArtifacts;
}
Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java?rev=1173398&r1=1173397&r2=1173398&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java (original)
+++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/ProjectDependencyAnalysis.java Tue Sep 20 21:47:42 2011
@@ -42,7 +42,7 @@ public class ProjectDependencyAnalysis
private final Set<Artifact> unusedDeclaredArtifacts;
// constructors -----------------------------------------------------------
-
+
public ProjectDependencyAnalysis()
{
this( null, null, null );
@@ -81,9 +81,9 @@ public class ProjectDependencyAnalysis
public int hashCode()
{
int hashCode = getUsedDeclaredArtifacts().hashCode();
- hashCode = (hashCode * 37) + getUsedUndeclaredArtifacts().hashCode();
- hashCode = (hashCode * 37) + getUnusedDeclaredArtifacts().hashCode();
-
+ hashCode = ( hashCode * 37 ) + getUsedUndeclaredArtifacts().hashCode();
+ hashCode = ( hashCode * 37 ) + getUnusedDeclaredArtifacts().hashCode();
+
return hashCode;
}
@@ -100,7 +100,7 @@ public class ProjectDependencyAnalysis
&& getUsedUndeclaredArtifacts().equals( analysis.getUsedUndeclaredArtifacts() )
&& getUnusedDeclaredArtifacts().equals( analysis.getUnusedDeclaredArtifacts() );
}
-
+
return false;
}
@@ -148,6 +148,7 @@ public class ProjectDependencyAnalysis
private Set<Artifact> safeCopy( Set<Artifact> set )
{
- return ( set == null ) ? Collections.<Artifact>emptySet() : Collections.unmodifiableSet( new LinkedHashSet<Artifact>( set ) );
+ return ( set == null ) ? Collections.<Artifact> emptySet()
+ : Collections.unmodifiableSet( new LinkedHashSet<Artifact>( set ) );
}
}
Modified: maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitor.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitor.java?rev=1173398&r1=1173397&r2=1173398&view=diff
==============================================================================
--- maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitor.java (original)
+++ maven/shared/trunk/maven-dependency-analyzer/src/main/java/org/apache/maven/shared/dependency/analyzer/asm/DependencyVisitor.java Tue Sep 20 21:47:42 2011
@@ -376,7 +376,9 @@ public class DependencyVisitor
public void visit( final String name, final Object value )
{
if ( value instanceof Type )
+ {
addType( (Type) value );
+ }
}
/*
@@ -569,7 +571,7 @@ public class DependencyVisitor
{
return;
}
-
+
for ( String name : names )
{
addName( name );
@@ -584,7 +586,7 @@ public class DependencyVisitor
private void addMethodDesc( final String desc )
{
addType( Type.getReturnType( desc ) );
-
+
Type[] types = Type.getArgumentTypes( desc );
for ( Type type : types )