Author: tchemit Date: 2012-05-02 12:56:28 +0200 (Wed, 02 May 2012) New Revision: 2342 Url: http://nuiton.org/repositories/revision/nuiton-utils/2342 Log: refs #2064: Add a ApplicationConfig report (last fix on render) Modified: trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReportRenderer.java trunk/nuiton-utils-maven-report-plugin/src/main/resources/application-config-report.properties trunk/nuiton-utils-maven-report-plugin/src/main/resources/application-config-report_fr.properties Modified: trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReportRenderer.java =================================================================== --- trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReportRenderer.java 2012-05-02 10:15:38 UTC (rev 2341) +++ trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReportRenderer.java 2012-05-02 10:56:28 UTC (rev 2342) @@ -29,6 +29,7 @@ import org.apache.maven.doxia.sink.SinkEventAttributeSet; import org.apache.maven.reporting.AbstractMavenReportRenderer; import org.codehaus.plexus.i18n.I18N; +import org.codehaus.plexus.util.StringUtils; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.ApplicationConfigProvider; @@ -237,7 +238,7 @@ } protected void renderOptionDefsTable(ApplicationConfigProvider configProvider, - ApplicationConfig.OptionDef[] options) { + ApplicationConfig.OptionDef... options) { if (options.length == 0) { @@ -280,7 +281,7 @@ if (!optionWithDetail) { sinkCellText(option.getType().getName()); } - sinkCellVerbatimText(option.getDefaultValue()); + sinkCellVerbatimText(getDefaultValue(option)); if (!optionWithDetail) { sinkCellText(getText(!option.isFinal())); sinkCellText(getText(!option.isTransient())); @@ -293,7 +294,7 @@ } } - protected void renderActionDefsTable(ApplicationConfig.ActionDef[] actions) { + protected void renderActionDefsTable(ApplicationConfig.ActionDef... actions) { if (actions.length == 0) { @@ -332,7 +333,8 @@ sink.section4(); sink.sectionTitle4(); sink.anchor("detail_" + configProvider.getName() + "_" + option.getKey()); - sink.text(getText("report.config.option.detail") + " " + option.getKey()); + sink.text(getText("report.config.option.detail") + " '" + option.getKey() + + "'"); sink.sectionTitle4_(); sink.lineBreak(); @@ -353,7 +355,7 @@ sinkHeaderCellText(headerWidth, getText("report.config.option.description")); sink.tableCell(cellWidth); sink.nonBreakingSpace(); - sink.text(option.getDescription()); + sink.text(l_(locale, option.getDescription())); sink.tableCell_(); sink.tableRow_(); @@ -362,7 +364,7 @@ sink.tableCell(cellWidth); sink.nonBreakingSpace(); sink.bold(); - sink.text(option.getDefaultValue()); + sink.text(getDefaultValue(option)); sink.bold_(); sink.tableCell_(); sink.tableRow_(); @@ -379,7 +381,7 @@ sinkHeaderCellText(headerWidth, getText("report.config.option.final")); sink.tableCell(cellWidth); sink.nonBreakingSpace(); - sink.text(getText(option.isFinal())); + sink.text(getText(!option.isFinal())); sink.tableCell_(); sink.tableRow_(); @@ -387,7 +389,7 @@ sinkHeaderCellText(headerWidth, getText("report.config.option.transient")); sink.tableCell(cellWidth); sink.nonBreakingSpace(); - sink.text(getText(option.isTransient())); + sink.text(getText(!option.isTransient())); sink.tableCell_(); sink.tableRow_(); @@ -403,8 +405,8 @@ } - protected String getText(Boolean key) { - return i18n.getString(bundleName, locale, "report." + String.valueOf(key)); + protected String getText(boolean key) { + return getText("report." + String.valueOf(key)); } /** @@ -417,6 +419,14 @@ return i18n.getString(bundleName, locale, key); } + protected String getDefaultValue(ApplicationConfig.OptionDef option) { + String defaultValue = option.getDefaultValue(); + if (StringUtils.isBlank(defaultValue)) { + defaultValue = getText("report.noDefaultValue"); + } + return defaultValue; + } + protected void renderWarningIcon() { sink.figure(); sink.figureGraphics("images/icon_warning_sml.gif"); Modified: trunk/nuiton-utils-maven-report-plugin/src/main/resources/application-config-report.properties =================================================================== --- trunk/nuiton-utils-maven-report-plugin/src/main/resources/application-config-report.properties 2012-05-02 10:15:38 UTC (rev 2341) +++ trunk/nuiton-utils-maven-report-plugin/src/main/resources/application-config-report.properties 2012-05-02 10:56:28 UTC (rev 2342) @@ -28,6 +28,7 @@ report.overview.text=This report summarizes all configuration options useable on the project. report.detail.text.noConfig=No configuration found in class-path. report.config.name=Name of configuration +report.noDefaultValue=No default value report.config.description=Description report.config.nbOptions=Number of options report.config.nbActions=Number of actions Modified: trunk/nuiton-utils-maven-report-plugin/src/main/resources/application-config-report_fr.properties =================================================================== --- trunk/nuiton-utils-maven-report-plugin/src/main/resources/application-config-report_fr.properties 2012-05-02 10:15:38 UTC (rev 2341) +++ trunk/nuiton-utils-maven-report-plugin/src/main/resources/application-config-report_fr.properties 2012-05-02 10:56:28 UTC (rev 2342) @@ -28,6 +28,7 @@ report.overview.text=Ce rapport d\u00E9crit les configurations utilisables dans ce projet. report.detail.text.noConfig=Aucune configuration trouv\u00E9e dans le class-path. report.config.option.key=Clef +report.noDefaultValue=Pas de valeur par d\u00E9faut report.config.option.description=Description report.config.option.type=Type report.config.option.defaultValue=Valeur par d\u00E9faut