diff -cr javasrc/docs/README javasrc.shh/docs/README
*** javasrc/docs/README	Fri Jun  4 16:14:40 1999
--- javasrc.shh/docs/README	Mon Sep  6 10:48:54 1999
***************
*** 4,13 ****
  Instructions
  ============
  
! java -cp javasrc.jar [-Dtitle=<title>] [-Doutdir=<doc dir>] javasrc.app.JavaSrc <sourcedir,sourcedir,...>
  
! javasrc will recursively descend the source dir, looking for java
! files to parse.
  
  If you run out of memory, try adding the flag "-Xmx180m" (for 180 megs).
  Keep increasing the memory size until it works.
--- 4,13 ----
  Instructions
  ============
  
! java -cp javasrc.jar [-Dtitle=<title>] [-Doutdir=<doc dir>] [-Drecurse=off] javasrc.app.JavaSrc <sourcedir,sourcedir,...>
  
! javasrc will recursively (unless -Drecurse=off is specified) descend
! the source dir, looking for java files to parse.
  
  If you run out of memory, try adding the flag "-Xmx180m" (for 180 megs).
  Keep increasing the memory size until it works.
diff -cr javasrc/src/antlr/debug/misc/ASTFrame.java javasrc.shh/src/antlr/debug/misc/ASTFrame.java
*** javasrc/src/antlr/debug/misc/ASTFrame.java	Thu Mar 11 05:08:16 1999
--- javasrc.shh/src/antlr/debug/misc/ASTFrame.java	Mon Sep  6 09:33:56 1999
***************
*** 4,12 ****
  import antlr.collections.AST;
  import java.awt.*;
  import java.awt.event.*;
! import com.sun.java.swing.*;
! import com.sun.java.swing.event.*;
! import com.sun.java.swing.tree.*;
  
  public class ASTFrame extends JFrame {
    // The initial width and height of the frame
--- 4,12 ----
  import antlr.collections.AST;
  import java.awt.*;
  import java.awt.event.*;
! import javax.swing.*;
! import javax.swing.event.*;
! import javax.swing.tree.*;
  
  public class ASTFrame extends JFrame {
    // The initial width and height of the frame
diff -cr javasrc/src/antlr/debug/misc/JTreeASTModel.java javasrc.shh/src/antlr/debug/misc/JTreeASTModel.java
*** javasrc/src/antlr/debug/misc/JTreeASTModel.java	Thu Mar 11 05:08:16 1999
--- javasrc.shh/src/antlr/debug/misc/JTreeASTModel.java	Mon Sep  6 09:33:56 1999
***************
*** 1,9 ****
  package antlr.debug.misc;
  
  import antlr.collections.AST;
! import com.sun.java.swing.*;
! import com.sun.java.swing.event.*;
! import com.sun.java.swing.tree.*;
  
  public class JTreeASTModel implements TreeModel {
  
--- 1,9 ----
  package antlr.debug.misc;
  
  import antlr.collections.AST;
! import javax.swing.*;
! import javax.swing.event.*;
! import javax.swing.tree.*;
  
  public class JTreeASTModel implements TreeModel {
  
diff -cr javasrc/src/antlr/debug/misc/JTreeASTPanel.java javasrc.shh/src/antlr/debug/misc/JTreeASTPanel.java
*** javasrc/src/antlr/debug/misc/JTreeASTPanel.java	Thu Mar 11 05:08:16 1999
--- javasrc.shh/src/antlr/debug/misc/JTreeASTPanel.java	Mon Sep  6 09:33:56 1999
***************
*** 1,9 ****
  package antlr.debug.misc;
  
  import java.awt.*;
! import com.sun.java.swing.*;
! import com.sun.java.swing.tree.*;
! import com.sun.java.swing.event.*;
  
  public class JTreeASTPanel extends JPanel {
    JTree tree;
--- 1,9 ----
  package antlr.debug.misc;
  
  import java.awt.*;
! import javax.swing.*;
! import javax.swing.tree.*;
! import javax.swing.event.*;
  
  public class JTreeASTPanel extends JPanel {
    JTree tree;
diff -cr javasrc/src/javasrc/app/JavaSrc.java javasrc.shh/src/javasrc/app/JavaSrc.java
*** javasrc/src/javasrc/app/JavaSrc.java	Thu Jun  3 17:41:06 1999
--- javasrc.shh/src/javasrc/app/JavaSrc.java	Mon Sep  6 10:47:46 1999
***************
*** 21,26 ****
--- 21,28 ----
    public static void setOutDir(String d) { _outDir=d; }
    public static String getTitle() { return _title; }
    public static void setTitle(String t) { _title=t; }
+   public static boolean getRecurse() { return _doRecurse; }
+   public static void setRecurse(boolean recurse) { _doRecurse=recurse; }
    public static void setSeparatorChar(char c) { _separatorChar=c; }
  
    public JavaSrc(String[] args)
***************
*** 40,46 ****
  
  	    // for each directory/file specified on the command line
  	    for(int i=0; i< args.length;i++)
! 	      JavaXref.doFile(new File(args[i]), symbolTable); // parse it
  
  	    System.err.println("Resolving types...");
  
--- 42,49 ----
  
  	    // for each directory/file specified on the command line
  	    for(int i=0; i< args.length;i++)
! 	      JavaXref.doFile(new File(args[i]), symbolTable,
! 			      getRecurse()); // parse it
  
  	    System.err.println("Resolving types...");
  
***************
*** 105,110 ****
--- 108,125 ----
      JavaSrc.setSeparatorChar('/');
  
      JavaSrc.setTitle(title);
+ 
+     boolean doRecurse = true;
+     String recurseStr = (String) System.getProperty("recurse");
+     if (recurseStr!=null) {
+       recurseStr = recurseStr.trim();
+       if (recurseStr.equalsIgnoreCase("off")
+ 	  || recurseStr.equalsIgnoreCase("false")
+ 	  || recurseStr.equalsIgnoreCase("no")
+ 	  || recurseStr.equalsIgnoreCase("0"))
+ 	  doRecurse = false;
+     }
+     JavaSrc.setRecurse(doRecurse);
    }
  
    public void createDirs(File f)
***************
*** 124,130 ****
  
      try
        {
! 	PrintWriter pw = new PrintWriter(new FileOutputStream(file));
  	pw.println("<TITLE>"+JavaSrc.getTitle()+"</TITLE>");
  	pw.println("<FRAMESET cols=\"20%,80%\">");
  	pw.println("  <FRAMESET rows=\"30%,70%\">");
--- 139,146 ----
  
      try
        {
! 	PrintWriter pw = new PrintWriter(
! 		         new BufferedOutputStream(new FileOutputStream(file)));
  	pw.println("<TITLE>"+JavaSrc.getTitle()+"</TITLE>");
  	pw.println("<FRAMESET cols=\"20%,80%\">");
  	pw.println("  <FRAMESET rows=\"30%,70%\">");
***************
*** 152,158 ****
  
  	try
            {
! 	    PrintWriter pw = new PrintWriter(new FileOutputStream(file));
  	    pw.println(".comment   { color:darkred;font-style:italic }");
  	    pw.println(".linenum   { color:blue;font-style:normal }");
  	    pw.println(".classDef  { color:blue;font-style:bold }");
--- 168,175 ----
  
  	try
            {
! 	    PrintWriter pw = new PrintWriter(
! 			new BufferedOutputStream(new FileOutputStream(file)));
  	    pw.println(".comment   { color:darkred;font-style:italic }");
  	    pw.println(".linenum   { color:blue;font-style:normal }");
  	    pw.println(".classDef  { color:blue;font-style:bold }");
***************
*** 177,183 ****
  
      try
        {
! 	PrintWriter pw = new PrintWriter(new FileOutputStream(file));
  
  	Vector sortedItems = JSCollections.sortEnumeration(packageTags.keys());
  	Enumeration e = sortedItems.elements();
--- 194,201 ----
  
      try
        {
! 	PrintWriter pw = new PrintWriter(
! 		         new BufferedOutputStream(new FileOutputStream(file)));
  
  	Vector sortedItems = JSCollections.sortEnumeration(packageTags.keys());
  	Enumeration e = sortedItems.elements();
***************
*** 299,305 ****
  	    
  	try
  	  {
! 	    pw = new PrintWriter(new FileOutputStream(file));
  
  	    pw.println("<center>" + packageName + "</center> <br>");
  	    pw.println("<TABLE BORDER=\"0\" WIDTH=\"100\"");
--- 317,324 ----
  	    
  	try
  	  {
! 	    pw = new PrintWriter(new BufferedOutputStream(
! 				 new FileOutputStream(file)));
  
  	    pw.println("<center>" + packageName + "</center> <br>");
  	    pw.println("<TABLE BORDER=\"0\" WIDTH=\"100\"");
***************
*** 358,364 ****
      File f = new File(newFileName);
      createDirs(f);
  
!     HTMLOutputWriter output=new LineOutputWriter(new FileOutputStream(f));
      String backup=getBackupPath(tagList,element);
      String header="<head>\n"+
        "<LINK rel=\"stylesheet\" type=\"text/css\" name=\"style1\""+
--- 377,384 ----
      File f = new File(newFileName);
      createDirs(f);
  
!     HTMLOutputWriter output=new LineOutputWriter(
! 			    new BufferedOutputStream(new FileOutputStream(f)));
      String backup=getBackupPath(tagList,element);
      String header="<head>\n"+
        "<LINK rel=\"stylesheet\" type=\"text/css\" name=\"style1\""+
***************
*** 664,668 ****
--- 684,689 ----
  
    private static String _outDir;
    private static String _title;
+   private static boolean _doRecurse;
    private static char   _separatorChar;
  }
Only in javasrc/src/javasrc: javasrc
diff -cr javasrc/src/javasrc/xref/JavaXref.java javasrc.shh/src/javasrc/xref/JavaXref.java
*** javasrc/src/javasrc/xref/JavaXref.java	Mon May 10 14:40:28 1999
--- javasrc.shh/src/javasrc/xref/JavaXref.java	Mon Sep  6 10:51:13 1999
***************
*** 42,54 ****
  
      // This method decides what action to take based on the type of
      //   file we are looking at
!     public static void doFile(File f, SymbolTable symbolTable)
                                throws Exception {
          // If this is a directory, walk each file/dir in that directory
          if (f.isDirectory()) {
              String files[] = f.list();
!             for(int i=0; i < files.length; i++)
!                 doFile(new File(f, files[i]), symbolTable);
          }
  
          // otherwise, if this is a java file, parse it!
--- 42,60 ----
  
      // This method decides what action to take based on the type of
      //   file we are looking at
!     public static void doFile(File f, SymbolTable symbolTable,
! 			      boolean doRecurse)
                                throws Exception {
          // If this is a directory, walk each file/dir in that directory
          if (f.isDirectory()) {
              String files[] = f.list();
!             for(int i=0; i < files.length; i++) {
! 		File next;
! 
! 		next = new File(f, files[i]);
! 		if (doRecurse || !next.isDirectory())
! 		    doFile(next, symbolTable, doRecurse);
! 	    }
          }
  
          // otherwise, if this is a java file, parse it!
***************
*** 56,62 ****
                  f.getName().substring(f.getName().length()-5).equals(".java")) {
              symbolTable.setFile(f);
              System.err.println("   "+f.getAbsolutePath());
!             parseFile(new FileInputStream(f), symbolTable);
          }
      }
  
--- 62,69 ----
                  f.getName().substring(f.getName().length()-5).equals(".java")) {
              symbolTable.setFile(f);
              System.err.println("   "+f.getAbsolutePath());
!             parseFile(new BufferedInputStream(new FileInputStream(f)),
! 		      symbolTable);
          }
      }
  
diff -cr javasrc/src/javasrc/xref/java.g javasrc.shh/src/javasrc/xref/java.g
*** javasrc/src/javasrc/xref/java.g	Mon May 10 14:40:28 1999
--- javasrc.shh/src/javasrc/xref/java.g	Mon Sep  6 10:49:38 1999
***************
*** 65,77 ****
  
      // This method decides what action to take based on the type of
      //   file we are looking at
!     public static void doFile(File f, SymbolTable symbolTable)
                                throws Exception {
          // If this is a directory, walk each file/dir in that directory
          if (f.isDirectory()) {
              String files[] = f.list();
!             for(int i=0; i < files.length; i++)
!                 doFile(new File(f, files[i]), symbolTable);
          }
  
          // otherwise, if this is a java file, parse it!
--- 65,83 ----
  
      // This method decides what action to take based on the type of
      //   file we are looking at
!     public static void doFile(File f, SymbolTable symbolTable,
! 			      boolean doRecurse)
                                throws Exception {
          // If this is a directory, walk each file/dir in that directory
          if (f.isDirectory()) {
              String files[] = f.list();
!             for(int i=0; i < files.length; i++) {
! 		File next;
! 
! 		next = new File(f, files[i]);
! 		if (doRecurse || !next.isDirectory())
! 		    doFile(next, symbolTable, doRecurse);
! 	    }
          }
  
          // otherwise, if this is a java file, parse it!
***************
*** 79,85 ****
                  f.getName().substring(f.getName().length()-5).equals(".java")) {
              symbolTable.setFile(f);
              System.err.println("   "+f.getAbsolutePath());
!             parseFile(new FileInputStream(f), symbolTable);
          }
      }
  
--- 85,92 ----
                  f.getName().substring(f.getName().length()-5).equals(".java")) {
              symbolTable.setFile(f);
              System.err.println("   "+f.getAbsolutePath());
!             parseFile(new BufferedInputStream(new FileInputStream(f)),
! 		      symbolTable);
          }
      }
  
Only in javasrc/src: test