JAL-969 - refactor colourscheme machinery from GUI code to core alignment view model

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

diff --git a/src/jalview/gui/TextColourChooser.java b/src/jalview/gui/TextColourChooser.java
index 804dc0b..614bfee 100644 (file)
--- a/src/jalview/gui/TextColourChooser.java
+++ b/src/jalview/gui/TextColourChooser.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7)
- * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Copyright (C) 2011 J Procter, AM Waterhouse, J Engelhardt, LM Lui, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
  * 
@@ -137,7 +137,7 @@ public class TextColourChooser
     if (sg == null)
     {
       ap.av.textColour = col;
-      if (ap.av.colourAppliesToAllGroups)
+      if (ap.av.getColourAppliesToAllGroups())
       {
         setGroupTextColour();
       }
@@ -155,7 +155,7 @@ public class TextColourChooser
     if (sg == null)
     {
       ap.av.textColour2 = col;
-      if (ap.av.colourAppliesToAllGroups)
+      if (ap.av.getColourAppliesToAllGroups())
       {
         setGroupTextColour();
       }
@@ -173,7 +173,7 @@ public class TextColourChooser
     if (sg == null)
     {
       ap.av.thresholdTextColour = value;
-      if (ap.av.colourAppliesToAllGroups)
+      if (ap.av.getColourAppliesToAllGroups())
       {
         setGroupTextColour();
       }
@@ -188,16 +188,15 @@ 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;