You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by an...@apache.org on 2006/01/08 17:40:41 UTC

svn commit: r367048 - in /cocoon: blocks/forms/trunk/java/org/apache/cocoon/forms/flow/javascript/ blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/ branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/ branches/BRANCH_2_1...

Author: antonio
Date: Sun Jan  8 08:40:26 2006
New Revision: 367048

URL: http://svn.apache.org/viewcvs?rev=367048&view=rev
Log:
Remove abstract methods already defined in implemented interface. Remove concrete methods that only calls parent class method.

Modified:
    cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/flow/javascript/ScriptableWidget.java
    cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/AbstractDatatypeWidgetDefinition.java
    cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/AbstractWidget.java
    cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/MultiValueFieldDefinition.java
    cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Widget.java
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/DefaultsMetaModule.java
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/SelectMetaInputModule.java
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/JCSDefaultStore.java
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/ElementPathPart.java
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/AbstractEnvironment.java
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/Environment.java
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/AbstractSwitchSelector.java
    cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java

Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/flow/javascript/ScriptableWidget.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/flow/javascript/ScriptableWidget.java?rev=367048&r1=367047&r2=367048&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/flow/javascript/ScriptableWidget.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/flow/javascript/ScriptableWidget.java Sun Jan  8 08:40:26 2006
@@ -145,10 +145,6 @@
         return super.get(index, start);
     }
 
-    public void delete(String id) {
-        super.delete(id);
-    }
-
     public void delete(int index) {
         if (delegate instanceof Repeater) {
             Repeater repeater = (Repeater)delegate;

Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/AbstractDatatypeWidgetDefinition.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/AbstractDatatypeWidgetDefinition.java?rev=367048&r1=367047&r2=367048&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/AbstractDatatypeWidgetDefinition.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/AbstractDatatypeWidgetDefinition.java Sun Jan  8 08:40:26 2006
@@ -44,8 +44,7 @@
     }
     
     /**
-     * checks 
-     * @return
+     * checks definition's completeness
      */
     public void checkCompleteness() throws IncompletenessException {
     	super.checkCompleteness();

Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/AbstractWidget.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/AbstractWidget.java?rev=367048&r1=367047&r2=367048&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/AbstractWidget.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/AbstractWidget.java Sun Jan  8 08:40:26 2006
@@ -108,7 +108,7 @@
      * {@link #generateDisplayData(ContentHandler)} to avoid NPE's.
      *
      * @return the widgetDefinition from which this widget was instantiated.
-     *        (@link WidgetDefinition#createInstance()}
+     *        (See {@link org.apache.cocoon.forms.formmodel.WidgetDefinition#createInstance()})
      */
     public abstract WidgetDefinition getDefinition();
 

Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/MultiValueFieldDefinition.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/MultiValueFieldDefinition.java?rev=367048&r1=367047&r2=367048&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/MultiValueFieldDefinition.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/MultiValueFieldDefinition.java Sun Jan  8 08:40:26 2006
@@ -25,14 +25,7 @@
         MultiValueField field =  new MultiValueField(this);
         return field;
     }
-    
-    /**
-     * checks completeness of this definition
-     */
-    public void checkCompleteness() throws IncompletenessException {
-    	super.checkCompleteness();
-    }
-    
+
 	public void setRequired(boolean required) {
 		throw new UnsupportedOperationException("The property 'required' is not available on widgets of type multivalue.");
 	}

Modified: cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Widget.java
URL: http://svn.apache.org/viewcvs/cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Widget.java?rev=367048&r1=367047&r2=367048&view=diff
==============================================================================
--- cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Widget.java (original)
+++ cocoon/blocks/forms/trunk/java/org/apache/cocoon/forms/formmodel/Widget.java Sun Jan  8 08:40:26 2006
@@ -30,7 +30,7 @@
  * of widgets. Each widget:
  *
  * <ul>
- *  <li>has an id, unique within its parent context widget. See {@link #getId()}.</li>
+ *  <li>has an unique id within its parent context widget. See {@link #getId()}.</li>
  *  <li>can have a parent (see {@link #getParent()}.</li>
  *  <li>can hold a value (which can be any kind of object). See {@link #getValue()}.</li>
  *  <li>can read its value from a request object (and convert it from a string to its native type).

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/DefaultsMetaModule.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/DefaultsMetaModule.java?rev=367048&r1=367047&r2=367048&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/DefaultsMetaModule.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/DefaultsMetaModule.java Sun Jan  8 08:40:26 2006
@@ -15,13 +15,6 @@
  */
 package org.apache.cocoon.components.modules.input;
 
-
-import java.util.Iterator;
-import java.util.Map;
-
-import org.apache.avalon.framework.configuration.Configuration;
-import org.apache.avalon.framework.configuration.ConfigurationException;
-
 /**
  * Old name for {@link DefaultsModule}.
  * @deprecated Use {@link DefaultsModule} instead; this is not a 'meta' module and is
@@ -32,24 +25,4 @@
 /* Deprecated 2003-03-19. Suggest we keep this class for compat with 2.0.x
  * until at least v2.2 (JT) */
 
-public class DefaultsMetaModule extends DefaultsModule {
-
-    public void configure(Configuration config) throws ConfigurationException {
-        super.configure( config );
-    }
-
-    public Object[] getAttributeValues( String name, Configuration modeConf, Map objectModel ) 
-        throws ConfigurationException {
-        return super.getAttributeValues( name, modeConf, objectModel );
-    }
-
-    public Iterator getAttributeNames( Configuration modeConf, Map objectModel ) 
-        throws ConfigurationException {
-        return super.getAttributeNames( modeConf, objectModel );
-     }
-
-    public Object getAttribute( String name, Configuration modeConf, Map objectModel ) 
-        throws ConfigurationException {
-        return super.getAttribute( name, modeConf, objectModel );
-    }
-}
+public class DefaultsMetaModule extends DefaultsModule {}

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/SelectMetaInputModule.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/SelectMetaInputModule.java?rev=367048&r1=367047&r2=367048&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/SelectMetaInputModule.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/modules/input/SelectMetaInputModule.java Sun Jan  8 08:40:26 2006
@@ -19,8 +19,6 @@
 import java.util.Map;
 import java.util.TreeMap;
 
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.thread.ThreadSafe;
@@ -211,13 +209,6 @@
     }
 
     /* (non-Javadoc)
-     * @see org.apache.avalon.framework.component.Composable#compose(ComponentManager)
-     */
-    public void compose(ComponentManager manager) throws ComponentException {
-        super.compose(manager);
-    }
-
-    /* (non-Javadoc)
      * @see org.apache.avalon.framework.activity.Disposable#dispose()
      */
     public void dispose() {
@@ -245,7 +236,6 @@
         if (this.initialized) {
             return;
         }
-
         super.lazy_initialize();
         
         if (this.expression != null) {

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/JCSDefaultStore.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/JCSDefaultStore.java?rev=367048&r1=367047&r2=367048&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/JCSDefaultStore.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/store/impl/JCSDefaultStore.java Sun Jan  8 08:40:26 2006
@@ -46,12 +46,11 @@
 import org.apache.jcs.engine.control.CompositeCacheManager;
 import org.apache.jcs.engine.memory.MemoryCache;
 
-
 /**
  * This is the default store implementation based on JCS
- * http://jakarta.apache.org/turbine/jcs/BasicJCSConfiguration.html
+ * http://jakarta.apache.org/jcs/BasicJCSConfiguration.html
  * 
- * @version CVS $Id$
+ * @version $Id$
  */
 public class JCSDefaultStore 
     extends AbstractLogEnabled
@@ -65,13 +64,13 @@
 
     /** The JCS configuration properties */
     protected Properties properties;
-    
+
     /** The JCS region name */
     protected String region;
-    
+
     /** JCS Cache manager */
     private CompositeCacheManager cacheManager;
-    
+
     /** The Java Cache System object */
     private JCSCacheAccess jcs;
 
@@ -83,17 +82,17 @@
 
     /** Service Manager */
     private ServiceManager manager;
-    
+
     /** Store janitor */
     private StoreJanitor janitor;
-    
+
     /* (non-Javadoc)
      * @see org.apache.avalon.framework.context.Contextualizable#contextualize(org.apache.avalon.framework.context.Context)
      */
     public void contextualize(Context aContext) throws ContextException {
         this.context = aContext;
     }
-    
+
     /* (non-Javadoc)
      * @see org.apache.avalon.framework.service.Serviceable#service(org.apache.avalon.framework.service.ServiceManager)
      */
@@ -101,7 +100,7 @@
         this.manager = aManager;
         this.janitor = (StoreJanitor)this.manager.lookup(StoreJanitor.ROLE);
     }
-    
+
     /* (non-Javadoc)
      * @see org.apache.avalon.framework.parameters.Parameterizable#parameterize(org.apache.avalon.framework.parameters.Parameters)
      */
@@ -120,7 +119,7 @@
         } catch (IOException e) {
             throw new ParameterException("Failure loading cache defaults",e);
         }
-        
+
         this.properties = new Properties(defaults);
         String[] names = parameters.getNames();
         for (int i = 0; i < names.length; i++) {
@@ -128,7 +127,7 @@
                 this.properties.put(names[i], parameters.getParameter(names[i]));
             }
         }
-        
+
         int maxobjects = parameters.getParameterAsInteger("maxobjects", -1);
         if (maxobjects != -1) {
             String key = "jcs.region." + region + ".cacheattributes.MaxObjects";
@@ -167,9 +166,8 @@
         } catch (IOException e) {
             throw new ParameterException("Unable to set directory", e);
         }
-        
     }
-    
+
     /* (non-Javadoc)
      * @see org.apache.avalon.framework.activity.Initializable#initialize()
      */
@@ -179,7 +177,7 @@
         this.jcs = new JCSCacheAccess(cacheManager.getCache(region));
         this.janitor.register(this);
     }
-    
+
     /* (non-Javadoc)
      * @see org.apache.avalon.framework.activity.Disposable#dispose()
      */
@@ -202,11 +200,11 @@
             this.manager = null;
         }
     }
-    
+
     protected String getDefaultPropertiesFile() {
         return DEFAULT_PROPERTIES;
     }
-    
+
     /**
      * Sets the disk cache location.
      */
@@ -233,13 +231,13 @@
                 "Directory '" + directory.getAbsolutePath() + "' is not readable/writable"
             );
         }
-        
+
         this.properties.setProperty("jcs.auxiliary.DC.attributes.DiskPath",
                                     directory.getAbsolutePath());
     }
 
     // ---------------------------------------------------- Store implementation
-    
+
     /* (non-Javadoc)
      * @see org.apache.excalibur.store.Store#get(java.lang.Object)
      */
@@ -252,10 +250,9 @@
                 getLogger().debug("NOT Found key: " + key);
             }
         }
-        
         return value;
     }
-    
+
     /* (non-Javadoc)
      * @see org.apache.excalibur.store.Store#store(java.lang.Object, java.lang.Object)
      */
@@ -272,7 +269,7 @@
             getLogger().error("Failure storing object ", ce);
         }
     }
-    
+
     /* (non-Javadoc)
      * @see org.apache.excalibur.store.Store#free()
      */
@@ -288,7 +285,7 @@
             }
         }
     }
-    
+
     /* (non-Javadoc)
      * @see org.apache.excalibur.store.Store#clear()
      */
@@ -296,14 +293,13 @@
         if (getLogger().isDebugEnabled()) {
             getLogger().debug("Clearing the store");
         }
-        
         try {
             this.jcs.remove();               
         } catch (CacheException ce) {
             getLogger().error("Failure clearing store", ce);
         }
     }
-    
+
     /* (non-Javadoc)
      * @see org.apache.excalibur.store.Store#remove(java.lang.Object)
      */
@@ -318,15 +314,14 @@
             getLogger().error("Failure removing object", ce);
         }
     }
-    
+
     /* (non-Javadoc)
      * @see org.apache.excalibur.store.Store#containsKey(java.lang.Object)
      */
     public boolean containsKey(Object key) {
         return this.jcs.get(key) != null;
     }
-    
-    
+
     /* (non-Javadoc)
      * @see org.apache.excalibur.store.Store#keys()
      */
@@ -337,7 +332,7 @@
         return new IteratorEnumeration(Arrays.asList(keys).iterator());
         //return new IteratorEnumeration(this.jcs.getGroupKeys("").iterator());
     }
-    
+
     /* (non-Javadoc)
      * @see org.apache.excalibur.store.Store#size()
      */
@@ -347,20 +342,14 @@
         return memoryCache.getSize();
         //return this.jcs.getSize();
     }
-    
 
     private static class JCSCacheAccess extends GroupCacheAccess {
         private JCSCacheAccess(CompositeCache cacheControl) {
             super(cacheControl);
         }
-        
+
         /*private int getSize() {
             return super.cacheControl.getSize();
         }*/
-        
-        public void dispose() {
-            super.dispose();
-        }
     }
-    
 }

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/ElementPathPart.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/ElementPathPart.java?rev=367048&r1=367047&r2=367048&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/ElementPathPart.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/components/xpointer/ElementPathPart.java Sun Jan  8 08:40:26 2006
@@ -142,18 +142,6 @@
                 super.endDocument();
         }
 
-        public void startPrefixMapping(String prefix, String uri)
-                throws SAXException {
-            // let namespace prefix alway through
-            super.startPrefixMapping(prefix, uri);
-        }
-
-        public void endPrefixMapping(String prefix)
-                throws SAXException {
-            // let namespace prefix alway through
-            super.endPrefixMapping(prefix);
-        }
-
         public void characters(char c[], int start, int len)
                 throws SAXException {
             if (include)

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/AbstractEnvironment.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/AbstractEnvironment.java?rev=367048&r1=367047&r2=367048&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/AbstractEnvironment.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/AbstractEnvironment.java Sun Jan  8 08:40:26 2006
@@ -322,11 +322,6 @@
         }
     }
 
-    /**
-     * Redirect the client to a new URL
-     */
-    public abstract void redirect(boolean sessionmode, String newURL) throws IOException;
-
     public void globalRedirect(boolean sessionmode, String newURL) throws IOException {
         redirect(sessionmode, newURL);
     }

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/Environment.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/Environment.java?rev=367048&r1=367047&r2=367048&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/Environment.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/Environment.java Sun Jan  8 08:40:26 2006
@@ -26,7 +26,7 @@
  * @author <a href="mailto:bluetkemeier@s-und-n.de">Bj&ouml;rn L&uuml;tkemeier</a>
  * @author <a href="mailto:Giacomo.Pati@pwr.ch">Giacomo Pati</a>
  * @author <a href="mailto:cziegeler@apache.org">Carsten Ziegeler</a>
- * @version CVS $Id: Environment.java,v 1.7 2004/03/18 15:08:12 cziegeler Exp $
+ * @version CVS $Id$
  */
 public interface Environment
     extends SourceResolver {
@@ -73,7 +73,7 @@
     void changeContext(String uriprefix, String context) throws Exception;
 
     /**
-     * Redirect to the given URL
+     * Redirect the client to the given URL
      */
     void redirect(boolean sessionmode, String url) throws IOException;
 

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java?rev=367048&r1=367047&r2=367048&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/environment/wrapper/EnvironmentWrapper.java Sun Jan  8 08:40:26 2006
@@ -438,15 +438,6 @@
     }
 
     /**
-     * Remove attribute from the current instance.
-     *
-     * @param name a <code>String</code> value
-     */
-    public void removeAttribute(String name) {
-        super.removeAttribute(name);
-    }
-
-    /**
      * Always return <code>false</code>.
      */
     public boolean isExternal() {

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/AbstractSwitchSelector.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/AbstractSwitchSelector.java?rev=367048&r1=367047&r2=367048&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/AbstractSwitchSelector.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/selection/AbstractSwitchSelector.java Sun Jan  8 08:40:26 2006
@@ -25,32 +25,12 @@
  *
  * @author <a href="mailto:crafterm@apache.org">Marcus Crafter</a>
  * @author <a href="mailto:sylvain@apache.org">Sylvain Wallez</a>
- * @version CVS $Id: AbstractSwitchSelector.java,v 1.2 2004/03/05 13:02:57 bdelacretaz Exp $
+ * @version $Id$
  */
 public abstract class AbstractSwitchSelector extends AbstractLogEnabled
     implements SwitchSelector {
 
     /**
-     * Method to create a selector context.
-     *
-     * @param objectModel The <code>Map</code> containing object of the
-     *                    calling environment which may be used
-     *                    to select values to test the expression.
-     * @param parameters  The sitemap parameters, as specified by
-     *                    &lt;parameter/&gt; tags.
-     * @return selector context
-     */
-    public abstract Object getSelectorContext(Map objectModel, Parameters parameters);
-
-    /**
-     * Selectors test pattern against some objects in a <code>Map</code>
-     * model and signals success with the returned boolean value
-     * @param expression  The expression to test.
-     * @return boolean    Signals successful test.
-     */
-    public abstract boolean select(String expression, Object selectorContext);
-
-    /**
      * Selectors test pattern against some objects in a <code>Map</code>
      * model and signals success with the returned boolean value
      * @param expr        The expression to test.
@@ -60,5 +40,3 @@
         return select(expr, getSelectorContext(objectModel, params));
     }
 }
-
-

Modified: cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java?rev=367048&r1=367047&r2=367048&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/serialization/AbstractTextSerializer.java Sun Jan  8 08:40:26 2006
@@ -44,8 +44,6 @@
 import javax.xml.transform.sax.SAXTransformerFactory;
 import javax.xml.transform.sax.TransformerHandler;
 import javax.xml.transform.stream.StreamResult;
-import java.io.IOException;
-import java.io.OutputStream;
 import java.io.StringWriter;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -139,11 +137,11 @@
         return this.getTransformerFactory().newTransformerHandler();
     }
 
-    /**
-     * Set the {@link OutputStream} where the requested resource should
-     * be serialized.
-     */
-    public void setOutputStream(OutputStream out) throws IOException {
+    ///**
+    // * Set the {@link OutputStream} where the requested resource should
+    // * be serialized.
+    // */
+    // public void setOutputStream(OutputStream out) throws IOException {
         /*
          * Add a level of buffering to the output stream. Xalan serializes
          * every character individually. In conjunction with chunked
@@ -154,9 +152,9 @@
         //      super.setOutputStream(
         //        new BufferedOutputStream(out, outputBufferSize));
         //  } else {
-        super.setOutputStream(out);
+        // super.setOutputStream(out);
         //  }
-    }
+    // }
 
     /**
      * Uses the context to retrieve a default encoding for the serializers.
@@ -549,19 +547,4 @@
             this.uriList.clear();
         }
     }
-
-    /* (non-Javadoc)
-     * @see org.xml.sax.ContentHandler#endDocument()
-     */
-    public void endDocument() throws SAXException {
-        super.endDocument();
-
-        //   if (this.output != null) {
-        //       try {
-        //           this.output.flush();
-        //       } catch (IOException ignored) {
-        //       }
-        //   }
-    }
-
 }