213467 - committing a patch from Pascal

1 files changed, 17 insertions, 8 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/util/ControlSwitcher.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/util/ControlSwitcher.java
index e70c010f7d..2c1def6475 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/util/ControlSwitcher.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/util/ControlSwitcher.java
@@ -104,15 +104,24 @@ public final class ControlSwitcher<T>
 			return;
 		}
 
+		// Retrieve the Control for the new value
 		Control pane = paneTransformer.transform(value);
+		boolean visible = (pane != null);
 
-		 if (pane == null) {
-			 pageBook.showPage(new Label(pageBook, SWT.SEPARATOR));
-		 }
-		 else {
-			 pageBook.showPage(pane);
-		 }
+		// Show the new page
+		if (visible) {
+			pageBook.showPage(pane);
+		}
+		else {
+			// Note: We can't null due to a bug in PageBook
+			pageBook.showPage(new Label(pageBook, SWT.SEPARATOR | SWT.HORIZONTAL));
+		}
+
+		if (pageBook.isVisible() != visible) {
+			pageBook.setVisible(visible);
+		}
 
-		 pageBook.setVisible(pane != null);
+		// Revalidate the parents in order to update the layout
+		SWTUtil.reflow(pageBook);
 	}
-}
+}
\ No newline at end of file