From: amwaterhouse <Andrew Waterhouse>
Date: Tue, 21 Nov 2006 10:35:52 +0000 (+0000)
Subject: foreground changes
X-Git-Tag: Release_2_2~89
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;ds=sidebyside;h=44cc00d0563abdc08395d60a1f8487bd3804c4c2;p=jalview.git

foreground changes
---

diff --git a/src/jalview/gui/FeatureRenderer.java b/src/jalview/gui/FeatureRenderer.java
index b5b53fd..e9f9d55 100755
--- a/src/jalview/gui/FeatureRenderer.java
+++ b/src/jalview/gui/FeatureRenderer.java
@@ -435,8 +435,11 @@ public class FeatureRenderer
       final JComboBox name = new JComboBox();
       final JComboBox source = new JComboBox();
       final JTextArea description = new JTextArea(3,25);
-      final JTextField start = new JTextField(6);
-      final JTextField end = new JTextField(6);
+      final JSpinner start = new JSpinner();
+      final JSpinner end = new JSpinner();
+
+     // final JTextField start = new JTextField(6);
+    //  final JTextField end = new JTextField(6);
       final JButton colour = new JButton("     ");
       colour.setMaximumSize(new Dimension(40,10));
       colour.addActionListener(new ActionListener()
@@ -475,9 +478,9 @@ public class FeatureRenderer
         bigPanel.add(panel, BorderLayout.SOUTH);
 
         panel = new JPanel();
-        panel.add(new JLabel("Start: ", JLabel.RIGHT));
+        panel.add(new JLabel(" Start: ", JLabel.RIGHT));
         panel.add(start);
-        panel.add(new JLabel("End: ", JLabel.RIGHT));
+        panel.add(new JLabel("  End: ", JLabel.RIGHT));
         panel.add(end);
         bigPanel.add(panel, BorderLayout.CENTER);
       }
@@ -525,9 +528,15 @@ public class FeatureRenderer
             features[0].description : lastDescriptionAdded);
 
         if (getColour(lastFeatureAdded) != null)
+        {
           colour.setBackground(getColour(lastFeatureAdded));
+          colour.setForeground(getColour(lastFeatureAdded));
+        }
         else
+        {
           colour.setBackground(new Color(60, 160, 115));
+          colour.setForeground(new Color(60, 160, 115));
+        }
 
       }
       else if (!newFeatures)
@@ -540,8 +549,8 @@ public class FeatureRenderer
 
         description.setText(features[0].getDescription());
         source.setSelectedItem(features[0].getFeatureGroup());
-        start.setText(features[0].getBegin()+"");
-        end.setText(features[0].getEnd()+"");
+        start.setValue(new Integer(features[0].getBegin()));
+        end.setValue(new Integer(features[0].getEnd()));
         colour.setBackground(
                 getColour(name.getSelectedItem().toString()));
         name.addItemListener(new ItemListener()
@@ -554,10 +563,12 @@ public class FeatureRenderer
               featureIndex = index;
               description.setText(features[index].getDescription());
               source.setSelectedItem(features[index].getFeatureGroup());
-              start.setText(features[index].getBegin() + "");
-              end.setText(features[index].getEnd() + "");
+              start.setValue(new Integer(features[index].getBegin()));
+              end.setValue(new Integer(features[index].getEnd()));
               colour.setBackground(
                   getColour(name.getSelectedItem().toString()));
+              colour.setForeground(
+                  getColour(name.getSelectedItem().toString()));
             }
           }
         });
@@ -605,8 +616,8 @@ public class FeatureRenderer
           sf.description = lastDescriptionAdded;
           setColour(sf.type, colour.getBackground());
           try{
-            sf.begin = Integer.parseInt( start.getText() );
-            sf.end = Integer.parseInt( end.getText() );
+            sf.begin = ((Integer)start.getValue()).intValue();
+            sf.end = ((Integer)end.getValue()).intValue();
           }catch(NumberFormatException ex)
           {}