From 6e2dc1255bece0b7bd1b44819faad642e61a43de Mon Sep 17 00:00:00 2001 From: Radim Kubacki Date: Fri, 18 Jun 2010 13:42:53 +0000 Subject: [PATCH] Avoid dependency on Editor Library and this makes the plugin compatible with NB6.5-6.9 (supposedly, I tried NB6.8&6.9 only) git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@7102 51baf565-9d33-0410-a72c-fc3788e3496d --- pmd-netbeans/build.xml | 2 +- pmd-netbeans/manifest.mf | 2 +- pmd-netbeans/nbproject/genfiles.properties | 2 +- pmd-netbeans/nbproject/project.xml | 9 --------- pmd-netbeans/src/pmd/scan/Scanner.java | 9 +++------ 5 files changed, 6 insertions(+), 18 deletions(-) diff --git a/pmd-netbeans/build.xml b/pmd-netbeans/build.xml index 392fadf328..ae078f4786 100644 --- a/pmd-netbeans/build.xml +++ b/pmd-netbeans/build.xml @@ -4,7 +4,7 @@ - + diff --git a/pmd-netbeans/manifest.mf b/pmd-netbeans/manifest.mf index ef989cc950..5edd37b5d2 100644 --- a/pmd-netbeans/manifest.mf +++ b/pmd-netbeans/manifest.mf @@ -1,5 +1,5 @@ Manifest-Version: 1.0 -OpenIDE-Module-Specification-Version: 2.2.5 +OpenIDE-Module-Specification-Version: 2.2.6 Created-By: Ole-Martin Mørk and Gunnlaugur Þór Briem, Radim Kubacki, Tomasz Slota OpenIDE-Module: pmd OpenIDE-Module-Layer: pmd/mf-layer.xml diff --git a/pmd-netbeans/nbproject/genfiles.properties b/pmd-netbeans/nbproject/genfiles.properties index 0e4bc6e61f..9b8f6158dc 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=1c5b0dad +nbproject/build-impl.xml.data.CRC32=c7fb167a nbproject/build-impl.xml.script.CRC32=209b78c0 nbproject/build-impl.xml.stylesheet.CRC32=deb65f65@1.31.1.7 diff --git a/pmd-netbeans/nbproject/project.xml b/pmd-netbeans/nbproject/project.xml index f00d00fded..0cd2f47d73 100644 --- a/pmd-netbeans/nbproject/project.xml +++ b/pmd-netbeans/nbproject/project.xml @@ -60,15 +60,6 @@ 1.9 - - org.netbeans.modules.editor.lib - - - - 1 - 1.27 - - org.netbeans.modules.editor.settings diff --git a/pmd-netbeans/src/pmd/scan/Scanner.java b/pmd-netbeans/src/pmd/scan/Scanner.java index b7318b43de..d3145d5516 100644 --- a/pmd-netbeans/src/pmd/scan/Scanner.java +++ b/pmd-netbeans/src/pmd/scan/Scanner.java @@ -36,7 +36,6 @@ import javax.swing.text.Document; import org.netbeans.api.editor.settings.SimpleValueNames; import org.netbeans.api.java.source.CancellableTask; import org.netbeans.api.java.source.CompilationInfo; -import org.netbeans.editor.BaseDocument; import org.netbeans.modules.editor.NbEditorUtilities; import org.openide.loaders.DataObject; import org.openide.cookies.LineCookie; @@ -95,11 +94,9 @@ public class Scanner implements CancellableTask { } int tabSize = 8; - if (doc instanceof BaseDocument) { - Integer foo = (Integer) doc.getProperty(SimpleValueNames.TAB_SIZE); - if (foo != null) - tabSize = foo.intValue(); - } + Integer foo = (Integer) doc.getProperty(SimpleValueNames.TAB_SIZE); + if (foo != null) + tabSize = foo.intValue(); DataObject dobj = NbEditorUtilities.getDataObject(doc); if (dobj == null) {