You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2015/09/30 21:21:44 UTC

svn commit: r1706137 - in /sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui: internal/SlingLaunchpadCombo.java wizards/SetupServerWizardPage.java

Author: rombert
Date: Wed Sep 30 19:21:44 2015
New Revision: 1706137

URL: http://svn.apache.org/viewvc?rev=1706137&view=rev
Log:
SLING-5081 - Unable to advance in the project creation wizard if the
server is pre-selected 

- always pre-select an entry if one exists
- allow finishing the wizard with a pre-selected entry

Modified:
    sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingLaunchpadCombo.java
    sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/SetupServerWizardPage.java

Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingLaunchpadCombo.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingLaunchpadCombo.java?rev=1706137&r1=1706136&r2=1706137&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingLaunchpadCombo.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/SlingLaunchpadCombo.java Wed Sep 30 19:21:44 2015
@@ -65,14 +65,11 @@ public class SlingLaunchpadCombo {
         repositoryCombo.removeAll();
         List<IServer> servers = project != null ? SelectionUtils.getServersLinkedToProject(project, monitor) : Arrays
                 .asList(ServerCore.getServers());
-        if (servers.size() > 1) {
-            repositoryCombo.add(""); // force selection only if there is more than one server
-        }
         for (IServer server : servers) {
             repositoryCombo.add(server.getId());
         }
 
-        if (servers.size() == 1) {
+        if (servers.size() > 0) {
             repositoryCombo.select(0);
         }
     }

Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/SetupServerWizardPage.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/SetupServerWizardPage.java?rev=1706137&r1=1706136&r2=1706137&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/SetupServerWizardPage.java (original)
+++ sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/wizards/SetupServerWizardPage.java Wed Sep 30 19:21:44 2015
@@ -217,6 +217,13 @@ public class SetupServerWizardPage exten
         setPageComplete(false);
 		
 		setControl(container);
+		
+		// allow the selection to proceed in case we have a preselected server
+        if (useExistingServer.getSelection()) {
+            if (existingServerCombo.getErrorMessage(SKIP_SERVER_STARTED) == null) {
+                updateStatus(null);
+            }
+        }
 	}
 
     private Label newLabel(Composite container, String text) {