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:
3ed1950
)
JAL-3148 redundant enum removed
feature/JAL-3148structureColourSchemes
author
gmungoc
<g.m.carstairs@dundee.ac.uk>
Wed, 7 Nov 2018 08:59:34 +0000
(08:59 +0000)
committer
gmungoc
<g.m.carstairs@dundee.ac.uk>
Wed, 7 Nov 2018 08:59:34 +0000
(08:59 +0000)
src/jalview/gui/StructureViewerBase.java
patch
|
blob
|
history
diff --git
a/src/jalview/gui/StructureViewerBase.java
b/src/jalview/gui/StructureViewerBase.java
index
a9dc31e
..
99873c9
100644
(file)
--- a/
src/jalview/gui/StructureViewerBase.java
+++ b/
src/jalview/gui/StructureViewerBase.java
@@
-77,14
+77,6
@@
import javax.swing.event.MenuListener;
public abstract class StructureViewerBase extends GStructureViewer
implements Runnable, ViewSetProvider
{
public abstract class StructureViewerBase extends GStructureViewer
implements Runnable, ViewSetProvider
{
- /*
- * names for colour options (additional to Jalview colour schemes)
- */
- enum ViewerColour
- {
- BySequence, ByChain, ChargeCysteine, ByViewer
- }
-
/**
* list of sequenceSet ids associated with the view
*/
/**
* list of sequenceSet ids associated with the view
*/
@@
-673,7
+665,6
@@
public boolean isUsedForColourBy(Object o)
seqColour = new JRadioButtonMenuItem();
seqColour.setText(MessageManager.getString("action.by_sequence"));
seqColour = new JRadioButtonMenuItem();
seqColour.setText(MessageManager.getString("action.by_sequence"));
- seqColour.setName(ViewerColour.BySequence.name());
seqColour.setSelected(binding.isColourBySequence());
seqColour.addActionListener(new ActionListener()
{
seqColour.setSelected(binding.isColourBySequence());
seqColour.addActionListener(new ActionListener()
{
@@
-686,7
+677,6
@@
public boolean isUsedForColourBy(Object o)
chainColour = new JRadioButtonMenuItem();
chainColour.setText(MessageManager.getString("action.by_chain"));
chainColour = new JRadioButtonMenuItem();
chainColour.setText(MessageManager.getString("action.by_chain"));
- chainColour.setName(ViewerColour.ByChain.name());
chainColour.addActionListener(new ActionListener()
{
@Override
chainColour.addActionListener(new ActionListener()
{
@Override
@@
-698,7
+688,6
@@
public boolean isUsedForColourBy(Object o)
chargeColour = new JRadioButtonMenuItem();
chargeColour.setText(MessageManager.getString("label.charge_cysteine"));
chargeColour = new JRadioButtonMenuItem();
chargeColour.setText(MessageManager.getString("label.charge_cysteine"));
- chargeColour.setName(ViewerColour.ChargeCysteine.name());
chargeColour.addActionListener(new ActionListener()
{
@Override
chargeColour.addActionListener(new ActionListener()
{
@Override
@@
-710,7
+699,6
@@
public boolean isUsedForColourBy(Object o)
viewerColour = new JRadioButtonMenuItem();
// text is set in overrides of this method
viewerColour = new JRadioButtonMenuItem();
// text is set in overrides of this method
- viewerColour.setName(ViewerColour.ByViewer.name());
viewerColour.setSelected(!binding.isColourBySequence());
if (_colourwith == null)
viewerColour.setSelected(!binding.isColourBySequence());
if (_colourwith == null)