Improved wizard pages
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerComposite.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerComposite.java
index 22621da..9fa2b1d 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerComposite.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/GenericServerComposite.java
@@ -11,8 +11,9 @@
public GenericServerComposite(Composite parent, GenericServerCompositeDecorator[] decorators) {
super(parent, SWT.NONE);
fDecorators = decorators;
+ GridLayout layout =new GridLayout(3,false);
+ setLayout(layout);
setLayoutData(new GridData(GridData.FILL_BOTH));
- setLayout(new GridLayout(3,false));
createControl();
}
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 ddd8b3c..d4fbe9e 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
@@ -36,7 +36,6 @@
import org.eclipse.jst.server.generic.core.internal.GenericServerRuntime;
import org.eclipse.jst.server.generic.servertype.definition.ServerRuntime;
import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
import org.eclipse.wst.server.core.IRuntime;
import org.eclipse.wst.server.core.IRuntimeType;
import org.eclipse.wst.server.core.IRuntimeWorkingCopy;
@@ -53,7 +52,7 @@
public class GenericServerRuntimeWizardFragment extends ServerDefinitionTypeAwareWizardFragment {
private GenericServerCompositeDecorator[] fDecorators;
- Composite fParent;
+
/**
* Constructor
@@ -72,9 +71,17 @@
return (status != null && status.isOK());
}
- public void createContent(Composite parent, IWizardHandle handle) {
- this.fParent = parent;
-
+ public void createContent(Composite parent, IWizardHandle handle) {
+ Map properties= null;
+ ServerRuntime definition=null;
+ if(getRuntimeDelegate()!=null){
+ properties = getRuntimeDelegate().getServerInstanceProperties();
+ definition = getServerTypeDefinition(getServerDefinitionId(),properties);
+ }
+ fDecorators= new GenericServerCompositeDecorator[2];
+ fDecorators[0]= new JRESelectDecorator(getRuntimeDelegate());
+ fDecorators[1]= new ServerTypeDefinitionRuntimeDecorator(definition,properties,getWizard(),getRuntimeDelegate());
+ GenericServerComposite composite = new GenericServerComposite(parent,fDecorators);
}
@@ -98,26 +105,6 @@
if(getRuntimeDelegate()!=null)
getRuntimeDelegate().getRuntimeWorkingCopy().setName(createName());
-
- Control[] controls = fParent.getChildren();
- for (int i = 0; i < controls.length; i++) {
- controls[i].dispose();
- }
- // This block should really be in createContent
- // moved here as a workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=98098
- Map properties= null;
- ServerRuntime definition=null;
- if(getRuntimeDelegate()!=null){
- properties = getRuntimeDelegate().getServerInstanceProperties();
- definition = getServerTypeDefinition(getServerDefinitionId(),properties);
- }
- fDecorators= new GenericServerCompositeDecorator[2];
- fDecorators[0]= new JRESelectDecorator(getRuntimeDelegate());
- fDecorators[1]= new ServerTypeDefinitionRuntimeDecorator(definition,properties,getWizard(),getRuntimeDelegate());
- GenericServerComposite composite = new GenericServerComposite(fParent,fDecorators);
- fParent.layout();
- //end
-
for (int i = 0; i < fDecorators.length; i++) {
if(fDecorators[i].validate())
return;
diff --git a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerDefinitionTypeAwareWizardFragment.java b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerDefinitionTypeAwareWizardFragment.java
index ccf3228..359540f 100644
--- a/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerDefinitionTypeAwareWizardFragment.java
+++ b/plugins/org.eclipse.jst.server.generic.ui/src/org/eclipse/jst/server/generic/ui/internal/ServerDefinitionTypeAwareWizardFragment.java
@@ -31,9 +31,10 @@
this.fWizard = handle;
Composite container = new Composite(parent, SWT.NONE);
- container.setLayoutData(new GridData(GridData.FILL_BOTH));
GridLayout grid = new GridLayout(1,false);
+ grid.marginWidth=0;
container.setLayout(grid);
+ container.setLayoutData(new GridData(GridData.FILL_BOTH));
handle.setImageDescriptor(GenericUiPlugin.getDefault().imageDescriptor(GenericUiPlugin.WIZBAN_IMAGE));
handle.setTitle(title());
handle.setDescription(description());
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 8496920..4d7ae38 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
@@ -5,6 +5,8 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+
+import org.eclipse.jface.dialogs.Dialog;
import org.eclipse.jface.dialogs.IMessageProvider;
import org.eclipse.jst.server.generic.servertype.definition.Property;
import org.eclipse.jst.server.generic.servertype.definition.ServerRuntime;
@@ -85,6 +87,7 @@
if (this.fContext.equals(property.getContext()))
createPropertyControl(composite, property);
}
+ Dialog.applyDialogFont(composite);
}
