[577382] New Server Runtime Environment dialog always picks the same default
diff --git a/features/org.eclipse.wst.server_ui.feature/feature.xml b/features/org.eclipse.wst.server_ui.feature/feature.xml
index a02ebcf..1fd8dee 100644
--- a/features/org.eclipse.wst.server_ui.feature/feature.xml
+++ b/features/org.eclipse.wst.server_ui.feature/feature.xml
@@ -14,7 +14,7 @@
<feature
id="org.eclipse.wst.server_ui.feature"
label="%featureName"
- version="3.3.1100.qualifier"
+ version="3.3.1200.qualifier"
provider-name="%providerName"
license-feature="org.eclipse.license"
license-feature-version="1.0.1.qualifier">
diff --git a/features/org.eclipse.wst.server_ui.feature/pom.xml b/features/org.eclipse.wst.server_ui.feature/pom.xml
index dc75da2..9a4dfa6 100644
--- a/features/org.eclipse.wst.server_ui.feature/pom.xml
+++ b/features/org.eclipse.wst.server_ui.feature/pom.xml
@@ -22,7 +22,7 @@
<groupId>org.eclipse.webtools.servertools</groupId>
<artifactId>org.eclipse.wst.server_ui.feature</artifactId>
- <version>3.3.1100-SNAPSHOT</version>
+ <version>3.3.1200-SNAPSHOT</version>
<packaging>eclipse-feature</packaging>
<build>
diff --git a/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF
index fe45ea4..af06fad 100644
--- a/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.wst.server.ui/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.wst.server.ui; singleton:=true
-Bundle-Version: 1.5.700.qualifier
+Bundle-Version: 1.5.800.qualifier
Bundle-Activator: org.eclipse.wst.server.ui.internal.ServerUIPlugin
Bundle-Vendor: %providerName
Bundle-Localization: plugin
diff --git a/plugins/org.eclipse.wst.server.ui/pom.xml b/plugins/org.eclipse.wst.server.ui/pom.xml
index b4b2c23..3ead6de 100644
--- a/plugins/org.eclipse.wst.server.ui/pom.xml
+++ b/plugins/org.eclipse.wst.server.ui/pom.xml
@@ -22,6 +22,6 @@
<groupId>org.eclipse.webtools.servertools</groupId>
<artifactId>org.eclipse.wst.server.ui</artifactId>
- <version>1.5.700-SNAPSHOT</version>
+ <version>1.5.800-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
</project>
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerUIPlugin.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerUIPlugin.java
index 4fcd8e5..f9806a5 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerUIPlugin.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/ServerUIPlugin.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2016 IBM Corporation and others.
+ * Copyright (c) 2003, 2021 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -744,9 +744,15 @@
}
/**
- * Returns the initial selection provider.
+ * @deprecated - A computed default new runtime type based on what's
+ * installed ends up being more annoying than useful (e.g.
+ * always selection the Preview Server even if you never use
+ * it).
+ *
+ * Returns the initial selection provider.
*
- * @return an initial selection provider, or <code>null</code> if none could be found
+ * @return an initial selection provider, or <code>null</code> if none
+ * could be found
*/
public static InitialSelectionProvider getInitialSelectionProvider() {
if (selectionProvider == null)
diff --git a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/AbstractTreeContentProvider.java b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/AbstractTreeContentProvider.java
index 04a8a1d..45320b3 100644
--- a/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/AbstractTreeContentProvider.java
+++ b/plugins/org.eclipse.wst.server.ui/serverui/org/eclipse/wst/server/ui/internal/viewers/AbstractTreeContentProvider.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2003, 2015 IBM Corporation and others.
+ * Copyright (c) 2003, 2021 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
* which accompanies this distribution, and is available at
@@ -20,7 +20,6 @@
import org.eclipse.jface.viewers.TreeViewer;
import org.eclipse.jface.viewers.Viewer;
import org.eclipse.wst.server.ui.internal.Messages;
-import org.eclipse.wst.server.ui.internal.ServerUIPlugin;
/**
* Runtime type content provider.
*/
@@ -183,7 +182,7 @@
// do nothing
}
- private Object[] getAllObjects() {
+ Object[] getAllObjects() {
List<Object> list = new ArrayList<Object>();
Object[] obj = getElements(null);
if (obj != null) {
@@ -210,18 +209,10 @@
}
public Object getInitialSelection() {
- if (initialSelection == null) {
- InitialSelectionProvider isp = ServerUIPlugin.getInitialSelectionProvider();
- initialSelection = isp.getInitialSelection(getAllObjects());
- }
return initialSelection;
}
public Object getInitialSelection(IProject project){
- if (initialSelection == null) {
- InitialSelectionProvider isp = ServerUIPlugin.getInitialSelectionProvider();
- initialSelection = isp.getInitialSelection(getAllObjects(),project);
- }
return initialSelection;
}
}
\ No newline at end of file
