Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpfullbright2009-04-07 20:34:26 +0000
committerpfullbright2009-04-07 20:34:26 +0000
commit8185ab4ca8d58705d1cf6b099fce0905987ebbf8 (patch)
tree0d2ae9142649baa5d02615fa7bd7b02930589a74
parent13425259bc781169fb51a77f4cdd1402b9cda60a (diff)
downloadwebtools.dali-8185ab4ca8d58705d1cf6b099fce0905987ebbf8.tar.gz
webtools.dali-8185ab4ca8d58705d1cf6b099fce0905987ebbf8.tar.xz
webtools.dali-8185ab4ca8d58705d1cf6b099fce0905987ebbf8.zip
[228237] - fixed problems with switching editors in navigator view (and exception w/ relationship mapping ui switching)
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/selection/DefaultJpaSelectionManager.java5
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/views/structure/JpaStructureView.java7
2 files changed, 11 insertions, 1 deletions
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 e0c716ede6..3a949682cd 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 class DefaultJpaSelectionManager
}
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 ab2b23bcc1..fb45b406b9 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 @@ public class JpaStructureView
}
@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;
}

Back to the top