|
|
197f950 |
diff -Naur hibernate-jpa-2.0-api-1.0.1.Final/src/main/java/javax/persistence/EntityManager.java hibernate-jpa-2.0-api-1.0.1.Final-work/src/main/java/javax/persistence/EntityManager.java
|
|
|
197f950 |
--- hibernate-jpa-2.0-api-1.0.1.Final/src/main/java/javax/persistence/EntityManager.java 2011-06-13 05:58:51.000000000 -0400
|
|
|
197f950 |
+++ hibernate-jpa-2.0-api-1.0.1.Final-work/src/main/java/javax/persistence/EntityManager.java 2012-01-15 09:49:01.036261572 -0500
|
|
|
197f950 |
@@ -103,7 +103,7 @@
|
|
|
197f950 |
* not exist
|
|
|
197f950 |
* @throws IllegalArgumentException if the first argument does
|
|
|
197f950 |
* not denote an entity type or the second argument is
|
|
|
197f950 |
- * is not a valid type for that entitys primary key or
|
|
|
197f950 |
+ * is not a valid type for that entity's primary key or
|
|
|
197f950 |
* is null
|
|
|
197f950 |
*/
|
|
|
197f950 |
public <T> T find(Class<T> entityClass, Object primaryKey);
|
|
|
197f950 |
@@ -123,7 +123,7 @@
|
|
|
197f950 |
* not exist
|
|
|
197f950 |
* @throws IllegalArgumentException if the first argument does
|
|
|
197f950 |
* not denote an entity type or the second argument is
|
|
|
197f950 |
- * is not a valid type for that entitys primary key or
|
|
|
197f950 |
+ * is not a valid type for that entity's primary key or
|
|
|
197f950 |
* is null
|
|
|
197f950 |
* @since Java Persistence 2.0
|
|
|
197f950 |
*/
|
|
|
197f950 |
@@ -244,7 +244,7 @@
|
|
|
197f950 |
* @return the found entity instance
|
|
|
197f950 |
* @throws IllegalArgumentException if the first argument does
|
|
|
197f950 |
* not denote an entity type or the second argument is
|
|
|
197f950 |
- * not a valid type for that entitys primary key or
|
|
|
197f950 |
+ * not a valid type for that entity's primary key or
|
|
|
197f950 |
* is null
|
|
|
197f950 |
* @throws EntityNotFoundException if the entity state
|
|
|
197f950 |
* cannot be accessed
|
|
|
197f950 |
@@ -722,4 +722,4 @@
|
|
|
197f950 |
* @since Java Persistence 2.0
|
|
|
197f950 |
*/
|
|
|
197f950 |
public Metamodel getMetamodel();
|
|
|
197f950 |
-}
|
|
|
197f950 |
\ No newline at end of file
|
|
|
197f950 |
+}
|
|
|
197f950 |
diff -Naur hibernate-jpa-2.0-api-1.0.1.Final/src/main/java/javax/persistence/MapsId.java hibernate-jpa-2.0-api-1.0.1.Final-work/src/main/java/javax/persistence/MapsId.java
|
|
|
197f950 |
--- hibernate-jpa-2.0-api-1.0.1.Final/src/main/java/javax/persistence/MapsId.java 2011-06-13 05:58:51.000000000 -0400
|
|
|
197f950 |
+++ hibernate-jpa-2.0-api-1.0.1.Final-work/src/main/java/javax/persistence/MapsId.java 2012-01-15 09:49:25.292274457 -0500
|
|
|
197f950 |
@@ -72,7 +72,7 @@
|
|
|
197f950 |
/**
|
|
|
197f950 |
* (Optional) The name of the attribute within the composite key
|
|
|
197f950 |
* to which the relationship attribute corresponds. If not
|
|
|
197f950 |
- * supplied, the relationship maps the entitys primary
|
|
|
197f950 |
+ * supplied, the relationship maps the entity's primary
|
|
|
197f950 |
* key.
|
|
|
197f950 |
*/
|
|
|
197f950 |
String value() default "";
|