git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7e257a4
)
JAL-1551 formatting
author
Jim Procter
<jprocter@dundee.ac.uk>
Fri, 23 Jan 2015 15:32:05 +0000
(15:32 +0000)
committer
Jim Procter
<jprocter@dundee.ac.uk>
Fri, 23 Jan 2015 15:32:05 +0000
(15:32 +0000)
src/jalview/io/FileParse.java
patch
|
blob
|
history
diff --git
a/src/jalview/io/FileParse.java
b/src/jalview/io/FileParse.java
index
f155e51
..
764715f
100755
(executable)
--- a/
src/jalview/io/FileParse.java
+++ b/
src/jalview/io/FileParse.java
@@
-22,8
+22,17
@@
package jalview.io;
import jalview.util.MessageManager;
import jalview.util.MessageManager;
-import java.io.*;
-import java.net.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
+import java.net.MalformedURLException;
+import java.net.URL;
import java.util.zip.GZIPInputStream;
/**
import java.util.zip.GZIPInputStream;
/**
@@
-99,7
+108,9
@@
public class FileParse
throw new Error(MessageManager.getString("error.implementation_error_null_fileparse"));
}
if (from == this)
throw new Error(MessageManager.getString("error.implementation_error_null_fileparse"));
}
if (from == this)
+ {
return;
return;
+ }
index = ++from.index;
inFile = from.inFile;
suffixSeparator = from.suffixSeparator;
index = ++from.index;
inFile = from.inFile;
suffixSeparator = from.suffixSeparator;
@@
-281,7
+292,9
@@
public class FileParse
{
checkURLSource(fileStr);
if (suffixSeparator == '#')
{
checkURLSource(fileStr);
if (suffixSeparator == '#')
+ {
extractSuffix(fileStr); // URL lref is stored for later reference.
extractSuffix(fileStr); // URL lref is stored for later reference.
+ }
} catch (IOException e)
{
String suffixLess = extractSuffix(fileStr);
} catch (IOException e)
{
String suffixLess = extractSuffix(fileStr);
@@
-323,7
+336,9
@@
public class FileParse
{
String suffixLess = extractSuffix(fileStr);
if (suffixLess != null)
{
String suffixLess = extractSuffix(fileStr);
if (suffixLess != null)
+ {
is = getClass().getResourceAsStream("/" + suffixLess);
is = getClass().getResourceAsStream("/" + suffixLess);
+ }
}
if (is != null)
{
}
if (is != null)
{
@@
-371,7
+386,9
@@
public class FileParse
public String nextLine() throws IOException
{
if (!error)
public String nextLine() throws IOException
{
if (!error)
+ {
return dataIn.readLine();
return dataIn.readLine();
+ }
throw new IOException(MessageManager.formatMessage("exception.invalid_source_stream", new String[]{errormessage}));
}
throw new IOException(MessageManager.formatMessage("exception.invalid_source_stream", new String[]{errormessage}));
}