X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=forester%2Fjava%2Fsrc%2Forg%2Fforester%2Fapplication%2Fmcc.java;h=c0c72b04e2e168a1eae02068a5ec067bffcefa4b;hb=cec76926e7d634373e238e61b805c723ef4c0ca7;hp=3ee440fbff49335be4a11862823b132680091d9f;hpb=e174d62534f7fc6f3de133d523a402a87735b27f;p=jalview.git diff --git a/forester/java/src/org/forester/application/mcc.java b/forester/java/src/org/forester/application/mcc.java index 3ee440f..c0c72b0 100644 --- a/forester/java/src/org/forester/application/mcc.java +++ b/forester/java/src/org/forester/application/mcc.java @@ -27,7 +27,9 @@ package org.forester.application; import java.io.File; import java.io.FileInputStream; +import java.io.InputStream; +import org.forester.io.parsers.FastaParser; import org.forester.io.parsers.GeneralMsaParser; import org.forester.msa.Msa; import org.forester.msa.MsaMethods; @@ -76,7 +78,13 @@ public class mcc { System.exit( 0 ); } Msa msa = null; - msa = GeneralMsaParser.parse( new FileInputStream( in ) ); + final InputStream is = new FileInputStream( in ); + if ( FastaParser.isLikelyFasta( in ) ) { + msa = FastaParser.parseMsa( is ); + } + else { + msa = GeneralMsaParser.parse( is ); + } if ( cla.isOptionSet( FROM_OPTION ) ) { singleCalc( in, from, to, msa ); }