Author: khmarbaise Date: Thu Dec 11 21:54:36 2014 New Revision: 1644777 URL: http://svn.apache.org/r1644777 Log: Make the code more Java 5 and remove warnings from the code.
Modified: maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarArtifactStub.java maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub.java Modified: maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java?rev=1644777&r1=1644776&r2=1644777&view=diff ============================================================================== --- maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java (original) +++ maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/RarMojoTest.java Thu Dec 11 21:54:36 2014 @@ -202,6 +202,8 @@ public class RarMojoTest assertTrue( entries.hasMoreElements() ); assertEquals( 0, getSizeOfExpectedFiles( entries, expectedFiles ) ); + + rar.close(); } public void testBasicRarWithManifest() @@ -275,9 +277,11 @@ public class RarMojoTest assertTrue( entries.hasMoreElements() ); assertEquals( 0, getSizeOfExpectedFiles( entries, expectedFiles ) ); + + rar.close(); } - private int getSizeOfExpectedFiles( Enumeration<? extends ZipEntry> entries, List expectedFiles ) + private int getSizeOfExpectedFiles( Enumeration<? extends ZipEntry> entries, List<String> expectedFiles ) { while ( entries.hasMoreElements() ) { @@ -296,7 +300,7 @@ public class RarMojoTest return expectedFiles.size(); } - private int getSizeOfExpectedFiles( List fileList, List expectedFiles ) + private int getSizeOfExpectedFiles( List<String> fileList, List<String> expectedFiles ) { for (Object aFileList : fileList) { String fileName = (String) aFileList; Modified: maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarArtifactStub.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarArtifactStub.java?rev=1644777&r1=1644776&r2=1644777&view=diff ============================================================================== --- maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarArtifactStub.java (original) +++ maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarArtifactStub.java Thu Dec 11 21:54:36 2014 @@ -43,8 +43,6 @@ public class RarArtifactStub private File file; - private ArtifactHandler artifactHandler; - public String getArtifactId() { return artifactId; Modified: maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub.java URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub.java?rev=1644777&r1=1644776&r2=1644777&view=diff ============================================================================== --- maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub.java (original) +++ maven/plugins/trunk/maven-rar-plugin/src/test/java/org/apache/maven/plugin/rar/stubs/RarMavenProjectStub.java Thu Dec 11 21:54:36 2014 @@ -40,7 +40,7 @@ import org.codehaus.plexus.PlexusTestCas public class RarMavenProjectStub extends MavenProject { - private List attachedArtifacts; + private List<Artifact> attachedArtifacts; public RarMavenProjectStub() { @@ -120,9 +120,9 @@ public class RarMavenProjectStub return artifact; } - public Set getArtifacts() + public Set<Artifact> getArtifacts() { - Set artifacts = new HashSet(); + Set<Artifact> artifacts = new HashSet<Artifact>(); artifacts.add( createArtifact( "org.apache.maven.test", "maven-artifact01", "1.0-SNAPSHOT", false ) ); artifacts.add( createArtifact( "org.apache.maven.test", "maven-artifact02", "1.0-SNAPSHOT", false ) ); @@ -130,11 +130,11 @@ public class RarMavenProjectStub return artifacts; } - public List getAttachedArtifacts() + public List<Artifact> getAttachedArtifacts() { if ( attachedArtifacts == null ) { - attachedArtifacts = new ArrayList(); + attachedArtifacts = new ArrayList<Artifact>(); } return attachedArtifacts; }