[JWebUnit-development] SF.net SVN: jwebunit:[848] trunk

[<he...@us...>]

Revision: 848
          http://jwebunit.svn.sourceforge.net/jwebunit/?rev=848&view=rev
Author:   henryju
Date:     2010-10-05 11:48:08 +0000 (Tue, 05 Oct 2010)

Log Message:
-----------
Updated Maven plugins.

Modified Paths:
--------------
    trunk/jwebunit-webtestcase-generator/src/main/javacc/Token.java
    trunk/pom.xml

Modified: trunk/jwebunit-webtestcase-generator/src/main/javacc/Token.java
===================================================================
--- trunk/jwebunit-webtestcase-generator/src/main/javacc/Token.java	2010-10-05 11:30:35 UTC (rev 847)
+++ trunk/jwebunit-webtestcase-generator/src/main/javacc/Token.java	2010-10-05 11:48:08 UTC (rev 848)
@@ -17,27 +17,38 @@
  * along with JWebUnit.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-/* Generated By:JavaCC: Do not edit this line. Token.java Version 3.0 */
+/* Generated By:JavaCC: Do not edit this line. Token.java Version 5.0 */
+/* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
 package net.sourceforge.jwebunit.javacc;
+
 /**
  * Describes the input token stream.
  */
 
-public class Token {
+public class Token implements java.io.Serializable {
 
   /**
+   * The version identifier for this Serializable class.
+   * Increment only if the <i>serialized</i> form of the
+   * class changes.
+   */
+  private static final long serialVersionUID = 1L;
+
+  /**
    * An integer that describes the kind of this token.  This numbering
    * system is determined by JavaCCParser, and a table of these numbers is
    * stored in the file ...Constants.java.
    */
   public int kind;
 
-  /**
-   * beginLine and beginColumn describe the position of the first character
-   * of this token; endLine and endColumn describe the position of the
-   * last character of this token.
-   */
-  public int beginLine, beginColumn, endLine, endColumn;
+  /** The line number of the first character of this Token. */
+  public int beginLine;
+  /** The column number of the first character of this Token. */
+  public int beginColumn;
+  /** The line number of the last character of this Token. */
+  public int endLine;
+  /** The column number of the last character of this Token. */
+  public int endColumn;
 
   /**
    * The string image of the token.
@@ -69,11 +80,45 @@
   public Token specialToken;
 
   /**
+   * An optional attribute value of the Token.
+   * Tokens which are not used as syntactic sugar will often contain
+   * meaningful values that will be used later on by the compiler or
+   * interpreter. This attribute value is often different from the image.
+   * Any subclass of Token that actually wants to return a non-null value can
+   * override this method as appropriate.
+   */
+  public Object getValue() {
+    return null;
+  }
+
+  /**
+   * No-argument constructor
+   */
+  public Token() {}
+
+  /**
+   * Constructs a new token for the specified Image.
+   */
+  public Token(int kind)
+  {
+    this(kind, null);
+  }
+
+  /**
+   * Constructs a new token for the specified Image and Kind.
+   */
+  public Token(int kind, String image)
+  {
+    this.kind = kind;
+    this.image = image;
+  }
+
+  /**
    * Returns the image.
    */
   public String toString()
   {
-     return image;
+    return image;
   }
 
   /**
@@ -81,27 +126,37 @@
    * can create and return subclass objects based on the value of ofKind.
    * Simply add the cases to the switch for all those special cases.
    * For example, if you have a subclass of Token called IDToken that
-   * you want to create if ofKind is ID, simlpy add something like :
+   * you want to create if ofKind is ID, simply add something like :
    *
-   *    case MyParserConstants.ID : return new IDToken();
+   *    case MyParserConstants.ID : return new IDToken(ofKind, image);
    *
    * to the following switch statement. Then you can cast matchedToken
-   * variable to the appropriate type and use it in your lexical actions.
+   * variable to the appropriate type and use sit in your lexical actions.
    */
-  public static final Token newToken(int ofKind)
+  public static Token newToken(int ofKind, String image)
   {
-     switch(ofKind)
-     {
-       default : return new Token();
-       case WebTestCaseGeneratorConstants.RUNSIGNEDSHIFT:
-       case WebTestCaseGeneratorConstants.RSIGNEDSHIFT:
-       case WebTestCaseGeneratorConstants.GT:
-          return new GTToken();
-     }
+    switch(ofKind)
+    {
+      case WebTestCaseGeneratorConstants.RUNSIGNEDSHIFT:
+      case WebTestCaseGeneratorConstants.RSIGNEDSHIFT:
+      case WebTestCaseGeneratorConstants.GT:
+         return new GTToken(ofKind, image);
+      default : return new Token(ofKind, image);
+    }
   }
 
+  public static Token newToken(int ofKind)
+  {
+    return newToken(ofKind, null);
+  }
+
   public static class GTToken extends Token
   {
      int realKind = WebTestCaseGeneratorConstants.GT;
+
+     public GTToken(int ofKind, String image) {
+         super(ofKind, image);
+     }
   }
 }
+/* JavaCC - OriginalChecksum=609da7eefb5a4f2a594508df0fe19464 (do not edit this line) */

Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml	2010-10-05 11:30:35 UTC (rev 847)
+++ trunk/pom.xml	2010-10-05 11:48:08 UTC (rev 848)
@@ -200,7 +200,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-assembly-plugin</artifactId>
-				<version>2.2-beta-2</version>
+				<version>2.2-beta-5</version>
 				<configuration>
 					<attach>false</attach>
 					<descriptors>
@@ -223,7 +223,7 @@
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-compiler-plugin</artifactId>
-				<version>2.1</version>
+				<version>2.3.2</version>
 				<configuration>
 					<source>1.5</source>
 					<target>1.5</target>
@@ -253,7 +253,7 @@
             <plugin>
                 <groupId>com.mycila.maven-license-plugin</groupId>
                 <artifactId>maven-license-plugin</artifactId>
-                <version>1.6.0</version>
+                <version>1.6.1</version>
                 <configuration>
                     <header>${topDirectoryLocation}/src/license/header.txt</header>
                     <aggregate>false</aggregate>
@@ -286,13 +286,13 @@
 					<inherited>true</inherited>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>javacc-maven-plugin</artifactId>
-					<version>2.4</version>
+					<version>2.6</version>
 				</plugin>
 				<plugin>
 					<inherited>true</inherited>
 					<groupId>org.codehaus.mojo</groupId>
 					<artifactId>exec-maven-plugin</artifactId>
-					<version>1.1-beta-1</version>
+					<version>1.2</version>
 				</plugin>
 				<plugin>
 					<inherited>true</inherited>
@@ -386,7 +386,7 @@
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-gpg-plugin</artifactId>
-                        <version>1.0</version>
+                        <version>1.1</version>
                         <executions>
                             <execution>
                                 <id>sign-artifacts</id>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.