From: Ben Soares <bsoares@dundee.ac.uk>
Date: Fri, 21 Jun 2019 16:15:19 +0000 (+0100)
Subject: JAL-3328 JAL-3300 changed invokeLaters to invokeAndWaits for more visible progress
X-Git-Tag: Release_2_11_0~3^2~1^2~7
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=b8fc49a98e4b2d82942f92660bdd00756dfc6a77;hp=cb04b0d167435efc06390b318360ebd4bfc03d50;p=jalview.git

JAL-3328 JAL-3300 changed invokeLaters to invokeAndWaits for more visible progress
---

diff --git a/getdown/lib/getdown-core.jar b/getdown/lib/getdown-core.jar
index dedf216..a6aa23d 100644
Binary files a/getdown/lib/getdown-core.jar and b/getdown/lib/getdown-core.jar differ
diff --git a/getdown/lib/getdown-launcher.jar b/getdown/lib/getdown-launcher.jar
index abab590..2a34fe9 100644
Binary files a/getdown/lib/getdown-launcher.jar and b/getdown/lib/getdown-launcher.jar differ
diff --git a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java
index fc3cfbd..e1ef2eb 100644
--- a/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java
+++ b/getdown/src/getdown/launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java
@@ -771,6 +771,10 @@ public abstract class Getdown extends Thread
         EventQueue.invokeLater(new Runnable() {
             public void run () {
 */
+        try {
+        EventQueue.invokeAndWait(new Runnable() {
+            public void run () {
+            	
                 if (_container == null || reinit) {
                     if (_container == null) {
                         _container = createContainer();
@@ -831,14 +835,16 @@ public abstract class Getdown extends Thread
                     _patchNotes.setFont(StatusPanel.FONT);
                     _layers.add(_patchNotes);
                     _status = new StatusPanel(_msgs);
+					//setStatusAsync("test", stepToGlobalPercent(1), -1L, false);
                     _layers.add(_status, Integer.valueOf(10));
                     initInterface();
                 }
                 showContainer();
-/*
             }
         });
-*/
+        } catch (Exception e) {
+        	e.printStackTrace();
+        }
     }
 
     /**
@@ -956,9 +962,15 @@ public abstract class Getdown extends Thread
             createInterfaceAsync(false);
         }
 
+/*
         EventQueue.invokeLater(new Runnable() {
             public void run () {
-                if (_status == null) {
+*/
+        try {
+        EventQueue.invokeAndWait(new Runnable() {
+            public void run () {
+
+            	if (_status == null) {
                     if (message != null) {
                         log.info("Dropping status '" + message + "'.");
                     }
@@ -974,6 +986,9 @@ public abstract class Getdown extends Thread
                 }
             }
         });
+        } catch (Exception e) {
+        	e.printStackTrace();
+        }
     }
 
     protected void reportTrackingEvent (String event, int progress)
diff --git a/getdown/src/getdown/mvn_cmd b/getdown/src/getdown/mvn_cmd
index 2e80990..bf2db45 100755
--- a/getdown/src/getdown/mvn_cmd
+++ b/getdown/src/getdown/mvn_cmd
@@ -1,6 +1,10 @@
 #!/usr/bin/env bash
 
-export VERSION=1.8.3-1.0_JVL
+if [ x$JVLVERSION != x ]; then
+  export VERSION=$JVLVERSION
+else
+  export VERSION=1.8.3-1.0_JVL
+fi
 
 if [ x${VERSION%_JVL} = x$VERSION ]; then
   VERSION=${VERSION}_JVL
diff --git a/j11lib/getdown-core.jar b/j11lib/getdown-core.jar
index dedf216..a6aa23d 100644
Binary files a/j11lib/getdown-core.jar and b/j11lib/getdown-core.jar differ
diff --git a/j8lib/getdown-core.jar b/j8lib/getdown-core.jar
index dedf216..a6aa23d 100644
Binary files a/j8lib/getdown-core.jar and b/j8lib/getdown-core.jar differ