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 'features/JAL-1933_occupancy' into develop
[jalview.git]
/
src
/
jalview
/
jbgui
/
GStructureViewer.java
diff --git
a/src/jalview/jbgui/GStructureViewer.java
b/src/jalview/jbgui/GStructureViewer.java
index
6b89ab4
..
d8f3f61
100644
(file)
--- a/
src/jalview/jbgui/GStructureViewer.java
+++ b/
src/jalview/jbgui/GStructureViewer.java
@@
-170,8
+170,8
@@
public abstract class GStructureViewer extends JInternalFrame implements
}
});
alignStructs = new JMenuItem();
}
});
alignStructs = new JMenuItem();
- alignStructs
- .setText(MessageManager.getString("label.align_structures"));
+ alignStructs.setText(MessageManager
+ .getString("label.superpose_structures"));
alignStructs.addActionListener(new ActionListener()
{
@Override
alignStructs.addActionListener(new ActionListener()
{
@Override
@@
-181,7
+181,7
@@
public abstract class GStructureViewer extends JInternalFrame implements
}
});
}
});
- viewerActionMenu = new JMenu();
+ viewerActionMenu = new JMenu(); // text set in sub-classes
viewerActionMenu.setVisible(false);
viewerActionMenu.add(alignStructs);
colourMenu = new JMenu();
viewerActionMenu.setVisible(false);
viewerActionMenu.add(alignStructs);
colourMenu = new JMenu();
@@
-219,9
+219,8
@@
public abstract class GStructureViewer extends JInternalFrame implements
{
}
{
}
- protected void alignStructs_actionPerformed(ActionEvent actionEvent)
- {
- }
+ protected abstract String alignStructs_actionPerformed(
+ ActionEvent actionEvent);
public void pdbFile_actionPerformed(ActionEvent actionEvent)
{
public void pdbFile_actionPerformed(ActionEvent actionEvent)
{