cziegeler 2004/03/31 03:39:10
Modified: src/kernel/org/apache/cocoon/kernel Installer.java
KernelDeployer.java DeployedWirings.java
SimpleComposer.java ProxyWire.java LoadedBlock.java
Log:
Remove unused imports
Revision Changes Path
1.3 +1 -5
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/Installer.java
Index: Installer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/Installer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Installer.java 31 Mar 2004 11:20:51 -0000 1.2
+++ Installer.java 31 Mar 2004 11:39:10 -0000 1.3
@@ -18,17 +18,13 @@
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import java.util.Set;
-import org.apache.cocoon.kernel.identification.BlockDescriptor;
import org.apache.cocoon.kernel.identification.Descriptor;
import org.apache.cocoon.kernel.identification.IdentificationException;
import org.apache.cocoon.kernel.identification.Identifier;
-import org.apache.cocoon.kernel.archival.Library;
import org.apache.cocoon.kernel.identification.ParsedIdentifier;
import org.apache.cocoon.kernel.configuration.Configuration;
-import org.apache.cocoon.kernel.configuration.ConfigurationBuilder;
import org.apache.cocoon.kernel.configuration.ConfigurationException;
import org.apache.cocoon.kernel.configuration.Parameters;
import org.apache.cocoon.kernel.deployment.Deployer;
1.3 +1 -4
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/KernelDeployer.java
Index: KernelDeployer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/KernelDeployer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- KernelDeployer.java 31 Mar 2004 11:20:52 -0000 1.2
+++ KernelDeployer.java 31 Mar 2004 11:39:10 -0000 1.3
@@ -19,17 +19,14 @@
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
-import java.util.Set;
import org.apache.cocoon.kernel.identification.BlockDescriptor;
import org.apache.cocoon.kernel.identification.Descriptor;
import org.apache.cocoon.kernel.identification.DescriptorBuilder;
import org.apache.cocoon.kernel.identification.Identifier;
import org.apache.cocoon.kernel.identification.IdentificationException;
-import org.apache.cocoon.kernel.archival.Library;
import org.apache.cocoon.kernel.configuration.Configuration;
-import org.apache.cocoon.kernel.configuration.ConfigurationBuilder;
import org.apache.cocoon.kernel.configuration.ConfigurationException;
import org.apache.cocoon.kernel.configuration.Parameters;
1.3 +1 -2
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/DeployedWirings.java
Index: DeployedWirings.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/DeployedWirings.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- DeployedWirings.java 31 Mar 2004 11:20:52 -0000 1.2
+++ DeployedWirings.java 31 Mar 2004 11:39:10 -0000 1.3
@@ -17,7 +17,6 @@
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
-import java.net.URL;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
1.3 +1 -2
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/SimpleComposer.java
Index: SimpleComposer.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/SimpleComposer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- SimpleComposer.java 31 Mar 2004 11:20:52 -0000 1.2
+++ SimpleComposer.java 31 Mar 2004 11:39:10 -0000 1.3
@@ -18,7 +18,6 @@
import org.apache.cocoon.kernel.composition.Composer;
import org.apache.cocoon.kernel.composition.Wirings;
import org.apache.cocoon.kernel.composition.WiringException;
-import org.apache.cocoon.kernel.configuration.Configurable;
import org.apache.cocoon.kernel.configuration.ConfigurationException;
import org.apache.cocoon.kernel.configuration.Parameters;
import org.apache.cocoon.kernel.deployment.DeploymentException;
1.3 +2 -1
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/ProxyWire.java
Index: ProxyWire.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/ProxyWire.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ProxyWire.java 31 Mar 2004 11:20:52 -0000 1.2
+++ ProxyWire.java 31 Mar 2004 11:39:10 -0000 1.3
@@ -174,6 +174,7 @@
/* Record the original composer, resolver, and instance */
this.composer = composer;
+ // FIXME ??? This assignment has no effect, is it correct?
this.instance = instance;
this.resolver = resolver;
} catch (Throwable t) {
1.3 +2 -2
cocoon-2.2/src/kernel/org/apache/cocoon/kernel/LoadedBlock.java
Index: LoadedBlock.java
===================================================================
RCS file:
/home/cvs/cocoon-2.2/src/kernel/org/apache/cocoon/kernel/LoadedBlock.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LoadedBlock.java 31 Mar 2004 11:20:52 -0000 1.2
+++ LoadedBlock.java 31 Mar 2004 11:39:10 -0000 1.3
@@ -78,7 +78,7 @@
extended = (LoadedBlock)loader.load(descriptor.extendedBlock());
Iterator iterator = this.extended.implementedBlocks();
while (iterator.hasNext()) {
- this.implemented.add((Block)iterator.next());
+ this.implemented.add(iterator.next());
}
}
