From: BobHanson Date: Sat, 4 Apr 2020 16:18:58 +0000 (-0500) Subject: JAL-3253 JAL-3032 upgrade to SwingJS-3.2.9.v1e complete X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=17f8661affe426336c54c5f48da4d32f981d4be0;p=jalview.git JAL-3253 JAL-3032 upgrade to SwingJS-3.2.9.v1e complete - random tests failing can be ignored (just thread timing issues) (AlignmentPanelTest and SeqCanvasTest). Problem is clearly from concurrent thread interference not likely to affect standard operation. - branch can be deleted after merging. --- diff --git a/src/jalview/gui/AlignViewport.java b/src/jalview/gui/AlignViewport.java index 9e738c1..fb3ec3a 100644 --- a/src/jalview/gui/AlignViewport.java +++ b/src/jalview/gui/AlignViewport.java @@ -49,7 +49,6 @@ import jalview.structure.StructureSelectionManager; import jalview.structure.VamsasSource; import jalview.util.MessageManager; import jalview.viewmodel.AlignmentViewport; -import jalview.viewmodel.ViewportRanges; import jalview.ws.params.AutoCalcSetting; import java.awt.Container; @@ -331,9 +330,6 @@ public class AlignViewport extends AlignmentViewport if (setGrid) { FontMetrics fm = c.getFontMetrics(font); - ViewportRanges.sTest += ("AlignViewport.setFont " + fm.getHeight() - + " " - + font + "\n"); int ww = fm.charWidth('M'); setCharHeight(fm.getHeight()); setCharWidth(ww); diff --git a/src/jalview/viewmodel/ViewportRanges.java b/src/jalview/viewmodel/ViewportRanges.java index 3d6bc3d..ec4165b 100644 --- a/src/jalview/viewmodel/ViewportRanges.java +++ b/src/jalview/viewmodel/ViewportRanges.java @@ -23,8 +23,6 @@ package jalview.viewmodel; import jalview.datamodel.AlignmentI; import jalview.datamodel.HiddenColumns; -import java.util.Arrays; - /** * Supplies and updates viewport properties relating to position such as: start * and end residues and sequences; ideally will serve hidden columns/rows too. @@ -78,25 +76,8 @@ public class ViewportRanges extends ViewportProperties this.al = alignment; } - public static String sTest = ""; - private void setEndSeqTest(int val) { - if (endSeq == val) - { - return; - } - - String st = Thread.currentThread().toString(); - sTest += "ViewPortRanges.setEndseqTest was " + endSeq + " now " + val - + " " - + st + "\n"; - if (val == 13) - { - sTest += Arrays.toString(new NullPointerException().getStackTrace()) - .replace(',', '\n') - + "\n"; - } endSeq = val; } /** diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip index 67bc412..84ed137 100644 Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ diff --git a/swingjs/_j2sclasslist.txt b/swingjs/_j2sclasslist.txt index e1d21f8..076f300 100644 --- a/swingjs/_j2sclasslist.txt +++ b/swingjs/_j2sclasslist.txt @@ -350,7 +350,6 @@ swingjs/a2s/ScrollPane.js swingjs/a2s/TextArea.js swingjs/a2s/TextField.js swingjs/api/Interface.js -swingjs/api/JSUtilI.js swingjs/api/js/DOMNode.js swingjs/api/js/HTML5CanvasContext2D.js swingjs/api/js/JSInterface.js diff --git a/swingjs/timestamp b/swingjs/timestamp index 24b24d7..3603394 100644 --- a/swingjs/timestamp +++ b/swingjs/timestamp @@ -1 +1 @@ -20200321133858 +20200404111034 diff --git a/swingjs/ver/3.2.9/SwingJS-site.zip b/swingjs/ver/3.2.9/SwingJS-site.zip index 67bc412..84ed137 100644 Binary files a/swingjs/ver/3.2.9/SwingJS-site.zip and b/swingjs/ver/3.2.9/SwingJS-site.zip differ diff --git a/swingjs/ver/3.2.9/_j2sclasslist.txt b/swingjs/ver/3.2.9/_j2sclasslist.txt index e1d21f8..076f300 100644 --- a/swingjs/ver/3.2.9/_j2sclasslist.txt +++ b/swingjs/ver/3.2.9/_j2sclasslist.txt @@ -350,7 +350,6 @@ swingjs/a2s/ScrollPane.js swingjs/a2s/TextArea.js swingjs/a2s/TextField.js swingjs/api/Interface.js -swingjs/api/JSUtilI.js swingjs/api/js/DOMNode.js swingjs/api/js/HTML5CanvasContext2D.js swingjs/api/js/JSInterface.js diff --git a/swingjs/ver/3.2.9/timestamp b/swingjs/ver/3.2.9/timestamp index 24b24d7..3603394 100644 --- a/swingjs/ver/3.2.9/timestamp +++ b/swingjs/ver/3.2.9/timestamp @@ -1 +1 @@ -20200321133858 +20200404111034