Merge branch 'develop' into features/JAL-845splitPaneMergeDevelop

[jalview.git] / src / jalview / gui / TextColourChooser.java

diff --git a/src/jalview/gui/TextColourChooser.java b/src/jalview/gui/TextColourChooser.java
index 0b5f34d..c8a4a08 100644 (file)
--- a/src/jalview/gui/TextColourChooser.java
+++ b/src/jalview/gui/TextColourChooser.java
@@ -20,14 +20,24 @@
  */
 package jalview.gui;
 
-import java.awt.*;
-import java.awt.event.*;
-import javax.swing.*;
-import javax.swing.event.*;
-
-import jalview.datamodel.*;
+import jalview.datamodel.SequenceGroup;
 import jalview.util.MessageManager;
 
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.awt.Dimension;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+
+import javax.swing.BorderFactory;
+import javax.swing.JColorChooser;
+import javax.swing.JLabel;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JSlider;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+
 public class TextColourChooser
 {
   AlignmentPanel ap;
@@ -42,9 +52,9 @@ public class TextColourChooser
     int original1, original2, originalThreshold;
     if (sg == null)
     {
-      original1 = ap.av.textColour.getRGB();
-      original2 = ap.av.textColour2.getRGB();
-      originalThreshold = ap.av.thresholdTextColour;
+      original1 = ap.av.getTextColour().getRGB();
+      original2 = ap.av.getTextColour2().getRGB();
+      originalThreshold = ap.av.getThresholdTextColour();
     }
     else
     {
@@ -119,9 +129,9 @@ public class TextColourChooser
     {
       if (sg == null)
       {
-        ap.av.textColour = new Color(original1);
-        ap.av.textColour2 = new Color(original2);
-        ap.av.thresholdTextColour = originalThreshold;
+        ap.av.setTextColour(new Color(original1));
+        ap.av.setTextColour2(new Color(original2));
+        ap.av.setThresholdTextColour(originalThreshold);
       }
       else
       {
@@ -136,7 +146,7 @@ public class TextColourChooser
   {
     if (sg == null)
     {
-      ap.av.textColour = col;
+      ap.av.setTextColour(col);
       if (ap.av.getColourAppliesToAllGroups())
       {
         setGroupTextColour();
@@ -154,7 +164,7 @@ public class TextColourChooser
   {
     if (sg == null)
     {
-      ap.av.textColour2 = col;
+      ap.av.setTextColour2(col);
       if (ap.av.getColourAppliesToAllGroups())
       {
         setGroupTextColour();
@@ -172,7 +182,7 @@ public class TextColourChooser
   {
     if (sg == null)
     {
-      ap.av.thresholdTextColour = value;
+      ap.av.setThresholdTextColour(value);
       if (ap.av.getColourAppliesToAllGroups())
       {
         setGroupTextColour();
@@ -195,9 +205,9 @@ public class TextColourChooser
 
     for (SequenceGroup sg : ap.av.getAlignment().getGroups())
     {
-      sg.textColour = ap.av.textColour;
-      sg.textColour2 = ap.av.textColour2;
-      sg.thresholdTextColour = ap.av.thresholdTextColour;
+      sg.textColour = ap.av.getTextColour();
+      sg.textColour2 = ap.av.getTextColour2();
+      sg.thresholdTextColour = ap.av.getThresholdTextColour();
     }
   }