Author: rob.stryker(a)jboss.com
Date: 2009-01-05 11:14:54 -0500 (Mon, 05 Jan 2009)
New Revision: 12880
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
Log:
JBIDE-3435 - NPE in wizard if (for some reason) enter had not been used
Modified:
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java
===================================================================
---
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2009-01-05
15:56:08 UTC (rev 12879)
+++
trunk/as/plugins/org.jboss.ide.eclipse.as.ui/jbossui/org/jboss/ide/eclipse/as/ui/wizards/JBossServerWizardFragment.java 2009-01-05
16:14:54 UTC (rev 12880)
@@ -236,7 +236,7 @@
return;
IJBossServerRuntime srt = getRuntime();
- name = getDefaultNameText();
+ name = name == null ? getDefaultNameText() : name;
nameText.setText(name);
homeValLabel.setText(srt.getRuntime().getLocation().toOSString());
configValLabel.setText(srt.getJBossConfiguration());
@@ -250,13 +250,14 @@
public void performFinish(IProgressMonitor monitor) throws CoreException {
IServerWorkingCopy serverWC = (IServerWorkingCopy)
getTaskModel().getObject(TaskModel.TASK_SERVER);
+ handleDefaults(serverWC);
serverWC.setRuntime((IRuntime)getTaskModel().getObject(TaskModel.TASK_RUNTIME));
serverWC.setName(name);
serverWC.setServerConfiguration(null); // no inside jboss folder
- handleDefaults(serverWC);
}
protected void handleDefaults(IServerWorkingCopy wc) {
+ name = name == null ? getDefaultNameText() : name;
String deployVal = IJBossServerConstants.PLUGIN_LOCATION.append(name).
append(IJBossServerConstants.DEPLOY).makeAbsolute().toString();
String deployTmpFolderVal = IJBossServerConstants.PLUGIN_LOCATION.append(name).
Show replies by date