git://source.jalview.org
/
vamsas.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VamsasArchive tested. Locked IO routines to be implemented in ArchiveFile
[vamsas.git]
/
src
/
org
/
vamsas
/
test
/
simpleclient
/
ArchiveReader.java
diff --git
a/src/org/vamsas/test/simpleclient/ArchiveReader.java
b/src/org/vamsas/test/simpleclient/ArchiveReader.java
index
f99bed8
..
d7959b4
100644
(file)
--- a/
src/org/vamsas/test/simpleclient/ArchiveReader.java
+++ b/
src/org/vamsas/test/simpleclient/ArchiveReader.java
@@
-23,7
+23,7
@@
public class ArchiveReader {
if (var.isValid()) {
InputStreamReader vdoc = new InputStreamReader(var.getVamsasDocumentStream());
VamsasDocument doc = VamsasDocument.unmarshal(vdoc);
if (var.isValid()) {
InputStreamReader vdoc = new InputStreamReader(var.getVamsasDocumentStream());
VamsasDocument doc = VamsasDocument.unmarshal(vdoc);
- if (ArchiveReports.reportDocument(doc, var, true)) {
+ if (ArchiveReports.reportDocument(doc, var, true, System.out)) {
roots = doc.getVAMSAS();
}
} else {
roots = doc.getVAMSAS();
}
} else {
@@
-41,7
+41,7
@@
public class ArchiveReader {
}
}
}
}
}
}
- if (!ArchiveReports.rootReport(roots, true))
+ if (!ArchiveReports.rootReport(roots, true, System.out))
System.err.print(args[0]+" is not a valid vamsas archive.");
} catch (Exception e) {
e.printStackTrace(System.err);
System.err.print(args[0]+" is not a valid vamsas archive.");
} catch (Exception e) {
e.printStackTrace(System.err);