cvs commit: cocoon-2.1/src/java/org/apache/cocoon/bean/helpers OutputStreamListener.java

[upayavira]

upayavira    2003/09/26 01:25:21

  Modified:    src/java/org/apache/cocoon Main.java
               src/java/org/apache/cocoon/bean/helpers
                        OutputStreamListener.java
  Log:
  Tidied output of CLI
  Reordered command line parameter code so that a destination directory on the 
command line will override an xconf one. This already applies to all other 
parameters.
  
  Revision  Changes    Path
  1.18      +5 -5      cocoon-2.1/src/java/org/apache/cocoon/Main.java
  
  Index: Main.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/java/org/apache/cocoon/Main.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Main.java 19 Sep 2003 09:09:43 -0000      1.17
  +++ Main.java 26 Sep 2003 08:25:21 -0000      1.18
  @@ -308,14 +308,14 @@
           }
   
           String destDir = null;
  -        if (line.hasOption(DEST_DIR_OPT)) {
  -            destDir = line.getOptionValue(DEST_DIR_OPT);
  -        }
  -
           if (line.hasOption(XCONF_OPT)) {
               // destDir from command line overrides one in xconf file
               destDir = Main.processXConf(cocoon, 
line.getOptionValue(XCONF_OPT), destDir);
           }
  +        if (line.hasOption(DEST_DIR_OPT)) {
  +            destDir = line.getOptionValue(DEST_DIR_OPT);
  +        }
  +
           if (line.hasOption(VERBOSE_OPT)) {
               cocoon.setVerbose(true);
           }
  
  
  
  1.3       +3 -3      
cocoon-2.1/src/java/org/apache/cocoon/bean/helpers/OutputStreamListener.java
  
  Index: OutputStreamListener.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/bean/helpers/OutputStreamListener.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- OutputStreamListener.java 18 Sep 2003 12:11:50 -0000      1.2
  +++ OutputStreamListener.java 26 Sep 2003 08:25:21 -0000      1.3
  @@ -109,7 +109,7 @@
           if (linksInPage == -1) {
               this.print("* " + sourceURI);
           } else {
  -            this.print(pad(13, "* ["+linksInPage + "/" + newLinksInPage + "] 
") +
  +            this.print(pad(8, "* ["+linksInPage + "] ") +
                          pad(7,time + "s ") +
                          pad(8, size) +
                          sourceURI);
  @@ -135,7 +135,7 @@
       }
   
       public void pageSkipped(String uri, String message) {
  -        this.print("^ "+uri);
  +        this.print(pad(23, "^ ") + uri);
       }
       
       public void complete() {