cziegeler 2003/01/29 23:17:55
Modified: src/java/org/apache/cocoon/components/treeprocessor/sitemap
ContinueNode.java MatchNode.java SerializeNode.java
src/java/org/apache/cocoon/components/source/impl
FileSource.java
src/java/org/apache/cocoon/components/source
MoveableSource.java
src/scratchpad/src/org/apache/cocoon/generation
SourceDescriptionGenerator.java
Log:
Organize imports
Revision Changes Path
1.8 +3 -4
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ContinueNode.java
Index: ContinueNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/ContinueNode.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ContinueNode.java 30 Jan 2003 05:00:13 -0000 1.7
+++ ContinueNode.java 30 Jan 2003 07:17:54 -0000 1.8
@@ -45,6 +45,9 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
+import java.util.ArrayList;
+import java.util.List;
+
import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentManager;
import org.apache.avalon.framework.component.Composable;
@@ -58,11 +61,7 @@
import org.apache.cocoon.components.treeprocessor.variables.VariableResolver;
import org.apache.cocoon.components.treeprocessor.variables.VariableResolverFactory;
import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.environment.Redirector;
import org.apache.cocoon.sitemap.PatternException;
-
-import java.util.ArrayList;
-import java.util.List;
/**
* Node to handle <map:continue with="...">
1.9 +3 -4
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MatchNode.java
Index: MatchNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/MatchNode.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MatchNode.java 30 Jan 2003 05:00:13 -0000 1.8
+++ MatchNode.java 30 Jan 2003 07:17:54 -0000 1.9
@@ -50,6 +50,8 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
+import java.util.Map;
+
import org.apache.avalon.framework.activity.Disposable;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentManager;
@@ -63,9 +65,6 @@
import org.apache.cocoon.environment.Environment;
import org.apache.cocoon.matching.Matcher;
import org.apache.cocoon.sitemap.PatternException;
-
-import java.util.List;
-import java.util.Map;
/**
*
1.12 +1 -3
xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SerializeNode.java
Index: SerializeNode.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/treeprocessor/sitemap/SerializeNode.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- SerializeNode.java 30 Jan 2003 05:00:13 -0000 1.11
+++ SerializeNode.java 30 Jan 2003 07:17:54 -0000 1.12
@@ -50,11 +50,9 @@
*/
package org.apache.cocoon.components.treeprocessor.sitemap;
-import java.util.List;
import java.util.Map;
import org.apache.avalon.framework.parameters.Parameters;
-
import org.apache.cocoon.Constants;
import org.apache.cocoon.components.pipeline.ProcessingPipeline;
import org.apache.cocoon.components.treeprocessor.InvokeContext;
1.10 +5 -6
xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/FileSource.java
Index: FileSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/impl/FileSource.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- FileSource.java 29 Jan 2003 10:55:17 -0000 1.9
+++ FileSource.java 30 Jan 2003 07:17:54 -0000 1.10
@@ -54,18 +54,17 @@
*/
package org.apache.cocoon.components.source.impl;
-import org.apache.cocoon.components.source.WriteableSource;
-import org.apache.excalibur.source.SourceException;
-import org.apache.excalibur.source.impl.URLSource;
-
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
-import java.io.InputStream;
import java.io.OutputStream;
import java.net.URL;
import java.util.ConcurrentModificationException;
import java.util.Map;
+
+import org.apache.cocoon.components.source.WriteableSource;
+import org.apache.excalibur.source.SourceException;
+import org.apache.excalibur.source.impl.URLSource;
/**
* A <code>org.apache.cocoon.components.source.WriteableSource</code>
1.2 +1 -3
xml-cocoon2/src/java/org/apache/cocoon/components/source/MoveableSource.java
Index: MoveableSource.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/source/MoveableSource.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- MoveableSource.java 29 Jan 2003 10:56:17 -0000 1.1
+++ MoveableSource.java 30 Jan 2003 07:17:55 -0000 1.2
@@ -53,8 +53,6 @@
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
-import java.io.IOException;
-import java.io.OutputStream;
/**
* This class marks a source to be able to moved and copied to
1.17 +2 -7
xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/SourceDescriptionGenerator.java
Index: SourceDescriptionGenerator.java
===================================================================
RCS file:
/home/cvs/xml-cocoon2/src/scratchpad/src/org/apache/cocoon/generation/SourceDescriptionGenerator.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- SourceDescriptionGenerator.java 29 Jan 2003 13:06:11 -0000 1.16
+++ SourceDescriptionGenerator.java 30 Jan 2003 07:17:55 -0000 1.17
@@ -57,11 +57,9 @@
import java.util.Hashtable;
import java.util.Map;
+import org.apache.avalon.excalibur.pool.Recyclable;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.parameters.Parameters;
-
-import org.apache.avalon.excalibur.pool.Recyclable;
-
import org.apache.cocoon.ProcessingException;
import org.apache.cocoon.caching.CacheableProcessingComponent;
import org.apache.cocoon.components.source.InspectableSource;
@@ -76,14 +74,11 @@
import org.apache.cocoon.components.source.helpers.SourcePermission;
import org.apache.cocoon.components.source.helpers.SourceProperty;
import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.xml.EmbeddedXMLPipe;
import org.apache.cocoon.xml.IncludeXMLConsumer;
-
import org.apache.excalibur.source.Source;
import org.apache.excalibur.source.SourceException;
import org.apache.excalibur.source.SourceValidity;
import org.apache.excalibur.source.impl.validity.AggregatedValidity;
-
import org.xml.sax.SAXException;
import org.xml.sax.helpers.AttributesImpl;
----------------------------------------------------------------------
In case of troubles, e-mail: [EMAIL PROTECTED]
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]