You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2003/02/04 16:14:30 UTC

cvs commit: xml-cocoon2/src/blocks/chaperon/java/org/apache/cocoon/xml TextXMLizer.java

cziegeler    2003/02/04 07:14:28

  Modified:    src/blocks/chaperon/java/org/apache/cocoon/transformation
                        PatternTransformer.java ParserTransformer.java
                        LexicalTransformer.java
               src/blocks/chaperon/java/org/apache/cocoon/xml
                        TextXMLizer.java
  Log:
  Organizing imports
  
  Revision  Changes    Path
  1.3       +12 -25    xml-cocoon2/src/blocks/chaperon/java/org/apache/cocoon/transformation/PatternTransformer.java
  
  Index: PatternTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/blocks/chaperon/java/org/apache/cocoon/transformation/PatternTransformer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- PatternTransformer.java	4 Feb 2003 13:26:34 -0000	1.2
  +++ PatternTransformer.java	4 Feb 2003 15:14:26 -0000	1.3
  @@ -51,10 +51,19 @@
   
   package org.apache.cocoon.transformation;
   
  -import org.apache.avalon.excalibur.pool.Recyclable;
  +import java.io.IOException;
  +import java.io.Serializable;
  +import java.util.Map;
   
  +import net.sourceforge.chaperon.adapter.avalon.LexiconFactory;
  +import net.sourceforge.chaperon.build.LexicalAutomatonBuilder;
  +import net.sourceforge.chaperon.common.Decoder;
  +import net.sourceforge.chaperon.model.lexicon.Lexicon;
  +import net.sourceforge.chaperon.process.LexicalAutomaton;
  +import net.sourceforge.chaperon.process.PatternProcessor;
  +
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
  @@ -63,40 +72,18 @@
   import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
   import org.apache.avalon.framework.logger.LogEnabled;
   import org.apache.avalon.framework.logger.Logger;
  -import org.apache.avalon.framework.parameters.ParameterException;
   import org.apache.avalon.framework.parameters.Parameters;
  -
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.caching.CacheableProcessingComponent;
   import org.apache.cocoon.components.source.SourceUtil;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.transformation.AbstractTransformer;
  -import org.apache.cocoon.xml.EmbeddedXMLPipe;
  -import org.apache.cocoon.xml.XMLConsumer;
  -
   import org.apache.excalibur.source.Source;
   import org.apache.excalibur.source.SourceException;
   import org.apache.excalibur.source.SourceValidity;
   import org.apache.excalibur.store.Store;
  -
   import org.xml.sax.Attributes;
  -import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
  -import org.xml.sax.ContentHandler;
   import org.xml.sax.helpers.AttributesImpl;
  -
  -import java.io.IOException;
  -import java.io.Serializable;
  -import java.util.Map;
  -
  -import net.sourceforge.chaperon.adapter.avalon.LexiconFactory;
  -import net.sourceforge.chaperon.adapter.sax.LexicalHandlerAdapter;
  -import net.sourceforge.chaperon.adapter.sax.LexicalProcessorAdapter;
  -import net.sourceforge.chaperon.build.LexicalAutomatonBuilder;
  -import net.sourceforge.chaperon.common.Decoder;
  -import net.sourceforge.chaperon.model.lexicon.Lexicon;
  -import net.sourceforge.chaperon.process.LexicalAutomaton;
  -import net.sourceforge.chaperon.process.PatternProcessor;
   
   /**
    * This transfomer transforms text pattern of a XML
  
  
  
  1.2       +13 -24    xml-cocoon2/src/blocks/chaperon/java/org/apache/cocoon/transformation/ParserTransformer.java
  
  Index: ParserTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/blocks/chaperon/java/org/apache/cocoon/transformation/ParserTransformer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- ParserTransformer.java	3 Feb 2003 19:15:33 -0000	1.1
  +++ ParserTransformer.java	4 Feb 2003 15:14:26 -0000	1.2
  @@ -51,10 +51,20 @@
   
   package org.apache.cocoon.transformation;
   
  -import org.apache.avalon.excalibur.pool.Recyclable;
  +import java.io.IOException;
  +import java.io.Serializable;
  +import java.util.Map;
  +
  +import net.sourceforge.chaperon.adapter.avalon.GrammarFactory;
  +import net.sourceforge.chaperon.adapter.sax.ParserHandlerAdapter;
  +import net.sourceforge.chaperon.adapter.sax.ParserProcessorAdapter;
  +import net.sourceforge.chaperon.build.ParserAutomatonBuilder;
  +import net.sourceforge.chaperon.model.grammar.Grammar;
  +import net.sourceforge.chaperon.process.ParserAutomaton;
  +import net.sourceforge.chaperon.process.ParserProcessor;
   
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
  @@ -66,37 +76,16 @@
   import org.apache.avalon.framework.parameters.ParameterException;
   import org.apache.avalon.framework.parameters.Parameterizable;
   import org.apache.avalon.framework.parameters.Parameters;
  -
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.caching.CacheableProcessingComponent;
   import org.apache.cocoon.components.source.SourceUtil;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.transformation.Transformer;
  -import org.apache.cocoon.xml.EmbeddedXMLPipe;
   import org.apache.cocoon.xml.XMLConsumer;
  -
   import org.apache.excalibur.source.Source;
   import org.apache.excalibur.source.SourceException;
   import org.apache.excalibur.source.SourceValidity;
   import org.apache.excalibur.store.Store;
  -
  -import org.xml.sax.Attributes;
  -import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.helpers.AttributesImpl;
  -
  -import java.io.IOException;
  -import java.io.Serializable;
  -import java.util.Map;
  -
  -import net.sourceforge.chaperon.adapter.avalon.GrammarFactory;
  -import net.sourceforge.chaperon.adapter.sax.ParserHandlerAdapter;
  -import net.sourceforge.chaperon.adapter.sax.ParserProcessorAdapter;
  -import net.sourceforge.chaperon.build.ParserAutomatonBuilder;
  -import net.sourceforge.chaperon.model.grammar.Grammar;
  -import net.sourceforge.chaperon.process.ParserAutomaton;
  -import net.sourceforge.chaperon.process.ParserProcessor;
   
   /**
    * This transfomer transforms lexical tokens in a XML
  
  
  
  1.2       +13 -25    xml-cocoon2/src/blocks/chaperon/java/org/apache/cocoon/transformation/LexicalTransformer.java
  
  Index: LexicalTransformer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/blocks/chaperon/java/org/apache/cocoon/transformation/LexicalTransformer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- LexicalTransformer.java	3 Feb 2003 19:15:33 -0000	1.1
  +++ LexicalTransformer.java	4 Feb 2003 15:14:26 -0000	1.2
  @@ -51,10 +51,20 @@
   
   package org.apache.cocoon.transformation;
   
  -import org.apache.avalon.excalibur.pool.Recyclable;
  +import java.io.IOException;
  +import java.io.Serializable;
  +import java.util.Map;
  +
  +import net.sourceforge.chaperon.adapter.avalon.LexiconFactory;
  +import net.sourceforge.chaperon.adapter.sax.LexicalHandlerAdapter;
  +import net.sourceforge.chaperon.adapter.sax.LexicalProcessorAdapter;
  +import net.sourceforge.chaperon.build.LexicalAutomatonBuilder;
  +import net.sourceforge.chaperon.model.lexicon.Lexicon;
  +import net.sourceforge.chaperon.process.LexicalAutomaton;
  +import net.sourceforge.chaperon.process.LexicalProcessor;
   
  +import org.apache.avalon.excalibur.pool.Recyclable;
   import org.apache.avalon.framework.activity.Disposable;
  -import org.apache.avalon.framework.component.Component;
   import org.apache.avalon.framework.component.ComponentException;
   import org.apache.avalon.framework.component.ComponentManager;
   import org.apache.avalon.framework.component.Composable;
  @@ -63,39 +73,17 @@
   import org.apache.avalon.framework.configuration.SAXConfigurationHandler;
   import org.apache.avalon.framework.logger.LogEnabled;
   import org.apache.avalon.framework.logger.Logger;
  -import org.apache.avalon.framework.parameters.ParameterException;
   import org.apache.avalon.framework.parameters.Parameters;
  -
   import org.apache.cocoon.ProcessingException;
   import org.apache.cocoon.caching.CacheableProcessingComponent;
   import org.apache.cocoon.components.source.SourceUtil;
   import org.apache.cocoon.environment.SourceResolver;
  -import org.apache.cocoon.transformation.Transformer;
  -import org.apache.cocoon.xml.EmbeddedXMLPipe;
   import org.apache.cocoon.xml.XMLConsumer;
  -
   import org.apache.excalibur.source.Source;
   import org.apache.excalibur.source.SourceException;
   import org.apache.excalibur.source.SourceValidity;
   import org.apache.excalibur.store.Store;
  -
  -import org.xml.sax.Attributes;
  -import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
  -import org.xml.sax.ContentHandler;
  -import org.xml.sax.helpers.AttributesImpl;
  -
  -import java.io.IOException;
  -import java.io.Serializable;
  -import java.util.Map;
  -
  -import net.sourceforge.chaperon.adapter.avalon.LexiconFactory;
  -import net.sourceforge.chaperon.adapter.sax.LexicalHandlerAdapter;
  -import net.sourceforge.chaperon.adapter.sax.LexicalProcessorAdapter;
  -import net.sourceforge.chaperon.build.LexicalAutomatonBuilder;
  -import net.sourceforge.chaperon.model.lexicon.Lexicon;
  -import net.sourceforge.chaperon.process.LexicalAutomaton;
  -import net.sourceforge.chaperon.process.LexicalProcessor;
   
   /**
    * This transfomer transforms special mark text part of a XML
  
  
  
  1.2       +6 -9      xml-cocoon2/src/blocks/chaperon/java/org/apache/cocoon/xml/TextXMLizer.java
  
  Index: TextXMLizer.java
  ===================================================================
  RCS file: /home/cvs/xml-cocoon2/src/blocks/chaperon/java/org/apache/cocoon/xml/TextXMLizer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TextXMLizer.java	3 Feb 2003 19:15:34 -0000	1.1
  +++ TextXMLizer.java	4 Feb 2003 15:14:28 -0000	1.2
  @@ -51,22 +51,19 @@
   
   package org.apache.cocoon.xml;
   
  -import org.apache.avalon.framework.thread.ThreadSafe;
  +import java.io.IOException;
  +import java.io.InputStreamReader;
  +import java.io.LineNumberReader;
  +
   import org.apache.avalon.framework.component.Component;
  +import org.apache.avalon.framework.thread.ThreadSafe;
   import org.apache.excalibur.xml.sax.SAXParser;
  -
  -import org.xml.sax.Attributes;
   import org.xml.sax.ContentHandler;
   import org.xml.sax.InputSource;
   import org.xml.sax.SAXException;
   import org.xml.sax.ext.LexicalHandler;
   import org.xml.sax.helpers.AttributesImpl;
   import org.xml.sax.helpers.LocatorImpl;
  -
  -import java.io.InputStream;
  -import java.io.InputStreamReader;
  -import java.io.IOException;
  -import java.io.LineNumberReader;
   
   /**
    * This XMLizer creates a SAX stream of a plain text document. The
  
  
  

----------------------------------------------------------------------
In case of troubles, e-mail:     webmaster@xml.apache.org
To unsubscribe, e-mail:          cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org