<!-- Webstart Image - looked for in resources/images -->
<property name="WebStartImage" value="JalviewLogo_big.png"/>
<!-- J2SE version needed for webstart launch -->
- <property name="j2sev" value="1.6+"/>
+<!-- Anne's version needs 1.7 - should rebuild VARNA to java 1.6 for release -->
+ <property name="j2sev" value="1.7+"/>
- <!-- Permissions for running Java applets and applications. Defaults are those suitable for deploying jalview webstart/jalviewLite at www.jalview.org -->
- <property name="application.codebase" value="*.jalview.org"/>
- <property name="applet.codebase" value="*.jalview.org"/>
- <property name="applet.caller-codebase" value="${applet.codebase}"/>
+ <!-- Permissions for running Java applets and applications. -->
+ <!-- Defaults are those suitable for deploying jalview webstart www.jalview.org -->
+ <property name="application.codebase" value="*.jalview.org" />
+ <!-- and allowing the applet to be deployed from any URL -->
+ <property name="applet.codebase" value="*" />
+ <property name="applet.caller-codebase" value="${applet.codebase}" />
<!-- build directory configuration -->
<property name="libDir" value="lib" />
* 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/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.analysis;
-
import java.util.*;
import java.awt.*;
* 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/>.
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
*/
+
package jalview.analysis;
import java.util.*;
-/*
+/*\r
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)\r
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle\r
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * 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.
- *
- * 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/>.
+ * \r
+ * This file is part of Jalview.\r
+ * \r
+ * Jalview is free software: you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License \r
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\r
+ * \r
+ * Jalview is distributed in the hope that it will be useful, but \r
+ * WITHOUT ANY WARRANTY; without even the implied warranty \r
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR \r
+ * PURPOSE. See the GNU General Public License for more details.\r
+ * \r
+ * You should have received a copy of the GNU General Public License along with Jalview. If not, see <http://www.gnu.org/licenses/>.\r
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
- */
-package jalview.ext.varna;
-
-import jalview.api.FeatureRenderer;
-import jalview.api.SequenceRenderer;
-import jalview.datamodel.AlignmentI;
-import jalview.datamodel.SequenceI;
-import jalview.structure.StructureMapping;
-import jalview.structure.StructureSelectionManager;
-
-import java.awt.Color;
-import java.util.ArrayList;
-
-/**
+ */\r
+package jalview.ext.varna;\r
+\r
+import jalview.api.FeatureRenderer;\r
+import jalview.api.SequenceRenderer;\r
+import jalview.datamodel.AlignmentI;\r
+import jalview.datamodel.SequenceI;\r
+import jalview.structure.StructureMapping;\r
+import jalview.structure.StructureSelectionManager;\r
+import jalview.util.Comparison;\r
+\r
+import java.awt.Color;\r
+import java.util.ArrayList;\r
+\r
+/**\r
- * Routines for generating Jmol commands for Jalview/Jmol binding\r
- * another cruisecontrol test.\r
+ * Routines for generating Jmol commands for Jalview/Jmol binding another
+ * cruisecontrol test.
- *
- * @author JimP
- *
- */
-public class VarnaCommands
-{
-
- /**
+ * \r
+ * @author JimP\r
+ *\r
+ */\r
+public class VarnaCommands\r
+{\r
+\r
+ /**\r
- * Jmol utility which constructs the commands to colour chains by the given alignment\r
+ * Jmol utility which constructs the commands to colour chains by the given
+ * alignment
- *
- */
+ * \r
+ */\r
- public static String[] getColourBySequenceCommand(StructureSelectionManager ssm, String[] files, SequenceI[][] sequence, SequenceRenderer sr, FeatureRenderer fr, AlignmentI alignment)\r
+ public static String[] getColourBySequenceCommand(
+ StructureSelectionManager ssm, String[] files,
+ SequenceI[][] sequence, SequenceRenderer sr, FeatureRenderer fr,
+ AlignmentI alignment)
- {
- ArrayList<String> str = new ArrayList<String>();
- StringBuffer command = new StringBuffer();
-
- for (int pdbfnum = 0; pdbfnum < files.length; pdbfnum++)
- {
- StructureMapping[] mapping = ssm.getMapping(files[pdbfnum]);
-
- if (mapping == null || mapping.length < 1)
- continue;
-
- int lastPos = -1;
- for (int s = 0; s < sequence[pdbfnum].length; s++)
- {
- for (int sp, m = 0; m < mapping.length; m++)
- {
- if (mapping[m].getSequence() == sequence[pdbfnum][s]
- && (sp = alignment.findIndex(sequence[pdbfnum][s])) > -1)
- {
- SequenceI asp = alignment.getSequenceAt(sp);
- for (int r = 0; r < asp.getLength(); r++)
- {
- // no mapping to gaps in sequence
- if (jalview.util.Comparison.isGap(asp.getCharAt(r)))
- {
- continue;
- }
- int pos = mapping[m].getPDBResNum(asp.findPosition(r));
-
- if (pos < 1 || pos == lastPos)
- continue;
-
- lastPos = pos;
-
- Color col = sr.getResidueBoxColour(sequence[pdbfnum][s], r);
-
- if (fr != null)
- col = fr.findFeatureColour(col, sequence[pdbfnum][s], r);
- String newSelcom = (mapping[m].getChain() != " " ? ":"
- + mapping[m].getChain() : "")
- + "/"
- + (pdbfnum + 1)
- + ".1"
- + ";color["
- + col.getRed()
- + ","
- + col.getGreen()
- + ","
- + col.getBlue() + "]";
+ {\r
+ \r
+ ArrayList<String> str = new ArrayList<String>();\r
+ StringBuffer command = new StringBuffer();\r
+ \r
+ for (int pdbfnum = 0; pdbfnum < files.length; pdbfnum++)\r
+ {\r
+ StructureMapping[] mapping = ssm.getMapping(files[pdbfnum]);\r
+ \r
+ if (mapping == null || mapping.length < 1)\r
+ continue;\r
+ \r
+ int lastPos = -1;\r
+ for (int s = 0; s < sequence[pdbfnum].length; s++)\r
+ {\r
+ for (int sp, m = 0; m < mapping.length; m++)\r
+ {\r
+ if (mapping[m].getSequence() == sequence[pdbfnum][s]\r
+ && (sp = alignment.findIndex(sequence[pdbfnum][s])) > -1)\r
+ {\r
+ SequenceI asp = alignment.getSequenceAt(sp);\r
+ for (int r = 0; r < asp.getLength(); r++)\r
+ {\r
+ // no mapping to gaps in sequence\r
+ if (jalview.util.Comparison.isGap(asp.getCharAt(r)))\r
+ {\r
+ continue;\r
+ }\r
+ int pos = mapping[m].getPDBResNum(asp.findPosition(r));\r
+ \r
+ if (pos < 1 || pos == lastPos)\r
+ continue;\r
+ \r
+ lastPos = pos;\r
+ \r
+ Color col = sr.getResidueBoxColour(sequence[pdbfnum][s], r);\r
+ \r
+ if (fr != null)\r
+ col = fr.findFeatureColour(col, sequence[pdbfnum][s], r);\r
+ String newSelcom = (mapping[m].getChain() != " " ? ":"\r
+ + mapping[m].getChain() : "")\r
+ + "/"\r
+ + (pdbfnum + 1)\r
+ + ".1"\r
+ + ";color["\r
+ + col.getRed()\r
+ + ","\r
+ + col.getGreen()\r
+ + ","\r
+ + col.getBlue() + "]";\r
- if (command.length()>newSelcom.length() && command.substring(command.length()-newSelcom.length()).equals(newSelcom))\r
+ if (command.length() > newSelcom.length()
+ && command.substring(
+ command.length() - newSelcom.length())
+ .equals(newSelcom))
- {
- command = VarnaCommands.condenseCommand(command, pos);
- continue;
- }
- // TODO: deal with case when buffer is too large for Jmol to parse
- // - execute command and flush
-
- command.append(";");
- if (command.length() > 51200)
- {
- // add another chunk
- str.add(command.toString());
- command.setLength(0);
- }
- command.append("select " + pos);
- command.append(newSelcom);
- }
- break;
- }
- }
- }
- }
- {
- // add final chunk
- str.add(command.toString());
- command.setLength(0);
- }
- return str.toArray(new String[str.size()]);
- }
-
- public static StringBuffer condenseCommand(StringBuffer command, int pos)
- {
-
- // work back to last 'select'
- int p = command.length(), q = p;
+ {\r
+ command = VarnaCommands.condenseCommand(command, pos);\r
+ continue;\r
+ }\r
+ // TODO: deal with case when buffer is too large for Jmol to parse\r
+ // - execute command and flush\r
+ \r
+ command.append(";");\r
+ if (command.length()>51200)\r
+ {\r
+ // add another chunk\r
+ str.add(command.toString());\r
+ command.setLength(0);\r
+ }\r
+ command.append("select " + pos);\r
+ command.append(newSelcom);\r
+ }\r
+ break;\r
+ }\r
+ }\r
+ }\r
+ }\r
+ {\r
+ // add final chunk\r
+ str.add(command.toString());\r
+ command.setLength(0);\r
+ }\r
+ return str.toArray(new String[str.size()]);\r
+ }\r
+\r
+ public static StringBuffer condenseCommand(StringBuffer command, int pos)\r
+ {\r
+ \r
+ // work back to last 'select'\r
+ int p=command.length(),q=p;\r
- do {\r
+ do
+ {
- p -= 6;
+ p-=6;\r
- if (p<1) { p=0; };\r
+ if (p < 1)
+ {
+ p = 0;
+ }
+ ;
- } while ((q = command.indexOf("select", p)) == -1 && p > 0);
-
- StringBuffer sb = new StringBuffer(command.substring(0, q + 7));
-
- command = command.delete(0, q + 7);
-
- String start;
-
- if (command.indexOf("-") > -1)
- {
- start = command.substring(0, command.indexOf("-"));
- }
- else
- {
- start = command.substring(0, command.indexOf(":"));
- }
-
- sb.append(start + "-" + pos + command.substring(command.indexOf(":")));
-
- return sb;
- }
-
-}
+ } while ((q=command.indexOf("select",p))==-1 && p>0);\r
+ \r
+ StringBuffer sb = new StringBuffer(command.substring(0,q+7));\r
+ \r
+ command = command.delete(0,q+7);\r
+ \r
+ String start;\r
+ \r
+ if (command.indexOf("-") > -1)\r
+ {\r
+ start = command.substring(0, command.indexOf("-"));\r
+ }\r
+ else\r
+ {\r
+ start = command.substring(0, command.indexOf(":"));\r
+ }\r
+ \r
+ sb.append(start + "-" + pos + command.substring(command.indexOf(":")));\r
+ \r
+ return sb;\r
+ }\r
+\r
+}\r
*/
package jalview.gui;
-import java.util.*;
+import jalview.bin.Cache;
+import jalview.datamodel.ColumnSelection;
+import jalview.datamodel.SequenceGroup;
+import jalview.datamodel.SequenceI;
+import jalview.structure.SecondaryStructureListener;
+import jalview.structure.SelectionListener;
+import jalview.structure.SelectionSource;
+import jalview.structure.StructureSelectionManager;
+import jalview.structure.VamsasSource;
+import jalview.util.ShiftList;
+
+import java.awt.BorderLayout;
+import java.awt.Color;
+import java.util.ArrayList;
+import java.util.Hashtable;
+import java.util.Map;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import java.awt.*;
-import javax.swing.*;
+import javax.swing.JInternalFrame;
+import javax.swing.JSplitPane;
+ import jalview.bin.Cache;
-import jalview.datamodel.*;
-import jalview.structure.*;
+ 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;
final String rnastruc = aa[i].getRNAStruc();
final String structureLine = aa[i].label;
menuItem = new JMenuItem();
- menuItem.setText("2D RNA " + structureLine);
+ menuItem.setText(MessageManager.formatMessage("label.2d_rna_structure_line", new String[]{structureLine}));\r
menuItem.addActionListener(new java.awt.event.ActionListener()
+
{
public void actionPerformed(ActionEvent e)
{
pdbFromFile_actionPerformed();
}
});
+// RNAFold.setText("From RNA Fold with predict2D");
+// RNAFold.addActionListener(new ActionListener()
+// {
+// public void actionPerformed(ActionEvent e)
+// {
+// try {
+// RNAFold_actionPerformed();
+// } catch (Exception e1) {
+// // TODO Auto-generated catch block
+// e1.printStackTrace();
+// }
+// }
+// });
+// ContraFold.setText("From Contra Fold with predict2D");
+// ContraFold.addActionListener(new ActionListener()
+// {
+// public void actionPerformed(ActionEvent e)
+// {
+// try {
+// ContraFold_actionPerformed();
+// } catch (Exception e1) {
+// // TODO Auto-generated catch block
+// e1.printStackTrace();
+// }
+// }
+// });
- enterPDB.setText("Enter PDB Id");
+ enterPDB.setText(MessageManager.getString("label.enter_pdb_id"));\r
enterPDB.addActionListener(new ActionListener()
{
public void actionPerformed(ActionEvent e)
* corresponding to READABLE_FNAMES
*/
public static final String[] READABLE_EXTENSIONS = new String[]
- { "fa,faa,fasta,fastq", "aln", "pfam", "msf", "pir", "blc", "amsa", "jar",
- "sto,stk","xml,rnaml" }; // ,
-
- // ".blast"
+ { "fa, fasta, mfa, fastq", "aln", "pfam", "msf", "pir", "blc", "amsa", "jar",
- "sto,stk" }; // ,
-
- // ".blast"
++ "sto,stk","xml,rnaml" }; // ".blast"
// };
/**
-/*
+/*\r
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8)\r
- * Copyright (C) 2012 J Procter, AM Waterhouse, LM Lui, J Engelhardt, G Barton, M Clamp, S Searle\r
+ * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.0b1)
+ * 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.
- *
- * 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/>.
+ * \r
+ * This file is part of Jalview.\r
+ * \r
+ * Jalview is free software: you can redistribute it and/or\r
+ * modify it under the terms of the GNU General Public License \r
+ * as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.\r
+ * \r
+ * Jalview is distributed in the hope that it will be useful, but \r
+ * WITHOUT ANY WARRANTY; without even the implied warranty \r
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR \r
+ * PURPOSE. See the GNU General Public License for more details.\r
+ * \r
+ * You should have received a copy of the GNU General Public License along with Jalview. If not, see <http://www.gnu.org/licenses/>.\r
+ * The Jalview Authors are detailed in the 'AUTHORS' file.
- */
-/*
- * This extension was written by Benjamin Schuster-Boeckler at sanger.ac.uk
- */
-package jalview.io;
-
-import java.io.*;
-import java.util.*;
-
-import com.stevesoft.pat.*;
-import jalview.datamodel.*;
-import jalview.util.Format;
-
-// import org.apache.log4j.*;
-
-/**
- * This class is supposed to parse a Stockholm format file into Jalview There
- * are TODOs in this class: we do not know what the database source and version
- * is for the file when parsing the #GS= AC tag which associates accessions with
- * sequences. Database references are also not parsed correctly: a separate
- * reference string parser must be added to parse the database reference form
- * into Jalview's local representation.
- *
- * @author bsb at sanger.ac.uk
- * @version 0.3 + jalview mods
- *
- */
-public class StockholmFile extends AlignFile
-{
- // static Logger logger = Logger.getLogger("jalview.io.StockholmFile");
+ */\r
+/*\r
+ * This extension was written by Benjamin Schuster-Boeckler at sanger.ac.uk\r
+ */\r
+package jalview.io;\r
+\r
+import jalview.datamodel.AlignmentI;\r
+import jalview.datamodel.AlignmentAnnotation;\r
+import jalview.datamodel.AlignmentI;\r
+import jalview.datamodel.Annotation;\r
+import jalview.datamodel.DBRefEntry;\r
+import jalview.datamodel.Mapping;\r
+import jalview.datamodel.Sequence;\r
+import jalview.datamodel.SequenceFeature;\r
+import jalview.datamodel.SequenceI;\r
+import jalview.util.Format;\r
+\r
+import java.io.BufferedReader;\r
+import java.io.FileReader;\r
+import java.io.IOException;\r
+import java.util.ArrayList;\r
+import java.util.Enumeration;\r
+import java.util.Hashtable;\r
+import java.util.List;\r
+import java.util.StringTokenizer;\r
+import java.util.Vector;\r
+\r
+import com.stevesoft.pat.Regex;\r
+\r
+import fr.orsay.lri.varna.exceptions.ExceptionUnmatchedClosingParentheses;\r
+import fr.orsay.lri.varna.factories.RNAFactory;\r
+import fr.orsay.lri.varna.models.rna.RNA;\r
+\r
+// import org.apache.log4j.*;\r
+\r
+/**\r
+ * This class is supposed to parse a Stockholm format file into Jalview There\r
+ * are TODOs in this class: we do not know what the database source and version\r
+ * is for the file when parsing the #GS= AC tag which associates accessions with\r
+ * sequences. Database references are also not parsed correctly: a separate\r
+ * reference string parser must be added to parse the database reference form\r
+ * into Jalview's local representation.\r
+ * \r
+ * @author bsb at sanger.ac.uk\r
+ * @author Natasha Shersnev (Dundee, UK) (Stockholm file writer)\r
+ * @author Lauren Lui (UCSC, USA) (RNA secondary structure annotation import as stockholm)\r
+ * @author Anne Menard (Paris, FR) (VARNA parsing of Stockholm file data)\r
+ * @version 0.3 + jalview mods\r
+ * \r
+ */\r
+public class StockholmFile extends AlignFile\r
+{\r
+ // static Logger logger = Logger.getLogger("jalview.io.StockholmFile");\r
+ protected ArrayList<RNA> result;\r
StringBuffer out; // output buffer
AlignmentI al;
*/
private void jbInit() throws Exception
{
+
- FileMenu.setText("File");
- HelpMenu.setText("Help");
+ FileMenu.setText(MessageManager.getString("action.file"));
+ HelpMenu.setText(MessageManager.getString("action.help"));
VamsasMenu.setText("Vamsas");
- VamsasMenu.setToolTipText("Share data with other vamsas applications.");
- VamsasStMenu.setText("Connect to");
- VamsasStMenu.setToolTipText("Join an existing vamsas session");
- inputLocalFileMenuItem.setText("from File");
+ VamsasMenu.setToolTipText(MessageManager.getString("label.share_data_vamsas_applications"));
+ VamsasStMenu.setText(MessageManager.getString("label.connect_to"));
+ VamsasStMenu.setToolTipText(MessageManager.getString("label.join_existing_vamsas_session"));
+ inputLocalFileMenuItem.setText(MessageManager.getString("label.load_tree_from_file"));
inputLocalFileMenuItem.setAccelerator(javax.swing.KeyStroke
.getKeyStroke(java.awt.event.KeyEvent.VK_O, Toolkit
.getDefaultToolkit().getMenuShortcutKeyMask(), false));