X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Fjalview%2Fbin%2FJalviewLiteURLRetrieve.java;h=f2ffda58222a7190b64c846418a508667871d5f3;hb=dce53361c4b6bb56dc8567ac77e85a2300a5458d;hp=be952d4a4e75f2142584f704b3f5ad173c3e0e89;hpb=153dd62dc91da13ae732600e6ea55ddbe15eab39;p=jalview.git
diff --git a/src/jalview/bin/JalviewLiteURLRetrieve.java b/src/jalview/bin/JalviewLiteURLRetrieve.java
index be952d4..f2ffda5 100644
--- a/src/jalview/bin/JalviewLiteURLRetrieve.java
+++ b/src/jalview/bin/JalviewLiteURLRetrieve.java
@@ -1,31 +1,36 @@
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.6)
- * Copyright (C) 2010 J Procter, AM Waterhouse, G Barton, M Clamp, S Searle
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ 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.DataSourceType;
+import jalview.io.FileFormat;
+import jalview.io.FileFormatI;
+import jalview.io.FileFormats;
import jalview.io.FileParse;
+import jalview.io.IdentifyFile;
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
{
@@ -45,6 +50,7 @@ public class JalviewLiteURLRetrieve extends Applet
*
* @return void
*/
+ @Override
public void init()
{
this.setSize(300, 200);
@@ -55,7 +61,7 @@ public class JalviewLiteURLRetrieve extends Applet
.println("Specify a resource to read on the file parameter");
return;
}
- String protocol = null;
+ DataSourceType protocol = null;
try
{
System.out.println("Loading thread started with:\n>>file\n" + file
@@ -75,22 +81,22 @@ public class JalviewLiteURLRetrieve extends Applet
+ (rtn ? "" : "not") + " located by classloader.");
if (rtn)
{
- protocol = AppletFormatAdapter.CLASSLOADER;
+ protocol = DataSourceType.CLASSLOADER;
}
} catch (Exception ex)
{
- System.out.println("Exception checking resources: " + file + " "
- + ex);
+ System.out.println(
+ "Exception checking resources: " + file + " " + ex);
}
if (file.indexOf("://") > -1)
{
- protocol = AppletFormatAdapter.URL;
+ protocol = DataSourceType.URL;
}
else
{
// skipping codebase prepend check.
- protocol = AppletFormatAdapter.FILE;
+ protocol = DataSourceType.FILE;
}
System.out.println("Trying to get contents of resource:");
@@ -110,17 +116,18 @@ public class JalviewLiteURLRetrieve extends Applet
+ " cannot be read with protocol==" + protocol);
return;
}
- String format = getParameter("format");
- if (format == null || format.length() == 0)
+ FileFormatI format = FileFormats.getInstance()
+ .forName(getParameter("format"));
+ if (format == null)
{
- format = new jalview.io.IdentifyFile().Identify(file, protocol);
+ format = new 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);
@@ -131,8 +138,8 @@ public class JalviewLiteURLRetrieve extends Applet
}
if (al != null)
{
- System.out.println(new AppletFormatAdapter().formatSequences(
- "FASTA", al, false));
+ System.out.println(new AppletFormatAdapter()
+ .formatSequences(FileFormat.Fasta, al, false));
}
} catch (Exception e)
{