X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTextColourChooser.java;h=5eadc51bfcb91e3d1d3641bb77ec0f9f8cd9d882;hb=910e92c4ec8b94b41d5b4c1e9b82438a4203207c;hp=d76142472a714f93a9255ac5dbddf28136a96517;hpb=d423f22792e47dbc800ae220a58677f988971d06;p=jalview.git
diff --git a/src/jalview/gui/TextColourChooser.java b/src/jalview/gui/TextColourChooser.java
index d761424..5eadc51 100644
--- a/src/jalview/gui/TextColourChooser.java
+++ b/src/jalview/gui/TextColourChooser.java
@@ -1,30 +1,30 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * Copyright (C) 2014 The Jalview Authors
*
* This file is part of Jalview.
*
* 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.
- *
+ *
* 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 .
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.gui;
-import java.util.*;
-
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import javax.swing.event.*;
import jalview.datamodel.*;
+import jalview.util.MessageManager;
public class TextColourChooser
{
@@ -55,22 +55,21 @@ public class TextColourChooser
final JPanel col1 = new JPanel();
col1.setPreferredSize(new Dimension(40, 20));
col1.setBorder(BorderFactory.createEtchedBorder());
- col1.setToolTipText("Dark Colour");
+ col1.setToolTipText(MessageManager.getString("label.dark_colour"));
col1.setBackground(new Color(original1));
final JPanel col2 = new JPanel();
col2.setPreferredSize(new Dimension(40, 20));
col2.setBorder(BorderFactory.createEtchedBorder());
- col2.setToolTipText("Light Colour");
+ col2.setToolTipText(MessageManager.getString("label.ligth_colour"));
col2.setBackground(new Color(original2));
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);
@@ -138,7 +137,7 @@ public class TextColourChooser
if (sg == null)
{
ap.av.textColour = col;
- if (ap.av.colourAppliesToAllGroups)
+ if (ap.av.getColourAppliesToAllGroups())
{
setGroupTextColour();
}
@@ -156,7 +155,7 @@ public class TextColourChooser
if (sg == null)
{
ap.av.textColour2 = col;
- if (ap.av.colourAppliesToAllGroups)
+ if (ap.av.getColourAppliesToAllGroups())
{
setGroupTextColour();
}
@@ -174,7 +173,7 @@ public class TextColourChooser
if (sg == null)
{
ap.av.thresholdTextColour = value;
- if (ap.av.colourAppliesToAllGroups)
+ if (ap.av.getColourAppliesToAllGroups())
{
setGroupTextColour();
}
@@ -189,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;