diff --git a/pmd-netbeans/build.xml b/pmd-netbeans/build.xml
index a0ae8bedff..b062070784 100644
--- a/pmd-netbeans/build.xml
+++ b/pmd-netbeans/build.xml
@@ -6,7 +6,7 @@
-
+
@@ -29,7 +29,9 @@
-
+
+
+
@@ -48,6 +50,8 @@
+
+
diff --git a/pmd-netbeans/lib/jaxen-core-1.0-fcs.jar b/pmd-netbeans/lib/jaxen-core-1.0-fcs.jar
new file mode 100644
index 0000000000..e52bf679cc
Binary files /dev/null and b/pmd-netbeans/lib/jaxen-core-1.0-fcs.jar differ
diff --git a/pmd-netbeans/lib/pmd-1.03.jar b/pmd-netbeans/lib/pmd-1.03.jar
deleted file mode 100644
index 5dff8a1dbe..0000000000
Binary files a/pmd-netbeans/lib/pmd-1.03.jar and /dev/null differ
diff --git a/pmd-netbeans/lib/pmd-1.04.jar b/pmd-netbeans/lib/pmd-1.04.jar
new file mode 100644
index 0000000000..2fd5d38339
Binary files /dev/null and b/pmd-netbeans/lib/pmd-1.04.jar differ
diff --git a/pmd-netbeans/lib/saxpath-1.0-fcs.jar b/pmd-netbeans/lib/saxpath-1.0-fcs.jar
new file mode 100644
index 0000000000..2b43955bab
Binary files /dev/null and b/pmd-netbeans/lib/saxpath-1.0-fcs.jar differ
diff --git a/pmd-netbeans/src/manifest.mf b/pmd-netbeans/src/manifest.mf
index 1d010c0f0c..19f8226004 100644
--- a/pmd-netbeans/src/manifest.mf
+++ b/pmd-netbeans/src/manifest.mf
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
-OpenIDE-Module-Specification-Version: 0.70.2
+OpenIDE-Module-Specification-Version: 0.71
Created-By: Ole-Martin Mørk
-Class-Path: ext/pmd-1.03.jar
+Class-Path: ext/pmd-1.04.jar ext/jaxen-core-1.0-fcs.jar ext/saxpath-1.0-fcs.jar
OpenIDE-Module: pmd
OpenIDE-Module-Layer: pmd/mf-layer.xml
OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.23
diff --git a/pmd-netbeans/src/pmd/RunPMDAction.java b/pmd-netbeans/src/pmd/RunPMDAction.java
index 0161353850..3cdf6c7a0e 100644
--- a/pmd-netbeans/src/pmd/RunPMDAction.java
+++ b/pmd-netbeans/src/pmd/RunPMDAction.java
@@ -83,7 +83,7 @@ public class RunPMDAction extends CookieAction {
* @return the name of the icon
*/
protected String iconResource() {
- return "/pmd/resources/PMDOptionsSettingsIcon.gif";
+ return "pmd/resources/PMDOptionsSettingsIcon.gif";
}
@@ -137,18 +137,14 @@ public class RunPMDAction extends CookieAction {
TopManager.getDefault().setStatusText(
"PMD checking for rule violations, " + ( i + 1 ) + "/" + ( dataobjects.size() ) );
DataObject dataobject = ( DataObject )dataobjects.get( i );
- SourceCookie cookie = ( SourceCookie )dataobject.getCookie( SourceCookie.class );
-
+ String name = dataobject.getPrimaryFile().getPackageName( '.' );
+
//The file is not a java file
- if( cookie == null || dataobject.getCookie( LineCookie.class ) == null ) {
+ if( !dataobject.getPrimaryFile().hasExt( "java" ) || dataobject.getCookie( LineCookie.class ) == null ) {
continue;
}
-
Reader reader = getSourceReader( dataobject );
- if(cookie.getSource().getClasses().length == 0){
- continue;
- }
- String name = cookie.getSource().getClasses()[0].getName().getFullName();
+
RuleContext ctx = new RuleContext();
Report report = new Report();
ctx.setReport( report );
@@ -190,7 +186,6 @@ public class RunPMDAction extends CookieAction {
listener.detach();
FaultRegistry.getInstance().clearRegistry();
try {
-
TopManager.getDefault().setStatusText( "PMD checking for rule violations" );
List list = getDataObjects( node );
List violations = checkCookies( list );
diff --git a/pmd-netbeans/src/pmd/config/ui/RuleSetChooser.java b/pmd-netbeans/src/pmd/config/ui/RuleSetChooser.java
index e6aa8259d3..35bedbf1e7 100644
--- a/pmd-netbeans/src/pmd/config/ui/RuleSetChooser.java
+++ b/pmd-netbeans/src/pmd/config/ui/RuleSetChooser.java
@@ -215,8 +215,10 @@ public class RuleSetChooser extends JPanel {
private void removejarActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_removejarActionPerformed
int index = jarList.getSelectedIndex();
- getJarListModel().removeElementAt( index );
- editor.firePropertyChange();
+ if( index >= 0 ) {
+ getJarListModel().removeElementAt( index );
+ editor.firePropertyChange();
+ }
}//GEN-LAST:event_removejarActionPerformed
private void addjarActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addjarActionPerformed
@@ -237,8 +239,10 @@ public class RuleSetChooser extends JPanel {
private void removeRuleSetActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_removeRuleSetActionPerformed
int index = rulesetList.getSelectedIndex();
- getRuleSetListModel().removeElementAt( index );
- editor.firePropertyChange();
+ if( index >= 0 ) {
+ getRuleSetListModel().removeElementAt( index );
+ editor.firePropertyChange();
+ }
}//GEN-LAST:event_removeRuleSetActionPerformed
private void addRuleSetActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_addRuleSetActionPerformed