X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FAppVarna.java;h=5f383138651e92f905792dbce77f5982089892e8;hb=ad15cff29620f960119f80176f1fd443da9f6763;hp=a1f9a3d679171973e8ffe83bcaa5034135084ce3;hpb=8d2724b83aca38ef75d68787cc5939d950467e63;p=jalview.git diff --git a/src/jalview/gui/AppVarna.java b/src/jalview/gui/AppVarna.java index a1f9a3d..5f38313 100644 --- a/src/jalview/gui/AppVarna.java +++ b/src/jalview/gui/AppVarna.java @@ -1,19 +1,21 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1) - * Copyright (C) 2014 The Jalview Authors + * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$) + * Copyright (C) $$Year-Rel$$ 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 . + * You should have received a copy of the GNU General Public License + * along with Jalview. If not, see . * The Jalview Authors are detailed in the 'AUTHORS' file. */ package jalview.gui; @@ -81,12 +83,12 @@ public class AppVarna extends JInternalFrame implements String struc, String name, AlignmentPanel 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); + // 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 rnaList = new ArrayList(); RNA rna1 = new RNA(name); @@ -94,9 +96,9 @@ public class AppVarna extends JInternalFrame implements { rna1.setRNA(strucseq, replaceOddGaps(struc)); -// System.out.println("The sequence is :"+rna1.getSeq()); -// System.out.println("The sequence is:"+struc); -// System.out.println("The sequence is:"+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(); @@ -107,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)"); @@ -115,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, @@ -127,16 +129,16 @@ public class AppVarna extends JInternalFrame implements // vab = new AppVarnaBinding(seq,struc); 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() { - + // vab.setFinishedInit(false); varnaPanel = vab.get_varnaPanel(); setBackground(Color.white); @@ -147,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, MessageManager.formatMessage("label.varna_params", new String[]{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); - + } public String replaceOddGaps(String oldStr) @@ -167,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 { @@ -434,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 - + } }