[jbosstools-commits] JBoss Tools SVN: r40747 - 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-03 07:19:42 -0400 (Thu, 03 May 2012)
New Revision: 40747

Modified:
   trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossConfigurationTableViewer.java
Log:
/JBIDE-11488 to trunk

Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossConfigurationTableViewer.java
===================================================================
--- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossConfigurationTableViewer.java	2012-05-03 08:38:28 UTC (rev 40746)
+++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossConfigurationTableViewer.java	2012-05-03 11:19:42 UTC (rev 40747)
@@ -26,6 +26,7 @@
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Table;
+import org.jboss.ide.eclipse.as.core.util.IConstants;
 import org.jboss.ide.eclipse.as.ui.JBossServerUISharedImages;
 
 /**
@@ -52,6 +53,10 @@
 	public void setFolder(String folder) {
 		setInput(folder);
 		String t = getSelectedConfiguration();
+		if( t == null ) {
+			t = IConstants.DEFAULT_CONFIGURATION;
+			setConfiguration(t);
+		}
 		if( t != null )
 			setSelection(new StructuredSelection(new Object[]{t}));
 	}
@@ -61,8 +66,8 @@
 	}
 
 	public void setConfiguration(String defaultConfiguration) {
+		selectedConfiguration = defaultConfiguration;
 		setSelection(new StructuredSelection(defaultConfiguration));
-		selectedConfiguration = defaultConfiguration;
 	}
 
 	private void init() {