X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FAlignFile.java;fp=src%2Fjalview%2Fio%2FAlignFile.java;h=3202ac9f8b067fddcbf26f82e52811390f9fcdf9;hb=1b10059cdf8b6a85fddd86a2a3c6588be3257c22;hp=9e426abe2080c18733213e7e52fae4063ae68fbb;hpb=4e00ffd10b483cb3d1ff96711cb2500a0ed01508;p=jalview.git diff --git a/src/jalview/io/AlignFile.java b/src/jalview/io/AlignFile.java index 9e426ab..3202ac9 100755 --- a/src/jalview/io/AlignFile.java +++ b/src/jalview/io/AlignFile.java @@ -79,6 +79,8 @@ public abstract class AlignFile extends FileParse private boolean parseImmediately = true; + private boolean dataClosed = false; + /** * @return if doParse() was called at construction time */ @@ -165,6 +167,12 @@ public abstract class AlignFile extends FileParse public AlignFile(boolean parseImmediately, FileParse source) throws IOException { + this(parseImmediately, source, true); + } + + public AlignFile(boolean parseImmediately, FileParse source, + boolean closeData) throws IOException + { super(source); initData(); @@ -174,7 +182,7 @@ public abstract class AlignFile extends FileParse if (parseImmediately) { - doParse(); + doParse(closeData); } } @@ -185,6 +193,11 @@ public abstract class AlignFile extends FileParse */ public void doParse() throws IOException { + doParse(true); + } + + public void doParse(boolean closeData) throws IOException + { if (parseCalled) { throw new IOException( @@ -193,7 +206,11 @@ public abstract class AlignFile extends FileParse } parseCalled = true; parse(); - dataIn.close(); + if (closeData && !dataClosed) + { + dataIn.close(); + dataClosed = true; + } } /**