| commit | c1ada7ab4f7f8396e24d91c7ac8bccc39bb3caf6 | [log] [tgz] |
|---|---|---|
| author | nhauge <nhauge> | Tue Oct 25 21:23:30 2011 +0000 |
| committer | nhauge <nhauge> | Tue Oct 25 21:23:30 2011 +0000 |
| tree | 663080c59a9e61e48788d8235dea3883b40c0d3c | |
| parent | 4565c63a1c2d21677ea92860f2f488e866352692 [diff] |
349015 - add qualifier to class with using id class.
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/data/model/CreateEntityTemplateModel.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/data/model/CreateEntityTemplateModel.java index 2f180bf..9755e94 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/data/model/CreateEntityTemplateModel.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/data/model/CreateEntityTemplateModel.java
@@ -371,6 +371,13 @@ public String getIdClassName() { return getClassName() + PK_SUFFIX; } + + /** + * @return constructed name of the mapping file id class (package name + entity name + PK as suffix) + */ + public String getOrmIdClassName() { + return getQualifiedJavaClassName() + PK_SUFFIX; + } /** * @return IProject presentation of JPA project
diff --git a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/data/operation/NewEntityClassOperation.java b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/data/operation/NewEntityClassOperation.java index 124d929..397c3b7 100644 --- a/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/data/operation/NewEntityClassOperation.java +++ b/jpa/plugins/org.eclipse.jpt.jpa.ui/src/org/eclipse/jpt/jpa/ui/internal/wizards/entity/data/operation/NewEntityClassOperation.java
@@ -417,7 +417,7 @@ entity.getTable().setSpecifiedName(model.getTableName()); } if (model.isCompositePK()) { - entity.getIdClassReference().setSpecifiedIdClassName(model.getIdClassName()); + entity.getIdClassReference().setSpecifiedIdClassName(model.getOrmIdClassName()); } for (String fieldName : model.getPKFields()) { persistentType.getAttributeNamed(fieldName).convertToSpecified(MappingKeys.ID_ATTRIBUTE_MAPPING_KEY); @@ -474,7 +474,7 @@ MappedSuperclass mappedSuperclass = (MappedSuperclass) persistentType.getMapping(); if (model.isCompositePK()) { - mappedSuperclass.getIdClassReference().setSpecifiedIdClassName(model.getIdClassName()); + mappedSuperclass.getIdClassReference().setSpecifiedIdClassName(model.getOrmIdClassName()); } for (String fieldName : model.getPKFields()) {