More java5
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1517357 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/main/java/org/apache/maven/plugin/verifier/ConsoleVerificationResultPrinter.java b/src/main/java/org/apache/maven/plugin/verifier/ConsoleVerificationResultPrinter.java
index c20474c..7de03cb 100644
--- a/src/main/java/org/apache/maven/plugin/verifier/ConsoleVerificationResultPrinter.java
+++ b/src/main/java/org/apache/maven/plugin/verifier/ConsoleVerificationResultPrinter.java
@@ -42,31 +42,28 @@
private void printExistenceFailures( VerificationResult results )
{
- for ( Iterator i = results.getExistenceFailures().iterator(); i.hasNext(); )
- {
- org.apache.maven.plugin.verifier.model.File file = (org.apache.maven.plugin.verifier.model.File) i.next();
+ for (Object o : results.getExistenceFailures()) {
+ org.apache.maven.plugin.verifier.model.File file = (org.apache.maven.plugin.verifier.model.File) o;
- printMessage( "File not found [" + file.getLocation() + "]" );
+ printMessage("File not found [" + file.getLocation() + "]");
}
}
private void printNonExistenceFailures( VerificationResult results )
{
- for ( Iterator i = results.getNonExistenceFailures().iterator(); i.hasNext(); )
- {
- org.apache.maven.plugin.verifier.model.File file = (org.apache.maven.plugin.verifier.model.File) i.next();
+ for (Object o : results.getNonExistenceFailures()) {
+ org.apache.maven.plugin.verifier.model.File file = (org.apache.maven.plugin.verifier.model.File) o;
- printMessage( "File should not exist [" + file.getLocation() + "]" );
+ printMessage("File should not exist [" + file.getLocation() + "]");
}
}
private void printContentFailures( VerificationResult results )
{
- for ( Iterator i = results.getContentFailures().iterator(); i.hasNext(); )
- {
- org.apache.maven.plugin.verifier.model.File file = (org.apache.maven.plugin.verifier.model.File) i.next();
+ for (Object o : results.getContentFailures()) {
+ org.apache.maven.plugin.verifier.model.File file = (org.apache.maven.plugin.verifier.model.File) o;
- printMessage( "File [" + file.getLocation() + "] does not match regexp [" + file.getContains() + "]" );
+ printMessage("File [" + file.getLocation() + "] does not match regexp [" + file.getContains() + "]");
}
}
diff --git a/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java b/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java
index 23f6a70..fed01fa 100644
--- a/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java
+++ b/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java
@@ -186,7 +186,7 @@
private boolean verifyFileExistence( org.apache.maven.plugin.verifier.model.File fileCheck,
VerificationResult results )
{
- boolean result = false;
+ boolean result;
File physicalFile = new File( fileCheck.getLocation() );
if ( fileCheck.isExists() )
