diff --git a/codan/org.eclipse.cdt.codan.checkers/META-INF/MANIFEST.MF b/codan/org.eclipse.cdt.codan.checkers/META-INF/MANIFEST.MF
index 1132ee5b38e..150f20c4374 100644
--- a/codan/org.eclipse.cdt.codan.checkers/META-INF/MANIFEST.MF
+++ b/codan/org.eclipse.cdt.codan.checkers/META-INF/MANIFEST.MF
@@ -4,10 +4,13 @@ Bundle-Name: Checkers
 Bundle-SymbolicName: org.eclipse.cdt.codan.checkers;singleton:=true
 Bundle-Version: 1.0.0
 Bundle-Activator: org.eclipse.cdt.codan.checkers.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
+Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.core.resources;bundle-version="3.5.0",
  org.eclipse.cdt.core;bundle-version="5.1.0",
- org.eclipse.cdt.codan.core;bundle-version="1.0.0"
+ org.eclipse.cdt.codan.core;bundle-version="1.0.0",
+ org.eclipse.ui.editors;bundle-version="3.5.0",
+ org.eclipse.jface.text;bundle-version="3.5.0",
+ org.eclipse.ui;bundle-version="3.5.0",
+ org.eclipse.ui.ide;bundle-version="3.5.0"
 Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/codan/org.eclipse.cdt.codan.checkers/plugin.xml b/codan/org.eclipse.cdt.codan.checkers/plugin.xml
index 99cf3432354..9c8de1e9016 100644
--- a/codan/org.eclipse.cdt.codan.checkers/plugin.xml
+++ b/codan/org.eclipse.cdt.codan.checkers/plugin.xml
@@ -15,5 +15,11 @@
       </problem>
       </checker>
    </extension>
-
+   <extension
+         point="org.eclipse.ui.ide.markerResolution">
+      <markerResolutionGenerator
+            class="org.eclipse.cdt.codan.checkers.sample.MarkerResolutionGenerator"
+            markerType="org.eclipse.cdt.codan.core.codanProblem">
+      </markerResolutionGenerator>
+   </extension>
 </plugin>
diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/sample/MarkerResolutionGenerator.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/sample/MarkerResolutionGenerator.java
new file mode 100644
index 00000000000..339913e44f7
--- /dev/null
+++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/sample/MarkerResolutionGenerator.java
@@ -0,0 +1,24 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Andrew Gvozdev
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Andrew Gvozdev  - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.codan.checkers.sample;
+
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.ui.IMarkerResolution;
+import org.eclipse.ui.IMarkerResolutionGenerator;
+
+public class MarkerResolutionGenerator implements IMarkerResolutionGenerator {
+
+       @Override
+       public IMarkerResolution[] getResolutions(IMarker marker) {
+               return new IMarkerResolution[] { new QuickFixAssignmentInCondition() };
+       }
+
+}
\ No newline at end of file
diff --git a/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/sample/QuickFixAssignmentInCondition.java b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/sample/QuickFixAssignmentInCondition.java
new file mode 100644
index 00000000000..63e4bf2ba45
--- /dev/null
+++ b/codan/org.eclipse.cdt.codan.checkers/src/org/eclipse/cdt/codan/checkers/sample/QuickFixAssignmentInCondition.java
@@ -0,0 +1,90 @@
+/*******************************************************************************
+ * Copyright (c) 2009 Andrew Gvozdev
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Andrew Gvozdev  - initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.codan.checkers.sample;
+
+import org.eclipse.core.resources.IFile;
+import org.eclipse.core.resources.IMarker;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.ui.IEditorPart;
+import org.eclipse.ui.IFileEditorInput;
+import org.eclipse.ui.IMarkerResolution;
+import org.eclipse.ui.IWorkbenchPage;
+import org.eclipse.ui.IWorkbenchWindow;
+import org.eclipse.ui.PartInitException;
+import org.eclipse.ui.PlatformUI;
+import org.eclipse.ui.ide.IDE;
+import org.eclipse.ui.part.FileEditorInput;
+import org.eclipse.ui.texteditor.ITextEditor;
+
+import org.eclipse.jface.text.BadLocationException;
+import org.eclipse.jface.text.FindReplaceDocumentAdapter;
+import org.eclipse.jface.text.IDocument;
+
+public class QuickFixAssignmentInCondition implements IMarkerResolution {
+
+       @Override
+       public String getLabel() {
+               return "Change first occurence '=' in the line to condition '=='";
+       }
+
+       @Override
+       public void run(IMarker marker) {
+               // See if there is an open editor on the file containing the marker
+               IWorkbenchWindow w = PlatformUI.getWorkbench().getActiveWorkbenchWindow();
+               if (w == null) {
+                       return;
+               }
+
+               IWorkbenchPage page = w.getActivePage();
+               if (page == null) {
+                       return;
+               }
+
+               IFileEditorInput input = new FileEditorInput((IFile) marker.getResource());
+               IEditorPart editorPart = page.findEditor(input);
+
+               if (editorPart == null) {
+                       // open an editor
+                       try {
+                               editorPart = IDE.openEditor(page, (IFile) marker.getResource(), true);
+                       } catch (PartInitException e) {
+                               e.printStackTrace();
+                       }
+               }
+               if (editorPart == null) {
+                       return;
+               }
+
+               if (editorPart instanceof ITextEditor) {
+                       ITextEditor editor = (ITextEditor) editorPart;
+                       IDocument doc = editor.getDocumentProvider().getDocument(
+                                       editor.getEditorInput());
+
+                       int line = marker.getAttribute(IMarker.LINE_NUMBER, -1)-1;
+
+                       FindReplaceDocumentAdapter dad = new FindReplaceDocumentAdapter(doc);
+                       try {
+                               dad.find(doc.getLineOffset(line), "=", /*forwardSearch*/ true, /*caseSensitive*/ false,
+                                               /*wholeWord*/ false, /*regExSearch*/ false);
+                               dad.replace("==", /*regExReplace*/ false);
+                               marker.delete();
+                       } catch (BadLocationException e) {
+                               // TODO: log the error
+                               e.printStackTrace();
+                       } catch (CoreException e) {
+                               // TODO: log the error
+                               e.printStackTrace();
+                       }
+
+               }
+       }
+
+}