merged latest changes from CVS

updated platform name to 'NetBeans 6.0'

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@5650 51baf565-9d33-0410-a72c-fc3788e3496d
This commit is contained in:
Radim Kubacki 2007-11-15 06:06:49 +00:00
parent 04e4541ed4
commit f0e364ff67
7 changed files with 11 additions and 13 deletions

Binary file not shown.

Binary file not shown.

View File

@ -1,7 +1,6 @@
extra.module.files=\
modules/ext/jaxen-1.1-beta-10.jar \
modules/ext/pmd-3.9.jar \
modules/ext/backport-util-concurrent.jar \
modules/ext/jaxen-1.1.jar \
modules/ext/pmd-4.0.jar \
modules/ext/asm-3.0.jar \
modules/ext/nbpmdrules.jar
javac.compilerargs=-Xlint:unchecked

View File

@ -13,16 +13,12 @@
<binary-origin>lib/asm-3.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/backport-util-concurrent.jar</runtime-relative-path>
<binary-origin>lib/backport-util-concurrent.jar</binary-origin>
<runtime-relative-path>ext/jaxen-1.1.jar</runtime-relative-path>
<binary-origin>lib/jaxen-1.1.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/jaxen-1.1-beta-10.jar</runtime-relative-path>
<binary-origin>lib/jaxen-1.1-beta-10.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<runtime-relative-path>ext/pmd-3.9.jar</runtime-relative-path>
<binary-origin>lib/pmd-3.9.jar</binary-origin>
<runtime-relative-path>ext/pmd-4.0.jar</runtime-relative-path>
<binary-origin>lib/pmd-4.0.jar</binary-origin>
</class-path-extension>
<class-path-extension>
<!-- Deployed path, relative to dir containing module: -->
@ -193,7 +189,7 @@
<public-packages/>
<extra-compilation-unit>
<package-root>libsrc</package-root>
<classpath>lib/pmd-3.9.jar</classpath>
<classpath>lib/pmd-4.0.jar</classpath>
<built-to>build/libclasses</built-to>
<built-to>${cluster}/modules/ext/nbpmdrules.jar</built-to>
</extra-compilation-unit>

View File

@ -91,6 +91,9 @@ public class Scanner implements CancellableTask<CompilationInfo> {
LOG.fine(toString() + "started");
cancelled = false;
Document doc = info.getDocument();
if (doc == null) {
return;
}
int tabSize = 8;
if (doc instanceof BaseDocument) {
@ -107,7 +110,7 @@ public class Scanner implements CancellableTask<CompilationInfo> {
return;
}
LineCookie cookie = ( LineCookie )dobj.getCookie( LineCookie.class );
LineCookie cookie = dobj.getCookie(LineCookie.class);
Line.Set lineset = cookie.getLineSet();
List<DataObject> list = Collections.singletonList(dobj);
// TODO try to avoid duplicate work in this method