Skip to content
Snippets Groups Projects
Commit 18cf107f authored by tjc's avatar tjc
Browse files

fix for reading fasta with java less than 1.6

git-svn-id: svn+ssh://svn.internal.sanger.ac.uk/repos/svn/pathsoft/artemis/trunk@15370 ee4ac58c-ac51-4696-9907-e4b3aa274f04
parent a0d1e828
No related branches found
No related tags found
No related merge requests found
......@@ -47,12 +47,6 @@ public class IndexFastaStream extends StreamSequence
private FastaSequenceIndex fastaIndex;
private int len;
private String contig;
static {
ReferenceSequenceFileFactory.FASTA_EXTENSIONS.add(".dna");
ReferenceSequenceFileFactory.FASTA_EXTENSIONS.add(".seq");
ReferenceSequenceFileFactory.FASTA_EXTENSIONS.add(".fas");
ReferenceSequenceFileFactory.FASTA_EXTENSIONS.add(".ffn");
}
public IndexFastaStream(Entry entry)
{
......@@ -111,9 +105,21 @@ public class IndexFastaStream extends StreamSequence
else
fastaIndexFile = new File(fasta.getName() + ".fai");
if (fastaIndexFile.exists())
{
try
{
setExtensions();
}
catch(UnsupportedClassVersionError e)
{
System.err.println("Java version "+System.getProperty("java.version")+
" does not support indexed fasta - use Java 1.6 or higher.");
return false;
}
return true;
}
}
}
catch(Exception e)
{
e.printStackTrace();
......@@ -121,6 +127,19 @@ public class IndexFastaStream extends StreamSequence
return false;
}
/**
* Add to supported FASTA allowed suffixes.
*/
private static void setExtensions()
{
if(ReferenceSequenceFileFactory.FASTA_EXTENSIONS.contains(".dna"))
return;
ReferenceSequenceFileFactory.FASTA_EXTENSIONS.add(".dna");
ReferenceSequenceFileFactory.FASTA_EXTENSIONS.add(".seq");
ReferenceSequenceFileFactory.FASTA_EXTENSIONS.add(".fas");
ReferenceSequenceFileFactory.FASTA_EXTENSIONS.add(".ffn");
}
public void setContigByIndex(int seqIndex)
{
/*ReferenceSequence ref = getReferenceSequence(seqIndex);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment