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-3551Pymol
[jalview.git]
/
src
/
jalview
/
jbgui
/
GStructureViewer.java
diff --git
a/src/jalview/jbgui/GStructureViewer.java
b/src/jalview/jbgui/GStructureViewer.java
index
dfee3e2
..
6c0beda
100644
(file)
--- a/
src/jalview/jbgui/GStructureViewer.java
+++ b/
src/jalview/jbgui/GStructureViewer.java
@@
-20,11
+20,6
@@
*/
package jalview.jbgui;
*/
package jalview.jbgui;
-import jalview.api.structures.JalviewStructureDisplayI;
-import jalview.gui.ColourMenuHelper.ColourChangeListener;
-import jalview.util.ImageMaker.TYPE;
-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;
@@
-38,6
+33,11
@@
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
@SuppressWarnings("serial")
public abstract class GStructureViewer extends JInternalFrame
implements JalviewStructureDisplayI, ColourChangeListener
@@
-109,7
+109,7
@@
public abstract class GStructureViewer extends JInternalFrame
@Override
public void actionPerformed(ActionEvent actionEvent)
{
@Override
public void actionPerformed(ActionEvent actionEvent)
{
- pdbFile_actionPerformed(actionEvent);
+ pdbFile_actionPerformed();
}
});
}
});
@@
-142,7
+142,7
@@
public abstract class GStructureViewer extends JInternalFrame
@Override
public void actionPerformed(ActionEvent actionEvent)
{
@Override
public void actionPerformed(ActionEvent actionEvent)
{
- viewMapping_actionPerformed(actionEvent);
+ viewMapping_actionPerformed();
}
});
}
});
@@
-172,7
+172,7
@@
public abstract class GStructureViewer extends JInternalFrame
@Override
public void actionPerformed(ActionEvent actionEvent)
{
@Override
public void actionPerformed(ActionEvent actionEvent)
{
- showHelp_actionPerformed(actionEvent);
+ showHelp_actionPerformed();
}
});
alignStructs = new JMenuItem();
}
});
alignStructs = new JMenuItem();
@@
-183,7
+183,7
@@
public abstract class GStructureViewer extends JInternalFrame
@Override
public void actionPerformed(ActionEvent actionEvent)
{
@Override
public void actionPerformed(ActionEvent actionEvent)
{
- alignStructs_actionPerformed(actionEvent);
+ alignStructsWithAllAlignPanels();
}
});
}
});
@@
-221,14
+221,13
@@
public abstract class GStructureViewer extends JInternalFrame
{
}
{
}
- protected void viewerColour_actionPerformed(ActionEvent actionEvent)
+ protected void viewerColour_actionPerformed()
{
}
{
}
- protected abstract String alignStructs_actionPerformed(
- ActionEvent actionEvent);
+ protected abstract String alignStructsWithAllAlignPanels();
- public void pdbFile_actionPerformed(ActionEvent actionEvent)
+ public void pdbFile_actionPerformed()
{
}
{
}
@@
-238,32
+237,32
@@
public abstract class GStructureViewer extends JInternalFrame
}
}
- 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()
{
}
{
}