[Babeldoc-devel] babeldoc/modules/core/src/com/babeldoc/core/journal/command JournalCommand.java,1.4,1.5

[<tr...@us...>]

Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/command
In directory sc8-pr-cvs1:/tmp/cvs-serv13778/modules/core/src/com/babeldoc/core/journal/command

Modified Files:
	JournalCommand.java 
Log Message:
Removed ostermiller utils from babeldoc

Index: JournalCommand.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/command/JournalCommand.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** JournalCommand.java	27 Jun 2003 02:19:57 -0000	1.4
--- JournalCommand.java	19 Jul 2003 15:32:27 -0000	1.5
***************
*** 66,72 ****
  package com.babeldoc.core.journal.command;
  
- import com.Ostermiller.util.CSVPrinter;
- 
  import com.babeldoc.core.I18n;
  import com.babeldoc.core.journal.IJournalTicket;
  import com.babeldoc.core.journal.JournalFactory;
--- 66,71 ----
  package com.babeldoc.core.journal.command;
  
  import com.babeldoc.core.I18n;
+ import com.babeldoc.core.LogService;
  import com.babeldoc.core.journal.IJournalTicket;
  import com.babeldoc.core.journal.JournalFactory;
***************
*** 76,79 ****
--- 75,79 ----
  import com.babeldoc.core.journal.query.QueryOption;
  import com.babeldoc.core.journal.query.QueryTicket;
+ import com.mindprod.csv.CSVWriter;
  
  import org.apache.commons.cli.CommandLine;
***************
*** 85,88 ****
--- 85,89 ----
  import java.util.Date;
  import java.util.Iterator;
+ import java.io.PrintWriter;
  
  
***************
*** 422,426 ****
            System.out.println("  </QueryTicket>");
          }
- 
          System.out.println("</QueryTickets>");
  
--- 423,426 ----
***************
*** 428,442 ****
  
        case CSV_DISP:
! 
!         CSVPrinter csv = new CSVPrinter(System.out);
! 
          for (int i = 0; i < qts.length; ++i) {
!           String[] vals = { qts[i].getTicket().getId(), Integer.toString(qts[i].getStep()), qts[i].getStage(), qts[i].getDate()
!                                                                                                                      .toString(), ((qts[i].getOperation() == null)
!             ? "null" : qts[i].getOperation()), ((qts[i].getOther() == null)
!             ? "null" : qts[i].getOther()), ((qts[i].getAdditional() == null)
!             ? "null" : qts[i].getAdditional()) };
! 
!           csv.println(vals);
          }
  
--- 428,441 ----
  
        case CSV_DISP:
!         CSVWriter csv = new CSVWriter(new PrintWriter(System.out));
          for (int i = 0; i < qts.length; ++i) {
!           csv.put(qts[i].getTicket().getId());
!           csv.put(Integer.toString(qts[i].getStep()));
!           csv.put(qts[i].getStage());
!           csv.put(qts[i].getDate().toString());
!           csv.put((qts[i].getOperation() == null) ? "null" : qts[i].getOperation());
!           csv.put((qts[i].getOther() == null) ? "null" : qts[i].getOther());
!           csv.put((qts[i].getAdditional() == null) ? "null" : qts[i].getAdditional());
!           csv.nl();
          }
  
***************
*** 452,457 ****
        }
      } else {
!       com.babeldoc.core.LogService.getInstance().logWarn(com.babeldoc.core.I18n.get(
!           "012001"));
      }
    }
--- 451,455 ----
        }
      } else {
!       LogService.getInstance().logWarn(I18n.get("012001"));
      }
    }