JAL-1975 updated image export pipeline to produce more informative messages.

[jalview.git] / src / MCview / PDBViewer.java

diff --git a/src/MCview/PDBViewer.java b/src/MCview/PDBViewer.java
index e1324d2..309a0e1 100755 (executable)
--- a/src/MCview/PDBViewer.java
+++ b/src/MCview/PDBViewer.java
@@ -145,6 +145,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
     Desktop.addInternalFrame(this, title.toString(), 400, 400);
   }
 
+  @Override
   public void run()
   {
     try
@@ -169,6 +170,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
   {
     this.addKeyListener(new KeyAdapter()
     {
+      @Override
       public void keyPressed(KeyEvent evt)
       {
         pdbcanvas.keyPressed(evt);
@@ -183,6 +185,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
     png.setText("PNG");
     png.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         png_actionPerformed(e);
@@ -191,6 +194,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
     eps.setText("EPS");
     eps.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         eps_actionPerformed(e);
@@ -199,6 +203,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
     mapping.setText(MessageManager.getString("label.view_mapping"));
     mapping.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         mapping_actionPerformed(e);
@@ -207,6 +212,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
     wire.setText(MessageManager.getString("label.wireframe"));
     wire.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         wire_actionPerformed(e);
@@ -216,6 +222,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
     depth.setText(MessageManager.getString("label.depthcue"));
     depth.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         depth_actionPerformed(e);
@@ -225,6 +232,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
     zbuffer.setText(MessageManager.getString("label.z_buffering"));
     zbuffer.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         zbuffer_actionPerformed(e);
@@ -233,6 +241,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
     charge.setText(MessageManager.getString("label.charge_cysteine"));
     charge.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         charge_actionPerformed(e);
@@ -241,6 +250,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
     chain.setText(MessageManager.getString("action.by_chain"));
     chain.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         chain_actionPerformed(e);
@@ -250,6 +260,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
     seqButton.setText(MessageManager.getString("action.by_sequence"));
     seqButton.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         seqButton_actionPerformed(e);
@@ -259,6 +270,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
     allchains.setText(MessageManager.getString("label.show_all_chains"));
     allchains.addItemListener(new ItemListener()
     {
+      @Override
       public void itemStateChanged(ItemEvent e)
       {
         allchains_itemStateChanged(e);
@@ -267,6 +279,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
     zappo.setText(MessageManager.getString("label.zappo"));
     zappo.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         zappo_actionPerformed(e);
@@ -275,6 +288,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
     taylor.setText(MessageManager.getString("label.taylor"));
     taylor.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         taylor_actionPerformed(e);
@@ -283,6 +297,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
     hydro.setText(MessageManager.getString("label.hydrophobicity"));
     hydro.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         hydro_actionPerformed(e);
@@ -291,6 +306,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
     helix.setText(MessageManager.getString("label.helix_propensity"));
     helix.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         helix_actionPerformed(e);
@@ -299,6 +315,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
     strand.setText(MessageManager.getString("label.strand_propensity"));
     strand.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         strand_actionPerformed(e);
@@ -307,6 +324,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
     turn.setText(MessageManager.getString("label.turn_propensity"));
     turn.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         turn_actionPerformed(e);
@@ -315,6 +333,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
     buried.setText(MessageManager.getString("label.buried_index"));
     buried.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         buried_actionPerformed(e);
@@ -323,6 +342,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
     user.setText(MessageManager.getString("action.user_defined"));
     user.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         user_actionPerformed(e);
@@ -333,6 +353,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
             .setText(MessageManager.getString("action.background_colour"));
     background.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         background_actionPerformed(e);
@@ -341,6 +362,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
     savePDB.setText(MessageManager.getString("label.pdb_file"));
     savePDB.addActionListener(new ActionListener()
     {
+      @Override
       public void actionPerformed(ActionEvent e)
       {
         savePDB_actionPerformed(e);
@@ -391,6 +413,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
         radioItem.setName("USER_DEFINED");
         radioItem.addMouseListener(new MouseAdapter()
         {
+          @Override
           public void mousePressed(MouseEvent evt)
           {
             if (evt.isControlDown()
@@ -415,6 +438,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
               {
                 radioItem.addActionListener(new ActionListener()
                 {
+                  @Override
                   public void actionPerformed(ActionEvent evt)
                   {
                     user_actionPerformed(evt);
@@ -426,6 +450,7 @@ public class PDBViewer extends JInternalFrame implements Runnable
         });
         radioItem.addActionListener(new ActionListener()
         {
+          @Override
           public void actionPerformed(ActionEvent evt)
           {
             user_actionPerformed(evt);
@@ -525,20 +550,20 @@ public class PDBViewer extends JInternalFrame implements Runnable
     {
       im = new jalview.util.ImageMaker(this,
               jalview.util.ImageMaker.TYPE.PNG, "Make PNG image from view",
-              width, height, null, null);
+              width, height, null, null, null, 0, false);
     }
     else if (type == jalview.util.ImageMaker.TYPE.EPS)
     {
       im = new jalview.util.ImageMaker(this,
               jalview.util.ImageMaker.TYPE.EPS, "Make EPS file from view",
-              width, height, null, this.getTitle());
+              width, height, null, this.getTitle(), null, 0, false);
     }
     else
     {
 
       im = new jalview.util.ImageMaker(this,
               jalview.util.ImageMaker.TYPE.SVG, "Make SVG file from PCA",
-              width, height, null, this.getTitle());
+              width, height, null, this.getTitle(), null, 0, false);
     }
 
     if (im.getGraphics() != null)