You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2010/05/04 00:58:16 UTC
svn commit: r940663 [1/2] - in
/maven/plugins/trunk/maven-project-info-reports-plugin/src:
main/java/org/apache/maven/report/projectinfo/
main/java/org/apache/maven/report/projectinfo/dependencies/renderer/
main/resources/ test/java/org/apache/maven/re...
Author: hboutemy
Date: Mon May 3 22:58:15 2010
New Revision: 940663
URL: http://svn.apache.org/viewvc?rev=940663&view=rev
Log:
code simplification
Added:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java (with props)
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.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/MailingListsReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectSummaryReport.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/TeamListReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependencyManagementRenderer.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_cs.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_de.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_es.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_fr.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_hu.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ja.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_ko.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_lt.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_no.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pl.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_pt_BR.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_sk.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_sv.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_tr.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_zh_CN.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/resources/project-info-report_zh_TW.properties
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/DependenciesReportTest.java
Added: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java?rev=940663&view=auto
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java (added)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java Mon May 3 22:58:15 2010
@@ -0,0 +1,61 @@
+package org.apache.maven.report.projectinfo;
+
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import java.util.Locale;
+
+import org.apache.maven.doxia.sink.Sink;
+import org.apache.maven.reporting.AbstractMavenReportRenderer;
+import org.codehaus.plexus.i18n.I18N;
+
+public abstract class AbstractProjectInfoRenderer
+ extends AbstractMavenReportRenderer
+{
+ private I18N i18n;
+
+ private Locale locale;
+
+ public AbstractProjectInfoRenderer( Sink sink, I18N i18n, Locale locale )
+ {
+ super( sink );
+
+ this.i18n = i18n;
+
+ this.locale = locale;
+ }
+
+ /** {@inheritDoc} */
+ public String getTitle()
+ {
+ return getI18nString( "title" );
+ }
+
+ protected String getI18nString( String key )
+ {
+ return getI18nString( getI18Nsection(), key );
+ }
+
+ protected String getI18nString( String section, String key )
+ {
+ return i18n.getString( "project-info-report", locale, "report." + section + '.' + key );
+ }
+
+ protected abstract String getI18Nsection();
+}
Propchange: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoRenderer.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java?rev=940663&r1=940662&r2=940663&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/CimReport.java Mon May 3 22:58:15 2010
@@ -23,7 +23,6 @@ import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.model.CiManagement;
import org.apache.maven.model.Model;
import org.apache.maven.model.Notifier;
-import org.apache.maven.reporting.AbstractMavenReportRenderer;
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.util.StringUtils;
@@ -73,29 +72,20 @@ public class CimReport
* Internal renderer class
*/
private static class CimRenderer
- extends AbstractMavenReportRenderer
+ extends AbstractProjectInfoRenderer
{
private Model model;
- private I18N i18n;
-
- private Locale locale;
-
CimRenderer( Sink sink, Model model, I18N i18n, Locale locale )
{
- super( sink );
+ super( sink, i18n, locale );
this.model = model;
-
- this.i18n = i18n;
-
- this.locale = locale;
}
- /** {@inheritDoc} */
- public String getTitle()
+ protected String getI18Nsection()
{
- return i18n.getString( "project-info-report", locale, "report.cim.title" );
+ return "cim";
}
/** {@inheritDoc} */
@@ -106,7 +96,7 @@ public class CimReport
{
startSection( getTitle() );
- paragraph( i18n.getString( "project-info-report", locale, "report.cim.nocim" ) );
+ paragraph( getI18nString( "nocim" ) );
endSection();
@@ -118,76 +108,75 @@ public class CimReport
List notifiers = cim.getNotifiers();
// Overview
- startSection( i18n.getString( "project-info-report", locale, "report.cim.overview.title" ) );
+ startSection( getI18nString( "overview.title" ) );
sink.paragraph();
if ( isCimSystem( system, "anthill" ) )
{
- linkPatternedText( i18n.getString( "project-info-report", locale, "report.cim.anthill.intro" ) );
+ linkPatternedText( getI18nString( "anthill.intro" ) );
}
else if ( isCimSystem( system, "buildforge" ) )
{
- linkPatternedText( i18n.getString( "project-info-report", locale, "report.cim.buildforge.intro" ) );
+ linkPatternedText( getI18nString( "buildforge.intro" ) );
}
else if ( isCimSystem( system, "continuum" ) )
{
- linkPatternedText( i18n.getString( "project-info-report", locale, "report.cim.continuum.intro" ) );
+ linkPatternedText( getI18nString( "continuum.intro" ) );
}
else if ( isCimSystem( system, "cruisecontrol" ) )
{
- linkPatternedText( i18n.getString( "project-info-report", locale, "report.cim.cruisecontrol.intro" ) );
+ linkPatternedText( getI18nString( "cruisecontrol.intro" ) );
}
else if ( isCimSystem( system, "hudson" ) )
{
- linkPatternedText( i18n.getString( "project-info-report", locale, "report.cim.hudson.intro" ) );
+ linkPatternedText( getI18nString( "hudson.intro" ) );
}
else if ( isCimSystem( system, "luntbuild" ) )
{
- linkPatternedText( i18n.getString( "project-info-report", locale, "report.cim.luntbuild.intro" ) );
+ linkPatternedText( getI18nString( "luntbuild.intro" ) );
}
else
{
- linkPatternedText( i18n.getString( "project-info-report", locale, "report.cim.general.intro" ) );
+ linkPatternedText( getI18nString( "general.intro" ) );
}
sink.paragraph_();
endSection();
// Access
- startSection( i18n.getString( "project-info-report", locale, "report.cim.access" ) );
+ startSection( getI18nString( "access" ) );
if ( !StringUtils.isEmpty( url ) )
{
- paragraph( i18n.getString( "project-info-report", locale, "report.cim.url" ) );
+ paragraph( getI18nString( "url" ) );
verbatimLink( url, url );
}
else
{
- paragraph( i18n.getString( "project-info-report", locale, "report.cim.nourl" ) );
+ paragraph( getI18nString( "nourl" ) );
}
endSection();
// Notifiers
- startSection( i18n.getString( "project-info-report", locale, "report.cim.notifiers.title" ) );
+ startSection( getI18nString( "notifiers.title" ) );
if ( notifiers == null || notifiers.isEmpty() )
{
- paragraph( i18n.getString( "project-info-report", locale, "report.cim.notifiers.nolist" ) );
+ paragraph( getI18nString( "notifiers.nolist" ) );
}
else
{
sink.paragraph();
- sink.text( i18n.getString( "project-info-report", locale, "report.cim.notifiers.intro" ) );
+ sink.text( getI18nString( "notifiers.intro" ) );
sink.paragraph_();
startTable();
- String type = i18n.getString( "project-info-report", locale, "report.cim.notifiers.column.type" );
- String address = i18n.getString( "project-info-report", locale, "report.cim.notifiers.column.address" );
- String configuration =
- i18n.getString( "project-info-report", locale, "report.cim.notifiers.column.configuration" );
+ String type = getI18nString( "notifiers.column.type" );
+ String address = getI18nString( "notifiers.column.address" );
+ String configuration = getI18nString( "notifiers.column.configuration" );
tableHeader( new String[]{type, address, configuration} );
@@ -207,11 +196,11 @@ public class CimReport
}
/**
- * Checks if a CIM system is bugzilla, continium...
+ * Checks if a CIM system is bugzilla, continuum...
*
* @param connection
* @param cim
- * @return true if the CIM system is bugzilla, continium..., false otherwise.
+ * @return true if the CIM system is bugzilla, continuum..., false otherwise.
*/
private boolean isCimSystem( String connection, String cim )
{
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java?rev=940663&r1=940662&r2=940663&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/IssueTrackingReport.java Mon May 3 22:58:15 2010
@@ -22,7 +22,6 @@ package org.apache.maven.report.projecti
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.model.IssueManagement;
import org.apache.maven.model.Model;
-import org.apache.maven.reporting.AbstractMavenReportRenderer;
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.util.StringUtils;
@@ -70,29 +69,20 @@ public class IssueTrackingReport
* Internal renderer class
*/
private static class IssueTrackingRenderer
- extends AbstractMavenReportRenderer
+ extends AbstractProjectInfoRenderer
{
private Model model;
- private I18N i18n;
-
- private Locale locale;
-
IssueTrackingRenderer( Sink sink, Model model, I18N i18n, Locale locale )
{
- super( sink );
+ super( sink, i18n, locale );
this.model = model;
-
- this.i18n = i18n;
-
- this.locale = locale;
}
- /** {@inheritDoc} */
- public String getTitle()
+ protected String getI18Nsection()
{
- return i18n.getString( "project-info-report", locale, "report.issuetracking.title" );
+ return "issuetracking";
}
/** {@inheritDoc} */
@@ -103,7 +93,7 @@ public class IssueTrackingReport
{
startSection( getTitle() );
- paragraph( i18n.getString( "project-info-report", locale, "report.issuetracking.noissueManagement" ) );
+ paragraph( getI18nString( "noissueManagement" ) );
endSection();
@@ -114,37 +104,33 @@ public class IssueTrackingReport
String url = issueManagement.getUrl();
// Overview
- startSection( i18n.getString( "project-info-report", locale, "report.issuetracking.overview.title" ) );
+ startSection( getI18nString( "overview.title" ) );
if ( isIssueManagementSystem( system, "jira" ) )
{
sink.paragraph();
- linkPatternedText( i18n.getString( "project-info-report", locale, "report.issuetracking.jira.intro" ) );
+ linkPatternedText( getI18nString( "jira.intro" ) );
sink.paragraph_();
}
else if ( isIssueManagementSystem( system, "bugzilla" ) )
{
sink.paragraph();
- linkPatternedText(
- i18n.getString( "project-info-report", locale, "report.issuetracking.bugzilla.intro" ) );
+ linkPatternedText( getI18nString( "bugzilla.intro" ) );
sink.paragraph_();
}
else if ( isIssueManagementSystem( system, "scarab" ) )
{
sink.paragraph();
- linkPatternedText(
- i18n.getString( "project-info-report", locale, "report.issuetracking.scarab.intro" ) );
+ linkPatternedText( getI18nString( "scarab.intro" ) );
sink.paragraph_();
}
else if ( system == null || "".equals( system.trim() ) )
{
- paragraph( i18n.getString( "project-info-report", locale, "report.issuetracking.general.intro" ) );
+ paragraph( getI18nString( "general.intro" ) );
}
else
{
- paragraph(
- i18n.getString( "project-info-report", locale, "report.issuetracking.custom.intro" ).replaceFirst(
- "%issueManagementSystem%", system ) );
+ paragraph( getI18nString( "custom.intro" ).replaceFirst( "%issueManagementSystem%", system ) );
}
endSection();
@@ -152,7 +138,7 @@ public class IssueTrackingReport
// Connection
startSection( getTitle() );
- paragraph( i18n.getString( "project-info-report", locale, "report.issuetracking.intro" ) );
+ paragraph( getI18nString( "intro" ) );
verbatimLink( url, url );
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=940663&r1=940662&r2=940663&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 Mon May 3 22:58:15 2010
@@ -23,7 +23,6 @@ import org.apache.commons.validator.UrlV
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.model.License;
import org.apache.maven.project.MavenProject;
-import org.apache.maven.reporting.AbstractMavenReportRenderer;
import org.apache.maven.settings.Settings;
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.util.StringUtils;
@@ -192,33 +191,24 @@ public class LicenseReport
* Internal renderer class
*/
private static class LicenseRenderer
- extends AbstractMavenReportRenderer
+ extends AbstractProjectInfoRenderer
{
private MavenProject project;
private Settings settings;
- private I18N i18n;
-
- private Locale locale;
-
LicenseRenderer( Sink sink, MavenProject project, I18N i18n, Locale locale, Settings settings )
{
- super( sink );
+ super( sink, i18n, locale );
this.project = project;
this.settings = settings;
-
- this.i18n = i18n;
-
- this.locale = locale;
}
- /** {@inheritDoc} */
- public String getTitle()
+ protected String getI18Nsection()
{
- return i18n.getString( "project-info-report", locale, "report.license.title" );
+ return "license";
}
/** {@inheritDoc} */
@@ -230,7 +220,7 @@ public class LicenseReport
{
startSection( getTitle() );
- paragraph( i18n.getString( "project-info-report", locale, "report.license.nolicense" ) );
+ paragraph( getI18nString( "nolicense" ) );
endSection();
@@ -238,14 +228,14 @@ public class LicenseReport
}
// Overview
- startSection( i18n.getString( "project-info-report", locale, "report.license.overview.title" ) );
+ startSection( getI18nString( "overview.title" ) );
- paragraph( i18n.getString( "project-info-report", locale, "report.license.overview.intro" ) );
+ paragraph( getI18nString( "overview.intro" ) );
endSection();
// License
- startSection( i18n.getString( "project-info-report", locale, "report.license.title" ) );
+ startSection( getI18nString( "title" ) );
for ( Iterator i = licenses.iterator(); i.hasNext(); )
{
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java?rev=940663&r1=940662&r2=940663&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/MailingListsReport.java Mon May 3 22:58:15 2010
@@ -22,7 +22,6 @@ package org.apache.maven.report.projecti
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.model.MailingList;
import org.apache.maven.model.Model;
-import org.apache.maven.reporting.AbstractMavenReportRenderer;
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.util.StringUtils;
@@ -74,31 +73,22 @@ public class MailingListsReport
* Internal renderer class
*/
protected static class MailingListsRenderer
- extends AbstractMavenReportRenderer
+ extends AbstractProjectInfoRenderer
{
private Model model;
- private I18N i18n;
-
- private Locale locale;
-
private static final String[] EMPTY_STRING_ARRAY = new String[0];
MailingListsRenderer( Sink sink, Model model, I18N i18n, Locale locale )
{
- super( sink );
+ super( sink, i18n, locale );
this.model = model;
-
- this.i18n = i18n;
-
- this.locale = locale;
}
- /** {@inheritDoc} */
- public String getTitle()
+ protected String getI18Nsection()
{
- return i18n.getString( "project-info-report", locale, "report.mailing-lists.title" );
+ return "mailing-lists";
}
/** {@inheritDoc} */
@@ -111,7 +101,7 @@ public class MailingListsReport
startSection( getTitle() );
// TODO: should the report just be excluded?
- paragraph( i18n.getString( "project-info-report", locale, "report.mailing-lists.nolist" ) );
+ paragraph( getI18nString( "nolist" ) );
endSection();
@@ -120,7 +110,7 @@ public class MailingListsReport
startSection( getTitle() );
- paragraph( i18n.getString( "project-info-report", locale, "report.mailing-lists.intro" ) );
+ paragraph( getI18nString( "intro" ) );
startTable();
@@ -136,14 +126,12 @@ public class MailingListsReport
}
}
- String name = i18n.getString( "project-info-report", locale, "report.mailing-lists.column.name" );
- String subscribe = i18n.getString( "project-info-report", locale, "report.mailing-lists.column.subscribe" );
- String unsubscribe =
- i18n.getString( "project-info-report", locale, "report.mailing-lists.column.unsubscribe" );
- String post = i18n.getString( "project-info-report", locale, "report.mailing-lists.column.post" );
- String archive = i18n.getString( "project-info-report", locale, "report.mailing-lists.column.archive" );
- String archivesOther =
- i18n.getString( "project-info-report", locale, "report.mailing-lists.column.otherArchives" );
+ String name = getI18nString( "column.name" );
+ String subscribe = getI18nString( "column.subscribe" );
+ String unsubscribe = getI18nString( "column.unsubscribe" );
+ String post = getI18nString( "column.post" );
+ String archive = getI18nString( "column.archive" );
+ String archivesOther = getI18nString( "column.otherArchives" );
if ( otherArchives )
{
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java?rev=940663&r1=940662&r2=940663&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ModulesReport.java Mon May 3 22:58:15 2010
@@ -29,7 +29,6 @@ import java.util.Locale;
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.model.Model;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
-import org.apache.maven.reporting.AbstractMavenReportRenderer;
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.util.IOUtil;
@@ -82,29 +81,20 @@ public class ModulesReport
* Internal renderer class
*/
private class ModulesRenderer
- extends AbstractMavenReportRenderer
+ extends AbstractProjectInfoRenderer
{
private Model model;
- private I18N i18n;
-
- private Locale locale;
-
ModulesRenderer( Sink sink, Model model, I18N i18n, Locale locale )
{
- super( sink );
+ super( sink, i18n, locale );
this.model = model;
-
- this.i18n = i18n;
-
- this.locale = locale;
}
- /** {@inheritDoc} */
- public String getTitle()
+ protected String getI18Nsection()
{
- return i18n.getString( "project-info-report", locale, "report.modules.title" );
+ return "modules";
}
/** {@inheritDoc} */
@@ -114,12 +104,12 @@ public class ModulesReport
startSection( getTitle() );
- paragraph( i18n.getString( "project-info-report", locale, "report.modules.intro" ) );
+ paragraph( getI18nString( "intro" ) );
startTable();
- String name = i18n.getString( "project-info-report", locale, "report.modules.header.name" );
- String description = i18n.getString( "project-info-report", locale, "report.modules.header.description" );
+ String name = getI18nString( "header.name" );
+ String description = getI18nString( "header.description" );
tableHeader( new String[] {name, description} );
for ( Iterator it = modules.iterator(); it.hasNext(); )
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java?rev=940663&r1=940662&r2=940663&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginManagementReport.java Mon May 3 22:58:15 2010
@@ -36,7 +36,6 @@ import org.apache.maven.plugin.logging.L
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.reporting.AbstractMavenReportRenderer;
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.util.StringUtils;
@@ -110,16 +109,12 @@ public class PluginManagementReport
* @author Nick Stolwijk
*/
protected static class PluginManagementRenderer
- extends AbstractMavenReportRenderer
+ extends AbstractProjectInfoRenderer
{
private final Log log;
private final List pluginManagement;
- private final Locale locale;
-
- private final I18N i18n;
-
private final MavenProject project;
private final MavenProjectBuilder mavenProjectBuilder;
@@ -143,16 +138,12 @@ public class PluginManagementReport
MavenProject project, MavenProjectBuilder mavenProjectBuilder,
ArtifactFactory artifactFactory, ArtifactRepository localRepository )
{
- super( sink );
+ super( sink, i18n, locale );
this.log = log;
- this.locale = locale;
-
this.pluginManagement = plugins;
- this.i18n = i18n;
-
this.project = project;
this.mavenProjectBuilder = mavenProjectBuilder;
@@ -162,11 +153,9 @@ public class PluginManagementReport
this.localRepository = localRepository;
}
-
- /** {@inheritDoc} */
- public String getTitle()
+ protected String getI18Nsection()
{
- return getReportString( "report.pluginManagement.title" );
+ return "pluginManagement";
}
/** {@inheritDoc} */
@@ -235,9 +224,9 @@ public class PluginManagementReport
private String[] getPluginTableHeader()
{
// reused key...
- String groupId = getReportString( "report.dependencyManagement.column.groupId" );
- String artifactId = getReportString( "report.dependencyManagement.column.artifactId" );
- String version = getReportString( "report.dependencyManagement.column.version" );
+ String groupId = getI18nString( "dependencyManagement", "column.groupId" );
+ String artifactId = getI18nString( "dependencyManagement", "column.artifactId" );
+ String version = getI18nString( "dependencyManagement", "column.version" );
return new String[] { groupId, artifactId, version };
}
@@ -266,10 +255,5 @@ public class PluginManagementReport
}
};
}
-
- private String getReportString( String key )
- {
- return i18n.getString( "project-info-report", locale, key );
- }
}
}
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java?rev=940663&r1=940662&r2=940663&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/PluginsReport.java Mon May 3 22:58:15 2010
@@ -36,7 +36,6 @@ import org.apache.maven.plugin.logging.L
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
-import org.apache.maven.reporting.AbstractMavenReportRenderer;
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.util.StringUtils;
@@ -109,7 +108,7 @@ public class PluginsReport
* Internal renderer class
*/
protected static class PluginsRenderer
- extends AbstractMavenReportRenderer
+ extends AbstractProjectInfoRenderer
{
private final Log log;
@@ -117,10 +116,6 @@ public class PluginsReport
private final List reports;
- private final Locale locale;
-
- private final I18N i18n;
-
private final MavenProject project;
private final MavenProjectBuilder mavenProjectBuilder;
@@ -145,18 +140,14 @@ public class PluginsReport
MavenProject project, MavenProjectBuilder mavenProjectBuilder,
ArtifactFactory artifactFactory, ArtifactRepository localRepository )
{
- super( sink );
+ super( sink, i18n, locale );
this.log = log;
- this.locale = locale;
-
this.plugins = new ArrayList( plugins );
this.reports = new ArrayList( reports );
- this.i18n = i18n;
-
this.project = project;
this.mavenProjectBuilder = mavenProjectBuilder;
@@ -166,10 +157,9 @@ public class PluginsReport
this.localRepository = localRepository;
}
- /** {@inheritDoc} */
- public String getTitle()
+ protected String getI18Nsection()
{
- return getReportString( "report.plugins.title" );
+ return "plugins";
}
/** {@inheritDoc} */
@@ -191,14 +181,14 @@ public class PluginsReport
List list = ( isPlugins ? plugins : reports );
String[] tableHeader = getPluginTableHeader();
- startSection( ( isPlugins ? getReportString( "report.plugins.title" )
- : getReportString( "report.plugins.report.title" ) ) );
+ startSection( ( isPlugins ? getI18nString( "title" )
+ : getI18nString( "report.title" ) ) );
if ( list == null || list.isEmpty() )
{
- paragraph( ( isPlugins ? getReportString( "report.plugins.nolist" )
- : getReportString( "report.plugins.report.nolist" ) ) );
+ paragraph( ( isPlugins ? getI18nString( "nolist" )
+ : getI18nString( "report.nolist" ) ) );
endSection();
@@ -259,9 +249,9 @@ public class PluginsReport
private String[] getPluginTableHeader()
{
// reused key...
- String groupId = getReportString( "report.dependencyManagement.column.groupId" );
- String artifactId = getReportString( "report.dependencyManagement.column.artifactId" );
- String version = getReportString( "report.dependencyManagement.column.version" );
+ String groupId = getI18nString( "dependencyManagement", "column.groupId" );
+ String artifactId = getI18nString( "dependencyManagement", "column.artifactId" );
+ String version = getI18nString( "dependencyManagement", "column.version" );
return new String[] { groupId, artifactId, version };
}
@@ -290,10 +280,5 @@ public class PluginsReport
}
};
}
-
- private String getReportString( String key )
- {
- return i18n.getString( "project-info-report", locale, key );
- }
}
}
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectSummaryReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectSummaryReport.java?rev=940663&r1=940662&r2=940663&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectSummaryReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/ProjectSummaryReport.java Mon May 3 22:58:15 2010
@@ -21,7 +21,6 @@ package org.apache.maven.report.projecti
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.model.Organization;
-import org.apache.maven.reporting.AbstractMavenReportRenderer;
import org.apache.maven.reporting.MavenReportException;
import org.codehaus.plexus.util.StringUtils;
@@ -69,21 +68,16 @@ public class ProjectSummaryReport
* Internal renderer class
*/
private class ProjectSummaryRenderer
- extends AbstractMavenReportRenderer
+ extends AbstractProjectInfoRenderer
{
- private final Locale locale;
-
ProjectSummaryRenderer( Sink sink, Locale locale )
{
- super( sink );
-
- this.locale = locale;
+ super( sink, i18n, locale );
}
- /** {@inheritDoc} */
- public String getTitle()
+ protected String getI18Nsection()
{
- return getReportString( "report.summary.title" );
+ return "summary";
}
/** {@inheritDoc} */
@@ -108,22 +102,21 @@ public class ProjectSummaryReport
homepage = "";
}
- startSection( getReportString( "report.summary.general.title" ) );
+ startSection( getI18nString( "general.title" ) );
startTable();
- tableHeader(
- new String[]{getReportString( "report.summary.field" ), getReportString( "report.summary.value" )} );
- tableRow( new String[]{getReportString( "report.summary.general.name" ), name} );
- tableRow( new String[]{getReportString( "report.summary.general.description" ), description} );
- tableRowWithLink( new String[]{getReportString( "report.summary.general.homepage" ), homepage} );
+ tableHeader( new String[]{getI18nString( "field" ), getI18nString( "value" )} );
+ tableRow( new String[]{getI18nString( "general.name" ), name} );
+ tableRow( new String[]{getI18nString( "general.description" ), description} );
+ tableRowWithLink( new String[]{getI18nString( "general.homepage" ), homepage} );
endTable();
endSection();
//organization sub-section
- startSection( getReportString( "report.summary.organization.title" ) );
+ startSection( getI18nString( "organization.title" ) );
Organization organization = project.getOrganization();
if ( organization == null )
{
- paragraph( getReportString( "report.summary.noorganization" ) );
+ paragraph( getI18nString( "noorganization" ) );
}
else
{
@@ -137,35 +130,27 @@ public class ProjectSummaryReport
}
startTable();
- tableHeader( new String[]{getReportString( "report.summary.field" ),
- getReportString( "report.summary.value" )} );
- tableRow( new String[] { getReportString( "report.summary.organization.name" ),
- organization.getName() } );
- tableRowWithLink(
- new String[]{getReportString( "report.summary.organization.url" ), organization.getUrl()} );
+ tableHeader( new String[]{getI18nString( "field" ), getI18nString( "value" )} );
+ tableRow( new String[] { getI18nString( "organization.name" ), organization.getName() } );
+ tableRowWithLink( new String[]{getI18nString( "organization.url" ), organization.getUrl()} );
endTable();
}
endSection();
//build section
- startSection( getReportString( "report.summary.build.title" ) );
+ startSection( getI18nString( "build.title" ) );
startTable();
- tableHeader(
- new String[]{getReportString( "report.summary.field" ), getReportString( "report.summary.value" )} );
- tableRow( new String[]{getReportString( "report.summary.build.groupid" ), project.getGroupId()} );
- tableRow( new String[]{getReportString( "report.summary.build.artifactid" ), project.getArtifactId()} );
- tableRow( new String[]{getReportString( "report.summary.build.version" ), project.getVersion()} );
- tableRow( new String[]{getReportString( "report.summary.build.type" ), project.getPackaging()} );
+ tableHeader( new String[]{getI18nString( "field" ), getI18nString( "value" )} );
+ tableRow( new String[]{getI18nString( "build.groupid" ), project.getGroupId()} );
+ tableRow( new String[]{getI18nString( "build.artifactid" ), project.getArtifactId()} );
+ tableRow( new String[]{getI18nString( "build.version" ), project.getVersion()} );
+ tableRow( new String[]{getI18nString( "build.type" ), project.getPackaging()} );
endTable();
endSection();
endSection();
}
- private String getReportString( String key )
- {
- return i18n.getString( "project-info-report", locale, key );
- }
private void tableRowWithLink( String[] content )
{
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=940663&r1=940662&r2=940663&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 Mon May 3 22:58:15 2010
@@ -24,7 +24,6 @@ import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.model.Model;
import org.apache.maven.model.Scm;
import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.reporting.AbstractMavenReportRenderer;
import org.apache.maven.scm.manager.NoSuchScmProviderException;
import org.apache.maven.scm.manager.ScmManager;
import org.apache.maven.scm.provider.cvslib.repository.CvsScmProviderRepository;
@@ -131,16 +130,12 @@ public class ScmReport
* Internal renderer class
*/
private static class ScmRenderer
- extends AbstractMavenReportRenderer
+ extends AbstractProjectInfoRenderer
{
private Log log;
private Model model;
- private I18N i18n;
-
- private Locale locale;
-
private ScmManager scmManager;
/**
@@ -157,7 +152,7 @@ public class ScmReport
ScmRenderer( Log log, ScmManager scmManager, Sink sink, Model model, I18N i18n, Locale locale,
String checkoutDirName, String webAccessUrl, String anonymousConnection, String devConnection )
{
- super( sink );
+ super( sink, i18n, locale );
this.log = log;
@@ -165,10 +160,6 @@ public class ScmReport
this.model = model;
- this.i18n = i18n;
-
- this.locale = locale;
-
this.checkoutDirectoryName = checkoutDirName;
this.webAccessUrl = webAccessUrl;
@@ -179,10 +170,9 @@ public class ScmReport
}
- /** {@inheritDoc} */
- public String getTitle()
+ protected String getI18Nsection()
{
- return i18n.getString( "project-info-report", locale, "report.scm.title" );
+ return "scm";
}
/** {@inheritDoc} */
@@ -193,7 +183,7 @@ public class ScmReport
{
startSection( getTitle() );
- paragraph( i18n.getString( "project-info-report", locale, "report.scm.noscm" ) );
+ paragraph( getI18nString( "noscm" ) );
endSection();
@@ -205,7 +195,7 @@ public class ScmReport
{
startSection( getTitle() );
- paragraph( i18n.getString( "project-info-report", locale, "report.scm.noscm" ) );
+ paragraph( getI18nString( "noscm" ) );
endSection();
@@ -241,47 +231,47 @@ public class ScmReport
*/
private void renderOverViewSection( ScmRepository anonymousRepository )
{
- startSection( i18n.getString( "project-info-report", locale, "report.scm.overview.title" ) );
+ startSection( getI18nString( "overview.title" ) );
if ( isScmSystem( anonymousRepository, "clearcase" ) )
{
sink.paragraph();
- linkPatternedText( i18n.getString( "project-info-report", locale, "report.scm.clearcase.intro" ) );
+ linkPatternedText( getI18nString( "clearcase.intro" ) );
sink.paragraph_();
}
else if ( isScmSystem( anonymousRepository, "cvs" ) )
{
sink.paragraph();
- linkPatternedText( i18n.getString( "project-info-report", locale, "report.scm.cvs.intro" ) );
+ linkPatternedText( getI18nString( "cvs.intro" ) );
sink.paragraph_();
}
else if ( isScmSystem( anonymousRepository, "hg" ) )
{
sink.paragraph();
- linkPatternedText( i18n.getString( "project-info-report", locale, "report.scm.hg.intro" ) );
+ linkPatternedText( getI18nString( "hg.intro" ) );
sink.paragraph_();
}
else if ( isScmSystem( anonymousRepository, "perforce" ) )
{
sink.paragraph();
- linkPatternedText( i18n.getString( "project-info-report", locale, "report.scm.perforce.intro" ) );
+ linkPatternedText( getI18nString( "perforce.intro" ) );
sink.paragraph_();
}
else if ( isScmSystem( anonymousRepository, "starteam" ) )
{
sink.paragraph();
- linkPatternedText( i18n.getString( "project-info-report", locale, "report.scm.starteam.intro" ) );
+ linkPatternedText( getI18nString( "starteam.intro" ) );
sink.paragraph_();
}
else if ( isScmSystem( anonymousRepository, "svn" ) )
{
sink.paragraph();
- linkPatternedText( i18n.getString( "project-info-report", locale, "report.scm.svn.intro" ) );
+ linkPatternedText( getI18nString( "svn.intro" ) );
sink.paragraph_();
}
else
{
- paragraph( i18n.getString( "project-info-report", locale, "report.scm.general.intro" ) );
+ paragraph( getI18nString( "general.intro" ) );
}
endSection();
@@ -294,15 +284,15 @@ public class ScmReport
*/
private void renderWebAccesSection( String scmUrl )
{
- startSection( i18n.getString( "project-info-report", locale, "report.scm.webaccess.title" ) );
+ startSection( getI18nString( "webaccess.title" ) );
if ( StringUtils.isEmpty( scmUrl ) )
{
- paragraph( i18n.getString( "project-info-report", locale, "report.scm.webaccess.nourl" ) );
+ paragraph( getI18nString( "webaccess.nourl" ) );
}
else
{
- paragraph( i18n.getString( "project-info-report", locale, "report.scm.webaccess.url" ) );
+ paragraph( getI18nString( "webaccess.url" ) );
verbatimLink( scmUrl, scmUrl );
}
@@ -324,7 +314,7 @@ public class ScmReport
return;
}
- startSection( i18n.getString( "project-info-report", locale, "report.scm.anonymousaccess.title" ) );
+ startSection( getI18nString( "anonymousaccess.title" ) );
if ( anonymousRepository != null && isScmSystem( anonymousRepository, "cvs" ) )
{
@@ -349,8 +339,7 @@ public class ScmReport
}
else
{
- paragraph( i18n.getString( "project-info-report", locale,
- "report.scm.anonymousaccess.general.intro" ) );
+ paragraph( getI18nString( "anonymousaccess.general.intro" ) );
verbatimText( anonymousConnection.substring( 4 ) );
}
@@ -370,7 +359,7 @@ public class ScmReport
return;
}
- startSection( i18n.getString( "project-info-report", locale, "report.scm.devaccess.title" ) );
+ startSection( getI18nString( "devaccess.title" ) );
if ( devRepository != null && isScmSystem( devRepository, "clearcase" ) )
{
@@ -410,7 +399,7 @@ public class ScmReport
}
else
{
- paragraph( i18n.getString( "project-info-report", locale, "report.scm.devaccess.general.intro" ) );
+ paragraph( getI18nString( "devaccess.general.intro" ) );
verbatimText( devConnection.substring( 4 ) );
}
@@ -425,14 +414,13 @@ public class ScmReport
*/
private void renderAccessBehindFirewallSection( ScmRepository devRepository )
{
- startSection( i18n.getString( "project-info-report", locale, "report.scm.accessbehindfirewall.title" ) );
+ startSection( getI18nString( "accessbehindfirewall.title" ) );
if ( devRepository != null && isScmSystem( devRepository, "svn" ) )
{
SvnScmProviderRepository svnRepo = (SvnScmProviderRepository) devRepository.getProviderRepository();
- paragraph( i18n.getString( "project-info-report", locale,
- "report.scm.accessbehindfirewall.svn.intro" ) );
+ paragraph( getI18nString( "accessbehindfirewall.svn.intro" ) );
StringBuffer sb = new StringBuffer();
sb.append( "$ svn checkout " ).append( svnRepo.getUrl() );
@@ -441,13 +429,11 @@ public class ScmReport
}
else if ( devRepository != null && isScmSystem( devRepository, "cvs" ) )
{
- linkPatternedText( i18n.getString( "project-info-report", locale,
- "report.scm.accessbehindfirewall.cvs.intro" ) );
+ linkPatternedText( getI18nString( "accessbehindfirewall.cvs.intro" ) );
}
else
{
- paragraph( i18n.getString( "project-info-report", locale,
- "report.scm.accessbehindfirewall.general.intro" ) );
+ paragraph( getI18nString( "accessbehindfirewall.general.intro" ) );
}
endSection();
@@ -463,15 +449,11 @@ public class ScmReport
{
if ( isScmSystem( anonymousRepository, "svn" ) || isScmSystem( devRepository, "svn" ) )
{
- startSection( i18n.getString( "project-info-report", locale,
- "report.scm.accessthroughtproxy.title" ) );
+ startSection( getI18nString( "accessthroughtproxy.title" ) );
- paragraph( i18n.getString( "project-info-report", locale,
- "report.scm.accessthroughtproxy.svn.intro1" ) );
- paragraph( i18n.getString( "project-info-report", locale,
- "report.scm.accessthroughtproxy.svn.intro2" ) );
- paragraph( i18n.getString( "project-info-report", locale,
- "report.scm.accessthroughtproxy.svn.intro3" ) );
+ paragraph( getI18nString( "accessthroughtproxy.svn.intro1" ) );
+ paragraph( getI18nString( "accessthroughtproxy.svn.intro2" ) );
+ paragraph( getI18nString( "accessthroughtproxy.svn.intro3" ) );
StringBuffer sb = new StringBuffer();
sb.append( "[global]" );
@@ -493,7 +475,7 @@ public class ScmReport
*/
private void developerAccessClearCase()
{
- paragraph( i18n.getString( "project-info-report", locale, "report.scm.devaccess.clearcase.intro" ) );
+ paragraph( getI18nString( "devaccess.clearcase.intro" ) );
StringBuffer command = new StringBuffer();
command.append( "$ cleartool checkout " );
@@ -514,7 +496,7 @@ public class ScmReport
*/
private void anonymousAccessCVS( CvsScmProviderRepository cvsRepo )
{
- paragraph( i18n.getString( "project-info-report", locale, "report.scm.anonymousaccess.cvs.intro" ) );
+ paragraph( getI18nString( "anonymousaccess.cvs.intro" ) );
StringBuffer command = new StringBuffer();
command.append( "$ cvs -d " ).append( cvsRepo.getCvsRoot() ).append( " login" );
@@ -537,7 +519,7 @@ public class ScmReport
private void anonymousAccessMercurial( HgScmProviderRepository hgRepo )
{
sink.paragraph();
- linkPatternedText( i18n.getString( "project-info-report", locale, "report.scm.anonymousaccess.hg.intro" ) );
+ linkPatternedText( getI18nString( "anonymousaccess.hg.intro" ) );
sink.paragraph_();
StringBuffer command = new StringBuffer();
@@ -557,7 +539,7 @@ public class ScmReport
*/
private void developerAccessCVS( CvsScmProviderRepository cvsRepo )
{
- paragraph( i18n.getString( "project-info-report", locale, "report.scm.devaccess.cvs.intro" ) );
+ paragraph( getI18nString( "devaccess.cvs.intro" ) );
// Safety: remove the username if present
String cvsRoot = StringUtils.replace( cvsRepo.getCvsRoot(), cvsRepo.getUser(), "username" );
@@ -582,7 +564,7 @@ public class ScmReport
private void developerAccessMercurial(HgScmProviderRepository hgRepo)
{
sink.paragraph();
- linkPatternedText( i18n.getString( "project-info-report", locale, "report.scm.devaccess.hg.intro" ) );
+ linkPatternedText( getI18nString( "devaccess.hg.intro" ) );
sink.paragraph_();
StringBuffer command = new StringBuffer();
@@ -605,7 +587,7 @@ public class ScmReport
*/
private void developerAccessPerforce( PerforceScmProviderRepository perforceRepo )
{
- paragraph( i18n.getString( "project-info-report", locale, "report.scm.devaccess.perforce.intro" ) );
+ paragraph( getI18nString( "devaccess.perforce.intro" ) );
StringBuffer command = new StringBuffer();
command.append( "$ p4" );
@@ -639,7 +621,7 @@ public class ScmReport
*/
private void developerAccessStarteam( StarteamScmProviderRepository starteamRepo )
{
- paragraph( i18n.getString( "project-info-report", locale, "report.scm.devaccess.starteam.intro" ) );
+ paragraph( getI18nString( "devaccess.starteam.intro" ) );
StringBuffer command = new StringBuffer();
@@ -670,7 +652,7 @@ public class ScmReport
*/
private void anonymousAccessSVN( SvnScmProviderRepository svnRepo )
{
- paragraph( i18n.getString( "project-info-report", locale, "report.scm.anonymousaccess.svn.intro" ) );
+ paragraph( getI18nString( "anonymousaccess.svn.intro" ) );
StringBuffer sb = new StringBuffer();
sb.append( "$ svn checkout " ).append( svnRepo.getUrl() ).append( " " ).append( checkoutDirectoryName );
@@ -693,23 +675,19 @@ public class ScmReport
{
if ( svnRepo.getUrl().startsWith( "https://" ) )
{
- paragraph( i18n.getString( "project-info-report", locale,
- "report.scm.devaccess.svn.intro1.https" ) );
+ paragraph( getI18nString( "devaccess.svn.intro1.https" ) );
}
else if ( svnRepo.getUrl().startsWith( "svn://" ) )
{
- paragraph( i18n.getString( "project-info-report", locale,
- "report.scm.devaccess.svn.intro1.svn" ) );
+ paragraph( getI18nString( "devaccess.svn.intro1.svn" ) );
}
else if ( svnRepo.getUrl().startsWith( "svn+ssh://" ) )
{
- paragraph( i18n.getString( "project-info-report", locale,
- "report.scm.devaccess.svn.intro1.svnssh" ) );
+ paragraph( getI18nString( "devaccess.svn.intro1.svnssh" ) );
}
else
{
- paragraph( i18n.getString( "project-info-report", locale,
- "report.scm.devaccess.svn.intro1.other" ) );
+ paragraph( getI18nString( "devaccess.svn.intro1.other" ) );
}
}
@@ -719,7 +697,7 @@ public class ScmReport
verbatimText( sb.toString() );
- paragraph( i18n.getString( "project-info-report", locale, "report.scm.devaccess.svn.intro2" ) );
+ paragraph( getI18nString( "devaccess.svn.intro2" ) );
sb = new StringBuffer();
sb.append( "$ svn commit --username your-username -m \"A message\"" );
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java?rev=940663&r1=940662&r2=940663&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/TeamListReport.java Mon May 3 22:58:15 2010
@@ -24,7 +24,6 @@ import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.model.Contributor;
import org.apache.maven.model.Developer;
import org.apache.maven.model.Model;
-import org.apache.maven.reporting.AbstractMavenReportRenderer;
import org.codehaus.plexus.i18n.I18N;
import org.codehaus.plexus.util.StringUtils;
@@ -78,7 +77,7 @@ public class TeamListReport
* Internal renderer class
*/
private static class TeamListRenderer
- extends AbstractMavenReportRenderer
+ extends AbstractProjectInfoRenderer
{
private static final String PROPERTIES = "properties";
@@ -100,33 +99,24 @@ public class TeamListReport
private Model model;
- private I18N i18n;
-
- private Locale locale;
-
private static final String[] EMPTY_STRING_ARRAY = new String[0];
TeamListRenderer( Sink sink, Model model, I18N i18n, Locale locale )
{
- super( sink );
+ super( sink, i18n, locale );
this.model = model;
-
- this.i18n = i18n;
-
- this.locale = locale;
}
- /** {@inheritDoc} */
- public String getTitle()
+ protected String getI18Nsection()
{
- return i18n.getString( "project-info-report", locale, "report.team-list.title" );
+ return "team-list";
}
/** {@inheritDoc} */
public void renderBody()
{
- startSection( i18n.getString( "project-info-report", locale, "report.team-list.intro.title" ) );
+ startSection( getI18nString( "intro.title" ) );
// To handle JS
StringBuffer javascript = new StringBuffer( "function offsetDate(id, offset) {" ).append( SystemUtils.LINE_SEPARATOR );
@@ -143,21 +133,21 @@ public class TeamListReport
javascript.append( "function init(){" ).append( SystemUtils.LINE_SEPARATOR );
// Introduction
- paragraph( i18n.getString( "project-info-report", locale, "report.team-list.intro.description1" ) );
- paragraph( i18n.getString( "project-info-report", locale, "report.team-list.intro.description2" ) );
+ paragraph( getI18nString( "intro.description1" ) );
+ paragraph( getI18nString( "intro.description2" ) );
// Developer section
List developers = model.getDevelopers();
- startSection( i18n.getString( "project-info-report", locale, "report.team-list.developers.title" ) );
+ startSection( getI18nString( "developers.title" ) );
if ( developers == null || developers.isEmpty() )
{
- paragraph( i18n.getString( "project-info-report", locale, "report.team-list.nodeveloper" ) );
+ paragraph( getI18nString( "nodeveloper" ) );
}
else
{
- paragraph( i18n.getString( "project-info-report", locale, "report.team-list.developers.intro" ) );
+ paragraph( getI18nString( "developers.intro" ) );
startTable();
@@ -188,15 +178,15 @@ public class TeamListReport
// contributors section
List contributors = model.getContributors();
- startSection( i18n.getString( "project-info-report", locale, "report.team-list.contributors.title" ) );
+ startSection( getI18nString( "contributors.title" ) );
if ( contributors == null || contributors.isEmpty() )
{
- paragraph( i18n.getString( "project-info-report", locale, "report.team-list.nocontributor" ) );
+ paragraph( getI18nString( "nocontributor" ) );
}
else
{
- paragraph( i18n.getString( "project-info-report", locale, "report.team-list.contributors.intro" ) );
+ paragraph( getI18nString( "contributors.intro" ) );
startTable();
@@ -384,19 +374,15 @@ public class TeamListReport
private String[] getRequiredContrHeaderArray( Map requiredHeaders )
{
List requiredArray = new ArrayList();
- String name = i18n.getString( "project-info-report", locale, "report.team-list.contributors.name" );
- String email = i18n.getString( "project-info-report", locale, "report.team-list.contributors.email" );
- String url = i18n.getString( "project-info-report", locale, "report.team-list.contributors.url" );
- String organization = i18n.getString( "project-info-report", locale,
- "report.team-list.contributors.organization" );
- String organizationUrl = i18n.getString( "project-info-report", locale,
- "report.team-list.contributors.organizationurl" );
- String roles = i18n.getString( "project-info-report", locale, "report.team-list.contributors.roles" );
- String timeZone = i18n.getString( "project-info-report", locale, "report.team-list.contributors.timezone" );
- String actualTime = i18n.getString( "project-info-report", locale,
- "report.team-list.contributors.actualtime" );
- String properties = i18n.getString( "project-info-report", locale,
- "report.team-list.contributors.properties" );
+ String name = getI18nString( "contributors.name" );
+ String email = getI18nString( "contributors.email" );
+ String url = getI18nString( "contributors.url" );
+ String organization = getI18nString( "contributors.organization" );
+ String organizationUrl = getI18nString( "contributors.organizationurl" );
+ String roles = getI18nString( "contributors.roles" );
+ String timeZone = getI18nString( "contributors.timezone" );
+ String actualTime = getI18nString( "contributors.actualtime" );
+ String properties = getI18nString( "contributors.properties" );
setRequiredArray( requiredHeaders, requiredArray, name, email, url, organization, organizationUrl, roles,
timeZone, actualTime, properties );
@@ -418,20 +404,16 @@ public class TeamListReport
{
List requiredArray = new ArrayList();
- String id = i18n.getString( "project-info-report", locale, "report.team-list.developers.id" );
- String name = i18n.getString( "project-info-report", locale, "report.team-list.developers.name" );
- String email = i18n.getString( "project-info-report", locale, "report.team-list.developers.email" );
- String url = i18n.getString( "project-info-report", locale, "report.team-list.developers.url" );
- String organization = i18n.getString( "project-info-report", locale,
- "report.team-list.developers.organization" );
- String organizationUrl = i18n.getString( "project-info-report", locale,
- "report.team-list.developers.organizationurl" );
- String roles = i18n.getString( "project-info-report", locale, "report.team-list.developers.roles" );
- String timeZone = i18n.getString( "project-info-report", locale, "report.team-list.developers.timezone" );
- String actualTime = i18n
- .getString( "project-info-report", locale, "report.team-list.developers.actualtime" );
- String properties = i18n
- .getString( "project-info-report", locale, "report.team-list.developers.properties" );
+ String id = getI18nString( "developers.id" );
+ String name = getI18nString( "developers.name" );
+ String email = getI18nString( "developers.email" );
+ String url = getI18nString( "developers.url" );
+ String organization = getI18nString( "developers.organization" );
+ String organizationUrl = getI18nString( "developers.organizationurl" );
+ String roles = getI18nString( "developers.roles" );
+ String timeZone = getI18nString( "developers.timezone" );
+ String actualTime = getI18nString( "developers.actualtime" );
+ String properties = getI18nString( "developers.properties" );
if ( requiredHeaders.get( ID ) == Boolean.TRUE )
{
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=940663&r1=940662&r2=940663&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 Mon May 3 22:58:15 2010
@@ -54,11 +54,11 @@ import org.apache.maven.plugin.logging.L
import org.apache.maven.project.MavenProject;
import org.apache.maven.project.MavenProjectBuilder;
import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.report.projectinfo.AbstractProjectInfoRenderer;
import org.apache.maven.report.projectinfo.ProjectInfoReportUtils;
import org.apache.maven.report.projectinfo.dependencies.Dependencies;
import org.apache.maven.report.projectinfo.dependencies.DependenciesReportConfiguration;
import org.apache.maven.report.projectinfo.dependencies.RepositoryUtils;
-import org.apache.maven.reporting.AbstractMavenReportRenderer;
import org.apache.maven.settings.Settings;
import org.apache.maven.shared.dependency.tree.DependencyNode;
import org.apache.maven.shared.jar.JarData;
@@ -72,7 +72,7 @@ import org.codehaus.plexus.util.StringUt
* @since 2.1
*/
public class DependenciesRenderer
- extends AbstractMavenReportRenderer
+ extends AbstractProjectInfoRenderer
{
/** URL for the 'icon_info_sml.gif' image */
private static final String IMG_INFO_URL = "./images/icon_info_sml.gif";
@@ -99,10 +99,6 @@ public class DependenciesRenderer
private final DependenciesReportConfiguration configuration;
- private final Locale locale;
-
- private final I18N i18n;
-
private final Log log;
private final Settings settings;
@@ -162,7 +158,7 @@ public class DependenciesRenderer
{
throw new RuntimeException( e );
}
-
+
StringBuffer sb = new StringBuffer();
sb.append( "<script language=\"javascript\" type=\"text/javascript\">" ).append( SystemUtils.LINE_SEPARATOR );
sb.append( " function toggleDependencyDetail( divId, imgId )" ).append( SystemUtils.LINE_SEPARATOR );
@@ -207,10 +203,8 @@ public class DependenciesRenderer
ArtifactFactory artifactFactory, MavenProjectBuilder mavenProjectBuilder,
List remoteRepositories, ArtifactRepository localRepository )
{
- super( sink );
+ super( sink, i18n, locale );
- this.locale = locale;
- this.i18n = i18n;
this.log = log;
this.settings = settings;
this.dependencies = dependencies;
@@ -229,17 +223,16 @@ public class DependenciesRenderer
this.fileLengthDecimalFormat.setDecimalFormatSymbols( new DecimalFormatSymbols( locale ) );
}
+ protected String getI18Nsection()
+ {
+ return "dependencies";
+ }
+
// ----------------------------------------------------------------------
// Public methods
// ----------------------------------------------------------------------
/** {@inheritDoc} */
- public String getTitle()
- {
- return getReportString( "report.dependencies.title" );
- }
-
- /** {@inheritDoc} */
public void renderBody()
{
// Dependencies report
@@ -249,7 +242,7 @@ public class DependenciesRenderer
startSection( getTitle() );
// TODO: should the report just be excluded?
- paragraph( getReportString( "report.dependencies.nolist" ) );
+ paragraph( getI18nString( "nolist" ) );
endSection();
@@ -408,12 +401,12 @@ public class DependenciesRenderer
*/
private String[] getDependencyTableHeader( boolean withClassifier, boolean withOptional )
{
- String groupId = getReportString( "report.dependencies.column.groupId" );
- String artifactId = getReportString( "report.dependencies.column.artifactId" );
- String version = getReportString( "report.dependencies.column.version" );
- String classifier = getReportString( "report.dependencies.column.classifier" );
- String type = getReportString( "report.dependencies.column.type" );
- String optional = getReportString( "report.dependencies.column.optional" );
+ String groupId = getI18nString( "column.groupId" );
+ String artifactId = getI18nString( "column.artifactId" );
+ String version = getI18nString( "column.version" );
+ String classifier = getI18nString( "column.classifier" );
+ String type = getI18nString( "column.type" );
+ String optional = getI18nString( "column.optional" );
if ( withClassifier )
{
@@ -472,15 +465,15 @@ public class DependenciesRenderer
{
Map dependenciesByScope = dependencies.getDependenciesByScope( true );
- startSection( getReportString( "report.transitivedependencies.title" ) );
+ startSection( getI18nString( "transitive.title" ) );
if ( dependenciesByScope.values().isEmpty() )
{
- paragraph( getReportString( "report.transitivedependencies.nolist" ) );
+ paragraph( getI18nString( "transitive.nolist" ) );
}
else
{
- paragraph( getReportString( "report.transitivedependencies.intro" ) );
+ paragraph( getI18nString( "transitive.intro" ) );
renderDependenciesForAllScopes( dependenciesByScope, true );
}
@@ -490,7 +483,7 @@ public class DependenciesRenderer
private void renderSectionProjectDependencyGraph()
{
- startSection( getReportString( "report.dependencies.graph.title" ) );
+ startSection( getI18nString( "graph.title" ) );
// === SubSection: Dependency Tree
renderSectionDependencyTree();
@@ -503,7 +496,7 @@ public class DependenciesRenderer
sink.rawText( JAVASCRIPT );
// for Dependencies Graph Tree
- startSection( getReportString( "report.dependencies.graph.tree.title" ) );
+ startSection( getI18nString( "graph.tree.title" ) );
sink.list();
printDependencyListing( dependencyTreeNode );
@@ -514,20 +507,20 @@ public class DependenciesRenderer
private void renderSectionDependencyFileDetails()
{
- startSection( getReportString( "report.dependencies.file.details.title" ) );
+ startSection( getI18nString( "file.details.title" ) );
List alldeps = dependencies.getAllDependencies();
Collections.sort( alldeps, getArtifactComparator() );
// i18n
- String filename = getReportString( "report.dependencies.file.details.column.file" );
- String size = getReportString( "report.dependencies.file.details.column.size" );
- String entries = getReportString( "report.dependencies.file.details.column.entries" );
- String classes = getReportString( "report.dependencies.file.details.column.classes" );
- String packages = getReportString( "report.dependencies.file.details.column.packages" );
- String jdkrev = getReportString( "report.dependencies.file.details.column.jdkrev" );
- String debug = getReportString( "report.dependencies.file.details.column.debug" );
- String sealed = getReportString( "report.dependencies.file.details.column.sealed" );
+ String filename = getI18nString( "file.details.column.file" );
+ String size = getI18nString( "file.details.column.size" );
+ String entries = getI18nString( "file.details.column.entries" );
+ String classes = getI18nString( "file.details.column.classes" );
+ String packages = getI18nString( "file.details.column.packages" );
+ String jdkrev = getI18nString( "file.details.column.jdkrev" );
+ String debug = getI18nString( "file.details.column.debug" );
+ String sealed = getI18nString( "file.details.column.sealed" );
int[] justification =
new int[] { Sink.JUSTIFY_LEFT, Sink.JUSTIFY_RIGHT, Sink.JUSTIFY_RIGHT, Sink.JUSTIFY_RIGHT,
@@ -630,7 +623,7 @@ public class DependenciesRenderer
}
// Total raws
- tableHeader[0] = getReportString( "report.dependencies.file.details.total" );
+ tableHeader[0] = getI18nString( "file.details.total" );
tableHeader( tableHeader );
justification[0] = Sink.JUSTIFY_RIGHT;
@@ -727,7 +720,7 @@ public class DependenciesRenderer
private void renderSectionDependencyRepositoryLocations()
{
- startSection( getReportString( "report.dependencies.repo.locations.title" ) );
+ startSection( getI18nString( "repo.locations.title" ) );
// Collect Alphabetical Dependencies
List alldeps = dependencies.getAllDependencies();
@@ -767,7 +760,7 @@ public class DependenciesRenderer
private void renderSectionDependencyLicenseListing()
{
- startSection( getReportString( "report.dependencies.graph.tables.licenses" ) );
+ startSection( getI18nString( "graph.tables.licenses" ) );
printGroupedLicenses();
endSection();
}
@@ -784,11 +777,11 @@ public class DependenciesRenderer
Collections.sort( artifacts, getArtifactComparator() );
String anchorByScope =
- ( isTransitive ? getReportString( "report.transitivedependencies.title" ) + "_" + scope
- : getReportString( "report.dependencies.title" ) + "_" + scope );
+ ( isTransitive ? getI18nString( "transitive.title" ) + "_" + scope
+ : getI18nString( "title" ) + "_" + scope );
startSection( anchorByScope, scope );
- paragraph( getReportString( "report.dependencies.intro." + scope ) );
+ paragraph( getI18nString( "intro." + scope ) );
startTable();
tableHeader( tableHeader );
@@ -839,8 +832,8 @@ public class DependenciesRenderer
private void renderArtifactRow( Artifact artifact, boolean withClassifier, boolean withOptional )
{
String isOptional =
- artifact.isOptional() ? getReportString( "report.dependencies.column.isOptional" )
- : getReportString( "report.dependencies.column.isNotOptional" );
+ artifact.isOptional() ? getI18nString( "column.isOptional" )
+ : getI18nString( "column.isNotOptional" );
String url =
ProjectInfoReportUtils.getArtifactUrl( artifactFactory, artifact, mavenProjectBuilder, remoteRepositories,
@@ -917,7 +910,7 @@ public class DependenciesRenderer
{
Artifact artifact = node.getArtifact();
String id = artifact.getId();
- String unknownLicenseMessage = getReportString( "report.dependencies.graph.tables.unknown" );
+ String unknownLicenseMessage = getI18nString( "graph.tables.unknown" );
sink.rawText( "<div id=\"" + uid + "\" style=\"display:none\">" );
@@ -944,7 +937,7 @@ public class DependenciesRenderer
sink.paragraph();
sink.bold();
- sink.text( getReportString( "report.dependencies.column.description" ) + ": " );
+ sink.text( getI18nString( "column.description" ) + ": " );
sink.bold_();
if ( StringUtils.isNotEmpty( artifactDescription ) )
{
@@ -952,7 +945,7 @@ public class DependenciesRenderer
}
else
{
- sink.text( getReportString( "report.index.nodescription" ) );
+ sink.text( getI18nString( "index", "nodescription" ) );
}
sink.paragraph_();
@@ -960,7 +953,7 @@ public class DependenciesRenderer
{
sink.paragraph();
sink.bold();
- sink.text( getReportString( "report.dependencies.column.url" ) + ": " );
+ sink.text( getI18nString( "column.url" ) + ": " );
sink.bold_();
if ( ProjectInfoReportUtils.isArtifactUrlValid( artifactUrl ) )
{
@@ -977,7 +970,7 @@ public class DependenciesRenderer
sink.paragraph();
sink.bold();
- sink.text( getReportString( "report.license.title" ) + ": " );
+ sink.text( getI18nString( "license", "title" ) + ": " );
sink.bold_();
if ( !licenses.isEmpty() )
{
@@ -1003,7 +996,7 @@ public class DependenciesRenderer
}
else
{
- sink.text( getReportString( "report.license.nolicense" ) );
+ sink.text( getI18nString( "license", "nolicense" ) );
licenseMap.put( unknownLicenseMessage, artifactName );
}
@@ -1027,16 +1020,16 @@ public class DependenciesRenderer
sink.paragraph();
sink.bold();
- sink.text( getReportString( "report.dependencies.column.description" ) + ": " );
+ sink.text( getI18nString( "column.description" ) + ": " );
sink.bold_();
- sink.text( getReportString( "report.index.nodescription" ) );
+ sink.text( getI18nString( "index", "nodescription" ) );
sink.paragraph_();
if ( artifact.getFile() != null )
{
sink.paragraph();
sink.bold();
- sink.text( getReportString( "report.dependencies.column.url" ) + ": " );
+ sink.text( getI18nString( "column.url" ) + ": " );
sink.bold_();
sink.text( artifact.getFile().getAbsolutePath() );
sink.paragraph_();
@@ -1060,7 +1053,7 @@ public class DependenciesRenderer
sink.bold();
if ( StringUtils.isEmpty( licenseName ) )
{
- sink.text( i18n.getString( "project-info-report", locale, "report.dependencies.unamed" ) );
+ sink.text( getI18nString( "unamed" ) );
}
else
{
@@ -1088,17 +1081,17 @@ public class DependenciesRenderer
private void printRepositories( Map repoMap, List repoUrlBlackListed )
{
// i18n
- String repoid = getReportString( "report.dependencies.repo.locations.column.repoid" );
- String url = getReportString( "report.dependencies.repo.locations.column.url" );
- String release = getReportString( "report.dependencies.repo.locations.column.release" );
- String snapshot = getReportString( "report.dependencies.repo.locations.column.snapshot" );
- String blacklisted = getReportString( "report.dependencies.repo.locations.column.blacklisted" );
- String releaseEnabled = getReportString( "report.dependencies.repo.locations.cell.release.enabled" );
- String releaseDisabled = getReportString( "report.dependencies.repo.locations.cell.release.disabled" );
- String snapshotEnabled = getReportString( "report.dependencies.repo.locations.cell.snapshot.enabled" );
- String snapshotDisabled = getReportString( "report.dependencies.repo.locations.cell.snapshot.disabled" );
- String blacklistedEnabled = getReportString( "report.dependencies.repo.locations.cell.blacklisted.enabled" );
- String blacklistedDisabled = getReportString( "report.dependencies.repo.locations.cell.blacklisted.disabled" );
+ String repoid = getI18nString( "repo.locations.column.repoid" );
+ String url = getI18nString( "repo.locations.column.url" );
+ String release = getI18nString( "repo.locations.column.release" );
+ String snapshot = getI18nString( "repo.locations.column.snapshot" );
+ String blacklisted = getI18nString( "repo.locations.column.blacklisted" );
+ String releaseEnabled = getI18nString( "repo.locations.cell.release.enabled" );
+ String releaseDisabled = getI18nString( "repo.locations.cell.release.disabled" );
+ String snapshotEnabled = getI18nString( "repo.locations.cell.snapshot.enabled" );
+ String snapshotDisabled = getI18nString( "repo.locations.cell.snapshot.disabled" );
+ String blacklistedEnabled = getI18nString( "repo.locations.cell.blacklisted.enabled" );
+ String blacklistedDisabled = getI18nString( "repo.locations.cell.blacklisted.disabled" );
// Table header
@@ -1164,10 +1157,10 @@ public class DependenciesRenderer
private void printArtifactsLocations( Map repoMap, List alldeps )
{
// i18n
- String artifact = getReportString( "report.dependencies.repo.locations.column.artifact" );
+ String artifact = getI18nString( "repo.locations.column.artifact" );
sink.paragraph();
- sink.text( getReportString( "report.dependencies.repo.locations.artifact.breakdown" ) );
+ sink.text( getI18nString( "repo.locations.artifact.breakdown" ) );
sink.paragraph_();
List repoIdList = new ArrayList();
@@ -1286,7 +1279,7 @@ public class DependenciesRenderer
// Total row
// reused key
- tableHeader[0] = getReportString( "report.dependencies.file.details.total" );
+ tableHeader[0] = getI18nString( "file.details.total" );
tableHeader( tableHeader );
String[] totalRow = new String[repoIdList.size() + 1];
totalRow[0] = totaldeps.toString();
@@ -1304,11 +1297,6 @@ public class DependenciesRenderer
endTable();
}
- private String getReportString( String key )
- {
- return i18n.getString( "project-info-report", locale, key );
- }
-
/**
* @param artifacts not null
* @return <code>true</code> if one artifact in the list has a classifier, <code>false</code> otherwise.