Fix checkstyle / formatting

Author: adangel

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/BaseVisitor.java

@@ -47,7 +47,6 @@
 import org.eclipse.ui.IWorkingSet;
 import org.eclipse.ui.ResourceWorkingSetFilter;
 
-import name.herlin.command.Timer;
 import net.sourceforge.pmd.PMD;
 import net.sourceforge.pmd.PMDConfiguration;
 import net.sourceforge.pmd.PMDException;
@@ -79,6 +78,8 @@
 import net.sourceforge.pmd.util.datasource.DataSource;
 import net.sourceforge.pmd.util.datasource.ReaderDataSource;
 
+import name.herlin.command.Timer;
+
 /**
  * Factor some useful features for visitors
  *
@@ -224,7 +225,7 @@ public RuleSets getRuleSets() {
      * @return
      */
     public RuleSet getRuleSet() {
-      return this.ruleSets.getAllRuleSets()[0];
+        return this.ruleSets.getAllRuleSets()[0];
     }
 
     /**
@@ -234,7 +235,7 @@ public RuleSet getRuleSet() {
      * @param ruleSet
      */
     public void setRuleSet(RuleSet ruleSet) {
-      this.ruleSets = new RuleSets(ruleSet);
+        this.ruleSets = new RuleSets(ruleSet);
     }
 
     /**

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/cmd/ReviewCodeCmd.java

@@ -71,8 +71,6 @@
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.PlatformUI;
 
-import name.herlin.command.CommandException;
-import name.herlin.command.Timer;
 import net.sourceforge.pmd.Rule;
 import net.sourceforge.pmd.RuleSet;
 import net.sourceforge.pmd.RuleSets;
@@ -85,6 +83,8 @@
 import net.sourceforge.pmd.eclipse.ui.actions.RuleSetUtil;
 import net.sourceforge.pmd.util.StringUtil;
 
+import name.herlin.command.CommandException;
+import name.herlin.command.Timer;
 
 /**
  * This command executes the PMD engine on a specified resource
@@ -615,33 +615,33 @@ private void processResourceDelta() throws CommandException {
 
             RuleSets ruleSets = properties.getProjectRuleSets();
 
-              // PMDEngine pmdEngine = getPmdEngineForProject(project);
-              int targetCount = countDeltaElement(resourceDelta);
-              // Could add a property that lets us set the max number to analyze
-              if (properties.isFullBuildEnabled() || isUserInitiated() || targetCount <= MAXIMUM_RESOURCE_COUNT) {
-                  setStepCount(targetCount);
-                  LOG.debug("Visiting delta of resource " + resource.getName() + " : " + getStepCount());
-  
-                  DeltaVisitor visitor = new DeltaVisitor();
-                  visitor.setMonitor(getMonitor());
-                  visitor.setRuleSets(ruleSets);
-                  // visitor.setPmdEngine(pmdEngine);
-                  visitor.setAccumulator(markersByFile);
-                  visitor.setUseTaskMarker(taskMarker);
-                  visitor.setProjectProperties(properties);
-                  resourceDelta.accept(visitor);
-  
-                  ruleCount = ruleSets.getAllRules().size();
-                  fileCount += visitor.getProcessedFilesCount();
-                  pmdDuration += visitor.getActualPmdDuration();
-              } else {
-                  String message = "Skipping resourceDelta " + resource.getName()
-                          + " because of fullBuildEnabled flag and " + "targetCount is " + targetCount
-                          + ". This is more than " + MAXIMUM_RESOURCE_COUNT + "."
-                          + " If you want to execute PMD, please check \"Full build enabled\" in the project settings";
-                  PMDPlugin.getDefault().logInformation(message);
-                  LOG.debug(message);
-              }
+            // PMDEngine pmdEngine = getPmdEngineForProject(project);
+            int targetCount = countDeltaElement(resourceDelta);
+            // Could add a property that lets us set the max number to analyze
+            if (properties.isFullBuildEnabled() || isUserInitiated() || targetCount <= MAXIMUM_RESOURCE_COUNT) {
+                setStepCount(targetCount);
+                LOG.debug("Visiting delta of resource " + resource.getName() + " : " + getStepCount());
+
+                DeltaVisitor visitor = new DeltaVisitor();
+                visitor.setMonitor(getMonitor());
+                visitor.setRuleSets(ruleSets);
+                // visitor.setPmdEngine(pmdEngine);
+                visitor.setAccumulator(markersByFile);
+                visitor.setUseTaskMarker(taskMarker);
+                visitor.setProjectProperties(properties);
+                resourceDelta.accept(visitor);
+
+                ruleCount = ruleSets.getAllRules().size();
+                fileCount += visitor.getProcessedFilesCount();
+                pmdDuration += visitor.getActualPmdDuration();
+            } else {
+                String message = "Skipping resourceDelta " + resource.getName()
+                        + " because of fullBuildEnabled flag and " + "targetCount is " + targetCount
+                        + ". This is more than " + MAXIMUM_RESOURCE_COUNT + "."
+                        + " If you want to execute PMD, please check \"Full build enabled\" in the project settings";
+                PMDPlugin.getDefault().logInformation(message);
+                LOG.debug(message);
+            }
         } catch (PropertiesException e) {
             throw new CommandException(e);
         } catch (CoreException e) {

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/runtime/preferences/impl/PreferencesManagerImpl.java

@@ -641,16 +641,14 @@ private void updateConfiguredProjects(RuleSet updatedRuleSet) {
                     RuleSets projectRuleSet = properties.getProjectRuleSets();
                     RuleSets newProjectRuleSet = new RuleSets();
                     if (projectRuleSet != null) {
-                      projectRuleSet.getAllRules().addAll(getNewRules(updatedRuleSet));
-                      for(RuleSet rs : projectRuleSet.getAllRuleSets()) {
-                        rs = RuleSetUtil.setExcludePatterns(rs,
-                          updatedRuleSet.getExcludePatterns());
-                        rs = RuleSetUtil.setIncludePatterns(rs,
-                          updatedRuleSet.getIncludePatterns());
-                        newProjectRuleSet.addRuleSet(rs);
-                      }
-                      properties.setProjectRuleSets(newProjectRuleSet);
-                      properties.sync();
+                        projectRuleSet.getAllRules().addAll(getNewRules(updatedRuleSet));
+                        for (RuleSet rs : projectRuleSet.getAllRuleSets()) {
+                            RuleSet modified = RuleSetUtil.setExcludePatterns(rs, updatedRuleSet.getExcludePatterns());
+                            modified = RuleSetUtil.setIncludePatterns(modified, updatedRuleSet.getIncludePatterns());
+                            newProjectRuleSet.addRuleSet(modified);
+                        }
+                        properties.setProjectRuleSets(newProjectRuleSet);
+                        properties.sync();
                     }
                 } catch (PropertiesException e) {
                     PMDPlugin.getDefault().logError("Unable to add new rules for project: " + project, e);