[jboss-cvs] jboss-seam/src/main/org/jboss/seam/framework ...
Gavin King
gavin.king at jboss.com
Mon Jan 29 07:43:31 EST 2007
User: gavin
Date: 07/01/29 07:43:31
Modified: src/main/org/jboss/seam/framework
EntityController.java EntityHome.java
EntityQuery.java HibernateEntityController.java
HibernateEntityHome.java HibernateEntityQuery.java
Home.java PersistenceController.java
Log:
fixed breakage with reuse by extension
Revision Changes Path
1.4 +6 -0 jboss-seam/src/main/org/jboss/seam/framework/EntityController.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EntityController.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework/EntityController.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- EntityController.java 27 Jan 2007 18:41:25 -0000 1.3
+++ EntityController.java 29 Jan 2007 12:43:31 -0000 1.4
@@ -26,6 +26,12 @@
setPersistenceContext(entityManager);
}
+ @Override
+ protected String getPersistenceContextName()
+ {
+ return "entityManager";
+ }
+
protected Query createNamedQuery(String name)
{
return getEntityManager().createNamedQuery(name);
1.16 +6 -0 jboss-seam/src/main/org/jboss/seam/framework/EntityHome.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EntityHome.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework/EntityHome.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- EntityHome.java 27 Jan 2007 18:41:25 -0000 1.15
+++ EntityHome.java 29 Jan 2007 12:43:31 -0000 1.16
@@ -82,4 +82,10 @@
setPersistenceContext(entityManager);
}
+ @Override
+ protected String getPersistenceContextName()
+ {
+ return "entityManager";
+ }
+
}
1.10 +6 -0 jboss-seam/src/main/org/jboss/seam/framework/EntityQuery.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: EntityQuery.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework/EntityQuery.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- EntityQuery.java 27 Jan 2007 18:41:25 -0000 1.9
+++ EntityQuery.java 29 Jan 2007 12:43:31 -0000 1.10
@@ -88,6 +88,12 @@
setPersistenceContext(entityManager);
}
+ @Override
+ protected String getPersistenceContextName()
+ {
+ return "entityManager";
+ }
+
protected javax.persistence.Query createQuery()
{
parseEjbql();
1.4 +6 -0 jboss-seam/src/main/org/jboss/seam/framework/HibernateEntityController.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: HibernateEntityController.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework/HibernateEntityController.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- HibernateEntityController.java 27 Jan 2007 18:41:25 -0000 1.3
+++ HibernateEntityController.java 29 Jan 2007 12:43:31 -0000 1.4
@@ -32,6 +32,12 @@
setPersistenceContext(session);
}
+ @Override
+ protected String getPersistenceContextName()
+ {
+ return "session";
+ }
+
protected Criteria createCriteria(Class clazz)
{
return getSession().createCriteria(clazz);
1.13 +6 -0 jboss-seam/src/main/org/jboss/seam/framework/HibernateEntityHome.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: HibernateEntityHome.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework/HibernateEntityHome.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- HibernateEntityHome.java 27 Jan 2007 18:41:25 -0000 1.12
+++ HibernateEntityHome.java 29 Jan 2007 12:43:31 -0000 1.13
@@ -79,4 +79,10 @@
setPersistenceContext(session);
}
+ @Override
+ protected String getPersistenceContextName()
+ {
+ return "session";
+ }
+
}
1.9 +6 -0 jboss-seam/src/main/org/jboss/seam/framework/HibernateEntityQuery.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: HibernateEntityQuery.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework/HibernateEntityQuery.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- HibernateEntityQuery.java 27 Jan 2007 18:41:25 -0000 1.8
+++ HibernateEntityQuery.java 29 Jan 2007 12:43:31 -0000 1.9
@@ -89,6 +89,12 @@
setPersistenceContext(session);
}
+ @Override
+ protected String getPersistenceContextName()
+ {
+ return "session";
+ }
+
protected org.hibernate.Query createQuery()
{
parseEjbql();
1.16 +1 -1 jboss-seam/src/main/org/jboss/seam/framework/Home.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: Home.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework/Home.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- Home.java 27 Jan 2007 18:50:36 -0000 1.15
+++ Home.java 29 Jan 2007 12:43:31 -0000 1.16
@@ -128,7 +128,7 @@
if (type instanceof ParameterizedType)
{
ParameterizedType paramType = (ParameterizedType) type;
- entityClass = (Class<E>) paramType.getActualTypeArguments()[1];
+ entityClass = (Class<E>) paramType.getActualTypeArguments()[0];
}
else
{
1.2 +1 -22 jboss-seam/src/main/org/jboss/seam/framework/PersistenceController.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PersistenceController.java
===================================================================
RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/framework/PersistenceController.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PersistenceController.java 27 Jan 2007 18:42:57 -0000 1.1
+++ PersistenceController.java 29 Jan 2007 12:43:31 -0000 1.2
@@ -1,7 +1,5 @@
package org.jboss.seam.framework;
-import java.lang.reflect.ParameterizedType;
-import java.lang.reflect.Type;
/**
* Base class for controller objects which require a persistence
@@ -14,7 +12,6 @@
public abstract class PersistenceController<T> extends Controller
{
private transient T persistenceContext;
- private String persistenceContextName;
public T getPersistenceContext()
{
@@ -30,24 +27,6 @@
this.persistenceContext = persistenceContext;
}
- protected String getPersistenceContextName()
- {
- if (persistenceContextName==null)
- {
- Type type = getClass().getGenericSuperclass();
- if (type instanceof ParameterizedType)
- {
- ParameterizedType paramType = (ParameterizedType) type;
- String className = ( (Class<T>) paramType.getActualTypeArguments()[0] ).getName();
- int loc = className.lastIndexOf('.');
- persistenceContextName = className.substring(loc+1,loc+2).toLowerCase() + className.substring(loc+2);
- }
- else
- {
- throw new IllegalArgumentException("Could not guess persistence context class by reflection");
- }
- }
- return persistenceContextName;
- }
+ protected abstract String getPersistenceContextName();
}
More information about the jboss-cvs-commits
mailing list