From 9e95025ca7a686639c1acdc630db8edde72ffc61 Mon Sep 17 00:00:00 2001 From: Jim Procter Date: Mon, 21 Aug 2017 14:22:52 +0100 Subject: [PATCH] =?utf8?q?JAL-2588=20don=E2=80=99t=20test=20char=3D=3Dgap=20?= =?utf8?q?until=20we=20know=20the=20shader=20won=E2=80=99t=20colour=20gaps=20?= =?utf8?q?itself?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .ant-targets-build.xml | 31 +++++++++++++++++++++ src/jalview/renderer/OverviewResColourFinder.java | 4 +-- 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 .ant-targets-build.xml 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; } -- 1.7.10.2