X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Forg%2Fvamsas%2Ftest%2Fsimpleclient%2FArchiveReader.java;h=f99bed803bb59ab0946bfa97617b79f3ad201a75;hb=9778c09c639e26835897ca55d89c9ba65382eec3;hp=46ae199f3b83212929fbe29d143a6ec4c5fbd773;hpb=85bcc8e60b7652bcbc3994463bb72dfb47c4766b;p=vamsas.git

diff --git a/src/org/vamsas/test/simpleclient/ArchiveReader.java b/src/org/vamsas/test/simpleclient/ArchiveReader.java
index 46ae199..f99bed8 100644
--- a/src/org/vamsas/test/simpleclient/ArchiveReader.java
+++ b/src/org/vamsas/test/simpleclient/ArchiveReader.java
@@ -6,62 +6,14 @@ import java.io.InputStream;
 import java.io.InputStreamReader;
 
 import org.vamsas.client.simpleclient.VamsasArchiveReader;
-import org.vamsas.objects.core.ApplicationData;
 import org.vamsas.objects.core.VAMSAS;
 import org.vamsas.objects.core.VamsasDocument;
 
 public class ArchiveReader {
-  public static boolean reportDocument(VamsasDocument document, VamsasArchiveReader archive) {
-    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");
-      if (document.getApplicationDataCount()>0) {
-        System.out.print("There are "+document.getApplicationDataCount()+" ApplicationData references.\n");
-        ApplicationData appd[] = document.getApplicationData();
-        for (int i=0,j=appd.length; i<j; i++) {
-          System.out.print("Application "+i+": '"+appd[i].getName()+"'\nVersion '"+appd[i].getVersion()+"'\nURN: '"+appd[i].getUrn()+"'\n");
-          System.out.print("AppData is ");
-          if (appd[i].getAppDataChoice().getDataReference()==null) {
-            String appData=appd[i].getAppDataChoice().getData();
-            if (appData.length()>1) {
-              System.out.print("a reference ("+appData+")");
-              InputStream jstrm;
-              if ((jstrm=archive.getAppdataStream(appData))!=null)
-                System.out.println(" which resolves to a JarEntry.");
-              else {
-                System.out.println(" which does not resolve to a JarEntry.");
-                System.err.println("Unresolved appdata reference '"+appData+"'");
-              }
-            } else {
-              System.out.println("an empty reference.");
-            }
-          } else {
-            System.out.println("an embedded chunk of "+appd[i].getAppDataChoice().getDataReference().length+" bytes.");
-          }
-        }
-          
-      }
-      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 {
@@ -71,7 +23,7 @@ public class ArchiveReader {
       if (var.isValid()) {
         InputStreamReader vdoc = new InputStreamReader(var.getVamsasDocumentStream());
         VamsasDocument doc = VamsasDocument.unmarshal(vdoc);
-        if (reportDocument(doc, var)) {
+        if (ArchiveReports.reportDocument(doc, var, true)) {
           roots = doc.getVAMSAS();
         }
       } else {
@@ -89,7 +41,7 @@ public class ArchiveReader {
           }
         }
       }
-      if (!rootReport(roots))
+      if (!ArchiveReports.rootReport(roots, true))
         System.err.print(args[0]+" is not a valid vamsas archive.");
     } catch (Exception e) {
       e.printStackTrace(System.err);