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 56619b9b50b..364cf586aa8 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 @@ -78,7 +78,7 @@ public class CodanBuilder extends IncrementalProjectBuilder implements ICodanBui @Override public void processResource(IResource resource, IProgressMonitor monitor) { - CodanRunner.processResource(resource, monitor, CheckerLaunchMode.RUN_ON_FULL_BUILD); + CodanRunner.processResource(resource, CheckerLaunchMode.RUN_ON_FULL_BUILD, monitor); } /** @@ -91,7 +91,7 @@ public class CodanBuilder extends IncrementalProjectBuilder implements ICodanBui */ @Override public void processResource(IResource resource, IProgressMonitor monitor, CheckerLaunchMode mode) { - CodanRunner.processResource(resource, monitor, mode); + CodanRunner.processResource(resource, mode, monitor); } private void processResourceDelta(IResource resource, IProgressMonitor monitor) { diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CodanRunner.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CodanRunner.java index 9b5dc9549be..ac33b50c173 100644 --- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CodanRunner.java +++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/CodanRunner.java @@ -40,23 +40,23 @@ public class CodanRunner { * @param monitor - the progress monitor */ public static void runInEditor(Object model, IResource resource, IProgressMonitor monitor) { - CodanRunner.processResource(resource, monitor, model, CheckerLaunchMode.RUN_AS_YOU_TYPE); + CodanRunner.processResource(resource, model, CheckerLaunchMode.RUN_AS_YOU_TYPE, monitor); } /** * Runs all checkers on a given resource. * * @param resource - the resource to run the checkers on, either IFile or IContainer - * @param monitor - the progress monitor * @param checkerLaunchMode - the checker launch mode. + * @param monitor - the progress monitor */ - public static void processResource(IResource resource, IProgressMonitor monitor, - CheckerLaunchMode checkerLaunchMode) { - processResource(resource, monitor, null, checkerLaunchMode); + public static void processResource(IResource resource, CheckerLaunchMode checkerLaunchMode, + IProgressMonitor monitor) { + processResource(resource, null, checkerLaunchMode, monitor); } - private static void processResource(IResource resource, IProgressMonitor monitor, Object model, - CheckerLaunchMode checkerLaunchMode) { + private static void processResource(IResource resource, Object model, + CheckerLaunchMode checkerLaunchMode, IProgressMonitor monitor) { CheckersRegistry chegistry = CheckersRegistry.getInstance(); int checkers = chegistry.getCheckersSize(); int memsize = 0; @@ -117,7 +117,7 @@ public class CodanRunner { if (monitor.isCanceled()) return; IResource member = members[i]; - processResource(member, new SubProgressMonitor(monitor, tick), null, checkerLaunchMode); + processResource(member, null, checkerLaunchMode, new SubProgressMonitor(monitor, tick)); } } catch (CoreException e) { CodanCorePlugin.log(e); diff --git a/codan/org.eclipse.cdt.codan.ui.cxx/src/org/eclipse/cdt/codan/internal/ui/cxx/Startup.java b/codan/org.eclipse.cdt.codan.ui.cxx/src/org/eclipse/cdt/codan/internal/ui/cxx/Startup.java index f89c7024440..675ddcc4990 100644 --- a/codan/org.eclipse.cdt.codan.ui.cxx/src/org/eclipse/cdt/codan/internal/ui/cxx/Startup.java +++ b/codan/org.eclipse.cdt.codan.ui.cxx/src/org/eclipse/cdt/codan/internal/ui/cxx/Startup.java @@ -87,7 +87,7 @@ public class Startup implements IStartup { Job job = new Job(NLS.bind(Messages.Startup_AnalyzingFile, resource.getName())) { @Override protected IStatus run(IProgressMonitor monitor) { - CodanRunner.processResource(resource, monitor, CheckerLaunchMode.RUN_ON_FILE_OPEN); + CodanRunner.processResource(resource, CheckerLaunchMode.RUN_ON_FILE_OPEN, monitor); return Status.OK_STATUS; } };