Thread: [hmath-commits] org.hmath.server/WEB-INF/src/org/hartmath/server/macro MathMLMacro.java,1.1,1.2 Quot

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

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

Modified Files:
	MathMLMacro.java QuoteMacro.java JViewMacro.java 
	AppletMacro.java STableMacro.java WikipediaMacro.java 
	CodeMacro.java MacroListMacro.java LinkMacro.java 
	ImageMacro.java MMLMacro.java 
Removed Files:
	HMathMacroLoader.java HMathMacroRepository.java 
Log Message:
misc changes


Index: QuoteMacro.java
===================================================================
RCS file: /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/macro/QuoteMacro.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** QuoteMacro.java	9 Mar 2004 20:13:05 -0000	1.1
--- QuoteMacro.java	25 Apr 2004 18:55:54 -0000	1.2
***************
*** 31,34 ****
--- 31,35 ----
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
+ import org.hartmath.server.filter.ICachableMacro;
  import org.hartmath.server.filter.INoParserBodyFilterMacro;
  import org.radeox.macro.LocalePreserved;
***************
*** 45,49 ****
   */
  
! public class QuoteMacro extends LocalePreserved implements INoParserBodyFilterMacro {
    private static Log log = LogFactory.getLog(QuoteMacro.class);
  
--- 46,50 ----
   */
  
! public class QuoteMacro extends LocalePreserved implements INoParserBodyFilterMacro, ICachableMacro {
    private static Log log = LogFactory.getLog(QuoteMacro.class);
  
***************
*** 65,69 ****
        throws IllegalArgumentException, IOException {
  
!     writer.write("<blockquote class=\"quote\">");
      writer.write(params.getContent());
      String source = "Source"; // i18n
--- 66,70 ----
        throws IllegalArgumentException, IOException {
  
!     writer.write("<blockquote>");
      writer.write(params.getContent());
      String source = "Source"; // i18n

Index: CodeMacro.java
===================================================================
RCS file: /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/macro/CodeMacro.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CodeMacro.java	14 Apr 2004 20:06:24 -0000	1.3
--- CodeMacro.java	25 Apr 2004 18:55:54 -0000	1.4
***************
*** 29,32 ****
--- 29,33 ----
  import org.apache.commons.logging.Log;
  import org.apache.commons.logging.LogFactory;
+ import org.hartmath.server.filter.ICachableMacro;
  import org.hartmath.server.filter.INoParserBodyFilterMacro;
  import org.hartmath.server.macro.code.AbstractCPPBasedCodeFilter;
***************
*** 50,54 ****
   */
  
! public class CodeMacro extends LocalePreserved implements INoParserBodyFilterMacro {
    private static Log log = LogFactory.getLog(CodeMacro.class);
  
--- 51,55 ----
   */
  
! public class CodeMacro extends LocalePreserved implements INoParserBodyFilterMacro, ICachableMacro {
    private static Log log = LogFactory.getLog(CodeMacro.class);
  

Index: JViewMacro.java
===================================================================
RCS file: /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/macro/JViewMacro.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** JViewMacro.java	9 Mar 2004 20:13:06 -0000	1.1
--- JViewMacro.java	25 Apr 2004 18:55:54 -0000	1.2
***************
*** 4,7 ****
--- 4,8 ----
  import java.io.Writer;
  
+ import org.hartmath.server.filter.ICachableMacro;
  import org.radeox.macro.parameter.MacroParameter;
  import org.snipsnap.app.Application;
***************
*** 12,16 ****
   * @author jsurfer
   */
! public class JViewMacro extends HMathMacro {
    private String[] paramDescription = {
    };
--- 13,17 ----
   * @author jsurfer
   */
! public class JViewMacro extends HMathMacro implements ICachableMacro {
    private String[] paramDescription = {
    };

Index: MacroListMacro.java
===================================================================
RCS file: /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/macro/MacroListMacro.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MacroListMacro.java	9 Mar 2004 20:13:06 -0000	1.1
--- MacroListMacro.java	25 Apr 2004 18:55:54 -0000	1.2
***************
*** 1,25 ****
  /*
   * This file is part of "SnipSnap Radeox Rendering Engine".
!  *
!  * Copyright (c) 2002 Stephan J. Schmidt, Matthias L. Jugel
!  * All Rights Reserved.
!  *
   * Please visit http://radeox.org/ for updates and contact.
!  *
!  * --LICENSE NOTICE--
!  * This library is free software; you can redistribute it and/or
!  * modify it under the terms of the GNU Lesser General Public
!  * License as published by the Free Software Foundation; either
!  * version 2.1 of the License, or (at your option) any later version.
!  *
!  * This library is distributed in the hope that it will be useful,
!  * but WITHOUT ANY WARRANTY; without even the implied warranty of
!  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
!  * Lesser General Public License for more details.
!  *
!  * You should have received a copy of the GNU Lesser General Public
!  * License along with this library; if not, write to the Free Software
!  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
!  * --LICENSE NOTICE--
   */
  package org.hartmath.server.macro;
--- 1,18 ----
  /*
   * This file is part of "SnipSnap Radeox Rendering Engine".
!  * 
!  * Copyright (c) 2002 Stephan J. Schmidt, Matthias L. Jugel All Rights Reserved.
!  * 
   * Please visit http://radeox.org/ for updates and contact.
!  * 
!  * --LICENSE NOTICE-- This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser
!  * General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any
!  * later version.
!  * 
!  * This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of
!  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
!  * 
!  * You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free
!  * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA --LICENSE NOTICE--
   */
  package org.hartmath.server.macro;
***************
*** 31,34 ****
--- 24,28 ----
  import java.util.List;
  
+ import org.hartmath.server.filter.ICachableMacro;
  import org.hartmath.server.filter.IRenderResultMacro;
  import org.radeox.macro.BaseLocaleMacro;
***************
*** 38,55 ****
  
  /*
!  * MacroListMacro displays a list of all known macros of the EngineManager
!  * with their name, parameters and a description.
!  *
   * @author Matthias L. Jugel
   * @version $Id$
   */
  
! public class MacroListMacro extends BaseLocaleMacro implements IRenderResultMacro {
    public String getLocaleKey() {
      return "macro.macrolist";
    }
  
!   public void execute(Writer writer, MacroParameter params)
!       throws IllegalArgumentException, IOException {
      if (params.getLength() == 0) {
        appendTo(writer);
--- 32,48 ----
  
  /*
!  * MacroListMacro displays a list of all known macros of the EngineManager with their name, parameters and a description.
!  * 
   * @author Matthias L. Jugel
+  * 
   * @version $Id$
   */
  
! public class MacroListMacro extends BaseLocaleMacro implements IRenderResultMacro, ICachableMacro {
    public String getLocaleKey() {
      return "macro.macrolist";
    }
  
!   public void execute(Writer writer, MacroParameter params) throws IllegalArgumentException, IOException {
      if (params.getLength() == 0) {
        appendTo(writer);

--- HMathMacroLoader.java DELETED ---

Index: MMLMacro.java
===================================================================
RCS file: /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/macro/MMLMacro.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** MMLMacro.java	20 Mar 2004 14:35:54 -0000	1.2
--- MMLMacro.java	25 Apr 2004 18:55:54 -0000	1.3
***************
*** 8,12 ****
  
  import org.hartmath.core.eval.MathMLUtilities;
- import org.hartmath.server.taglib.BrowserTag;
  import org.hartmath.server.taglib.MathSniffer;
  import org.radeox.macro.parameter.MacroParameter;
--- 8,11 ----

Index: WikipediaMacro.java
===================================================================
RCS file: /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/macro/WikipediaMacro.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** WikipediaMacro.java	9 Mar 2004 20:13:06 -0000	1.1
--- WikipediaMacro.java	25 Apr 2004 18:55:54 -0000	1.2
***************
*** 23,26 ****
--- 23,27 ----
  import java.io.Writer;
  
+ import org.hartmath.server.filter.ICachableMacro;
  import org.hartmath.server.filter.IRenderResultMacro;
  import org.radeox.macro.parameter.MacroParameter;
***************
*** 32,36 ****
   */
  
! public class WikipediaMacro extends HMathMacro implements IRenderResultMacro {
    private String fCopiedFrom;
    private String fWikipediaCopyright;
--- 33,37 ----
   */
  
! public class WikipediaMacro extends HMathMacro implements IRenderResultMacro, ICachableMacro {
    private String fCopiedFrom;
    private String fWikipediaCopyright;

Index: MathMLMacro.java
===================================================================
RCS file: /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/macro/MathMLMacro.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MathMLMacro.java	9 Mar 2004 20:13:06 -0000	1.1
--- MathMLMacro.java	25 Apr 2004 18:55:46 -0000	1.2
***************
*** 4,7 ****
--- 4,8 ----
  import java.io.Writer;
  
+ import org.hartmath.server.filter.ICachableMacro;
  import org.radeox.macro.parameter.MacroParameter;
  
***************
*** 11,15 ****
   * @author jsurfer
   */
! public class MathMLMacro extends HMathMacro {
    private String[] paramDescription = {
    };
--- 12,16 ----
   * @author jsurfer
   */
! public class MathMLMacro extends HMathMacro implements ICachableMacro {
    private String[] paramDescription = {
    };

Index: AppletMacro.java
===================================================================
RCS file: /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/macro/AppletMacro.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** AppletMacro.java	28 Mar 2004 17:25:07 -0000	1.1
--- AppletMacro.java	25 Apr 2004 18:55:54 -0000	1.2
***************
*** 4,7 ****
--- 4,8 ----
  import java.io.Writer;
  
+ import org.hartmath.server.filter.ICachableMacro;
  import org.radeox.macro.parameter.MacroParameter;
  import org.snipsnap.app.Application;
***************
*** 12,16 ****
   * @author jsurfer
   */
! public class AppletMacro extends HMathMacro {
    private String[] paramDescription = {
    };
--- 13,17 ----
   * @author jsurfer
   */
! public class AppletMacro extends HMathMacro implements ICachableMacro{
    private String[] paramDescription = {
    };

--- HMathMacroRepository.java DELETED ---

Index: STableMacro.java
===================================================================
RCS file: /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/macro/STableMacro.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** STableMacro.java	2 Apr 2004 18:16:25 -0000	1.1
--- STableMacro.java	25 Apr 2004 18:55:54 -0000	1.2
***************
*** 42,47 ****
   * The first line of the table is rendered as column headers.
   * {table}
!  *  A|B|C
!  *  1|2|3
   * {table}
   *
--- 42,48 ----
   * The first line of the table is rendered as column headers.
   * {table}
!  *  A B C
!  *  = = =
!  *  1 2 3
   * {table}
   *

Index: ImageMacro.java
===================================================================
RCS file: /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/macro/ImageMacro.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ImageMacro.java	2 Apr 2004 18:12:59 -0000	1.1
--- ImageMacro.java	25 Apr 2004 18:55:54 -0000	1.2
***************
*** 21,25 ****
  import java.io.Writer;
  
! import org.hartmath.server.filter.WikipediaFilter;
  import org.radeox.api.engine.ImageRenderEngine;
  import org.radeox.api.engine.RenderEngine;
--- 21,26 ----
  import java.io.Writer;
  
! import org.hartmath.server.filter.CachedWikipediaFilter;
! import org.hartmath.server.filter.ICachableMacro;
  import org.radeox.api.engine.ImageRenderEngine;
  import org.radeox.api.engine.RenderEngine;
***************
*** 41,45 ****
   */
  
! public class ImageMacro extends SnipMacro {
    Configuration config;
  
--- 42,46 ----
   */
  
! public class ImageMacro extends SnipMacro implements ICachableMacro {
    Configuration config;
  
***************
*** 99,103 ****
            // Does the name contain an extension?
            int dotIndex = imageName.lastIndexOf('.');
!           if (dotIndex==(-1) && img != null && WikipediaFilter.createStaticImage(img, buff)) {
              writer.write(buff.toString());
            } else {
--- 100,104 ----
            // Does the name contain an extension?
            int dotIndex = imageName.lastIndexOf('.');
!           if (dotIndex==(-1) && img != null && CachedWikipediaFilter.createStaticImage(img, buff)) {
              writer.write(buff.toString());
            } else {

Index: LinkMacro.java
===================================================================
RCS file: /cvsroot/hmath/org.hmath.server/WEB-INF/src/org/hartmath/server/macro/LinkMacro.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** LinkMacro.java	20 Mar 2004 10:10:35 -0000	1.1
--- LinkMacro.java	25 Apr 2004 18:55:54 -0000	1.2
***************
*** 28,31 ****
--- 28,32 ----
  import java.io.Writer;
  
+ import org.hartmath.server.filter.ICachableMacro;
  import org.radeox.api.engine.ImageRenderEngine;
  import org.radeox.api.engine.RenderEngine;
***************
*** 44,48 ****
   */
  
! public class LinkMacro extends BaseLocaleMacro {
    public String getLocaleKey() {
      return "macro.link";
--- 45,49 ----
   */
  
! public class LinkMacro extends BaseLocaleMacro implements ICachableMacro {
    public String getLocaleKey() {
      return "macro.link";