Author: scabanovich Date: 2007-11-02 08:02:02 -0400 (Fri, 02 Nov 2007) New Revision: 4657 Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/RadioFieldEditor.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/RadioField.java trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java Log: JBIDE-1220 Added choice for vertical/horizontal layout in RadioField. Vertical layout is used in Generate Entities Wizard. Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/RadioFieldEditor.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/RadioFieldEditor.java 2007-11-02 11:49:02 UTC (rev 4656) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/editor/RadioFieldEditor.java 2007-11-02 12:02:02 UTC (rev 4657) @@ -47,7 +47,7 @@ public Control getComboControl(Composite composite) { if(radioField == null) { - radioField = new RadioField(composite,labels, values,getValue()); + radioField = new RadioField(composite,labels, values,getValue(), false); radioField.addPropertyChangeListener(this); } else if(composite!=null) { Assert.isTrue(radioField.getControl().getParent()==composite); Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/RadioField.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/RadioField.java 2007-11-02 11:49:02 UTC (rev 4656) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/widget/field/RadioField.java 2007-11-02 12:02:02 UTC (rev 4657) @@ -31,10 +31,12 @@ private Button[] radios; private Object value; - public RadioField(Composite parent, List<String> labels, List<Object> values, Object defaultValue) { + public RadioField(Composite parent, List<String> labels, List<Object> values, Object defaultValue, boolean verticalLayout) { topComposite = new Composite(parent, SWT.NONE); - topComposite.setLayout(new GridLayout(values.size(), false)); -// topComposite.setLayoutData(new GridData(SWT.BEGINNING)); + topComposite.setLayout(new GridLayout(verticalLayout ? 1 : values.size(), false)); + if(verticalLayout) { + topComposite.setLayoutData(new GridData(GridData.FILL_HORIZONTAL)); + } radios = new Button[values.size()]; if(defaultValue==null && values.size()>0) { @@ -44,7 +46,7 @@ radios[i] = new Button(topComposite, SWT.RADIO); radios[i].setText(labels.get(i)); radios[i].addSelectionListener(this); - radios[i].setLayoutData(new GridData(GridData.BEGINNING)); + radios[i].setLayoutData(new GridData(verticalLayout ? GridData.FILL_HORIZONTAL : GridData.BEGINNING)); Object value = values.get(i); radios[i].setData(value); if(value != null && value.equals(defaultValue)) { Modified: trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java =================================================================== --- trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java 2007-11-02 11:49:02 UTC (rev 4656) +++ trunk/seam/plugins/org.jboss.tools.seam.ui/src/org/jboss/tools/seam/ui/wizard/SeamGenerateEnitiesWizardPage.java 2007-11-02 12:02:02 UTC (rev 4657) @@ -102,7 +102,7 @@ ArrayList<String> labels = new ArrayList<String>(); labels.add(SeamUIMessages.GENERATE_SEAM_ENTITIES_WIZARD_REVERSE_ENGINEER_LABEL); labels.add(SeamUIMessages.GENERATE_SEAM_ENTITIES_WIZARD_EXISTING_ENTITIES_LABEL); - radios = new RadioField(radioComposite, labels, values, null); + radios = new RadioField(radioComposite, labels, values, null, true); radios.addPropertyChangeListener(this); setControl(top);