[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/deploy/macro MacroToXML.java,1.14,1.15

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

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

Modified Files:
	MacroToXML.java 
Log Message:
Added setprops tag

Index: MacroToXML.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/deploy/macro/MacroToXML.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** MacroToXML.java	4 Mar 2002 23:05:35 -0000	1.14
--- MacroToXML.java	23 Mar 2002 04:48:28 -0000	1.15
***************
*** 37,41 ****
      String rmlNS;
      Stack writeStack;
! 
      String currentTagName;
  
--- 37,41 ----
      String rmlNS;
      Stack writeStack;
!     StringBuffer textBuff;
      String currentTagName;
  
***************
*** 56,59 ****
--- 56,60 ----
          lastOwnLine = false;
          writeStack = new Stack();
+         textBuff = new StringBuffer();
          this.rmlNS=rmlNS;
  
***************
*** 111,115 ****
  
              if (isScript) {
!                 outText(curr);
                  tagEnd = outScript(end);
              }
--- 112,117 ----
  
              if (isScript) {
!                 //outText(curr);
!                 textBuff.append(curr);
                  tagEnd = outScript(end);
              }
***************
*** 123,131 ****
                  if (isRMLTag(tag)) {
                      outText(curr);
                      tagEnd = outTag(tag,tagEnd);
                  }
                  else  {
!                     outText(curr);
!                     outText(tag);
                  }
              }
--- 125,136 ----
                  if (isRMLTag(tag)) {
                      outText(curr);
+                     //textBuff.append(curr);
                      tagEnd = outTag(tag,tagEnd);
                  }
                  else  {
!                     //textBuff.append(curr).append(tag);
!                     
!                     outText(curr + tag);
!                     //outText(tag);
                  }
              }
***************
*** 150,153 ****
--- 155,163 ----
       */
      protected int outScript(int begin) throws IOException {
+         /*if (textBuff.length() > 0) {
+             outText(textBuff.toString());
+             textBuff = new StringBuffer();
+         }*/
+         
          int end = rmlSrc.indexOf(info.getScriptChar() + ">",begin);
          int spaceBegin;
***************
*** 311,314 ****
--- 321,329 ----
       */
      protected int outTag(String tag,int currEnd) throws IOException {
+         /*if (textBuff.length() > 0) {
+             outText(textBuff.toString());
+             textBuff = new StringBuffer();
+         }*/
+         
          int begin=0, end=0,tmp,retEnd;
          char c;