Removed duplication from ExternalOrderColumn
diff --git a/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/ExternalOrderColumn.java b/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/ExternalOrderColumn.java
index 158338b..9bd2b97 100644
--- a/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/ExternalOrderColumn.java
+++ b/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/ExternalOrderColumn.java
@@ -13,7 +13,6 @@
******************************************************************************/
package org.eclipse.persistence.tools.mapping.orm;
-import org.eclipse.persistence.tools.mapping.ExternalForm;
import org.eclipse.persistence.tools.utility.TextRange;
/**
@@ -28,7 +27,7 @@
* @version 2.6
*/
@SuppressWarnings("nls")
-public interface ExternalOrderColumn extends ExternalForm {
+public interface ExternalOrderColumn extends ExternalBasicColumn {
/**
* The attribute name used to store and retrieve the base property.
@@ -36,46 +35,16 @@
String BASE = "base";
/**
- * The attribute name used to store and retrieve the column-definition of the property.
- */
- String COLUMN_DEFINITION = "column-definition";
-
- /**
* The attribute name used to store and retrieve the contiguous property.
*/
String CONTIGUOUS = "contiguous";
/**
- * The attribute name used to store and retrieve the insertable property.
- */
- String INSERTABLE = "insertable";
-
- /**
- * The attribute name used to store and retrieve the name property.
- */
- String NAME = "name";
-
- /**
- * The attribute name used to store and retrieve the nullable property.
- */
- String NULLABLE = "nullable";
-
- /**
* The attribute name used to store and retrieve the primary-key of the property.
*/
String ORDER_COLUMN = "order-column";
/**
- * The attribute name used to store and retrieve the table property.
- */
- String TABLE = "table";
-
- /**
- * The attribute name used to store and retrieve the updatable property.
- */
- String UPDATABLE = "updatable";
-
- /**
* Returns the base for this column.
*/
Integer getBase();
@@ -86,122 +55,27 @@
TextRange getBaseTextRange();
/**
- * Returns the native DDL or definition string representing this column.
- */
- String getColumnDefinition();
-
- /**
- * Returns the {@link TextRange} for the column definition value.
- */
- TextRange getColumnDefinitionTextRange();
-
- /**
* Returns the {@link TextRange} for the contiguous value.
*/
TextRange getContiguousTextRange();
/**
- * Returns the {@link TextRange} for the insertable value.
- */
- TextRange getInstertableTextRange();
-
- /**
- * Returns the column name.
- */
- String getName();
-
- /**
- * Returns the text range of the name attribute.
- */
- TextRange getNameTextRange();
-
- /**
- * Returns the {@link TextRange} for the nullable value.
- */
- TextRange getNullableTextRange();
-
- /**
- * Returns name of the owning table for this column.
- */
- String getTable();
-
- /**
- * Returns the {@link TextRange} for the owning table for this column.
- */
- TextRange getTableTextRange();
-
- /**
- * Returns the {@link TextRange} for the updatable value.
- */
- TextRange getUpdatableTextRange();
-
- /**
* Indicates whether this column is contiguous.
*/
Boolean isContiguous();
/**
- * Indicates whether this column is insertable.
- */
- Boolean isInstertable();
-
- /**
- * Indicates whether this column is nullable.
- */
- Boolean isNullable();
-
- /**
- * Indicates whether this column is updatable.
- */
- Boolean isUpdatable();
-
- /**
* Removes all metadata associated with this column from the the external form.
*/
void removeColumn();
/**
- * Removes itself from its parent.
- */
- void removeSelf();
-
- /**
* Returns the base for this column.
*/
void setBase(Integer base);
/**
- * Sets the column definition.
- */
- void setColumnDefinition(String columnDefinition);
-
- /**
* Sets the boolean value of whether the column is contiguous.
*/
void setContiguous(Boolean unique);
-
- /**
- * Sets the boolean value of whether the column is insertable.
- */
- void setInsertable(Boolean insertable);
-
- /**
- * Sets the name of the column.
- */
- void setName(String name);
-
- /**
- * Sets the boolean value of whether the column is nullable.
- */
- void setNullable(Boolean nullable);
-
- /**
- * Sets the table name.
- */
- void setTable(String table);
-
- /**
- * Sets the boolean value of whether the column is updatable.
- */
- void setUpdatable(Boolean updatable);
}
\ No newline at end of file
diff --git a/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/OrderColumn.java b/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/OrderColumn.java
index 8acf297..60922fc 100644
--- a/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/OrderColumn.java
+++ b/tools/org.eclipse.persistence.tools.mapping/src/org/eclipse/persistence/tools/mapping/orm/dom/OrderColumn.java
@@ -26,7 +26,7 @@
*
* @version 2.6
*/
-final class OrderColumn extends AbstractExternalForm
+final class OrderColumn extends AbstractColumn
implements ExternalOrderColumn {
/**
@@ -75,22 +75,6 @@
* {@inheritDoc}
*/
@Override
- public String getColumnDefinition() {
- return getAttribute(COLUMN_DEFINITION);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public TextRange getColumnDefinitionTextRange() {
- return getAttributeTextRange(COLUMN_DEFINITION);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
public TextRange getContiguousTextRange() {
return getAttributeTextRange(CONTIGUOUS);
}
@@ -107,62 +91,6 @@
* {@inheritDoc}
*/
@Override
- public TextRange getInstertableTextRange() {
- return getAttributeTextRange(INSERTABLE);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getName() {
- return getAttribute(NAME);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public TextRange getNameTextRange() {
- return getAttributeTextRange(NAME);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public TextRange getNullableTextRange() {
- return getAttributeTextRange(NULLABLE);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public String getTable() {
- return getAttribute(TABLE);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public TextRange getTableTextRange() {
- return getAttributeTextRange(TABLE);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public TextRange getUpdatableTextRange() {
- return getAttributeTextRange(UPDATABLE);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
public Boolean isContiguous() {
return getBooleanAttribute(CONTIGUOUS);
}
@@ -171,30 +99,6 @@
* {@inheritDoc}
*/
@Override
- public Boolean isInstertable() {
- return getBooleanAttribute(INSERTABLE);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Boolean isNullable() {
- return getBooleanAttribute(NULLABLE);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public Boolean isUpdatable() {
- return getBooleanAttribute(UPDATABLE);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
public void removeColumn() {
removeSelf();
}
@@ -211,55 +115,7 @@
* {@inheritDoc}
*/
@Override
- public void setColumnDefinition(String columnDefinition) {
- setAttribute(COLUMN_DEFINITION, columnDefinition);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
public void setContiguous(Boolean contiguous) {
setAttribute(CONTIGUOUS, contiguous);
}
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setInsertable(Boolean insertable) {
- setAttribute(INSERTABLE, insertable);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setName(String name) {
- setAttribute(NAME, name);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setNullable(Boolean nullable) {
- setAttribute(NULLABLE, nullable);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setTable(String table) {
- setAttribute(TABLE, table);
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public void setUpdatable(Boolean updatable) {
- setAttribute(UPDATABLE, updatable);
- }
}
\ No newline at end of file
