diff options
Diffstat (limited to 'org.jacoco.report/src/org/jacoco/report')
7 files changed, 42 insertions, 20 deletions
diff --git a/org.jacoco.report/src/org/jacoco/report/IReportVisitor.java b/org.jacoco.report/src/org/jacoco/report/IReportVisitor.java index db36796d..1cf4aed4 100644 --- a/org.jacoco.report/src/org/jacoco/report/IReportVisitor.java +++ b/org.jacoco.report/src/org/jacoco/report/IReportVisitor.java @@ -15,7 +15,7 @@ import java.io.IOException; import java.util.Collection; import java.util.List; -import org.jacoco.core.data.ExecutionData; +import org.jacoco.core.data.IExecutionData; import org.jacoco.core.data.SessionInfo; /** @@ -39,7 +39,9 @@ public interface IReportVisitor extends IReportGroupVisitor { * in case of IO problems with the report writer */ void visitInfo(List<SessionInfo> sessionInfos, - Collection<ExecutionData> executionData) throws IOException; + // BEGIN android-change + Collection<IExecutionData> executionData) throws IOException; + // END android-change /** * Has to be called after all report data has been emitted. diff --git a/org.jacoco.report/src/org/jacoco/report/MultiReportVisitor.java b/org.jacoco.report/src/org/jacoco/report/MultiReportVisitor.java index 3cd5e558..f4fefa85 100644 --- a/org.jacoco.report/src/org/jacoco/report/MultiReportVisitor.java +++ b/org.jacoco.report/src/org/jacoco/report/MultiReportVisitor.java @@ -17,7 +17,7 @@ import java.util.Collection; import java.util.List; import org.jacoco.core.analysis.IBundleCoverage; -import org.jacoco.core.data.ExecutionData; +import org.jacoco.core.data.IExecutionData; import org.jacoco.core.data.SessionInfo; /** @@ -41,7 +41,9 @@ public class MultiReportVisitor extends MultiGroupVisitor implements } public void visitInfo(final List<SessionInfo> sessionInfos, - final Collection<ExecutionData> executionData) throws IOException { + // BEGIN android-change + final Collection<IExecutionData> executionData) throws IOException { + // END android-chnage for (final IReportVisitor v : visitors) { v.visitInfo(sessionInfos, executionData); } diff --git a/org.jacoco.report/src/org/jacoco/report/check/RulesChecker.java b/org.jacoco.report/src/org/jacoco/report/check/RulesChecker.java index cc6acf04..f7435600 100644 --- a/org.jacoco.report/src/org/jacoco/report/check/RulesChecker.java +++ b/org.jacoco.report/src/org/jacoco/report/check/RulesChecker.java @@ -17,7 +17,7 @@ import java.util.Collection; import java.util.List; import org.jacoco.core.analysis.IBundleCoverage; -import org.jacoco.core.data.ExecutionData; +import org.jacoco.core.data.IExecutionData; import org.jacoco.core.data.SessionInfo; import org.jacoco.report.ILanguageNames; import org.jacoco.report.IReportGroupVisitor; @@ -86,7 +86,9 @@ public class RulesChecker { } public void visitInfo(final List<SessionInfo> sessionInfos, - final Collection<ExecutionData> executionData) + // BEGIN android-change + final Collection<IExecutionData> executionData) + // END android-change throws IOException { } diff --git a/org.jacoco.report/src/org/jacoco/report/csv/CSVFormatter.java b/org.jacoco.report/src/org/jacoco/report/csv/CSVFormatter.java index 793e2153..42939daa 100644 --- a/org.jacoco.report/src/org/jacoco/report/csv/CSVFormatter.java +++ b/org.jacoco.report/src/org/jacoco/report/csv/CSVFormatter.java @@ -17,7 +17,7 @@ import java.io.OutputStreamWriter; import java.util.Collection; import java.util.List; -import org.jacoco.core.data.ExecutionData; +import org.jacoco.core.data.IExecutionData; import org.jacoco.core.data.SessionInfo; import org.jacoco.report.ILanguageNames; import org.jacoco.report.IReportVisitor; @@ -84,7 +84,9 @@ public class CSVFormatter { } public void visitInfo(final List<SessionInfo> sessionInfos, - final Collection<ExecutionData> executionData) + // BEGIN android-change + final Collection<IExecutionData> executionData) + // END android-change throws IOException { // Info not used for CSV report } diff --git a/org.jacoco.report/src/org/jacoco/report/html/HTMLFormatter.java b/org.jacoco.report/src/org/jacoco/report/html/HTMLFormatter.java index 9994ced0..ce8cd2d9 100644 --- a/org.jacoco.report/src/org/jacoco/report/html/HTMLFormatter.java +++ b/org.jacoco.report/src/org/jacoco/report/html/HTMLFormatter.java @@ -18,7 +18,7 @@ import java.util.Locale; import org.jacoco.core.analysis.IBundleCoverage; import org.jacoco.core.analysis.ICoverageNode.CounterEntity; -import org.jacoco.core.data.ExecutionData; +import org.jacoco.core.data.IExecutionData; import org.jacoco.core.data.SessionInfo; import org.jacoco.report.ILanguageNames; import org.jacoco.report.IMultiReportOutput; @@ -193,12 +193,16 @@ public class HTMLFormatter implements IHTMLReportContext { return new IReportVisitor() { private List<SessionInfo> sessionInfos; - private Collection<ExecutionData> executionData; + // BEGIN android-change + private Collection<IExecutionData> executionData; + // END android-change private HTMLGroupVisitor groupHandler; public void visitInfo(final List<SessionInfo> sessionInfos, - final Collection<ExecutionData> executionData) + // BEGIN android-change + final Collection<IExecutionData> executionData) + // END android-change throws IOException { this.sessionInfos = sessionInfos; this.executionData = executionData; diff --git a/org.jacoco.report/src/org/jacoco/report/internal/html/page/SessionsPage.java b/org.jacoco.report/src/org/jacoco/report/internal/html/page/SessionsPage.java index 67de4941..3a489025 100644 --- a/org.jacoco.report/src/org/jacoco/report/internal/html/page/SessionsPage.java +++ b/org.jacoco.report/src/org/jacoco/report/internal/html/page/SessionsPage.java @@ -20,7 +20,7 @@ import java.util.Comparator; import java.util.Date; import java.util.List; -import org.jacoco.core.data.ExecutionData; +import org.jacoco.core.data.IExecutionData; import org.jacoco.core.data.SessionInfo; import org.jacoco.report.ILanguageNames; import org.jacoco.report.internal.ReportOutputFolder; @@ -48,7 +48,7 @@ public class SessionsPage extends ReportPage { private final DateFormat dateFormat; - private final List<ExecutionData> executionData; + private final List<IExecutionData> executionData; private final ElementIndex index; @@ -69,18 +69,24 @@ public class SessionsPage extends ReportPage { * settings context */ public SessionsPage(final List<SessionInfo> sessionInfos, - final Collection<ExecutionData> executionData, + // BEGIN android-change + final Collection<IExecutionData> executionData, + // END android-change final ElementIndex index, final ReportPage parent, final ReportOutputFolder folder, final IHTMLReportContext context) { super(parent, folder, context); this.sessionInfos = sessionInfos; - this.executionData = new ArrayList<ExecutionData>(executionData); + // BEGIN android-change + this.executionData = new ArrayList<IExecutionData>(executionData); + // END android-change this.index = index; this.dateFormat = DateFormat.getDateTimeInstance(DateFormat.DEFAULT, DateFormat.DEFAULT, context.getLocale()); final ILanguageNames names = context.getLanguageNames(); - Collections.sort(this.executionData, new Comparator<ExecutionData>() { - public int compare(final ExecutionData e1, final ExecutionData e2) { + // BEGIN android-change + Collections.sort(this.executionData, new Comparator<IExecutionData>() { + public int compare(final IExecutionData e1, final IExecutionData e2) { + // END android-change return names.getQualifiedClassName(e1.getName()).compareTo( names.getQualifiedClassName(e2.getName())); } @@ -129,7 +135,9 @@ public class SessionsPage extends ReportPage { } final HTMLElement tbody = table.tbody(); final ILanguageNames names = context.getLanguageNames(); - for (final ExecutionData e : executionData) { + // BEGIN android-change + for (final IExecutionData e : executionData) { + // END android-change final HTMLElement tr = tbody.tr(); final String link = index.getLinkToClass(e.getId()); final String qualifiedName = names.getQualifiedClassName(e diff --git a/org.jacoco.report/src/org/jacoco/report/xml/XMLFormatter.java b/org.jacoco.report/src/org/jacoco/report/xml/XMLFormatter.java index a1fee86e..3bda5ed4 100644 --- a/org.jacoco.report/src/org/jacoco/report/xml/XMLFormatter.java +++ b/org.jacoco.report/src/org/jacoco/report/xml/XMLFormatter.java @@ -17,7 +17,7 @@ import java.util.Collection; import java.util.List; import org.jacoco.core.analysis.IBundleCoverage; -import org.jacoco.core.data.ExecutionData; +import org.jacoco.core.data.IExecutionData; import org.jacoco.core.data.SessionInfo; import org.jacoco.report.IReportGroupVisitor; import org.jacoco.report.IReportVisitor; @@ -61,7 +61,9 @@ public class XMLFormatter { private XMLGroupVisitor groupVisitor; public void visitInfo(final List<SessionInfo> sessionInfos, - final Collection<ExecutionData> executionData) + // BEGIN android-change + final Collection<IExecutionData> executionData) + // END android-change throws IOException { this.sessionInfos = sessionInfos; } |