Changeset 3218

Timestamp:

10/02/07 10:29:03 (12 years ago)

Author:

curtis

Message:

Allow processing from stdin.

Location:

trunk/loci/formats/tools

Files:

• XMLIndent.java (modified) (2 diffs)
• XMLValidate.java (modified) (2 diffs)

trunk/loci/formats/tools/XMLIndent.java

@@ -25 +25 @@
 package loci.formats.tools;
 
-import java.io.BufferedReader;
-import java.io.FileReader;
+import java.io.*;
 import loci.formats.XMLTools;
 
@@ -38 +37 @@
 public class XMLIndent {
 
+  public static void process(BufferedReader in) throws IOException {
+    StringBuffer sb = new StringBuffer();
+    while (true) {
+      String line = in.readLine();
+      if (line == null) break;
+      sb.append(line);
+    }
+    in.close();
+    System.out.println(XMLTools.indentXML(sb.toString()));
+  }
+
   public static void main(String[] args) throws Exception {
-    for (int i=0; i<args.length; i++) {
-      String f = args[i];
-      BufferedReader in = new BufferedReader(new FileReader(f));
-      StringBuffer sb = new StringBuffer();
-      while (true) {
-        String line = in.readLine();
-        if (line == null) break;
-        sb.append(line);
+    if (args.length == 0) {
+      // read from stdin
+      process(new BufferedReader(new InputStreamReader(System.in)));
+    }
+    else {
+      // read from file(s)
+      for (int i=0; i<args.length; i++) {
+        process(new BufferedReader(new FileReader(args[i])));
       }
-      in.close();
-      System.out.println(XMLTools.indentXML(sb.toString()));
     }
   }

trunk/loci/formats/tools/XMLValidate.java

@@ -25 +25 @@
 package loci.formats.tools;
 
-import java.io.BufferedReader;
-import java.io.FileReader;
+import java.io.*;
 import loci.formats.XMLTools;
 
@@ -38 +37 @@
 public class XMLValidate {
 
+  public static void process(String label, BufferedReader in)
+    throws IOException
+  {
+    StringBuffer sb = new StringBuffer();
+    while (true) {
+      String line = in.readLine();
+      if (line == null) break;
+      sb.append(line);
+    }
+    in.close();
+    XMLTools.validateXML(sb.toString(), label);
+  }
+
   public static void main(String[] args) throws Exception {
-    for (int i=0; i<args.length; i++) {
-      String f = args[i];
-      BufferedReader in = new BufferedReader(new FileReader(f));
-      StringBuffer sb = new StringBuffer();
-      while (true) {
-        String line = in.readLine();
-        if (line == null) break;
-        sb.append(line);
+    if (args.length == 0) {
+      // read from stdin
+      process("<stdin>", new BufferedReader(new InputStreamReader(System.in)));
+    }
+    else {
+      // read from file(s)
+      for (int i=0; i<args.length; i++) {
+        process(args[i], new BufferedReader(new FileReader(args[i])));
       }
-      in.close();
-      XMLTools.validateXML(sb.toString(), args[i]);
     }
   }