maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From micha...@apache.org
Subject svn commit: r1721951 - in /maven/plugins/branches/MPIR-251: ./ src/main/java/org/apache/maven/report/projectinfo/ src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/ src/main/resources/
Date Mon, 28 Dec 2015 17:07:14 GMT
Author: michaelo
Date: Mon Dec 28 17:07:14 2015
New Revision: 1721951

URL: http://svn.apache.org/viewvc?rev=1721951&view=rev
Log:
Merge with trunk

Modified:
    maven/plugins/branches/MPIR-251/   (props changed)
    maven/plugins/branches/MPIR-251/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
    maven/plugins/branches/MPIR-251/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
    maven/plugins/branches/MPIR-251/src/main/resources/project-info-report.properties
    maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_cs.properties
    maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_de.properties
    maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_es.properties
    maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_fr.properties
    maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_pt.properties
    maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_ru.properties

Propchange: maven/plugins/branches/MPIR-251/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 28 17:07:14 2015
@@ -1 +1,2 @@
 /maven/plugins/branches/MPIR-279:1636164-1639524
+/maven/plugins/trunk/maven-project-info-reports-plugin:1721757-1721949

Modified: maven/plugins/branches/MPIR-251/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MPIR-251/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java?rev=1721951&r1=1721950&r2=1721951&view=diff
==============================================================================
--- maven/plugins/branches/MPIR-251/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
(original)
+++ maven/plugins/branches/MPIR-251/src/main/java/org/apache/maven/report/projectinfo/DependencyConvergenceReport.java
Mon Dec 28 17:07:14 2015
@@ -711,6 +711,7 @@ public class DependencyConvergenceReport
     {
         sink.figure();
         sink.figureCaption();
+        // TODO Translate me!
         sink.text( "success" );
         sink.figureCaption_();
         sink.figureGraphics( "images/icon_success_sml.gif" );
@@ -721,6 +722,7 @@ public class DependencyConvergenceReport
     {
         sink.figure();
         sink.figureCaption();
+        // TODO Translate me!
         sink.text( "error" );
         sink.figureCaption_();
         sink.figureGraphics( "images/icon_error_sml.gif" );

Modified: maven/plugins/branches/MPIR-251/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MPIR-251/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java?rev=1721951&r1=1721950&r2=1721951&view=diff
==============================================================================
--- maven/plugins/branches/MPIR-251/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
(original)
+++ maven/plugins/branches/MPIR-251/src/main/java/org/apache/maven/report/projectinfo/dependencies/renderer/DependenciesRenderer.java
Mon Dec 28 17:07:14 2015
@@ -518,6 +518,8 @@ public class DependenciesRenderer
         String debugInformationCellYes = getI18nString( "file.details.cell.debuginformation.yes"
);
         String debugInformationCellNo = getI18nString( "file.details.cell.debuginformation.no"
);
         String sealed = getI18nString( "file.details.column.sealed" );
+        String sealedCellYes = getI18nString( "file.details.cell.sealed.yes" );
+        String sealedCellNo = getI18nString( "file.details.cell.sealed.no" );
 
         int[] justification =
             new int[] { Sink.JUSTIFY_LEFT, Sink.JUSTIFY_RIGHT, Sink.JUSTIFY_RIGHT, Sink.JUSTIFY_RIGHT,
@@ -597,10 +599,10 @@ public class DependenciesRenderer
                         // ignore
                     }
 
-                    String sealedstr = "";
+                    String sealedCellValue = sealedCellNo;
                     if ( jarDetails.isSealed() )
                     {
-                        sealedstr = "sealed";
+                        sealedCellValue = sealedCellYes;
                         totalsealed.incrementTotal( artifact.getScope() );
                     }
 
@@ -619,7 +621,7 @@ public class DependenciesRenderer
                                   DEFAULT_DECIMAL_FORMAT.format( jarDetails.getNumEntries()
),
                                   DEFAULT_DECIMAL_FORMAT.format( jarDetails.getNumClasses()
),
                                   DEFAULT_DECIMAL_FORMAT.format( jarDetails.getNumPackages()
),
-                                  jarDetails.getJdkRevision(), debugInformationCellValue,
sealedstr } );
+                                  jarDetails.getJdkRevision(), debugInformationCellValue,
sealedCellValue } );
                 }
                 catch ( IOException e )
                 {
@@ -1441,6 +1443,7 @@ public class DependenciesRenderer
 
                         sink.figure();
                         sink.figureCaption();
+                        // TODO Translate me!
                         sink.text( "Found at " + repo.getUrl() );
                         sink.figureCaption_();
                         sink.figureGraphics( "images/icon_success_sml.gif" );

Modified: maven/plugins/branches/MPIR-251/src/main/resources/project-info-report.properties
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MPIR-251/src/main/resources/project-info-report.properties?rev=1721951&r1=1721950&r2=1721951&view=diff
==============================================================================
--- maven/plugins/branches/MPIR-251/src/main/resources/project-info-report.properties (original)
+++ maven/plugins/branches/MPIR-251/src/main/resources/project-info-report.properties Mon
Dec 28 17:07:14 2015
@@ -53,6 +53,8 @@ report.dependencies.column.version
 report.dependencies.description                                    = This document lists
the project's dependencies and provides information on each dependency.
 report.dependencies.file.details.cell.debuginformation.yes         = Yes
 report.dependencies.file.details.cell.debuginformation.no          = No
+report.dependencies.file.details.cell.sealed.yes                   = Yes
+report.dependencies.file.details.cell.sealed.no                    = No
 report.dependencies.file.details.column.classes                    = Classes
 report.dependencies.file.details.column.debuginformation           = Debug Information
 report.dependencies.file.details.column.entries                    = Entries

Modified: maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_cs.properties
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_cs.properties?rev=1721951&r1=1721950&r2=1721951&view=diff
==============================================================================
--- maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_cs.properties (original)
+++ maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_cs.properties Mon
Dec 28 17:07:14 2015
@@ -53,6 +53,8 @@ report.dependencies.column.version
 report.dependencies.description                                    = Tento dokument obsahuje
seznamem z\u00e1vislost\u00ed projektu a poskytuje informaci o ka\u017ed\u00e9 z nich.
 report.dependencies.file.details.cell.debuginformation.yes         = Ano
 report.dependencies.file.details.cell.debuginformation.no          = Ne
+report.dependencies.file.details.cell.sealed.yes                   = Ano
+report.dependencies.file.details.cell.sealed.no                    = Ne
 report.dependencies.file.details.column.classes                    = T\u0159\u00eddy
 report.dependencies.file.details.column.entries                    = Z\u00e1znamy
 report.dependencies.file.details.column.file                       = N\u00e1zev souboru

Modified: maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_de.properties
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_de.properties?rev=1721951&r1=1721950&r2=1721951&view=diff
==============================================================================
--- maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_de.properties (original)
+++ maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_de.properties Mon
Dec 28 17:07:14 2015
@@ -53,6 +53,8 @@ report.dependencies.column.version
 report.dependencies.description                                    = Informationen \u00fcber
die Abh\u00e4ngigkeiten dieses Projektes.
 report.dependencies.file.details.cell.debuginformation.yes         = Ja
 report.dependencies.file.details.cell.debuginformation.no          = Nein
+report.dependencies.file.details.cell.sealed.yes                   = Ja
+report.dependencies.file.details.cell.sealed.no                    = Nein
 report.dependencies.file.details.column.classes                    = Klassen
 report.dependencies.file.details.column.debuginformation           = Debug-Informationen
 report.dependencies.file.details.column.entries                    = Eintr\u00e4ge

Modified: maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_es.properties
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_es.properties?rev=1721951&r1=1721950&r2=1721951&view=diff
==============================================================================
--- maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_es.properties (original)
+++ maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_es.properties Mon
Dec 28 17:07:14 2015
@@ -53,6 +53,8 @@ report.dependencies.column.version
 report.dependencies.description                                    = Este documento presenta
las dependencias del proyecto y proporciona informaci\u00f3n sobre cada dependencia.
 report.dependencies.file.details.cell.debuginformation.yes         = S\u00ed
 report.dependencies.file.details.cell.debuginformation.no          = No
+report.dependencies.file.details.cell.sealed.yes                   = S\u00ed
+report.dependencies.file.details.cell.sealed.no                    = No
 report.dependencies.file.details.column.classes                    = Clases
 report.dependencies.file.details.column.entries                    = Entries
 report.dependencies.file.details.column.file                       = Fichero

Modified: maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_fr.properties
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_fr.properties?rev=1721951&r1=1721950&r2=1721951&view=diff
==============================================================================
--- maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_fr.properties (original)
+++ maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_fr.properties Mon
Dec 28 17:07:14 2015
@@ -53,6 +53,8 @@ report.dependencies.column.version
 report.dependencies.description                                    = Ce document liste les
d\u00e9pendances du projet et fournit des informations sur chaque d\u00e9pendance.
 report.dependencies.file.details.cell.debuginformation.yes         = Oui
 report.dependencies.file.details.cell.debuginformation.no          = Non
+report.dependencies.file.details.cell.sealed.yes                   = Oui
+report.dependencies.file.details.cell.sealed.no                    = Non
 report.dependencies.file.details.column.classes                    = Classes
 report.dependencies.file.details.column.entries                    = Entr\u00e9es
 report.dependencies.file.details.column.file                       = Nom du fichier

Modified: maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_pt.properties
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_pt.properties?rev=1721951&r1=1721950&r2=1721951&view=diff
==============================================================================
--- maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_pt.properties (original)
+++ maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_pt.properties Mon
Dec 28 17:07:14 2015
@@ -52,6 +52,8 @@ report.dependencies.column.version
 report.dependencies.description                                    = Este documento enumera
as depend\u00eancias do projecto e fornece informa\u00e7\u00f5es de cada uma.
 report.dependencies.file.details.cell.debuginformation.yes         = Sim
 report.dependencies.file.details.cell.debuginformation.no          = N\u00e3o
+report.dependencies.file.details.cell.sealed.yes                   = Sim
+report.dependencies.file.details.cell.sealed.no                    = N\u00e3o
 report.dependencies.file.details.column.classes                    = Classes
 report.dependencies.file.details.column.entries                    = Entradas
 report.dependencies.file.details.column.file                       = Nome do ficheiro

Modified: maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_ru.properties
URL: http://svn.apache.org/viewvc/maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_ru.properties?rev=1721951&r1=1721950&r2=1721951&view=diff
==============================================================================
--- maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_ru.properties (original)
+++ maven/plugins/branches/MPIR-251/src/main/resources/project-info-report_ru.properties Mon
Dec 28 17:07:14 2015
@@ -52,6 +52,8 @@ report.dependencies.column.version
 report.dependencies.description                                    = \u0417\u0434\u0435\u0441\u044c
\u043c\u043e\u0436\u043d\u043e \u043d\u0430\u0439\u0442\u0438 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e
\u043e \u0432\u0441\u0435\u0445 \u0437\u0430\u0432\u0438\u0441\u0438\u043c\u043e\u0441\u0442\u044f\u0445
\u043f\u0440\u043e\u0435\u043a\u0442\u0430.
 report.dependencies.file.details.cell.debuginformation.yes         = \u0414\u0430
 report.dependencies.file.details.cell.debuginformation.no          = \u041d\u0435\u0442
+report.dependencies.file.details.cell.sealed.yes                   = \u0414\u0430
+report.dependencies.file.details.cell.sealed.no                    = \u041d\u0435\u0442
 report.dependencies.file.details.column.classes                    = \u041a\u043b\u0430\u0441\u0441\u044b
 report.dependencies.file.details.column.entries                    = \u0417\u0430\u043f\u0438\u0441\u044c
 report.dependencies.file.details.column.file                       = \u0418\u043c\u044f \u0444\u0430\u0439\u043b\u0430



Mime
View raw message