/*\r
* Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2007 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
*\r
* This program is free software; you can redistribute it and/or\r
* modify it under the terms of the GNU General Public License\r
\r
package jalview.gui;\r
\r
-import java.awt.BorderLayout;\r
-import java.awt.event.MouseAdapter;\r
-import javax.swing.JOptionPane;\r
-import jalview.datamodel.SequenceGroup;\r
-import javax.swing.BorderFactory;\r
-import javax.swing.JColorChooser;\r
-import javax.swing.JPanel;\r
-import javax.swing.event.ChangeEvent;\r
-import java.awt.Color;\r
-import java.awt.event.MouseEvent;\r
-import java.awt.Dimension;\r
-import javax.swing.JSlider;\r
-import javax.swing.event.ChangeListener;\r
-import javax.swing.JLabel;\r
-import java.util.Vector;\r
+import java.util.*;\r
+\r
+import java.awt.*;\r
+import java.awt.event.*;\r
+import javax.swing.*;\r
+import javax.swing.event.*;\r
+\r
+import jalview.datamodel.*;\r
\r
public class TextColourChooser\r
{\r
AlignmentPanel ap;\r
SequenceGroup sg;\r
\r
- public void chooseColour(AlignmentPanel ap, SequenceGroup sg )\r
+ public void chooseColour(AlignmentPanel ap, SequenceGroup sg)\r
{\r
this.ap = ap;\r
this.sg = sg;\r
\r
- int original1,original2, originalThreshold;\r
- if(sg==null)\r
+ int original1, original2, originalThreshold;\r
+ if (sg == null)\r
{\r
original1 = ap.av.textColour.getRGB();\r
original2 = ap.av.textColour2.getRGB();\r
\r
if (reply == JOptionPane.CANCEL_OPTION)\r
{\r
- if(sg==null)\r
+ if (sg == null)\r
{\r
ap.av.textColour = new Color(original1);\r
ap.av.textColour2 = new Color(original2);\r
\r
void colour1Changed(Color col)\r
{\r
- if(sg==null)\r
+ if (sg == null)\r
{\r
ap.av.textColour = col;\r
if (ap.av.colourAppliesToAllGroups)\r
+ {\r
setGroupTextColour();\r
+ }\r
}\r
else\r
+ {\r
sg.textColour = col;\r
+ }\r
\r
- ap.repaint();\r
+ ap.paintAlignment(true);\r
}\r
\r
void colour2Changed(Color col)\r
{\r
- if(sg==null)\r
+ if (sg == null)\r
{\r
ap.av.textColour2 = col;\r
if (ap.av.colourAppliesToAllGroups)\r
+ {\r
setGroupTextColour();\r
+ }\r
}\r
else\r
+ {\r
sg.textColour2 = col;\r
+ }\r
\r
- ap.repaint();\r
+ ap.paintAlignment(true);\r
}\r
\r
void thresholdChanged(int value)\r
{\r
- if(sg==null)\r
+ if (sg == null)\r
{\r
ap.av.thresholdTextColour = value;\r
if (ap.av.colourAppliesToAllGroups)\r
+ {\r
setGroupTextColour();\r
+ }\r
}\r
else\r
+ {\r
sg.thresholdTextColour = value;\r
+ }\r
\r
- ap.repaint();\r
+ ap.paintAlignment(true);\r
}\r
\r
-\r
-\r
void setGroupTextColour()\r
{\r
if (ap.av.alignment.getGroups() == null)\r
+ {\r
return;\r
+ }\r
\r
Vector groups = ap.av.alignment.getGroups();\r
\r