header updated

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

diff --git a/src/jalview/appletgui/FeatureSettings.java b/src/jalview/appletgui/FeatureSettings.java
index b642fb3..f829826 100755 (executable)
--- a/src/jalview/appletgui/FeatureSettings.java
+++ b/src/jalview/appletgui/FeatureSettings.java
@@ -1,6 +1,6 @@
 /*\r
  * Jalview - A Sequence Alignment Editor and Viewer\r
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
+ * Copyright (C) 2006 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle\r
  *\r
  * This program is free software; you can redistribute it and/or\r
  * modify it under the terms of the GNU General Public License\r
@@ -104,9 +104,10 @@ public class FeatureSettings extends Panel implements ItemListener,
     }\r
     frame = new Frame();\r
     frame.add(this);\r
-    int height = featurePanel.getComponentCount()*50 +30;\r
+    int height = featurePanel.getComponentCount()*50 +60;\r
 \r
-    height = Math.max(100, height);\r
+\r
+    height = Math.max(200, height);\r
     height = Math.min(400, height);\r
 \r
     jalview.bin.JalviewLite.addFrame(frame, "Feature Settings", 280,\r
@@ -117,6 +118,8 @@ public class FeatureSettings extends Panel implements ItemListener,
   {\r
     g.setColor(Color.black);\r
     g.drawString("No Features added to this alignment!!", 10, 20);\r
+    g.drawString("(Features can be added from searches or", 10, 40);\r
+    g.drawString("from Jalview / GFF features files)", 10, 60);\r
   }\r
 \r
   void setTableData()\r
@@ -374,7 +377,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 +406,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 +457,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 +494,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