From: amwaterhouse <Andrew Waterhouse>
Date: Wed, 31 Jan 2007 15:28:47 +0000 (+0000)
Subject: Unique name for new group and treegroup
X-Git-Tag: Release_2_3~406
X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=3e6b14950a06bb87c147493e4dfff0c4491ea25b

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
--- a/src/jalview/appletgui/SeqPanel.java
+++ b/src/jalview/appletgui/SeqPanel.java
@@ -572,7 +572,9 @@ public class SeqPanel
       {
         if(groups[g].getStartRes()<=res && groups[g].getEndRes()>=res)
         {
-          tooltipText.append(groups[g].getName()+" ");
+          if (!groups[g].getName().startsWith("JTreeGroup") &&
+              !groups[g].getName().startsWith("JGroup"))
+            tooltipText.append(groups[g].getName() + " ");
           if(groups[g].getDescription()!=null)
             tooltipText.append(groups[g].getDescription());
           tooltipText.append("\n");
diff --git a/src/jalview/appletgui/TreeCanvas.java b/src/jalview/appletgui/TreeCanvas.java
index 2801351..5f707d5 100755
--- a/src/jalview/appletgui/TreeCanvas.java
+++ b/src/jalview/appletgui/TreeCanvas.java
@@ -574,10 +574,12 @@ public class TreeCanvas
                                                    av.getIgnoreGapsConsensus());
           }
 
-          SequenceGroup sg = new SequenceGroup(sequences, "TreeGroup",
+          SequenceGroup sg = new SequenceGroup(sequences, "",
                                                cs, true, true,
                                                false, 0, av.alignment.getWidth()-1);
 
+          sg.setName("JTreeGroup:"+sg.hashCode());
+
 
           if (  av.getGlobalColourScheme()!=null
              && av.getGlobalColourScheme().conservationApplied())
diff --git a/src/jalview/datamodel/SequenceGroup.java b/src/jalview/datamodel/SequenceGroup.java
index eefbf1c..31ccf69 100755
--- a/src/jalview/datamodel/SequenceGroup.java
+++ b/src/jalview/datamodel/SequenceGroup.java
@@ -39,9 +39,9 @@ public class SequenceGroup
     String description;
     Conservation conserve;
     Vector aaFrequency;
-    boolean displayBoxes;
-    boolean displayText;
-    boolean colourText;
+    boolean displayBoxes = true;
+    boolean displayText = true;
+    boolean colourText = true;
     private Vector sequences = new Vector();
     int width = -1;
 
@@ -60,11 +60,7 @@ public class SequenceGroup
      */
     public SequenceGroup()
     {
-        groupName = "Group";
-        this.displayBoxes = true;
-        this.displayText = true;
-        this.colourText = false;
-        cs = null;
+        groupName = "JGroup:"+this.hashCode();
     }
 
     /**
@@ -94,30 +90,6 @@ public class SequenceGroup
         recalcConservation();
     }
 
-    /**
-     * Creates a new SequenceGroup object.
-     *
-     * @param groupName DOCUMENT ME!
-     * @param scheme DOCUMENT ME!
-     * @param displayBoxes DOCUMENT ME!
-     * @param displayText DOCUMENT ME!
-     * @param colourText DOCUMENT ME!
-     * @param start DOCUMENT ME!
-     * @param end DOCUMENT ME!
-     */
-    public SequenceGroup(String groupName, ColourSchemeI scheme,
-        boolean displayBoxes, boolean displayText, boolean colourText,
-        int start, int end)
-    {
-        this.groupName = groupName;
-        this.displayBoxes = displayBoxes;
-        this.displayText = displayText;
-        this.colourText = colourText;
-        this.cs = scheme;
-        startRes = start;
-        endRes = end;
-    }
-
     public SequenceI [] getSelectionAsNewSequences(AlignmentI align)
     {
       int iSize = sequences.size();
diff --git a/src/jalview/gui/SeqPanel.java b/src/jalview/gui/SeqPanel.java
index cd6fe2e..ed9ce8d 100755
--- a/src/jalview/gui/SeqPanel.java
+++ b/src/jalview/gui/SeqPanel.java
@@ -581,7 +581,10 @@ public class SeqPanel extends JPanel implements MouseListener,
         {
           if(groups[g].getStartRes()<=res && groups[g].getEndRes()>=res)
           {
-            tooltipText.append(groups[g].getName()+" ");
+            if (!groups[g].getName().startsWith("JTreeGroup") &&
+                !groups[g].getName().startsWith("JGroup"))
+              tooltipText.append(groups[g].getName() + " ");
+
             if(groups[g].getDescription()!=null)
               tooltipText.append(groups[g].getDescription()+"<BR>");
           }
diff --git a/src/jalview/gui/TreeCanvas.java b/src/jalview/gui/TreeCanvas.java
index f338492..db5de1c 100755
--- 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++)
       {