Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkmoore2009-03-16 14:11:12 -0400
committerkmoore2009-03-16 14:11:12 -0400
commit5086b7151f106e5e8b53d05ff76e6cd64d2ec435 (patch)
tree071ece2b588c1d504b2ed5b0a617fe01c119f03c
parentd8cdf44af450be62b46a668000601a77cb154a32 (diff)
downloadwebtools.dali-5086b7151f106e5e8b53d05ff76e6cd64d2ec435.tar.gz
webtools.dali-5086b7151f106e5e8b53d05ff76e6cd64d2ec435.tar.xz
webtools.dali-5086b7151f106e5e8b53d05ff76e6cd64d2ec435.zip
268417 - contribution from Danny Ju plus some formatting changes
-rw-r--r--jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/BaseEntityGenCustomizer.java238
-rw-r--r--jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/ORMGenTable.java534
-rw-r--r--jpa/plugins/org.eclipse.jpt.gen/templates/entities/mappingKind.vm6
-rw-r--r--jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/TableGenPanel.java36
4 files changed, 475 insertions, 339 deletions
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/BaseEntityGenCustomizer.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/BaseEntityGenCustomizer.java
index 15c4a9a899..b6b45d34a7 100644
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/BaseEntityGenCustomizer.java
+++ b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/BaseEntityGenCustomizer.java
@@ -12,49 +12,54 @@ package org.eclipse.jpt.gen.internal2;
import java.io.File;
import java.util.List;
import java.util.Set;
-
import org.eclipse.jpt.db.Column;
import org.eclipse.jpt.db.Schema;
import org.eclipse.jpt.gen.internal2.util.DTPUtil;
import org.eclipse.jpt.gen.internal2.util.StringUtil;
/**
- * Default implementation of ORMGenCustomizer according to JPA specification
- * for entity generation.
+ * Default implementation of ORMGenCustomizer according to JPA specification for
+ * entity generation.
*
- * This is used to retrieve/change the properties from the wizard
- * and is also passed as a context object to Velocity.
+ * This is used to retrieve/change the properties from the wizard and is also
+ * passed as a context object to Velocity.
*/
-public class BaseEntityGenCustomizer extends ORMGenCustomizer implements java.io.Serializable
+public class BaseEntityGenCustomizer extends ORMGenCustomizer
+ implements java.io.Serializable
{
private final static long serialVersionUID = 1;
- /*mapping kinds*/
- private static final String BASIC_MAPPING_KIND = "basic";
- private static final String ID_MAPPING_KIND = "id";
- private static final String VERSION_MAPPING_KIND = "version";
-
-
- /*the strings for generator names. These appear in a combo box
- * and used by the Velocity template processing.*/
- private static final String AUTO_GENERATOR = "auto";
- private static final String NONE_GENERATOR = "none";
- private static final String IDENTITY_GENERATOR = "identity";
- private static final String SEQUENCE_GENERATOR = "sequence";
- private static final String TABLE_GENERATOR = "table";
-
- public BaseEntityGenCustomizer(){}
-
+ /* mapping kinds */
+ private static final String BASIC_MAPPING_KIND = "basic"; //$NON-NLS-1$
+ private static final String ID_MAPPING_KIND = "id"; //$NON-NLS-1$
+ private static final String VERSION_MAPPING_KIND = "version"; //$NON-NLS-1$
+
+ /*
+ * the strings for generator names. These appear in a combo box and used by
+ * the Velocity template processing.
+ */
+ private static final String AUTO_GENERATOR = "auto"; //$NON-NLS-1$
+ private static final String NONE_GENERATOR = "none"; //$NON-NLS-1$
+ private static final String IDENTITY_GENERATOR = "identity"; //$NON-NLS-1$
+ private static final String SEQUENCE_GENERATOR = "sequence"; //$NON-NLS-1$
+ private static final String TABLE_GENERATOR = "table"; //$NON-NLS-1$
+
+ public BaseEntityGenCustomizer() {
+ super();
+ }
+
+ @Override
public void init(File file, Schema schema) {
super.init(file, schema);
}
-
- //-----------------------------------------
- //------ ORMGenCustomizer methods
- //-----------------------------------------
+
+ // -----------------------------------------
+ // ------ ORMGenCustomizer methods
+ // -----------------------------------------
+ @Override
public List<String> getAllIdGenerators() {
List<String> result = new java.util.ArrayList<String>(5);
- /*add in the order in which they would appear in the combo*/
+ /* add in the order in which they would appear in the combo */
result.add(AUTO_GENERATOR);
result.add(IDENTITY_GENERATOR);
result.add(SEQUENCE_GENERATOR);
@@ -62,140 +67,163 @@ public class BaseEntityGenCustomizer extends ORMGenCustomizer implements java.io
result.add(NONE_GENERATOR);
return result;
}
+
+ @Override
public String getNoIdGenerator() {
return NONE_GENERATOR;
}
+
+ @Override
public String getIdentityIdGenerator() {
return IDENTITY_GENERATOR;
}
+
+ @Override
public Set<String> getSequenceIdGenerators() {
Set<String> result = new java.util.HashSet<String>(3);
- result.add(AUTO_GENERATOR);
result.add(SEQUENCE_GENERATOR);
-
return result;
}
- public String getPropertyTypeFromColumn( Column column) {
- return DTPUtil.getJavaType( getSchema(), column );
+
+ @Override
+ public String getPropertyTypeFromColumn(Column column) {
+ return DTPUtil.getJavaType(getSchema(), column);
}
+
+ @Override
+ @SuppressWarnings("nls")
public String[] getAllPropertyTypes() {
/*
- * Java primitive types, wrapper of the primitive types
- * , java.lang.String, java.math.BigInteger,
- * java.math.BigDecimal, java.util.Date, java.util.Calendar, java.sql.Date,
- * java.sql.Time, java.sql.Timestamp, byte[], Byte[], char[], Character[],
- * enums, and any other type that implements Serializable.
- * */
- //return in the order that will be used in the combo
+ * Java primitive types, wrapper of the primitive types ,
+ * java.lang.String, java.math.BigInteger, java.math.BigDecimal,
+ * java.util.Date, java.util.Calendar, java.sql.Date, java.sql.Time,
+ * java.sql.Timestamp, byte[], Byte[], char[], Character[], enums, and
+ * any other type that implements Serializable.
+ */
+ // return in the order that will be used in the combo
return new String[] {
- "boolean"
- , "Boolean"
- , "byte"
- , "Byte"
- , "byte[]"
- , "char"
- , "char[]"
- , "Character"
- , "Character[]"
- , "double"
- , "Double"
- , "float"
- , "Float"
- , "int"
- , "Integer"
- , "long"
- , "Long"
- , "Object"
- , "short"
- , "Short"
- , "String"
-
- , java.math.BigDecimal.class.getName()
- , java.math.BigInteger.class.getName()
- , java.util.Calendar.class.getName()
- , java.util.Date.class.getName()
- , java.sql.Date.class.getName()
- , java.sql.Time.class.getName()
- , java.sql.Timestamp.class.getName()
- };
+ "boolean",
+ "Boolean",
+ "byte",
+ "Byte",
+ "byte[]",
+ "char",
+ "char[]",
+ "Character",
+ "Character[]",
+ "double",
+ "Double",
+ "float",
+ "Float",
+ "int",
+ "Integer",
+ "long",
+ "Long",
+ "Object",
+ "short",
+ "Short",
+ "String",
+ java.math.BigDecimal.class.getName(),
+ java.math.BigInteger.class.getName(),
+ java.util.Calendar.class.getName(),
+ java.util.Date.class.getName(),
+ java.sql.Date.class.getName(),
+ java.sql.Time.class.getName(),
+ java.sql.Timestamp.class.getName()
+ };
}
+
+ @Override
public String[] getAllMappingKinds() {
return new String[] {
- BASIC_MAPPING_KIND
- , ID_MAPPING_KIND
- , VERSION_MAPPING_KIND
+ BASIC_MAPPING_KIND, ID_MAPPING_KIND, VERSION_MAPPING_KIND
};
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
*/
+ @Override
public String getBasicMappingKind() {
return BASIC_MAPPING_KIND;
}
- /* (non-Javadoc)
+
+ /*
+ * (non-Javadoc)
*/
+ @Override
public String getIdMappingKind() {
return ID_MAPPING_KIND;
}
+
+ @Override
public boolean editCascade(AssociationRole role) {
return false;
}
+ @Override
protected boolean manySideIsAssociationOwner() {
return true;
}
- //-----------------------------------------
- //---- Velocity templates methods
- //-----------------------------------------
+ // -----------------------------------------
+ // ---- Velocity templates methods
+ // -----------------------------------------
/**
- * Returns the cascades annotation member value, or empty string
- * if none.
- * Empty string is returned instead of null because Velocity does not like null
- * when used in #set.
+ * Returns the cascades annotation member value, or empty string if none.
+ * Empty string is returned instead of null because Velocity does not like
+ * null when used in #set.
*/
public String genCascades(AssociationRole role) {
- List<String> cascades = StringUtil.strToList(role.getCascade(), ',', true/*trim*/);
+ List<String> cascades = StringUtil.strToList(role.getCascade(), ',', true/* trim */);
if (cascades == null) {
- return "";
+ return ""; //$NON-NLS-1$
}
- StringBuffer buffer = new StringBuffer("{");
+ StringBuffer buffer = new StringBuffer('{');
for (int i = 0, n = cascades.size(); i < n; ++i) {
- String cascade = (String)cascades.get(i);
+ String cascade = cascades.get(i);
String enumStr;
if (cascade.equals(TagNames.ALL_CASCADE)) {
- enumStr = "CascadeType.ALL";
- } else if (cascade.equals(TagNames.PERSIST_CASCADE)) {
- enumStr = "CascadeType.PERSIST";
- } else if (cascade.equals(TagNames.MERGE_CASCADE)) {
- enumStr = "CascadeType.MERGE";
- } else if (cascade.equals(TagNames.REMOVE_CASCADE)) {
- enumStr = "CascadeType.REMOVE";
- } else {
- assert(cascade.equals(TagNames.REFRESH_CASCADE));
- enumStr = "CascadeType.REFRESH";
+ enumStr = "CascadeType.ALL"; //$NON-NLS-1$
+ }
+ else if (cascade.equals(TagNames.PERSIST_CASCADE)) {
+ enumStr = "CascadeType.PERSIST"; //$NON-NLS-1$
+ }
+ else if (cascade.equals(TagNames.MERGE_CASCADE)) {
+ enumStr = "CascadeType.MERGE"; //$NON-NLS-1$
+ }
+ else if (cascade.equals(TagNames.REMOVE_CASCADE)) {
+ enumStr = "CascadeType.REMOVE"; //$NON-NLS-1$
+ }
+ else {
+ assert (cascade.equals(TagNames.REFRESH_CASCADE));
+ enumStr = "CascadeType.REFRESH"; //$NON-NLS-1$
}
if (i != 0) {
- buffer.append(", ");
+ buffer.append(", "); //$NON-NLS-1$
}
buffer.append(enumStr);
}
buffer.append('}');
return buffer.toString();
}
+
/**
- * Returns the fetch type annotation member value, or empty string
- * if none.
- * Empty string is returned instead of null because Velocity does not like null
- * when used in #set.
+ * Returns the fetch type annotation member value, or empty string if none.
+ * Empty string is returned instead of null because Velocity does not like
+ * null when used in #set.
*/
+ @Override
public String genFetch(ORMGenTable table) {
String fetch = table.getDefaultFetch();
- if (fetch == null || ORMGenTable.DEFAULT_FETCH.equals( fetch)) {
- return "";
- } else if (fetch.equals(ORMGenTable.LAZY_FETCH)) {
- return "FetchType.LAZY";
- } else {
- return "FetchType.EAGER";
+ if (fetch == null || ORMGenTable.DEFAULT_FETCH.equals(fetch)) {
+ return ""; //$NON-NLS-1$
+ }
+ else if (fetch.equals(ORMGenTable.LAZY_FETCH)) {
+ return "FetchType.LAZY"; //$NON-NLS-1$
+ }
+ else {
+ return "FetchType.EAGER"; //$NON-NLS-1$
}
}
}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/ORMGenTable.java b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/ORMGenTable.java
index 51280f5a84..6a38452038 100644
--- a/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/ORMGenTable.java
+++ b/jpa/plugins/org.eclipse.jpt.gen/src/org/eclipse/jpt/gen/internal2/ORMGenTable.java
@@ -8,12 +8,12 @@
* Oracle - initial API and implementation
******************************************************************************/
package org.eclipse.jpt.gen.internal2;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-
import org.eclipse.jpt.db.Column;
import org.eclipse.jpt.db.Table;
import org.eclipse.jpt.gen.internal.EntityGenTools;
@@ -22,13 +22,12 @@ import org.eclipse.jpt.gen.internal2.util.StringUtil;
import org.eclipse.jpt.utility.JavaType;
/**
- * Represents the ORM generation properties for a database
- * table.
+ * Represents the ORM generation properties for a database table.
*
- * <p>This is designed to be created/changed by the generation wizard,
- * and generated using Velocity templates.
- * The modified properties (if any) are persisted/retrieved using
- * <code>ORMGenCustomizer</code>.
+ * <p>
+ * This is designed to be created/changed by the generation wizard, and
+ * generated using Velocity templates. The modified properties (if any) are
+ * persisted/retrieved using <code>ORMGenCustomizer</code>.
*
*/
public class ORMGenTable
@@ -36,85 +35,103 @@ public class ORMGenTable
private ORMGenCustomizer mCustomizer;
private List<ORMGenColumn> mColumns;
private Table mDbTable;
-
+
/**
- * @param table The database table or null if this table is used
- * to get/set the default table properties (properties that apply to all tables unless overriden).
+ * @param table
+ * The database table or null if this table is used to get/set
+ * the default table properties (properties that apply to all
+ * tables unless overriden).
*/
public ORMGenTable(Table table, ORMGenCustomizer customizer) {
super();
-
mDbTable = table;
mCustomizer = customizer;
}
+
public ORMGenCustomizer getCustomizer() {
return mCustomizer;
}
+
/**
- * Returns true if this table is is used to get/set the default
- * table properties.
+ * Returns true if this table is is used to get/set the default table
+ * properties.
*/
public boolean isDefaultsTable() {
return mDbTable == null;
}
-
+
protected String customized(String propName) {
return getCustomizer().getProperty(propName, getName(), null);
}
+
protected boolean customizedBoolean(String propName) {
return getCustomizer().getBooleanProperty(propName, getName(), null);
}
+
protected void setCustomized(String propName, String value) {
if (value != null && value.length() == 0) {
value = null;
}
getCustomizer().setProperty(propName, value, getName(), null);
}
+
protected void setCustomizedBoolean(String propName, boolean value, boolean defaultValue) {
if (defaultValue == value) {
- setCustomized(propName, null); //remove the property
- } else {
+ setCustomized(propName, null); // remove the property
+ }
+ else {
getCustomizer().setBooleanProperty(propName, value, getName(), null);
}
}
+
public Table getDbTable() {
return mDbTable;
}
+
/**
* Returns the table name.
*/
public String getName() {
- if( mDbTable == null )
+ if (mDbTable == null)
return ORMGenCustomizer.ANY_TABLE;
return mDbTable.getName();
}
-
- public String getJoinTableAnnotationName(){
- if( mDbTable == null )
+
+ public String getJoinTableAnnotationName() {
+ if (mDbTable == null)
return ORMGenCustomizer.ANY_TABLE;
- String annotationName = this.mCustomizer.getDatabaseAnnotationNameBuilder().
- buildJoinTableAnnotationName( mDbTable);
+ String annotationName = this.mCustomizer.getDatabaseAnnotationNameBuilder().buildJoinTableAnnotationName(mDbTable);
return annotationName != null ? annotationName : mDbTable.getName();
}
-
+
/**
* Returns the database schema containing the table.
*/
public String getSchema() {
- if( DTPUtil.isDefaultSchema( mDbTable ))
- return "";
+ if (DTPUtil.isDefaultSchema(mDbTable))
+ return ""; //$NON-NLS-1$
String schemaName = mDbTable.getSchema().getName();
-
return schemaName;
}
+
/**
- * Sets the package for the generated class (empty string for the default package)
+ * Sets the package for the generated class (empty string for the default
+ * package)
*/
public void setPackage(String srcFolder, String pkg) {
setCustomized(SRC_FOLDER, srcFolder);
-
- getCustomizer().setProperty(PACKAGE, pkg, getName(), null); //not calling setCustomized so that empty strings do not get nulled out.
+ getCustomizer().setProperty(PACKAGE, pkg, getName(), null); // not
+ // calling
+ // setCustomized
+ // so that
+ // empty
+ // strings
+ // do not
+ // get
+ // nulled
+ // out.
}
+
/**
* Returns the Java package (empty string for the default package).
*/
@@ -128,114 +145,132 @@ public class ORMGenTable
public String getClassName() {
String name = customized(CLASS_NAME);
if (name == null) {
- //name = StringUtil.tableNameToVarName(getName());
- //name = StringUtil.initUpper(name);
- name = EntityGenTools.convertToUniqueJavaStyleClassName( getName(), new ArrayList<String>() );
+ // name = StringUtil.tableNameToVarName(getName());
+ // name = StringUtil.initUpper(name);
+ name = EntityGenTools.convertToUniqueJavaStyleClassName(getName(), new ArrayList<String>());
name = StringUtil.singularise(name);
}
return name;
}
+
public void setClassName(String className) {
- /*if the class name is the same as the (possibly computed) class name
- * then nothing to do*/
+ /*
+ * if the class name is the same as the (possibly computed) class name
+ * then nothing to do
+ */
if (!StringUtil.equalObjects(className, getClassName())) {
setCustomized(CLASS_NAME, className);
}
}
+
/**
- * Returns a name suitable to be used as a variable or class name.
- * This is computed based on the table name.
+ * Returns a name suitable to be used as a variable or class name. This is
+ * computed based on the table name.
*
- * @param singular Whether the name should be singular or plural.
+ * @param singular
+ * Whether the name should be singular or plural.
*/
public String getVarName(boolean singular) {
String name = StringUtil.tableNameToVarName(getName());
if (singular) {
name = StringUtil.singularise(name);
- } else {
+ }
+ else {
name = StringUtil.pluralise(name);
}
return name;
}
+
/**
* Returns the fully qualified generated Java class name.
*/
public String getQualifiedClassName() {
return qualify(getClassName());
}
+
/**
* Returns the composite key Java class name (not qualified).
*/
public String getCompositeKeyClassName() {
String name = customized(COMPOSITE_KEY_CLASS_NAME);
if (name == null) {
- name = getClassName() + "PK";
+ name = getClassName() + "PK"; //$NON-NLS-1$
}
return name;
}
+
/**
* Returns the fully qualified composite key Java class name.
*/
public String getQualifiedCompositeKeyClassName() {
return qualify(getCompositeKeyClassName());
}
+
/**
* Returns the composite key property name.
*/
public String getCompositeKeyPropertyName() {
- return "id";
+ return "id"; //$NON-NLS-1$
}
+
/**
- * Returns the <code>ORMGenColumn</code> objects to be
- * generated for this table.
+ * Returns the <code>ORMGenColumn</code> objects to be generated for this
+ * table.
*/
public List<ORMGenColumn> getColumns() {
if (mColumns == null) {
- mColumns = new ArrayList<ORMGenColumn>();
+ mColumns = new ArrayList<ORMGenColumn>();
Iterator<Column> cols = mDbTable.columns();
- while (cols.hasNext() ) {
+ while (cols.hasNext()) {
Column c = cols.next();
- ORMGenColumn genColumn = getCustomizer().createGenColumn( c );
- mColumns.add( genColumn );
+ ORMGenColumn genColumn = getCustomizer().createGenColumn(c);
+ mColumns.add(genColumn);
}
}
return mColumns;
}
+
public List<String> getColumnNames() {
Iterator<Column> cols = mDbTable.columns();
List<String> ret = new ArrayList<String>();
- while (cols.hasNext() ) {
- Column c = cols.next();
+ while (cols.hasNext()) {
+ Column c = cols.next();
ret.add(c.getName());
}
return ret;
}
+
/**
- * Returns the <code>ORMGenColumn</code> objects representing
- * the table's primary key.
+ * Returns the <code>ORMGenColumn</code> objects representing the table's
+ * primary key.
*/
- public List<ORMGenColumn> getPrimaryKeyColumns() {
- List<Column> dbCols = DTPUtil.getPrimaryKeyColumns( mDbTable);
+ public List<ORMGenColumn> getPrimaryKeyColumns() {
+ List<Column> dbCols = DTPUtil.getPrimaryKeyColumns(mDbTable);
List<ORMGenColumn> ret = new ArrayList<ORMGenColumn>();
- for(Column dbCol : dbCols ){
+ for (Column dbCol : dbCols) {
ret.add(new ORMGenColumn(dbCol, this.mCustomizer));
}
return ret;
}
+
/**
- * Returns the primary key column or null if there is
- * no or many primary key columns.
+ * Returns the primary key column or null if there is no or many primary key
+ * columns.
*/
public ORMGenColumn getPrimaryKeyColumn() {
ORMGenColumn pkCol = null;
List<ORMGenColumn> pkColumns = getPrimaryKeyColumns();
if (pkColumns.size() == 1) {
- //Column dbCol = (Column)pkColumns.get(0);
- pkCol = pkColumns.get(0); //(ORMGenColumn) mCustomizer.createGenColumn(dbCol);
- } else {
- /*if no pk column then look for the first column with id
- * mapping kind. This is so that the wizard can be used with tables
- * not having primary keys. */
+ // Column dbCol = (Column)pkColumns.get(0);
+ pkCol = pkColumns.get(0); // (ORMGenColumn)
+ // mCustomizer.createGenColumn(dbCol);
+ }
+ else {
+ /*
+ * if no pk column then look for the first column with id mapping
+ * kind. This is so that the wizard can be used with tables not
+ * having primary keys.
+ */
List<ORMGenColumn> columns = getColumns();
for (int i = 0, n = columns.size(); i < n; ++i) {
ORMGenColumn column = columns.get(i);
@@ -243,30 +278,34 @@ public class ORMGenTable
pkCol = column;
break;
}
- }
+ }
}
return pkCol;
}
+
/**
* Returns true if there is more than 1 pk column.
*/
public boolean isCompositeKey() {
- return DTPUtil.getPrimaryKeyColumnNames( mDbTable ).size() > 1;
+ return DTPUtil.getPrimaryKeyColumnNames(mDbTable).size() > 1;
}
+
/**
- * Returns the <code>ORMGenColumn</code> objects for the
- * the columns that are not part of any association.
+ * Returns the <code>ORMGenColumn</code> objects for the the columns that
+ * are not part of any association.
*
- * @param genOnly Whether to include only the columns marked for generation.
+ * @param genOnly
+ * Whether to include only the columns marked for generation.
*
- * @param includePk Whether to include the primary kley column(s).
+ * @param includePk
+ * Whether to include the primary kley column(s).
*
- * @param includeInherited Whether to include the columns associated
- * with Java properties that exist in the super class (if any).
+ * @param includeInherited
+ * Whether to include the columns associated with Java properties
+ * that exist in the super class (if any).
*/
- public List<ORMGenColumn> getSimpleColumns(boolean genOnly, boolean includePk, boolean includeInherited){
+ public List<ORMGenColumn> getSimpleColumns(boolean genOnly, boolean includePk, boolean includeInherited) {
List<ORMGenColumn> result = new java.util.ArrayList<ORMGenColumn>();
-
List<ORMGenColumn> columns = getColumns();
List<AssociationRole> roles = getAssociationRoles();
for (int i = 0, n = columns.size(); i < n; ++i) {
@@ -278,32 +317,33 @@ public class ORMGenTable
if (!includePk || isCompositeKey()) {
continue;
}
- } else if (isColumnInAsscociation(column, roles)) {
+ }
+ else if (isColumnInAsscociation(column, roles)) {
continue;
}
-
result.add(column);
}
return result;
-
}
+
public List<ORMGenColumn> getSimpleColumns() {
- return getSimpleColumns(true/*genOnly*/, true/*includePk*/, true/*includeInherited*/);
+ return getSimpleColumns(true/* genOnly */, true/* includePk */, true/* includeInherited */);
}
+
/**
- * Returns false if the given column should be generated with
- * false updatable/insertable.
- * This is the case when the column is mapped more than once, this
- * usually happen with columns in composite keys and many-to-one
- * associations.
+ * Returns false if the given column should be generated with false
+ * updatable/insertable. This is the case when the column is mapped more
+ * than once, this usually happen with columns in composite keys and
+ * many-to-one associations.
*
- * <br>Note that for Hibernate the column param is null because
- * the insert/update attributes are specified for the many-to-one tag itself
+ * <br>
+ * Note that for Hibernate the column param is null because the
+ * insert/update attributes are specified for the many-to-one tag itself
* instead of the nested column tags (bogus obviously).
*/
- public boolean isColumnUpdateInsert(AssociationRole role, ORMGenColumn column) {
+ public boolean isColumnUpdateInsert(AssociationRole role, ORMGenColumn column) {
if (column == null) {
- for (Iterator<ORMGenColumn> iter = role.getReferrerColumns().iterator(); iter.hasNext(); ) {
+ for (Iterator<ORMGenColumn> iter = role.getReferrerColumns().iterator(); iter.hasNext();) {
ORMGenColumn c = iter.next();
if (!isColumnUpdateInsert(role, c)) {
return false;
@@ -311,30 +351,32 @@ public class ORMGenTable
}
return true;
}
-
if (column.isPrimaryKey()) {
return false;
}
- /*should look if there are multiple associations using the same column
- * and return false, but this is probably an unusual case.*/
-
+ /*
+ * should look if there are multiple associations using the same column
+ * and return false, but this is probably an unusual case.
+ */
return true;
}
+
/**
- * Returns the <code>ORMGenColumn</code> objects corresponding
- * to the given column names.
+ * Returns the <code>ORMGenColumn</code> objects corresponding to the given
+ * column names.
*/
- public List<ORMGenColumn> getColumnsByNames(List<String> names){
+ public List<ORMGenColumn> getColumnsByNames(List<String> names) {
List<ORMGenColumn> result = new java.util.ArrayList<ORMGenColumn>();
- for( String name : names ){
+ for (String name : names) {
ORMGenColumn column = getColumnByName(name);
- assert(column != null);
+ assert (column != null);
if (column != null) {
result.add(column);
}
}
return result;
}
+
/**
* Returns the columns having the given name, or null if none.
*/
@@ -348,24 +390,28 @@ public class ORMGenTable
}
return null;
}
+
/**
- * Returns the <code>AssociationRole</code> objects for this table.
- * Only the association marked for generation are returned.
+ * Returns the <code>AssociationRole</code> objects for this table. Only the
+ * association marked for generation are returned.
*/
- public List<AssociationRole> getAssociationRoles(){
- /*this is not cached intentionally because invalidating the
- * cache with wizard changes is kinda tricky.*/
+ public List<AssociationRole> getAssociationRoles() {
+ /*
+ * this is not cached intentionally because invalidating the cache with
+ * wizard changes is kinda tricky.
+ */
List<AssociationRole> associationRoles = new ArrayList<AssociationRole>();
-
String name = getName();
List<Association> associations = mCustomizer.getAssociations();
- for (Iterator<Association> iter = associations.iterator(); iter.hasNext(); ) {
+ for (Iterator<Association> iter = associations.iterator(); iter.hasNext();) {
Association association = iter.next();
if (!association.isGenerated()) {
continue;
}
- /*check both referrer *and* referenced because an association could be
- * from-to the same table (employee/manager)*/
+ /*
+ * check both referrerand referenced because an association could be
+ * from-to the same table (employee/manager)
+ */
if (association.getReferrerTable().getName().equals(name)) {
AssociationRole role = association.getReferrerRole();
if (role != null) {
@@ -381,13 +427,15 @@ public class ORMGenTable
}
return associationRoles;
}
+
public String getClassDescription() {
return customized(CLASS_DESC);
}
+
/**
- * Returns the generated class scope, one of {@link #PUBLIC_SCOPE}|{@link #PROTECTED_SCOPE}
- * |{@link #PRIVATE_SCOPE}.
- * This method never returns null (defaults to public).
+ * Returns the generated class scope, one of {@link #PUBLIC_SCOPE}|
+ * {@link #PROTECTED_SCOPE} |{@link #PRIVATE_SCOPE}. This method never
+ * returns null (defaults to public).
*/
public String getClassScope() {
String scope = customized(CLASS_SCOPE);
@@ -396,43 +444,47 @@ public class ORMGenTable
}
return scope;
}
+
public String getExtends() {
return customized(EXTENDS);
}
+
public void setExtends(String baseClass) {
setCustomized(EXTENDS, baseClass);
}
+
public List<String> getImplements() {
String str = customized(IMPLEMENTS);
- List<String> result = StringUtil.strToList(str, ',', true/*trim*/);
+ List<String> result = StringUtil.strToList(str, ',', true/* trim */);
if (result == null) {
result = Collections.emptyList();
}
return result;
}
+
public void setImplements(List<String> interfaces) {
setCustomized(IMPLEMENTS, StringUtil.listToStr(interfaces, ','));
}
+
/**
- * Returns the string that should be generated in the Java class
- * for extends and implements.
+ * Returns the string that should be generated in the Java class for extends
+ * and implements.
*/
public String generateExtendsImplements() {
StringBuffer buffer = new StringBuffer();
-
String extendsClass = getExtends();
if (extendsClass != null && !extendsClass.equals("java.lang.Object") && !extendsClass.equals("Object")) {
buffer.append("extends " + simplifyClassName(extendsClass));
}
-
- buffer.append(" implements Serializable"); //assuming that the Java file template imports the java.io.Serializable
-
- for (Iterator<String> iter = getImplements().iterator(); iter.hasNext(); ) {
- buffer.append(", " + simplifyClassName(iter.next()));
+ buffer.append(" implements Serializable"); // assuming that the Java
+ // file template imports the
+ // java.io.Serializable
+ for (Iterator<String> iter = getImplements().iterator(); iter.hasNext();) {
+ buffer.append(", " + simplifyClassName(iter.next()));
}
-
return buffer.toString();
}
+
private String simplifyClassName(String fullClassName) {
final String JAVA_LANG = "java.lang.";
if (fullClassName.startsWith(JAVA_LANG)) {
@@ -440,25 +492,29 @@ public class ORMGenTable
}
String pkg = StringUtil.getPackageName(fullClassName);
if (pkg != null && StringUtil.equalObjects(pkg, getPackage())) {
- return StringUtil.getClassName(fullClassName);
+ return StringUtil.getClassName(fullClassName);
}
return fullClassName;
}
+
/**
- * Returns the id generator scheme (assigned, sequence, etc).
- * Does not return null, defaults to "assigned" or "identity" depending on whether
+ * Returns the id generator scheme (assigned, sequence, etc). Does not
+ * return null, defaults to "assigned" or "identity" depending on whether
* the table has an identity column.
*/
- public String getIdGenerator() {
+ public String getIdGenerator() {
String generator = customized(ID_GENERATOR);
String noneGenerator = getCustomizer().getNoIdGenerator();
if (!isDefaultsTable()) {
- /*This is done mainly because there might be cases where some tables have autoinctement pk
- * and others are assigned. In this case this makes it so that it is possible to have
- * a "none" default value that is interpreted depending on the case. */
+ /*
+ * This is done mainly because there might be cases where some
+ * tables have autoinctement pk and others are assigned. In this
+ * case this makes it so that it is possible to have a "none"
+ * default value that is interpreted depending on the case.
+ */
if (generator == null || generator.equals(noneGenerator)) {
ORMGenColumn pkColumn = getPrimaryKeyColumn();
- if (pkColumn != null && DTPUtil.isAutoIncrement( pkColumn.getDbColumn() )) {
+ if (pkColumn != null && DTPUtil.isAutoIncrement(pkColumn.getDbColumn())) {
generator = getCustomizer().getIdentityIdGenerator();
}
}
@@ -468,12 +524,14 @@ public class ORMGenTable
}
return generator;
}
+
/**
* Changes the id generator scheme (assigned, sequence, etc).
*/
public void setIdGenerator(String scheme) {
setCustomized(ID_GENERATOR, scheme);
}
+
/**
* Returns the sequence name for the given table, or null if none (makes
* sense only when the scheme is native, sequence, ..).
@@ -481,41 +539,45 @@ public class ORMGenTable
public String getSequence() {
return customized(SEQUENCE);
}
- public void setSeqence(String name) {
+
+ public void setSequence(String name) {
setCustomized(SEQUENCE, name);
}
+
/**
- * Returns the sequence name after replacing the ${table} and ${pk}
- * by their values, or null if none.
+ * Returns the sequence name after replacing the ${table} and ${pk} by their
+ * values, or null if none.
*/
- public String getFormattedSequence() {
+ public String getFormattedSequence() {
String sequence = getSequence();
if (sequence != null) {
- /*resolve the ${table} and ${pk} patterns*/
+ /* resolve the ${table} and ${pk} patterns */
sequence = StringUtil.strReplace(sequence, TABLE_SEQ_PATTERN, getName());
-
if (sequence.indexOf(PK_SEQ_PATTERN) >= 0) {
- List<String> pkNames = DTPUtil.getPrimaryKeyColumnNames( getDbTable() );
- String pkName = null;
- if (pkNames.size()>0 ) {
- pkName = pkNames.get(0);
- }
- sequence = StringUtil.strReplace(sequence, PK_SEQ_PATTERN, pkName);
+ List<String> pkNames = DTPUtil.getPrimaryKeyColumnNames(getDbTable());
+ String pkName = null;
+ if (pkNames.size() > 0) {
+ pkName = pkNames.get(0);
+ }
+ sequence = StringUtil.strReplace(sequence, PK_SEQ_PATTERN, pkName);
}
}
- return sequence!=null?sequence.toUpperCase():"";
+ return sequence != null ? sequence.toUpperCase() : "";
}
+
public boolean isImplementEquals() {
- return !"true".equals(customized(IMPLEMENT_EQUALS)); //defaults to false
+ return !"true".equals(customized(IMPLEMENT_EQUALS)); // defaults to
+ // false
}
+
public void setImplementEquals(boolean value) {
setCustomizedBoolean(IMPLEMENT_EQUALS, value, true);
}
-
+
/**
* Returns true if there is any column participating in equals/hashcode.
*/
- public boolean hasColumnsInEquals() {
+ public boolean hasColumnsInEquals() {
List<ORMGenColumn> columns = getSimpleColumns();
for (int i = 0, n = columns.size(); i < n; ++i) {
ORMGenColumn column = columns.get(i);
@@ -525,25 +587,26 @@ public class ORMGenTable
}
return false;
}
-
+
/**
- * Returns {@link #GENERATE_DDL_ANNOTATION} indicating whether
- * the optional DDL parameters like length, nullable, unqiue, etc should be generated
- * in @Column annotation.
- * defaults to false.
+ * Returns {@link #GENERATE_DDL_ANNOTATION} indicating whether the optional
+ * DDL parameters like length, nullable, unqiue, etc should be generated in @Column
+ * annotation. defaults to false.
*/
public boolean isGenerateDDLAnnotations() {
- return "true".equals(customized(ORMGenCustomizer.GENERATE_DDL_ANNOTATION)); //defaults to false
+ return "true".equals(customized(ORMGenCustomizer.GENERATE_DDL_ANNOTATION)); // defaults
+ // to
+ // false
}
-
+
public void setGenerateDDLAnnotations(boolean generate) {
- setCustomizedBoolean(ORMGenCustomizer.GENERATE_DDL_ANNOTATION, generate, false);
+ setCustomizedBoolean(ORMGenCustomizer.GENERATE_DDL_ANNOTATION, generate, false);
}
/**
- * Returns one of {@link #PROPERTY_ACCESS}|{@link #FIELD_ACCESS} indicating how
- * the entity properties are mapped.
- * Does not return null (defaults to {@link #FIELD_ACCESS}).
+ * Returns one of {@link #PROPERTY_ACCESS}|{@link #FIELD_ACCESS} indicating
+ * how the entity properties are mapped. Does not return null (defaults to
+ * {@link #FIELD_ACCESS}).
*/
public String getAccess() {
String name = customized(ACCESS);
@@ -552,31 +615,38 @@ public class ORMGenTable
}
return name;
}
+
public void setAccess(String access) {
- assert(access == null || access.equals(PROPERTY_ACCESS) || access.equals(FIELD_ACCESS));
+ assert (access == null || access.equals(PROPERTY_ACCESS) || access.equals(FIELD_ACCESS));
if (!StringUtil.equalObjects(access, getAccess())) {
setCustomized(ACCESS, access);
}
}
+
/**
- * Returns one of {@link #LAZY_FETCH}|{@link #EAGER_FETCH} indicating how
- * the table associations are feched.
- * Returns null if the provider defaults should be used.
+ * Returns one of {@link #LAZY_FETCH}|{@link #EAGER_FETCH} indicating how
+ * the table associations are feched. Returns null if the provider defaults
+ * should be used.
*/
public String getDefaultFetch() {
return customized(DEFAULT_FETCH);
}
+
public void setDefaultFetch(String fetch) {
- assert(fetch == null || fetch.equals(LAZY_FETCH) || fetch.equals(EAGER_FETCH));
+ assert (fetch == null || fetch.equals(LAZY_FETCH) || fetch.equals(EAGER_FETCH));
setCustomized(DEFAULT_FETCH, fetch);
}
+
public String[] getSupportedCollectionTypes() {
- return new String[] {SET_COLLECTION_TYPE, LIST_COLLECTION_TYPE};
+ return new String[] {
+ SET_COLLECTION_TYPE, LIST_COLLECTION_TYPE
+ };
}
+
/**
- * Returns one of {@link #LIST_COLLECTION_TYPE}|{@link #SET_COLLECTION_TYPE} indicating
- * the Java type (full class name) used for properties of collection types.
- * This does not return null (defaults to list).
+ * Returns one of {@link #LIST_COLLECTION_TYPE}|{@link #SET_COLLECTION_TYPE}
+ * indicating the Java type (full class name) used for properties of
+ * collection types. This does not return null (defaults to list).
*/
public String getDefaultCollectionType() {
String cType = customized(DEFAULT_COLLECTION_TYPE);
@@ -585,16 +655,17 @@ public class ORMGenTable
}
return cType;
}
+
public void setDefaultCollectionType(String cType) {
- assert(cType.equals(LIST_COLLECTION_TYPE) || cType.equals(SET_COLLECTION_TYPE));
+ assert (cType.equals(LIST_COLLECTION_TYPE) || cType.equals(SET_COLLECTION_TYPE));
setCustomized(DEFAULT_COLLECTION_TYPE, cType);
}
+
/**
- * Returns true if the primary key is compound and any of its
- * columns should be included in the <code>equals</code> method
- * implementation.
+ * Returns true if the primary key is compound and any of its columns should
+ * be included in the <code>equals</code> method implementation.
*/
- public boolean isCompoundKeyUseInEquals() {
+ public boolean isCompoundKeyUseInEquals() {
if (isCompositeKey()) {
for (Iterator<ORMGenColumn> iter = getPrimaryKeyColumns().iterator(); iter.hasNext();) {
ORMGenColumn column = iter.next();
@@ -605,7 +676,8 @@ public class ORMGenTable
}
return false;
}
- public boolean isRoleUseInEquals(AssociationRole role) {
+
+ public boolean isRoleUseInEquals(AssociationRole role) {
for (Iterator<ORMGenColumn> iter = role.getReferrerColumns().iterator(); iter.hasNext();) {
ORMGenColumn column = iter.next();
if (column.isUseInEquals()) {
@@ -614,22 +686,19 @@ public class ORMGenTable
}
return false;
}
-
-
+
/**
- * Return true if the values of name element in the @Table is default
- * so we can skip generating the annotation
+ * Return true if the values of name element in the @Table is default so we
+ * can skip generating the annotation
*
* @return true
*/
- public boolean isDefaultname(){
+ public boolean isDefaultname() {
String entityName = getClassName();
- String annotationName = this.mCustomizer.getDatabaseAnnotationNameBuilder().
- buildTableAnnotationName(entityName, mDbTable);
-
- return annotationName==null;
+ String annotationName = this.mCustomizer.getDatabaseAnnotationNameBuilder().buildTableAnnotationName(entityName, mDbTable);
+ return annotationName == null;
}
-
+
/**
* Qualifies a class name if there is a package.
*/
@@ -640,6 +709,7 @@ public class ORMGenTable
}
return className;
}
+
/**
* Returns true if the given column is part of any association.
*/
@@ -647,17 +717,18 @@ public class ORMGenTable
for (int i = 0, n = roles.size(); i < n; ++i) {
AssociationRole role = roles.get(i);
List<ORMGenColumn> cols = role.getReferrerColumns();
- for( ORMGenColumn col : cols ){
- if (col.getName().equals( column.getName() )) {
+ for (ORMGenColumn col : cols) {
+ if (col.getName().equals(column.getName())) {
return true;
}
}
}
return false;
}
-
+
/**
* Print the clause to be used in the generated equals() method
+ *
* @return String
*/
public String getPrimaryKeyEqualsClause() {
@@ -674,18 +745,19 @@ public class ORMGenTable
buf.append(";");
return buf.toString();
}
-
+
private void printPrimaryKeyEqualsClauseOn(ORMGenColumn column, StringBuilder buf) {
String fieldName = column.getPropertyName();
JavaType javaType = column.getDbColumn().getPrimaryKeyJavaType();
if (javaType.isPrimitive()) {
this.printPrimitiveEqualsClauseOn(fieldName, buf);
- } else {
+ }
+ else {
this.printReferenceEqualsClauseOn(fieldName, buf);
}
}
- private void printPrimitiveEqualsClauseOn(String fieldName, StringBuilder buf) {
+ private void printPrimitiveEqualsClauseOn(String fieldName, StringBuilder buf) {
buf.append("(this.");
buf.append(fieldName);
buf.append(" == castOther.");
@@ -693,16 +765,17 @@ public class ORMGenTable
buf.append(')');
}
- private void printReferenceEqualsClauseOn(String fieldName, StringBuilder buf) {
+ private void printReferenceEqualsClauseOn(String fieldName, StringBuilder buf) {
buf.append("this.");
buf.append(fieldName);
buf.append(".equals(castOther.");
buf.append(fieldName);
buf.append(')');
}
-
+
/**
* Print the clause to be used in the generated hasCode() method
+ *
* @return String
*/
public String getPrimaryKeyHashCodeClause() {
@@ -717,42 +790,51 @@ public class ORMGenTable
}
return buf.toString();
}
-
+
private void printPrimaryKeyHashCodeClauseOn(ORMGenColumn column, StringBuilder buf) {
String fieldName = column.getPropertyName();
JavaType javaType = column.getDbColumn().getPrimaryKeyJavaType();
if (javaType.isPrimitive()) {
this.printPrimitiveHashCodeClauseOn(javaType.getElementTypeName(), fieldName, buf);
- } else {
+ }
+ else {
this.printReferenceHashCodeClauseOn(fieldName, buf);
}
- }
-
+ }
+
private void printPrimitiveHashCodeClauseOn(String primitiveName, String fieldName, StringBuilder buf) {
if (primitiveName.equals("int")) {
// this.value
buf.append("this.");
buf.append(fieldName);
- } else if (primitiveName.equals("short") || primitiveName.equals("byte") || primitiveName.equals("char")) { // explicit cast
+ }
+ else if (primitiveName.equals("short") || primitiveName.equals("byte") || primitiveName.equals("char")) { // explicit
+ // cast
// ((int) this.value)
buf.append("((int) this.");
buf.append(fieldName);
buf.append(')');
- } else if (primitiveName.equals("long")) { // cribbed from Long#hashCode()
+ }
+ else if (primitiveName.equals("long")) { // cribbed from Long#hashCode()
// ((int) (this.value ^ (this.value >>> 32)))
buf.append("((int) (this.");
buf.append(fieldName);
buf.append(" ^ (this.");
buf.append(fieldName);
buf.append(" >>> 32)))");
- } else if (primitiveName.equals("float")) { // cribbed from Float#hashCode()
+ }
+ else if (primitiveName.equals("float")) { // cribbed from
+ // Float#hashCode()
// java.lang.Float.floatToIntBits(this.value)
buf.append("java.lang.Float");
buf.append(".floatToIntBits(this.");
buf.append(fieldName);
buf.append(')');
- } else if (primitiveName.equals("double")) { // cribbed from Double#hashCode()
- // ((int) (java.lang.Double.doubleToLongBits(this.value) ^ (java.lang.Double.doubleToLongBits(this.value) >>> 32)))
+ }
+ else if (primitiveName.equals("double")) { // cribbed from
+ // Double#hashCode()
+ // ((int) (java.lang.Double.doubleToLongBits(this.value) ^
+ // (java.lang.Double.doubleToLongBits(this.value) >>> 32)))
buf.append("((int) (");
buf.append("java.lang.Double");
buf.append(".doubleToLongBits(this.");
@@ -762,69 +844,95 @@ public class ORMGenTable
buf.append(".doubleToLongBits(this.");
buf.append(fieldName);
buf.append(") >>> 32)))");
- } else if (primitiveName.equals("boolean")) {
+ }
+ else if (primitiveName.equals("boolean")) {
// (this.value ? 1 : 0)
buf.append("(this.");
buf.append(fieldName);
buf.append(" ? 1 : 0)");
- } else {
+ }
+ else {
throw new IllegalArgumentException(primitiveName);
}
}
- private void printReferenceHashCodeClauseOn(String fieldName, StringBuilder buf) {
+ private void printReferenceHashCodeClauseOn(String fieldName, StringBuilder buf) {
buf.append("this.");
buf.append(fieldName);
buf.append(".hashCode()");
}
-
+
@Override
- public String toString(){
- return "name="+ this.getName() + "; columns=" + Arrays.toString( this.getColumnNames().toArray()) ;
+ public String toString() {
+ return "name=" + this.getName() + "; columns=" + Arrays.toString(this.getColumnNames().toArray());
}
-
- /*class scopes*/
+
+ /* class scopes */
public static final String PUBLIC_SCOPE = "public";
+
public static final String PROTECTED_SCOPE = "protected";
+
public static final String PRIVATE_SCOPE = "private";
-
- /*access constants. Note that these strings are used in the ui*/
+
+ /* access constants. Note that these strings are used in the ui */
public static final String PROPERTY_ACCESS = "property";
+
public static final String FIELD_ACCESS = "field";
-
- /*default fech constants. Note that these strings are used in the gen velocity templates.*/
+
+ /*
+ * default fech constants. Note that these strings are used in the gen
+ * velocity templates.
+ */
public static final String DEFAULT_FETCH = "defaultFetch";
+
public static final String LAZY_FETCH = "lazy";
+
public static final String EAGER_FETCH = "eager";
-
- /*default collection type constants. Note that these strings are used in the gen velocity templates.*/
+
+ /*
+ * default collection type constants. Note that these strings are used in
+ * the gen velocity templates.
+ */
public static final String LIST_COLLECTION_TYPE = "java.util.List";
+
public static final String SET_COLLECTION_TYPE = "java.util.Set";
-
+
/**
- * The pattern replaced by the table name in the id generator
- * sequence name param.
+ * The pattern replaced by the table name in the id generator sequence name
+ * param.
*/
public static final String TABLE_SEQ_PATTERN = "$table";
+
/**
- * The pattern replaced by the primary key in the id generator
- * sequence name param.
+ * The pattern replaced by the primary key in the id generator sequence name
+ * param.
*/
public static final String PK_SEQ_PATTERN = "$pk";
- /*customization properties*/
+ /* customization properties */
private static final String PACKAGE = "package";
+
private static final String SRC_FOLDER = "srcFolder";
+
private static final String CLASS_NAME = "className";
+
private static final String CLASS_DESC = "classDesc";
+
private static final String CLASS_SCOPE = "classScope";
+
private static final String EXTENDS = "extends";
+
private static final String IMPLEMENTS = "implements";
+
private static final String ID_GENERATOR = "idGenerator";
+
private static final String SEQUENCE = "sequence";
+
private static final String COMPOSITE_KEY_CLASS_NAME = "compositeKeyClassName";
+
private static final String IMPLEMENT_EQUALS = "implementEquals";
+
private static final String ACCESS = "access";
- private static final String DEFAULT_COLLECTION_TYPE = "defaultCollectionType";
+ private static final String DEFAULT_COLLECTION_TYPE = "defaultCollectionType";
}
diff --git a/jpa/plugins/org.eclipse.jpt.gen/templates/entities/mappingKind.vm b/jpa/plugins/org.eclipse.jpt.gen/templates/entities/mappingKind.vm
index 4bc95386e3..f378cb24d6 100644
--- a/jpa/plugins/org.eclipse.jpt.gen/templates/entities/mappingKind.vm
+++ b/jpa/plugins/org.eclipse.jpt.gen/templates/entities/mappingKind.vm
@@ -16,9 +16,13 @@
#else
#set ($generationType = "")
#end
-#if ($idGenerator == "sequence" || ($idGenerator == "auto" && $table.sequence))
+#if ($idGenerator == "sequence" )
#set ($generatorName = "${table.name.toUpperCase()}_${column.propertyName.toUpperCase()}_GENERATOR")
+#if( $table.formattedSequence != "" )
@SequenceGenerator(name="$generatorName", sequenceName="$table.formattedSequence")
+#else
+ @SequenceGenerator(name="$generatorName" )
+#end
@GeneratedValue(strategy=$generationType, generator="$generatorName")
#elseif ($generationType != "")
@GeneratedValue(strategy=$generationType)
diff --git a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/TableGenPanel.java b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/TableGenPanel.java
index 9b3d487dac..ab7ad72cbe 100644
--- a/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/TableGenPanel.java
+++ b/jpa/plugins/org.eclipse.jpt.ui/src/org/eclipse/jpt/ui/internal/wizards/gen/TableGenPanel.java
@@ -73,7 +73,7 @@ class TableGenPanel
this.wizardPage = wizardPage;
this.isDefaultTable = isDefaultTable;
createTableMappingPropertiesGroup(parent, columns);
- SWTUtil.createLabel(parent, 4, "");
+ SWTUtil.createLabel(parent, 4, ""); //$NON-NLS-1$
}
protected void createTableMappingPropertiesGroup(Composite composite, int columns) {
@@ -226,12 +226,14 @@ class TableGenPanel
String[] values = new String[schemes.size()];
schemes.toArray(values);
idGeneratorCombo.setItems( values );
- idGeneratorCombo.setText( mTable.getIdGenerator());
+ String idGenerator = mTable.getIdGenerator();
+ idGeneratorCombo.setText( idGenerator);
+ boolean isSequence = this.mTable.getCustomizer().getSequenceIdGenerators().contains(idGenerator);
String sequenceName = mTable.isDefaultsTable() ? mTable.getSequence() : mTable.getFormattedSequence();
sequenceName = ( sequenceName==null?"":sequenceName );
sequenceNameField.setText( sequenceName );
- if( sequenceName.length()> 0 ){
+ if( isSequence ){
sequenceNameField.setEnabled(true);
sequenceNameNoteLabel.setEnabled(true);
}else{
@@ -300,24 +302,18 @@ class TableGenPanel
public void modifyText(ModifyEvent e) {
if (e.getSource() == null || !isUpdatingControls) {
- if( idGeneratorCombo.getText().equals("sequence")){
+ if( idGeneratorCombo.getText().equals("sequence")){ //$NON-NLS-1$
String sequenceName = sequenceNameField.getText();
- if( sequenceName.toLowerCase().indexOf("$table")>=0 ||
- sequenceName.toLowerCase().indexOf("$pk")>=0 ){
- sequenceName = convertVarToLowerCase("$table", sequenceName);
- sequenceName = convertVarToLowerCase("$pk", sequenceName);
+ if( sequenceName.toLowerCase().indexOf("$table")>=0 || //$NON-NLS-1$
+ sequenceName.toLowerCase().indexOf("$pk")>=0 ){ //$NON-NLS-1$
+ sequenceName = convertVarToLowerCase("$table", sequenceName); //$NON-NLS-1$
+ sequenceName = convertVarToLowerCase("$pk", sequenceName); //$NON-NLS-1$
}
if( sequenceName.trim().length() != 0 ){
- mTable.setSeqence( sequenceName );
- wizardPage.setErrorMessage(null);
- wizardPage.setPageComplete(true);
+ mTable.setSequence( sequenceName );
}else{
- wizardPage.setErrorMessage("Please specify a sequence name.");
- wizardPage.setPageComplete(false);
+ mTable.setSequence( "" ); //$NON-NLS-1$
}
- }else{
- wizardPage.setErrorMessage(null);
- wizardPage.setPageComplete(true);
}
}
}
@@ -343,14 +339,14 @@ class TableGenPanel
}
private void idGenChanged() {
- String scheme = (String)idGeneratorCombo.getText();
+ String scheme = idGeneratorCombo.getText();
mTable.setIdGenerator(scheme);
boolean isSequence = this.mTable.getCustomizer().getSequenceIdGenerators().contains(scheme);
if (!isSequence) {
sequenceNameField.setText("");
sequenceNameField.setEnabled(false);
- mTable.setSeqence(null);
+ mTable.setSequence(null);
sequenceNameNoteLabel.setEnabled(false);
}else{
sequenceNameField.setEnabled(true);
@@ -358,8 +354,8 @@ class TableGenPanel
sequenceNameNoteLabel.setEnabled(true);
if( sequenceNameField.getText().length()==0 ) {
String newMessage = "Please specify a sequence name";
- this.wizardPage.setErrorMessage(newMessage);
- this.wizardPage.setPageComplete(false);
+ this.wizardPage.setMessage(newMessage);
+ this.wizardPage.setPageComplete(true);
}else{
this.wizardPage.setErrorMessage(null);
this.wizardPage.setPageComplete(true);

Back to the top