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 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git...
[jalview.git]
/
src
/
jalview
/
jbgui
/
GStructureViewer.java
diff --git
a/src/jalview/jbgui/GStructureViewer.java
b/src/jalview/jbgui/GStructureViewer.java
index
cee8b93
..
97cdf12
100644
(file)
--- a/
src/jalview/jbgui/GStructureViewer.java
+++ b/
src/jalview/jbgui/GStructureViewer.java
@@
-22,6
+22,7
@@
package jalview.jbgui;
import jalview.api.structures.JalviewStructureDisplayI;
import jalview.gui.ColourMenuHelper.ColourChangeListener;
import jalview.api.structures.JalviewStructureDisplayI;
import jalview.gui.ColourMenuHelper.ColourChangeListener;
+import jalview.util.ImageMaker.TYPE;
import jalview.util.MessageManager;
import java.awt.BorderLayout;
import jalview.util.MessageManager;
import java.awt.BorderLayout;
@@
-37,8
+38,8
@@
import javax.swing.JMenuItem;
import javax.swing.JPanel;
import javax.swing.JRadioButtonMenuItem;
import javax.swing.JPanel;
import javax.swing.JRadioButtonMenuItem;
-public abstract class GStructureViewer extends JInternalFrame implements
- JalviewStructureDisplayI, ColourChangeListener
+public abstract class GStructureViewer extends JInternalFrame
+ implements JalviewStructureDisplayI, ColourChangeListener
{
// private AAStructureBindingModel bindingModel;
{
// private AAStructureBindingModel bindingModel;
@@
-93,7
+94,8
@@
public abstract class GStructureViewer extends JInternalFrame implements
fileMenu.setText(MessageManager.getString("action.file"));
savemenu = new JMenu();
fileMenu.setText(MessageManager.getString("action.file"));
savemenu = new JMenu();
- savemenu.setActionCommand(MessageManager.getString("action.save_image"));
+ savemenu.setActionCommand(
+ MessageManager.getString("action.save_image"));
savemenu.setText(MessageManager.getString("action.save_as"));
JMenuItem pdbFile = new JMenuItem();
savemenu.setText(MessageManager.getString("action.save_as"));
JMenuItem pdbFile = new JMenuItem();
@@
-114,7
+116,7
@@
public abstract class GStructureViewer extends JInternalFrame implements
@Override
public void actionPerformed(ActionEvent actionEvent)
{
@Override
public void actionPerformed(ActionEvent actionEvent)
{
- png_actionPerformed(actionEvent);
+ makePDBImage(TYPE.PNG);
}
});
}
});
@@
-125,7
+127,7
@@
public abstract class GStructureViewer extends JInternalFrame implements
@Override
public void actionPerformed(ActionEvent actionEvent)
{
@Override
public void actionPerformed(ActionEvent actionEvent)
{
- eps_actionPerformed(actionEvent);
+ makePDBImage(TYPE.EPS);
}
});
}
});
@@
-170,8
+172,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
@@
-219,21
+221,15
@@
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)
{
}
- public void png_actionPerformed(ActionEvent actionEvent)
- {
-
- }
-
- public void eps_actionPerformed(ActionEvent actionEvent)
+ public void makePDBImage(TYPE imageType)
{
}
{
}