From 4aef583e4fb5c98e25f8e40a9964663a738f064f Mon Sep 17 00:00:00 2001 From: Heng Sin Low Date: Wed, 19 Jan 2011 12:24:38 +0800 Subject: [PATCH] Use process title as pdf viewer title. Ensure busy dialog is always closed. --- .../org/adempiere/webui/apps/ProcessDialog.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java index 7337ec6184..b8c9f2ec48 100644 --- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java +++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/apps/ProcessDialog.java @@ -493,15 +493,18 @@ public class ProcessDialog extends Window implements EventListener//, ASyncProce document.close(); hideBusyDialog(); - Window win = new SimplePDFViewer(this.getTitle(), new FileInputStream(outFile)); + Window win = new SimplePDFViewer(m_pi.getTitle(), new FileInputStream(outFile)); SessionManager.getAppDesktop().showWindow(win, "center"); } catch (Exception e) { log.log(Level.SEVERE, e.getLocalizedMessage(), e); + } finally { + //do no harm calling this twice + hideBusyDialog(); } } else if (pdfList.size() > 0) { hideBusyDialog(); try { - Window win = new SimplePDFViewer(this.getTitle(), new FileInputStream(pdfList.get(0))); + Window win = new SimplePDFViewer(m_pi.getTitle(), new FileInputStream(pdfList.get(0))); SessionManager.getAppDesktop().showWindow(win, "center"); } catch (Exception e) { @@ -561,14 +564,18 @@ public class ProcessDialog extends Window implements EventListener//, ASyncProce document.close(); hideBusyDialog(); - Window win = new SimplePDFViewer(this.getTitle(), new FileInputStream(outFile)); + Window win = new SimplePDFViewer(m_pi.getTitle(), new FileInputStream(outFile)); SessionManager.getAppDesktop().showWindow(win, "center"); } catch (Exception e) { log.log(Level.SEVERE, e.getLocalizedMessage(), e); + } finally { + //do no harm calling this twice + hideBusyDialog(); } } else if (pdfList.size() > 0) { + hideBusyDialog(); try { - Window win = new SimplePDFViewer(this.getTitle(), new FileInputStream(pdfList.get(0))); + Window win = new SimplePDFViewer(m_pi.getTitle(), new FileInputStream(pdfList.get(0))); SessionManager.getAppDesktop().showWindow(win, "center"); } catch (Exception e) {