You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2014/02/02 15:25:13 UTC
svn commit: r1563620 - in
/maven/plugins/trunk/maven-checkstyle-plugin/src/main:
java/org/apache/maven/plugin/checkstyle/ resources/
Author: michaelo
Date: Sun Feb 2 14:25:12 2014
New Revision: 1563620
URL: http://svn.apache.org/r1563620
Log:
[MCHECKSTYLE-209] Correct grammar and make icons and text consistent in the report
- Do not add alternative text to icons because they are always acompanied by a text. Non-image rendering would lead into duplicate text.
- Unify output of icon and text: It is now always <icon> <text>
- Details table: First columns is severity and not violation
- There is no plural for information in English
- Correct spelling in German bundle
Modified:
maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report.properties
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report_de.properties
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report_fr.properties
maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report_pt_BR.properties
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java?rev=1563620&r1=1563619&r2=1563620&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/java/org/apache/maven/plugin/checkstyle/CheckstyleReportGenerator.java Sun Feb 2 14:25:12 2014
@@ -204,9 +204,6 @@ public class CheckstyleReportGenerator
private void iconInfo()
{
sink.figure();
- sink.figureCaption();
- sink.text( bundle.getString( "report.checkstyle.infos" ) );
- sink.figureCaption_();
sink.figureGraphics( "images/icon_info_sml.gif" );
sink.figure_();
}
@@ -214,9 +211,6 @@ public class CheckstyleReportGenerator
private void iconWarning()
{
sink.figure();
- sink.figureCaption();
- sink.text( bundle.getString( "report.checkstyle.warnings" ) );
- sink.figureCaption_();
sink.figureGraphics( "images/icon_warning_sml.gif" );
sink.figure_();
}
@@ -224,9 +218,6 @@ public class CheckstyleReportGenerator
private void iconError()
{
sink.figure();
- sink.figureCaption();
- sink.text( bundle.getString( "report.checkstyle.errors" ) );
- sink.figureCaption_();
sink.figureGraphics( "images/icon_error_sml.gif" );
sink.figure_();
}
@@ -581,21 +572,21 @@ public class CheckstyleReportGenerator
sink.tableHeaderCell_();
sink.tableHeaderCell();
- sink.text( bundle.getString( "report.checkstyle.infos" ) );
- sink.nonBreakingSpace();
iconInfo();
+ sink.nonBreakingSpace();
+ sink.text( bundle.getString( "report.checkstyle.infos" ) );
sink.tableHeaderCell_();
sink.tableHeaderCell();
- sink.text( bundle.getString( "report.checkstyle.warnings" ) );
- sink.nonBreakingSpace();
iconWarning();
+ sink.nonBreakingSpace();
+ sink.text( bundle.getString( "report.checkstyle.warnings" ) );
sink.tableHeaderCell_();
sink.tableHeaderCell();
- sink.text( bundle.getString( "report.checkstyle.errors" ) );
- sink.nonBreakingSpace();
iconError();
+ sink.nonBreakingSpace();
+ sink.text( bundle.getString( "report.checkstyle.errors" ) );
sink.tableHeaderCell_();
sink.tableRow_();
@@ -633,19 +624,19 @@ public class CheckstyleReportGenerator
sink.text( bundle.getString( "report.checkstyle.files" ) );
sink.tableHeaderCell_();
sink.tableHeaderCell();
- sink.text( bundle.getString( "report.checkstyle.infos.abbrev" ) );
- sink.nonBreakingSpace();
iconInfo();
+ sink.nonBreakingSpace();
+ sink.text( bundle.getString( "report.checkstyle.infos.abbrev" ) );
sink.tableHeaderCell_();
sink.tableHeaderCell();
- sink.text( bundle.getString( "report.checkstyle.warnings.abbrev" ) );
- sink.nonBreakingSpace();
iconWarning();
+ sink.nonBreakingSpace();
+ sink.text( bundle.getString( "report.checkstyle.warnings.abbrev" ) );
sink.tableHeaderCell_();
sink.tableHeaderCell();
- sink.text( bundle.getString( "report.checkstyle.errors.abbrev" ) );
- sink.nonBreakingSpace();
iconError();
+ sink.nonBreakingSpace();
+ sink.text( bundle.getString( "report.checkstyle.errors.abbrev" ) );
sink.tableHeaderCell_();
sink.tableRow_();
@@ -722,7 +713,7 @@ public class CheckstyleReportGenerator
sink.table();
sink.tableRow();
sink.tableHeaderCell();
- sink.text( bundle.getString( "report.checkstyle.column.violation" ) );
+ sink.text( bundle.getString( "report.checkstyle.column.severity" ) );
sink.tableHeaderCell_();
sink.tableHeaderCell();
sink.text( bundle.getString( "report.checkstyle.column.message" ) );
@@ -747,7 +738,7 @@ public class CheckstyleReportGenerator
{
SeverityLevel level = event.getSeverityLevel();
- if ( ( getSeverityLevel() != null ) && !getSeverityLevel().equals( level ) )
+ if ( ( getSeverityLevel() != null ) && !( getSeverityLevel() != level ) )
{
continue;
}
@@ -756,17 +747,25 @@ public class CheckstyleReportGenerator
sink.tableCell();
- if ( SeverityLevel.INFO.equals( level ) )
+ switch( level )
{
+ case INFO:
iconInfo();
- }
- else if ( SeverityLevel.WARNING.equals( level ) )
- {
+ sink.nonBreakingSpace();
+ sink.text( bundle.getString( "report.checkstyle.info" ) );
+ break;
+ case WARNING:
iconWarning();
- }
- else if ( SeverityLevel.ERROR.equals( level ) )
- {
+ sink.nonBreakingSpace();
+ sink.text( bundle.getString( "report.checkstyle.warning" ) );
+ break;
+ case ERROR:
iconError();
+ sink.nonBreakingSpace();
+ sink.text( bundle.getString( "report.checkstyle.error" ) );
+ break;
+ default:
+ break;
}
sink.tableCell_();
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report.properties?rev=1563620&r1=1563619&r2=1563620&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report.properties (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report.properties Sun Feb 2 14:25:12 2014
@@ -24,10 +24,13 @@ report.checkstyle.column.line=Line
report.checkstyle.column.message=Message
report.checkstyle.checkstylelink=The following document contains the results of
report.checkstyle.files=Files
-report.checkstyle.infos=Infos
+report.checkstyle.info=Info
+report.checkstyle.infos=Info
report.checkstyle.infos.abbrev=I
+report.checkstyle.warning=Warning
report.checkstyle.warnings=Warnings
report.checkstyle.warnings.abbrev=W
+report.checkstyle.error=Error
report.checkstyle.errors=Errors
report.checkstyle.errors.abbrev=E
report.checkstyle.error=Error
@@ -36,4 +39,4 @@ report.checkstyle.details=Details
report.checkstyle.summary=Summary
report.checkstyle.rules=Rules
report.checkstyle.severity_title=Checkstyle errors in severity
-report.checkstyle.norule=No Rules found
+report.checkstyle.norule=No rules found
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report_de.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report_de.properties?rev=1563620&r1=1563619&r2=1563620&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report_de.properties (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report_de.properties Sun Feb 2 14:25:12 2014
@@ -16,24 +16,26 @@
# under the License.
report.checkstyle.name=Checkstyle
-report.checkstyle.description=Bericht über Konventionen für den Code-Stil.
-report.checkstyle.title=Checkstyle Ergebnisse
+report.checkstyle.description=Bericht über Konventionen für den Codestil.
+report.checkstyle.title=Checkstyle-Ergebnisse
report.checkstyle.column.violation=Verstoß
report.checkstyle.column.severity=Schweregrad
report.checkstyle.column.line=Zeile
report.checkstyle.column.message=Meldung
report.checkstyle.checkstylelink=Dieses Dokument enthält die Ergebnisse von
report.checkstyle.files=Dateien
+report.checkstyle.info=Info
report.checkstyle.infos=Infos
report.checkstyle.infos.abbrev=I
+report.checkstyle.warning=Warnung
report.checkstyle.warnings=Warnungen
report.checkstyle.warnings.abbrev=W
+report.checkstyle.error=Fehler
report.checkstyle.errors=Fehler
report.checkstyle.errors.abbrev=F
-report.checkstyle.error=Fehler
report.checkstyle.violations=Verstöße
report.checkstyle.details=Details
report.checkstyle.summary=Zusammenfassung
report.checkstyle.rules=Regeln
-report.checkstyle.severity_title=Checkstyle Ergebnisse mit Schweregrad
+report.checkstyle.severity_title=Checkstyle-Ergebnisse mit Schweregrad
report.checkstyle.norule=Keine Regeln definiert
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report_fr.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report_fr.properties?rev=1563620&r1=1563619&r2=1563620&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report_fr.properties (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report_fr.properties Sun Feb 2 14:25:12 2014
@@ -24,13 +24,15 @@ report.checkstyle.column.line=Ligne
report.checkstyle.column.message=Message
report.checkstyle.checkstylelink=Le document suivant contient les résultats de
report.checkstyle.files=Fichiers
+report.checkstyle.info=Info
report.checkstyle.infos=Infos
report.checkstyle.infos.abbrev=I
+report.checkstyle.warning=Avertissement
report.checkstyle.warnings=Avertissements
report.checkstyle.warnings.abbrev=A
+report.checkstyle.error=Erreur
report.checkstyle.errors=Erreurs
report.checkstyle.errors.abbrev=E
-report.checkstyle.error=Erreur
report.checkstyle.violations=Violations
report.checkstyle.details=Détails
report.checkstyle.summary=Résumé
Modified: maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report_pt_BR.properties
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report_pt_BR.properties?rev=1563620&r1=1563619&r2=1563620&view=diff
==============================================================================
--- maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report_pt_BR.properties (original)
+++ maven/plugins/trunk/maven-checkstyle-plugin/src/main/resources/checkstyle-report_pt_BR.properties Sun Feb 2 14:25:12 2014
@@ -24,13 +24,15 @@ report.checkstyle.column.line=Linha
report.checkstyle.column.message=Mensagem
report.checkstyle.checkstylelink=O seguinte documento contém os resultados de
report.checkstyle.files=Arquivos
+report.checkstyle.info=Informativo
report.checkstyle.infos=Informativos
report.checkstyle.infos.abbrev=I
+report.checkstyle.warning=Alerta
report.checkstyle.warnings=Alertas
report.checkstyle.warnings.abbrev=A
+report.checkstyle.error=Erro
report.checkstyle.errors=Erros
report.checkstyle.errors.abbrev=E
-report.checkstyle.error=Erro
report.checkstyle.violations=Violações
report.checkstyle.details=Detalhes
report.checkstyle.summary=Sumário