You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@struts.apache.org by jm...@apache.org on 2004/01/22 05:54:13 UTC
cvs commit: jakarta-struts/src/share/org/apache/struts/validator/validwhen ValidWhenLexer.java ValidWhenParser.java ValidWhenParserTokenTypes.java
jmitchell 2004/01/21 20:54:13
Modified: src/share/org/apache/struts/action ActionMapping.java
src/examples/org/apache/struts/webapp/validator
EditTypeAction.java
src/share/org/apache/struts/taglib/html ImgTag.java
src/test/org/apache/struts/action TestDynaActionForm.java
src/test/org/apache/struts/config TestModuleConfig.java
src/share/org/apache/struts/validator/validwhen
ValidWhenLexer.java ValidWhenParser.java
ValidWhenParserTokenTypes.java
Log:
- Remove unused imports
- One (very small) formatting change
Revision Changes Path
1.32 +5 -5 jakarta-struts/src/share/org/apache/struts/action/ActionMapping.java
Index: ActionMapping.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/action/ActionMapping.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- ActionMapping.java 19 Jan 2004 22:20:40 -0000 1.31
+++ ActionMapping.java 22 Jan 2004 04:54:13 -0000 1.32
@@ -64,8 +64,8 @@
import java.util.ArrayList;
+
import org.apache.struts.config.ActionConfig;
-import org.apache.struts.config.ExceptionConfig;
import org.apache.struts.config.ForwardConfig;
1.3 +3 -4 jakarta-struts/src/examples/org/apache/struts/webapp/validator/EditTypeAction.java
Index: EditTypeAction.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/examples/org/apache/struts/webapp/validator/EditTypeAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- EditTypeAction.java 10 Jan 2004 21:03:40 -0000 1.2
+++ EditTypeAction.java 22 Jan 2004 04:54:13 -0000 1.3
@@ -62,7 +62,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
import java.util.ArrayList;
import org.apache.commons.logging.Log;
1.37 +4 -5 jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java
Index: ImgTag.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/taglib/html/ImgTag.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- ImgTag.java 19 Jan 2004 04:43:10 -0000 1.36
+++ ImgTag.java 22 Jan 2004 04:54:13 -0000 1.37
@@ -72,7 +72,6 @@
import org.apache.struts.config.ModuleConfig;
import org.apache.struts.taglib.TagUtils;
import org.apache.struts.util.MessageResources;
-import org.apache.struts.util.RequestUtils;
/**
* Generate an IMG tag to the specified image URI.
1.14 +2 -3 jakarta-struts/src/test/org/apache/struts/action/TestDynaActionForm.java
Index: TestDynaActionForm.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/action/TestDynaActionForm.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- TestDynaActionForm.java 13 Jan 2004 12:48:53 -0000 1.13
+++ TestDynaActionForm.java 22 Jan 2004 04:54:13 -0000 1.14
@@ -64,12 +64,11 @@
import junit.framework.TestSuite;
import org.apache.commons.beanutils.DynaProperty;
-import org.apache.struts.config.ModuleConfig;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
import org.apache.struts.config.FormBeanConfig;
import org.apache.struts.config.ModuleConfig;
import org.apache.struts.config.impl.ModuleConfigImpl;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
/**
1.6 +1 -2 jakarta-struts/src/test/org/apache/struts/config/TestModuleConfig.java
Index: TestModuleConfig.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/test/org/apache/struts/config/TestModuleConfig.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- TestModuleConfig.java 13 Jan 2004 12:48:53 -0000 1.5
+++ TestModuleConfig.java 22 Jan 2004 04:54:13 -0000 1.6
@@ -62,7 +62,6 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
-import org.apache.struts.action.ActionMapping;
import org.apache.commons.digester.Digester;
import org.apache.struts.Globals;
1.7 +14 -22 jakarta-struts/src/share/org/apache/struts/validator/validwhen/ValidWhenLexer.java
Index: ValidWhenLexer.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/validator/validwhen/ValidWhenLexer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ValidWhenLexer.java 13 Jan 2004 12:48:53 -0000 1.6
+++ ValidWhenLexer.java 22 Jan 2004 04:54:13 -0000 1.7
@@ -63,33 +63,25 @@
package org.apache.struts.validator.validwhen;
-import java.util.Stack;
-import org.apache.commons.validator.util.ValidatorUtils;
-
-
import java.io.InputStream;
-import antlr.TokenStreamException;
-import antlr.TokenStreamIOException;
-import antlr.TokenStreamRecognitionException;
-import antlr.CharStreamException;
-import antlr.CharStreamIOException;
-import antlr.ANTLRException;
import java.io.Reader;
import java.util.Hashtable;
-import antlr.CharScanner;
-import antlr.InputBuffer;
+
+import antlr.ANTLRHashString;
import antlr.ByteBuffer;
import antlr.CharBuffer;
-import antlr.Token;
-import antlr.CommonToken;
-import antlr.RecognitionException;
+import antlr.CharStreamException;
+import antlr.CharStreamIOException;
+import antlr.InputBuffer;
+import antlr.LexerSharedInputState;
import antlr.NoViableAltForCharException;
-import antlr.MismatchedCharException;
+import antlr.RecognitionException;
+import antlr.Token;
import antlr.TokenStream;
-import antlr.ANTLRHashString;
-import antlr.LexerSharedInputState;
+import antlr.TokenStreamException;
+import antlr.TokenStreamIOException;
+import antlr.TokenStreamRecognitionException;
import antlr.collections.impl.BitSet;
-import antlr.SemanticException;
public class ValidWhenLexer extends antlr.CharScanner implements ValidWhenParserTokenTypes, TokenStream
{
1.8 +17 -21 jakarta-struts/src/share/org/apache/struts/validator/validwhen/ValidWhenParser.java
Index: ValidWhenParser.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/validator/validwhen/ValidWhenParser.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ValidWhenParser.java 13 Jan 2004 12:48:53 -0000 1.7
+++ ValidWhenParser.java 22 Jan 2004 04:54:13 -0000 1.8
@@ -63,30 +63,26 @@
package org.apache.struts.validator.validwhen;
-import java.util.Stack;
-import org.apache.commons.validator.util.ValidatorUtils;
+import java.util.Stack;
+import org.apache.commons.validator.util.ValidatorUtils;
-import antlr.TokenBuffer;
-import antlr.TokenStreamException;
-import antlr.TokenStreamIOException;
-import antlr.ANTLRException;
-import antlr.LLkParser;
-import antlr.Token;
-import antlr.TokenStream;
-import antlr.RecognitionException;
import antlr.NoViableAltException;
-import antlr.MismatchedTokenException;
-import antlr.SemanticException;
import antlr.ParserSharedInputState;
+import antlr.RecognitionException;
+import antlr.Token;
+import antlr.TokenBuffer;
+import antlr.TokenStream;
+import antlr.TokenStreamException;
import antlr.collections.impl.BitSet;
-public class ValidWhenParser extends antlr.LLkParser implements ValidWhenParserTokenTypes
- {
-Stack argStack = new Stack();
-Object form;
-int index;
-String value;
+public class ValidWhenParser extends antlr.LLkParser
+ implements ValidWhenParserTokenTypes {
+
+ Stack argStack = new Stack();
+ Object form;
+ int index;
+ String value;
public void setForm(Object f) { form = f; };
public void setIndex (int i) { index = i; };
1.6 +3 -7 jakarta-struts/src/share/org/apache/struts/validator/validwhen/ValidWhenParserTokenTypes.java
Index: ValidWhenParserTokenTypes.java
===================================================================
RCS file: /home/cvs/jakarta-struts/src/share/org/apache/struts/validator/validwhen/ValidWhenParserTokenTypes.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ValidWhenParserTokenTypes.java 13 Jan 2004 12:48:53 -0000 1.5
+++ ValidWhenParserTokenTypes.java 22 Jan 2004 04:54:13 -0000 1.6
@@ -63,10 +63,6 @@
package org.apache.struts.validator.validwhen;
-import java.util.Stack;
-import org.apache.commons.validator.util.ValidatorUtils;
-
-
public interface ValidWhenParserTokenTypes {
int EOF = 1;
int NULL_TREE_LOOKAHEAD = 3;
---------------------------------------------------------------------
To unsubscribe, e-mail: struts-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: struts-dev-help@jakarta.apache.org