Repository: airavata Updated Branches: refs/heads/master 5d56aa719 -> b6d9a5e4d
Fixing AIRAVATA-1540 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b6d9a5e4 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b6d9a5e4 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b6d9a5e4 Branch: refs/heads/master Commit: b6d9a5e4d8d26b97de1d2c707233b3e7172f300f Parents: 5d56aa7 Author: shamrath <[email protected]> Authored: Fri Dec 5 01:56:15 2014 -0500 Committer: shamrath <[email protected]> Committed: Fri Dec 5 01:56:15 2014 -0500 ---------------------------------------------------------------------- .../xbaya/component/registry/ComponentRegistryLoader.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/b6d9a5e4/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java ---------------------------------------------------------------------- diff --git a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java index b367dd6..8ed3972 100644 --- a/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java +++ b/modules/xbaya-gui/src/main/java/org/apache/airavata/xbaya/component/registry/ComponentRegistryLoader.java @@ -77,6 +77,7 @@ public class ComponentRegistryLoader implements Cancelable, Observer { public void cancel() { this.canceled = true; this.loadThread.interrupt(); + this.loadingDialog.hide(); } /** @@ -95,11 +96,11 @@ public class ComponentRegistryLoader implements Cancelable, Observer { } }; this.loadThread.start(); - if (!getComponentTreeNodesMap().containsKey(registry.getName())) { - // This has to be the last because it blocks when the dialog is modal. - this.loadingDialog.show(); - } + // This has to be the last because it blocks when the dialog is modal. + this.loadingDialog.show(); + } + } /**
