Merge branch 'master' of https://github.com/dkulp/pmd-eclipse-plugin into dkulp-master

Author: adangel

net.sourceforge.pmd.eclipse.plugin/src/main/java/net/sourceforge/pmd/eclipse/plugin/FileChangeReviewer.java

@@ -7,6 +7,7 @@
 import net.sourceforge.pmd.eclipse.runtime.builder.MarkerUtil;
 import net.sourceforge.pmd.eclipse.runtime.cmd.ReviewCodeCmd;
 
+import org.apache.log4j.Logger;
 import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IResource;
 import org.eclipse.core.resources.IResourceChangeEvent;
@@ -110,6 +111,7 @@ private void changed(Set<ResourceChange> itemsChanged, IResourceDelta delta, IPr
 					if (monitor.isCanceled()) return;
 					changed(itemsChanged, grandkidDelta, monitor);
 				}
+				break;
 			case IResourceDelta.ADDED :
 //				if (rsc instanceof IProject) {
 //					removed(itemsChanged, (IProject)rsc, delta.getFlags());
@@ -121,6 +123,7 @@ private void changed(Set<ResourceChange> itemsChanged, IResourceDelta delta, IPr
 					if (monitor.isCanceled()) return;
 					changed(itemsChanged, grandkidDelta, monitor);
 				}		
+				break;
 			case IResourceDelta.CHANGED :
 //				if (rsc instanceof IProject) {
 //					changed(itemsChanged, (IProject)rsc, delta.getFlags());
@@ -131,7 +134,8 @@ private void changed(Set<ResourceChange> itemsChanged, IResourceDelta delta, IPr
 				for (IResourceDelta grandkidDelta : delta.getAffectedChildren()) {
 					if (monitor.isCanceled()) return;
 					changed(itemsChanged, grandkidDelta, monitor);
-				}			
+				}
+				break;
 			default :
 				for (IResourceDelta grandkidDelta : delta.getAffectedChildren()) {
 					if (monitor.isCanceled()) return;

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

@@ -102,6 +102,8 @@ public class ReviewCodeCmd extends AbstractDefaultCommand {
     private int 						fileCount;
     private long 						pmdDuration;
     private String						onErrorIssue = null;
+    
+    private IProjectProperties          propertyCache = null;
 
     private static final long serialVersionUID = 1L;
 
@@ -353,11 +355,17 @@ private void processResources() throws CommandException {
             }
         }
     }
+    
+    private IProjectProperties getProjectProperties(IProject project) throws PropertiesException, CommandException {
+    	if (propertyCache == null || !propertyCache.getProject().getName().equals(project.getName())) {
+    		propertyCache = PMDPlugin.getDefault().loadProjectProperties(project);
+    	}
+		return propertyCache;
+    }
 
     private RuleSet rulesetFrom(IResource resource) throws PropertiesException, CommandException {
-    	
     	 IProject project = resource.getProject();
-         IProjectProperties properties = PMDPlugin.getDefault().loadProjectProperties(project);
+         IProjectProperties properties = getProjectProperties(project);
 
          return filteredRuleSet(properties);	//properties.getProjectRuleSet();
     }
@@ -369,7 +377,10 @@ private void processResource(IResource resource) throws CommandException {
         try {
 
             final IProject project = resource.getProject();
-            final IProjectProperties properties = PMDPlugin.getDefault().loadProjectProperties(project);
+            final IProjectProperties properties = getProjectProperties(project);
+            if (!properties.isPmdEnabled()) {
+            	return;
+            }
 
             final RuleSet ruleSet = rulesetFrom(resource);	//properties.getProjectRuleSet();
 
@@ -490,7 +501,7 @@ private RuleSet rulesetFromResourceDelta() throws PropertiesException, CommandEx
 
     	 IResource resource = resourceDelta.getResource();
          final IProject project = resource.getProject();
-         final IProjectProperties properties = PMDPlugin.getDefault().loadProjectProperties(project);
+         final IProjectProperties properties = getProjectProperties(project);
 
          return filteredRuleSet(properties);	//properties.getProjectRuleSet();
     }
@@ -502,7 +513,7 @@ private void processResourceDelta() throws CommandException {
         try {
             IResource resource = resourceDelta.getResource();
             final IProject project = resource.getProject();
-            final IProjectProperties properties = PMDPlugin.getDefault().loadProjectProperties(project);
+            final IProjectProperties properties = getProjectProperties(project);
 
             RuleSet ruleSet = rulesetFromResourceDelta();	//properties.getProjectRuleSet();
 
@@ -655,4 +666,4 @@ public boolean visit(IResourceDelta delta) {
         }
     }
 
-}
+}