From fd72ce3d1b71be9e7b6082c56346102b785c1d2e Mon Sep 17 00:00:00 2001 From: Carlos Ruiz Date: Thu, 14 May 2020 18:58:16 +0200 Subject: [PATCH] IDEMPIERE-3333 - extend the usage of the new MReportView to other places where is suggested as best practice --- .../handler/ReportViewElementHandler.java | 22 +++++++++---------- .../webui/apps/AbstractProcessDialog.java | 4 ++-- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ReportViewElementHandler.java b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ReportViewElementHandler.java index a503cd06f5..f8fd05866a 100644 --- a/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ReportViewElementHandler.java +++ b/org.adempiere.pipo.handlers/src/org/adempiere/pipo2/handler/ReportViewElementHandler.java @@ -36,7 +36,7 @@ import org.compiere.model.I_AD_ReportView; import org.compiere.model.I_AD_Table; import org.compiere.model.X_AD_Package_Exp_Detail; import org.compiere.model.X_AD_Package_Imp_Detail; -import org.compiere.model.X_AD_ReportView; +import org.compiere.model.MReportView; import org.compiere.model.X_AD_ReportView_Col; import org.compiere.util.DB; import org.compiere.util.Env; @@ -50,11 +50,11 @@ public class ReportViewElementHandler extends AbstractElementHandler { public void startElement(PIPOContext ctx, Element element) throws SAXException { - List excludes = defaultExcludeList(X_AD_ReportView.Table_Name); + List excludes = defaultExcludeList(MReportView.Table_Name); - X_AD_ReportView mReportview = findPO(ctx, element); + MReportView mReportview = findPO(ctx, element); if (mReportview == null) { - mReportview = new X_AD_ReportView(ctx.ctx, 0, getTrxName(ctx)); + mReportview = new MReportView(ctx.ctx, 0, getTrxName(ctx)); } PoFiller filler = new PoFiller(ctx, mReportview, element, this); List notfound = filler.autoFill(excludes); @@ -65,11 +65,11 @@ public class ReportViewElementHandler extends AbstractElementHandler { } if (mReportview.is_new() || mReportview.is_Changed()) { - X_AD_Package_Imp_Detail impDetail = createImportDetail(ctx, element.qName, X_AD_ReportView.Table_Name, - X_AD_ReportView.Table_ID); + X_AD_Package_Imp_Detail impDetail = createImportDetail(ctx, element.qName, MReportView.Table_Name, + MReportView.Table_ID); String action = null; if (!mReportview.is_new()) { - backupRecord(ctx, impDetail.getAD_Package_Imp_Detail_ID(), X_AD_ReportView.Table_Name, mReportview); + backupRecord(ctx, impDetail.getAD_Package_Imp_Detail_ID(), MReportView.Table_Name, mReportview); action = "Update"; } else { action = "New"; @@ -97,7 +97,7 @@ public class ReportViewElementHandler extends AbstractElementHandler { return; AttributesImpl atts = new AttributesImpl(); - X_AD_ReportView m_Reportview = new X_AD_ReportView(ctx.ctx, AD_ReportView_ID, getTrxName(ctx)); + MReportView m_Reportview = new MReportView(ctx.ctx, AD_ReportView_ID, getTrxName(ctx)); // Export Table if neccessary ElementHandler tableHandler = packOut.getHandler(I_AD_Table.Table_Name); @@ -133,7 +133,7 @@ public class ReportViewElementHandler extends AbstractElementHandler { } if (createElement) { - document.endElement("", "", X_AD_ReportView.Table_Name); + document.endElement("", "", MReportView.Table_Name); } sql = "SELECT AD_PrintFormat_ID FROM AD_PrintFormat WHERE AD_ReportView_ID=" @@ -165,10 +165,10 @@ public class ReportViewElementHandler extends AbstractElementHandler { } private void createReportViewBinding(PIPOContext ctx, TransformerHandler document, - X_AD_ReportView m_Reportview) { + MReportView m_Reportview) { PoExporter filler = new PoExporter(ctx, document, m_Reportview); - List excludes = defaultExcludeList(X_AD_ReportView.Table_Name); + List excludes = defaultExcludeList(MReportView.Table_Name); if (m_Reportview.getAD_ReportView_ID() <= PackOut.MAX_OFFICIAL_ID) filler.add("AD_ReportView_ID", new AttributesImpl()); filler.export(excludes); diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AbstractProcessDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AbstractProcessDialog.java index cfc122e916..87e991f947 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AbstractProcessDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/AbstractProcessDialog.java @@ -73,7 +73,7 @@ import org.compiere.model.MSysConfig; import org.compiere.model.MUser; import org.compiere.model.Query; import org.compiere.model.SystemIDs; -import org.compiere.model.X_AD_ReportView; +import org.compiere.model.MReportView; import org.compiere.print.MPrintFormat; import org.compiere.process.ProcessInfo; import org.compiere.process.ProcessInfoUtil; @@ -542,7 +542,7 @@ public abstract class AbstractProcessDialog extends Window implements IProcessUI { if (pr.getAD_ReportView_ID() > 0) { - X_AD_ReportView m_Reportview = new X_AD_ReportView(m_ctx, pr.getAD_ReportView_ID(), null); + MReportView m_Reportview = MReportView.get(m_ctx, pr.getAD_ReportView_ID()); table_ID = m_Reportview.getAD_Table_ID(); } else if (pr.getAD_PrintFormat_ID() > 0)