From 60b01f39f336317e35e3df71837acde8388bfb07 Mon Sep 17 00:00:00 2001
From: Sergey Prigogin
Date: Fri, 25 Mar 2011 21:49:27 +0000
Subject: Bug 338349 - CodanCReconciler does not find resources consistenly.

---
 .../codan/internal/ui/cxx/CodanCReconciler.java    | 48 ++++++++--------------
 1 file changed, 18 insertions(+), 30 deletions(-)

(limited to 'codan/org.eclipse.cdt.codan.ui.cxx')

diff --git a/codan/org.eclipse.cdt.codan.ui.cxx/src/org/eclipse/cdt/codan/internal/ui/cxx/CodanCReconciler.java b/codan/org.eclipse.cdt.codan.ui.cxx/src/org/eclipse/cdt/codan/internal/ui/cxx/CodanCReconciler.java
index 3c44ab1981f..687898f9c69 100644
--- a/codan/org.eclipse.cdt.codan.ui.cxx/src/org/eclipse/cdt/codan/internal/ui/cxx/CodanCReconciler.java
+++ b/codan/org.eclipse.cdt.codan.ui.cxx/src/org/eclipse/cdt/codan/internal/ui/cxx/CodanCReconciler.java
@@ -1,36 +1,30 @@
 /*******************************************************************************
- * Copyright (c) 2009, 2010 Alena Laskavaia 
+ * Copyright (c) 2009, 2011 Alena Laskavaia 
  * 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:
- *    Alena Laskavaia  - initial API and implementation
+ *     Alena Laskavaia  - initial API and implementation
  *******************************************************************************/
 package org.eclipse.cdt.codan.internal.ui.cxx;
 
-import java.io.File;
-import java.net.URI;
-
 import org.eclipse.cdt.codan.core.PreferenceConstants;
 import org.eclipse.cdt.codan.core.cxx.internal.model.CxxCodanReconciler;
 import org.eclipse.cdt.codan.internal.ui.CodanUIActivator;
 import org.eclipse.cdt.core.dom.ast.IASTTranslationUnit;
+import org.eclipse.cdt.core.model.ITranslationUnit;
 import org.eclipse.cdt.internal.ui.editor.CEditor;
 import org.eclipse.cdt.internal.ui.text.ICReconcilingListener;
-import org.eclipse.core.resources.IFile;
 import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IWorkspace;
-import org.eclipse.core.resources.IWorkspaceRoot;
-import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.core.resources.IResource;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.ui.texteditor.ITextEditor;
 
 /**
  * @author Alena
- * 
  */
 public class CodanCReconciler implements ICReconcilingListener {
 	private CxxCodanReconciler reconsiler = new CxxCodanReconciler();
@@ -59,9 +53,7 @@ public class CodanCReconciler implements ICReconcilingListener {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see
-	 * org.eclipse.cdt.internal.ui.text.ICReconcilingListener#aboutToBeReconciled
-	 * ()
+	 * @see org.eclipse.cdt.internal.ui.text.ICReconcilingListener#aboutToBeReconciled()
 	 */
 	public void aboutToBeReconciled() {
 		// nothing
@@ -70,27 +62,23 @@ public class CodanCReconciler implements ICReconcilingListener {
 	/*
 	 * (non-Javadoc)
 	 * 
-	 * @see
-	 * org.eclipse.cdt.internal.ui.text.ICReconcilingListener#reconciled(org
-	 * .eclipse.cdt.core.dom.ast.IASTTranslationUnit, boolean,
-	 * org.eclipse.core.runtime.IProgressMonitor)
+	 * @see org.eclipse.cdt.internal.ui.text.ICReconcilingListener#reconciled(
+	 * 		org.eclipse.cdt.core.dom.ast.IASTTranslationUnit, boolean,
+	 * 		org.eclipse.core.runtime.IProgressMonitor)
 	 */
 	public void reconciled(IASTTranslationUnit ast, boolean force, IProgressMonitor progressMonitor) {
 		if (ast == null)
 			return;
-		String filePath = ast.getFilePath();
-		IWorkspace workspace = ResourcesPlugin.getWorkspace();
-		IWorkspaceRoot root = workspace.getRoot();
-		IFile[] resources;
-		URI uri = new File(filePath).toURI();
-		resources = root.findFilesForLocationURI(uri);
-		if (resources != null && resources.length > 0) {
-			IFile resource = resources[0];
-			IProject project = resource.getProject();
-			IPreferenceStore store = CodanUIActivator.getDefault().getPreferenceStore(project);
-			if (store.getBoolean(PreferenceConstants.P_RUN_IN_EDITOR)) {
-				reconsiler.reconciledAst(ast, resource, progressMonitor);
-			}
+		ITranslationUnit tu = ast.getOriginatingTranslationUnit();
+		if (tu == null)
+			return;
+		IResource resource = tu.getResource();
+		if (resource == null)
+			return;
+		IProject project = resource.getProject();
+		IPreferenceStore store = CodanUIActivator.getDefault().getPreferenceStore(project);
+		if (store.getBoolean(PreferenceConstants.P_RUN_IN_EDITOR)) {
+			reconsiler.reconciledAst(ast, resource, progressMonitor);
 		}
 	}
 }
-- 
cgit v1.2.3