merge from develop

[jalview.git] / src / jalview / appletgui / APopupMenu.java

diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java
index f16da84..9e16329 100644 (file)
--- a/src/jalview/appletgui/APopupMenu.java
+++ b/src/jalview/appletgui/APopupMenu.java
@@ -896,9 +896,9 @@ public class APopupMenu extends java.awt.PopupMenu implements
 
   void addPDB()
   {
-    if (seq.getPDBId() != null)
+    if (seq.getAllPDBEntries() != null)
     {
-      PDBEntry entry = seq.getPDBId().firstElement();
+      PDBEntry entry = seq.getAllPDBEntries().firstElement();
 
       if (ap.av.applet.jmolAvailable)
       {
@@ -1025,7 +1025,8 @@ public class APopupMenu extends java.awt.PopupMenu implements
 
     userDefinedColour.setLabel(MessageManager.getString("action.user_defined"));
     userDefinedColour.addActionListener(this);
-    PIDColour.setLabel(MessageManager.getString("action.percentage_identity"));
+    PIDColour.setLabel(MessageManager
+            .getString("label.percentage_identity"));
     PIDColour.addActionListener(this);
     BLOSUM62Colour.setLabel("BLOSUM62");
     BLOSUM62Colour.addActionListener(this);