Revert "Reformatted to code style"
Something creepy is going on @ localhost
This reverts commit 8858a32d7b5c59f230db137d8321ce2be254557b.
git-svn-id: https://svn.apache.org/repos/asf/maven/plugins/trunk@1517906 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 e7a9bec..65b2e05 100644
--- a/src/main/java/org/apache/maven/plugin/verifier/ConsoleVerificationResultPrinter.java
+++ b/src/main/java/org/apache/maven/plugin/verifier/ConsoleVerificationResultPrinter.java
@@ -40,31 +40,28 @@
private void printExistenceFailures( VerificationResult results )
{
- for ( Object o : results.getExistenceFailures() )
- {
+ 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 ( Object o : results.getNonExistenceFailures() )
- {
+ 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 ( Object o : results.getContentFailures() )
- {
+ 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 ac3cb8c..b00e9a0 100644
--- a/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java
+++ b/src/main/java/org/apache/maven/plugin/verifier/VerifierMojo.java
@@ -109,18 +109,14 @@
VerificationsXpp3Reader xppReader = new VerificationsXpp3Reader();
Verifications verifications = xppReader.read( reader );
- for ( org.apache.maven.plugin.verifier.model.File file : verifications.getFiles() )
- {
+ for (org.apache.maven.plugin.verifier.model.File file : verifications.getFiles()) {
// Transform the file to check into an absolute path prefixing the basedir if
// the location is relative
- if ( file.getLocation() != null )
- {
- file.setLocation( getAbsoluteFileToCheck( new File( file.getLocation() ) ).getPath() );
- verifyFile( file, results );
- }
- else
- {
- throw new MojoExecutionException( "Missing <location> element" );
+ if (file.getLocation() != null) {
+ file.setLocation(getAbsoluteFileToCheck(new File(file.getLocation())).getPath());
+ verifyFile(file, results);
+ } else {
+ throw new MojoExecutionException("Missing <location> element");
}
}
}
