X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fbin%2FJalviewLiteURLRetrieve.java;h=b42e413f9b7017e9f51a1015902bcfa89ee64d27;hb=db93a1adcbe0a4eaaf06e0a70ade0d6c5c1961c3;hp=a77186f242733287053f84d941eda5bd0599f27c;hpb=a45774ee31d9f35d4eff46d54d7deab719afb092;p=jalview.git diff --git a/src/jalview/bin/JalviewLiteURLRetrieve.java b/src/jalview/bin/JalviewLiteURLRetrieve.java index a77186f..b42e413 100644 --- a/src/jalview/bin/JalviewLiteURLRetrieve.java +++ b/src/jalview/bin/JalviewLiteURLRetrieve.java @@ -1,31 +1,31 @@ /* - * Jalview - A Sequence Alignment Editor and Viewer (Version 2.7) - * Copyright (C) 2011 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle + * Jalview - A Sequence Alignment Editor and Viewer (Version 2.9.0b2) + * Copyright (C) 2015 The Jalview Authors * * This file is part of Jalview. * * 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.bin; -import jalview.datamodel.Alignment; +import jalview.datamodel.AlignmentI; import jalview.io.AppletFormatAdapter; import jalview.io.FileParse; import java.applet.Applet; -import java.io.BufferedInputStream; -import java.io.BufferedReader; import java.io.InputStream; -import java.io.InputStreamReader; public class JalviewLiteURLRetrieve extends Applet { @@ -113,14 +113,14 @@ public class JalviewLiteURLRetrieve extends Applet String format = getParameter("format"); if (format == null || format.length() == 0) { - format = new jalview.io.IdentifyFile().Identify(file, protocol); + format = new jalview.io.IdentifyFile().identify(file, protocol); System.out.println("Format is " + format); } else { System.out.println("User specified Format is " + format); } - Alignment al = null; + AlignmentI al = null; try { al = new AppletFormatAdapter().readFile(file, protocol, format);