JAL-4260 fix up click/drags on ruler area in wrapped mode.

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

diff --git a/src/jalview/appletgui/APopupMenu.java b/src/jalview/appletgui/APopupMenu.java
index 6299c62..413b0d4 100644 (file)
--- a/src/jalview/appletgui/APopupMenu.java
+++ b/src/jalview/appletgui/APopupMenu.java
@@ -393,14 +393,14 @@ public class APopupMenu extends java.awt.PopupMenu
         urlLink = new UrlLink(link);
       } catch (Exception foo)
       {
-        System.err.println("Exception for URLLink '" + link + "': "
+        jalview.bin.Console.errPrintln("Exception for URLLink '" + link + "': "
                 + foo.getMessage());
         continue;
       }
 
       if (!urlLink.isValid())
       {
-        System.err.println(urlLink.getInvalidMessage());
+        jalview.bin.Console.errPrintln(urlLink.getInvalidMessage());
         continue;
       }
 
@@ -835,8 +835,8 @@ public class APopupMenu extends java.awt.PopupMenu
         if (start <= end)
         {
           seqs.add(sg.getSequenceAt(i));
-          features.add(new SequenceFeature(null, null, start, end,
-                  "Jalview"));
+          features.add(
+                  new SequenceFeature(null, null, start, end, "Jalview"));
         }
       }
 
@@ -945,8 +945,8 @@ public class APopupMenu extends java.awt.PopupMenu
       }
       else
       {
-        new MCview.AppletPDBViewer(entry, new SequenceI[] { seq }, null, ap,
-                DataSourceType.URL);
+        new mc_view.AppletPDBViewer(entry, new SequenceI[] { seq }, null,
+                ap, DataSourceType.URL);
       }
 
     }
@@ -1056,7 +1056,7 @@ public class APopupMenu extends java.awt.PopupMenu
     BLOSUM62Colour.setName(JalviewColourScheme.Blosum62.toString());
     BLOSUM62Colour.addItemListener(this);
     PIDColour.setLabel(
-            MessageManager.getString("label.colourScheme_%_identity"));
+            MessageManager.getString("label.colourScheme_%identity"));
     PIDColour.setName(JalviewColourScheme.PID.toString());
     PIDColour.addItemListener(this);
     zappoColour
@@ -1072,20 +1072,20 @@ public class APopupMenu extends java.awt.PopupMenu
     hydrophobicityColour
             .setName(JalviewColourScheme.Hydrophobic.toString());
     hydrophobicityColour.addItemListener(this);
-    helixColour.setLabel(MessageManager
-            .getString("label.colourScheme_helix_propensity"));
+    helixColour.setLabel(
+            MessageManager.getString("label.colourScheme_helixpropensity"));
     helixColour.setName(JalviewColourScheme.Helix.toString());
     helixColour.addItemListener(this);
     strandColour.setLabel(MessageManager
-            .getString("label.colourScheme_strand_propensity"));
+            .getString("label.colourScheme_strandpropensity"));
     strandColour.setName(JalviewColourScheme.Strand.toString());
     strandColour.addItemListener(this);
     turnColour.setLabel(
-            MessageManager.getString("label.colourScheme_turn_propensity"));
+            MessageManager.getString("label.colourScheme_turnpropensity"));
     turnColour.setName(JalviewColourScheme.Turn.toString());
     turnColour.addItemListener(this);
     buriedColour.setLabel(
-            MessageManager.getString("label.colourScheme_buried_index"));
+            MessageManager.getString("label.colourScheme_buriedindex"));
     buriedColour.setName(JalviewColourScheme.Buried.toString());
     buriedColour.addItemListener(this);
     nucleotideColour.setLabel(