diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/AbstractApexRule.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/AbstractApexRule.java index cedb30ae7c..b51210428b 100644 --- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/AbstractApexRule.java +++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/AbstractApexRule.java @@ -96,21 +96,16 @@ import net.sourceforge.pmd.lang.apex.ast.ApexParserVisitor; import net.sourceforge.pmd.lang.ast.Node; import net.sourceforge.pmd.lang.rule.AbstractRule; import net.sourceforge.pmd.lang.rule.ImmutableLanguage; -import net.sourceforge.pmd.lang.rule.properties.IntegerProperty; import net.sourceforge.pmd.renderers.CodeClimateRule; public abstract class AbstractApexRule extends AbstractRule implements ApexParserVisitor, ImmutableLanguage, CodeClimateRule { - public static final IntegerProperty CODACY_MINUTES_TO_FIX = new IntegerProperty("codacy_minutes_to_fix", - "Codacy.com Time to fix in minutes", 0, Integer.MAX_VALUE, 5, 1.0f); - public AbstractApexRule() { super.setLanguage(LanguageRegistry.getLanguage(ApexLanguageModule.NAME)); definePropertyDescriptor(CODECLIMATE_CATEGORIES); definePropertyDescriptor(CODECLIMATE_REMEDIATION_MULTIPLIER); definePropertyDescriptor(CODECLIMATE_BLOCK_HIGHLIGHTING); - definePropertyDescriptor(CODACY_MINUTES_TO_FIX); } @Override diff --git a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/ApexXPathRule.java b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/ApexXPathRule.java index 85eec0a3bf..ea86f815fe 100644 --- a/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/ApexXPathRule.java +++ b/pmd-apex/src/main/java/net/sourceforge/pmd/lang/apex/rule/ApexXPathRule.java @@ -18,7 +18,6 @@ public class ApexXPathRule extends XPathRule implements CodeClimateRule { definePropertyDescriptor(CODECLIMATE_CATEGORIES); definePropertyDescriptor(CODECLIMATE_REMEDIATION_MULTIPLIER); definePropertyDescriptor(CODECLIMATE_BLOCK_HIGHLIGHTING); - definePropertyDescriptor(AbstractApexRule.CODACY_MINUTES_TO_FIX); } @Override diff --git a/pmd-apex/src/main/resources/rulesets/apex/ruleset.xml b/pmd-apex/src/main/resources/rulesets/apex/ruleset.xml index c6e4c4ad26..64e3993c6a 100644 --- a/pmd-apex/src/main/resources/rulesets/apex/ruleset.xml +++ b/pmd-apex/src/main/resources/rulesets/apex/ruleset.xml @@ -1,121 +1,93 @@ - Default ruleset used by the Code Climate Engine for Salesforce.com Apex - - 2 + 3 - - - + - - 2 + 3 - - - + - - 2 + 3 - - - + - - 2 + 3 - - - + - - 2 + 3 - - - + - - 2 + 3 - - - + - - 2 + 3 - - - + - - 2 + 3 - - - + - - 2 + 3 - - - + @@ -123,57 +95,42 @@ - - 2 + 3 - - - + - - 2 + 3 - - - + - - - - 2 + 3 - - - + - - 2 + 3 - - - + -<<<<<<< HEAD 3 @@ -193,265 +150,196 @@ -======= - ->>>>>>> Up2Go/master 3 - - - + - 3 - - - + - 3 - - - + - 3 - - - + - - - + 3 - - - + - 3 - - - + - - - 1 + 3 - - - + - - 1 + 3 - - - + - - 1 + 3 - - - + - - 1 + 3 - - - + - - 1 + 3 - - - + - - 1 + 3 - - - + - - 1 + 3 - - - + - - 1 + 3 - - - + - - 1 + 3 - - - + - - 1 + 3 - - - + - - + - 1 + 3 - - - + - - - 2 + 3 - - - + - - 2 + 3 - - - + - - 2 + 3 - - - + - - 2 + 3 - - - + - \ No newline at end of file