[Babeldoc-devel] babeldoc/modules/core/src/com/babeldoc/core/pipeline/stage DomifyPipelineStage.java,1.18,1.19 ScriptingPipelineStage.java,1.11,1.12

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

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

Modified Files:
	DomifyPipelineStage.java ScriptingPipelineStage.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: DomifyPipelineStage.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/stage/DomifyPipelineStage.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** DomifyPipelineStage.java	28 May 2004 10:31:10 -0000	1.18
--- DomifyPipelineStage.java	24 Jul 2004 00:18:51 -0000	1.19
***************
*** 124,127 ****
--- 124,130 ----
    public static boolean USE_DTD_CACHE;
    
+   /** logging for this class */
+   private LogService log = LogService.getInstance(this.getClass().getName());
+   
    /** cache document representations here rather than as document attributes **/
    private static Map domCache = Collections.synchronizedMap(new WeakHashMap()); 
***************
*** 288,292 ****
        }
        */
!     LogService.getInstance().logDebug(I18n.get("100014"));
  
      return buf.substring(0, startDTD - 1) +
--- 291,296 ----
        }
        */
!     if(log.isDebugEnabled())
!     	log.logDebug(I18n.get("100014"));
  
      return buf.substring(0, startDTD - 1) +
***************
*** 332,340 ****
                dfactory.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
              } catch (IllegalArgumentException e) {
!               LogService.getInstance().logWarn(I18n.get("100006"));
              }
  
              dfactory.setAttribute(JAXP_SCHEMA_SOURCE, schemaFile);
!             LogService.getInstance().logDebug(I18n.get("100007", schemaFile));
            } else {
              throw new PipelineException(I18n.get("100008"), null);
--- 336,345 ----
                dfactory.setAttribute(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA);
              } catch (IllegalArgumentException e) {
!               log.logWarn(I18n.get("100006"));
              }
  
              dfactory.setAttribute(JAXP_SCHEMA_SOURCE, schemaFile);
! 						if(log.isDebugEnabled())
!             	log.logDebug(I18n.get("100007", schemaFile));
            } else {
              throw new PipelineException(I18n.get("100008"), null);
***************
*** 372,379 ****
            public void error(SAXParseException exception) {
              errorOccured = true;
!             LogService.getInstance().logDebug(I18n.get("100011",
!                 exception.getMessage()));
!             errorDescription = errorDescription + exception.getMessage() +
!               "\n";
            }
  
--- 377,383 ----
            public void error(SAXParseException exception) {
              errorOccured = true;
! 						if(log.isDebugEnabled())
! 	            log.logDebug(I18n.get("100011", exception.getMessage()));
!             errorDescription = errorDescription + exception.getMessage() + "\n";
            }
  
***************
*** 385,392 ****
            public void fatalError(SAXParseException exception) {
              errorOccured = true;
!             LogService.getInstance().logDebug(I18n.get("100012",
!                 exception.getMessage()));
!             errorDescription = errorDescription + exception.getMessage() +
!               "\n";
            }
  
--- 389,395 ----
            public void fatalError(SAXParseException exception) {
              errorOccured = true;
! 						if(log.isDebugEnabled())
!             	log.logDebug(I18n.get("100012",exception.getMessage()));
!             errorDescription = errorDescription + exception.getMessage() + "\n";
            }
  
***************
*** 398,405 ****
            public void warning(SAXParseException exception) {
              errorOccured = true;
!             LogService.getInstance().logDebug(I18n.get("100013",
!                 exception.getMessage()));
!             errorDescription = errorDescription + exception.getMessage() +
!               "\n";
            }
  
--- 401,407 ----
            public void warning(SAXParseException exception) {
              errorOccured = true;
! 						if(log.isDebugEnabled())
!             	log.logDebug(I18n.get("100013", exception.getMessage()));
!             errorDescription = errorDescription + exception.getMessage() + "\n";
            }
  
***************
*** 426,430 ****
        throw pe;
      } catch (Exception e) {
!       LogService.getInstance().logError(e);
      }
  
--- 428,432 ----
        throw pe;
      } catch (Exception e) {
!       log.logError(e);
      }
  

Index: ScriptingPipelineStage.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/pipeline/stage/ScriptingPipelineStage.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** ScriptingPipelineStage.java	12 Aug 2003 23:44:44 -0000	1.11
--- ScriptingPipelineStage.java	24 Jul 2004 00:18:51 -0000	1.12
***************
*** 246,253 ****
        }
      }
! 
!     LogService.getInstance().logDebug("Script to process =");
!     LogService.getInstance().logDebug(script);
! 
      return script;
    }
--- 246,255 ----
        }
      }
! 		
! 		if(LogService.getInstance().isDebugEnabled()) {
! 	    LogService.getInstance().logDebug("Script to process =");
! 	    LogService.getInstance().logDebug(script);
! 		}
! 		
      return script;
    }