[qdox-scm] [592] trunk/qdox/src/grammar: support method-annotation before javadoc comment

[rfscholte]

Title: [592] trunk/qdox/src/grammar: support method-annotation before javadoc comment

Revision

592

Author

rfscholte

Date

2009-04-21 15:35:35 -0500 (Tue, 21 Apr 2009)

Log Message

support method-annotation before javadoc comment

Modified Paths

• trunk/qdox/src/grammar/parser.y
• trunk/qdox/src/test/com/thoughtworks/qdox/AnnotationsTest.java

Diff

Modified: trunk/qdox/src/grammar/parser.y (591 => 592)

--- trunk/qdox/src/grammar/parser.y	2009-04-20 18:36:41 UTC (rev 591)
+++ trunk/qdox/src/grammar/parser.y	2009-04-21 20:35:35 UTC (rev 592)
@@ -130,6 +130,7 @@
 modifiers:
     modifiers modifier { modifiers.add($2); } |
     modifiers annotation { builder.addAnnotation((Annotation) $2); } |
+    modifiers javadoc |
     ;
 
 
@@ -431,7 +432,7 @@
     constructor |
     static_block |
     class |
-	enum |
+	  enum |
     SEMI;
 
 memberend:

Modified: trunk/qdox/src/test/com/thoughtworks/qdox/AnnotationsTest.java (591 => 592)

--- trunk/qdox/src/test/com/thoughtworks/qdox/AnnotationsTest.java	2009-04-20 18:36:41 UTC (rev 591)
+++ trunk/qdox/src/test/com/thoughtworks/qdox/AnnotationsTest.java	2009-04-21 20:35:35 UTC (rev 592)
@@ -204,4 +204,16 @@
     	builder.addSource(new StringReader(source));
     	assertEquals("MyAnnotation", builder.getClasses()[0].getAnnotations()[0].getType().getValue());
     }
+    
+    public void testMethodAnnotationBeforeComment() throws Exception {
+    	String source = "class Foo {\n" +
+    			"@Override\n" +
+    			"/**\n" +
+    			" * " +
+    			" */" +
+    			" public boolean isPostback() { return true;}\n" +
+    			"}";
+    	builder.addSource(new StringReader(source));
+    	assertEquals("java.lang.Override", builder.getClasses()[0].getMethods()[0].getAnnotations()[0].getType().getValue());
+    }
 }

---

To unsubscribe from this list please visit:

http://xircles.codehaus.org/manage_email