git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'JAL-1486_hiddenStartEnd' into develop
[jalview.git]
/
src
/
jalview
/
jbgui
/
GAlignFrame.java
diff --git
a/src/jalview/jbgui/GAlignFrame.java
b/src/jalview/jbgui/GAlignFrame.java
index
698d4af
..
6201e04
100755
(executable)
--- a/
src/jalview/jbgui/GAlignFrame.java
+++ b/
src/jalview/jbgui/GAlignFrame.java
@@
-140,6
+140,8
@@
public class GAlignFrame extends JInternalFrame
protected JRadioButtonMenuItem nucleotideColour = new JRadioButtonMenuItem();
protected JRadioButtonMenuItem purinePyrimidineColour = new JRadioButtonMenuItem();
protected JRadioButtonMenuItem nucleotideColour = new JRadioButtonMenuItem();
protected JRadioButtonMenuItem purinePyrimidineColour = new JRadioButtonMenuItem();
+
+ protected JRadioButtonMenuItem RNAInteractionColour = new JRadioButtonMenuItem();
// protected JRadioButtonMenuItem covariationColour = new
// JRadioButtonMenuItem();
// protected JRadioButtonMenuItem covariationColour = new
// JRadioButtonMenuItem();
@@
-460,7
+462,7
@@
public class GAlignFrame extends JInternalFrame
colours.add(purinePyrimidineColour);
// colours.add(covariationColour);
colours.add(tcoffeeColour);
colours.add(purinePyrimidineColour);
// colours.add(covariationColour);
colours.add(tcoffeeColour);
-
+ colours.add(RNAInteractionColour);
setColourSelected(jalview.bin.Cache
.getDefault("DEFAULT_COLOUR", "None"));
setColourSelected(jalview.bin.Cache
.getDefault("DEFAULT_COLOUR", "None"));
@@
-538,6
+540,11
@@
public class GAlignFrame extends JInternalFrame
purinePyrimidineColour.setSelected(true);
break;
purinePyrimidineColour.setSelected(true);
break;
+
+ case ColourSchemeProperty.RNAINTERACTION:
+ RNAInteractionColour.setSelected(true);
+
+ break;
/*
* case ColourSchemeProperty.COVARIATION:
* covariationColour.setSelected(true);
/*
* case ColourSchemeProperty.COVARIATION:
* covariationColour.setSelected(true);
@@
-875,7
+882,7
@@
public class GAlignFrame extends JInternalFrame
strandColour_actionPerformed(e);
}
});
strandColour_actionPerformed(e);
}
});
- turnColour.setText(MessageManager.getString("Turn Propensity"));
+ turnColour.setText(MessageManager.getString("label.turn_propensity"));
turnColour.addActionListener(new java.awt.event.ActionListener()
{
public void actionPerformed(ActionEvent e)
turnColour.addActionListener(new java.awt.event.ActionListener()
{
public void actionPerformed(ActionEvent e)
@@
-883,7
+890,7
@@
public class GAlignFrame extends JInternalFrame
turnColour_actionPerformed(e);
}
});
turnColour_actionPerformed(e);
}
});
- buriedColour.setText(MessageManager.getString("Buried Index"));
+ buriedColour.setText(MessageManager.getString("label.buried_index"));
buriedColour.addActionListener(new java.awt.event.ActionListener()
{
public void actionPerformed(ActionEvent e)
buriedColour.addActionListener(new java.awt.event.ActionListener()
{
public void actionPerformed(ActionEvent e)
@@
-933,6
+940,15
@@
public class GAlignFrame extends JInternalFrame
purinePyrimidineColour_actionPerformed(e);
}
});
purinePyrimidineColour_actionPerformed(e);
}
});
+
+ RNAInteractionColour.setText("RNA Interaction type");
+ RNAInteractionColour.addActionListener(new java.awt.event.ActionListener()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ RNAInteractionColour_actionPerformed(e);
+ }
+ });
/*
* covariationColour.setText("Covariation");
* covariationColour.addActionListener(new java.awt.event.ActionListener() {
/*
* covariationColour.setText("Covariation");
* covariationColour.addActionListener(new java.awt.event.ActionListener() {
@@
-1909,6
+1925,7
@@
public class GAlignFrame extends JInternalFrame
colourMenu.add(buriedColour);
colourMenu.add(nucleotideColour);
colourMenu.add(purinePyrimidineColour);
colourMenu.add(buriedColour);
colourMenu.add(nucleotideColour);
colourMenu.add(purinePyrimidineColour);
+ colourMenu.add(RNAInteractionColour);
// colourMenu.add(covariationColour);
colourMenu.add(tcoffeeColour);
colourMenu.add(userDefinedColour);
// colourMenu.add(covariationColour);
colourMenu.add(tcoffeeColour);
colourMenu.add(userDefinedColour);
@@
-1918,7
+1935,7
@@
public class GAlignFrame extends JInternalFrame
colourMenu.add(abovePIDThreshold);
colourMenu.add(modifyPID);
colourMenu.add(annotationColour);
colourMenu.add(abovePIDThreshold);
colourMenu.add(modifyPID);
colourMenu.add(annotationColour);
- colourMenu.add(rnahelicesColour);
+ colourMenu.add(rnahelicesColour);
calculateMenu.add(sort);
calculateMenu.add(calculateTree);
calculateMenu.addSeparator();
calculateMenu.add(sort);
calculateMenu.add(calculateTree);
calculateMenu.addSeparator();
@@
-2302,6
+2319,11
@@
public class GAlignFrame extends JInternalFrame
protected void purinePyrimidineColour_actionPerformed(ActionEvent e)
{
}
protected void purinePyrimidineColour_actionPerformed(ActionEvent e)
{
}
+
+ protected void RNAInteractionColour_actionPerformed(ActionEvent e)
+ {
+ }
+
/*
* protected void covariationColour_actionPerformed(ActionEvent e) { }
/*
* protected void covariationColour_actionPerformed(ActionEvent e) { }