- Revision
- 697
- Author
- rfscholte
- Date
- 2010-01-08 11:20:21 -0600 (Fri, 08 Jan 2010)
Log Message
Fix for QDOX-190: multiple javadocs for enum's field
Modified Paths
Diff
Modified: trunk/qdox/src/grammar/parser.y (696 => 697)
--- trunk/qdox/src/grammar/parser.y 2010-01-08 16:36:24 UTC (rev 696) +++ trunk/qdox/src/grammar/parser.y 2010-01-08 17:20:21 UTC (rev 697) @@ -68,6 +68,10 @@ // ----- JAVADOC +javadoclist: + javadoc | + javadoclist javadoc; + javadoc: JAVADOCSTART javadocdescription javadoctags JAVADOCEND; javadocdescription: @@ -377,7 +381,7 @@ enum_values: | enum_value | enum_value COMMA enum_values; enum_value: - javadoc opt_annotations enum_constructor | + javadoclist opt_annotations enum_constructor | opt_annotations enum_constructor; enum_constructor:
Modified: trunk/qdox/src/test/com/thoughtworks/qdox/JavaDocBuilderTest.java (696 => 697)
--- trunk/qdox/src/test/com/thoughtworks/qdox/JavaDocBuilderTest.java 2010-01-08 16:36:24 UTC (rev 696) +++ trunk/qdox/src/test/com/thoughtworks/qdox/JavaDocBuilderTest.java 2010-01-08 17:20:21 UTC (rev 697) @@ -1175,7 +1175,7 @@ assertEquals("deprecated", javaClass.getTags()[1].getName()); } - //fix for QDOX-198 + // for QDOX-189 public void testFinalAnnotationParam() { JavaDocBuilder builder = new JavaDocBuilder(); String source = "public final class WSEndpointReference {\n" + @@ -1185,6 +1185,19 @@ builder.addSource(new StringReader(source)); } + // for QDOX-190 + public void testTwoCommentsBeforeEnumValue() { + JavaDocBuilder builder = new JavaDocBuilder(); + String source = + "public enum Source {\n" + + " /** comment 1 */ \n" + + " /** comment 2 */\n" + + " JDK1_2(\"1.2\");\n" + + "}\n"; + JavaSource src = "" StringReader(source)); + assertEquals( "comment 2", src.getClasses()[0].getFieldByName( "JDK1_2" ).getComment() ); + } + public void _testSharedPackageJavaClasses() { String source1 = "@javax.xml.bind.annotation.XmlSchema(namespace = \"http://docs.oasis-open.org/wsn/br-2\")\n" + "package com.foo;\n" +
To unsubscribe from this list please visit:
