#2654 Create constraint dialog: make it more clear (+fix layout)

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/object/struct/AttributesSelectorPage.java

@@ -288,10 +288,10 @@ public abstract class AttributesSelectorPage extends BaseObjectEditPage {
         final Composite tableGroup = new Composite(panel, SWT.NONE);
         tableGroup.setLayout(new GridLayout(2, false));
         tableGroup.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
-        Text tableNameLabel = UIUtils.createLabelText(
+        UIUtils.createLabelText(
             tableGroup,
             CoreMessages.dialog_struct_columns_select_label_table,
-            DBUtils.getObjectFullName(entity, DBPEvaluationContext.UI), SWT.BORDER | SWT.READ_ONLY);
+            DBUtils.getObjectFullName(entity, DBPEvaluationContext.UI), SWT.BORDER | SWT.READ_ONLY, new GridData(GridData.FILL_HORIZONTAL));
         return tableGroup;
     }
 

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/ui/editors/object/struct/EditConstraintPage.java

@@ -144,12 +144,7 @@ public class EditConstraintPage extends AttributesSelectorPage {
 
         final Text nameText = entity != null ? UIUtils.createLabelText(panel, "Name", constraintName) : null;
         if (nameText != null) {
-            nameText.addModifyListener(new ModifyListener() {
-                @Override
-                public void modifyText(ModifyEvent e) {
-                    constraintName = nameText.getText();
-                }
-            });
+            nameText.addModifyListener(e -> constraintName = nameText.getText());
         }
 
         UIUtils.createControlLabel(panel, CoreMessages.dialog_struct_edit_constrain_label_type);
@@ -163,7 +158,7 @@ public class EditConstraintPage extends AttributesSelectorPage {
             }
         }
         typeCombo.select(0);
-        typeCombo.setEnabled(constraintTypes.length > 1);
+        //typeCombo.setEnabled(constraintTypes.length > 1);
         typeCombo.addSelectionListener(new SelectionAdapter() {
             @Override
             public void widgetSelected(SelectionEvent e)
@@ -185,16 +180,17 @@ public class EditConstraintPage extends AttributesSelectorPage {
                 toggleEditAreas();
             }
         });
-        
-        final Button enableConstraintButton = UIUtils.createCheckbox(panel, "Enable Constraint", true);
-        enableConstraintButton.setVisible(showEnable);
-        enableConstraintButton.addSelectionListener(new SelectionAdapter() {
-        	@Override
-        	public void widgetSelected(SelectionEvent e)
-        	{
-        		enableConstraint = enableConstraintButton.getSelection();
-        	}
-		});
+
+        {
+            final Button enableConstraintButton = UIUtils.createCheckbox(panel, "Enable Constraint", "Enable constraint after creation", true, 2);
+            enableConstraintButton.setVisible(showEnable);
+            enableConstraintButton.addSelectionListener(new SelectionAdapter() {
+                @Override
+                public void widgetSelected(SelectionEvent e) {
+                    enableConstraint = enableConstraintButton.getSelection();
+                }
+            });
+        }
     }
 
     @Override