From b4136eb94f63b9ccc71da856967a84a2b2fbff53 Mon Sep 17 00:00:00 2001 From: servertood Date: Sun, 23 Nov 2008 10:35:18 +0000 Subject: [PATCH] replace references to non worker initTree --- extra/jheidi/mainToolbarEvents.ajl | 12 ++++++++++-- extra/jheidi/mainWindowEvents.ajl | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/extra/jheidi/mainToolbarEvents.ajl b/extra/jheidi/mainToolbarEvents.ajl index 86ee7ff3..e11f7060 100644 --- a/extra/jheidi/mainToolbarEvents.ajl +++ b/extra/jheidi/mainToolbarEvents.ajl @@ -96,7 +96,11 @@ else if ("Create Database" == who) if ( script("createDBDialog", args()) != null ) { Tree schemaTree = context.get("/schemaTree"); - thread("initTree", args(), true); + Worker w = worker("initTreeWorker", args(), Worker.RunOption.LET_FINISH_IF_RUNNING); + if (!w.isCancelled()) + { + LongRunningTask.detect("initTreeWorker", "progressWaiter", args(),w, 250); + } } } @@ -105,7 +109,11 @@ else if ("Create Table" == who) if ( script("createTableDialog", args()) != null ) { Tree schemaTree = context.get("/schemaTree"); - thread("initTree", args(), true); + Worker w = worker("initTreeWorker", args(), Worker.RunOption.LET_FINISH_IF_RUNNING); + if (!w.isCancelled()) + { + LongRunningTask.detect("initTreeWorker", "progressWaiter", args(), w, 250); + } } } diff --git a/extra/jheidi/mainWindowEvents.ajl b/extra/jheidi/mainWindowEvents.ajl index 37d08f8a..ae488975 100644 --- a/extra/jheidi/mainWindowEvents.ajl +++ b/extra/jheidi/mainWindowEvents.ajl @@ -98,7 +98,11 @@ else if ("Create Database" == who) if ( script("createDBDialog", args()) != null ) { Tree schemaTree = context.get("/schemaTree"); - thread("initTree", args(), true); + Worker w = worker("initTreeWorker", args(), Worker.RunOption.LET_FINISH_IF_RUNNING); + if (!w.isCancelled()) + { + LongRunningTask.detect("initTreeWorker", "progressWaiter", args(), w, 250); + } } } @@ -107,7 +111,11 @@ else if ("Create Table" == who) if ( script("createTableDialog", args()) != null ) { Tree schemaTree = context.get("/schemaTree"); - thread("initTree", args(), true); + Worker w = worker("initTreeWorker", args(), Worker.RunOption.LET_FINISH_IF_RUNNING); + if (!w.isCancelled()) + { + LongRunningTask.detect("initTreeWorker", "progressWaiter", args(),w, 250); + } } }