X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTextColourChooser.java;h=614bfeefa6282c7021b9d8b9da1804f06f6aba38;hb=0b9d0f8eba1cec46c0b31fdd402a826e26244ff5;hp=bec682384b3dc8921e7de46aede4e94a287f0e93;hpb=8a6fa9ea9900d0f106529c3f6283e7f9d76dd2cb;p=jalview.git diff --git a/src/jalview/gui/TextColourChooser.java b/src/jalview/gui/TextColourChooser.java index bec6823..614bfee 100644 --- a/src/jalview/gui/TextColourChooser.java +++ b/src/jalview/gui/TextColourChooser.java @@ -1,6 +1,6 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6) - * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) + * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle * * This file is part of Jalview. * @@ -137,7 +137,7 @@ public class TextColourChooser if (sg == null) { ap.av.textColour = col; - if (ap.av.colourAppliesToAllGroups) + if (ap.av.getColourAppliesToAllGroups()) { setGroupTextColour(); } @@ -155,7 +155,7 @@ public class TextColourChooser if (sg == null) { ap.av.textColour2 = col; - if (ap.av.colourAppliesToAllGroups) + if (ap.av.getColourAppliesToAllGroups()) { setGroupTextColour(); } @@ -173,7 +173,7 @@ public class TextColourChooser if (sg == null) { ap.av.thresholdTextColour = value; - if (ap.av.colourAppliesToAllGroups) + if (ap.av.getColourAppliesToAllGroups()) { setGroupTextColour(); } @@ -188,16 +188,15 @@ public class TextColourChooser void setGroupTextColour() { - if (ap.av.alignment.getGroups() == null) + if (ap.av.getAlignment().getGroups() == null) { return; } - Vector groups = ap.av.alignment.getGroups(); + - for (int i = 0; i < groups.size(); i++) + for (SequenceGroup sg:ap.av.getAlignment().getGroups()) { - SequenceGroup sg = (SequenceGroup) groups.elementAt(i); sg.textColour = ap.av.textColour; sg.textColour2 = ap.av.textColour2; sg.thresholdTextColour = ap.av.thresholdTextColour;