Author: rob.stryker(a)jboss.com Date: 2012-04-05 01:35:49 -0400 (Thu, 05 Apr 2012) New Revision: 40047 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java Log: JBIDE-11479 Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2012-04-05 05:33:15 UTC (rev 40046) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/editor/ServerModeSectionComposite.java 2012-04-05 05:35:49 UTC (rev 40047) @@ -167,7 +167,11 @@ return true; } protected boolean showListenOnAllHostsCheckbox() { - + IRuntime rt = callback.getRuntime(); + JBossExtendedProperties props2 = (JBossExtendedProperties)rt + .loadAdapter(JBossExtendedProperties.class, + new NullProgressMonitor()); + props2.runtimeSupportsBindingToAllInterfaces(); IServerWorkingCopy wc = callback.getServer(); JBossExtendedProperties props = (JBossExtendedProperties)wc .loadAdapter(JBossExtendedProperties.class, Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java 2012-04-05 05:33:15 UTC (rev 40046) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBoss7RuntimeWizardFragment.java 2012-04-05 05:35:49 UTC (rev 40047) @@ -182,6 +182,7 @@ selectedVM = null; configDirTextVal = configDirText.getText(); updateErrorMessage(); + saveDetailsInRuntime(); } protected String getWarningString() { if( getHomeVersionWarning() != null ) @@ -258,19 +259,22 @@ } @Override - public void exit() { + protected void saveDetailsInRuntime() { IRuntime r = (IRuntime) getTaskModel() .getObject(TaskModel.TASK_RUNTIME); IRuntimeWorkingCopy runtimeWC = r.isWorkingCopy() ? ((IRuntimeWorkingCopy) r) : r.createWorkingCopy(); - runtimeWC.setName(name); - runtimeWC.setLocation(new Path(homeDir)); + if( name != null ) + runtimeWC.setName(name); + if( homeDir != null ) + runtimeWC.setLocation(new Path(homeDir)); LocalJBoss7ServerRuntime srt = (LocalJBoss7ServerRuntime) runtimeWC.loadAdapter( LocalJBoss7ServerRuntime.class, new NullProgressMonitor()); - srt.setVM(selectedVM); - srt.setConfigurationFile(configDirTextVal); - + if( selectedVM != null ) + srt.setVM(selectedVM); + if( configDirTextVal != null && !"".equals(configDirTextVal)) + srt.setConfigurationFile(configDirTextVal); getTaskModel().putObject(TaskModel.TASK_RUNTIME, runtimeWC); } } Modified: trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java =================================================================== --- trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2012-04-05 05:33:15 UTC (rev 40046) +++ trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossRuntimeWizardFragment.java 2012-04-05 05:35:49 UTC (rev 40047) @@ -596,6 +596,7 @@ selectedVM = null; configDirTextVal = configDirText.getText(); updateErrorMessage(); + saveDetailsInRuntime(); } protected void updateErrorMessage() { @@ -776,18 +777,27 @@ } public void exit() { + saveDetailsInRuntime(); + } + + protected void saveDetailsInRuntime() { IRuntime r = (IRuntime) getTaskModel() .getObject(TaskModel.TASK_RUNTIME); IRuntimeWorkingCopy runtimeWC = r.isWorkingCopy() ? ((IRuntimeWorkingCopy) r) : r.createWorkingCopy(); - runtimeWC.setName(name); - runtimeWC.setLocation(new Path(homeDir)); + if( name != null ) + runtimeWC.setName(name); + if( homeDir != null) + runtimeWC.setLocation(new Path(homeDir)); IJBossServerRuntime srt = (IJBossServerRuntime) runtimeWC.loadAdapter( IJBossServerRuntime.class, new NullProgressMonitor()); - srt.setVM(selectedVM); - srt.setJBossConfiguration(configurations.getSelectedConfiguration()); - srt.setConfigLocation(configDirTextVal); + if( selectedVM != null ) + srt.setVM(selectedVM); + if( configurations != null && configurations.getSelectedConfiguration() != null ) + srt.setJBossConfiguration(configurations.getSelectedConfiguration()); + if( configDirText != null ) + srt.setConfigLocation(configDirTextVal); getTaskModel().putObject(TaskModel.TASK_RUNTIME, runtimeWC); }