code cleanup
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerRuntimeWizardFragment.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerRuntimeWizardFragment.java
index 2d747fa..2522a49 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerRuntimeWizardFragment.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerRuntimeWizardFragment.java
@@ -30,137 +30,161 @@
*
* @author Gorkem Ercan
*/
-public class GenericServerRuntimeWizardFragment extends ServerDefinitionTypeAwareWizardFragment {
-
- private GenericServerCompositeDecorator[] fDecorators;
-
-
- /**
- * Constructor
- */
- public GenericServerRuntimeWizardFragment() {
- super();
- }
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.ui.wizard.IWizardFragment#isComplete()
- */
- public boolean isComplete() {
- RuntimeDelegate runtime = getRuntimeDelegate();
- if (runtime == null)
- return false;
- IStatus status = runtime.validate();
- return (status != null && status.isOK());
- }
-
- public void createContent(Composite parent, IWizardHandle handle) {
- Map properties= null;
- ServerRuntime definition=null;
- if(getRuntimeDelegate()!=null){
- properties = getRuntimeDelegate().getServerInstanceProperties();
- definition = getServerTypeDefinition(getServerDefinitionId(),properties);
- }
- IInstallableRuntime ir = ServerPlugin.findInstallableRuntime(getRuntimeDelegate().getRuntime().getRuntimeType().getId());
- if (ir!= null){
- fDecorators= new GenericServerCompositeDecorator[3];
- fDecorators[0]= new JRESelectDecorator(getRuntimeDelegate());
- fDecorators[1]= new ServerTypeDefinitionRuntimeDecorator(definition,properties,getWizard(),getRuntimeDelegate());
- fDecorators[2]= new InstallableRuntimeDecorator(getWizard(), getRuntimeDelegate());
+public class GenericServerRuntimeWizardFragment extends
+ ServerDefinitionTypeAwareWizardFragment {
+
+ private GenericServerCompositeDecorator[] fDecorators;
+
+ /**
+ * Constructor
+ */
+ public GenericServerRuntimeWizardFragment() {
+ super();
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.wst.server.ui.wizard.IWizardFragment#isComplete()
+ */
+ public boolean isComplete() {
+ RuntimeDelegate runtime = getRuntimeDelegate();
+ if( runtime == null )
+ return false;
+ IStatus status = runtime.validate();
+ return (status != null && status.isOK());
+ }
+
+ public void createContent( Composite parent, IWizardHandle handle ) {
+ Map properties = null;
+ ServerRuntime definition = null;
+ if( getRuntimeDelegate() != null )
+ {
+ properties = getRuntimeDelegate().getServerInstanceProperties();
+ definition = getServerTypeDefinition( getServerDefinitionId(),
+ properties );
}
- else{
- fDecorators= new GenericServerCompositeDecorator[2];
- fDecorators[0]= new JRESelectDecorator(getRuntimeDelegate());
- fDecorators[1]= new ServerTypeDefinitionRuntimeDecorator(definition,properties,getWizard(),getRuntimeDelegate());
+ IInstallableRuntime ir = ServerPlugin
+ .findInstallableRuntime( getRuntimeDelegate().getRuntime()
+ .getRuntimeType().getId() );
+ if( ir != null )
+ {
+ fDecorators = new GenericServerCompositeDecorator[3];
+ fDecorators[0] = new JRESelectDecorator( getRuntimeDelegate() );
+ fDecorators[1] = new ServerTypeDefinitionRuntimeDecorator(
+ definition, properties, getWizard(), getRuntimeDelegate() );
+ fDecorators[2] = new InstallableRuntimeDecorator( getWizard(),
+ getRuntimeDelegate() );
+ } else
+ {
+ fDecorators = new GenericServerCompositeDecorator[2];
+ fDecorators[0] = new JRESelectDecorator( getRuntimeDelegate() );
+ fDecorators[1] = new ServerTypeDefinitionRuntimeDecorator(
+ definition, properties, getWizard(), getRuntimeDelegate() );
}
-
- new GenericServerComposite(parent,fDecorators);
- }
-
- private String getServerDefinitionId(){
- String currentDefinition= null;
- if(getRuntimeDelegate()!=null)
- currentDefinition = getRuntimeDelegate().getRuntime().getRuntimeType().getId();
- if(currentDefinition!= null && currentDefinition.length()>0)
- {
- return currentDefinition;
- }
- return null;
- }
-
-
-
- /* (non-Javadoc)
- * @see org.eclipse.wst.server.ui.wizard.IWizardFragment#enter()
- */
- public void enter() {
- if(getRuntimeDelegate()!=null)
- getRuntimeDelegate().getRuntimeWorkingCopy().setName(createName());
-
- for (int i = 0; i < fDecorators.length; i++) {
- if(fDecorators[i].validate())
- return;
- }
- }
-
- public void exit() {
- //validate to save latest values
- for (int i = 0; i < fDecorators.length; i++) {
- if(fDecorators[i].validate())
- return;
- }
- }
+ new GenericServerComposite( parent, fDecorators );
+ }
+ private String getServerDefinitionId() {
+ String currentDefinition = null;
+ if( getRuntimeDelegate() != null )
+ currentDefinition = getRuntimeDelegate().getRuntime()
+ .getRuntimeType().getId();
+ if( currentDefinition != null && currentDefinition.length() > 0 )
+ {
+ return currentDefinition;
+ }
+ return null;
+ }
- private String createName()
- {
- RuntimeDelegate dl = getRuntimeDelegate();
- IRuntimeType runtimeType = dl.getRuntime().getRuntimeType();
- String name = GenericServerUIMessages.bind(GenericServerUIMessages.runtimeName,runtimeType.getName());
- IRuntime[] list = ServerCore.getRuntimes();
- int suffix = 1;
- String suffixName=name;
- for(int i=0;i<list.length;i++)
- {
- if((list[i].getName().equals(name)|| list[i].getName().equals(suffixName))&& !list[i].equals(dl.getRuntime()))
- suffix++;
- suffixName= name+" "+suffix; //$NON-NLS-1$
- }
-
- if(suffix>1)
- return suffixName;
- return name;
- }
-
- private GenericServerRuntime getRuntimeDelegate(){
- IRuntimeWorkingCopy wc = (IRuntimeWorkingCopy) getTaskModel().getObject(TaskModel.TASK_RUNTIME);
- if (wc == null)
- return null;
- return (GenericServerRuntime) wc.loadAdapter(GenericServerRuntime.class, new NullProgressMonitor());
- }
- /* (non-Javadoc)
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.eclipse.wst.server.ui.wizard.IWizardFragment#enter()
+ */
+ public void enter() {
+ if( getRuntimeDelegate() != null )
+ getRuntimeDelegate().getRuntimeWorkingCopy().setName( createName() );
+
+ for( int i = 0; i < fDecorators.length; i++ )
+ {
+ if( fDecorators[i].validate() )
+ return;
+ }
+ }
+
+ public void exit() {
+ // validate to save latest values
+ for( int i = 0; i < fDecorators.length; i++ )
+ {
+ if( fDecorators[i].validate() )
+ return;
+ }
+ }
+
+ private String createName() {
+ RuntimeDelegate dl = getRuntimeDelegate();
+ IRuntimeType runtimeType = dl.getRuntime().getRuntimeType();
+ String name = GenericServerUIMessages.bind(
+ GenericServerUIMessages.runtimeName, runtimeType.getName() );
+ IRuntime[] list = ServerCore.getRuntimes();
+ int suffix = 1;
+ String suffixName = name;
+ for( int i = 0; i < list.length; i++ )
+ {
+ if( (list[i].getName().equals( name ) || list[i].getName().equals(
+ suffixName ))
+ && !list[i].equals( dl.getRuntime() ) )
+ suffix++;
+ suffixName = name + ' ' + suffix;
+ }
+
+ if( suffix > 1 )
+ return suffixName;
+ return name;
+ }
+
+ private GenericServerRuntime getRuntimeDelegate() {
+ IRuntimeWorkingCopy wc = (IRuntimeWorkingCopy) getTaskModel()
+ .getObject( TaskModel.TASK_RUNTIME );
+ if( wc == null )
+ return null;
+ return (GenericServerRuntime) wc.loadAdapter(
+ GenericServerRuntime.class, new NullProgressMonitor() );
+ }
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.jst.server.generic.internal.ui.ServerDefinitionTypeAwareWizardFragment#description()
*/
public String description() {
String rName = getRuntimeName();
- if(rName == null || rName.length()<1)
- rName="Generic"; //$NON-NLS-1$
- return GenericServerUIMessages.bind(GenericServerUIMessages.runtimeWizardDescription,rName);
+ if( rName == null || rName.length() < 1 )
+ rName = "Generic"; //$NON-NLS-1$
+ return GenericServerUIMessages.bind(
+ GenericServerUIMessages.runtimeWizardDescription, rName );
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.jst.server.generic.internal.ui.ServerDefinitionTypeAwareWizardFragment#title()
*/
public String title() {
String rName = getRuntimeName();
- if(rName == null || rName.length()<1)
- rName="Generic"; //$NON-NLS-1$
- return GenericServerUIMessages.bind(GenericServerUIMessages.runtimeWizardTitle,rName);
+ if( rName == null || rName.length() < 1 )
+ rName = "Generic"; //$NON-NLS-1$
+ return GenericServerUIMessages.bind(
+ GenericServerUIMessages.runtimeWizardTitle, rName );
}
-
- private String getRuntimeName()
- {
- if(getRuntimeDelegate()!=null && getRuntimeDelegate().getRuntime()!=null)
+
+ private String getRuntimeName() {
+ if( getRuntimeDelegate() != null
+ && getRuntimeDelegate().getRuntime() != null )
return getRuntimeDelegate().getRuntime().getName();
return null;
}
-
+
}
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerWizardFragment.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerWizardFragment.java
index 50834ed..00ca40e 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerWizardFragment.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerWizardFragment.java
@@ -23,60 +23,72 @@
import org.eclipse.wst.server.core.ServerCore;
import org.eclipse.wst.server.core.TaskModel;
import org.eclipse.wst.server.ui.wizard.IWizardHandle;
+
/**
*
- *
+ *
* @author Gorkem Ercan
*/
-public class GenericServerWizardFragment extends ServerDefinitionTypeAwareWizardFragment
-{
- private GenericServerCompositeDecorator[] fDecorators;
+public class GenericServerWizardFragment extends
+ ServerDefinitionTypeAwareWizardFragment {
+ private GenericServerCompositeDecorator[] fDecorators;
- /**
- *
- */
- public boolean isComplete() {
+ /**
+ *
+ */
+ public boolean isComplete() {
- ServerRuntime serverRuntime = getServerTypeDefinitionFor(getServer());
- if(serverRuntime==null)
- return false;
+ ServerRuntime serverRuntime = getServerTypeDefinitionFor( getServer() );
+ if( serverRuntime == null )
+ return false;
- IServerWorkingCopy server = getServer();
- GenericServer dl= (GenericServer)server.loadAdapter(GenericServer.class,null);
+ IServerWorkingCopy server = getServer();
+ GenericServer dl = (GenericServer) server.loadAdapter(
+ GenericServer.class, null );
- IStatus status = dl.validate();
- return (status != null && status.isOK());
-
- }
+ IStatus status = dl.validate();
+ return (status != null && status.isOK());
- public void createContent(Composite parent, IWizardHandle handle){
- IServerWorkingCopy server = getServer();
- GenericServer dl= (GenericServer)server.loadAdapter(GenericServer.class,null);
- ServerRuntime definition = getServerTypeDefinitionFor(server);
- fDecorators = new GenericServerCompositeDecorator[1];
- fDecorators[0]=new ServerTypeDefinitionServerDecorator(definition,null,getWizard(),dl);
- new GenericServerComposite(parent,fDecorators);
-
- }
- /**
+ }
+
+ public void createContent( Composite parent, IWizardHandle handle ) {
+ IServerWorkingCopy server = getServer();
+ GenericServer dl = (GenericServer) server.loadAdapter(
+ GenericServer.class, null );
+ ServerRuntime definition = getServerTypeDefinitionFor( server );
+ fDecorators = new GenericServerCompositeDecorator[1];
+ fDecorators[0] = new ServerTypeDefinitionServerDecorator( definition,
+ null, getWizard(), dl );
+ new GenericServerComposite( parent, fDecorators );
+
+ }
+
+ /**
* @param server
* @return
*/
- private ServerRuntime getServerTypeDefinitionFor(IServerWorkingCopy server) {
- GenericServerRuntime runtime = (GenericServerRuntime)server.getRuntime().getAdapter(GenericServerRuntime.class);
- if(runtime==null){
- IRuntime wc = (IRuntime)getTaskModel().getObject(TaskModel.TASK_RUNTIME);
- runtime= (GenericServerRuntime)wc.getAdapter(GenericServerRuntime.class);
- if(runtime==null)
- runtime= (GenericServerRuntime)wc.loadAdapter(GenericServerRuntime.class,new NullProgressMonitor());
+ private ServerRuntime getServerTypeDefinitionFor( IServerWorkingCopy server ) {
+ GenericServerRuntime runtime = (GenericServerRuntime) server
+ .getRuntime().getAdapter( GenericServerRuntime.class );
+ if( runtime == null )
+ {
+ IRuntime wc = (IRuntime) getTaskModel().getObject(
+ TaskModel.TASK_RUNTIME );
+ runtime = (GenericServerRuntime) wc
+ .getAdapter( GenericServerRuntime.class );
+ if( runtime == null )
+ runtime = (GenericServerRuntime) wc.loadAdapter(
+ GenericServerRuntime.class, new NullProgressMonitor() );
}
String serverTyepId = server.getServerType().getId();
String runtimeTypeId = runtime.getRuntime().getRuntimeType().getId();
- if(runtimeTypeId==null){
+ if( runtimeTypeId == null )
+ {
return null;
}
Map runtimeProperties = runtime.getServerInstanceProperties();
- ServerRuntime definition = getServerTypeDefinition(serverTyepId, runtimeTypeId, runtimeProperties);
+ ServerRuntime definition = getServerTypeDefinition( serverTyepId,
+ runtimeTypeId, runtimeProperties );
return definition;
}
@@ -84,66 +96,83 @@
* @return
*/
private IServerWorkingCopy getServer() {
- IServerWorkingCopy server = (IServerWorkingCopy)getTaskModel().getObject(TaskModel.TASK_SERVER);
+ IServerWorkingCopy server = (IServerWorkingCopy) getTaskModel()
+ .getObject( TaskModel.TASK_SERVER );
return server;
}
- private boolean isNameInUse(String name){
- IServer[] servers =ServerCore.getServers();
- for (int i = 0; i < servers.length; i++) {
- if(!servers[i].equals(getServer().getOriginal()) && (servers[i].getName().equals(name) ))
- return true;
- }
- return false;
+ private boolean isNameInUse( String name ) {
+ IServer[] servers = ServerCore.getServers();
+ for( int i = 0; i < servers.length; i++ )
+ {
+ if( !servers[i].equals( getServer().getOriginal() )
+ && (servers[i].getName().equals( name )) )
+ return true;
+ }
+ return false;
}
-
- private String createName(){
- String name = GenericServerUIMessages.bind(GenericServerUIMessages.serverName,getServerTypeDefinitionFor(getServer()).getName());
- int suffix=1;
- String suffixName =name;
- while(isNameInUse(suffixName)){
- suffixName = name+" "+suffix; //$NON-NLS-1$
- suffix++;
- }
- return suffixName;
+
+ private String createName() {
+ String name = GenericServerUIMessages.bind(
+ GenericServerUIMessages.serverName, getServerTypeDefinitionFor(
+ getServer() ).getName() );
+ int suffix = 1;
+ String suffixName = name;
+ while( isNameInUse( suffixName ) )
+ {
+ suffixName = name + ' ' + suffix;
+ suffix++;
+ }
+ return suffixName;
}
+
public void enter() {
- getServer().setName(createName());
- for (int i = 0; i < fDecorators.length; i++) {
- if(fDecorators[i].validate())
- return;
- }
- }
- public void exit() {
- //validate needed to save the latest values.
- for (int i = 0; i < fDecorators.length; i++) {
- if(fDecorators[i].validate())
- return;
- }
- }
- /* (non-Javadoc)
+ getServer().setName( createName() );
+ for( int i = 0; i < fDecorators.length; i++ )
+ {
+ if( fDecorators[i].validate() )
+ return;
+ }
+ }
+
+ public void exit() {
+ // validate needed to save the latest values.
+ for( int i = 0; i < fDecorators.length; i++ )
+ {
+ if( fDecorators[i].validate() )
+ return;
+ }
+ }
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.jst.server.generic.internal.ui.ServerDefinitionTypeAwareWizardFragment#description()
*/
public String description() {
String sName = getServerName();
- if(sName==null || sName.length()<1)
- sName="Generic"; //$NON-NLS-1$
- return GenericServerUIMessages.bind(GenericServerUIMessages.serverWizardDescription,sName);
+ if( sName == null || sName.length() < 1 )
+ sName = "Generic"; //$NON-NLS-1$
+ return GenericServerUIMessages.bind(
+ GenericServerUIMessages.serverWizardDescription, sName );
}
- private String getServerName()
- {
- if(getServer()!=null && getServer().getRuntime()!=null)
- return getServer().getRuntime().getRuntimeType().getName();
+ private String getServerName() {
+ if( getServer() != null && getServer().getRuntime() != null )
+ return getServer().getRuntime().getRuntimeType().getName();
return null;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
+ *
* @see org.eclipse.jst.server.generic.internal.ui.ServerDefinitionTypeAwareWizardFragment#title()
*/
public String title() {
- String sName= getServerName();
- if(sName==null || sName.length()<1)
- sName="Generic"; //$NON-NLS-1$
- return GenericServerUIMessages.bind(GenericServerUIMessages.serverWizardTitle,sName);
+ String sName = getServerName();
+ if( sName == null || sName.length() < 1 )
+ sName = "Generic"; //$NON-NLS-1$
+ return GenericServerUIMessages.bind(
+ GenericServerUIMessages.serverWizardTitle, sName );
}
}
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/InstallableRuntimeDecorator.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/InstallableRuntimeDecorator.java
index eff3be5..1a4ccd5 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/InstallableRuntimeDecorator.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/InstallableRuntimeDecorator.java
@@ -58,10 +58,7 @@
try {
fWizard.run(true, false, runnable);
- } catch (InterruptedException e) {
- e.printStackTrace();
- } catch (InvocationTargetException e) {
- e.printStackTrace();
+
} catch (Exception e) {
Trace.trace(Trace.SEVERE,
"Error installing runtime", e); //$NON-NLS-1$
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/SWTUtil.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/SWTUtil.java
index ad196fe..d29ee93 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/SWTUtil.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/SWTUtil.java
@@ -141,7 +141,7 @@
button = SWTUtil.createButton(parent,
GenericServerUIMessages.serverTypeGroup_label_browse);
} else {
- label = createFormLabel(title, parent, toolkit);
+ createFormLabel(title, parent, toolkit);
cText = toolkit.createText(parent, value);
button = toolkit.createButton(parent,
GenericServerUIMessages.serverTypeGroup_label_browse,
@@ -207,7 +207,7 @@
button = SWTUtil.createButton(parent,
GenericServerUIMessages.serverTypeGroup_label_browse);
} else {
- label = createFormLabel(title, parent, toolkit);
+ createFormLabel(title, parent, toolkit);
cText = toolkit.createText(parent, value);
button = toolkit.createButton(parent,
GenericServerUIMessages.serverTypeGroup_label_browse,
@@ -269,7 +269,7 @@
label.setText(title);
text = new Text(parent, SWT.SHADOW_IN | SWT.BORDER);
} else {
- label = createFormLabel(title, parent, toolkit);
+ createFormLabel(title, parent, toolkit);
text = toolkit.createText(parent, value);
}
@@ -311,7 +311,7 @@
label.setText(title);
button = new Button(parent, SWT.CHECK);
} else {
- label = createFormLabel(title, parent, toolkit);
+ createFormLabel(title, parent, toolkit);
button = toolkit.createButton(parent, null, SWT.CHECK);
}
@@ -324,7 +324,7 @@
}
/**
- * Creates a label and an editable Combo
+ * Creates a label and an editable Combo.
*
* @param title
* @param values
@@ -352,7 +352,7 @@
label = new Label(parent, SWT.WRAP);
label.setText(title);
} else {
- label = createFormLabel(title, parent, toolkit);
+ createFormLabel(title, parent, toolkit);
}
Combo combo = new Combo(parent, SWT.READ_ONLY);
if (toolkit != null) {
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionDecorator.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionDecorator.java
index b891fba..3e43573 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionDecorator.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionDecorator.java
@@ -41,7 +41,7 @@
private ServerRuntime fDefinition;
private Map fProperties;
private String fContext;
- private String fLastMessage = null;
+ private String fLastMessage;
protected IWizardHandle fWizard;
private List fPropertyControls= new ArrayList();
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionServerDecorator.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionServerDecorator.java
index 727c258..71a8ca9 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionServerDecorator.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerTypeDefinitionServerDecorator.java
@@ -30,9 +30,12 @@
}
public boolean validate() {
- if(fServer!=null)
+ IStatus status = null;
+ if(fServer!=null)
+ {
fServer.setServerInstanceProperties(getValues());
- IStatus status = fServer.validate();
+ status = fServer.validate();
+ }
if(status==null || status.isOK())
{
fWizard.setMessage(null, IMessageProvider.NONE);
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/editor/ServerPropertiesEditorSection.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/editor/ServerPropertiesEditorSection.java
index 3e5bea5..c9e989c 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/editor/ServerPropertiesEditorSection.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/editor/ServerPropertiesEditorSection.java
@@ -36,7 +36,7 @@
private GenericServer fServer;
private PropertyChangeListener fPropertyChangeListener;
private Map fControls = new HashMap();
- private boolean fUpdating = false;
+ private boolean fUpdating;
public void init(IEditorSite site, IEditorInput input) {
super.init(site, input);
