Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...

diff --git a/src/jalview/ext/ensembl/EnsemblRestClient.java b/src/jalview/ext/ensembl/EnsemblRestClient.java
index fa626cb..5ebfcbf 100644 (file)
--- a/src/jalview/ext/ensembl/EnsemblRestClient.java
+++ b/src/jalview/ext/ensembl/EnsemblRestClient.java
@@ -345,12 +345,9 @@ abstract class EnsemblRestClient extends EnsemblSequenceFetcher
     connection.setDoInput(true);
     connection.setDoOutput(multipleIds);
 
-    if (!Jalview.isJS()) 
-    {
-      connection.setUseCaches(false);
-      connection.setConnectTimeout(CONNECT_TIMEOUT_MS);
-      connection.setReadTimeout(readTimeout);
-    }
+    connection.setUseCaches(false);
+    connection.setConnectTimeout(CONNECT_TIMEOUT_MS);
+    connection.setReadTimeout(readTimeout);
 
     if (multipleIds)
     {

diff --git a/src/jalview/gui/FeatureSettings.java b/src/jalview/gui/FeatureSettings.java
index 6046a2e..3cd6c21 100644 (file)
--- a/src/jalview/gui/FeatureSettings.java
+++ b/src/jalview/gui/FeatureSettings.java
@@ -22,6 +22,7 @@ package jalview.gui;
 
 import jalview.api.FeatureColourI;
 import jalview.api.FeatureSettingsControllerI;
+import jalview.bin.Jalview;
 import jalview.datamodel.AlignmentI;
 import jalview.datamodel.SequenceI;
 import jalview.datamodel.features.FeatureMatcher;
@@ -1144,26 +1145,28 @@ public class FeatureSettings extends JPanel
     repaintTable();
   }
 
-
-       private void repaintTable() {
-               // BH 2018
-               // Here is a needed intervention
-               // because generally we don't "repaint"
-               // the table. We re-create the HTML divs
-               // that is associated with it. A better
-               // way to do this would be to fire a property change.
-
-               @SuppressWarnings("unused")
-               TableUI ui = table.getUI();
-               /**
-                * @j2sNative ui.repaintTable$();
-                */
-               {
-                       table.repaint();
-               }
+  /**
+   * Repaints the table using alternative code for Java and J2S
+   */
+  private void repaintTable() 
+  {
+       // BH 2018
+       // Here is a needed intervention
+       // because generally we don't "repaint"
+       // the table. We re-create the HTML divs
+       // that is associated with it. A better
+       // way to do this would be to fire a property change.
+       @SuppressWarnings("unused")
+       TableUI ui = table.getUI();
+       /**
+        * @j2sNative ui.repaintTable$();
+        */
+       {
+         table.repaint();
        }
+  }
 
-public void close()
+  public void close()
   {
     try
     {
@@ -1752,9 +1755,7 @@ public void close()
            * variable colour and filters dialog
            */
           chooser = new FeatureTypeSettings(me.fr, type);
-          /**
-           * @j2sNative
-           */
+          if (!Jalview.isJS())
           {
             chooser.setRequestFocusEnabled(true);
             chooser.requestFocus();