minor layout tweaks to the entity generation wizard
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/DatabaseGroup.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/DatabaseGroup.java
index ea01485..b983817 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/DatabaseGroup.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/DatabaseGroup.java
@@ -90,7 +90,10 @@
this.connectionComboBox = this.buildComboBox(parent, widthHint, this.buildConnectionComboBoxSelectionListener());
// add connection button
- this.buildButton(parent, JptUiEntityGenMessages.addConnectionLink, ImageRepository.getAddConnectionButtonImage(this.resourceManager), this.buildAddConnectionLinkSelectionListener());
+ Button addConnectionButton = this.buildButton(parent, JptUiEntityGenMessages.addConnectionLink, ImageRepository.getAddConnectionButtonImage(this.resourceManager), this.buildAddConnectionLinkSelectionListener());
+ GridData data = new GridData();
+ addConnectionButton.setLayoutData(data);
+
// A composite holds the reconnect button & text
this.buildLabel(parent, 1, ""); //$NON-NLS-1$
@@ -109,7 +112,7 @@
// schema combo-box
this.buildLabel(parent, 1, JptUiEntityGenMessages.schema);
this.schemaComboBox = new Combo(parent, SWT.BORDER | SWT.READ_ONLY);
- GridData data = new GridData(SWT.BEGINNING, SWT.CENTER, true, false);
+ data = new GridData(SWT.BEGINNING, SWT.CENTER, true, false);
data.horizontalAlignment = SWT.FILL;
data.horizontalSpan = 1;
data.grabExcessHorizontalSpace = true ;
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/TableGenPanel.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/TableGenPanel.java
index 75518c9..f533675 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/TableGenPanel.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/TableGenPanel.java
@@ -100,14 +100,12 @@
}
private void createGenerateOptionalAnnotationControls(Group parent, int columns) {
- SWTUtil.createLabel(parent, 1, "");
generateOptionalAnnotations = new Button(parent, SWT.CHECK );
generateOptionalAnnotations.setText( JptUiEntityGenMessages.GenerateEntitiesWizard_defaultTablePage_genOptionalAnnotations);
generateOptionalAnnotations.setToolTipText(JptUiEntityGenMessages.GenerateEntitiesWizard_defaultTablePage_genOptionalAnnotations_desc);
GridData gd = new GridData();
- gd.horizontalSpan = columns-1;
- gd.horizontalIndent = 3 ;
+ gd.horizontalSpan = columns;
generateOptionalAnnotations.setLayoutData(gd);
generateOptionalAnnotations.addSelectionListener(new SelectionListener(){
public void widgetDefaultSelected(SelectionEvent e) {}
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/TablesSelectorWizardPage.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/TablesSelectorWizardPage.java
index 3d20c0a..9e971f4 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/TablesSelectorWizardPage.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/TablesSelectorWizardPage.java
@@ -137,8 +137,6 @@
createTablesSelectionControl(composite, nColumns);
- //Filler column
- new Label( composite, SWT.NONE);
this.updatePersistenceXmlCheckBox = new Button(composite, SWT.CHECK);
this.updatePersistenceXmlCheckBox.setText(JptUiEntityGenMessages.GenerateEntitiesWizard_tableSelectPage_updatePersistenceXml );
@@ -151,7 +149,7 @@
}
});
- fillColumns( this.updatePersistenceXmlCheckBox, 2);
+ fillColumns( this.updatePersistenceXmlCheckBox, 3);
//Filler column
@@ -319,6 +317,9 @@
Composite buttonComposite = new Composite(parent, SWT.NULL);
GridLayout buttonLayout = new GridLayout(1, false);
+ buttonLayout.marginHeight = 0;
+ buttonLayout.marginWidth = 0;
+
buttonComposite.setLayout(buttonLayout);
GridData data = new GridData();
data.horizontalAlignment = GridData.FILL;
