Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-5709: New property of PersistentClass finally renamed to jpaEntityName

This commit is contained in:
Tomasz Blachowicz 2010-11-09 09:53:02 +00:00
parent f29fab99a6
commit fb26f4c1a0
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/cfg/annotations/EntityBinder.java
View File

@ -195,7 +195,7 @@ public class EntityBinder {
persistentClass.setAbstract( annotatedClass.isAbstract() ); persistentClass.setAbstract( annotatedClass.isAbstract() );
persistentClass.setClassName( annotatedClass.getName() ); persistentClass.setClassName( annotatedClass.getName() );
persistentClass.setNodeName( name ); persistentClass.setNodeName( name );
persistentClass.setAnnotatedEntityName(name); persistentClass.setJpaEntityName(name);
//persistentClass.setDynamic(false); //no longer needed with the Entity name refactoring? //persistentClass.setDynamic(false); //no longer needed with the Entity name refactoring?
persistentClass.setEntityName( annotatedClass.getName() ); persistentClass.setEntityName( annotatedClass.getName() );
bindDiscriminatorValue(); bindDiscriminatorValue();

10
hibernate-core/src/main/java/org/hibernate/mapping/PersistentClass.java
View File

@ -57,7 +57,7 @@ public abstract class PersistentClass implements Serializable, Filterable, MetaA
private String proxyInterfaceName; private String proxyInterfaceName;
private String nodeName; private String nodeName;
private String annotatedEntityName; private String jpaEntityName;
private String discriminatorValue; private String discriminatorValue;
private boolean lazy; private boolean lazy;
@ -737,12 +737,12 @@ public abstract class PersistentClass implements Serializable, Filterable, MetaA
this.nodeName = nodeName; this.nodeName = nodeName;
} }
public String getAnnotatedEntityName() { public String getJpaEntityName() {
return annotatedEntityName; return jpaEntityName;
} }
public void setAnnotatedEntityName(String annotatedEntityName) { public void setJpaEntityName(String jpaEntityName) {
this.annotatedEntityName = annotatedEntityName; this.jpaEntityName = jpaEntityName;
} }
public boolean hasPojoRepresentation() { public boolean hasPojoRepresentation() {

8
hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/EntityTypeImpl.java
View File

@ -33,20 +33,20 @@ import javax.persistence.metamodel.EntityType;
public class EntityTypeImpl<X> public class EntityTypeImpl<X>
extends AbstractIdentifiableType<X> extends AbstractIdentifiableType<X>
implements EntityType<X>, Serializable { implements EntityType<X>, Serializable {
private final String nodeName; private final String jpaEntityName;
public EntityTypeImpl( public EntityTypeImpl(
Class<X> javaType, Class<X> javaType,
AbstractIdentifiableType<? super X> superType, AbstractIdentifiableType<? super X> superType,
String nodeName, String jpaEntityName,
boolean hasIdentifierProperty, boolean hasIdentifierProperty,
boolean isVersioned) { boolean isVersioned) {
super( javaType, superType, hasIdentifierProperty, isVersioned ); super( javaType, superType, hasIdentifierProperty, isVersioned );
this.nodeName = nodeName; this.jpaEntityName = jpaEntityName;
} }
public String getName() { public String getName() {
return nodeName; return jpaEntityName;
} }
public BindableType getBindableType() { public BindableType getBindableType() {

2
hibernate-entitymanager/src/main/java/org/hibernate/ejb/metamodel/MetamodelImpl.java
View File

@ -94,7 +94,7 @@ public class MetamodelImpl implements Metamodel, Serializable {
EntityTypeImpl entityType = new EntityTypeImpl( EntityTypeImpl entityType = new EntityTypeImpl(
javaType, javaType,
superType, superType,
persistentClass.getAnnotatedEntityName(), persistentClass.getJpaEntityName(),
persistentClass.hasIdentifierProperty(), persistentClass.hasIdentifierProperty(),
persistentClass.isVersioned() persistentClass.isVersioned()
); );