Revision: 759
http://jwebunit.svn.sourceforge.net/jwebunit/?rev=759&view=rev
Author: henryju
Date: 2008-10-29 09:30:17 +0000 (Wed, 29 Oct 2008)
Log Message:
-----------
[2205858] WebTestCase generator should now handle generics. Minor deprecated
param fix in javacc plugin.
Modified Paths:
--------------
trunk/jwebunit-webtestcase-generator/pom.xml
trunk/jwebunit-webtestcase-generator/src/main/javacc/Java1.5.jj
Modified: trunk/jwebunit-webtestcase-generator/pom.xml
===================================================================
--- trunk/jwebunit-webtestcase-generator/pom.xml 2008-10-29 04:17:14 UTC
(rev 758)
+++ trunk/jwebunit-webtestcase-generator/pom.xml 2008-10-29 09:30:17 UTC
(rev 759)
@@ -23,12 +23,11 @@
<goal>javacc</goal>
</goals>
<configuration>
-
<packageName>net.sourceforge.jwebunit.javacc</packageName>
-
<outputDirectory>target/generated-sources/javacc</outputDirectory>
+
<outputDirectory>target/generated-sources/javacc</outputDirectory>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: trunk/jwebunit-webtestcase-generator/src/main/javacc/Java1.5.jj
===================================================================
--- trunk/jwebunit-webtestcase-generator/src/main/javacc/Java1.5.jj
2008-10-29 04:17:14 UTC (rev 758)
+++ trunk/jwebunit-webtestcase-generator/src/main/javacc/Java1.5.jj
2008-10-29 09:30:17 UTC (rev 759)
@@ -904,34 +904,41 @@
}
String ClassOrInterfaceType():
-{String result;
+{String result="";
+ String result2="";
Token t;}
{
- t=<IDENTIFIER> {result=t.image;} [ LOOKAHEAD(2) TypeArguments() ]
+ t=<IDENTIFIER> {result=t.image;} [ LOOKAHEAD(2) result2=TypeArguments() ]
( LOOKAHEAD(2) "." <IDENTIFIER> [ LOOKAHEAD(2) TypeArguments() ] )*
- {return result;}
+ {return result+result2;}
}
-void TypeArguments():
-{}
+String TypeArguments():
+{String resultTmp;
+ StringBuffer sb = new StringBuffer();}
{
- "<" TypeArgument() ( "," TypeArgument() )* ">"
+ "<" {sb.append("<");} resultTmp=TypeArgument() {sb.append(resultTmp);} (
"," {sb.append(",");} resultTmp=TypeArgument() {sb.append(resultTmp);} )* ">"
{sb.append(">");}
+ {return sb.toString();}
}
-void TypeArgument():
-{}
+String TypeArgument():
+{String resultTmp = "";
+ StringBuffer sb = new StringBuffer();}
{
- ReferenceType()
+ (resultTmp=ReferenceType() {sb.append(resultTmp);}
|
- "?" [ WildcardBounds() ]
+ "?" {sb.append("?");} [ resultTmp=WildcardBounds() {sb.append(resultTmp);}
])
+ {return sb.toString();}
}
-void WildcardBounds():
-{}
+String WildcardBounds():
+{String resultTmp = "";
+ StringBuffer sb = new StringBuffer();}
{
- "extends" ReferenceType()
+ "extends" {sb.append("extends");} resultTmp=ReferenceType()
{sb.append(resultTmp);}
|
- "super" ReferenceType()
+ "super" {sb.append("super");} resultTmp=ReferenceType()
{sb.append(resultTmp);}
+ {return sb.toString();}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
JWebUnit-development mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/jwebunit-development
