X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fio%2FFileParse.java;h=e8e9f2ef6ffd9a17cdab241ec7542513ad309b09;hb=77abb3fac2965a8966410cd77cd749c7c1dc6453;hp=47583f0b57fb3b176a5be1d0abcd986fccec3c20;hpb=a8f483d04205bb8273ee311c12968b7e86d205fa;p=jalview.git
diff --git a/src/jalview/io/FileParse.java b/src/jalview/io/FileParse.java
index 47583f0..e8e9f2e 100755
--- a/src/jalview/io/FileParse.java
+++ b/src/jalview/io/FileParse.java
@@ -6,14 +6,16 @@
*
* 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.
+ * 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 .
+ * You should have received a copy of the GNU General Public License
+ * along with Jalview. If not, see .
* The Jalview Authors are detailed in the 'AUTHORS' file.
*/
package jalview.io;
@@ -48,7 +50,7 @@ public class FileParse
public void setNewlineString(String nl)
{
- newline = nl;
+ newline = nl;
}
public String getNewlineString()
@@ -158,43 +160,53 @@ public class FileParse
}
;
}
-
+
dataIn = new BufferedReader(new FileReader(fileStr));
dataName = fileStr;
}
return error;
}
- private BufferedReader tryAsGzipSource(InputStream inputStream) throws Exception
+
+ private BufferedReader tryAsGzipSource(InputStream inputStream)
+ throws Exception
{
- BufferedReader inData = new BufferedReader(new InputStreamReader(new GZIPInputStream(inputStream)));
+ BufferedReader inData = new BufferedReader(new InputStreamReader(
+ new GZIPInputStream(inputStream)));
inData.mark(2048);
inData.read();
inData.reset();
return inData;
}
+
private boolean checkURLSource(String fileStr) throws IOException,
MalformedURLException
{
errormessage = "URL NOT FOUND";
URL url = new URL(fileStr);
//
- // GZIPInputStream code borrowed from Aquaria (soon to be open sourced) via Kenny Sabir
- Exception e=null;
- if (fileStr.toLowerCase().endsWith(".gz")) {
- try {
- InputStream inputStream = url.openStream();
- dataIn = tryAsGzipSource(inputStream);
- dataName = fileStr;
- return false;
- } catch (Exception ex) {
- e=ex;
+ // GZIPInputStream code borrowed from Aquaria (soon to be open sourced) via
+ // Kenny Sabir
+ Exception e = null;
+ if (fileStr.toLowerCase().endsWith(".gz"))
+ {
+ try
+ {
+ InputStream inputStream = url.openStream();
+ dataIn = tryAsGzipSource(inputStream);
+ dataName = fileStr;
+ return false;
+ } catch (Exception ex)
+ {
+ e = ex;
}
}
- try {
+ try
+ {
dataIn = new BufferedReader(new InputStreamReader(url.openStream()));
- } catch (IOException q) {
- if (e!=null)
+ } catch (IOException q)
+ {
+ if (e != null)
{
throw new IOException("Failed to resolve GZIP stream", e);
}