X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fio%2Fparsers%2FGeneralMsaParser.java;h=507ae1f670c29ec12aade42448cc495726a66077;hb=6062dfb954cafb6af22e01af89222888d9d5ba66;hp=4b7e9209400a631fc79f9edd377f49aecee4b4d9;hpb=48f7a89be9d34f1930a1f863e608235cc27184c5;p=jalview.git diff --git a/forester/java/src/org/forester/io/parsers/GeneralMsaParser.java b/forester/java/src/org/forester/io/parsers/GeneralMsaParser.java index 4b7e920..507ae1f 100644 --- a/forester/java/src/org/forester/io/parsers/GeneralMsaParser.java +++ b/forester/java/src/org/forester/io/parsers/GeneralMsaParser.java @@ -6,7 +6,7 @@ // Copyright (C) 2010 Christian M Zmasek // Copyright (C) 2010 Sanford-Burnham Medical Research Institute // All rights reserved -// +// // This library is free software; you can redistribute it and/or // modify it under the terms of the GNU Lesser General Public // License as published by the Free Software Foundation; either @@ -16,13 +16,13 @@ // but WITHOUT ANY WARRANTY; without even the implied warranty of // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU // Lesser General Public License for more details. -// +// // You should have received a copy of the GNU Lesser General Public // License along with this library; if not, write to the Free Software // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA // // Contact: phylosoft @ gmail . com -// WWW: www.phylosoft.org/forester +// WWW: https://sites.google.com/site/cmzmasek/home/software/forester package org.forester.io.parsers; @@ -48,7 +48,7 @@ public final class GeneralMsaParser { private static final Pattern NAME_SEQ_PATTERN = Pattern.compile( "(\\S+)\\s+(\\S+)\\s*" ); private static final Pattern INDENTED_SEQ_PATTERN = Pattern.compile( "\\s+(\\S+)\\s*" ); private static final Pattern NON_INDENTED_SEQ_PATTERN = Pattern.compile( "(\\S+).*" ); - private static final Pattern PROBCONS_REGEX = Pattern.compile( "^CLUSTAL\\s" ); + private static final Pattern PROBCONS_REGEX = Pattern.compile( "^CLUSTAL" ); private static final Pattern MUSCLE_REGEX = Pattern.compile( "^MUSCLE\\s\\(" ); private static final Pattern CLUSTAL_REGEX = Pattern.compile( "^PROBCONS\\s" ); private static final Pattern ANYTHING_REGEX = Pattern.compile( "[\\d\\s]+" );