antonio 2003/12/11 21:39:39
Modified: src/java/org/apache/cocoon/generation
JXTemplateGenerator.java
src/blocks/woody/java/org/apache/cocoon/woody/formmodel
MultiValueField.java
src/java/org/apache/cocoon/i18n BundleFactory.java
src/blocks/scratchpad/java/org/apache/cocoon/transformation/constrained
XmlTreeConstraint.java
src/java/org/apache/cocoon/transformation
I18nTransformer.java
src/java/org/apache/cocoon/components/flow/javascript/fom
FOM_Cocoon.java
src/test/org/apache/cocoon/environment/mock MockRequest.java
Log:
Removing unused imports + innecessary class cast
Revision Changes Path
1.23 +1 -5
cocoon-2.1/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java
Index: JXTemplateGenerator.java
===================================================================
RCS file:
/home/cvs//cocoon-2.1/src/java/org/apache/cocoon/generation/JXTemplateGenerator.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- JXTemplateGenerator.java 10 Dec 2003 16:43:49 -0000 1.22
+++ JXTemplateGenerator.java 12 Dec 2003 05:39:37 -0000 1.23
@@ -62,14 +62,12 @@
import java.text.DecimalFormatSymbols;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
import java.util.Map;
-import java.util.Set;
import java.util.Stack;
import java.util.TimeZone;
@@ -82,7 +80,6 @@
import org.apache.cocoon.components.source.SourceUtil;
import org.apache.cocoon.environment.ObjectModelHelper;
import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Response;
import org.apache.cocoon.environment.SourceResolver;
import org.apache.cocoon.transformation.AbstractTransformer;
import org.apache.cocoon.xml.XMLConsumer;
@@ -97,7 +94,6 @@
import org.apache.commons.jexl.util.introspection.VelPropertySet;
import org.apache.commons.jxpath.CompiledExpression;
import org.apache.commons.jxpath.DynamicPropertyHandler;
-import org.apache.commons.jxpath.ExpressionContext;
import org.apache.commons.jxpath.JXPathBeanInfo;
import org.apache.commons.jxpath.JXPathContext;
import org.apache.commons.jxpath.JXPathContextFactory;
1.11 +1 -1
cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/MultiValueField.java
Index: MultiValueField.java
===================================================================
RCS file:
/home/cvs//cocoon-2.1/src/blocks/woody/java/org/apache/cocoon/woody/formmodel/MultiValueField.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- MultiValueField.java 11 Dec 2003 21:06:14 -0000 1.10
+++ MultiValueField.java 12 Dec 2003 05:39:38 -0000 1.11
@@ -194,7 +194,7 @@
setValues(new Object[0]);
}
else if (value.getClass().isArray()) {
- setValues((Object[])values);
+ setValues(values);
} else {
throw new RuntimeException("Cannot set value of field \"" +
getFullyQualifiedId() + "\" with an object of type " +
value.getClass().getName());
}
1.5 +1 -2
cocoon-2.1/src/java/org/apache/cocoon/i18n/BundleFactory.java
Index: BundleFactory.java
===================================================================
RCS file:
/home/cvs//cocoon-2.1/src/java/org/apache/cocoon/i18n/BundleFactory.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- BundleFactory.java 10 Dec 2003 15:37:37 -0000 1.4
+++ BundleFactory.java 12 Dec 2003 05:39:38 -0000 1.5
@@ -52,7 +52,6 @@
import java.util.Locale;
-import org.apache.avalon.framework.component.Component;
import org.apache.avalon.framework.component.ComponentException;
import org.apache.avalon.framework.component.ComponentSelector;
1.3 +2 -2
cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/transformation/constrained/XmlTreeConstraint.java
Index: XmlTreeConstraint.java
===================================================================
RCS file:
/home/cvs//cocoon-2.1/src/blocks/scratchpad/java/org/apache/cocoon/transformation/constrained/XmlTreeConstraint.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XmlTreeConstraint.java 5 Sep 2003 07:04:34 -0000 1.2
+++ XmlTreeConstraint.java 12 Dec 2003 05:39:38 -0000 1.3
@@ -197,7 +197,7 @@
ListIterator iter2 = l2.listIterator(l2.size());
while (iter1.hasPrevious()) {
- if (!(((String) iter1.previous().toString())
+ if (!((iter1.previous().toString())
.equals(iter2.previous().toString()))) {
//System.out.println("ends are NOT equal.");
1.19 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/transformation/I18nTransformer.java
Index: I18nTransformer.java
===================================================================
RCS file:
/home/cvs//cocoon-2.1/src/java/org/apache/cocoon/transformation/I18nTransformer.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- I18nTransformer.java 10 Dec 2003 15:37:36 -0000 1.18
+++ I18nTransformer.java 12 Dec 2003 05:39:38 -0000 1.19
@@ -2148,7 +2148,7 @@
public Bundle getCatalogue() throws Exception {
if (catalogue == null) {
resolve();
- catalogue = (Bundle) factory.select(resolvedLocation,
resolvedName, locale);
+ catalogue = factory.select(resolvedLocation, resolvedName,
locale);
}
return catalogue;
}
1.22 +1 -2
cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
Index: FOM_Cocoon.java
===================================================================
RCS file:
/home/cvs//cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- FOM_Cocoon.java 9 Dec 2003 21:21:07 -0000 1.21
+++ FOM_Cocoon.java 12 Dec 2003 05:39:38 -0000 1.22
@@ -66,7 +66,6 @@
import org.apache.avalon.framework.service.ServiceManager;
import org.apache.cocoon.components.LifecycleHelper;
import org.apache.cocoon.components.flow.ContinuationsManager;
-import org.apache.cocoon.components.flow.FlowHelper;
import org.apache.cocoon.components.flow.WebContinuation;
import org.apache.cocoon.components.flow.Interpreter.Argument;
import org.apache.cocoon.components.treeprocessor.sitemap.PipelinesNode;
1.9 +2 -2
cocoon-2.1/src/test/org/apache/cocoon/environment/mock/MockRequest.java
Index: MockRequest.java
===================================================================
RCS file:
/home/cvs//cocoon-2.1/src/test/org/apache/cocoon/environment/mock/MockRequest.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MockRequest.java 15 Oct 2003 21:00:24 -0000 1.8
+++ MockRequest.java 12 Dec 2003 05:39:38 -0000 1.9
@@ -307,9 +307,9 @@
public Session getSession(boolean create) {
if ((session == null) && (create))
this.session = new MockSession();
- else if ((session != null) && (!((MockSession) session).isValid())
&& (create))
+ else if ((session != null) && (!(session).isValid()) && (create))
this.session = new MockSession();
- if ((session != null) && (((MockSession) session).isValid()))
+ if ((session != null) && ((session).isValid()))
return this.session;
else
return null;
