Skip to content
Commits on Source (7)
qdox2 (2.0~M10-1) unstable; urgency=medium
* New upstream version 2.0~M10.
* Declare compliance with Debian Policy 4.3.0.
* Use canonical VCS URI.
* Remove get-orig-source target.
* Update copyright years.
-- Markus Koschany <apo@debian.org> Sun, 20 Jan 2019 00:38:04 +0100
qdox2 (2.0~M9-2) unstable; urgency=medium
* Declare compliance with Debian Policy 4.2.1.
......
......@@ -15,9 +15,9 @@ Build-Depends:
libmaven-javadoc-plugin-java,
libmockito-java,
maven-debian-helper
Standards-Version: 4.2.1
Vcs-Git: https://anonscm.debian.org/git/pkg-java/qdox2.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/qdox2.git
Standards-Version: 4.3.0
Vcs-Git: https://salsa.debian.org/java-team/qdox2.git
Vcs-Browser: https://salsa.debian.org/java-team/qdox2
Homepage: https://github.com/paul-hammant/qdox
Package: libqdox2-java
......
......@@ -5,13 +5,13 @@ Files-Excluded:
bootstrap/yacc*
Files: *
Copyright: 2002-2017, Joe Walnes and QDox Project Team
Copyright: 2002-2019, Joe Walnes and QDox Project Team
License: Apache-2.0
Files: debian/*
Copyright: 2005, Trygve Laugstøl <trygvis@inamo.no>
2009, Ludovic Claude <ludovic.claude@laposte.net>
2015-2018, Markus Koschany <apo@debian.org>
2015-2019, Markus Koschany <apo@debian.org>
License: Apache-2.0
License: Apache-2.0
......
......@@ -11,6 +11,3 @@ override_dh_auto_build:
cp debian/JFlexLexer.java src/main/java/com/thoughtworks/qdox/parser/impl
dh_auto_build
get-orig-source:
-uscan --verbose --download-current-version --force-download
......@@ -10,7 +10,7 @@
<name>QDox</name>
<groupId>com.thoughtworks.qdox</groupId>
<artifactId>qdox</artifactId>
<version>2.0-M9</version>
<version>2.0-M10</version>
<url>https://github.com/paul-hammant/qdox</url>
<description>
......@@ -36,7 +36,7 @@
<connection>scm:git:https://github.com/paul-hammant/qdox.git</connection>
<developerConnection>scm:git:ssh://git@github.com/paul-hammant/qdox.git</developerConnection>
<url>https://github.com/paul-hammant/qdox</url>
<tag>qdox-2.0-M9</tag>
<tag>qdox-2.0-M10</tag>
</scm>
<developers>
......
......@@ -159,7 +159,7 @@ import java.util.*;
private void resetAnnotatedElementLine()
{
annotatedElementLine = 0 - annotatedElementLine;
annotatedElementLine = - Math.abs(annotatedElementLine);
}
public JFlexLexer( java.io.Reader reader, java.io.Writer writer ) {
......@@ -429,7 +429,7 @@ JavadocEnd = "*"+ "/"
}
<NAME> {
{Id} / {WhiteSpace}* "." { return Parser.IDENTIFIER; }
{Id} / {WhiteSpace}* [;{] { resetAnnotatedElementLine(); popState(); return Parser.IDENTIFIER; }
{Id} / {WhiteSpace}* [;{(] { resetAnnotatedElementLine(); popState(); return Parser.IDENTIFIER; }
{Id} { popState(); return Parser.IDENTIFIER; }
}
<YYINITIAL, ANNOTATIONNOARG, ANNOTATIONTYPE, ENUM, MODULE, TYPE> {
......
......@@ -1342,6 +1342,21 @@ public class JavaProjectBuilderTest extends TestCase
assertEquals( 9, clazz.getMethods().get(1).getLineNumber() );
}
public void testConstructorLineNumber() {
String source = "package fix.test;\r\n" +
"public class ClassWithJavadoc\r\n" +
" implements InterfaceWithJavadoc\r\n" +
"{\r\n" +
" public ClassWithJavadoc()\r\n" +
" {\r\n" +
" }"
+ "}";
builder.addSource(new StringReader( source ));
assertEquals( 5, builder.getClassByName( "fix.test.ClassWithJavadoc" ).getConstructors().get( 0 ).getLineNumber() );
}
// for QDOX-209
public void testAnnotationMap() {
String source = "import javax.persistence.JoinColumn;\n" +
......