Unique name for new group and treegroup

diff --git a/src/jalview/appletgui/SeqPanel.java b/src/jalview/appletgui/SeqPanel.java
index 1a2da1e..7933eb9 100755 (executable)
--- a/src/jalview/appletgui/SeqPanel.java
+++ b/src/jalview/appletgui/SeqPanel.java
@@ -572,7 +572,9 @@ public class SeqPanel
       {\r
         if(groups[g].getStartRes()<=res && groups[g].getEndRes()>=res)\r
         {\r
-          tooltipText.append(groups[g].getName()+" ");\r
+          if (!groups[g].getName().startsWith("JTreeGroup") &&\r
+              !groups[g].getName().startsWith("JGroup"))\r
+            tooltipText.append(groups[g].getName() + " ");\r
           if(groups[g].getDescription()!=null)\r
             tooltipText.append(groups[g].getDescription());\r
           tooltipText.append("\n");\r

diff --git a/src/jalview/appletgui/TreeCanvas.java b/src/jalview/appletgui/TreeCanvas.java
index 2801351..5f707d5 100755 (executable)
--- a/src/jalview/appletgui/TreeCanvas.java
+++ b/src/jalview/appletgui/TreeCanvas.java
@@ -574,10 +574,12 @@ public class TreeCanvas
                                                    av.getIgnoreGapsConsensus());\r
           }\r
 \r
-          SequenceGroup sg = new SequenceGroup(sequences, "TreeGroup",\r
+          SequenceGroup sg = new SequenceGroup(sequences, "",\r
                                                cs, true, true,\r
                                                false, 0, av.alignment.getWidth()-1);\r
 \r
+          sg.setName("JTreeGroup:"+sg.hashCode());\r
+\r
 \r
           if (  av.getGlobalColourScheme()!=null\r
              && av.getGlobalColourScheme().conservationApplied())\r

diff --git a/src/jalview/datamodel/SequenceGroup.java b/src/jalview/datamodel/SequenceGroup.java
index eefbf1c..31ccf69 100755 (executable)
--- a/src/jalview/datamodel/SequenceGroup.java
+++ b/src/jalview/datamodel/SequenceGroup.java
@@ -39,9 +39,9 @@ public class SequenceGroup
     String description;\r
     Conservation conserve;\r
     Vector aaFrequency;\r
-    boolean displayBoxes;\r
-    boolean displayText;\r
-    boolean colourText;\r
+    boolean displayBoxes = true;\r
+    boolean displayText = true;\r
+    boolean colourText = true;\r
     private Vector sequences = new Vector();\r
     int width = -1;\r
 \r
@@ -60,11 +60,7 @@ public class SequenceGroup
      */\r
     public SequenceGroup()\r
     {\r
-        groupName = "Group";\r
-        this.displayBoxes = true;\r
-        this.displayText = true;\r
-        this.colourText = false;\r
-        cs = null;\r
+        groupName = "JGroup:"+this.hashCode();\r
     }\r
 \r
     /**\r
@@ -94,30 +90,6 @@ public class SequenceGroup
         recalcConservation();\r
     }\r
 \r
-    /**\r
-     * Creates a new SequenceGroup object.\r
-     *\r
-     * @param groupName DOCUMENT ME!\r
-     * @param scheme DOCUMENT ME!\r
-     * @param displayBoxes DOCUMENT ME!\r
-     * @param displayText DOCUMENT ME!\r
-     * @param colourText DOCUMENT ME!\r
-     * @param start DOCUMENT ME!\r
-     * @param end DOCUMENT ME!\r
-     */\r
-    public SequenceGroup(String groupName, ColourSchemeI scheme,\r
-        boolean displayBoxes, boolean displayText, boolean colourText,\r
-        int start, int end)\r
-    {\r
-        this.groupName = groupName;\r
-        this.displayBoxes = displayBoxes;\r
-        this.displayText = displayText;\r
-        this.colourText = colourText;\r
-        this.cs = scheme;\r
-        startRes = start;\r
-        endRes = end;\r
-    }\r
-\r
     public SequenceI [] getSelectionAsNewSequences(AlignmentI align)\r
     {\r
       int iSize = sequences.size();\r

diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index cd6fe2e..ed9ce8d 100755 (executable)
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -581,7 +581,10 @@ public class SeqPanel extends JPanel implements MouseListener,
         {\r
           if(groups[g].getStartRes()<=res && groups[g].getEndRes()>=res)\r
           {\r
-            tooltipText.append(groups[g].getName()+" ");\r
+            if (!groups[g].getName().startsWith("JTreeGroup") &&\r
+                !groups[g].getName().startsWith("JGroup"))\r
+              tooltipText.append(groups[g].getName() + " ");\r
+\r
             if(groups[g].getDescription()!=null)\r
               tooltipText.append(groups[g].getDescription()+"<BR>");\r
           }\r

diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java
index f338492..db5de1c 100755 (executable)
--- a/src/jalview/gui/TreeCanvas.java
+++ b/src/jalview/gui/TreeCanvas.java
@@ -838,10 +838,12 @@ public class TreeCanvas extends JPanel implements MouseListener, Runnable,
       }
 
       SequenceGroup sg = new SequenceGroup(sequences,
-                                           "TreeGroup", cs, true, true, false,
+                                           null, cs, true, true, false,
                                            0,
                                            av.alignment.getWidth() - 1);
 
+      sg.setName("JTreeGroup:"+sg.hashCode());
+
       AlignmentPanel[] aps = getAssociatedPanels();
       for (int a = 0; a < aps.length; a++)
       {