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/03/27 17:51:44 UTC
svn commit: r1085967 - in /maven/plugins/trunk/maven-dependency-plugin/src:
main/java/org/apache/maven/plugin/dependency/utils/filters/
test/java/org/apache/maven/plugin/dependency/utils/filters/
Author: hboutemy
Date: Sun Mar 27 15:51:44 2011
New Revision: 1085967
URL: http://svn.apache.org/viewvc?rev=1085967&view=rev
Log:
reduced attributes visibility
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ResolveFileFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestDestFileFilter.java
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java?rev=1085967&r1=1085966&r2=1085967&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java Sun Mar 27 15:51:44 2011
@@ -38,24 +38,23 @@ public class DestFileFilter
extends AbstractArtifactsFilter
implements ArtifactItemFilter
{
+ private boolean overWriteReleases;
- boolean overWriteReleases;
+ private boolean overWriteSnapshots;
- boolean overWriteSnapshots;
+ private boolean overWriteIfNewer;
- boolean overWriteIfNewer;
+ private boolean useSubDirectoryPerArtifact;
- boolean useSubDirectoryPerArtifact;
+ private boolean useSubDirectoryPerType;
- boolean useSubDirectoryPerType;
+ private boolean useSubDirectoryPerScope;
- boolean useSubDirectoryPerScope;
+ private boolean useRepositoryLayout;
- boolean useRepositoryLayout;
+ private boolean removeVersion;
- boolean removeVersion;
-
- File outputFileDirectory;
+ private File outputFileDirectory;
public DestFileFilter( File outputFileDirectory )
{
@@ -270,8 +269,7 @@ public class DestFileFilter
destFile = new File( destFolder, item.getDestFileName() );
}
- return overWrite
- || ( !destFile.exists()
- || ( overWriteIfNewer && artifact.getFile().lastModified() > destFile.lastModified() ) );
+ return overWrite || !destFile.exists()
+ || ( overWriteIfNewer && artifact.getFile().lastModified() > destFile.lastModified() );
}
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java?rev=1085967&r1=1085966&r2=1085967&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java Sun Mar 27 15:51:44 2011
@@ -38,13 +38,13 @@ public class MarkerFileFilter
implements ArtifactItemFilter
{
- boolean overWriteReleases;
+ private boolean overWriteReleases;
- boolean overWriteSnapshots;
+ private boolean overWriteSnapshots;
- boolean overWriteIfNewer;
+ private boolean overWriteIfNewer;
- MarkerHandler handler;
+ protected final MarkerHandler handler;
public MarkerFileFilter( boolean overWriteReleases, boolean overWriteSnapshots, boolean overWriteIfNewer,
MarkerHandler handler )
@@ -89,7 +89,7 @@ public class MarkerFileFilter
try
{
- return overWrite || ( !handler.isMarkerSet() || ( overWriteIfNewer && handler.isMarkerOlder( artifact ) ) );
+ return overWrite || !handler.isMarkerSet() || ( overWriteIfNewer && handler.isMarkerOlder( artifact ) );
}
catch ( MojoExecutionException e )
{
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ResolveFileFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ResolveFileFilter.java?rev=1085967&r1=1085966&r2=1085967&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ResolveFileFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ResolveFileFilter.java Sun Mar 27 15:51:44 2011
@@ -47,7 +47,7 @@ public class ResolveFileFilter
}
catch ( MojoExecutionException e )
{
- throw new ArtifactFilterException( e.getMessage(),e);
+ throw new ArtifactFilterException( e.getMessage(), e );
}
}
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestDestFileFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestDestFileFilter.java?rev=1085967&r1=1085966&r2=1085967&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestDestFileFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestDestFileFilter.java Sun Mar 27 15:51:44 2011
@@ -99,7 +99,7 @@ public class TestDestFileFilter
createFile( artifact );
assertFalse( filter.isArtifactIncluded( artifact) );
- filter.overWriteReleases = true;
+ filter.setOverWriteReleases( true );
assertTrue( filter.isArtifactIncluded( artifact ) );
}
@@ -113,7 +113,7 @@ public class TestDestFileFilter
createFile( artifact );
assertFalse( filter.isArtifactIncluded( artifact ) );
- filter.overWriteSnapshots = true;
+ filter.setOverWriteSnapshots( true );
assertTrue( filter.isArtifactIncluded( artifact ) );
}
@@ -122,13 +122,13 @@ public class TestDestFileFilter
{
DestFileFilter filter = new DestFileFilter( outputFolder );
Artifact artifact = fact.getSnapshotArtifact();
- filter.removeVersion = true;
+ filter.setRemoveVersion( true );
assertTrue( filter.isArtifactIncluded( artifact) );
createFile( artifact, false, false, true );
assertFalse( filter.isArtifactIncluded( artifact ) );
- filter.overWriteSnapshots = true;
+ filter.setOverWriteSnapshots( true );
assertTrue( filter.isArtifactIncluded( artifact ) );
}
@@ -137,13 +137,13 @@ public class TestDestFileFilter
{
DestFileFilter filter = new DestFileFilter( outputFolder );
Artifact artifact = fact.getSnapshotArtifact();
- filter.useSubDirectoryPerArtifact = true;
+ filter.setUseSubDirectoryPerArtifact( true );
assertTrue( filter.isArtifactIncluded( artifact ) );
createFile( artifact, true, false, false );
assertFalse( filter.isArtifactIncluded( artifact ) );
- filter.overWriteSnapshots = true;
+ filter.setOverWriteSnapshots( true );
assertTrue( filter.isArtifactIncluded( artifact ) );
}
@@ -152,13 +152,13 @@ public class TestDestFileFilter
{
DestFileFilter filter = new DestFileFilter( outputFolder );
Artifact artifact = fact.getSnapshotArtifact();
- filter.useSubDirectoryPerType = true;
+ filter.setUseSubDirectoryPerType( true );
assertTrue( filter.isArtifactIncluded( artifact) );
createFile( artifact, false, true, false );
assertFalse( filter.isArtifactIncluded( artifact ) );
- filter.overWriteSnapshots = true;
+ filter.setOverWriteSnapshots( true );
assertTrue( filter.isArtifactIncluded( artifact ) );
}
@@ -171,7 +171,7 @@ public class TestDestFileFilter
Artifact artifact = fact.getSnapshotArtifact();
File artifactFile = artifact.getFile();
artifactFile.setLastModified( artifactFile.lastModified() );
- filter.overWriteIfNewer = true;
+ filter.setOverWriteIfNewer( true );
// should pass because the file doesn't exist yet.
assertTrue( filter.isArtifactIncluded( artifact) );