diff options
author | Brian Vosburgh | 2012-10-19 22:01:54 +0000 |
---|---|---|
committer | Brian Vosburgh | 2012-12-07 16:52:55 +0000 |
commit | 22b33f11caf65b626cdd65b440957c6623aa8b8d (patch) | |
tree | 12223d056e38e61e5080de207a1dd3d2e5865752 /jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualBaseColumn.java | |
parent | 5644d900f6f78227c2d19f95bddb24791304e01d (diff) | |
download | webtools.dali-22b33f11caf65b626cdd65b440957c6623aa8b8d.tar.gz webtools.dali-22b33f11caf65b626cdd65b440957c6623aa8b8d.tar.xz webtools.dali-22b33f11caf65b626cdd65b440957c6623aa8b8d.zip |
change column "table" to "table name"
Diffstat (limited to 'jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualBaseColumn.java')
-rw-r--r-- | jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualBaseColumn.java | 48 |
1 files changed, 24 insertions, 24 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualBaseColumn.java b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualBaseColumn.java index 6956890d94..08d8aff0c5 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualBaseColumn.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.core/src/org/eclipse/jpt/jpa/core/internal/context/orm/AbstractOrmVirtualBaseColumn.java @@ -18,8 +18,8 @@ public abstract class AbstractOrmVirtualBaseColumn<O extends ReadOnlyBaseColumn. extends AbstractOrmVirtualNamedColumn<O, C> implements VirtualBaseColumn { - protected String specifiedTable; - protected String defaultTable; + protected String specifiedTableName; + protected String defaultTableName; protected Boolean specifiedUnique; protected boolean defaultUnique; @@ -45,8 +45,8 @@ public abstract class AbstractOrmVirtualBaseColumn<O extends ReadOnlyBaseColumn. public void update() { super.update(); - this.setSpecifiedTable(this.buildSpecifiedTable()); - this.setDefaultTable(this.buildDefaultTable()); + this.setSpecifiedTableName(this.buildSpecifiedTableName()); + this.setDefaultTableName(this.buildDefaultTableName()); this.setSpecifiedUnique(this.buildSpecifiedUnique()); this.setDefaultUnique(this.buildDefaultUnique()); @@ -62,37 +62,37 @@ public abstract class AbstractOrmVirtualBaseColumn<O extends ReadOnlyBaseColumn. } - // ********** table ********** + // ********** table name ********** - public String getTable() { - return (this.specifiedTable != null) ? this.specifiedTable : this.defaultTable; + public String getTableName() { + return (this.specifiedTableName != null) ? this.specifiedTableName : this.defaultTableName; } - public String getSpecifiedTable() { - return this.specifiedTable; + public String getSpecifiedTableName() { + return this.specifiedTableName; } - protected void setSpecifiedTable(String table) { - String old = this.specifiedTable; - this.specifiedTable = table; - this.firePropertyChanged(SPECIFIED_TABLE_PROPERTY, old, table); + protected void setSpecifiedTableName(String tableName) { + String old = this.specifiedTableName; + this.specifiedTableName = tableName; + this.firePropertyChanged(SPECIFIED_TABLE_NAME_PROPERTY, old, tableName); } - protected String buildSpecifiedTable() { - return this.getOverriddenColumn().getSpecifiedTable(); + protected String buildSpecifiedTableName() { + return this.getOverriddenColumn().getSpecifiedTableName(); } - public String getDefaultTable() { - return this.defaultTable; + public String getDefaultTableName() { + return this.defaultTableName; } - protected void setDefaultTable(String table) { - String old = this.defaultTable; - this.defaultTable = table; - this.firePropertyChanged(DEFAULT_TABLE_PROPERTY, old, table); + protected void setDefaultTableName(String tableName) { + String old = this.defaultTableName; + this.defaultTableName = tableName; + this.firePropertyChanged(DEFAULT_TABLE_NAME_PROPERTY, old, tableName); } - protected String buildDefaultTable() { + protected String buildDefaultTableName() { return this.owner.getDefaultTableName(); } @@ -240,7 +240,7 @@ public abstract class AbstractOrmVirtualBaseColumn<O extends ReadOnlyBaseColumn. // ********** misc ********** public boolean tableNameIsInvalid() { - return this.owner.tableNameIsInvalid(this.getTable()); + return this.owner.tableNameIsInvalid(this.getTableName()); } public Iterable<String> getCandidateTableNames() { @@ -250,7 +250,7 @@ public abstract class AbstractOrmVirtualBaseColumn<O extends ReadOnlyBaseColumn. // ********** validation ********** - public TextRange getTableTextRange() { + public TextRange getTableNameTextRange() { return this.getValidationTextRange(); } } |