git://source.jalview.org
/
jalview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'documentation/JAL-2418_release2102' into develop
[jalview.git]
/
src
/
jalview
/
bin
/
JalviewLiteURLRetrieve.java
diff --git
a/src/jalview/bin/JalviewLiteURLRetrieve.java
b/src/jalview/bin/JalviewLiteURLRetrieve.java
index
a8bb153
..
d6fb090
100644
(file)
--- a/
src/jalview/bin/JalviewLiteURLRetrieve.java
+++ b/
src/jalview/bin/JalviewLiteURLRetrieve.java
@@
-1,6
+1,6
@@
/*
/*
- * Jalview - A Sequence Alignment Editor and Viewer (Version 2.8.2b1)
- * Copyright (C) 2014 The Jalview Authors
+ * Jalview - A Sequence Alignment Editor and Viewer ($$Version-Rel$$)
+ * Copyright (C) $$Year-Rel$$ The Jalview Authors
*
* This file is part of Jalview.
*
*
* This file is part of Jalview.
*
@@
-20,9
+20,14
@@
*/
package jalview.bin;
*/
package jalview.bin;
-import jalview.datamodel.Alignment;
+import jalview.datamodel.AlignmentI;
import jalview.io.AppletFormatAdapter;
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.FileParse;
+import jalview.io.IdentifyFile;
import java.applet.Applet;
import java.io.InputStream;
import java.applet.Applet;
import java.io.InputStream;
@@
-45,6
+50,7
@@
public class JalviewLiteURLRetrieve extends Applet
*
* @return void
*/
*
* @return void
*/
+ @Override
public void init()
{
this.setSize(300, 200);
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;
}
.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
try
{
System.out.println("Loading thread started with:\n>>file\n" + file
@@
-75,7
+81,7
@@
public class JalviewLiteURLRetrieve extends Applet
+ (rtn ? "" : "not") + " located by classloader.");
if (rtn)
{
+ (rtn ? "" : "not") + " located by classloader.");
if (rtn)
{
- protocol = AppletFormatAdapter.CLASSLOADER;
+ protocol = DataSourceType.CLASSLOADER;
}
} catch (Exception ex)
}
} catch (Exception ex)
@@
-85,12
+91,12
@@
public class JalviewLiteURLRetrieve extends Applet
}
if (file.indexOf("://") > -1)
{
}
if (file.indexOf("://") > -1)
{
- protocol = AppletFormatAdapter.URL;
+ protocol = DataSourceType.URL;
}
else
{
// skipping codebase prepend check.
}
else
{
// skipping codebase prepend check.
- protocol = AppletFormatAdapter.FILE;
+ protocol = DataSourceType.FILE;
}
System.out.println("Trying to get contents of resource:");
}
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;
}
+ " 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);
}
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);
try
{
al = new AppletFormatAdapter().readFile(file, protocol, format);
@@
-132,7
+139,7
@@
public class JalviewLiteURLRetrieve extends Applet
if (al != null)
{
System.out.println(new AppletFormatAdapter().formatSequences(
if (al != null)
{
System.out.println(new AppletFormatAdapter().formatSequences(
- "FASTA", al, false));
+ FileFormat.Fasta, al, false));
}
} catch (Exception e)
{
}
} catch (Exception e)
{