[hmath-commits] org.hmath.server/WEB-INF/src/org/hartmath/server/macro CodeMacro.java,1.1,1.2

[Klaus H. <js...@us...>]

Update of /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/macro
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9604/WEB-INF/src/org/hartmath/server/macro

Modified Files:
	CodeMacro.java 
Log Message:
misc changes


Index: CodeMacro.java
===================================================================
RCS file: /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/macro/CodeMacro.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** CodeMacro.java	9 Mar 2004 20:13:05 -0000	1.1
--- CodeMacro.java	2 Apr 2004 18:12:31 -0000	1.2
***************
*** 123,127 ****
  
      SourceCodeFormatter formatter = null;
! 
      if (params.getLength() == 0 || !formatters.containsKey(params.get("0"))) {
        formatter = (SourceCodeFormatter) formatters.get(initialContext.get(RenderContext.DEFAULT_FORMATTER));
--- 123,127 ----
  
      SourceCodeFormatter formatter = null;
!     String result;
      if (params.getLength() == 0 || !formatters.containsKey(params.get("0"))) {
        formatter = (SourceCodeFormatter) formatters.get(initialContext.get(RenderContext.DEFAULT_FORMATTER));
***************
*** 130,139 ****
          formatter = (SourceCodeFormatter) formatters.get("java");
        }
      } else {
        formatter = (SourceCodeFormatter) formatters.get(params.get("0"));
      }
  
-     String result = formatter.filter(Encoder.escape( params.getContent() ), nullContext);
- 
      writer.write(start);
      writer.write(replace(result.trim()));
--- 130,139 ----
          formatter = (SourceCodeFormatter) formatters.get("java");
        }
+       result = formatter.filter(Encoder.escape( params.getContent() ), nullContext);
      } else {
        formatter = (SourceCodeFormatter) formatters.get(params.get("0"));
+       result = formatter.filter( params.getContent() , nullContext);
      }
  
      writer.write(start);
      writer.write(replace(result.trim()));