Remove empty() from feature ToolTip

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

diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java
index e87ab95..5ecc613 100755 (executable)
--- a/src/jalview/appletgui/SeqPanel.java
+++ b/src/jalview/appletgui/SeqPanel.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
@@ -322,17 +322,20 @@ public class SeqPanel
      {\r
        lastMousePress = evt.getPoint();\r
 \r
+       //For now, ignore the mouseWheel font resizing on Macs\r
+       //As the Button2_mask always seems to be true\r
        if ( (evt.getModifiers() & InputEvent.BUTTON2_MASK) ==\r
-         InputEvent.BUTTON2_MASK)\r
+         InputEvent.BUTTON2_MASK && !av.MAC)\r
        {\r
          mouseWheelPressed = true;\r
          return;\r
        }\r
 \r
-       if (evt.isShiftDown() || evt.isAltDown() ||\r
-           evt.isControlDown())\r
+       if (evt.isShiftDown()\r
+           || evt.isControlDown()\r
+           || evt.isAltDown())\r
        {\r
-         if (evt.isAltDown() || evt.isControlDown())\r
+         if (evt.isControlDown() || evt.isAltDown())\r
          {\r
            groupEditing = true;\r
          }\r
@@ -412,6 +415,8 @@ public class SeqPanel
 \r
 \r
       int cwidth = seqCanvas.getWrappedCanvasWidth(getSize().width);\r
+      if(cwidth<1)\r
+        return 0;\r
 \r
       wrappedBlock = y / cHeight;\r
       wrappedBlock += av.getStartRes() / cwidth;\r
@@ -562,7 +567,9 @@ public class SeqPanel
 \r
         if (sf.getValue("status") != null )\r
         {\r
-          featureText.append(" (" + sf.getValue("status") + ")");\r
+          String status = sf.getValue("status").toString();\r
+          if(status.length()>0)\r
+            featureText.append(" (" + sf.getValue("status") + ")");\r
         }\r
         featureText.append("\n");\r
 \r
@@ -987,7 +994,7 @@ public class SeqPanel
     {\r
         seq.insertCharAt(j, av.getGapCharacter());\r
         seqEditOccurred = true;\r
-    }\r
+   }\r
 \r
     void insertChar(int j, SequenceI seq, int fixedColumn)\r
     {\r
@@ -1029,7 +1036,6 @@ public class SeqPanel
             "End editing: Tried removing residue " + seq.getCharAt(j));\r
         return;\r
       }\r
-\r
       seq.deleteCharAt(j);\r
       seq.insertCharAt(fixedColumn, av.getGapCharacter());\r
       seqEditOccurred = true;\r