Formatted source

[jalview.git] / src / jalview / io / FileParse.java

diff --git a/src/jalview/io/FileParse.java b/src/jalview/io/FileParse.java
index ea86ae0..0c46a17 100755 (executable)
--- a/src/jalview/io/FileParse.java
+++ b/src/jalview/io/FileParse.java
@@ -16,50 +16,48 @@
 * along with this program; if not, write to the Free Software\r
 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA\r
 */\r
-\r
 package jalview.io;\r
 \r
 import java.io.*;\r
-import java.net.*;\r
-\r
-public class FileParse {\r
-\r
-  public File   inFile;\r
-  public int    fileSize;\r
-  public int    noLines;\r
 \r
-  protected String          type;\r
-  protected BufferedReader dataIn;\r
+import java.net.*;\r
 \r
-  public FileParse() {}\r
 \r
-  public FileParse(String fileStr, String type) throws MalformedURLException, IOException\r
-  {\r
+public class FileParse {\r
+    public File inFile;\r
+    public int fileSize;\r
+    public int noLines;\r
+    protected String type;\r
+    protected BufferedReader dataIn;\r
 \r
-    this.type = type;\r
+    public FileParse() {\r
+    }\r
 \r
-    if (type.equals("File")) {\r
-      this.inFile = new File(fileStr);\r
-      this.fileSize = (int)inFile.length();\r
+    public FileParse(String fileStr, String type)\r
+        throws MalformedURLException, IOException {\r
+        this.type = type;\r
+\r
+        if (type.equals("File")) {\r
+            this.inFile = new File(fileStr);\r
+            this.fileSize = (int) inFile.length();\r
+\r
+            dataIn = new BufferedReader(new FileReader(fileStr));\r
+        } else if (type.equals("URL")) {\r
+            URL url = new URL(fileStr);\r
+            this.fileSize = 0;\r
+            dataIn = new BufferedReader(new InputStreamReader(url.openStream()));\r
+        } else if (type.equals("Paste")) {\r
+            dataIn = new BufferedReader(new StringReader(fileStr));\r
+        }\r
+    }\r
 \r
-      dataIn = new BufferedReader(new FileReader( fileStr ));\r
+    public String nextLine() throws IOException {\r
+        String next = dataIn.readLine();\r
 \r
-    } else if (type.equals("URL")) {\r
-      URL url = new URL(fileStr);\r
-      this.fileSize = 0;\r
-      dataIn = new BufferedReader(new InputStreamReader( url.openStream() ));\r
-    } else if(type.equals("Paste"))\r
-    {\r
-      dataIn = new BufferedReader(new StringReader(fileStr));\r
-    }\r
-  }\r
+        if (next != null) {\r
+            noLines++;\r
+        }\r
 \r
-  public String nextLine() throws IOException {\r
-    String next = dataIn.readLine();\r
-    if (next != null) {\r
-      noLines++;\r
+        return next;\r
     }\r
-    return next;\r
-  }\r
-\r
 }\r