Merge branch 'JAL-1403' into Release_2_8_1_Branch

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

diff --git a/src/MCview/AppletPDBCanvas.java b/src/MCview/AppletPDBCanvas.java
old mode 100755 (executable)
new mode 100644 (file)
index c82c331..40e99db
--- a/src/MCview/AppletPDBCanvas.java
+++ b/src/MCview/AppletPDBCanvas.java
@@ -1,13 +1,13 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.5)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
+ * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
  * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
- * 
+ *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
@@ -29,6 +29,7 @@ import jalview.datamodel.*;
 
 import jalview.appletgui.*;
 import jalview.structure.*;
+import jalview.util.MessageManager;
 
 public class AppletPDBCanvas extends Panel implements MouseListener,
         MouseMotionListener, StructureListener
@@ -132,7 +133,8 @@ public class AppletPDBCanvas extends Panel implements MouseListener,
     this.pdbentry = pdbentry;
     this.sequence = seq;
 
-    ssm = StructureSelectionManager.getStructureSelectionManager();
+    ssm = StructureSelectionManager
+            .getStructureSelectionManager(ap.av.applet);
 
     try
     {
@@ -177,8 +179,10 @@ public class AppletPDBCanvas extends Panel implements MouseListener,
       // the start and end points.
       // Align the sequence to the pdb
       // TODO: DNa/Pep switch
-      AlignSeq as = new AlignSeq(sequence, ((PDBChain) pdb.chains
-              .elementAt(i)).sequence, ((PDBChain) pdb.chains.elementAt(i)).isNa ? AlignSeq.DNA : AlignSeq.PEP);
+      AlignSeq as = new AlignSeq(sequence,
+              ((PDBChain) pdb.chains.elementAt(i)).sequence,
+              ((PDBChain) pdb.chains.elementAt(i)).isNa ? AlignSeq.DNA
+                      : AlignSeq.PEP);
       as.calcScoreMatrix();
       as.traceAlignment();
       PrintStream ps = new PrintStream(System.out)
@@ -465,7 +469,7 @@ public class AppletPDBCanvas extends Panel implements MouseListener,
       g.fillRect(0, 0, getSize().width, getSize().height);
       g.setColor(Color.black);
       g.setFont(new Font("Verdana", Font.BOLD, 14));
-      g.drawString("Error loading PDB data!!", 50, getSize().height / 2);
+      g.drawString(MessageManager.getString("label.error_loading_pdb_data"), 50, getSize().height / 2);
       return;
     }
 
@@ -473,7 +477,7 @@ public class AppletPDBCanvas extends Panel implements MouseListener,
     {
       g.setColor(Color.black);
       g.setFont(new Font("Verdana", Font.BOLD, 14));
-      g.drawString("Fetching PDB data...", 50, getSize().height / 2);
+      g.drawString(MessageManager.getString("label.fetching_pdb_data"), 50, getSize().height / 2);
       return;
     }
 
@@ -1102,7 +1106,8 @@ public class AppletPDBCanvas extends Panel implements MouseListener,
   // /StructureListener
   public String[] getPdbFile()
   {
-    return new String[] { pdbentry.getFile() };
+    return new String[]
+    { pdbentry.getFile() };
   }
 
   String lastMessage;
@@ -1189,4 +1194,11 @@ public class AppletPDBCanvas extends Panel implements MouseListener,
     repaint();
   }
 
+  @Override
+  public void releaseReferences(Object svl)
+  {
+    // TODO Auto-generated method stub
+
+  }
+
 }