Fixed bug 633432 and 634463 and updated to pmd 1.01

git-svn-id: https://pmd.svn.sourceforge.net/svnroot/pmd/trunk@1242 51baf565-9d33-0410-a72c-fc3788e3496d

pmd-netbeans/CHANGES.txt

@@ -1,5 +1,10 @@
+Version 0.5
+- Fixed bug 633432 pmd-netbeans can't change settings (netbeans) 
+- Fixed bug 634463 Problem with UnusedPrivateField (netbeans) 
+- Updated pmd to version 1.01
+
 Version 0.4
-Fixed bug in manifest.mf, so now people are able to upgrade the currently installed version
+- Fixed bug in manifest.mf, so now people are able to upgrade the currently installed version
 
 Version 0.3
 - Changed default rulesets
@@ -15,4 +20,4 @@ Version 0.3
 - Made it possible to select several folders or javafiles and run pmd
 
 Version 0.2
-Fixed bug in manifest.mf to make it work on unix plattform.
+- Fixed bug in manifest.mf to make it work on unix plattform.

pmd-netbeans/README.txt

@@ -26,9 +26,4 @@ OPTIONS
 
 Go to Options/IDE Configuration/Server And External Tool Settings/PMD Settings
 to choose which rulesets to use. Go to the PMD documentation to learn more about
-rulesets.
-
-------------------------
-KNOWN BUGS
-------------------------
-633432 - pmd-netbeans can't change settings in Sun ONE Studio 4
+rulesets.

pmd-netbeans/build.xml

@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <project basedir="." default="nbm" name="PMD netbeans module">
 	<target description="Compiles all java files and copies property files to the classes dir" name="compile">
 		<mkdir dir="build/classes"/>
@@ -9,7 +8,7 @@
 				<!-- of openide module. The jar will be at <netbeans_home/lib/openide.jar                 -->
 				<!-- todo: Check out the license file, if the jar can be distributed with this module     -->
 				<pathelement path="lib/openide.jar"/>
-				<pathelement path="lib/pmd-1.0.jar"/>
+				<pathelement path="lib/pmd-1.01.jar"/>
 			</classpath>
 		</javac>
 		<copy todir="build/classes">
@@ -36,7 +35,7 @@
 		<taskdef classname="org.netbeans.nbbuild.MakeNBM" classpath="lib\nbantext.jar" name="makenbm"/>
 		<mkdir dir="build/temp_distribution/netbeans/modules/ext"/>
 		<copy file="build/pmd.jar" tofile="build/temp_distribution/netbeans/modules/pmd.jar"/>
-		<copy file="lib/pmd-1.0.jar" tofile="build/temp_distribution/netbeans/modules/ext/pmd-1.0.jar"/>
+		<copy file="lib/pmd-1.01.jar" tofile="build/temp_distribution/netbeans/modules/ext/pmd-1.01.jar"/>
 		<makenbm file="build/pmd.nbm" homepage="http://pmd.sourceforge.net" module="build/pmd.jar" topdir="build/temp_distribution">
 			<license file="LICENSE.txt"/>
 		</makenbm>
@@ -66,4 +65,7 @@
 	<target description="Clean all build products." name="clean">
 		<delete dir="build"/>
 	</target>
+	<target name="deploy" depends="jars" description="Deploys the jar to netbeans">
+		<copy file="build/pmd.jar" tofile="E:/Documents and Settings/ole martin mørk/netbeans/3.4/modules/pmd.jar"/>
+	</target>
 </project>

pmd-netbeans/src/manifest.mf

@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
-OpenIDE-Module-Specification-Version: 0.40
+OpenIDE-Module-Specification-Version: 0.50
 Created-By: NetBeans
-Class-Path: ext/pmd-1.0.jar
+Class-Path: ext/pmd-1.01.jar
 OpenIDE-Module: pmd
 OpenIDE-Module-Layer: pmd/mf-layer.xml
 

pmd-netbeans/src/pmd/RunPMDAction.java

@@ -43,7 +43,6 @@ import net.sourceforge.pmd.RuleSetFactory;
 import net.sourceforge.pmd.RuleSetNotFoundException;
 import net.sourceforge.pmd.RuleViolation;
 
-import org.openide.ErrorManager;
 import org.openide.TopManager;
 import org.openide.cookies.EditorCookie;
 import org.openide.cookies.SourceCookie;
@@ -66,7 +65,7 @@ import pmd.config.PMDOptionsSettings;
  * @created 17. oktober 2002
  */
 public class RunPMDAction extends CookieAction {
-
+	
 	/** Indicates if any violations has been printed */
 	private boolean printed = false;
 
@@ -210,7 +209,7 @@ public class RunPMDAction extends CookieAction {
 
 		}
 		catch( IOException e ) {
-			ErrorManager.getDefault().notify( e );
+			TopManager.getDefault().getErrorManager().notify( e );
 		}
 
 	}
@@ -230,7 +229,7 @@ public class RunPMDAction extends CookieAction {
 				PMDOptionsSettings.getDefault().getRulesets() );
 		}
 		catch( RuleSetNotFoundException rsnfe ) {
-			ErrorManager.getDefault().notify( rsnfe );
+			TopManager.getDefault().getErrorManager().notify( rsnfe );
 		}
 		return rules;
 	}

pmd-netbeans/src/pmd/config/PMDOptionsSettingsBeanInfo.java

@@ -32,7 +32,7 @@ import java.beans.IntrospectionException;
 import java.beans.PropertyDescriptor;
 import java.beans.SimpleBeanInfo;
 
-import org.openide.ErrorManager;
+import org.openide.TopManager;
 import org.openide.util.NbBundle;
 import org.openide.util.Utilities;
 
@@ -57,7 +57,7 @@ public class PMDOptionsSettingsBeanInfo extends SimpleBeanInfo {
 			return new PropertyDescriptor[]{rulesets};
 		}
 		catch( IntrospectionException ie ) {
-			ErrorManager.getDefault().notify( ie );
+			TopManager.getDefault().getErrorManager().notify( ie );
 			return null;
 		}
 	}

pmd-netbeans/src/pmd/config/option.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <!DOCTYPE settings PUBLIC "-//NetBeans//DTD Session settings 1.0//EN" "http://www.netbeans.org/dtds/sessionsettings-1_0.dtd">
 <settings version="1.0">
-    <module name="PMD" spec="0.1"/>
+    <module name="pmd" spec="0.1"/>
     <instanceof class="org.openide.options.SystemOption"/>
     <instanceof class="pmd.config.PMDOptionsSettings"/>
     <instance class="pmd.config.PMDOptionsSettings"/>