(no commit message)

diff --git a/src/java/org/ufcspa/simdecs/mb/editarcasos/EditarCasoBean.java b/src/java/org/ufcspa/simdecs/mb/editarcasos/EditarCasoBean.java
index 1c963a4..4dc7908 100644 (file)
--- a/src/java/org/ufcspa/simdecs/mb/editarcasos/EditarCasoBean.java
+++ b/src/java/org/ufcspa/simdecs/mb/editarcasos/EditarCasoBean.java
@@ -194,8 +194,8 @@ public class EditarCasoBean extends DefaultManagedBean {
         idPaciente = Long.valueOf(getTextParameter("pIdPaciente"));
         Paciente paciente = em.find(Paciente.class, idPaciente);
         
-        UnBUtil unBUtil = UnBUtil.getInstance(paciente.getRede().getNomeArquivo());
-        unBUtil.abreRede(paciente.getRede().getNomeArquivo());
+        UnBUtil unBUtil = UnBUtil.getInstance(paciente.getRede());
+        unBUtil.abreRede(paciente.getRede());
 
         // Sinais e Sintomas
         for (Object nodo : sinaisSintomas.getSource()) {
@@ -375,7 +375,7 @@ public class EditarCasoBean extends DefaultManagedBean {
         examesFisicos = new DualListModel<Nodo>(origemExamesFisicos, destinoExamesFisicos);
         examesComplementares = new DualListModel<Nodo>(origemExamesComplementares, destinoExamesComplementares);
     
-        UnBUtil unBUtil = UnBUtil.getInstance(paciente.getRede().getNomeArquivo());
+        UnBUtil unBUtil = UnBUtil.getInstance(paciente.getRede());
 
         diagnosticos = unBUtil.getProbabilidadeDiagnosticos();
         condutas     = unBUtil.getProbabilidadeCondutas();

diff --git a/src/java/org/ufcspa/simdecs/util/UnBUtil.java b/src/java/org/ufcspa/simdecs/util/UnBUtil.java
index f73335c..c77f62d 100644 (file)
--- a/src/java/org/ufcspa/simdecs/util/UnBUtil.java
+++ b/src/java/org/ufcspa/simdecs/util/UnBUtil.java
@@ -11,6 +11,7 @@ import java.util.Comparator;
 import java.util.List;
 import javax.persistence.EntityManager;
 import org.ufcspa.simdecs.entities.Nodo;
+import org.ufcspa.simdecs.entities.Rede;
 import unbbayes.io.xmlbif.version6.XMLBIFIO;
 import unbbayes.prs.Node;
 import unbbayes.prs.bn.JunctionTreeAlgorithm;
@@ -27,17 +28,17 @@ public class UnBUtil {
     private static UnBUtil unBUtil;
     private ProbabilisticNetwork rede;
     
-    private UnBUtil(String caminhoRede) {
-        abreRede(caminhoRede);
+    private UnBUtil(Rede redeEntity) {
+        abreRede(redeEntity);
     }
     
-    public final void abreRede(String caminhoRede) {
+    public final void abreRede(Rede redeEntity) {
         try {
             // required to run unbbayes gui classes on server
             System.setProperty("java.awt.headless", "false"); 
-
+            System.out.println("REDE: " + redeEntity.getArquivo());
             rede = new ProbabilisticNetwork(null);
-            XMLBIFIO.loadXML(new File(caminhoRede), rede);
+            XMLBIFIO.loadXML(new File(redeEntity.getArquivo()), rede);
 
         } catch (Exception e) {
             e.printStackTrace();
@@ -47,9 +48,9 @@ public class UnBUtil {
         compilar();
     }
     
-    public static UnBUtil getInstance(String caminhoRede) {
+    public static UnBUtil getInstance(Rede redeEntity) {
         if (unBUtil == null) 
-            unBUtil = new UnBUtil(caminhoRede);
+            unBUtil = new UnBUtil(redeEntity);
         
         return unBUtil;
     }

diff --git a/src/java/redes/headache.xml b/web/redes/headache.xml
similarity index 100%
rename from src/java/redes/headache.xml
rename to web/redes/headache.xml