diff --git a/pmd-netbeans/CHANGES.txt b/pmd-netbeans/CHANGES.txt index 36e26d3479..861daab962 100644 --- a/pmd-netbeans/CHANGES.txt +++ b/pmd-netbeans/CHANGES.txt @@ -1,3 +1,6 @@ +Version 0.91 +- Updated pmd to version 1.3 (required code change because PMD API changed) + Version 0.9 - Updated pmd to version 1.2.1 - The NBM module can now be built signed with someone's key (task 76460) diff --git a/pmd-netbeans/build.xml b/pmd-netbeans/build.xml index e164e4ec4e..eb595f118e 100644 --- a/pmd-netbeans/build.xml +++ b/pmd-netbeans/build.xml @@ -1,6 +1,6 @@ - + diff --git a/pmd-netbeans/lib/pmd-1.2.1.jar b/pmd-netbeans/lib/pmd-1.2.1.jar deleted file mode 100644 index a87b32ad7d..0000000000 Binary files a/pmd-netbeans/lib/pmd-1.2.1.jar and /dev/null differ diff --git a/pmd-netbeans/lib/pmd-1.3.jar b/pmd-netbeans/lib/pmd-1.3.jar new file mode 100644 index 0000000000..5c3c064486 Binary files /dev/null and b/pmd-netbeans/lib/pmd-1.3.jar differ diff --git a/pmd-netbeans/src/manifest.mf b/pmd-netbeans/src/manifest.mf index 4306fd41c9..d300080692 100644 --- a/pmd-netbeans/src/manifest.mf +++ b/pmd-netbeans/src/manifest.mf @@ -1,5 +1,5 @@ Manifest-Version: 1.0 -OpenIDE-Module-Specification-Version: 0.90 +OpenIDE-Module-Specification-Version: 0.91 Created-By: Ole-Martin Mørk and Gunnlaugur Þór Briem Class-Path: ext/@pmd.jar@ ext/jaxen-core-1.0-fcs.jar ext/saxpath-1.0-fcs.jar ext/jakarta-oro-2.0.jar OpenIDE-Module: pmd diff --git a/pmd-netbeans/src/pmd/config/ui/PropertiesModel.java b/pmd-netbeans/src/pmd/config/ui/PropertiesModel.java index 59fa4dd556..bf848a02b8 100644 --- a/pmd-netbeans/src/pmd/config/ui/PropertiesModel.java +++ b/pmd-netbeans/src/pmd/config/ui/PropertiesModel.java @@ -29,10 +29,10 @@ package pmd.config.ui; import java.util.Collections; import java.util.Enumeration; import java.util.Map; +import java.util.Properties; import javax.swing.table.AbstractTableModel; import net.sourceforge.pmd.Rule; -import net.sourceforge.pmd.RuleProperties; import pmd.config.PMDOptionsSettings; /** The datamodel for the properties table @@ -53,7 +53,7 @@ public class PropertiesModel extends AbstractTableModel { values = new String[0][0]; return; } - RuleProperties properties = rule.getProperties(); + Properties properties = rule.getProperties(); Map propertyOverrides = (Map)PMDOptionsSettings.getDefault().getRuleProperties().get(rule.getName()); if(propertyOverrides == null) { propertyOverrides = Collections.EMPTY_MAP; diff --git a/pmd-netbeans/src/pmd/config/ui/RuleEnabler.java b/pmd-netbeans/src/pmd/config/ui/RuleEnabler.java index 2fe36e4ff8..55e1b4f2f9 100644 --- a/pmd-netbeans/src/pmd/config/ui/RuleEnabler.java +++ b/pmd-netbeans/src/pmd/config/ui/RuleEnabler.java @@ -39,7 +39,7 @@ import org.apache.oro.text.perl.Perl5Util; import pmd.config.PMDOptionsSettings; /** - * The UI for editing the Rule and RuleProperties properties. + * The UI for editing the Rule and Properties properties. * * @author ole martin mørk * @author Gunnlaugur Þór Briem