Author: dennisl
Date: Sun Nov 25 13:04:30 2007
New Revision: 598052
URL: http://svn.apache.org/viewvc?rev=598052&view=rev
Log:
o Fix errors reported by Checkstyle.
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java?rev=598052&r1=598051&r2=598052&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
Sun Nov 25 13:04:30 2007
@@ -26,7 +26,6 @@
import org.codehaus.plexus.util.StringUtils;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
@@ -455,7 +454,7 @@
if ( iterator.hasNext() )
{
ReverseDependencyLink rdl = (ReverseDependencyLink)
iterator.next();
- if( isReactorProject(rdl.getDependency()) )
+ if ( isReactorProject( rdl.getDependency() ) )
{
isReactorProject = true;
}
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java?rev=598052&r1=598051&r2=598052&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/LicenseReport.java
Sun Nov 25 13:04:30 2007
@@ -246,8 +246,8 @@
String licenseContentLC =
licenseContent.toLowerCase();
int bodyStart = licenseContentLC.indexOf( "<body"
);
int bodyEnd = licenseContentLC.indexOf( "</body>"
);
- if ( ( licenseContentLC.startsWith( "<!doctype
html" ) ||
- licenseContentLC.startsWith( "<html>" ) ) &&
bodyStart >= 0 && bodyEnd >= 0 )
+ if ( ( licenseContentLC.startsWith( "<!doctype
html" )
+ || licenseContentLC.startsWith( "<html>" ) )
&& bodyStart >= 0 && bodyEnd >= 0 )
{
bodyStart = licenseContentLC.indexOf( ">",
bodyStart ) + 1;
String body = licenseContent.substring(
bodyStart, bodyEnd );
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java?rev=598052&r1=598051&r2=598052&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ScmReport.java
Sun Nov 25 13:04:30 2007
@@ -193,8 +193,8 @@
return;
}
- if ( StringUtils.isEmpty( anonymousConnection ) &&
StringUtils.isEmpty( devConnection ) &&
- StringUtils.isEmpty( scm.getUrl() ) )
+ if ( StringUtils.isEmpty( anonymousConnection ) &&
StringUtils.isEmpty( devConnection )
+ && StringUtils.isEmpty( scm.getUrl() ) )
{
startSection( getTitle() );
@@ -295,8 +295,8 @@
*/
private void renderAnonymousAccessSection( ScmRepository
anonymousRepository )
{
- if ( isScmSystem( anonymousRepository, "clearcase" ) ||
isScmSystem( anonymousRepository, "perforce" ) ||
- isScmSystem( anonymousRepository, "starteam" ) ||
StringUtils.isEmpty( anonymousConnection ) )
+ if ( isScmSystem( anonymousRepository, "clearcase" ) ||
isScmSystem( anonymousRepository, "perforce" )
+ || isScmSystem( anonymousRepository, "starteam" ) ||
StringUtils.isEmpty( anonymousConnection ) )
{
return;
}
@@ -622,7 +622,8 @@
{
if ( svnRepo.getUrl().startsWith( "https://"; ) )
{
- paragraph( i18n.getString( "project-info-report", locale,
"report.scm.devaccess.svn.intro1.https" ) );
+ paragraph( i18n.getString( "project-info-report", locale,
+
"report.scm.devaccess.svn.intro1.https" ) );
}
else if ( svnRepo.getUrl().startsWith( "svn://" ) )
{
@@ -630,11 +631,13 @@
}
else if ( svnRepo.getUrl().startsWith( "svn+ssh://" ) )
{
- paragraph( i18n.getString( "project-info-report", locale,
"report.scm.devaccess.svn.intro1.svnssh" ) );
+ paragraph( i18n.getString( "project-info-report", locale,
+
"report.scm.devaccess.svn.intro1.svnssh" ) );
}
else
{
- paragraph( i18n.getString( "project-info-report", locale,
"report.scm.devaccess.svn.intro1.other" ) );
+ paragraph( i18n.getString( "project-info-report", locale,
+
"report.scm.devaccess.svn.intro1.other" ) );
}
}
@@ -681,7 +684,9 @@
/**
* Convenience method that return true is the defined <code>SCM
repository</code> is a known provider.
- * <p>Actually, we fully support Clearcase, CVS, Perforce, Starteam,
SVN by the maven-scm-providers component.</p>
+ * <p>
+ * Actually, we fully support Clearcase, CVS, Perforce, Starteam, SVN
by the maven-scm-providers component.
+ * </p>
*
* @param scmRepository a SCM repository
* @param scmProvider a SCM provider name
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java?rev=598052&r1=598051&r2=598052&view=diff
==============================================================================
---
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
(original)
+++
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
Sun Nov 25 13:04:30 2007
@@ -102,28 +102,28 @@
}
};
- public DependenciesRenderer( Sink sink, Locale _locale, I18N _i18n,
Dependencies _dependencies,
- DependencyTree _depTree,
DependenciesReportConfiguration _config,
- RepositoryUtils _repoUtils )
+ public DependenciesRenderer( Sink sink, Locale locale, I18N i18n,
Dependencies dependencies,
+ DependencyTree depTree,
DependenciesReportConfiguration config,
+ RepositoryUtils repoUtils )
{
super( sink );
- this.locale = _locale;
+ this.locale = locale;
- this.dependencyTree = _depTree;
+ this.dependencyTree = depTree;
- this.repoUtils = _repoUtils;
+ this.repoUtils = repoUtils;
- this.dependencies = _dependencies;
+ this.dependencies = dependencies;
- this.i18n = _i18n;
+ this.i18n = i18n;
- this.configuration = _config;
+ this.configuration = config;
}
- public void setLog( Log _log )
+ public void setLog( Log log )
{
- log = _log;
+ this.log = log;
}
public String getTitle()
@@ -540,8 +540,8 @@
boolean dependencyExists = false;
// check snapshots in snapshots repository only and
releases in release repositories...
- if ( ( dependency.isSnapshot() &&
repo.getSnapshots().isEnabled() ) ||
- ( !dependency.isSnapshot() &&
repo.getReleases().isEnabled() ) )
+ if ( ( dependency.isSnapshot() &&
repo.getSnapshots().isEnabled() )
+ || ( !dependency.isSnapshot() &&
repo.getReleases().isEnabled() ) )
{
dependencyExists = repoUtils.dependencyExistsInRepo(
repo, dependency );
}
@@ -694,7 +694,7 @@
List licenses = artifactProject.getLicenses();
sink.paragraph();
- if( id != null )
+ if ( id != null )
{
sink.anchor( id );
}
@@ -702,7 +702,7 @@
sink.bold();
sink.text( artifactName );
sink.bold_();
- if( id != null )
+ if ( id != null )
{
sink.anchor_();
}
