diff --git a/pmd-jbuilder/PMDOpenTool.jpx.local b/pmd-jbuilder/PMDOpenTool.jpx.local index 6560ed4c2b..b007658137 100644 --- a/pmd-jbuilder/PMDOpenTool.jpx.local +++ b/pmd-jbuilder/PMDOpenTool.jpx.local @@ -25,10 +25,10 @@ debug.NoTracingClasses.6[0]=30 com.borland.jbuilder.runtime.*1 1 -1 debug.NoTracingClasses.7[0]=17 com.borland.sql.*1 1 -1 debug.NoTracingClasses.8[0]=9 com.sun.*1 1 -1 debug.NoTracingClasses.9[0]=6 java.*1 1 -1 -history.files.active[0]=src/net/sourceforge/pmd/jbuilder/PMDOpenTool.java -history.files.open.1[0]=src/net/sourceforge/pmd/jbuilder/PMDOpenTool.java,F;0,2518 -history.files.open.2[0]=src/net/sourceforge/pmd/jbuilder/RuleSetPropertyGroup.java,F;28,1143 -history.files.open.3[0]=src/net/sourceforge/pmd/jbuilder/RuleSetPropertyPage.java,F;56,2908 +history.files.active[0]=src/net/sourceforge/pmd/jbuilder/RuleSetPropertyPage.java +history.files.open.1[0]=src/net/sourceforge/pmd/jbuilder/PMDOpenTool.java,F;115,4478 +history.files.open.2[0]=src/net/sourceforge/pmd/jbuilder/RuleSetPropertyGroup.java,F;34,2485 +history.files.open.3[0]=src/net/sourceforge/pmd/jbuilder/RuleSetPropertyPage.java,F;63,3085 import.optimize.packageprefixgroupings.1[0]=java import.optimize.packageprefixgroupings.2[0]= import.optimize.packageprefixgroupings.3[0]=javax diff --git a/pmd-jbuilder/copyfile.bat b/pmd-jbuilder/copyfile.bat index 7cfb754f3f..8f95e022b7 100755 --- a/pmd-jbuilder/copyfile.bat +++ b/pmd-jbuilder/copyfile.bat @@ -1,2 +1,2 @@ copy lib\PMDOpenTool.jar %1 -copy lib\pmd-0.4.jar %1 \ No newline at end of file +copy lib\pmd-0.5.jar %1 \ No newline at end of file diff --git a/pmd-jbuilder/lib/PMDOpenTool.jar b/pmd-jbuilder/lib/PMDOpenTool.jar index 4d785e5da0..f8f4ecd23e 100644 Binary files a/pmd-jbuilder/lib/PMDOpenTool.jar and b/pmd-jbuilder/lib/PMDOpenTool.jar differ diff --git a/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/RuleSetPropertyGroup.java b/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/RuleSetPropertyGroup.java index eaba157ee1..bf3914feeb 100644 --- a/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/RuleSetPropertyGroup.java +++ b/pmd-jbuilder/src/net/sourceforge/pmd/jbuilder/RuleSetPropertyGroup.java @@ -16,6 +16,10 @@ import com.borland.primetime.properties.PropertyGroup; import com.borland.primetime.properties.PropertyPageFactory; import com.borland.primetime.properties.GlobalProperty; import com.borland.primetime.properties.PropertyPage; +import net.sourceforge.pmd.RuleSetFactory; +import net.sourceforge.pmd.RuleSet; +import java.util.Iterator; + /** @@ -34,20 +38,23 @@ public class RuleSetPropertyGroup public static final String RULESET_UNUSEDCODE = "unusedcode"; public static final String RULESET_COUGAAR = "cougaar"; public static final String RULESET_NAMING = "naming"; + public static final String RULESET_IMPORTS = "imports"; public static final Object RULESETS_TOPIC = new Object(); public static final GlobalProperty PROPKEY_RULESET_DESIGN = new GlobalProperty(RULESETS, RULESET_DESIGN, "true"); public static final GlobalProperty PROPKEY_RULESET_BASIC = new GlobalProperty(RULESETS, RULESET_BASIC, "true"); public static final GlobalProperty PROPKEY_RULESET_UNUSEDCODE = new GlobalProperty(RULESETS, RULESET_UNUSEDCODE, "true"); public static final GlobalProperty PROPKEY_RULESET_COUGAAR = new GlobalProperty(RULESETS, RULESET_COUGAAR, "true"); public static final GlobalProperty PROPKEY_RULESET_NAMING = new GlobalProperty(RULESETS, RULESET_NAMING, "true"); + public static final GlobalProperty PROPKEY_RULESET_IMPORTS = new GlobalProperty(RULESETS, RULESET_IMPORTS, "true"); //make sure that these two arrays are synchronized public static final String[] RULESET_NAMES = { - RULESET_BASIC, RULESET_DESIGN, RULESET_UNUSEDCODE, RULESET_COUGAAR, RULESET_NAMING + RULESET_BASIC, RULESET_DESIGN, RULESET_UNUSEDCODE, RULESET_COUGAAR, RULESET_NAMING, RULESET_IMPORTS }; public static final GlobalProperty[] PROPKEYS = { - PROPKEY_RULESET_BASIC, PROPKEY_RULESET_DESIGN, PROPKEY_RULESET_UNUSEDCODE, PROPKEY_RULESET_COUGAAR, PROPKEY_RULESET_NAMING + PROPKEY_RULESET_BASIC, PROPKEY_RULESET_DESIGN, PROPKEY_RULESET_UNUSEDCODE, PROPKEY_RULESET_COUGAAR, PROPKEY_RULESET_NAMING, PROPKEY_RULESET_IMPORTS }; + /** * END - RULE DEFINITION SECTION */ @@ -56,7 +63,7 @@ public class RuleSetPropertyGroup * Standard Constructor */ public RuleSetPropertyGroup () { - } + } /** * Called by JBuilder