[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/deploy/macro MacroToXML.java,1.20,1.21 MacroToX
Brought to you by:
bigman921
|
From: Marc B. <big...@us...> - 2004-08-30 00:57:03
|
Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/macro In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12162/src/net/sourceforge/idrs/deploy/macro Modified Files: MacroToXML.java MacroToXMLHandler.java Log Message: Added log4j support. cleaned up the logs Index: MacroToXML.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/macro/MacroToXML.java,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** MacroToXML.java 29 Aug 2004 05:01:40 -0000 1.20 --- MacroToXML.java 30 Aug 2004 00:56:07 -0000 1.21 *************** *** 13,16 **** --- 13,17 ---- package net.sourceforge.idrs.deploy.macro; + import org.apache.log4j.Logger; import org.xml.sax.*; import org.xml.sax.helpers.*; *************** *** 25,29 **** String errWord; int line; ! String rmlSrc; --- 26,30 ---- String errWord; int line; ! static Logger logger = Logger.getLogger(MacroToXML.class.getName()); String rmlSrc; *************** *** 133,137 **** textBuff.setLength(0); tagEnd = outScript(end); ! System.out.println("After Script Left : \n" + rmlSrc.substring(tagEnd) + "\n End Script Left"); } else { --- 134,138 ---- textBuff.setLength(0); tagEnd = outScript(end); ! logger.debug("After Script Left : \n" + rmlSrc.substring(tagEnd) + "\n End Script Left"); } else { *************** *** 141,145 **** tag = rmlSrc.substring(end, tagEnd); ! System.out.print("tag : " + tag); if (isRMLTag(tag)) { --- 142,146 ---- tag = rmlSrc.substring(end, tagEnd); ! //System.out.print("tag : " + tag); if (isRMLTag(tag)) { *************** *** 222,230 **** int ecr = txt.lastIndexOf('\n'); ! System.out.println("Begin Out Text"); ! System.out.println("Parent, name = " + tg.name + " , isSimple= " + tg.isSimple + ", isClose=" + tg.isClose + ", ownLine=" + tg.ownLine + " , hits=" + tg.hits); ! System.out.println("Current, name = " + tgCurr.name + " , isSimple= " + tgCurr.isSimple + ", isClose=" + tgCurr.isClose + ", ownLine=" + tgCurr.ownLine + " , hits=" + tgCurr.hits); ! System.out.println("Text to print:"); ! System.out.println(txt); --- 223,231 ---- int ecr = txt.lastIndexOf('\n'); ! logger.debug("Begin Out Text"); ! logger.debug("Parent, name = " + tg.name + " , isSimple= " + tg.isSimple + ", isClose=" + tg.isClose + ", ownLine=" + tg.ownLine + " , hits=" + tg.hits); ! logger.debug("Current, name = " + tgCurr.name + " , isSimple= " + tgCurr.isSimple + ", isClose=" + tgCurr.isClose + ", ownLine=" + tgCurr.ownLine + " , hits=" + tgCurr.hits); ! logger.debug("Text to print:"); ! logger.debug(txt); *************** *** 355,359 **** out.write(beginTag + text + endTag); tg.hits++; ! System.out.println("End Out Text"); } --- 356,360 ---- out.write(beginTag + text + endTag); tg.hits++; ! logger.debug("End Out Text"); } Index: MacroToXMLHandler.java =================================================================== RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/macro/MacroToXMLHandler.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** MacroToXMLHandler.java 29 Aug 2004 05:01:40 -0000 1.10 --- MacroToXMLHandler.java 30 Aug 2004 00:56:07 -0000 1.11 *************** *** 13,16 **** --- 13,17 ---- package net.sourceforge.idrs.deploy.macro; + import org.apache.log4j.Logger; import org.xml.sax.*; import org.xml.sax.helpers.*; *************** *** 23,26 **** --- 24,28 ---- */ public class MacroToXMLHandler extends DefaultHandler { + static Logger logger = Logger.getLogger(MacroToXMLHandler.class.getName()); static final String RML = "rml", TEXT_TAG = "texttag", *************** *** 70,74 **** if (name.equals(RML)) { ! System.out.println("Found Tag : " + currBuff.toString().trim().toLowerCase()); rep = atts.getValue(REPRESENT); --- 72,76 ---- if (name.equals(RML)) { ! logger.debug("Found Tag : " + currBuff.toString().trim().toLowerCase()); rep = atts.getValue(REPRESENT); *************** *** 151,155 **** */ public boolean isRMLTag(String tag) { ! System.out.println("is a rml tag? : " + tag); return rmlTags.get(tag.toLowerCase().trim()) != null; } --- 153,157 ---- */ public boolean isRMLTag(String tag) { ! return rmlTags.get(tag.toLowerCase().trim()) != null; } *************** *** 168,172 **** */ public boolean isTagSimple(String tag) { ! System.out.println("tag " + tag + " exits " + isRMLTag(tag)); return ((Tag) rmlTags.get(tag.toLowerCase().trim())).isSimple; } --- 170,174 ---- */ public boolean isTagSimple(String tag) { ! logger.debug("tag " + tag + " exits " + isRMLTag(tag)); return ((Tag) rmlTags.get(tag.toLowerCase().trim())).isSimple; } *************** *** 177,181 **** */ public boolean isTagOwnLine(String tag) { ! System.out.println("tag " + tag + " exits " + isRMLTag(tag)); return ((Tag) rmlTags.get(tag.toLowerCase().trim())).ownLine; } --- 179,183 ---- */ public boolean isTagOwnLine(String tag) { ! logger.debug("tag " + tag + " exits " + isRMLTag(tag)); return ((Tag) rmlTags.get(tag.toLowerCase().trim())).ownLine; } |