From c8aa181aa34dcaf79a380c4f49a4c829287d4b0c Mon Sep 17 00:00:00 2001
From: Radim Kubacki <kubacki@users.sourceforge.net>
Date: Mon, 21 May 2007 16:25:21 +0000
Subject: [PATCH] #1722116: pmd.scan.Scanner.run fails with Netbeans 6.0 -
 fixed by using soft dependency on JavaKit

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@5108 51baf565-9d33-0410-a72c-fc3788e3496d
---
 pmd-netbeans/CHANGES.txt                   |  2 ++
 pmd-netbeans/nbproject/genfiles.properties |  2 +-
 pmd-netbeans/nbproject/project.xml         | 32 ++++++++--------------
 pmd-netbeans/src/pmd/scan/Scanner.java     |  4 +--
 4 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/pmd-netbeans/CHANGES.txt b/pmd-netbeans/CHANGES.txt
index b87c8b9b79..2baa1a6652 100644
--- a/pmd-netbeans/CHANGES.txt
+++ b/pmd-netbeans/CHANGES.txt
@@ -1,3 +1,5 @@
+- [1722116] pmd.scan.Scanner.run fails with Netbeans 6.0
+
 Version 1.9.1
 - [ 1634131 ] Netbeans Plug-in and source level 1.6
 - Removed dependency on Jakarta-ORO
diff --git a/pmd-netbeans/nbproject/genfiles.properties b/pmd-netbeans/nbproject/genfiles.properties
index 30996993e5..6c1f4af376 100644
--- a/pmd-netbeans/nbproject/genfiles.properties
+++ b/pmd-netbeans/nbproject/genfiles.properties
@@ -1,5 +1,5 @@
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=1d63799f
+nbproject/build-impl.xml.data.CRC32=dba7ea2d
 nbproject/build-impl.xml.script.CRC32=209b78c0
 nbproject/build-impl.xml.stylesheet.CRC32=3f8b4615
diff --git a/pmd-netbeans/nbproject/project.xml b/pmd-netbeans/nbproject/project.xml
index d08ef2e56d..a0938aad18 100644
--- a/pmd-netbeans/nbproject/project.xml
+++ b/pmd-netbeans/nbproject/project.xml
@@ -72,14 +72,6 @@
                         <release-version>1</release-version>
                     </run-dependency>
                 </dependency>
-                <dependency>
-                    <code-name-base>org.netbeans.modules.java.editor</code-name-base>
-                    <build-prerequisite/>
-                    <compile-dependency/>
-                    <run-dependency>
-                        <release-version>1</release-version>
-                    </run-dependency>
-                </dependency>
                 <dependency>
                     <code-name-base>org.netbeans.modules.options.api</code-name-base>
                     <build-prerequisite/>
@@ -176,18 +168,18 @@
                     </run-dependency>
                 </dependency>
             </module-dependencies>
-          <test-dependencies>
-              <test-type>
-                  <name>unit</name>
-                  <test-dependency>
-                      <code-name-base>pmd</code-name-base>
-                      <recursive/>
-                      <compile-dependency/>
-                  </test-dependency>
-                  <test-dependency>
-                      <code-name-base>org.netbeans.modules.masterfs</code-name-base>
-                  </test-dependency>
-              </test-type>
+            <test-dependencies>
+                <test-type>
+                    <name>unit</name>
+                    <test-dependency>
+                        <code-name-base>pmd</code-name-base>
+                        <recursive/>
+                        <compile-dependency/>
+                    </test-dependency>
+                    <test-dependency>
+                        <code-name-base>org.netbeans.modules.masterfs</code-name-base>
+                    </test-dependency>
+                </test-type>
             </test-dependencies>
             <public-packages/>
             <extra-compilation-unit>
diff --git a/pmd-netbeans/src/pmd/scan/Scanner.java b/pmd-netbeans/src/pmd/scan/Scanner.java
index 87613cf2c7..013b04bf7d 100644
--- a/pmd-netbeans/src/pmd/scan/Scanner.java
+++ b/pmd-netbeans/src/pmd/scan/Scanner.java
@@ -36,13 +36,11 @@ import org.netbeans.editor.BaseDocument;
 import org.netbeans.editor.Settings;
 import org.netbeans.editor.SettingsNames;
 import org.netbeans.modules.editor.NbEditorUtilities;
-import org.netbeans.modules.editor.java.JavaKit;
 import org.openide.ErrorManager;
 import org.openide.loaders.DataObject;
 import org.openide.cookies.LineCookie;
 import org.openide.text.Annotatable;
 import org.openide.text.Line;
-import org.openide.text.Line.Part;
 import org.openide.util.RequestProcessor;
 import pmd.Fault;
 import pmd.RunPMDAction;
@@ -100,7 +98,7 @@ public class Scanner implements Runnable, DocumentListener {
                 LOG.fine(toString() + "started");
                     
                 int tabSize = 8;
-                Integer foo = (Integer) Settings.getValue(JavaKit.class, SettingsNames.TAB_SIZE);
+                Integer foo = (Integer) Settings.getValue(doc.getKitClass(), SettingsNames.TAB_SIZE);
                 if (foo != null)
                     tabSize = foo.intValue();