[jbosstools-commits] JBoss Tools SVN: r40785 - trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards.

[jbosstools-commits at lists.jboss.org]

Author: rob.stryker at jboss.com
Date: 2012-05-04 05:07:32 -0400 (Fri, 04 May 2012)
New Revision: 40785

Modified:
   trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBInitialSelectionProvider.java
Log:
JBIDE-11205

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBInitialSelectionProvider.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBInitialSelectionProvider.java	2012-05-04 09:03:28 UTC (rev 40784)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBInitialSelectionProvider.java	2012-05-04 09:07:32 UTC (rev 40785)
@@ -42,9 +42,8 @@
 		types.addAll(Arrays.asList(serverTypes));
 		
 		// Find the last-selected one
-		IEclipsePreferences defaults = DefaultScope.INSTANCE.getNode(JBossServerUIPlugin.PLUGIN_ID);
 		IEclipsePreferences prefs =  InstanceScope.INSTANCE.getNode(JBossServerUIPlugin.PLUGIN_ID);
-		String last = prefs.get(LAST_SERVER_CREATED_KEY, defaults.get(DEFAULT_INITIAL_SERVER_TYPE, null));
+		String last = prefs.get(LAST_SERVER_CREATED_KEY, null);
 		
 		IServer lastServer = last == null ? null : ServerCore.findServer(last);
 		IServerType lastType = lastServer == null ? null : lastServer.getServerType();
@@ -61,7 +60,8 @@
 	}
 	
 	public IServerType getDefaultServerType() {
-		String newestJBoss = IJBossToolingConstants.SERVER_AS_71;
+		IEclipsePreferences defaults = DefaultScope.INSTANCE.getNode(JBossServerUIPlugin.PLUGIN_ID);
+		String newestJBoss = defaults.get(DEFAULT_INITIAL_SERVER_TYPE, IJBossToolingConstants.SERVER_AS_71);
 		return ServerCore.findServerType(newestJBoss);
 	}