From 80a65e94e335700426e69f6c5d537b75ebde34c6 Mon Sep 17 00:00:00 2001 From: labkey-adam Date: Sun, 7 Apr 2019 18:40:37 -0700 Subject: [PATCH] Eliminate RReportBean (redundant with ScriptReportBean) Genericize ReportDesignBean, ScriptReportDesignBean and CrosstabReportDesignBean, and usages --- ms2/src/org/labkey/ms2/compare/MS2ReportUIProvider.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ms2/src/org/labkey/ms2/compare/MS2ReportUIProvider.java b/ms2/src/org/labkey/ms2/compare/MS2ReportUIProvider.java index efa6d34a19..e75666da4d 100644 --- a/ms2/src/org/labkey/ms2/compare/MS2ReportUIProvider.java +++ b/ms2/src/org/labkey/ms2/compare/MS2ReportUIProvider.java @@ -20,8 +20,8 @@ import org.labkey.api.reports.ReportService; import org.labkey.api.reports.report.RReport; import org.labkey.api.reports.report.view.DefaultReportUIProvider; -import org.labkey.api.reports.report.view.RReportBean; import org.labkey.api.reports.report.view.ReportUtil; +import org.labkey.api.reports.report.view.ScriptReportBean; import org.labkey.api.view.ViewContext; import org.labkey.ms2.peptideview.SingleMS2RunRReport; @@ -55,7 +55,7 @@ public List getDesignerInfo(ViewContext context, Que { addDesignerURL(context, settings, reportDesigners, SingleMS2RunRReport.TYPE, SingleMS2RunRReport.PARAMS); - RReportBean bean = new RReportBean(settings); + ScriptReportBean bean = new ScriptReportBean(settings); bean.setReportType(SpectraCountRReport.TYPE); bean.setRedirectUrl(context.getActionURL().toString());