X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FTextColourChooser.java;h=8dd9d49a5e373c463a7a04e7312821082651a0d9;hb=ccc0d91abe38690088a6050faba8ef66cde1f271;hp=c9840d8f2950f5eb851a0ff63043a221f7fc5c55;hpb=f5041efe0ef6fefa86634566c6217242895a14d3;p=jalview.git

diff --git a/src/jalview/gui/TextColourChooser.java b/src/jalview/gui/TextColourChooser.java
index c9840d8..8dd9d49 100644
--- a/src/jalview/gui/TextColourChooser.java
+++ b/src/jalview/gui/TextColourChooser.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2007 AM Waterhouse, J Procter, 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
@@ -19,34 +19,27 @@
 
 package jalview.gui;
 
-import java.awt.BorderLayout;
-import java.awt.event.MouseAdapter;
-import javax.swing.JOptionPane;
-import jalview.datamodel.SequenceGroup;
-import javax.swing.BorderFactory;
-import javax.swing.JColorChooser;
-import javax.swing.JPanel;
-import javax.swing.event.ChangeEvent;
-import java.awt.Color;
-import java.awt.event.MouseEvent;
-import java.awt.Dimension;
-import javax.swing.JSlider;
-import javax.swing.event.ChangeListener;
-import javax.swing.JLabel;
-import java.util.Vector;
+import java.util.*;
+
+import java.awt.*;
+import java.awt.event.*;
+import javax.swing.*;
+import javax.swing.event.*;
+
+import jalview.datamodel.*;
 
 public class TextColourChooser
 {
   AlignmentPanel ap;
   SequenceGroup sg;
 
-  public void chooseColour(AlignmentPanel ap, SequenceGroup sg )
+  public void chooseColour(AlignmentPanel ap, SequenceGroup sg)
   {
     this.ap = ap;
     this.sg = sg;
 
-    int original1,original2, originalThreshold;
-    if(sg==null)
+    int original1, original2, originalThreshold;
+    if (sg == null)
     {
       original1 = ap.av.textColour.getRGB();
       original2 = ap.av.textColour2.getRGB();
@@ -130,7 +123,7 @@ public class TextColourChooser
 
     if (reply == JOptionPane.CANCEL_OPTION)
     {
-      if(sg==null)
+      if (sg == null)
       {
         ap.av.textColour = new Color(original1);
         ap.av.textColour2 = new Color(original2);
@@ -147,52 +140,64 @@ public class TextColourChooser
 
   void colour1Changed(Color col)
   {
-    if(sg==null)
+    if (sg == null)
     {
       ap.av.textColour = col;
       if (ap.av.colourAppliesToAllGroups)
+      {
         setGroupTextColour();
+      }
     }
     else
+    {
       sg.textColour = col;
+    }
 
-    ap.repaint();
+    ap.paintAlignment(true);
   }
 
   void colour2Changed(Color col)
   {
-    if(sg==null)
+    if (sg == null)
     {
       ap.av.textColour2 = col;
       if (ap.av.colourAppliesToAllGroups)
+      {
         setGroupTextColour();
+      }
     }
     else
+    {
       sg.textColour2 = col;
+    }
 
-    ap.repaint();
+    ap.paintAlignment(true);
   }
 
   void thresholdChanged(int value)
   {
-    if(sg==null)
+    if (sg == null)
     {
       ap.av.thresholdTextColour = value;
       if (ap.av.colourAppliesToAllGroups)
+      {
         setGroupTextColour();
+      }
     }
     else
+    {
       sg.thresholdTextColour = value;
+    }
 
-    ap.repaint();
+    ap.paintAlignment(true);
   }
 
-
-
   void setGroupTextColour()
   {
     if (ap.av.alignment.getGroups() == null)
+    {
       return;
+    }
 
     Vector groups = ap.av.alignment.getGroups();