PROXY-170 : Update Entity Manager with provider

git-svn-id: https://scm.gforge.inria.fr/authscm/ycadoret/svn/gazelle/Maven/gazelle-proxy/trunk@56323 356b4b1a-1d2b-0410-8bf1-ffa24008f01e

gazelle-proxy-jar/src/main/java/net/ihe/gazelle/proxy/admin/gui/ApplicationManager.java

 package net.ihe.gazelle.proxy.admin.gui;
 
 import net.ihe.gazelle.hql.HQLQueryBuilder;
+import net.ihe.gazelle.hql.providers.EntityManagerService;
 import net.ihe.gazelle.proxy.admin.model.ApplicationConfiguration;
 import net.ihe.gazelle.proxy.admin.model.ApplicationConfigurationQuery;
-import org.jboss.seam.Component;
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.Scope;
@@ -27,7 +27,7 @@ public class ApplicationManager implements Serializable {
 
     public List<ApplicationConfiguration> getAllPreferences() {
         HQLQueryBuilder<ApplicationConfiguration> builder = new HQLQueryBuilder<ApplicationConfiguration>(
-                (EntityManager) Component.getInstance("entityManager"), ApplicationConfiguration.class);
+                EntityManagerService.provideEntityManager(), ApplicationConfiguration.class);
         builder.addOrder("variable", true);
         return builder.getList();
     }
@@ -36,7 +36,7 @@ public class ApplicationManager implements Serializable {
         ApplicationConfigurationQuery q = new ApplicationConfigurationQuery();
         q.variable().eq(inPreference.getVariable());
         if (q.getCount() == 0) {
-            EntityManager entityManager = (EntityManager) Component.getInstance("entityManager");
+            EntityManager entityManager = EntityManagerService.provideEntityManager();
             entityManager.merge(inPreference);
             entityManager.flush();
             preference = null;
@@ -49,7 +49,7 @@ public class ApplicationManager implements Serializable {
     }
 
     public void updatePreference(ApplicationConfiguration inPreference) {
-        EntityManager entityManager = (EntityManager) Component.getInstance("entityManager");
+        EntityManager entityManager = EntityManagerService.provideEntityManager();
         entityManager.merge(inPreference);
         entityManager.flush();
         preference = null;
@@ -61,7 +61,7 @@ public class ApplicationManager implements Serializable {
     public void removeSelectedPreference() {
         String preferenceName;
         if (this.preference != null) {
-            EntityManager entityManager = (EntityManager) Component.getInstance("entityManager");
+            EntityManager entityManager = EntityManagerService.provideEntityManager();
             this.preference = entityManager.find(ApplicationConfiguration.class, this.preference.getId());
             if (this.preference != null) {
                 preferenceName = this.preference.getVariable();
@@ -78,11 +78,11 @@ public class ApplicationManager implements Serializable {
         preference = new ApplicationConfiguration();
     }
 
-    public void setPreference(ApplicationConfiguration preference) {
-        this.preference = preference;
-    }
-
     public ApplicationConfiguration getPreference() {
         return preference;
     }
+
+    public void setPreference(ApplicationConfiguration preference) {
+        this.preference = preference;
+    }
 }

gazelle-proxy-jar/src/main/java/net/ihe/gazelle/proxy/admin/model/ApplicationConfiguration.java

@@ -58,7 +58,6 @@ public class ApplicationConfiguration implements Serializable {
 
     public static String getValueOfVariable(String variable) {
         EntityManager entityManager = EntityManagerService.provideEntityManager();
-        //EntityManager entityManager = (EntityManager) Component.getInstance("entityManager");
         return getValueOfVariable(variable, entityManager);
     }
 

gazelle-proxy-jar/src/main/java/net/ihe/gazelle/proxy/admin/model/Home.java

 package net.ihe.gazelle.proxy.admin.model;
 
 import net.ihe.gazelle.hql.HQLQueryBuilder;
+import net.ihe.gazelle.hql.providers.EntityManagerService;
 import org.hibernate.annotations.Type;
-import org.jboss.seam.Component;
 import org.jboss.seam.annotations.Name;
 import org.jboss.seam.web.Locale;
 
@@ -53,7 +53,7 @@ public class Home implements Serializable {
     public static Home getHomeForSelectedLanguage() {
         String language = Locale.instance().getISO3Language();
         if (language != null && !language.isEmpty()) {
-            EntityManager entityManager = (EntityManager) Component.getInstance("entityManager");
+            EntityManager entityManager = EntityManagerService.provideEntityManager();
             HQLQueryBuilder<Home> queryBuilder = new HQLQueryBuilder<Home>(entityManager, Home.class);
             queryBuilder.addEq("iso3Language", language);
             List<Home> homes = queryBuilder.getList();
@@ -103,7 +103,7 @@ public class Home implements Serializable {
      * @return home
      */
     public Home save() {
-        EntityManager entityManager = (EntityManager) Component.getInstance("entityManager");
+        EntityManager entityManager = EntityManagerService.provideEntityManager();
         Home home = entityManager.merge(this);
         entityManager.flush();
         return home;

gazelle-proxy-jar/src/main/java/net/ihe/gazelle/proxy/gui/MessageBean.java

@@ -17,7 +17,6 @@ import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.StringEscapeUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
-import org.jboss.seam.Component;
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
@@ -460,7 +459,7 @@ public class MessageBean implements Serializable {
             if (!(resultOidList.contains(oid))) {
                 resultOidList.add(oid);
                 message.setResultOid(resultOidList);
-                EntityManager entityManager = (EntityManager) Component.getInstance("entityManager");
+                EntityManager entityManager = EntityManagerService.provideEntityManager();
                 message = entityManager.merge(message);
                 entityManager.flush();
             } else {
@@ -479,7 +478,7 @@ public class MessageBean implements Serializable {
         if ((resultOidList.contains(oid))) {
             resultOidList.remove(oid);
             message.setResultOid(resultOidList);
-            EntityManager entityManager = (EntityManager) Component.getInstance("entityManager");
+            EntityManager entityManager = EntityManagerService.provideEntityManager();
             message = entityManager.merge(message);
             entityManager.flush();
         } else {