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
JAL-1551 formatting
[jalview.git]
/
src
/
jalview
/
jbgui
/
GStructureViewer.java
diff --git
a/src/jalview/jbgui/GStructureViewer.java
b/src/jalview/jbgui/GStructureViewer.java
index
c76fb23
..
bd0f1de
100644
(file)
--- a/
src/jalview/jbgui/GStructureViewer.java
+++ b/
src/jalview/jbgui/GStructureViewer.java
@@
-20,6
+20,9
@@
*/
package jalview.jbgui;
*/
package jalview.jbgui;
+import jalview.api.structures.JalviewStructureDisplayI;
+import jalview.util.MessageManager;
+
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
@@
-33,9
+36,6
@@
import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.JRadioButtonMenuItem;
import javax.swing.JPanel;
import javax.swing.JRadioButtonMenuItem;
-import jalview.api.structures.JalviewStructureDisplayI;
-import jalview.util.MessageManager;
-
public abstract class GStructureViewer extends JInternalFrame implements
JalviewStructureDisplayI
{
public abstract class GStructureViewer extends JInternalFrame implements
JalviewStructureDisplayI
{
@@
-114,6
+114,7
@@
public abstract class GStructureViewer extends JInternalFrame implements
pdbFile.setText(MessageManager.getString("label.pdb_file"));
pdbFile.addActionListener(new ActionListener()
{
pdbFile.setText(MessageManager.getString("label.pdb_file"));
pdbFile.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent actionEvent)
{
pdbFile_actionPerformed(actionEvent);
public void actionPerformed(ActionEvent actionEvent)
{
pdbFile_actionPerformed(actionEvent);
@@
-124,6
+125,7
@@
public abstract class GStructureViewer extends JInternalFrame implements
png.setText("PNG");
png.addActionListener(new ActionListener()
{
png.setText("PNG");
png.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent actionEvent)
{
png_actionPerformed(actionEvent);
public void actionPerformed(ActionEvent actionEvent)
{
png_actionPerformed(actionEvent);
@@
-134,6
+136,7
@@
public abstract class GStructureViewer extends JInternalFrame implements
eps.setText("EPS");
eps.addActionListener(new ActionListener()
{
eps.setText("EPS");
eps.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent actionEvent)
{
eps_actionPerformed(actionEvent);
public void actionPerformed(ActionEvent actionEvent)
{
eps_actionPerformed(actionEvent);
@@
-144,6
+147,7
@@
public abstract class GStructureViewer extends JInternalFrame implements
viewMapping.setText(MessageManager.getString("label.view_mapping"));
viewMapping.addActionListener(new ActionListener()
{
viewMapping.setText(MessageManager.getString("label.view_mapping"));
viewMapping.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent actionEvent)
{
viewMapping_actionPerformed(actionEvent);
public void actionPerformed(ActionEvent actionEvent)
{
viewMapping_actionPerformed(actionEvent);
@@
-156,6
+160,7
@@
public abstract class GStructureViewer extends JInternalFrame implements
fitToWindow.setText(MessageManager.getString("label.fit_to_window"));
fitToWindow.addActionListener(new ActionListener()
{
fitToWindow.setText(MessageManager.getString("label.fit_to_window"));
fitToWindow.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent actionEvent)
{
fitToWindow_actionPerformed();
public void actionPerformed(ActionEvent actionEvent)
{
fitToWindow_actionPerformed();
@@
-166,10
+171,11
@@
public abstract class GStructureViewer extends JInternalFrame implements
colourMenu.setText(MessageManager.getString("label.colours"));
JMenuItem backGround = new JMenuItem();
colourMenu.setText(MessageManager.getString("label.colours"));
JMenuItem backGround = new JMenuItem();
- backGround.setText(MessageManager.getString("label.background_colour")
- + "...");
+ backGround
+ .setText(MessageManager.getString("action.background_colour"));
backGround.addActionListener(new ActionListener()
{
backGround.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent actionEvent)
{
backGround_actionPerformed(actionEvent);
public void actionPerformed(ActionEvent actionEvent)
{
backGround_actionPerformed(actionEvent);
@@
-179,6
+185,7
@@
public abstract class GStructureViewer extends JInternalFrame implements
seqColour.setText(MessageManager.getString("action.by_sequence"));
seqColour.addActionListener(new ActionListener()
{
seqColour.setText(MessageManager.getString("action.by_sequence"));
seqColour.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent actionEvent)
{
seqColour_actionPerformed(actionEvent);
public void actionPerformed(ActionEvent actionEvent)
{
seqColour_actionPerformed(actionEvent);
@@
-187,6
+194,7
@@
public abstract class GStructureViewer extends JInternalFrame implements
chainColour.setText(MessageManager.getString("action.by_chain"));
chainColour.addActionListener(new ActionListener()
{
chainColour.setText(MessageManager.getString("action.by_chain"));
chainColour.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent actionEvent)
{
chainColour_actionPerformed(actionEvent);
public void actionPerformed(ActionEvent actionEvent)
{
chainColour_actionPerformed(actionEvent);
@@
-195,6
+203,7
@@
public abstract class GStructureViewer extends JInternalFrame implements
chargeColour.setText(MessageManager.getString("label.charge_cysteine"));
chargeColour.addActionListener(new ActionListener()
{
chargeColour.setText(MessageManager.getString("label.charge_cysteine"));
chargeColour.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent actionEvent)
{
chargeColour_actionPerformed(actionEvent);
public void actionPerformed(ActionEvent actionEvent)
{
chargeColour_actionPerformed(actionEvent);
@@
-203,6
+212,7
@@
public abstract class GStructureViewer extends JInternalFrame implements
zappoColour.setText(MessageManager.getString("label.zappo"));
zappoColour.addActionListener(new ActionListener()
{
zappoColour.setText(MessageManager.getString("label.zappo"));
zappoColour.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent actionEvent)
{
zappoColour_actionPerformed(actionEvent);
public void actionPerformed(ActionEvent actionEvent)
{
zappoColour_actionPerformed(actionEvent);
@@
-211,6
+221,7
@@
public abstract class GStructureViewer extends JInternalFrame implements
taylorColour.setText(MessageManager.getString("label.taylor"));
taylorColour.addActionListener(new ActionListener()
{
taylorColour.setText(MessageManager.getString("label.taylor"));
taylorColour.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent actionEvent)
{
taylorColour_actionPerformed(actionEvent);
public void actionPerformed(ActionEvent actionEvent)
{
taylorColour_actionPerformed(actionEvent);
@@
-219,6
+230,7
@@
public abstract class GStructureViewer extends JInternalFrame implements
hydroColour.setText(MessageManager.getString("label.hydrophobicity"));
hydroColour.addActionListener(new ActionListener()
{
hydroColour.setText(MessageManager.getString("label.hydrophobicity"));
hydroColour.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent actionEvent)
{
hydroColour_actionPerformed(actionEvent);
public void actionPerformed(ActionEvent actionEvent)
{
hydroColour_actionPerformed(actionEvent);
@@
-228,6
+240,7
@@
public abstract class GStructureViewer extends JInternalFrame implements
.getString("label.strand_propensity"));
strandColour.addActionListener(new ActionListener()
{
.getString("label.strand_propensity"));
strandColour.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent actionEvent)
{
strandColour_actionPerformed(actionEvent);
public void actionPerformed(ActionEvent actionEvent)
{
strandColour_actionPerformed(actionEvent);
@@
-236,6
+249,7
@@
public abstract class GStructureViewer extends JInternalFrame implements
helixColour.setText(MessageManager.getString("label.helix_propensity"));
helixColour.addActionListener(new ActionListener()
{
helixColour.setText(MessageManager.getString("label.helix_propensity"));
helixColour.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent actionEvent)
{
helixColour_actionPerformed(actionEvent);
public void actionPerformed(ActionEvent actionEvent)
{
helixColour_actionPerformed(actionEvent);
@@
-244,6
+258,7
@@
public abstract class GStructureViewer extends JInternalFrame implements
turnColour.setText(MessageManager.getString("label.turn_propensity"));
turnColour.addActionListener(new ActionListener()
{
turnColour.setText(MessageManager.getString("label.turn_propensity"));
turnColour.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent actionEvent)
{
turnColour_actionPerformed(actionEvent);
public void actionPerformed(ActionEvent actionEvent)
{
turnColour_actionPerformed(actionEvent);
@@
-252,6
+267,7
@@
public abstract class GStructureViewer extends JInternalFrame implements
buriedColour.setText(MessageManager.getString("label.buried_index"));
buriedColour.addActionListener(new ActionListener()
{
buriedColour.setText(MessageManager.getString("label.buried_index"));
buriedColour.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent actionEvent)
{
buriedColour_actionPerformed(actionEvent);
public void actionPerformed(ActionEvent actionEvent)
{
buriedColour_actionPerformed(actionEvent);
@@
-261,6
+277,7
@@
public abstract class GStructureViewer extends JInternalFrame implements
.getString("label.purine_pyrimidine"));
purinePyrimidineColour.addActionListener(new ActionListener()
{
.getString("label.purine_pyrimidine"));
purinePyrimidineColour.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent actionEvent)
{
purinePyrimidineColour_actionPerformed(actionEvent);
public void actionPerformed(ActionEvent actionEvent)
{
purinePyrimidineColour_actionPerformed(actionEvent);
@@
-270,6
+287,7
@@
public abstract class GStructureViewer extends JInternalFrame implements
userColour.setText(MessageManager.getString("action.user_defined"));
userColour.addActionListener(new ActionListener()
{
userColour.setText(MessageManager.getString("action.user_defined"));
userColour.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent actionEvent)
{
userColour_actionPerformed(actionEvent);
public void actionPerformed(ActionEvent actionEvent)
{
userColour_actionPerformed(actionEvent);
@@
-282,6
+300,7
@@
public abstract class GStructureViewer extends JInternalFrame implements
.getString("label.let_jmol_manage_structure_colours"));
viewerColour.addActionListener(new ActionListener()
{
.getString("label.let_jmol_manage_structure_colours"));
viewerColour.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent actionEvent)
{
viewerColour_actionPerformed(actionEvent);
public void actionPerformed(ActionEvent actionEvent)
{
viewerColour_actionPerformed(actionEvent);
@@
-293,6
+312,7
@@
public abstract class GStructureViewer extends JInternalFrame implements
helpItem.setText(MessageManager.getString("label.jmol_help"));
helpItem.addActionListener(new ActionListener()
{
helpItem.setText(MessageManager.getString("label.jmol_help"));
helpItem.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent actionEvent)
{
showHelp_actionPerformed(actionEvent);
public void actionPerformed(ActionEvent actionEvent)
{
showHelp_actionPerformed(actionEvent);
@@
-302,6
+322,7
@@
public abstract class GStructureViewer extends JInternalFrame implements
.setText(MessageManager.getString("label.align_structures"));
alignStructs.addActionListener(new ActionListener()
{
.setText(MessageManager.getString("label.align_structures"));
alignStructs.addActionListener(new ActionListener()
{
+ @Override
public void actionPerformed(ActionEvent actionEvent)
{
alignStructs_actionPerformed(actionEvent);
public void actionPerformed(ActionEvent actionEvent)
{
alignStructs_actionPerformed(actionEvent);
@@
-348,6
+369,7
@@
public abstract class GStructureViewer extends JInternalFrame implements
colourButtons.add(strandColour);
colourButtons.add(turnColour);
colourButtons.add(buriedColour);
colourButtons.add(strandColour);
colourButtons.add(turnColour);
colourButtons.add(buriedColour);
+ colourButtons.add(purinePyrimidineColour);
colourButtons.add(userColour);
colourButtons.add(viewerColour);
colourButtons.add(userColour);
colourButtons.add(viewerColour);
@@
-363,6
+385,10
@@
public abstract class GStructureViewer extends JInternalFrame implements
{
}
{
}
+ protected void highlightSelection_actionPerformed()
+ {
+ }
+
protected void viewerColour_actionPerformed(ActionEvent actionEvent)
{
}
protected void viewerColour_actionPerformed(ActionEvent actionEvent)
{
}