SEAMREPORTS-3: Added getDelegate() to interfaces

seam · May 26, 2011 · 5860a92 · 5860a92
1 parent b693f16
commit 5860a92
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 7 deletions.
diff --git a/api/src/main/java/org/jboss/seam/reports/Report.java b/api/src/main/java/org/jboss/seam/reports/Report.java
@@ -23,5 +23,17 @@
  * 
  */
 public interface Report {
+    /**
+     * Return the definition (if available) that this report was based
+     * 
+     * @return the {@link ReportDefinition} used to create this {@link Report}
+     */
+    public ReportDefinition<? extends ReportDataSource, ? extends Report> getReportDefinition();
 
+    /**
+     * Return the underlying provider object for the {@link Report}, if available
+     * 
+     * @return The result of this method is implementation specific
+     */
+    public Object getDelegate();
 }
diff --git a/api/src/main/java/org/jboss/seam/reports/ReportDataSource.java b/api/src/main/java/org/jboss/seam/reports/ReportDataSource.java
@@ -24,4 +24,10 @@
  */
 public interface ReportDataSource {
 
+    /**
+     * The result of this method is implementation specific
+     * 
+     * @return
+     */
+    public Object getDelegate();
 }
diff --git a/impl/src/main/java/org/jboss/seam/reports/jasperreports/JasperSeamReport.java b/impl/src/main/java/org/jboss/seam/reports/jasperreports/JasperSeamReport.java
@@ -23,12 +23,24 @@
 public class JasperSeamReport implements Report {
 
     private JasperPrint jasperPrint;
-
+    private JasperSeamReportDefinition reportDefinition;
+
     public JasperSeamReport(JasperPrint jasperPrint) {
         this.jasperPrint = jasperPrint;
     }
 
-    public JasperPrint getJasperPrint() {
+    public JasperSeamReport(JasperPrint jasperPrint, JasperSeamReportDefinition reportDefinition) {
+        this.jasperPrint = jasperPrint;
+        this.reportDefinition = reportDefinition;
+    }
+
+    @Override
+    public JasperSeamReportDefinition getReportDefinition() {
+        return reportDefinition;
+    }
+
+    @Override
+    public JasperPrint getDelegate() {
         return jasperPrint;
     }
 }
diff --git a/impl/src/main/java/org/jboss/seam/reports/jasperreports/JasperSeamReportDataSource.java b/impl/src/main/java/org/jboss/seam/reports/jasperreports/JasperSeamReportDataSource.java
@@ -28,7 +28,7 @@ public JasperSeamReportDataSource(JRDataSource dataSource) {
         this.dataSource = dataSource;
     }
 
-    public JRDataSource getDataSource() {
+    public JRDataSource getDelegate() {
         return dataSource;
     }
 }
diff --git a/impl/src/main/java/org/jboss/seam/reports/jasperreports/JasperSeamReportDefinition.java b/impl/src/main/java/org/jboss/seam/reports/jasperreports/JasperSeamReportDefinition.java
@@ -44,7 +44,7 @@ public JasperReport getCompiledReport() {
     public JasperSeamReport fill(JasperSeamReportDataSource dataSource, Map<String, Object> parameters)
             throws ReportException {
         try {
-            JRDataSource ds = dataSource.getDataSource();
+            JRDataSource ds = dataSource.getDelegate();
             JasperPrint filledReport = JasperFillManager.fillReport(getCompiledReport(), parameters,ds);
             return new JasperSeamReport(filledReport);
         } catch (JRException e) {

diff --git a/...main/java/org/jboss/seam/reports/jasperreports/renderer/AbstractJasperReportRenderer.java b/...main/java/org/jboss/seam/reports/jasperreports/renderer/AbstractJasperReportRenderer.java
@@ -31,7 +31,7 @@ public abstract class AbstractJasperReportRenderer implements ReportRenderer<Jas
     @Override
     public void render(JasperSeamReport reportInstance, OutputStream output) throws ReportException {
         JRExporter exporter = getExporter();
-        exporter.setParameter(JRExporterParameter.JASPER_PRINT, reportInstance.getJasperPrint());
+        exporter.setParameter(JRExporterParameter.JASPER_PRINT, reportInstance.getDelegate());
         exporter.setParameter(JRExporterParameter.OUTPUT_STREAM, output);
         try {
             exporter.exportReport();

diff --git a/...java/org/jboss/seam/reports/jasperreports/qualifiers/test/JasperReportsQualifierTest.java b/...java/org/jboss/seam/reports/jasperreports/qualifiers/test/JasperReportsQualifierTest.java
@@ -24,9 +24,9 @@
 
 import org.jboss.arquillian.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
-import org.jboss.seam.reports.ReportDefinition;
-import org.jboss.seam.reports.ReportDataSource;
 import org.jboss.seam.reports.Report;
+import org.jboss.seam.reports.ReportDataSource;
+import org.jboss.seam.reports.ReportDefinition;
 import org.jboss.seam.reports.ReportRenderer;
 import org.jboss.seam.reports.jasperreports.JasperReports;
 import org.jboss.seam.reports.jasperreports.JasperSeamReportLoader;