[228237] - fixed problems with switching editors in navigator view (and exception w/ relationship mapping ui switching)
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/DefaultJpaSelectionManager.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/DefaultJpaSelectionManager.java
index e0c716e..3a94968 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/DefaultJpaSelectionManager.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/DefaultJpaSelectionManager.java
@@ -241,7 +241,10 @@
 		}
 		
 		public void partBroughtToTop(IWorkbenchPartReference partRef) {
-			// nop
+			IWorkbenchPart part = partRef.getPart(false);
+			if (part != null) {
+				initPart(part);
+			}
 		}
 		
 		public void partClosed(IWorkbenchPartReference partRef) {
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructureView.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructureView.java
index ab2b23b..fb45b40 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructureView.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructureView.java
@@ -46,6 +46,13 @@
 	}
 	
 	@Override
+	public void partBroughtToTop(IWorkbenchPart part) {
+		// do same thing as partActivated, which will check to see if the 
+		// part is an editor, in which case, we want to show the right page
+		partActivated(part);
+	}
+	
+	@Override
 	protected boolean isImportant(IWorkbenchPart part) {
 		return part instanceof IEditorPart;
 	}