git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
38a1081
)
foreground changes
author
amwaterhouse
<Andrew Waterhouse>
Tue, 21 Nov 2006 10:35:52 +0000
(10:35 +0000)
committer
amwaterhouse
<Andrew Waterhouse>
Tue, 21 Nov 2006 10:35:52 +0000
(10:35 +0000)
src/jalview/gui/FeatureRenderer.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/FeatureRenderer.java
b/src/jalview/gui/FeatureRenderer.java
index
b5b53fd
..
e9f9d55
100755
(executable)
--- a/
src/jalview/gui/FeatureRenderer.java
+++ b/
src/jalview/gui/FeatureRenderer.java
@@
-435,8
+435,11
@@
public class FeatureRenderer
final JComboBox name = new JComboBox();
\r
final JComboBox source = new JComboBox();
\r
final JTextArea description = new JTextArea(3,25);
\r
final JComboBox name = new JComboBox();
\r
final JComboBox source = new JComboBox();
\r
final JTextArea description = new JTextArea(3,25);
\r
- final JTextField start = new JTextField(6);
\r
- final JTextField end = new JTextField(6);
\r
+ final JSpinner start = new JSpinner();
\r
+ final JSpinner end = new JSpinner();
\r
+
\r
+ // final JTextField start = new JTextField(6);
\r
+ // final JTextField end = new JTextField(6);
\r
final JButton colour = new JButton(" ");
\r
colour.setMaximumSize(new Dimension(40,10));
\r
colour.addActionListener(new ActionListener()
\r
final JButton colour = new JButton(" ");
\r
colour.setMaximumSize(new Dimension(40,10));
\r
colour.addActionListener(new ActionListener()
\r
@@
-475,9
+478,9
@@
public class FeatureRenderer
bigPanel.add(panel, BorderLayout.SOUTH);
\r
\r
panel = new JPanel();
\r
bigPanel.add(panel, BorderLayout.SOUTH);
\r
\r
panel = new JPanel();
\r
- panel.add(new JLabel("Start: ", JLabel.RIGHT));
\r
+ panel.add(new JLabel(" Start: ", JLabel.RIGHT));
\r
panel.add(start);
\r
panel.add(start);
\r
- panel.add(new JLabel("End: ", JLabel.RIGHT));
\r
+ panel.add(new JLabel(" End: ", JLabel.RIGHT));
\r
panel.add(end);
\r
bigPanel.add(panel, BorderLayout.CENTER);
\r
}
\r
panel.add(end);
\r
bigPanel.add(panel, BorderLayout.CENTER);
\r
}
\r
@@
-525,9
+528,15
@@
public class FeatureRenderer
features[0].description : lastDescriptionAdded);
\r
\r
if (getColour(lastFeatureAdded) != null)
\r
features[0].description : lastDescriptionAdded);
\r
\r
if (getColour(lastFeatureAdded) != null)
\r
+ {
\r
colour.setBackground(getColour(lastFeatureAdded));
\r
colour.setBackground(getColour(lastFeatureAdded));
\r
+ colour.setForeground(getColour(lastFeatureAdded));
\r
+ }
\r
else
\r
else
\r
+ {
\r
colour.setBackground(new Color(60, 160, 115));
\r
colour.setBackground(new Color(60, 160, 115));
\r
+ colour.setForeground(new Color(60, 160, 115));
\r
+ }
\r
\r
}
\r
else if (!newFeatures)
\r
\r
}
\r
else if (!newFeatures)
\r
@@
-540,8
+549,8
@@
public class FeatureRenderer
\r
description.setText(features[0].getDescription());
\r
source.setSelectedItem(features[0].getFeatureGroup());
\r
\r
description.setText(features[0].getDescription());
\r
source.setSelectedItem(features[0].getFeatureGroup());
\r
- start.setText(features[0].getBegin()+"");
\r
- end.setText(features[0].getEnd()+"");
\r
+ start.setValue(new Integer(features[0].getBegin()));
\r
+ end.setValue(new Integer(features[0].getEnd()));
\r
colour.setBackground(
\r
getColour(name.getSelectedItem().toString()));
\r
name.addItemListener(new ItemListener()
\r
colour.setBackground(
\r
getColour(name.getSelectedItem().toString()));
\r
name.addItemListener(new ItemListener()
\r
@@
-554,10
+563,12
@@
public class FeatureRenderer
featureIndex = index;
\r
description.setText(features[index].getDescription());
\r
source.setSelectedItem(features[index].getFeatureGroup());
\r
featureIndex = index;
\r
description.setText(features[index].getDescription());
\r
source.setSelectedItem(features[index].getFeatureGroup());
\r
- start.setText(features[index].getBegin() + "");
\r
- end.setText(features[index].getEnd() + "");
\r
+ start.setValue(new Integer(features[index].getBegin()));
\r
+ end.setValue(new Integer(features[index].getEnd()));
\r
colour.setBackground(
\r
getColour(name.getSelectedItem().toString()));
\r
colour.setBackground(
\r
getColour(name.getSelectedItem().toString()));
\r
+ colour.setForeground(
\r
+ getColour(name.getSelectedItem().toString()));
\r
}
\r
}
\r
});
\r
}
\r
}
\r
});
\r
@@
-605,8
+616,8
@@
public class FeatureRenderer
sf.description = lastDescriptionAdded;
\r
setColour(sf.type, colour.getBackground());
\r
try{
\r
sf.description = lastDescriptionAdded;
\r
setColour(sf.type, colour.getBackground());
\r
try{
\r
- sf.begin = Integer.parseInt( start.getText() );
\r
- sf.end = Integer.parseInt( end.getText() );
\r
+ sf.begin = ((Integer)start.getValue()).intValue();
\r
+ sf.end = ((Integer)end.getValue()).intValue();
\r
}catch(NumberFormatException ex)
\r
{}
\r
\r
}catch(NumberFormatException ex)
\r
{}
\r
\r