From: BobHanson Date: Sat, 13 Jun 2020 14:30:04 +0000 (-0500) Subject: minor changes X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=521951df7d677995b8e142fd0a3c3061df5d2781 minor changes --- diff --git a/src/jalview/bin/Jalview.java b/src/jalview/bin/Jalview.java index b6fc7e8..b8f49a2 100755 --- a/src/jalview/bin/Jalview.java +++ b/src/jalview/bin/Jalview.java @@ -807,8 +807,7 @@ public class Jalview implements ApplicationSingletonI, JalviewJSApi * */ { - if (aparser.contains(ArgsParser.NOANNOTATION) - || aparser.contains(ArgsParser.NOANNOTATION2)) + if (noAnnotation) { af.getViewport().setShowAnnotation(false); if (!af.getViewport().isShowAnnotation()) diff --git a/src/jalview/gui/AlignmentPanel.java b/src/jalview/gui/AlignmentPanel.java index 443ae68..c62b2a7 100644 --- a/src/jalview/gui/AlignmentPanel.java +++ b/src/jalview/gui/AlignmentPanel.java @@ -872,7 +872,7 @@ public class AlignmentPanel extends GAlignmentPanel implements * though I still think this call should be elsewhere. */ ViewportRanges ranges = av.getRanges(); - setScrollValues(ranges.getStartRes(), ranges.getStartSeq()); + // setScrollValues(ranges.getStartRes(), ranges.getStartSeq()); super.paintComponent(g); } diff --git a/src/jalview/gui/JvSwingUtils.java b/src/jalview/gui/JvSwingUtils.java index fc2ecde..fb487d8 100644 --- a/src/jalview/gui/JvSwingUtils.java +++ b/src/jalview/gui/JvSwingUtils.java @@ -73,7 +73,7 @@ public final class JvSwingUtils { Objects.requireNonNull(ttext, "Tootip text to format must not be null!"); - ttext = ttext.trim(); + ttext = ttext.trim().replaceAll("
", "
"); boolean maxLengthExceeded = false; boolean isHTML = ttext.startsWith(""); if (isHTML) diff --git a/src/jalview/viewmodel/ViewportRanges.java b/src/jalview/viewmodel/ViewportRanges.java index f8decf6..765c9a0 100644 --- a/src/jalview/viewmodel/ViewportRanges.java +++ b/src/jalview/viewmodel/ViewportRanges.java @@ -234,7 +234,7 @@ public class ViewportRanges extends ViewportProperties */ public void setStartEndSeq(int start, int end) { - // System.out.println("ViewportRange setStartEndSeq " + start + " " + end); + //System.out.println("ViewportRange setStartEndSeq " + start + " " + end); int[] oldvalues = updateStartEndSeq(start, end); int oldstartseq = oldvalues[0]; int oldendseq = oldvalues[1]; @@ -813,4 +813,11 @@ public class ViewportRanges extends ViewportProperties return maxScroll; } + + @Override + public String toString() + { + return "[ViewportRange " + startSeq + "-" + endSeq + ", " + startRes + + "-" + endRes + "]"; + } } diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip index f722183..d3beb9b 100644 Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ diff --git a/swingjs/timestamp b/swingjs/timestamp index 1d7209a..3ac80a7 100644 --- a/swingjs/timestamp +++ b/swingjs/timestamp @@ -1 +1 @@ -20200607232230 +20200609215953 diff --git a/swingjs/ver/3.2.9-j11/SwingJS-site.zip b/swingjs/ver/3.2.9-j11/SwingJS-site.zip index 79827d7..f722183 100644 Binary files a/swingjs/ver/3.2.9-j11/SwingJS-site.zip and b/swingjs/ver/3.2.9-j11/SwingJS-site.zip differ diff --git a/swingjs/ver/3.2.9-j11/timestamp b/swingjs/ver/3.2.9-j11/timestamp index 866b287..fce12fc 100644 --- a/swingjs/ver/3.2.9-j11/timestamp +++ b/swingjs/ver/3.2.9-j11/timestamp @@ -1 +1 @@ -20200607231708 +20200609014636 diff --git a/swingjs/ver/3.2.9/SwingJS-site.zip b/swingjs/ver/3.2.9/SwingJS-site.zip index f722183..d3beb9b 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/timestamp b/swingjs/ver/3.2.9/timestamp index 1d7209a..3ac80a7 100644 --- a/swingjs/ver/3.2.9/timestamp +++ b/swingjs/ver/3.2.9/timestamp @@ -1 +1 @@ -20200607232230 +20200609215953 diff --git a/test/jalview/gui/JvSwingUtilsTest.java b/test/jalview/gui/JvSwingUtilsTest.java index d46972a..c33e337 100644 --- a/test/jalview/gui/JvSwingUtilsTest.java +++ b/test/jalview/gui/JvSwingUtilsTest.java @@ -108,15 +108,15 @@ public class JvSwingUtilsTest public void testWrapTooltip_multilineShortText() { String tip = "Now is the winter of our discontent
Made glorious summer by this sun of York"; - + String tip2 = "Now is the winter of our discontent
Made glorious summer by this sun of York"; // System.out.println( // JvSwingUtils.wrapTooltip(false, "" + tip + "")); // System.out.println(JvSwingUtils.wrapTooltip(true, tip)); assertEquals("" + tip + "", - JvSwingUtils.wrapTooltip(false, "" + tip + "")); + JvSwingUtils.wrapTooltip(false, "" + tip2 + "")); assertEquals("" + tip + "", - JvSwingUtils.wrapTooltip(true, tip)); + JvSwingUtils.wrapTooltip(true, tip2)); // was: //