Color updated for new seq, OK is default option
authoramwaterhouse <Andrew Waterhouse>
Tue, 7 Nov 2006 16:13:01 +0000 (16:13 +0000)
committeramwaterhouse <Andrew Waterhouse>
Tue, 7 Nov 2006 16:13:01 +0000 (16:13 +0000)
src/jalview/gui/FeatureRenderer.java

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