summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKaren Butzke2012-09-25 07:50:32 (EDT)
committerKaren Butzke2012-09-25 07:50:32 (EDT)
commit49b62e1aa96cbc360da111e0bfb04a13304fc42d (patch)
treef7957417df9eea0f899af2d7a91617d9edd0b184
parentba6e3586e997ea27cf3035065456a482c72b0c9d (diff)
downloadwebtools.dali-49b62e1aa96cbc360da111e0bfb04a13304fc42d.zip
webtools.dali-49b62e1aa96cbc360da111e0bfb04a13304fc42d.tar.gz
webtools.dali-49b62e1aa96cbc360da111e0bfb04a13304fc42d.tar.bz2
Revert "Bug 348145 - The list of discriminator columns/order columns not updated when table of entity changed"v201209251600
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyNamedColumn.java1
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualNamedColumn.java13
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumn.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualNamedColumn.java13
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/DiscriminatorColumnComposite.java12
-rw-r--r--jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrderColumnComposite.java13
7 files changed, 3 insertions, 73 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyNamedColumn.java
index 8475a29..4cdd707 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyNamedColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/context/ReadOnlyNamedColumn.java
@@ -69,7 +69,6 @@ public interface ReadOnlyNamedColumn
* Return the column's datasource table.
*/
Table getDbTable();
- String DB_TABLE_PROPERTY = "dbTable"; //$NON-NLS-1$
/**
* Return whether the column is found on the datasource.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java
index 735064c..74b8443 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaNamedColumn.java
@@ -51,7 +51,6 @@ public abstract class AbstractJavaNamedColumn<A extends NamedColumnAnnotation, O
protected String columnDefinition;
- protected Table dbTable;
protected AbstractJavaNamedColumn(JpaContextNode parent, O owner) {
this(parent, owner, null);
@@ -86,7 +85,6 @@ public abstract class AbstractJavaNamedColumn<A extends NamedColumnAnnotation, O
public void update() {
super.update();
this.setDefaultName(this.buildDefaultName());
- this.setDbTable(this.buildDbTable());
}
@@ -193,16 +191,6 @@ public abstract class AbstractJavaNamedColumn<A extends NamedColumnAnnotation, O
}
public Table getDbTable() {
- return this.dbTable;
- }
-
- protected void setDbTable(Table dbTable) {
- Table old = this.dbTable;
- this.dbTable = dbTable;
- this.firePropertyChanged(DB_TABLE_PROPERTY, old, dbTable);
- }
-
- protected Table buildDbTable() {
return this.owner.resolveDbTable(this.getTable());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualNamedColumn.java
index e090bd8..ece6bb8 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualNamedColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/java/AbstractJavaVirtualNamedColumn.java
@@ -40,7 +40,6 @@ public abstract class AbstractJavaVirtualNamedColumn<O extends ReadOnlyNamedColu
protected String columnDefinition;
- protected Table dbTable;
protected AbstractJavaVirtualNamedColumn(JpaContextNode parent, O owner) {
super(parent);
@@ -58,8 +57,6 @@ public abstract class AbstractJavaVirtualNamedColumn<O extends ReadOnlyNamedColu
this.setDefaultName(this.buildDefaultName());
this.setColumnDefinition(this.buildColumnDefinition());
-
- this.setDbTable(this.buildDbTable());
}
@@ -131,16 +128,6 @@ public abstract class AbstractJavaVirtualNamedColumn<O extends ReadOnlyNamedColu
}
public Table getDbTable() {
- return this.dbTable;
- }
-
- protected void setDbTable(Table dbTable) {
- Table old = this.dbTable;
- this.dbTable = dbTable;
- this.firePropertyChanged(DB_TABLE_PROPERTY, old, dbTable);
- }
-
- protected Table buildDbTable() {
return this.owner.resolveDbTable(this.getTable());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumn.java
index b5174cf..28013bc 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmNamedColumn.java
@@ -52,7 +52,6 @@ public abstract class AbstractOrmNamedColumn<X extends XmlNamedColumn, O extends
protected String columnDefinition;
- protected Table dbTable;
// ********** constructor/initialization **********
@@ -82,7 +81,6 @@ public abstract class AbstractOrmNamedColumn<X extends XmlNamedColumn, O extends
public void update() {
super.update();
this.setDefaultName(this.buildDefaultName());
- this.setDbTable(this.buildDbTable());
}
@@ -201,16 +199,6 @@ public abstract class AbstractOrmNamedColumn<X extends XmlNamedColumn, O extends
}
public Table getDbTable() {
- return this.dbTable;
- }
-
- protected void setDbTable(Table dbTable) {
- Table old = this.dbTable;
- this.dbTable = dbTable;
- this.firePropertyChanged(DB_TABLE_PROPERTY, old, dbTable);
- }
-
- protected Table buildDbTable() {
return this.owner.resolveDbTable(this.getTable());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualNamedColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualNamedColumn.java
index 792d412..df24982 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualNamedColumn.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualNamedColumn.java
@@ -41,7 +41,6 @@ public abstract class AbstractOrmVirtualNamedColumn<O extends ReadOnlyNamedColum
protected String columnDefinition;
- protected Table dbTable;
protected AbstractOrmVirtualNamedColumn(JpaContextNode parent, O owner) {
super(parent);
@@ -59,8 +58,6 @@ public abstract class AbstractOrmVirtualNamedColumn<O extends ReadOnlyNamedColum
this.setDefaultName(this.buildDefaultName());
this.setColumnDefinition(this.buildColumnDefinition());
-
- this.setDbTable(this.buildDbTable());
}
@@ -132,16 +129,6 @@ public abstract class AbstractOrmVirtualNamedColumn<O extends ReadOnlyNamedColum
}
public Table getDbTable() {
- return this.dbTable;
- }
-
- protected void setDbTable(Table dbTable) {
- Table old = this.dbTable;
- this.dbTable = dbTable;
- this.firePropertyChanged(DB_TABLE_PROPERTY, old, dbTable);
- }
-
- protected Table buildDbTable() {
return this.owner.resolveDbTable(this.getTable());
}
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/DiscriminatorColumnComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/DiscriminatorColumnComposite.java
index e3e2495..fd831c7 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/DiscriminatorColumnComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/details/DiscriminatorColumnComposite.java
@@ -15,8 +15,8 @@ import org.eclipse.jpt.common.ui.internal.widgets.EnumFormComboViewer;
import org.eclipse.jpt.common.ui.internal.widgets.IntegerCombo;
import org.eclipse.jpt.common.ui.internal.widgets.Pane;
import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
-import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
import org.eclipse.jpt.jpa.core.context.DiscriminatorColumn;
import org.eclipse.jpt.jpa.core.context.DiscriminatorType;
import org.eclipse.jpt.jpa.core.context.Entity;
@@ -150,16 +150,6 @@ public class DiscriminatorColumnComposite<T extends Entity> extends Pane<T> {
super.addPropertyNames(propertyNames);
propertyNames.add(ReadOnlyNamedColumn.SPECIFIED_NAME_PROPERTY);
propertyNames.add(ReadOnlyNamedColumn.DEFAULT_NAME_PROPERTY);
- propertyNames.add(ReadOnlyNamedColumn.DB_TABLE_PROPERTY);
- }
-
- @Override
- protected void propertyChanged(String propertyName) {
- if (propertyName.equals(ReadOnlyNamedColumn.DB_TABLE_PROPERTY)) {
- this.doPopulate();
- } else {
- super.propertyChanged(propertyName);
- }
}
@Override
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrderColumnComposite.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrderColumnComposite.java
index 595d794..c8f5124 100644
--- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrderColumnComposite.java
+++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/jpa2/details/OrderColumnComposite.java
@@ -10,13 +10,14 @@
package org.eclipse.jpt.jpa.ui.internal.jpa2.details;
import java.util.Collection;
+
import org.eclipse.jpt.common.ui.internal.JptCommonUiMessages;
import org.eclipse.jpt.common.ui.internal.widgets.Pane;
import org.eclipse.jpt.common.ui.internal.widgets.TriStateCheckBox;
import org.eclipse.jpt.common.utility.internal.model.value.PropertyAspectAdapter;
import org.eclipse.jpt.common.utility.internal.model.value.TransformationPropertyValueModel;
-import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
import org.eclipse.jpt.common.utility.model.value.PropertyValueModel;
+import org.eclipse.jpt.common.utility.model.value.ModifiablePropertyValueModel;
import org.eclipse.jpt.jpa.core.context.BaseColumn;
import org.eclipse.jpt.jpa.core.context.NamedColumn;
import org.eclipse.jpt.jpa.core.jpa2.context.OrderColumn2_0;
@@ -83,16 +84,6 @@ public class OrderColumnComposite extends Pane<OrderColumn2_0> {
super.addPropertyNames(propertyNames);
propertyNames.add(NamedColumn.DEFAULT_NAME_PROPERTY);
propertyNames.add(NamedColumn.SPECIFIED_NAME_PROPERTY);
- propertyNames.add(NamedColumn.DB_TABLE_PROPERTY);
- }
-
- @Override
- protected void propertyChanged(String propertyName) {
- if (propertyName.equals(NamedColumn.DB_TABLE_PROPERTY)) {
- this.doPopulate();
- } else {
- super.propertyChanged(propertyName);
- }
}
@Override