| 1 |
dmorgan |
330516 |
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 |
| 2 |
|
|
--- hibernate-jpa-2.0-api-1.0.1.Final/src/main/java/javax/persistence/EntityManager.java 2011-06-13 05:58:51.000000000 -0400 |
| 3 |
|
|
+++ 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 |
| 4 |
|
|
@@ -103,7 +103,7 @@ |
| 5 |
|
|
* not exist |
| 6 |
|
|
* @throws IllegalArgumentException if the first argument does |
| 7 |
|
|
* not denote an entity type or the second argument is |
| 8 |
|
|
- * is not a valid type for that entitys primary key or |
| 9 |
|
|
+ * is not a valid type for that entity's primary key or |
| 10 |
|
|
* is null |
| 11 |
|
|
*/ |
| 12 |
|
|
public <T> T find(Class<T> entityClass, Object primaryKey); |
| 13 |
|
|
@@ -123,7 +123,7 @@ |
| 14 |
|
|
* not exist |
| 15 |
|
|
* @throws IllegalArgumentException if the first argument does |
| 16 |
|
|
* not denote an entity type or the second argument is |
| 17 |
|
|
- * is not a valid type for that entitys primary key or |
| 18 |
|
|
+ * is not a valid type for that entity's primary key or |
| 19 |
|
|
* is null |
| 20 |
|
|
* @since Java Persistence 2.0 |
| 21 |
|
|
*/ |
| 22 |
|
|
@@ -244,7 +244,7 @@ |
| 23 |
|
|
* @return the found entity instance |
| 24 |
|
|
* @throws IllegalArgumentException if the first argument does |
| 25 |
|
|
* not denote an entity type or the second argument is |
| 26 |
|
|
- * not a valid type for that entitys primary key or |
| 27 |
|
|
+ * not a valid type for that entity's primary key or |
| 28 |
|
|
* is null |
| 29 |
|
|
* @throws EntityNotFoundException if the entity state |
| 30 |
|
|
* cannot be accessed |
| 31 |
|
|
@@ -722,4 +722,4 @@ |
| 32 |
|
|
* @since Java Persistence 2.0 |
| 33 |
|
|
*/ |
| 34 |
|
|
public Metamodel getMetamodel(); |
| 35 |
|
|
-} |
| 36 |
|
|
\ No newline at end of file |
| 37 |
|
|
+} |
| 38 |
|
|
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 |
| 39 |
|
|
--- hibernate-jpa-2.0-api-1.0.1.Final/src/main/java/javax/persistence/MapsId.java 2011-06-13 05:58:51.000000000 -0400 |
| 40 |
|
|
+++ 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 |
| 41 |
|
|
@@ -72,7 +72,7 @@ |
| 42 |
|
|
/** |
| 43 |
|
|
* (Optional) The name of the attribute within the composite key |
| 44 |
|
|
* to which the relationship attribute corresponds. If not |
| 45 |
|
|
- * supplied, the relationship maps the entitys primary |
| 46 |
|
|
+ * supplied, the relationship maps the entity's primary |
| 47 |
|
|
* key. |
| 48 |
|
|
*/ |
| 49 |
|
|
String value() default ""; |
Parent Directory
| 
Revision Log