cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject cvs commit: cocoon-2.1/src/scratchpad/src/org/apache/cocoon/generation JXFormsGenerator.java JXTemplateGenerator.java
Date Sun, 27 Apr 2003 14:56:16 GMT
cziegeler    2003/04/27 07:56:16

  Modified:    src/scratchpad/src/org/apache/cocoon/generation
                        JXFormsGenerator.java JXTemplateGenerator.java
  Log:
  Cleaning up code
  
  Revision  Changes    Path
  1.3       +5 -9      cocoon-2.1/src/scratchpad/src/org/apache/cocoon/generation/JXFormsGenerator.java
  
  Index: JXFormsGenerator.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/src/org/apache/cocoon/generation/JXFormsGenerator.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- JXFormsGenerator.java	27 Apr 2003 08:28:51 -0000	1.2
  +++ JXFormsGenerator.java	27 Apr 2003 14:56:16 -0000	1.3
  @@ -53,23 +53,19 @@
   import java.io.IOException;
   import java.util.HashMap;
   import java.util.Iterator;
  -import java.util.LinkedList;
  -import java.util.List;
   import java.util.Map;
   import java.util.Set;
   import java.util.Stack;
  -import org.apache.cocoon.components.jxforms.xmlform.Form;
  -import org.apache.cocoon.components.jxforms.validation.Violation;
  +
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.transformation.AbstractTransformer;
   import org.apache.cocoon.components.flow.WebContinuation;
  +import org.apache.cocoon.components.jxforms.validation.Violation;
  +import org.apache.cocoon.components.jxforms.xmlform.Form;
   import org.apache.cocoon.components.source.SourceUtil;
   import org.apache.cocoon.environment.Environment;
  -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;
   import org.apache.commons.jxpath.CompiledExpression;
   import org.apache.commons.jxpath.JXPathContext;
  @@ -187,7 +183,7 @@
           throws SAXParseException {
           if (expr == null) return null;
           try {
  -            return context.compile(expr);
  +            return JXPathContext.compile(expr);
           } catch (Exception exc) {
               throw new SAXParseException(exc.getMessage(),
                                           location, exc);
  
  
  
  1.2       +4 -19     cocoon-2.1/src/scratchpad/src/org/apache/cocoon/generation/JXTemplateGenerator.java
  
  Index: JXTemplateGenerator.java
  ===================================================================
  RCS file: /home/cvs/cocoon-2.1/src/scratchpad/src/org/apache/cocoon/generation/JXTemplateGenerator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- JXTemplateGenerator.java	26 Apr 2003 22:00:31 -0000	1.1
  +++ JXTemplateGenerator.java	27 Apr 2003 14:56:16 -0000	1.2
  @@ -55,9 +55,8 @@
   import java.io.IOException;
   import java.io.StringReader;
   import java.lang.reflect.Field;
  -import java.lang.reflect.Method;
   import java.lang.reflect.InvocationTargetException;
  -import java.util.ArrayList;
  +import java.lang.reflect.Method;
   import java.util.HashMap;
   import java.util.Iterator;
   import java.util.LinkedList;
  @@ -67,7 +66,6 @@
   
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.cocoon.ProcessingException;
  -import org.apache.cocoon.transformation.AbstractTransformer;
   import org.apache.cocoon.components.flow.WebContinuation;
   import org.apache.cocoon.components.source.SourceUtil;
   import org.apache.cocoon.environment.Environment;
  @@ -75,6 +73,7 @@
   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;
   import org.apache.cocoon.xml.dom.DOMBuilder;
   import org.apache.cocoon.xml.dom.DOMStreamer;
  @@ -85,24 +84,10 @@
   import org.apache.commons.jexl.util.introspection.VelMethod;
   import org.apache.commons.jexl.util.introspection.VelPropertyGet;
   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.JXPathBeanInfo;
  -import org.apache.commons.jxpath.JXPathContext;
  -import org.apache.commons.jxpath.JXPathContextFactory;
  -import org.apache.commons.jxpath.JXPathIntrospector;
  -import org.apache.commons.jxpath.Pointer;
  -import org.apache.commons.jxpath.Variables;
  +import org.apache.commons.jxpath.*;
   import org.apache.excalibur.source.Source;
   import org.apache.excalibur.source.SourceException;
  -import org.mozilla.javascript.Context;
  -import org.mozilla.javascript.JavaScriptException;
  -import org.mozilla.javascript.NativeArray;
  -import org.mozilla.javascript.ScriptRuntime;
  -import org.mozilla.javascript.Scriptable;
  -import org.mozilla.javascript.ScriptableObject;
  -import org.mozilla.javascript.Undefined;
  -import org.mozilla.javascript.Wrapper;
  +import org.mozilla.javascript.*;
   import org.w3c.dom.Node;
   import org.w3c.dom.NodeList;
   import org.xml.sax.Attributes;
  
  
  

Mime
View raw message