midsuit
/
core-jgi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-2499:long task (ZkReportViewerProvider.openViewer) in process make GUI lock

This commit is contained in:
hieplq 2015-03-06 17:48:56 +07:00
parent a974c5134d
commit fd8ade7734
1 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
org.adempiere.ui.zk/WEB-INF/src/org/adempiere/webui/window/ZkReportViewerProvider.java
View File

@ -16,12 +16,16 @@
*****************************************************************************/ *****************************************************************************/
package org.adempiere.webui.window; package org.adempiere.webui.window;
import org.adempiere.util.ContextRunnable;
import org.adempiere.webui.apps.AEnv; import org.adempiere.webui.apps.AEnv;
import org.adempiere.webui.component.Window; import org.adempiere.webui.component.Window;
import org.adempiere.webui.part.WindowContainer; import org.adempiere.webui.part.WindowContainer;
import org.adempiere.webui.session.SessionManager; import org.adempiere.webui.session.SessionManager;
import org.compiere.Adempiere;
import org.compiere.print.ReportEngine; import org.compiere.print.ReportEngine;
import org.compiere.print.ReportViewerProvider; 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 class ZkReportViewerProvider implements ReportViewerProvider {
public void openViewer(final ReportEngine report) { public void openViewer(final ReportEngine report) {
Runnable runnable = new Runnable() { final Runnable runnable = new Runnable() {
@Override @Override
public void run() { public void run() {
Window viewer = new ZkReportViewer(report, report.getName()); Window viewer = new ZkReportViewer(report, report.getName());
@ -42,6 +46,21 @@ public class ZkReportViewerProvider implements ReportViewerProvider {
SessionManager.getAppDesktop().showWindow(viewer); 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);
}
} }
} }