You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by pi...@apache.org on 2005/09/04 15:24:39 UTC

svn commit: r278591 - in /cocoon/branches/BRANCH_2_1_X/src: blocks/proxy/java/org/apache/cocoon/generation/ blocks/woody/java/org/apache/cocoon/woody/ blocks/xsp/java/org/apache/cocoon/components/language/markup/ blocks/xsp/java/org/apache/cocoon/compo...

Author: pier
Date: Sun Sep  4 06:24:23 2005
New Revision: 278591

URL: http://svn.apache.org/viewcvs?rev=278591&view=rev
Log:
Removing unused imports

Modified:
    cocoon/branches/BRANCH_2_1_X/src/blocks/proxy/java/org/apache/cocoon/generation/GenericProxyGenerator.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/woody/java/org/apache/cocoon/woody/Constants.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/Logicsheet.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionFilter.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionParser.java
    cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java
    cocoon/branches/BRANCH_2_1_X/src/samples/org/apache/cocoon/samples/parentcm/Generator.java

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/proxy/java/org/apache/cocoon/generation/GenericProxyGenerator.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/proxy/java/org/apache/cocoon/generation/GenericProxyGenerator.java?rev=278591&r1=278590&r2=278591&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/proxy/java/org/apache/cocoon/generation/GenericProxyGenerator.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/proxy/java/org/apache/cocoon/generation/GenericProxyGenerator.java Sun Sep  4 06:24:23 2005
@@ -38,7 +38,6 @@
 import org.apache.excalibur.xml.sax.SAXParser;
 import org.xml.sax.InputSource;
 import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
 
 /**
  * This is a generic HTTP proxy, designed to handle any possible HTTP method,

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/woody/java/org/apache/cocoon/woody/Constants.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/woody/java/org/apache/cocoon/woody/Constants.java?rev=278591&r1=278590&r2=278591&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/woody/java/org/apache/cocoon/woody/Constants.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/woody/java/org/apache/cocoon/woody/Constants.java Sun Sep  4 06:24:23 2005
@@ -18,7 +18,6 @@
 import org.apache.cocoon.xml.XMLUtils;
 
 import org.xml.sax.Attributes;
-import org.xml.sax.helpers.AttributesImpl;
 
 /**
  * Various constants used in the Woody form framework.

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java?rev=278591&r1=278590&r2=278591&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/AbstractMarkupLanguage.java Sun Sep  4 06:24:23 2005
@@ -20,7 +20,6 @@
 import org.apache.avalon.framework.configuration.Configuration;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.logger.AbstractLogEnabled;
-import org.apache.avalon.framework.parameters.ParameterException;
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.avalon.framework.service.ServiceManager;
@@ -40,7 +39,6 @@
 
 import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
-import org.xml.sax.XMLFilter;
 
 import java.io.IOException;
 import java.net.MalformedURLException;

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/Logicsheet.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/Logicsheet.java?rev=278591&r1=278590&r2=278591&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/Logicsheet.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/Logicsheet.java Sun Sep  4 06:24:23 2005
@@ -25,11 +25,7 @@
 import org.apache.excalibur.source.Source;
 import org.apache.excalibur.source.SourceException;
 import org.apache.excalibur.source.SourceResolver;
-import org.xml.sax.Attributes;
 import org.xml.sax.SAXException;
-import org.xml.sax.XMLFilter;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLFilterImpl;
 
 import javax.xml.transform.sax.TransformerHandler;
 

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionFilter.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionFilter.java?rev=278591&r1=278590&r2=278591&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionFilter.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionFilter.java Sun Sep  4 06:24:23 2005
@@ -15,7 +15,6 @@
  */
 package org.apache.cocoon.components.language.markup.xsp;
 
-import org.apache.cocoon.components.language.markup.AbstractMarkupLanguage;
 import org.apache.cocoon.components.language.markup.LogicsheetFilter;
 import org.apache.cocoon.xml.AbstractXMLPipe;
 import org.apache.cocoon.xml.AttributesImpl;
@@ -26,9 +25,7 @@
 import org.xml.sax.ContentHandler;
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
-import org.xml.sax.XMLReader;
 import org.xml.sax.ext.LexicalHandler;
-import org.xml.sax.helpers.XMLFilterImpl;
 import java.util.LinkedList;
 
 /**

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionParser.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionParser.java?rev=278591&r1=278590&r2=278591&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionParser.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionParser.java Sun Sep  4 06:24:23 2005
@@ -15,8 +15,6 @@
  */
 package org.apache.cocoon.components.language.markup.xsp;
 
-import org.apache.cocoon.xml.XMLUtils;
-import org.xml.sax.ContentHandler;
 import org.xml.sax.SAXException;
 
 /**
@@ -213,7 +211,7 @@
                     parser.setState(EXPRESSION_CHAR_STATE);
                     break;
 
-                case '´':
+                case '�':
                     parser.append(ch);
                     parser.setState(EXPRESSION_SHELL_STATE);
                     break;
@@ -237,10 +235,10 @@
     protected static final State EXPRESSION_CHAR_STATE = new QuotedState('\'');
 
     /**
-     * The parser has encountered '´' in <code>{@link EXPRESSION_STATE}</code>
+     * The parser has encountered '�' in <code>{@link EXPRESSION_STATE}</code>
      * to start a Python string constant.
      */
-    protected static final State EXPRESSION_SHELL_STATE = new QuotedState('´');
+    protected static final State EXPRESSION_SHELL_STATE = new QuotedState('�');
 
     /**
      * The parser state

Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java?rev=278591&r1=278590&r2=278591&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPMarkupLanguage.java Sun Sep  4 06:24:23 2005
@@ -19,13 +19,6 @@
 import org.apache.cocoon.components.language.markup.LogicsheetFilter;
 import org.apache.cocoon.components.language.programming.ProgrammingLanguage;
 import org.apache.cocoon.xml.AbstractXMLPipe;
-import org.apache.cocoon.xml.XMLUtils;
-
-import org.xml.sax.Attributes;
-import org.xml.sax.SAXException;
-import org.xml.sax.XMLFilter;
-
-import java.util.Stack;
 
 /**
  * This class implements <code>MarkupLanguage</code> for Cocoon's

Modified: cocoon/branches/BRANCH_2_1_X/src/samples/org/apache/cocoon/samples/parentcm/Generator.java
URL: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/samples/org/apache/cocoon/samples/parentcm/Generator.java?rev=278591&r1=278590&r2=278591&view=diff
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/samples/org/apache/cocoon/samples/parentcm/Generator.java (original)
+++ cocoon/branches/BRANCH_2_1_X/src/samples/org/apache/cocoon/samples/parentcm/Generator.java Sun Sep  4 06:24:23 2005
@@ -15,19 +15,18 @@
  */
 package org.apache.cocoon.samples.parentcm;
 
+import java.io.IOException;
+import java.util.Date;
+import java.util.Map;
+
 import org.apache.avalon.excalibur.pool.Poolable;
 import org.apache.avalon.framework.parameters.Parameters;
 import org.apache.avalon.framework.service.ServiceException;
 import org.apache.cocoon.ProcessingException;
-import org.apache.cocoon.xml.XMLUtils;
 import org.apache.cocoon.environment.SourceResolver;
 import org.apache.cocoon.generation.ServiceableGenerator;
+import org.apache.cocoon.xml.XMLUtils;
 import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
-
-import java.io.IOException;
-import java.util.Date;
-import java.util.Map;
 
 /**
  * Generator for the parent component manager sample. The generator outputs



Re: svn commit: r278591 - in /cocoon/branches/BRANCH_2_1_X/src: blocks/proxy/java/org/apache/cocoon/generation/ blocks/woody/java/org/apache/cocoon/woody/ blocks/xsp/java/org/apache/cocoon/components/language/markup/ blocks/xsp/java/org/apache/cocoon/compo...

Posted by Antonio Gallardo <ag...@agssa.net>.
pier@apache.org wrote:

>Author: pier
>Date: Sun Sep  4 06:24:23 2005
>New Revision: 278591
>
>URL: http://svn.apache.org/viewcvs?rev=278591&view=rev
>Log:
>Removing unused imports
>
>Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/xsp/java/org/apache/cocoon/components/language/markup/xsp/XSPExpressionParser.java
> 
>@@ -213,7 +211,7 @@
>                     parser.setState(EXPRESSION_CHAR_STATE);
>                     break;
> 
>-                case '´':
>+                case '�':
>                     parser.append(ch);
>                     parser.setState(EXPRESSION_SHELL_STATE);
>                     break;
>@@ -237,10 +235,10 @@
>     protected static final State EXPRESSION_CHAR_STATE = new QuotedState('\'');
> 
>     /**
>-     * The parser has encountered '´' in <code>{@link EXPRESSION_STATE}</code>
>+     * The parser has encountered '�' in <code>{@link EXPRESSION_STATE}</code>
>      * to start a Python string constant.
>      */
>-    protected static final State EXPRESSION_SHELL_STATE = new QuotedState('´');
>+    protected static final State EXPRESSION_SHELL_STATE = new QuotedState('�');
>  
>
Please review this. I am not telling this is bad. Just wondering why the 
char change.

Best Regards,

Antonio Gallardo.