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
JAL-4274 comments to help follow the tests
[jalview.git]
/
src
/
jalview
/
bin
/
JalviewLiteURLRetrieve.java
diff --git
a/src/jalview/bin/JalviewLiteURLRetrieve.java
b/src/jalview/bin/JalviewLiteURLRetrieve.java
index
fd88028
..
d38892a
100644
(file)
--- a/
src/jalview/bin/JalviewLiteURLRetrieve.java
+++ b/
src/jalview/bin/JalviewLiteURLRetrieve.java
@@
-22,7
+22,12
@@
package jalview.bin;
import jalview.datamodel.AlignmentI;
import jalview.io.AppletFormatAdapter;
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.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,10
+61,10
@@
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
{
try
{
- System.out.println("Loading thread started with:\n>>file\n" + file
+ jalview.bin.Console.outPrintln("Loading thread started with:\n>>file\n" + file
+ ">>endfile");
// This might throw a security exception in certain browsers
// Netscape Communicator for instance.
+ ">>endfile");
// This might throw a security exception in certain browsers
// Netscape Communicator for instance.
@@
-71,29
+77,29
@@
public class JalviewLiteURLRetrieve extends Applet
rtn = true;
is.close();
}
rtn = true;
is.close();
}
- System.err.println("Resource '" + file + "' was "
+ jalview.bin.Console.errPrintln("Resource '" + file + "' was "
+ (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)
{
- System.out.println("Exception checking resources: " + file + " "
- + ex);
+ jalview.bin.Console.outPrintln(
+ "Exception checking resources: " + file + " " + ex);
}
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:");
+ jalview.bin.Console.outPrintln("Trying to get contents of resource:");
FileParse fp = new FileParse(file, protocol);
if (fp.isValid())
{
FileParse fp = new FileParse(file, protocol);
if (fp.isValid())
{
@@
-106,19
+112,20
@@
public class JalviewLiteURLRetrieve extends Applet
}
else
{
}
else
{
- System.out.println("Resource at " + file
+ jalview.bin.Console.outPrintln("Resource at " + file
+ " 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);
- System.out.println("Format is " + format);
+ format = new IdentifyFile().identify(file, protocol);
+ jalview.bin.Console.outPrintln("Format is " + format);
}
else
{
}
else
{
- System.out.println("User specified Format is " + format);
+ jalview.bin.Console.outPrintln("User specified Format is " + format);
}
AlignmentI al = null;
try
}
AlignmentI al = null;
try
@@
-126,17
+133,17
@@
public class JalviewLiteURLRetrieve extends Applet
al = new AppletFormatAdapter().readFile(file, protocol, format);
} catch (java.io.IOException ex)
{
al = new AppletFormatAdapter().readFile(file, protocol, format);
} catch (java.io.IOException ex)
{
- System.err.println("Failed to open the file.");
+ jalview.bin.Console.errPrintln("Failed to open the file.");
ex.printStackTrace();
}
if (al != null)
{
ex.printStackTrace();
}
if (al != null)
{
- System.out.println(new AppletFormatAdapter().formatSequences(
- "FASTA", al, false));
+ jalview.bin.Console.outPrintln(new AppletFormatAdapter()
+ .formatSequences(FileFormat.Fasta, al, false));
}
} catch (Exception e)
{
}
} catch (Exception e)
{
- System.err.println("bailing out : Unexpected exception:");
+ jalview.bin.Console.errPrintln("bailing out : Unexpected exception:");
e.printStackTrace();
}
}
e.printStackTrace();
}
}