From f7b306a66221e24b346eb3661aedeb6125d9c0e6 Mon Sep 17 00:00:00 2001
From: Alena Laskavaia <elaskavaia.cdt@gmail.com>
Date: Thu, 18 Mar 2010 14:36:39 +0000
Subject: [PATCH] - fixed checker were running even when disabled

---
 .../cdt/codan/internal/core/CodanBuilder.java | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CodanBuilder.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CodanBuilder.java
index 40a80416a35..7506bc4567c 100644
--- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CodanBuilder.java
+++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CodanBuilder.java
@@ -15,10 +15,10 @@ import java.util.Map;
 import org.eclipse.cdt.codan.core.CodanCorePlugin;
 import org.eclipse.cdt.codan.core.CodanRuntime;
 import org.eclipse.cdt.codan.core.model.IChecker;
-import org.eclipse.cdt.codan.core.model.IRunnableInEditorChecker;
 import org.eclipse.cdt.codan.core.model.ICodanBuilder;
 import org.eclipse.cdt.codan.core.model.IProblemReporter;
 import org.eclipse.cdt.codan.core.model.IProblemReporterPersistent;
+import org.eclipse.cdt.codan.core.model.IRunnableInEditorChecker;
 import org.eclipse.cdt.codan.internal.core.model.CodanMarkerProblemReporter;
 import org.eclipse.core.resources.IProject;
 import org.eclipse.core.resources.IResource;
@@ -115,13 +115,10 @@ public class CodanBuilder extends IncrementalProjectBuilder implements
 		CheckersRegisry chegistry = CheckersRegisry.getInstance();
 		for (IChecker checker : chegistry) {
 			try {
-				boolean run = false;
-				if (checker.enabledInContext(resource))
-					run = true;
-				if (chegistry.isCheckerEnabled(checker, resource))
-					run = true;
-				if (run)
+				if (chegistry.isCheckerEnabled(checker, resource)
+						&& checker.enabledInContext(resource)) {
 					checker.processResource(resource);
+				}
 			} catch (Throwable e) {
 				CodanCorePlugin.log(e);
 			}
@@ -170,18 +167,19 @@ public class CodanBuilder extends IncrementalProjectBuilder implements
 			((IProblemReporterPersistent) problemReporter)
 					.deleteProblems(resource);
 		}
-		for (IChecker checker : CheckersRegisry.getInstance()) {
+		CheckersRegisry chegistry = CheckersRegisry.getInstance();
+		for (IChecker checker : chegistry) {
 			try {
 				boolean run = false;
-				if (checker.enabledInContext(resource))
-					run = true;
-				if (CheckersRegisry.getInstance().isCheckerEnabled(checker,
-						resource)) {
+				if (checker.enabledInContext(resource)
+						&& chegistry.isCheckerEnabled(checker, resource)) {
 					run = true;
 				}
 				if (run && checker.runInEditor()
 						&& checker instanceof IRunnableInEditorChecker)
 					((IRunnableInEditorChecker) checker).processModel(model);
+				if (monitor.isCanceled())
+					break;
 			} catch (Throwable e) {
 				CodanCorePlugin.log(e);
 			}