diff options
2 files changed, 9 insertions, 2 deletions
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 2f180bfae3..9755e94da1 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 class CreateEntityTemplateModel { 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 124d92999e..397c3b7a31 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 @@ public class NewEntityClassOperation extends AbstractDataModelOperation { 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 @@ public class NewEntityClassOperation extends AbstractDataModelOperation { MappedSuperclass mappedSuperclass = (MappedSuperclass) persistentType.getMapping(); if (model.isCompositePK()) { - mappedSuperclass.getIdClassReference().setSpecifiedIdClassName(model.getIdClassName()); + mappedSuperclass.getIdClassReference().setSpecifiedIdClassName(model.getOrmIdClassName()); } for (String fieldName : model.getPKFields()) { |