Author: tchemit Date: 2012-05-02 13:03:13 +0200 (Wed, 02 May 2012) New Revision: 2343 Url: http://nuiton.org/repositories/revision/nuiton-utils/2343 Log: refs #2064: Add a ApplicationConfig report (options in asc order) Modified: trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReportRenderer.java 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:56:28 UTC (rev 2342) +++ trunk/nuiton-utils-maven-report-plugin/src/main/java/org/nuiton/util/plugin/report/ApplicationConfigReportRenderer.java 2012-05-02 11:03:13 UTC (rev 2343) @@ -33,7 +33,12 @@ import org.nuiton.util.ApplicationConfig; import org.nuiton.util.ApplicationConfigProvider; +import java.util.ArrayList; import java.util.Arrays; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; import java.util.Locale; import java.util.Set; @@ -210,7 +215,8 @@ sink.sectionTitle3_(); sink.lineBreak(); - ApplicationConfig.OptionDef[] options = configProvider.getOptions(); + Collection<ApplicationConfig.OptionDef> options = + getOptions(configProvider); renderOptionDefsTable(configProvider, options); @@ -238,9 +244,9 @@ } protected void renderOptionDefsTable(ApplicationConfigProvider configProvider, - ApplicationConfig.OptionDef... options) { + Collection<ApplicationConfig.OptionDef> options) { - if (options.length == 0) { + if (options.isEmpty()) { sink.paragraph(); sink.bold(); @@ -424,7 +430,7 @@ if (StringUtils.isBlank(defaultValue)) { defaultValue = getText("report.noDefaultValue"); } - return defaultValue; + return defaultValue; } protected void renderWarningIcon() { @@ -491,4 +497,19 @@ sink.tableCell_(); } + protected Collection<ApplicationConfig.OptionDef> getOptions( + ApplicationConfigProvider configProvider) { + List<ApplicationConfig.OptionDef> result = + new ArrayList<ApplicationConfig.OptionDef>( + Arrays.asList(configProvider.getOptions())); + Collections.sort(result, new Comparator<ApplicationConfig.OptionDef>() { + @Override + public int compare(ApplicationConfig.OptionDef o1, + ApplicationConfig.OptionDef o2) { + return o1.getKey().compareTo(o2.getKey()); + } + }); + return result; + } + }