Author: dgeraskov
Date: 2009-05-06 08:39:55 -0400 (Wed, 06 May 2009)
New Revision: 15069
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/DocumentBase.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/DocumentBase.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/DocumentBase.java
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/DocumentBase.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4264
Recommit changes and fixed broken test.
Modified:
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java
===================================================================
---
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java 2009-05-06
12:01:25 UTC (rev 15068)
+++
trunk/hibernatetools/plugins/org.hibernate.eclipse.jdt.ui/src/org/hibernate/eclipse/jdt/ui/internal/jpa/collect/CollectEntityInfo.java 2009-05-06
12:39:55 UTC (rev 15069)
@@ -512,6 +512,7 @@
while (itVarNames.hasNext()) {
String name = (String)itVarNames.next();
entityInfo.updateAnnotationColumn(name, null, false);
+ entityInfo.addPrimaryIdCandidate(name);
}
}
}
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/DocumentBase.java
===================================================================
---
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/DocumentBase.java 2009-05-06
12:01:25 UTC (rev 15068)
+++
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/fields/DocumentBase.java 2009-05-06
12:39:55 UTC (rev 15069)
@@ -14,7 +14,7 @@
public abstract class DocumentBase {
- protected String globalDocumentIdentificator;
+ protected boolean globalDocumentIdentificator;
protected Integer version;
}
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/DocumentBase.java
===================================================================
---
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/DocumentBase.java 2009-05-06
12:01:25 UTC (rev 15068)
+++
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/project/test/annotated/getters/DocumentBase.java 2009-05-06
12:39:55 UTC (rev 15069)
@@ -15,7 +15,7 @@
@javax.persistence.MappedSuperclass
public abstract class DocumentBase {
- protected String globalDocumentIdentificator;
+ protected boolean globalDocumentIdentificator;
protected Integer version;
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/DocumentBase.java
===================================================================
---
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/DocumentBase.java 2009-05-06
12:01:25 UTC (rev 15068)
+++
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/fields/DocumentBase.java 2009-05-06
12:39:55 UTC (rev 15069)
@@ -10,16 +10,14 @@
******************************************************************************/
package test.annotated.fields;
-import javax.persistence.Column;
import javax.persistence.MappedSuperclass;
import javax.persistence.Version;
@MappedSuperclass
public abstract class DocumentBase {
+
+ protected boolean globalDocumentIdentificator;
- @Column(length=200)
- protected String globalDocumentIdentificator;
-
@Version
protected Integer version;
Modified:
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/DocumentBase.java
===================================================================
---
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/DocumentBase.java 2009-05-06
12:01:25 UTC (rev 15068)
+++
trunk/hibernatetools/tests/org.hibernate.eclipse.jdt.ui.test/res/specimen/test/annotated/getters/DocumentBase.java 2009-05-06
12:39:55 UTC (rev 15069)
@@ -15,7 +15,7 @@
@javax.persistence.MappedSuperclass
public abstract class DocumentBase {
- protected String globalDocumentIdentificator;
+ protected boolean globalDocumentIdentificator;
protected Integer version;