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 'develop' into feature/JAL-3390hideUnmappedStructure
[jalview.git]
/
src
/
jalview
/
jbgui
/
GStructureViewer.java
diff --git
a/src/jalview/jbgui/GStructureViewer.java
b/src/jalview/jbgui/GStructureViewer.java
index
11cbfd7
..
6e88d27
100644
(file)
--- a/
src/jalview/jbgui/GStructureViewer.java
+++ b/
src/jalview/jbgui/GStructureViewer.java
@@
-20,10
+20,6
@@
*/
package jalview.jbgui;
*/
package jalview.jbgui;
-import jalview.api.structures.JalviewStructureDisplayI;
-import jalview.gui.ColourMenuHelper.ColourChangeListener;
-import jalview.util.MessageManager;
-
import java.awt.BorderLayout;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.BorderLayout;
import java.awt.GridLayout;
import java.awt.event.ActionEvent;
@@
-40,6
+36,12
@@
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.gui.ColourMenuHelper.ColourChangeListener;
+import jalview.util.ImageMaker.TYPE;
+import jalview.util.MessageManager;
+
+@SuppressWarnings("serial")
public abstract class GStructureViewer extends JInternalFrame
implements JalviewStructureDisplayI, ColourChangeListener
{
public abstract class GStructureViewer extends JInternalFrame
implements JalviewStructureDisplayI, ColourChangeListener
{
@@
-93,6
+95,9
@@
public abstract class GStructureViewer extends JInternalFrame
private void jbInit() throws Exception
{
private void jbInit() throws Exception
{
+
+ setName("jalview-structureviewer");
+
JMenuBar menuBar = new JMenuBar();
this.setJMenuBar(menuBar);
JMenuBar menuBar = new JMenuBar();
this.setJMenuBar(menuBar);
@@
-111,7
+116,7
@@
public abstract class GStructureViewer extends JInternalFrame
@Override
public void actionPerformed(ActionEvent actionEvent)
{
@Override
public void actionPerformed(ActionEvent actionEvent)
{
- pdbFile_actionPerformed(actionEvent);
+ pdbFile_actionPerformed();
}
});
}
});
@@
-122,7
+127,7
@@
public abstract class GStructureViewer extends JInternalFrame
@Override
public void actionPerformed(ActionEvent actionEvent)
{
@Override
public void actionPerformed(ActionEvent actionEvent)
{
- png_actionPerformed(actionEvent);
+ makePDBImage(TYPE.PNG);
}
});
}
});
@@
-133,7
+138,7
@@
public abstract class GStructureViewer extends JInternalFrame
@Override
public void actionPerformed(ActionEvent actionEvent)
{
@Override
public void actionPerformed(ActionEvent actionEvent)
{
- eps_actionPerformed(actionEvent);
+ makePDBImage(TYPE.EPS);
}
});
}
});
@@
-144,7
+149,7
@@
public abstract class GStructureViewer extends JInternalFrame
@Override
public void actionPerformed(ActionEvent actionEvent)
{
@Override
public void actionPerformed(ActionEvent actionEvent)
{
- viewMapping_actionPerformed(actionEvent);
+ viewMapping_actionPerformed();
}
});
}
});
@@
-168,13
+173,12
@@
public abstract class GStructureViewer extends JInternalFrame
JMenu helpMenu = new JMenu();
helpMenu.setText(MessageManager.getString("action.help"));
helpItem = new JMenuItem();
JMenu helpMenu = new JMenu();
helpMenu.setText(MessageManager.getString("action.help"));
helpItem = new JMenuItem();
- helpItem.setText(MessageManager.getString("label.jmol_help"));
helpItem.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent actionEvent)
{
helpItem.addActionListener(new ActionListener()
{
@Override
public void actionPerformed(ActionEvent actionEvent)
{
- showHelp_actionPerformed(actionEvent);
+ showHelp_actionPerformed();
}
});
alignStructs = new JMenuItem();
}
});
alignStructs = new JMenuItem();
@@
-185,7
+189,7
@@
public abstract class GStructureViewer extends JInternalFrame
@Override
public void actionPerformed(ActionEvent actionEvent)
{
@Override
public void actionPerformed(ActionEvent actionEvent)
{
- alignStructs_actionPerformed(actionEvent);
+ alignStructsWithAllAlignPanels();
}
});
}
});
@@
-219,54
+223,48
@@
public abstract class GStructureViewer extends JInternalFrame
{
}
{
}
- protected void viewerColour_actionPerformed(ActionEvent actionEvent)
+ protected void viewerColour_actionPerformed()
{
}
{
}
- protected abstract String alignStructs_actionPerformed(
- ActionEvent actionEvent);
-
- public void pdbFile_actionPerformed(ActionEvent actionEvent)
- {
-
- }
+ protected abstract String alignStructsWithAllAlignPanels();
- public void png_actionPerformed(ActionEvent actionEvent)
+ public void pdbFile_actionPerformed()
{
}
{
}
- public void eps_actionPerformed(ActionEvent actionEvent)
+ public void makePDBImage(TYPE imageType)
{
}
{
}
- public void viewMapping_actionPerformed(ActionEvent actionEvent)
+ public void viewMapping_actionPerformed()
{
}
{
}
- public void seqColour_actionPerformed(ActionEvent actionEvent)
+ public void seqColour_actionPerformed()
{
}
{
}
- public void chainColour_actionPerformed(ActionEvent actionEvent)
+ public void chainColour_actionPerformed()
{
}
{
}
- public void chargeColour_actionPerformed(ActionEvent actionEvent)
+ public void chargeColour_actionPerformed()
{
}
{
}
- public void background_actionPerformed(ActionEvent actionEvent)
+ public void background_actionPerformed()
{
}
{
}
- public void showHelp_actionPerformed(ActionEvent actionEvent)
+ public void showHelp_actionPerformed()
{
}
{
}