You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2008/03/11 00:44:36 UTC
svn commit: r635762 - in
/maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter:
./ plugins/ relocators/
Author: dennisl
Date: Mon Mar 10 16:44:31 2008
New Revision: 635762
URL: http://svn.apache.org/viewvc?rev=635762&view=rev
Log:
o Fix errors reported by Checkstyle.
Modified:
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ArtifactPomRewriter.java
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ModelUtils.java
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PluginComparator.java
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PomV3ToV4Translator.java
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ReportPluginComparator.java
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCTaglist.java
maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/AbstractPluginRelocator.java
Modified: maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ArtifactPomRewriter.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ArtifactPomRewriter.java?rev=635762&r1=635761&r2=635762&view=diff
==============================================================================
--- maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ArtifactPomRewriter.java (original)
+++ maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ArtifactPomRewriter.java Mon Mar 10 16:44:31 2008
@@ -28,14 +28,14 @@
*/
public interface ArtifactPomRewriter
{
- public static final String ROLE = ArtifactPomRewriter.class.getName();
+ String ROLE = ArtifactPomRewriter.class.getName();
- public static final String V3_POM = "v3";
+ String V3_POM = "v3";
- public static final String V4_POM = "v4";
+ String V4_POM = "v4";
- public void rewrite( Reader from, Writer to, boolean reportOnly, String groupId, String artifactId, String version,
- String packaging )
+ void rewrite( Reader from, Writer to, boolean reportOnly, String groupId, String artifactId, String version,
+ String packaging )
throws Exception;
List getWarnings();
Modified: maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ModelUtils.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ModelUtils.java?rev=635762&r1=635761&r2=635762&view=diff
==============================================================================
--- maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ModelUtils.java (original)
+++ maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ModelUtils.java Mon Mar 10 16:44:31 2008
@@ -1,11 +1,5 @@
package org.apache.maven.model.converter;
-import org.apache.maven.model.Model;
-import org.apache.maven.model.Plugin;
-import org.apache.maven.model.ReportPlugin;
-
-import java.util.Iterator;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -24,6 +18,12 @@
* specific language governing permissions and limitations
* under the License.
*/
+
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Plugin;
+import org.apache.maven.model.ReportPlugin;
+
+import java.util.Iterator;
/**
* Utility class which features various methods associated with Maven model.
Modified: maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PluginComparator.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PluginComparator.java?rev=635762&r1=635761&r2=635762&view=diff
==============================================================================
--- maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PluginComparator.java (original)
+++ maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PluginComparator.java Mon Mar 10 16:44:31 2008
@@ -82,7 +82,7 @@
// Compare values
int answer;
answer = plugin1.getGroupId().compareTo( plugin2.getGroupId() );
- if( answer == 0)
+ if ( answer == 0 )
{
answer = compareArtifactId( plugin1, plugin2 );
}
Modified: maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PomV3ToV4Translator.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PomV3ToV4Translator.java?rev=635762&r1=635761&r2=635762&view=diff
==============================================================================
--- maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PomV3ToV4Translator.java (original)
+++ maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/PomV3ToV4Translator.java Mon Mar 10 16:44:31 2008
@@ -205,8 +205,8 @@
if ( StringUtils.isNotEmpty( v3Model.getGumpRepositoryId() ) )
{
- warnings.add( "Ignoring gump repository id: \'" + v3Model.getGumpRepositoryId() +
- "\'. This is not supported in v4 POMs." );
+ warnings.add( "Ignoring gump repository id: \'" + v3Model.getGumpRepositoryId()
+ + "\'. This is not supported in v4 POMs." );
}
if ( notEmpty( v3Model.getVersions() ) )
@@ -287,7 +287,7 @@
StringBuffer info = new StringBuffer();
info.append( "Using some derived information for report: \'" ).append( reportName ).append( "\'.\n" )
- .append( "\to groupId: \'" ).append(reportPlugin.getGroupId()).append("\'\n" )
+ .append( "\to groupId: \'" ).append( reportPlugin.getGroupId() ).append( "\'\n" )
.append( "\to artifactId: \'" ).append( reportName ).append( "\'\n" )
.append( "\to goal: \'report\'\n" )
.append( "\n" )
@@ -437,12 +437,13 @@
site.setName( "Default Site" );
- StringBuffer url = new StringBuffer("scp://");
- url.append(siteAddress);
- if(!siteAddress.endsWith( "/" ) && !siteDirectory.startsWith( "/" )) {
- url.append("/");
+ StringBuffer url = new StringBuffer( "scp://" );
+ url.append( siteAddress );
+ if ( !siteAddress.endsWith( "/" ) && !siteDirectory.startsWith( "/" ) )
+ {
+ url.append( "/" );
}
- url.append(siteDirectory );
+ url.append( siteDirectory );
site.setUrl( url.toString() );
}
Modified: maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ReportPluginComparator.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ReportPluginComparator.java?rev=635762&r1=635761&r2=635762&view=diff
==============================================================================
--- maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ReportPluginComparator.java (original)
+++ maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/ReportPluginComparator.java Mon Mar 10 16:44:31 2008
@@ -82,7 +82,7 @@
// Compare values
int answer;
answer = plugin1.getGroupId().compareTo( plugin2.getGroupId() );
- if( answer == 0)
+ if ( answer == 0 )
{
answer = compareArtifactId( plugin1, plugin2 );
}
Modified: maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCTaglist.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCTaglist.java?rev=635762&r1=635761&r2=635762&view=diff
==============================================================================
--- maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCTaglist.java (original)
+++ maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/plugins/PCCTaglist.java Mon Mar 10 16:44:31 2008
@@ -56,7 +56,8 @@
final String propertyName = "maven.tasklist.taskTag";
String value = projectProperties.getProperty( propertyName );
- if( StringUtils.isNotEmpty( value ) ) {
+ if ( StringUtils.isNotEmpty( value ) )
+ {
Xpp3Dom tags = new Xpp3Dom( "tags" );
addConfigurationChild( tags, projectProperties, propertyName, "tag" );
configuration.addChild( tags );
Modified: maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/AbstractPluginRelocator.java
URL: http://svn.apache.org/viewvc/maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/AbstractPluginRelocator.java?rev=635762&r1=635761&r2=635762&view=diff
==============================================================================
--- maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/AbstractPluginRelocator.java (original)
+++ maven/shared/trunk/maven-model-converter/src/main/java/org/apache/maven/model/converter/relocators/AbstractPluginRelocator.java Mon Mar 10 16:44:31 2008
@@ -117,8 +117,8 @@
{
// The new plugin already exist, remove the old one
v4Model.getBuild().getPlugins().remove( oldBuildPlugin );
- sendInfoMessage( "Removing old build plugin " + getOldGroupId() + ":" + getOldArtifactId() +
- " because the new one already exist" );
+ sendInfoMessage( "Removing old build plugin " + getOldGroupId() + ":" + getOldArtifactId()
+ + " because the new one already exist" );
fireRemovePluginEvent( getOldGroupId(), getOldArtifactId() );
}
}
@@ -150,8 +150,8 @@
{
// The new plugin already exist, remove the old one
v4Model.getReporting().getPlugins().remove( oldReportPlugin );
- sendInfoMessage( "Removing old report plugin " + getOldGroupId() + ":" + getOldArtifactId() +
- " because the new one already exist" );
+ sendInfoMessage( "Removing old report plugin " + getOldGroupId() + ":" + getOldArtifactId()
+ + " because the new one already exist" );
fireRemovePluginEvent( getOldGroupId(), getOldArtifactId() );
}
}