From fd8ade77349265b2e31f9c1898499297cd56aac3 Mon Sep 17 00:00:00 2001
From: hieplq <hieplq@hasuvimex.vn>
Date: Fri, 6 Mar 2015 17:48:56 +0700
Subject: [PATCH] IDEMPIERE-2499:long task (ZkReportViewerProvider.openViewer)
 in process make GUI lock

---
 .../webui/window/ZkReportViewerProvider.java  | 25 ++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewerProvider.java b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewerProvider.java
index 0279335be8..d0e4320d49 100644
--- a/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewerProvider.java
+++ b/org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewerProvider.java
@@ -16,12 +16,16 @@
  *****************************************************************************/
 package org.adempiere.webui.window;
 
+import org.adempiere.util.ContextRunnable;
 import org.adempiere.webui.apps.AEnv;
 import org.adempiere.webui.component.Window;
 import org.adempiere.webui.part.WindowContainer;
 import org.adempiere.webui.session.SessionManager;
+import org.compiere.Adempiere;
 import org.compiere.print.ReportEngine;
 import org.compiere.print.ReportViewerProvider;
+import org.zkoss.zk.ui.Execution;
+import org.zkoss.zk.ui.Executions;
 
 /**
  * 
@@ -29,9 +33,9 @@ import org.compiere.print.ReportViewerProvider;
  *
  */
 public class ZkReportViewerProvider implements ReportViewerProvider {
-
+	
 	public void openViewer(final ReportEngine report) {
-		Runnable runnable = new Runnable() {			
+		final Runnable runnable = new Runnable() {			
 			@Override
 			public void run() {
 				Window viewer = new ZkReportViewer(report, report.getName());
@@ -42,6 +46,21 @@ public class ZkReportViewerProvider implements ReportViewerProvider {
 		    	SessionManager.getAppDesktop().showWindow(viewer);				
 			}
 		};
-		AEnv.executeAsyncDesktopTask(runnable);
+		
+		// IDEMPIERE-2499
+		// detect ui thread by value of Executions.getCurrent(), not office method but work
+		if (Executions.getCurrent() != null){
+			Adempiere.getThreadPoolExecutor().submit(new ContextRunnable(){
+				protected void doRun(){
+					// load layout, with big report it's heavy job, do in non ui thread to don't lock gui 
+					report.getLayout();
+					AEnv.executeAsyncDesktopTask(runnable);
+				}
+			});
+		}else{
+			// load layout in non ui thread before run into ui thread 
+			report.getLayout();
+			AEnv.executeAsyncDesktopTask(runnable);
+		}
 	}
 }
\ No newline at end of file