From: janengelhardt <engelhardt87@googlemail.com>
Date: Thu, 29 Sep 2011 01:11:33 +0000 (+0200)
Subject: Sequence name in VARNA windows was not correct (always contained
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=2c7efe6527eab948c296b4e1b8aae3337c622ad9;p=jalview.git

Sequence name in VARNA windows was not correct (always contained
"consensus-"). The addition of the prefix is therefore moved from
AppVarna to PopUpMenu.

Change-Id: I7e0cd46bce9eee07726678742e5f8046f7f528af
---

diff --git a/src/jalview/gui/AppVarna.java b/src/jalview/gui/AppVarna.java
index ecc6cb6..fd9ef02 100644
--- a/src/jalview/gui/AppVarna.java
+++ b/src/jalview/gui/AppVarna.java
@@ -76,15 +76,13 @@ public class AppVarna extends JInternalFrame implements InterfaceVARNAListener,S
 	  }
 	  rnaList.add(trimRNA(rna1));	  
 	  rnaList.add(rna1);
-	  rna1.setName("consenus_"+rna1.getName());
+	  //rna1.setName("consensus_"+rna1.getName());
 	  
 	  
 	  vab = new AppVarnaBinding(rnaList);
-	  //vab = new AppVarnaBinding(seq,struc);
-	  //System.out.println("Hallo: "+name);
 	  this.name=name;
 	  initVarna();
-      ssm = ap.getStructureSelectionManager();
+          ssm = ap.getStructureSelectionManager();
 	  ssm.addStructureViewerListener(this);
   }
   
diff --git a/src/jalview/gui/PopupMenu.java b/src/jalview/gui/PopupMenu.java
index f2f41a3..22656b1 100644
--- a/src/jalview/gui/PopupMenu.java
+++ b/src/jalview/gui/PopupMenu.java
@@ -279,7 +279,7 @@ public class PopupMenu extends JPopupMenu
             {
               public void actionPerformed(ActionEvent e)
               {
-                new AppVarna(seq.getSequenceAsString(), rnastruc, seq
+                new AppVarna(seq.getSequenceAsString(), rnastruc, "consensus_"+seq
                         .getName(), ap);
               }
             });