Fix for Finn Drablos bug. Must use equals for comparing strings

diff --git a/src/jalview/appletgui/AnnotationPanel.java b/src/jalview/appletgui/AnnotationPanel.java
index 92ee3a2..ad2e6f0 100755 (executable)
--- a/src/jalview/appletgui/AnnotationPanel.java
+++ b/src/jalview/appletgui/AnnotationPanel.java
@@ -389,8 +389,8 @@ public class AnnotationPanel
                           y + iconOffset + 3);\r
                   }\r
                   else if (((row.annotations[j - 1] == null) ||\r
-                          (row.annotations[j].displayCharacter != row.annotations[j -\r
-                          1].displayCharacter)))\r
+                          (!row.annotations[j].displayCharacter.equals(\r
+                           row.annotations[j - 1].displayCharacter))))\r
                   {\r
                       g.drawString(row.annotations[j].displayCharacter, x+charOffset,\r
                           y + iconOffset + 3);\r

diff --git a/src/jalview/gui/AnnotationPanel.java b/src/jalview/gui/AnnotationPanel.java
index e962bdf..ab6d395 100755 (executable)
--- a/src/jalview/gui/AnnotationPanel.java
+++ b/src/jalview/gui/AnnotationPanel.java
@@ -711,9 +711,10 @@ public class AnnotationPanel extends JPanel implements MouseListener,
                         g.drawString(row.annotations[column].displayCharacter, x+charOffset,\r
                             y + iconOffset + 3);\r
                     }\r
-                    else if (((row.annotations[column - 1] == null) ||\r
-                            (row.annotations[column].displayCharacter != row.annotations[column -\r
-                            1].displayCharacter)))\r
+                    else if (((row.annotations[column - 1] == null)\r
+                              ||\r
+                            (!row.annotations[column].displayCharacter.equals(\r
+                             row.annotations[column - 1].displayCharacter))))\r
                     {\r
                         g.drawString(row.annotations[column].displayCharacter, x+charOffset,\r
                             y + iconOffset + 3);\r