From: Jim Procter Date: Mon, 21 Aug 2017 13:22:52 +0000 (+0100) Subject: JAL-2588 don’t test char==gap until we know the shader won’t colour gaps itself X-Git-Tag: Release_2_10_3b1~142^2~2^2~9^2 X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=9e95025ca7a686639c1acdc630db8edde72ffc61;ds=sidebyside JAL-2588 don’t test char==gap until we know the shader won’t colour gaps itself --- diff --git a/.ant-targets-build.xml b/.ant-targets-build.xml new file mode 100644 index 0000000..15432a1 --- /dev/null +++ b/.ant-targets-build.xml @@ -0,0 +1,31 @@ +build +buildPropertiesFile +buildTests +buildextclients +buildindices +castorbinding +clean +compileApplet +distclean +help +init +linkcheck +makeApplet +makedist +makefulldist +obfuscate +packageApplet +prepare +prepareTests +preparejnlp +prepubapplet_1 +pubapplet +runenv +signApplet +sourcedist +sourcedoc +sourcescrub +testclean +testng +usage +writejnlpf diff --git a/src/jalview/renderer/OverviewResColourFinder.java b/src/jalview/renderer/OverviewResColourFinder.java index ec638a7..c591f54 100644 --- a/src/jalview/renderer/OverviewResColourFinder.java +++ b/src/jalview/renderer/OverviewResColourFinder.java @@ -41,8 +41,8 @@ public class OverviewResColourFinder extends ResidueColourFinder // settings if (shader.getColourScheme() != null) { - if (Comparison.isGap(currentChar) - && !shader.getColourScheme().hasGapColour()) + if (!shader.getColourScheme().hasGapColour() + && Comparison.isGap(currentChar)) { resBoxColour = GAP_COLOUR; }