1 files changed, 10 insertions, 82 deletions

diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideDialog.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideDialog.java
index f2c40a13fc..358458b2dc 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideDialog.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/mappings/details/JoinColumnInAssociationOverrideDialog.java
@@ -9,34 +9,16 @@
  ******************************************************************************/
 package org.eclipse.jpt.ui.internal.mappings.details;
 
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jpt.core.internal.IAttributeMapping;
-import org.eclipse.jpt.core.internal.mappings.DefaultTrueBoolean;
 import org.eclipse.jpt.core.internal.mappings.IAssociationOverride;
 import org.eclipse.jpt.core.internal.mappings.IEntity;
 import org.eclipse.jpt.core.internal.mappings.IJoinColumn;
 import org.eclipse.jpt.core.internal.mappings.ISingleRelationshipMapping;
+import org.eclipse.jpt.db.internal.Schema;
 import org.eclipse.jpt.db.internal.Table;
-import org.eclipse.jpt.ui.internal.IJpaHelpContextIds;
-import org.eclipse.jpt.ui.internal.mappings.JptUiMappingsMessages;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
-import org.eclipse.ui.PlatformUI;
-import org.eclipse.ui.help.IWorkbenchHelpSystem;
 
-public class JoinColumnInAssociationOverrideDialog extends AbstractJoinColumnDialog<IJoinColumn> {
-	private DefaultTrueBoolean insertable;
-	private ComboViewer insertableComboViewer;
-
-	private DefaultTrueBoolean updatable;
-	private ComboViewer updatableComboViewer;
+public class JoinColumnInAssociationOverrideDialog extends JoinColumnDialog {
 
 	private IAssociationOverride associationOverride;
 	
@@ -49,44 +31,16 @@ public class JoinColumnInAssociationOverrideDialog extends AbstractJoinColumnDia
 		super(parent, joinColumn);
 		this.associationOverride = (IAssociationOverride) joinColumn.eContainer();
 	}
-
-	protected Control createDialogArea(Composite parent) {
-		IWorkbenchHelpSystem helpSystem = PlatformUI.getWorkbench().getHelpSystem();
-		Composite composite = (Composite) super.createDialogArea(parent);
-		
-		Label insertableLabel = new Label(composite, SWT.LEFT);
-		insertableLabel.setText(JptUiMappingsMessages.JoinColumnDialog_insertable);
-		insertableLabel.setLayoutData(new GridData());
-		
-		this.insertableComboViewer = this.buildInsertableComboViewer(composite);
-		this.insertableComboViewer.getCombo().setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		helpSystem.setHelp(this.insertableComboViewer.getCombo(), IJpaHelpContextIds.MAPPING_COLUMN_INSERTABLE);
-	
-		Label updatableLabel = new Label(composite, SWT.LEFT);
-		updatableLabel.setText(JptUiMappingsMessages.JoinColumnDialog_updatable);
-		updatableLabel.setLayoutData(new GridData());
-		
-		this.updatableComboViewer = this.buildUpdatableComboViewer(composite);
-		this.updatableComboViewer.getCombo().setLayoutData(new GridData(GridData.FILL_HORIZONTAL | GridData.GRAB_HORIZONTAL));
-		helpSystem.setHelp(this.updatableComboViewer.getCombo(), IJpaHelpContextIds.MAPPING_COLUMN_UPDATABLE);
 	
-		return composite;
-	}
-
-	private ComboViewer buildInsertableComboViewer(Composite parent) {
-		ComboViewer viewer = new ComboViewer(parent, SWT.READ_ONLY);
-		viewer.add(DefaultTrueBoolean.VALUES.toArray());
-		DefaultTrueBoolean sel = (this.joinColumn() == null) ? DefaultTrueBoolean.DEFAULT : this.joinColumn().getInsertable();
-		viewer.setSelection(new StructuredSelection(sel));
-		return viewer;
+	protected Schema getSchema() {
+		return this.associationOverride.typeMapping().dbSchema();
 	}
-
-	private ComboViewer buildUpdatableComboViewer(Composite parent) {
-		ComboViewer viewer = new ComboViewer(parent, SWT.READ_ONLY);
-		viewer.add(DefaultTrueBoolean.VALUES.toArray());
-		DefaultTrueBoolean sel = (this.joinColumn() == null) ? DefaultTrueBoolean.DEFAULT : this.joinColumn().getUpdatable();
-		viewer.setSelection(new StructuredSelection(sel));
-		return viewer;
+	
+	protected String defaultTableName() {
+		if (getJoinColumn() != null) {
+			return getJoinColumn().getDefaultTable();
+		}
+		return this.associationOverride.typeMapping().getTableName();
 	}
 
 	protected Table getNameTable() {
@@ -105,30 +59,4 @@ public class JoinColumnInAssociationOverrideDialog extends AbstractJoinColumnDia
 		return null;
 	}
 
-	private IJoinColumn joinColumn() {
-		return this.getJoinColumn();
-	}
-
-	public DefaultTrueBoolean getInsertable() {
-		return this.insertable;
-	}
-
-	public DefaultTrueBoolean getUpdatable() {
-		return this.updatable;
-	}
-
-	public boolean close() {
-		ISelection selection = this.insertableComboViewer.getSelection();
-		if (selection instanceof IStructuredSelection) {
-			this.insertable = (DefaultTrueBoolean) ((IStructuredSelection) selection).getFirstElement();
-		}
-
-		selection = this.updatableComboViewer.getSelection();
-		if (selection instanceof IStructuredSelection) {
-			this.updatable = (DefaultTrueBoolean) ((IStructuredSelection) selection).getFirstElement();
-		}
-
-		return super.close();
-	}
-
 }