Author: tchemit Date: 2012-03-20 23:36:31 +0100 (Tue, 20 Mar 2012) New Revision: 240 Url: http://nuiton.org/repositories/revision/jredmine/240 Log: fixes #2018 (report api update) Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java 2012-03-20 22:35:30 UTC (rev 239) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractIssuesReport.java 2012-03-20 22:36:31 UTC (rev 240) @@ -71,7 +71,7 @@ @Override public final String getOutputName() { - return "redmine-report" + (group == null ? "" : ("-by-" + group)); + return "redmine-report" + (group == null ? "" : "-by-" + group); } @Override @@ -178,7 +178,7 @@ report.setTrackers(service.getTrackers(id)); report.setVersions(service.getVersions(id)); - report.doGenerateReport(getBundle(locale), getSink(), getLog()); + report.doGenerateReport(getBundle(locale), getSink()); } } catch (MavenReportException mre) { @@ -186,7 +186,7 @@ // so that the build fails throw mre; } catch (Exception e) { - e.printStackTrace(); + getLog().error("Could not execute report", e); } } Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java 2012-03-20 22:35:30 UTC (rev 239) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/AbstractRedmineReport.java 2012-03-20 22:36:31 UTC (rev 240) @@ -33,6 +33,7 @@ import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; import org.apache.maven.artifact.versioning.VersionRange; import org.apache.maven.doxia.sink.Sink; +import org.apache.maven.doxia.sink.render.RenderingContext; import org.apache.maven.doxia.site.decoration.Body; import org.apache.maven.doxia.site.decoration.DecorationModel; import org.apache.maven.doxia.site.decoration.Skin; @@ -43,7 +44,6 @@ import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.reporting.MavenReport; import org.apache.maven.reporting.MavenReportException; -import org.apache.maven.reporting.sink.SinkFactory; import org.codehaus.plexus.i18n.I18N; import org.nuiton.jredmine.plugin.AbstractRedmineMojo; @@ -187,8 +187,13 @@ String filename = getOutputName() + ".html"; File file = new File(outputDirectory, filename); - SiteRendererSink sink = SinkFactory.createSink(outputDirectory, filename); + RenderingContext context = new RenderingContext(outputDirectory, getOutputName() + ".html"); + //SiteRendererSink sink = SinkFactory.createSink(outputDirectory, filename); + + SiteRendererSink sink = new SiteRendererSink(context); + + generate(sink, currentLocale); Writer writer = new FileWriter(file); @@ -196,7 +201,7 @@ try { siteRenderer.generateDocument(writer, sink, siteContext); } finally { - + writer.close(); } Modified: trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java =================================================================== --- trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java 2012-03-20 22:35:30 UTC (rev 239) +++ trunk/jredmine-maven-plugin/src/main/java/org/nuiton/jredmine/plugin/report/IssueReportGenerator.java 2012-03-20 22:36:31 UTC (rev 240) @@ -71,12 +71,11 @@ * <p/> * Can retreave th i18n header key by {@link #getI18nKey()} and have the * logic of each cell generation in the method - * {@link #sinkInsideCell(org.apache.maven.doxia.sink.Sink, org.nuiton.jredmine.plugin.report.IssueReportGenerator, org.nuiton.jredmine.model.Issue)} + * {@link #sinkInsideCell(Sink, org.nuiton.jredmine.plugin.report.IssueReportGenerator, Issue)} */ public enum ReportColumn { key(false, "report.label.key") { - @Override public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { generator.constructIssueLink(issue, sink); @@ -88,7 +87,6 @@ } }, summary(false, "report.label.summary") { - @Override public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { generator.sinkRawText(sink, issue.getDescription()); @@ -100,18 +98,17 @@ } }, status(true, "report.label.status") { - @Override public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { int id = issue.getStatusId(); - String t = id + ""; +// String t = id + ""; IssueStatus status = generator.getIssueStatus(id); - if (status == null) { - t = id == 0 ? "-" : t; - } else { - t = status.getName(); - } +// if (status == null) { +// t = id == 0 ? "-" : t; +// } else { +// t = status.getName(); +// } generator.sinkI18nAble(sink, id, status); } @@ -122,7 +119,6 @@ } }, assignee(true, "report.label.by") { - @Override public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { int id = issue.getAssignedToId(); @@ -144,7 +140,6 @@ } }, reporter(true, "report.label.reporter") { - @Override public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { int id = issue.getAuthorId(); @@ -166,7 +161,6 @@ } }, tracker(true, "report.label.type") { - @Override public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { int id = issue.getTrackerId(); @@ -180,7 +174,6 @@ } }, priority(true, "report.label.priority") { - @Override public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { int id = issue.getPriorityId(); @@ -194,7 +187,6 @@ } }, version(true, "report.label.version") { - @Override public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { int id = issue.getFixedVersionId(); @@ -208,7 +200,6 @@ } }, category(true, "report.label.category") { - @Override public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { int id = issue.getCategoryId(); @@ -222,7 +213,6 @@ } }, createdon(false, "report.label.created") { - @Override public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { Date d = issue.getCreatedOn(); @@ -235,7 +225,6 @@ } }, updatedon(false, "report.label.updated") { - @Override public void sinkInsideCell(Sink sink, IssueReportGenerator generator, Issue issue) { Date d = issue.getUpdatedOn(); @@ -252,7 +241,7 @@ private String i18nKey; - private ReportColumn(boolean canGroup, String i18nKey) { + ReportColumn(boolean canGroup, String i18nKey) { this.canGroup = canGroup; this.i18nKey = i18nKey; } @@ -372,7 +361,7 @@ sinkEndReport(sink); } - public void doGenerateReport(ResourceBundle bundle, Sink sink, Log log) + public void doGenerateReport(ResourceBundle bundle, Sink sink) throws MojoExecutionException { if (issues != null && issues.length == 0) { @@ -436,7 +425,7 @@ * @return {@code true} if issue links can be generated, {@code false} otherwise. */ public boolean canGenerateIssueLinks() { - return !StringUtils.isEmpty(issueLinkTemplate) && (!StringUtils.isBlank(getUrl()) || issueLinkTemplate.indexOf(URL_TOKEN) < 0); + return !StringUtils.isEmpty(issueLinkTemplate) && (!StringUtils.isBlank(getUrl()) || !issueLinkTemplate.contains(URL_TOKEN)); } /** @@ -445,7 +434,7 @@ * @return {@code true} if issue links can be generated, {@code false} otherwise. */ public boolean canGenerateVersionLinks() { - return !StringUtils.isEmpty(versionLinkTemplate) && (!StringUtils.isBlank(getUrl()) || versionLinkTemplate.indexOf(URL_TOKEN) < 0); + return !StringUtils.isEmpty(versionLinkTemplate) && (!StringUtils.isBlank(getUrl()) || !versionLinkTemplate.contains(URL_TOKEN)); } public void setUrl(String url) { @@ -552,10 +541,7 @@ String issueLink = issueLinkTemplate; parseLink = issueLink.replaceFirst(ISSUE_TOKEN, issue); - if (parseLink.indexOf(URL_TOKEN) >= 0) { -// String u = this.url.substring(0, this.url.lastIndexOf("/")); - -// parseLink = parseLink.replaceFirst(URL_TOKEN, u); + if (parseLink.contains(URL_TOKEN)) { parseLink = parseLink.replaceFirst(URL_TOKEN, url); } @@ -567,9 +553,7 @@ String issueLink = versionLinkTemplate; parseLink = issueLink.replaceFirst(VERSION_TOKEN, issue); - if (parseLink.indexOf(URL_TOKEN) >= 0) { -// String u = this.url.substring(0, this.url.lastIndexOf("/")); -// parseLink = parseLink.replaceFirst(URL_TOKEN, u); + if (parseLink.contains(URL_TOKEN)) { parseLink = parseLink.replaceFirst(URL_TOKEN, url); }