X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTextColourChooser.java;h=56bc5fb65231e636a3c7712d0310c1a7aa69747a;hb=b57a02c25e335d033c97f8a6bacd6b54f62bd2b6;hp=c0f3916cfee6c4af63ea97a84b008b715aec1763;hpb=506d60f0e188723ddc91c26824b41ac7034df3fe;p=jalview.git
diff --git a/src/jalview/gui/TextColourChooser.java b/src/jalview/gui/TextColourChooser.java
index c0f3916..56bc5fb 100644
--- a/src/jalview/gui/TextColourChooser.java
+++ b/src/jalview/gui/TextColourChooser.java
@@ -1,20 +1,19 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.4)
- * Copyright (C) 2008 AM Waterhouse, J Procter, 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 program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * This file is part of Jalview.
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * Jalview is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ * Jalview is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with Jalview. If not, see .
*/
package jalview.gui;
@@ -66,12 +65,11 @@ public class TextColourChooser
final JPanel bigpanel = new JPanel(new BorderLayout());
JPanel panel = new JPanel();
bigpanel.add(panel, BorderLayout.CENTER);
- bigpanel
- .add(
- new JLabel(
- "Select a dark and light text colour, then set the threshold to"
- + "
switch between colours, based on background colour"),
- BorderLayout.NORTH);
+ bigpanel.add(
+ new JLabel(
+ "Select a dark and light text colour, then set the threshold to"
+ + "
switch between colours, based on background colour"),
+ BorderLayout.NORTH);
panel.add(col1);
panel.add(slider);
panel.add(col2);
@@ -139,7 +137,7 @@ public class TextColourChooser
if (sg == null)
{
ap.av.textColour = col;
- if (ap.av.colourAppliesToAllGroups)
+ if (ap.av.getColourAppliesToAllGroups())
{
setGroupTextColour();
}
@@ -157,7 +155,7 @@ public class TextColourChooser
if (sg == null)
{
ap.av.textColour2 = col;
- if (ap.av.colourAppliesToAllGroups)
+ if (ap.av.getColourAppliesToAllGroups())
{
setGroupTextColour();
}
@@ -175,7 +173,7 @@ public class TextColourChooser
if (sg == null)
{
ap.av.thresholdTextColour = value;
- if (ap.av.colourAppliesToAllGroups)
+ if (ap.av.getColourAppliesToAllGroups())
{
setGroupTextColour();
}
@@ -190,16 +188,13 @@ 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;