git://source.jalview.org / jalview.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
JAL-1645 Version-Rel Version 2.9 Year-Rel 2015 Licensing glob
[jalview.git] / src / jalview / gui / TextColourChooser.java
diff --git a/src/jalview/gui/TextColourChooser.java b/src/jalview/gui/TextColourChooser.java
index bb2f295..fc01404 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.8.2)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9)
+ * Copyright (C) 2015 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
@@ -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
     {
@@ -69,9 +79,10 @@ public class TextColourChooser
     bigpanel.add(panel, BorderLayout.CENTER);
     bigpanel.add(
             new JLabel(
-                    "<html><i>Select a dark and light text colour, then set the threshold to"
-                            + "<br>switch between colours, based on background colour</i></html>"),
-            BorderLayout.NORTH);
+                    "<html>"
+                            + MessageManager
+                                    .getString("label.select_dark_light_set_thereshold")
+                            + "</html>"), BorderLayout.NORTH);
     panel.add(col1);
     panel.add(slider);
     panel.add(col2);
@@ -81,7 +92,8 @@ public class TextColourChooser
       public void mousePressed(MouseEvent e)
       {
         Color col = JColorChooser.showDialog(bigpanel,
-                MessageManager.getString("label.select_colour_for_text"), col1.getBackground());
+                MessageManager.getString("label.select_colour_for_text"),
+                col1.getBackground());
         if (col != null)
         {
           colour1Changed(col);
@@ -95,7 +107,8 @@ public class TextColourChooser
       public void mousePressed(MouseEvent e)
       {
         Color col = JColorChooser.showDialog(bigpanel,
-                       MessageManager.getString("label.select_colour_for_text"), col2.getBackground());
+                MessageManager.getString("label.select_colour_for_text"),
+                col2.getBackground());
         if (col != null)
         {
           colour2Changed(col);
@@ -112,18 +125,22 @@ public class TextColourChooser
       }
     });
 
-    int reply = JOptionPane.showInternalOptionDialog(ap, bigpanel,
-            MessageManager.getString("label.adjunst_foreground_text_colour_thereshold"),
-            JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE,
-            null, null, null);
+    int reply = JOptionPane
+            .showInternalOptionDialog(
+                    ap,
+                    bigpanel,
+                    MessageManager
+                            .getString("label.adjunst_foreground_text_colour_thereshold"),
+                    JOptionPane.OK_CANCEL_OPTION,
+                    JOptionPane.QUESTION_MESSAGE, null, null, null);
 
     if (reply == JOptionPane.CANCEL_OPTION)
     {
       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
       {
@@ -138,7 +155,7 @@ public class TextColourChooser
   {
     if (sg == null)
     {
-      ap.av.textColour = col;
+      ap.av.setTextColour(col);
       if (ap.av.getColourAppliesToAllGroups())
       {
         setGroupTextColour();
@@ -156,7 +173,7 @@ public class TextColourChooser
   {
     if (sg == null)
     {
-      ap.av.textColour2 = col;
+      ap.av.setTextColour2(col);
       if (ap.av.getColourAppliesToAllGroups())
       {
         setGroupTextColour();
@@ -174,7 +191,7 @@ public class TextColourChooser
   {
     if (sg == null)
     {
-      ap.av.thresholdTextColour = value;
+      ap.av.setThresholdTextColour(value);
       if (ap.av.getColourAppliesToAllGroups())
       {
         setGroupTextColour();
@@ -197,9 +214,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();
     }
   }