From b48dbe507a2e9513a63d2b459d941d97af0f7366 Mon Sep 17 00:00:00 2001
From: Anton Leherbauer <anton.leherbauer@windriver.com>
Date: Wed, 25 Apr 2007 11:33:40 +0000
Subject: [PATCH] Fix for 183482: C Editor always re-opens file which was
 alreay open

---
 .../org/eclipse/cdt/internal/ui/cview/OpenFileGroup.java   | 7 +++++--
 .../cdt/internal/ui/navigator/OpenCElementAction.java      | 4 +++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenFileGroup.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenFileGroup.java
index 4da82741eb9..7441908309c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenFileGroup.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/cview/OpenFileGroup.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2000, 2006 IBM Corporation and others.
+ * Copyright (c) 2000, 2007 IBM Corporation and others.
  * 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
@@ -7,11 +7,14 @@
  *
  * Contributors:
  *     IBM Corporation - initial API and implementation
+ *     Anton Leherbauer (Wind River Systems)
  *******************************************************************************/
 package org.eclipse.cdt.internal.ui.cview;
 
 import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.core.model.ISourceReference;
+import org.eclipse.cdt.core.model.ITranslationUnit;
+
 import org.eclipse.cdt.internal.ui.actions.SelectionConverter;
 import org.eclipse.cdt.internal.ui.util.EditorUtility;
 import org.eclipse.core.resources.IContainer;
@@ -134,7 +137,7 @@ public class OpenFileGroup extends CViewActionGroup {
 				if (part != null) {
 					IWorkbenchPage page = getCView().getSite().getPage();
 					page.bringToTop(part);
-					if (celement instanceof ISourceReference) {
+					if (celement instanceof ISourceReference && !(celement instanceof ITranslationUnit)) {
 						EditorUtility.revealInEditor(part, celement);
 					}
 				}
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/OpenCElementAction.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/OpenCElementAction.java
index bed572735a5..ad100e1fe0c 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/OpenCElementAction.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/navigator/OpenCElementAction.java
@@ -14,6 +14,8 @@ package org.eclipse.cdt.internal.ui.navigator;
 import org.eclipse.cdt.core.model.IBinary;
 import org.eclipse.cdt.core.model.ICElement;
 import org.eclipse.cdt.core.model.ISourceReference;
+import org.eclipse.cdt.core.model.ITranslationUnit;
+
 import org.eclipse.cdt.internal.ui.util.EditorUtility;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.core.runtime.CoreException;
@@ -47,7 +49,7 @@ public class OpenCElementAction extends OpenFileAction {
 			IEditorPart part;
 			try {
 				part= EditorUtility.openInEditor(fOpenElement);
-				if (fOpenElement instanceof ISourceReference) {
+				if (fOpenElement instanceof ISourceReference && !(fOpenElement instanceof ITranslationUnit)) {
 					EditorUtility.revealInEditor(part, fOpenElement);
 				}
 			} catch (CoreException exc) {