X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Forg%2Fvamsas%2Ftest%2Fsimpleclient%2FArchiveReader.java;h=d7959b4e2201b26d33401be295de808f0f6f8d4f;hb=7700d838b129db99edacb208b3153546795a33c7;hp=2156c51e964bf4bd7704603b2447b563cb5e980e;hpb=8c0230fceb94cba911790b1622b030d02eb0e7ac;p=vamsas.git

diff --git a/src/org/vamsas/test/simpleclient/ArchiveReader.java b/src/org/vamsas/test/simpleclient/ArchiveReader.java
index 2156c51..d7959b4 100644
--- a/src/org/vamsas/test/simpleclient/ArchiveReader.java
+++ b/src/org/vamsas/test/simpleclient/ArchiveReader.java
@@ -4,38 +4,16 @@ import java.io.BufferedInputStream;
 import java.io.File;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.util.Vector;
 
 import org.vamsas.client.simpleclient.VamsasArchiveReader;
 import org.vamsas.objects.core.VAMSAS;
 import org.vamsas.objects.core.VamsasDocument;
 
 public class ArchiveReader {
-  public static boolean reportDocument(VamsasDocument document) {
-    if (document!=null) {
-      System.out.print("Vamsas Document version '"+document.getVersion()+"'");
-      System.out.print("Document contains "+document.getVAMSASCount()+" VAMSAS Elements and "+document.getApplicationDataCount()+" elements.\n");
-      return true;
-    } else {
-      System.out.print("Document Object is null");
-    }
-    return false;
-  }
-  
-  public static boolean rootReport(VAMSAS[] roots) {
-    if (roots!=null) {
-      for (int i=0; i<roots.length; i++) {
-        VAMSAS r = roots[i];
-        System.out.print("Vamsas Root "+i+" (id="
-            +((r.getId()!=null) ? r.getId():"<none>")
-            +") contains "+r.getDataSetCount()+" DataSets, "
-            + r.getTreeCount()+" Global trees");
-      }
-      return true;
-    }
-    return false;
-  }
-  
+  /**
+   * tests VamsasArchiveReader archive reader on a vamsas jar file
+   * @param args
+   */
   public static void main(String args[]) {
     
     try {
@@ -45,7 +23,7 @@ public class ArchiveReader {
       if (var.isValid()) {
         InputStreamReader vdoc = new InputStreamReader(var.getVamsasDocumentStream());
         VamsasDocument doc = VamsasDocument.unmarshal(vdoc);
-        if (reportDocument(doc)) {
+        if (ArchiveReports.reportDocument(doc, var, true, System.out)) {
           roots = doc.getVAMSAS();
         }
       } else {
@@ -63,7 +41,7 @@ public class ArchiveReader {
           }
         }
       }
-      if (!rootReport(roots))
+      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);