X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTextColourChooser.java;h=dc705b2ba63f70134940e042a0609bafa7227783;hb=47168f025aefdaa044802bd5f8f510ffe43a4808;hp=3ada67e468cf3e9306ceab5ea339d539c9e32fc8;hpb=d053a3c980cf4318b9a19a255f9fc870e74de989;p=jalview.git
diff --git a/src/jalview/gui/TextColourChooser.java b/src/jalview/gui/TextColourChooser.java
index 3ada67e..dc705b2 100644
--- a/src/jalview/gui/TextColourChooser.java
+++ b/src/jalview/gui/TextColourChooser.java
@@ -1,30 +1,32 @@
/*
- * 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
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * 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.
- *
+ * 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 .
+ * 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,12 +57,12 @@ 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();
@@ -137,7 +139,7 @@ public class TextColourChooser
if (sg == null)
{
ap.av.textColour = col;
- if (ap.av.colourAppliesToAllGroups)
+ if (ap.av.getColourAppliesToAllGroups())
{
setGroupTextColour();
}
@@ -155,7 +157,7 @@ public class TextColourChooser
if (sg == null)
{
ap.av.textColour2 = col;
- if (ap.av.colourAppliesToAllGroups)
+ if (ap.av.getColourAppliesToAllGroups())
{
setGroupTextColour();
}
@@ -173,7 +175,7 @@ public class TextColourChooser
if (sg == null)
{
ap.av.thresholdTextColour = value;
- if (ap.av.colourAppliesToAllGroups)
+ if (ap.av.getColourAppliesToAllGroups())
{
setGroupTextColour();
}
@@ -193,11 +195,8 @@ public class TextColourChooser
return;
}
- Vector groups = ap.av.getAlignment().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;