Scrolling fixed and selection in wrapped mode updated

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

diff --git a/src/jalview/appletgui/FeatureSettings.java b/src/jalview/appletgui/FeatureSettings.java
index b642fb3..49f0996 100755 (executable)
--- a/src/jalview/appletgui/FeatureSettings.java
+++ b/src/jalview/appletgui/FeatureSettings.java
@@ -374,7 +374,9 @@ public class FeatureSettings extends Panel implements ItemListener,
 \r
     selectedCheck = (MyCheckbox)evt.getSource();\r
 \r
-    if ( fr.featureLinks.containsKey(selectedCheck.getLabel() )   )\r
+    if(fr.featureLinks!=null\r
+       && fr.featureLinks.containsKey(selectedCheck.getLabel() )\r
+        )\r
       {\r
         if(evt.getX()>selectedCheck.stringWidth+20)\r
         {\r
@@ -401,8 +403,9 @@ public class FeatureSettings extends Panel implements ItemListener,
 \r
     int height = evt.getY()+evt.getComponent().getLocation().y;\r
 \r
-    if(height > this.getSize().height)\r
+    if(height > featurePanel.getSize().height)\r
      {\r
+\r
        comp = featurePanel.getComponent(featurePanel.getComponentCount()-1);\r
      }\r
      else if(height < 0)\r
@@ -451,7 +454,8 @@ public class FeatureSettings extends Panel implements ItemListener,
   {\r
     MyCheckbox check = (MyCheckbox) evt.getSource();\r
 \r
-    if (fr.featureLinks.containsKey(check.getLabel()))\r
+    if (fr.featureLinks!=null\r
+        && fr.featureLinks.containsKey(check.getLabel()))\r
     {\r
       if (evt.getX() > check.stringWidth + 20)\r
       {\r
@@ -487,6 +491,7 @@ public class FeatureSettings extends Panel implements ItemListener,
     public MyCheckbox(String label, boolean checked, boolean haslink)\r
     {\r
       super(label, checked);\r
+\r
       FontMetrics fm = av.nullFrame.getFontMetrics(av.nullFrame.getFont());\r
       stringWidth = fm.stringWidth(label);\r
       this.hasLink = haslink;\r