From: Jim Procter Date: Tue, 2 Jul 2019 14:34:10 +0000 (+0100) Subject: Merge branch 'documentation/JAL-3111_release_211' into develop X-Git-Tag: Release_2_11_0~2^2~14 X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=7db05549804d9e41c20dbb340c4b716b35dc6d21;hp=71332f2343d253b168b1438d5320d9bdcdffd427 Merge branch 'documentation/JAL-3111_release_211' into develop --- diff --git a/gradle.properties b/gradle.properties index 2e6e38c..cc845fa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -57,6 +57,7 @@ getdown_launch_jvl = channel_launch.jvl getdown_build_properties = build_properties getdown_txt_title = Jalview getdown_txt_allow_offline = true +getdown_txt_max_concurrent_downloads = 10 getdown_txt_jalview.jvmmempc = 90 getdown_txt_multi_jvmarg = -Dgetdownappdir=%APPDIR% getdown_txt_strict_comments = true diff --git a/src/jalview/gui/WebserviceInfo.java b/src/jalview/gui/WebserviceInfo.java index 5240eea..8158718 100644 --- a/src/jalview/gui/WebserviceInfo.java +++ b/src/jalview/gui/WebserviceInfo.java @@ -848,8 +848,6 @@ protected void cancel_actionPerformed(ActionEvent e) { Thread.sleep(25); - int units = (int) ((System.currentTimeMillis() - startTime) - / 5f); float delta = (System.currentTimeMillis() - startTime) / invSpeed; angle += delta * factor; startTime = System.currentTimeMillis();