X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fjbgui%2FGStructureViewer.java;h=e16d63a5fc8728be489de9328cbb7dc15dbd7752;hb=51b0b157926ed477cb558ca5971126bf9fccbd31;hp=cee8b932819c749a47d7d9278def6b68337671bf;hpb=20bb45279db7745e7d0062c1084f97644c60db19;p=jalview.git

diff --git a/src/jalview/jbgui/GStructureViewer.java b/src/jalview/jbgui/GStructureViewer.java
index cee8b93..e16d63a 100644
--- a/src/jalview/jbgui/GStructureViewer.java
+++ b/src/jalview/jbgui/GStructureViewer.java
@@ -21,7 +21,9 @@
 package jalview.jbgui;
 
 import jalview.api.structures.JalviewStructureDisplayI;
+import jalview.bin.Jalview;
 import jalview.gui.ColourMenuHelper.ColourChangeListener;
+import jalview.util.ImageMaker.TYPE;
 import jalview.util.MessageManager;
 
 import java.awt.BorderLayout;
@@ -37,8 +39,9 @@ import javax.swing.JMenuItem;
 import javax.swing.JPanel;
 import javax.swing.JRadioButtonMenuItem;
 
-public abstract class GStructureViewer extends JInternalFrame implements
-        JalviewStructureDisplayI, ColourChangeListener
+@SuppressWarnings("serial")
+public abstract class GStructureViewer extends JInternalFrame
+        implements JalviewStructureDisplayI, ColourChangeListener
 {
   // private AAStructureBindingModel bindingModel;
 
@@ -86,6 +89,9 @@ public abstract class GStructureViewer extends JInternalFrame implements
 
   private void jbInit() throws Exception
   {
+
+    setName(Jalview.getAppID("structureviewer"));
+
     JMenuBar menuBar = new JMenuBar();
     this.setJMenuBar(menuBar);
 
@@ -93,7 +99,8 @@ public abstract class GStructureViewer extends JInternalFrame implements
     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();
@@ -114,7 +121,7 @@ public abstract class GStructureViewer extends JInternalFrame implements
       @Override
       public void actionPerformed(ActionEvent actionEvent)
       {
-        png_actionPerformed(actionEvent);
+        makePDBImage(TYPE.PNG);
       }
     });
 
@@ -125,7 +132,7 @@ public abstract class GStructureViewer extends JInternalFrame implements
       @Override
       public void actionPerformed(ActionEvent actionEvent)
       {
-        eps_actionPerformed(actionEvent);
+        makePDBImage(TYPE.EPS);
       }
     });
 
@@ -170,8 +177,8 @@ public abstract class GStructureViewer extends JInternalFrame implements
       }
     });
     alignStructs = new JMenuItem();
-    alignStructs
-            .setText(MessageManager.getString("label.align_structures"));
+    alignStructs.setText(
+            MessageManager.getString("label.superpose_structures"));
     alignStructs.addActionListener(new ActionListener()
     {
       @Override
@@ -219,21 +226,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 png_actionPerformed(ActionEvent actionEvent)
-  {
-
-  }
-
-  public void eps_actionPerformed(ActionEvent actionEvent)
+  public void makePDBImage(TYPE imageType)
   {
 
   }