cziegeler 2004/04/29 01:46:19
Modified: src/blocks/forms/java/org/apache/cocoon/forms/transformation
EffectPipe.java
src/blocks/forms/java/org/apache/cocoon/forms/validation
WidgetValidator.java
src/blocks/forms/java/org/apache/cocoon/forms/formmodel
WidgetDefinition.java AbstractWidgetDefinition.java
src/blocks/forms/java/org/apache/cocoon/forms/util
JavaScriptHelper.java
src/blocks/forms/java/org/apache/cocoon/forms/binding
JavaScriptJXPathBinding.java
Log:
Clean up code
Revision Changes Path
1.8 +10 -10
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectPipe.java
Index: EffectPipe.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/transformation/EffectPipe.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- EffectPipe.java 14 Apr 2004 18:01:22 -0000 1.7
+++ EffectPipe.java 29 Apr 2004 08:46:19 -0000 1.8
@@ -185,31 +185,31 @@
super.endPrefixMapping(input.prefix);
}
- public void element(String prefix, String uri, String loc,
Attributes attrs) throws SAXException {
+ public void element(String prefix, String uri, String loc,
Attributes attrs) {
element = new Element(uri, loc, prefix + ":" + loc, attrs);
}
- public void element(String prefix, String uri, String loc) throws
SAXException {
+ public void element(String prefix, String uri, String loc) {
element(prefix, uri, loc, null);
}
- public void element(String loc, Attributes attrs) throws
SAXException {
+ public void element(String loc, Attributes attrs) {
element = new Element("", loc, loc, attrs);
}
- public void element(String loc) throws SAXException {
+ public void element(String loc) {
element(loc, null);
}
- public void element() throws SAXException {
+ public void element() {
element = new Element(input.uri, input.loc, input.raw,
input.attrs);
}
- public void attribute(String prefix, String uri, String name, String
value) throws SAXException {
+ public void attribute(String prefix, String uri, String name, String
value) {
element.addAttribute(prefix, uri, name, value);
}
- public void attribute(String name, String value) throws SAXException
{
+ public void attribute(String name, String value) {
element.addAttribute(name, value);
}
@@ -222,11 +222,11 @@
}
}
- public void attributes(Attributes attrs) throws SAXException {
+ public void attributes(Attributes attrs) {
element.addAttributes(attrs);
}
- public void attributes() throws SAXException {
+ public void attributes() {
attributes(input.attrs);
}
1.4 +1 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/validation/WidgetValidator.java
Index: WidgetValidator.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/validation/WidgetValidator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- WidgetValidator.java 28 Apr 2004 16:34:13 -0000 1.3
+++ WidgetValidator.java 29 Apr 2004 08:46:19 -0000 1.4
@@ -15,7 +15,6 @@
*/
package org.apache.cocoon.forms.validation;
-import org.apache.cocoon.forms.FormContext;
import org.apache.cocoon.forms.formmodel.Widget;
/**
1.5 +1 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/WidgetDefinition.java
Index: WidgetDefinition.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/WidgetDefinition.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- WidgetDefinition.java 28 Apr 2004 16:34:12 -0000 1.4
+++ WidgetDefinition.java 29 Apr 2004 08:46:19 -0000 1.5
@@ -15,7 +15,6 @@
*/
package org.apache.cocoon.forms.formmodel;
-import org.apache.cocoon.forms.FormContext;
import org.xml.sax.ContentHandler;
import org.xml.sax.SAXException;
1.6 +1 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractWidgetDefinition.java
Index: AbstractWidgetDefinition.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/formmodel/AbstractWidgetDefinition.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractWidgetDefinition.java 28 Apr 2004 16:34:12 -0000 1.5
+++ AbstractWidgetDefinition.java 29 Apr 2004 08:46:19 -0000 1.6
@@ -21,7 +21,6 @@
import java.util.Map;
import org.apache.cocoon.forms.Constants;
-import org.apache.cocoon.forms.FormContext;
import org.apache.cocoon.forms.validation.WidgetValidator;
import org.apache.cocoon.xml.XMLUtils;
import org.apache.excalibur.xml.sax.XMLizable;
1.4 +1 -2
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/util/JavaScriptHelper.java
Index: JavaScriptHelper.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/util/JavaScriptHelper.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JavaScriptHelper.java 25 Apr 2004 12:12:09 -0000 1.3
+++ JavaScriptHelper.java 29 Apr 2004 08:46:19 -0000 1.4
@@ -23,7 +23,6 @@
import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.cocoon.components.flow.FlowHelper;
import
org.apache.cocoon.components.flow.javascript.fom.FOM_JavaScriptFlowHelper;
-import org.apache.cocoon.environment.Request;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.Function;
import org.mozilla.javascript.JavaScriptException;
1.5 +1 -3
cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/JavaScriptJXPathBinding.java
Index: JavaScriptJXPathBinding.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/forms/java/org/apache/cocoon/forms/binding/JavaScriptJXPathBinding.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JavaScriptJXPathBinding.java 25 Apr 2004 12:12:09 -0000 1.4
+++ JavaScriptJXPathBinding.java 29 Apr 2004 08:46:19 -0000 1.5
@@ -20,8 +20,6 @@
import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.cocoon.components.CocoonComponentManager;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Request;
import org.apache.cocoon.forms.formmodel.Widget;
import org.apache.cocoon.forms.util.JavaScriptHelper;
import org.apache.commons.jxpath.JXPathContext;
