Author: dennisl
Date: Thu Dec 16 22:53:04 2010
New Revision: 1050209
URL: http://svn.apache.org/viewvc?rev=1050209&view=rev
Log:
Fix issues reported by Checkstyle.
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AbstractAnnouncementMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ReleaseUtilsTestCase.java
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AbstractAnnouncementMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AbstractAnnouncementMojo.java?rev=1050209&r1=1050208&r2=1050209&view=diff
==============================================================================
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AbstractAnnouncementMojo.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AbstractAnnouncementMojo.java
Thu Dec 16 22:53:04 2010
@@ -28,7 +28,9 @@ import org.apache.maven.execution.MavenS
* @version $Id$
* @since 2.3
*/
-public abstract class AbstractAnnouncementMojo extends AbstractMojo {
+public abstract class AbstractAnnouncementMojo
+ extends AbstractMojo
+{
/**
* The current project base directory.
*
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java?rev=1050209&r1=1050208&r2=1050209&view=diff
==============================================================================
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/announcement/AnnouncementMojo.java
Thu Dec 16 22:53:04 2010
@@ -348,7 +348,8 @@ public class AnnouncementMojo
}
else
{
- throw new MojoExecutionException( "Something is wrong with
the Issue Management section. See previous error messages." );
+ throw new MojoExecutionException( "Something is wrong with
the Issue Management section."
+ + " See previous error messages." );
}
}
else
@@ -526,7 +527,8 @@ public class AnnouncementMojo
}
else
{
- throw new MojoExecutionException( "Something is wrong with the
Issue Management section. See previous error messages." );
+ throw new MojoExecutionException( "Something is wrong with the
Issue Management section."
+ + " See previous error messages." );
}
}
Modified:
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java?rev=1050209&r1=1050208&r2=1050209&view=diff
==============================================================================
---
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/main/java/org/apache/maven/plugin/changes/ReleaseUtils.java
Thu Dec 16 22:53:04 2010
@@ -1,15 +1,5 @@
package org.apache.maven.plugin.changes;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugins.changes.model.Action;
-import org.apache.maven.plugins.changes.model.Release;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -29,6 +19,16 @@ import org.apache.maven.plugins.changes.
* under the License.
*/
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.plugins.changes.model.Action;
+import org.apache.maven.plugins.changes.model.Release;
+
/**
* A utility class for working with Release objects.
*
@@ -99,10 +99,7 @@ public class ReleaseUtils
throw new MojoExecutionException( "Couldn't find the release '" +
pomVersion
+ "' among the supplied releases." );
}
- else
- {
- }
return release;
}
@@ -196,7 +193,7 @@ public class ReleaseUtils
firstRelease.getActions().addAll(
secondRelease.getActions() );
}
}
- mergedReleases.add(firstRelease);
+ mergedReleases.add( firstRelease );
}
// Handle releases that are only in the second issue tracker
@@ -206,7 +203,7 @@ public class ReleaseUtils
Release mergedRelease = getRelease( mergedReleases,
secondRelease.getVersion() );
if ( mergedRelease == null )
{
- mergedReleases.add(secondRelease);
+ mergedReleases.add( secondRelease );
}
}
return mergedReleases;
Modified:
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ReleaseUtilsTestCase.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ReleaseUtilsTestCase.java?rev=1050209&r1=1050208&r2=1050209&view=diff
==============================================================================
---
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ReleaseUtilsTestCase.java
(original)
+++
maven/plugins/trunk/maven-changes-plugin/src/test/java/org/apache/maven/plugin/changes/ReleaseUtilsTestCase.java
Thu Dec 16 22:53:04 2010
@@ -1,13 +1,5 @@
package org.apache.maven.plugin.changes;
-import java.util.ArrayList;
-import java.util.List;
-
-import junit.framework.TestCase;
-import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugin.testing.SilentLog;
-import org.apache.maven.plugins.changes.model.Release;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -27,6 +19,14 @@ import org.apache.maven.plugins.changes.
* under the License.
*/
+import java.util.ArrayList;
+import java.util.List;
+
+import junit.framework.TestCase;
+import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.plugin.testing.SilentLog;
+import org.apache.maven.plugins.changes.model.Release;
+
/**
* @author Dennis Lundberg
* @version $Id$
