Fix rule message

Author: amitdev

PMD-Intellij.iml

@@ -1,19 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="PLUGIN_MODULE" version="4">
-  <component name="CheckStyle-IDEA-Module">
-    <option name="configuration">
-      <map />
-    </option>
-  </component>
   <component name="DevKit.ModuleBuildProperties" url="file://$MODULE_DIR$/resources/META-INF/plugin.xml" />
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="pmd-6.27" level="project" />
+    <orderEntry type="library" name="pmd-java-6.32.0" level="project" />
   </component>
 </module>

src/com/intellij/plugins/bodhi/pmd/PMDInvoker.java

@@ -172,7 +172,7 @@ public void run() {
                     progress.setText("Running : " + rules[i] + " on " + files.size() + " file(s)");
 
                     //Create a result collector to get results
-                    PMDResultCollector collector = new PMDResultCollector(isCustomRuleSet);
+                    PMDResultCollector collector = new PMDResultCollector();
 
                     //Get the tree nodes from result collector
                     List<DefaultMutableTreeNode> results = collector.getResults(files, rules[i], projectComponent);

src/com/intellij/plugins/bodhi/pmd/core/PMDResultCollector.java

@@ -47,17 +47,12 @@ public class PMDResultCollector {
     private Map<String, DefaultMutableTreeNode> map;
     public static Report report;
 
-    //Whether we are using custom ruleset or not
-    private boolean isCustomRuleSet;
-
     /**
      * Creates an instance of PMDResultCollector.
      *
-     * @param isCustomRuleSet Whether a custom rule has to be run
      */
-    public PMDResultCollector(boolean isCustomRuleSet) {
+    public PMDResultCollector() {
         map = new HashMap<>();
-        this.isCustomRuleSet = isCustomRuleSet;
     }
 
     /**
@@ -152,9 +147,7 @@ public static String isValidRuleSet(String path) {
             if (rs.getRules().size() != 0) {
                 return "";
             }
-        } catch (RuleSetNotFoundException e) {
-            return e.getMessage();
-        } catch (RuntimeException e) {
+        } catch (RuleSetNotFoundException | RuntimeException e) {
             return e.getMessage();
         }
         return "Invalid File";
@@ -201,10 +194,10 @@ public void renderFileViolations(Iterator<RuleViolation> violations) throws IOEx
             if (PMDResultCollector.report == null) {
                 PMDResultCollector.report = new Report();
             }
-            for (; violations.hasNext();) {
+            while (violations.hasNext()) {
                 RuleViolation iRuleViolation = violations.next();
                 PMDResultCollector.report.addRuleViolation(iRuleViolation);
-                String message = iRuleViolation.getRule().getName() + ": " + iRuleViolation.getRule().getMessage();
+                String message = iRuleViolation.getRule().getName();
                 DefaultMutableTreeNode node = map.get(message);
                 if (node == null) {
                     node = nodeFactory.createNode(shortMessage(message));

src/com/intellij/plugins/bodhi/pmd/handlers/PMDCheckinHandler.java

@@ -116,7 +116,7 @@ public ReturnResult beforeCheckin(@Nullable CommitExecutor executor,
 
     private DefaultMutableTreeNode scanFiles(String ruleSet, PMDProjectComponent plugin) {
         DefaultMutableTreeNode result = null;
-        PMDResultCollector collector = new PMDResultCollector(true);
+        PMDResultCollector collector = new PMDResultCollector();
         List<File> files = new ArrayList<>(checkinProjectPanel.getFiles());
 
         List<DefaultMutableTreeNode> ruleSetResults = collector.getResults(files, ruleSet, plugin);