[Babeldoc-devel] babeldoc/modules/core/src/com/babeldoc/core/journal/simple SimpleJournal.java,1.11,1.12

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

Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/simple
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26389/modules/core/src/com/babeldoc/core/journal/simple

Modified Files:
	SimpleJournal.java 
Log Message:
Logging cleanups...

1.  Created log instance variable instead of calling LogService.getInstance().
2.  All logs to debug check if debug level is set.

Index: SimpleJournal.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/journal/simple/SimpleJournal.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** SimpleJournal.java	16 Sep 2003 05:19:00 -0000	1.11
--- SimpleJournal.java	24 Jul 2004 00:18:50 -0000	1.12
***************
*** 153,156 ****
--- 153,158 ----
    private IConfigInfo info;
  
+ 	/** log setup */
+ 	private LogService log = LogService.getInstance(SimpleJournal.class.getName());
  
  
***************
*** 251,256 ****
  
        Object obj = ois.readObject();
!       LogService.getInstance().logDebug(I18n.get("013003", ticket,
!           Integer.toString(step), obj.getClass().toString()));
  
        try {
--- 253,259 ----
  
        Object obj = ois.readObject();
!       if(log.isDebugEnabled())
! 	      log.logDebug(I18n.get("013003", ticket,
! 	          Integer.toString(step), obj.getClass().toString()));
  
        try {
***************
*** 422,426 ****
     */
    public synchronized IJournalTicket newTicket() throws JournalException {
!     //LogService.getInstance().logDebug("[SimpleJournal.newTicket] called");
      IJournalTicket ticket = new JournalTicket(getValueForTicket());
  
--- 425,429 ----
     */
    public synchronized IJournalTicket newTicket() throws JournalException {
!     //log.logDebug("[SimpleJournal.newTicket] called");
      IJournalTicket ticket = new JournalTicket(getValueForTicket());
  
***************
*** 452,456 ****
          rollLogFile();
        } catch (IOException iox) {
!         LogService.getInstance().logError(iox);
        }
  
--- 455,459 ----
          rollLogFile();
        } catch (IOException iox) {
!         log.logError(iox);
        }
  
***************
*** 494,507 ****
     */
    protected void rollLogFile() throws IOException {
!     File log = new File(getLogFile());
  
!     if (log.length() > getLogMaxSize()) {
        getLogWriter().close();
  
        String fileName = getLogFile() + "." + new Date().toString();
!       com.babeldoc.core.LogService.getInstance().logInfo(I18n.get("013001",
!           fileName));
  
!       log.renameTo(new File(fileName));
        logWriter = new FileWriter(getLogFile(), true);
        logPrinter = new CSVWriter(getLogWriter());
--- 497,509 ----
     */
    protected void rollLogFile() throws IOException {
!     File logfile = new File(getLogFile());
  
!     if (logfile.length() > getLogMaxSize()) {
        getLogWriter().close();
  
        String fileName = getLogFile() + "." + new Date().toString();
!       log.logInfo(I18n.get("013001", fileName));
  
!       logfile.renameTo(new File(fileName));
        logWriter = new FileWriter(getLogFile(), true);
        logPrinter = new CSVWriter(getLogWriter());
***************
*** 580,584 ****
      i = directory.listFiles(new FilenameFilter() {
            public boolean accept(File dir, String name) {
!             //LogService.getInstance().logDebug(name);
              return name.endsWith(DELTA_SUFFIX);
            }
--- 582,586 ----
      i = directory.listFiles(new FilenameFilter() {
            public boolean accept(File dir, String name) {
!             //log.logDebug(name);
              return name.endsWith(DELTA_SUFFIX);
            }
***************
*** 696,700 ****
          logWriter = new FileWriter(getLogFile(), true);
        } catch (IOException e) {
!         LogService.getInstance().logError(e);
        }
      }
--- 698,702 ----
          logWriter = new FileWriter(getLogFile(), true);
        } catch (IOException e) {
!         log.logError(e);
        }
      }