commit 52bfc2f58180260a6f827a4af568092220e963f4
author Elson Yuen <eyuen@ca.ibm.com> Tue Sep 27 17:30:59 2016 -0400
committer Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> Tue Sep 27 17:30:59 2016 -0400
tree e15a7af5b4d3c9086ba37bbb5381940ac934330b
parent 43ed4bf72dc9f82e41a75d7952ee93fba07d4509
parent 9625e11d7629ab9ced7da1a5eb273c959d258a25

Merge "Bug 496141 - Text flickering when selecting server types in New Server wizard"

plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewManualServerComposite.java

diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewManualServerComposite.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewManualServerComposite.java
index 2554ea5..0e24fb3 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewManualServerComposite.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/wizard/page/NewManualServerComposite.java
@@ -822,10 +822,13 @@
 			serverNameLabel.setVisible(true);
 			serverName.setVisible(true);
 			hostnameLabel.setVisible(true);
-			runtimeLabel.setVisible(true);
-			runtimeCombo.setVisible(true);
-			configureRuntimes.setVisible(true);
-			addRuntime.setVisible(true);
+			if (serverType.hasRuntime() && server != null
+					&& ServerUIPlugin.getRuntimes(serverType.getRuntimeType()).length >= 1) {
+				runtimeLabel.setVisible(true);
+				runtimeCombo.setVisible(true);
+				configureRuntimes.setVisible(true);
+				addRuntime.setVisible(true);
+			}
 			hostnameDecoration.setImage(fd.getImage());
 			hostnameDecoration.setDescriptionText(fd.getDescription());
 		}