cvs commit: xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp XSPGenerator.java

[cziegeler]

cziegeler    2003/02/26 05:32:33

  Modified:    src/java/org/apache/cocoon/components/language/markup/xsp
                        XSPGenerator.java
  Log:
  Updating code; removing dependencies on deprecated code
  
  Revision  Changes    Path
  1.9       +3 -20     
xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java
  
  Index: XSPGenerator.java
  ===================================================================
  RCS file: 
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/markup/xsp/XSPGenerator.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- XSPGenerator.java 31 Jan 2003 22:51:26 -0000      1.8
  +++ XSPGenerator.java 26 Feb 2003 13:32:33 -0000      1.9
  @@ -50,22 +50,15 @@
   */
   package org.apache.cocoon.components.language.markup.xsp;
   
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.framework.context.Contextualizable;
  -
  -import org.apache.avalon.excalibur.pool.Recyclable;
  -
   import org.apache.cocoon.components.language.generator.CompiledComponent;
   import org.apache.cocoon.generation.AbstractServerPage;
  -import org.apache.cocoon.xml.XMLizable;
  -
   import org.xml.sax.SAXException;
  -import org.w3c.dom.Node;
  -
  -import java.util.Collection;
   
   /**
    * Base class for XSP-generated <code>ServerPagesGenerator</code> classes
  @@ -118,16 +111,6 @@
        * @param v the value
        */
       public void xspExpr(Object v) throws SAXException {
  -        if (v == null || v instanceof String) {
  -            XSPObjectHelper.xspExpr(this.contentHandler, (String) v);
  -        } else if (v instanceof Collection) {
  -            XSPObjectHelper.xspExpr(this.contentHandler, (Collection) v);
  -        } else if (v instanceof XMLizable) {
  -            XSPObjectHelper.xspExpr(this.contentHandler, (XMLizable) v);
  -        } else if (v instanceof Node) {
  -            XSPObjectHelper.xspExpr(this.contentHandler, (Node) v);
  -        } else if (v instanceof Object) {
  -            XSPObjectHelper.xspExpr(this.contentHandler, (Object) v);
  -        }
  +        XSPObjectHelper.xspExpr(this.contentHandler, v);
       }
   }