X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fjalview%2Fio%2FFileParse.java;h=0c46a17217a165451a1b52803c7157031dd407db;hb=5fafaa6e8d537c78f5bb2dfd4a9c33f468eb635b;hp=5f2e856de2a13b9ee32da8a7cb33028bb8b10ffe;hpb=1ecf6419aba86993b3c223bf5ec0fa79427baf85;p=jalview.git diff --git a/src/jalview/io/FileParse.java b/src/jalview/io/FileParse.java index 5f2e856..0c46a17 100755 --- a/src/jalview/io/FileParse.java +++ b/src/jalview/io/FileParse.java @@ -1,46 +1,63 @@ +/* +* Jalview - A Sequence Alignment Editor and Viewer +* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle +* +* This program 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 2 +* of the License, or (at your option) any later version. +* +* This program 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 this program; if not, write to the Free Software +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA +*/ package jalview.io; import java.io.*; -import java.net.*; - -public class FileParse { - public File inFile; - public int fileSize; - public int noLines; - - protected String type; - protected BufferedReader dataIn; +import java.net.*; - public FileParse() {} - public FileParse(String fileStr, String type) throws MalformedURLException, IOException - { +public class FileParse { + public File inFile; + public int fileSize; + public int noLines; + protected String type; + protected BufferedReader dataIn; - this.type = type; + public FileParse() { + } - if (type.equals("File")) { - this.inFile = new File(fileStr); - this.fileSize = (int)inFile.length(); + public FileParse(String fileStr, String type) + throws MalformedURLException, IOException { + this.type = type; + + if (type.equals("File")) { + this.inFile = new File(fileStr); + this.fileSize = (int) inFile.length(); + + dataIn = new BufferedReader(new FileReader(fileStr)); + } else if (type.equals("URL")) { + URL url = new URL(fileStr); + this.fileSize = 0; + dataIn = new BufferedReader(new InputStreamReader(url.openStream())); + } else if (type.equals("Paste")) { + dataIn = new BufferedReader(new StringReader(fileStr)); + } + } - dataIn = new BufferedReader(new FileReader( fileStr )); + public String nextLine() throws IOException { + String next = dataIn.readLine(); - } else if (type.equals("URL")) { - URL url = new URL(fileStr); - this.fileSize = 0; - dataIn = new BufferedReader(new InputStreamReader( url.openStream() )); - } else if(type.equals("Paste")) - { - dataIn = new BufferedReader(new StringReader(fileStr)); - } - } + if (next != null) { + noLines++; + } - public String nextLine() throws IOException { - String next = dataIn.readLine(); - if (next != null) { - noLines++; + return next; } - return next; - } - }