X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAppVarna.java;h=4fe9ac2139d4a41bf3446fa6e735cd22dd60683e;hb=ad5029edaf36ceaafb4e269f2e00b0e1e0d7ffc4;hp=70e68eea770bf2fc884f20e8d8988bf8db13fd20;hpb=9a59ebeab8ec986ea70103431d9f63412f640625;p=jalview.git

diff --git a/src/jalview/gui/AppVarna.java b/src/jalview/gui/AppVarna.java
index 70e68ee..4fe9ac2 100644
--- a/src/jalview/gui/AppVarna.java
+++ b/src/jalview/gui/AppVarna.java
@@ -1,19 +1,22 @@
 /*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2)
+ * Copyright (C) 2014 The Jalview Authors
  * 
  * This file is part of Jalview.
  * 
  * Jalview is free software: you can redistribute it and/or
  * modify it under the terms of the GNU General Public License 
- * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
  *  
  * Jalview is distributed in the hope that it will be useful, but 
  * WITHOUT ANY WARRANTY; without even the implied warranty 
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR 
  * PURPOSE.  See the GNU General Public License for more details.
  * 
- * You should have received a copy of the GNU General Public License along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview.  If not, see <http://www.gnu.org/licenses/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
  */
 package jalview.gui;
 
@@ -39,6 +42,10 @@ import java.util.regex.Pattern;
 import javax.swing.JInternalFrame;
 import javax.swing.JSplitPane;
 
+import jalview.bin.Cache;
+import jalview.util.MessageManager;
+import jalview.util.ShiftList;
+
 import fr.orsay.lri.varna.VARNAPanel;
 import fr.orsay.lri.varna.exceptions.ExceptionFileFormatOrSyntax;
 import fr.orsay.lri.varna.exceptions.ExceptionUnmatchedClosingParentheses;
@@ -75,23 +82,23 @@ public class AppVarna extends JInternalFrame implements
   public AppVarna(String sname, SequenceI seq, String strucseq,
           String struc, String name, AlignmentPanel ap)
   {
-	  System.out.println("je suis là (AppVarna!!");
-	  System.out.println("1:"+sname);
-	  System.out.println("2:"+seq);
-	  System.out.println("3:"+strucseq);
-	  System.out.println("4:"+struc);
-	  System.out.println("5:"+name);
-	  System.out.println("6:"+ap);
+
+    // System.out.println("1:"+sname);
+    // System.out.println("2:"+seq);
+    // System.out.println("3:"+strucseq);
+    // System.out.println("4:"+struc);
+    // System.out.println("5:"+name);
+    // System.out.println("6:"+ap);
     this.ap = ap;
     ArrayList<RNA> rnaList = new ArrayList<RNA>();
     RNA rna1 = new RNA(name);
     try
     {
-    System.out.println("ou ici ?");
+
       rna1.setRNA(strucseq, replaceOddGaps(struc));
-      System.out.println("La séquence est :"+rna1.getSeq());
-      System.out.println("La séquence est :"+struc);
-      System.out.println("La séquence est :"+replaceOddGaps(struc).toString());
+      // System.out.println("The sequence is :"+rna1.getSeq());
+      // System.out.println("The sequence is:"+struc);
+      // System.out.println("The sequence is:"+replaceOddGaps(struc).toString());
     } catch (ExceptionUnmatchedClosingParentheses e2)
     {
       e2.printStackTrace();
@@ -102,7 +109,7 @@ public class AppVarna extends JInternalFrame implements
     RNA trim = trimRNA(rna1, "trimmed " + sname);
     rnaList.add(trim);
     rnaList.add(rna1);
-    
+
     rnas.put(seq, rna1);
     rnas.put(seq, trim);
     rna1.setName(sname + " (with gaps)");
@@ -110,7 +117,7 @@ public class AppVarna extends JInternalFrame implements
     {
       seqs.put(trim, seq);
       seqs.put(rna1, seq);
-      
+
       /**
        * if (false || seq.getStart()!=1) { for (RNA rshift:rnaList) { ShiftList
        * shift=offsets.get(rshift); if (shift==null) { offsets.put(rshift,
@@ -120,19 +127,18 @@ public class AppVarna extends JInternalFrame implements
     }
     vab = new AppVarnaBinding(rnaList);
     // vab = new AppVarnaBinding(seq,struc);
-    // System.out.println("Hallo: "+name);
     this.name = sname + " trimmed to " + name;
     initVarna();
-   
+
     ssm = ap.getStructureSelectionManager();
-    System.out.println(ssm.toString());
+    // System.out.println(ssm.toString());
     ssm.addStructureViewerListener(this);
     ssm.addSelectionListener(this);
   }
 
   public void initVarna()
   {
-	  System.out.println("initialisation VANRA");
+
     // vab.setFinishedInit(false);
     varnaPanel = vab.get_varnaPanel();
     setBackground(Color.white);
@@ -143,11 +149,12 @@ public class AppVarna extends JInternalFrame implements
     // getContentPane().add(vab.getTools(), BorderLayout.NORTH);
     varnaPanel.addVARNAListener(this);
     varnaPanel.addSelectionListener(this);
-    jalview.gui.Desktop.addInternalFrame(this, "VARNA -" + name,
-            getBounds().width, getBounds().height);
+    jalview.gui.Desktop.addInternalFrame(this,
+            MessageManager.formatMessage("label.varna_params", new String[]
+            { name }), getBounds().width, getBounds().height);
     this.pack();
     showPanel(true);
-    System.out.println("Sortie initialisation VANRA");
+
   }
 
   public String replaceOddGaps(String oldStr)
@@ -163,7 +170,7 @@ public class AppVarna extends JInternalFrame implements
   public RNA trimRNA(RNA rna, String name)
   {
     ShiftList offset = new ShiftList();
-    
+
     RNA rnaTrim = new RNA(name);
     try
     {
@@ -430,14 +437,14 @@ public class AppVarna extends JInternalFrame implements
   public void onTranslationChanged()
   {
     // TODO Auto-generated method stub
-    
+
   }
 
   @Override
   public void onZoomLevelChanged()
   {
     // TODO Auto-generated method stub
-    
+
   }
 
 }