From: amwaterhouse <Andrew Waterhouse>
Date: Tue, 7 Nov 2006 16:13:01 +0000 (+0000)
Subject: Color updated for new seq, OK is default option
X-Git-Tag: Release_2_2~171
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=219069b19ed66908ea5ec0819802f772df3493f3

Color updated for new seq, OK is default option
---

diff --git a/src/jalview/gui/FeatureRenderer.java b/src/jalview/gui/FeatureRenderer.java
index 2ca3ca3..b5b53fd 100755
--- a/src/jalview/gui/FeatureRenderer.java
+++ b/src/jalview/gui/FeatureRenderer.java
@@ -439,7 +439,6 @@ public class FeatureRenderer
       final JTextField end = new JTextField(6);
       final JButton colour = new JButton("     ");
       colour.setMaximumSize(new Dimension(40,10));
-      colour.setBackground(new Color(60, 160, 115));
       colour.addActionListener(new ActionListener()
           {
             public void actionPerformed(ActionEvent evt)
@@ -524,6 +523,12 @@ public class FeatureRenderer
         description.setText(
             lastDescriptionAdded == null ?
             features[0].description : lastDescriptionAdded);
+
+        if (getColour(lastFeatureAdded) != null)
+          colour.setBackground(getColour(lastFeatureAdded));
+        else
+          colour.setBackground(new Color(60, 160, 115));
+
       }
       else if (!newFeatures)
       {
@@ -574,7 +579,7 @@ public class FeatureRenderer
                                                    JOptionPane.YES_NO_CANCEL_OPTION,
                                                    JOptionPane.QUESTION_MESSAGE,
                                                    null,
-                                                   options, null);
+                                                   options, "OK");
 
       jalview.io.FeaturesFile ffile = new jalview.io.FeaturesFile();