[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/deploy/macro MacroToXML.class,1.4,1.5 MacroToXML.java,1.7,1.8 MacroToXMLHandler.class,1.4,1.5 MacroToXMLHandler.java,1.4,1.5

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/macro
In directory usw-pr-cvs1:/tmp/cvs-serv22718/src/net/sourceforge/idrs/deploy/macro

Modified Files:
	MacroToXML.class MacroToXML.java MacroToXMLHandler.class 
	MacroToXMLHandler.java 
Log Message:
Added new build.xml and some better subdirs


Index: MacroToXML.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/macro/MacroToXML.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
Binary files /tmp/cvsCG0W2I and /tmp/cvsK8JgZh differ

Index: MacroToXML.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/macro/MacroToXML.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MacroToXML.java	2002/01/21 21:06:00	1.7
--- MacroToXML.java	2002/01/23 13:54:08	1.8
***************
*** 17,20 ****
--- 17,22 ----
  	boolean lastTagWrite;
  	boolean lookLastTag;
+ 	boolean ownLine;
+ 	boolean inTag;
  	
  	Stack writeStack;
***************
*** 23,26 ****
--- 25,30 ----
  		
  	public MacroToXML(String parser, String xmlSrc, boolean isFile) throws Exception {
+ 		ownLine = false;
+ 		inTag = false;
  		lastTagWrite = false;
  		lookLastTag = false;
***************
*** 122,125 ****
--- 126,131 ----
  			out.write("<" + info.getNameSpace() + ":" + info.getTextTag() + ">");
  			
+ 		
+ 	
  		out.write(xmlEncode(txt));	
  		
***************
*** 183,186 ****
--- 189,194 ----
  				popTag = false;
  			}
+ 			
+ 			
  		}
  		
***************
*** 268,271 ****
--- 276,281 ----
  		return buffer.toString();
  	}
+ 	
+ 	
  	
  		

Index: MacroToXMLHandler.class
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/macro/MacroToXMLHandler.class,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
Binary files /tmp/cvsLFhyRJ and /tmp/cvsqrckAj differ

Index: MacroToXMLHandler.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/macro/MacroToXMLHandler.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** MacroToXMLHandler.java	2002/01/21 21:06:01	1.4
--- MacroToXMLHandler.java	2002/01/23 13:54:08	1.5
***************
*** 120,123 ****
--- 120,128 ----
    }
    
+   public boolean isTagWonLine(String tag) {
+   	System.out.println("tag " + tag + " exits " + isRMLTag(tag));
+   	return ((Tag) rmlTags.get(tag.toLowerCase().trim())).ownLine;
+   }
+   
  
  }