Refactorings for RedeBayesiana and ArquivoRedeBayesiana.
authorMichele Silva <michele.silva@gmail.com>
Mon, 28 Nov 2011 03:11:50 +0000 (01:11 -0200)
committerMichele Silva <michele.silva@gmail.com>
Mon, 28 Nov 2011 03:11:50 +0000 (01:11 -0200)
17 files changed:
SimDeCS/WebContent/layout/menu.xhtml
SimDeCS/WebContent/layout/template.xhtml
SimDeCS/WebContent/seguro/admin/rede/ArquivoRedeBayesiana.xhtml [moved from SimDeCS/WebContent/seguro/admin/rede/ArquivoRede.xhtml with 67% similarity]
SimDeCS/WebContent/seguro/admin/rede/ArquivoRedeBayesianaList.xhtml [moved from SimDeCS/WebContent/seguro/admin/rede/ArquivoRedeList.xhtml with 63% similarity]
SimDeCS/WebContent/seguro/admin/rede/RedeBayesiana.xhtml [new file with mode: 0644]
SimDeCS/WebContent/seguro/admin/rede/RedeBayesianaList.xhtml [new file with mode: 0644]
SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ArquivoRedeBayesianaHome.java [moved from SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ArquivoRedeHome.java with 84% similarity]
SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ArquivoRedeBayesianaList.java [new file with mode: 0644]
SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ArquivoRedeList.java [deleted file]
SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/DownloadArquivoRedeBayesiana.java [moved from SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/DownloadArquivoRede.java with 70% similarity]
SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RedeBayesianaHome.java [new file with mode: 0644]
SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RedeBayesianaList.java [new file with mode: 0644]
SimDeCS/src/main/org/ufcspa/simdecs/entities/ArquivoRedeBayesiana.java [moved from SimDeCS/src/main/org/ufcspa/simdecs/entities/ArquivoRede.java with 82% similarity]
SimDeCS/src/main/org/ufcspa/simdecs/entities/Nodo.java
SimDeCS/src/main/org/ufcspa/simdecs/entities/PerguntaNodo.java
SimDeCS/src/main/org/ufcspa/simdecs/entities/RedeBayesiana.java [moved from SimDeCS/src/main/org/ufcspa/simdecs/entities/Rede.java with 76% similarity]
SimDeCS/src/main/org/ufcspa/simdecs/entities/RespostaNodo.java

index 0c2b532..44fe524 100644 (file)
                        includePageParams="false"
                propagation="none"/>
      </rich:menuItem>
-     <rich:menuItem>
-       <s:link view="/seguro/admin/rede/ArquivoRedeList.xhtml"
+       <rich:menuItem>
+       <s:link view="/seguro/admin/rede/RedeBayesianaList.xhtml"
                value="Redes Bayesianas"
-               id="RedeId"
+               id="redeBayesianaId"
                        includePageParams="false"
                propagation="none"/>
      </rich:menuItem>
index 23c3caa..6eabb97 100644 (file)
@@ -29,7 +29,7 @@
          <ui:insert name="body"/>
       </div>
       <div class="footer">
-         <p>Desenvolvido pela <a href="http://www.ufcspa.edu.br">UFCSPA</a>- Universidade Federal de Ciências da Saúde de Porto Alegre </p>
+         <p>Desenvolvido pela <a href="http://www.ufcspa.edu.br">UFCSPA</a> - Universidade Federal de Ciências da Saúde de Porto Alegre </p>
          <s:fragment rendered="#{init.debug}">
          <a:log hotkey="D"/>
         </s:fragment>
                                <s:decorate id="fileUploadDecoration" template="/layout/edit.xhtml">
                                        <ui:define name="label">Arquivo</ui:define>
                                        <s:fileUpload id="file" 
-                                                     data="#{arquivoRedeHome.instance.data}"
-                                                     contentType="#{arquivoRedeHome.instance.contentType}"
-                                                     fileName="#{arquivoRedeHome.instance.nome}"
-                                                     fileSize="#{arquivoRedeHome.instance.tamanho}" />
+                                                     data="#{arquivoRedeBayesianaHome.instance.data}"
+                                                     contentType="#{arquivoRedeBayesianaHome.instance.contentType}"
+                                                     fileName="#{arquivoRedeBayesianaHome.instance.nome}"
+                                                     fileSize="#{arquivoRedeBayesianaHome.instance.tamanho}" />
                                </s:decorate>
                                
                                <s:decorate id="nameDecoration" template="/layout/display.xhtml">
                                        <ui:define name="label">Nome</ui:define>
-                                       <h:outputText value="#{arquivoRedeHome.instance.nome}"/>
+                                       <h:outputText value="#{arquivoRedeBayesianaHome.instance.nome}"/>
                                </s:decorate>
                                
                                <s:decorate id="contentTypeDecoration" template="/layout/display.xhtml">
                                        <ui:define name="label">Tipo</ui:define>
-                                       <h:outputText value="#{attachmentHome.instance.contentType}"/>
+                                       <h:outputText value="#{arquivoRedeBayesianaHome.instance.contentType}"/>
                                </s:decorate>
                                
                                <s:decorate id="sizeDecoration" template="/layout/display.xhtml">
                                        <ui:define name="label">Tamanho</ui:define>
-                                       <h:outputText value="#{arquivoRedeHome.instance.tamanho}"/>
+                                       <h:outputText value="#{arquivoRedeBayesianaHome.instance.tamanho}"/>
                                </s:decorate>
                                
                                <div style="clear: both" />
                        
                        <div class="actionButtons">
                                <h:commandButton value="Upload" 
-                                                action="#{arquivoRedeHome.saveNetwork}"  
-                                                rendered="#{!arquivoRedeHome.managed}"/>
+                                                action="#{arquivoRedeBayesianaHome.saveNetwork}"  
+                                                rendered="#{!arquivoRedeBayesianaHome.managed}"/>
                                <h:commandButton value="Delete" 
-                                                action="#{arquivoRedeHome.remove}"
+                                                action="#{arquivoRedeBayesianaHome.remove}"
                                                 immediate="true"  
-                                                rendered="#{arquivoRedeHome.managed}">
+                                                rendered="#{arquivoRedeBayesianaHome.managed}">
                                        <s:conversationPropagation type="end" />
                                </h:commandButton>
                                <s:button propagation="end" 
                           id="done" 
                           value="Concluído"
-                          view="/seguro/admin/rede/ArquivoRedeList.xhtml"/>
+                          view="/seguro/admin/rede/RedeBayesianaList.xhtml"/>
                        </div>
 
                </h:form>
                
                    <h:outputText value="Não existem redes cadastradas" rendered="#{empty arquivoRedeList.resultList}"/>
                           
-                   <rich:dataTable id="arquivoRedeList" 
-                                        var="arquivoRede"
-                                value="#{arquivoRedeList.resultList}" 
-                                        rendered="#{not empty arquivoRedeList.resultList}">
+                   <rich:dataTable id="arquivoRedeBayesianaList" 
+                                        var="arquivoRedeBayesiana"
+                                value="#{arquivoRedeBayesianaList.resultList}" 
+                                        rendered="#{not empty arquivoRedeBayesianaList.resultList}">
                        <rich:column>
                            <f:facet name="header">Arquivo</f:facet>
-                           <s:link value="#{arquivoRede.nome}" view="/seguro/admin/rede/ArquivoRede.xhtml">
-                               <f:param name="arquivoRedeId" value="${arquivoRede.id}" />
+                           <s:link value="#{arquivoRedeBayesiana.nome}" view="/seguro/admin/rede/ArquivoRedeBayesiana.xhtml">
+                               <f:param name="arquivoRedeBayesianaId" value="${arquivoRedeBayesiana.id}" />
                            </s:link>
                        </rich:column>
                        <rich:column>
                            <f:facet name="header">Tipo</f:facet>
-                           #{arquivoRede.contentType}
+                           #{arquivoRedeBayesiana.contentType}
                        </rich:column>
                        <rich:column>
                            <f:facet name="header">Tamanho (bytes)</f:facet>
-                           #{arquivoRede.tamanho}
+                           #{arquivoRedeBayesiana.tamanho}
                        </rich:column>
                        <rich:column>
                            <f:facet name="header">Ações</f:facet>
-                           <s:link value="Download" action="#{downloadArquivoRede.download}">
-                                   <f:param name="arquivoRedeId" value="${arquivoRede.id}" />
+                           <s:link value="Download" action="#{downloadArquivoRedeBayesiana.download}">
+                                   <f:param name="arquivoRedeBayesianaId" value="${arquivoRedeBayesiana.id}" />
                                </s:link>
                                <br></br>
-                               <s:link value="Delete" action="#{arquivoRedeHome.remove}">
-                                   <f:param name="arquivoRedeId" value="${arquivoRede.id}" />
-                               </s:link>
-                               <br></br>
-                               <s:link value="Perguntas e Respostas"  view="/seguro/admin/rede/PerguntaEdit.xhtml">
-                                   <f:param name="arquivoRedeId" value="${arquivoRede.id}" />
+                               <s:link value="Delete" action="#{arquivoRedeBayesianaHome.remove}">
+                                   <f:param name="arquivoRedeBayesianaId" value="${arquivoRedeBayesiana.id}" />
                                </s:link>
                        </rich:column>
                    </rich:dataTable>
@@ -60,7 +56,7 @@
            <div class="actionButtons">
                <s:button id="done" 
                       value="Upload de Rede Bayesiana"
-                       view="/seguro/admin/rede/ArquivoRede.xhtml"/>                     
+                       view="/seguro/admin/rede/ArquivoRedeBayesiana.xhtml"/>                    
            </div>
            
        </ui:define>
diff --git a/SimDeCS/WebContent/seguro/admin/rede/RedeBayesiana.xhtml b/SimDeCS/WebContent/seguro/admin/rede/RedeBayesiana.xhtml
new file mode 100644 (file)
index 0000000..73a83e1
--- /dev/null
@@ -0,0 +1,39 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:s="http://jboss.com/products/seam/taglib"
+    xmlns:ui="http://java.sun.com/jsf/facelets"
+    xmlns:f="http://java.sun.com/jsf/core"
+    xmlns:h="http://java.sun.com/jsf/html"
+    xmlns:rich="http://richfaces.org/rich"
+    template="/layout/template.xhtml">
+
+<ui:define name="body">
+
+    <h:form id="redeBayesianaForm">
+
+        <rich:panel>
+            <f:facet name="header">Rede Bayesiana</f:facet>
+
+            <s:decorate id="nameField" template="/layout/edit.xhtml">
+                <ui:define name="label">Nome</ui:define>
+                <h:inputText id="name" required="true"
+                             value="#{redeBayesianaHome.instance.nome}"/>
+            </s:decorate>
+
+            <div style="clear:both"/>
+
+        </rich:panel>
+
+        <div class="actionButtons">
+            <s:button propagation="end"
+                               id="cancel"
+                            value="Voltar"
+                             view="/seguro/admin/rede/RedeBayesianaList.xhtml"/>
+        </div>
+
+    </h:form>
+
+</ui:define>
+
+</ui:composition>
diff --git a/SimDeCS/WebContent/seguro/admin/rede/RedeBayesianaList.xhtml b/SimDeCS/WebContent/seguro/admin/rede/RedeBayesianaList.xhtml
new file mode 100644 (file)
index 0000000..f8cca35
--- /dev/null
@@ -0,0 +1,73 @@
+<!DOCTYPE composition PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<ui:composition xmlns="http://www.w3.org/1999/xhtml"
+    xmlns:s="http://jboss.com/products/seam/taglib"
+    xmlns:ui="http://java.sun.com/jsf/facelets"
+    xmlns:f="http://java.sun.com/jsf/core"
+    xmlns:h="http://java.sun.com/jsf/html"
+    xmlns:rich="http://richfaces.org/rich"
+    template="/layout/template.xhtml">
+
+<ui:define name="body">
+
+    <rich:panel>
+        <f:facet name="header"> Redes Bayesianas Cadastradas </f:facet>
+
+        <div class="results">
+
+            <h:outputText value="Não existem redes cadastradas"
+                       rendered="#{empty redeBayesianaList.resultList}"/>
+
+            <rich:dataTable id="redeBayesianaList" var="redeBayesiana"
+                      value="#{redeBayesianaList.resultList}"
+                   rendered="#{not empty redeBayesianaList.resultList}">
+                <rich:column>
+                    <f:facet name="header">Nome</f:facet>
+                    <s:link id="redeBayesiana"
+                         value="#{redeBayesiana.nome}"
+                   propagation="none"
+                         view="/seguro/admin/rede/RedeBayesiana.xhtml">
+                        <f:param name="redeBayesianaId"
+                                value="#{redeBayesiana.id}"/>
+                    </s:link>
+                </rich:column>
+                
+                 <rich:column>
+                           <f:facet name="header">Arquivo</f:facet>
+                           <s:link value="#{redeBayesiana.arquivo.nome}" view="/seguro/admin/rede/ArquivoRedeBayesiana.xhtml">
+                               <f:param name="arquivoRedeBayesianaId" value="${redeBayesiana.arquivo.id}" />
+                           </s:link>
+                       </rich:column>
+                       <rich:column>
+                           <f:facet name="header">Tipo</f:facet>
+                           #{redeBayesiana.arquivo.contentType}
+                       </rich:column>
+                       <rich:column>
+                           <f:facet name="header">Tamanho (bytes)</f:facet>
+                           #{redeBayesiana.arquivo.tamanho}
+                       </rich:column>
+                       <rich:column>
+                           <f:facet name="header">Ações</f:facet>
+                           <s:link value="Download" action="#{downloadArquivoRedeBayesiana.download}">
+                                   <f:param name="arquivoRedeBayesianaId" value="${redeBayesiana.arquivo.id}" />
+                               </s:link>
+                               <br></br>
+                               <s:link value="Delete" action="#{arquivoRedeBayesianaHome.remove}">
+                                   <f:param name="arquivoRedeBayesianaId" value="${redeBayesiana.arquivo.id}" />
+                               </s:link>
+                       </rich:column>
+            </rich:dataTable>
+
+        </div>
+
+    </rich:panel>
+
+    <div class="actionButtons">
+        <s:button id="done" 
+                      value="Upload de Rede Bayesiana"
+                       view="/seguro/admin/rede/ArquivoRedeBayesiana.xhtml"/>                    
+    </div>
+
+</ui:define>
+
+</ui:composition>
@@ -12,14 +12,14 @@ import org.jboss.seam.annotations.Begin;
 import org.jboss.seam.annotations.web.RequestParameter;
 import org.jboss.seam.log.Log;
 
-import org.ufcspa.simdecs.entities.ArquivoRede;
+import org.ufcspa.simdecs.entities.ArquivoRedeBayesiana;
 import org.ufcspa.simdecs.entities.BayesianNetworkParser;
 import org.ufcspa.simdecs.entities.Nodo;
-import org.ufcspa.simdecs.entities.Rede;
+import org.ufcspa.simdecs.entities.RedeBayesiana;
 import org.ufcspa.simdecs.session.crud.defaults.SimDeCSEntityHome;
 
-@Name("arquivoRedeHome")
-public class ArquivoRedeHome extends SimDeCSEntityHome<ArquivoRede>
+@Name("arquivoRedeBayesianaHome")
+public class ArquivoRedeBayesianaHome extends SimDeCSEntityHome<ArquivoRedeBayesiana>
 {
        private static final long serialVersionUID = 1L;
 
@@ -54,15 +54,16 @@ public class ArquivoRedeHome extends SimDeCSEntityHome<ArquivoRede>
                ArrayList<String> nodes = parser.getBayesianNetworkNodes();
                log.info(name + ": " + nodes);
                
-               Rede rede = new Rede();
+               RedeBayesiana rede = new RedeBayesiana();
                rede.setNome(name);
                rede.setArquivo(super.getInstance());
+       
                entityManager.persist(rede);
-               
+                               
                for (int i = 0; i < nodes.size(); i++){
                        Nodo nodo = new Nodo();
                        nodo.setNome(nodes.get(i));
-                       nodo.setRede(rede);
+                       nodo.setRedeBayesiana(rede);
                        entityManager.persist(nodo);
                }
                
diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ArquivoRedeBayesianaList.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ArquivoRedeBayesianaList.java
new file mode 100644 (file)
index 0000000..43f894e
--- /dev/null
@@ -0,0 +1,14 @@
+package org.ufcspa.simdecs.session.crud.admin;
+
+import org.jboss.seam.annotations.Name;
+import org.ufcspa.simdecs.entities.ArquivoRedeBayesiana;
+import org.ufcspa.simdecs.session.crud.defaults.SimDeCSEntityQuery;
+
+@Name("arquivoRedeBayesianaList")
+public class ArquivoRedeBayesianaList extends SimDeCSEntityQuery<ArquivoRedeBayesiana>
+{
+    public ArquivoRedeBayesianaList()
+    {
+        setEjbql("select arquivoRedeBayesiana from ArquivoRedeBayesiana arquivoRedeBayesiana");
+    }
+}
diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ArquivoRedeList.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ArquivoRedeList.java
deleted file mode 100644 (file)
index 369a218..0000000
+++ /dev/null
@@ -1,14 +0,0 @@
-package org.ufcspa.simdecs.session.crud.admin;
-
-import org.jboss.seam.annotations.Name;
-import org.ufcspa.simdecs.entities.ArquivoRede;
-import org.ufcspa.simdecs.session.crud.defaults.SimDeCSEntityQuery;
-
-@Name("arquivoRedeList")
-public class ArquivoRedeList extends SimDeCSEntityQuery<ArquivoRede>
-{
-    public ArquivoRedeList()
-    {
-        setEjbql("select arquivoRede from ArquivoRede arquivoRede");
-    }
-}
@@ -12,10 +12,10 @@ import org.jboss.seam.annotations.Name;
 import org.jboss.seam.annotations.web.RequestParameter;
 import org.jboss.seam.log.Log;
 
-import org.ufcspa.simdecs.entities.ArquivoRede;
+import org.ufcspa.simdecs.entities.ArquivoRedeBayesiana;
 
-@Name("downloadArquivoRede")
-public class DownloadArquivoRede {
+@Name("downloadArquivoRedeBayesiana")
+public class DownloadArquivoRedeBayesiana {
        
        @Logger
        private Log log;
@@ -30,16 +30,16 @@ public class DownloadArquivoRede {
        FacesContext facesContext;
        
        @RequestParameter
-       private Long arquivoRedeId;
+       private Long arquivoRedeBayesianaId;
        
        public String download() {
-               ArquivoRede arquivoRede = entityManager.find(ArquivoRede.class, arquivoRedeId);
+               ArquivoRedeBayesiana arquivoRedeBayesiana = entityManager.find(ArquivoRedeBayesiana.class, arquivoRedeBayesianaId);
                HttpServletResponse response = (HttpServletResponse)extCtx.getResponse();
-               response.setContentType(arquivoRede.getContentType());
-                response.addHeader("Content-disposition", "attachment; filename=\"" + arquivoRede.getNome() +"\"");
+               response.setContentType(arquivoRedeBayesiana.getContentType());
+                response.addHeader("Content-disposition", "attachment; filename=\"" + arquivoRedeBayesiana.getNome() +"\"");
                try {
                        ServletOutputStream os = response.getOutputStream();
-                       os.write(arquivoRede.getData());
+                       os.write(arquivoRedeBayesiana.getData());
                        os.flush();
                        os.close();
                        facesContext.responseComplete();
diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RedeBayesianaHome.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RedeBayesianaHome.java
new file mode 100644 (file)
index 0000000..23562d5
--- /dev/null
@@ -0,0 +1,33 @@
+package org.ufcspa.simdecs.session.crud.admin;
+
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Begin;
+import org.jboss.seam.annotations.web.RequestParameter;
+import org.jboss.seam.framework.EntityHome;
+
+import org.ufcspa.simdecs.entities.RedeBayesiana;
+
+@Name("redeBayesianaHome")
+public class RedeBayesianaHome extends EntityHome<RedeBayesiana>
+{
+    @RequestParameter Long redeBayesianaId;
+
+    @Override
+    public Object getId()
+    {
+        if (redeBayesianaId == null)
+        {
+            return super.getId();
+        }
+        else
+        {
+            return redeBayesianaId;
+        }
+    }
+
+    @Override @Begin
+    public void create() {
+        super.create();
+    }
+
+}
diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RedeBayesianaList.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RedeBayesianaList.java
new file mode 100644 (file)
index 0000000..727c122
--- /dev/null
@@ -0,0 +1,14 @@
+package org.ufcspa.simdecs.session.crud.admin;
+
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.framework.EntityQuery;
+import org.ufcspa.simdecs.entities.RedeBayesiana;
+
+@Name("redeBayesianaList")
+public class RedeBayesianaList extends EntityQuery<RedeBayesiana>
+{
+    public RedeBayesianaList()
+    {
+        setEjbql("select redeBayesiana from RedeBayesiana redeBayesiana");
+    }
+}
@@ -7,10 +7,16 @@ import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Lob;
+import javax.persistence.Table;
 
 @Entity
-public class ArquivoRede implements java.io.Serializable {
+@Table(name="ArquivoRedeBayesiana")
+public class ArquivoRedeBayesiana implements java.io.Serializable {
 
+       /**
+        * 
+        */
+       private static final long serialVersionUID = -4027369275301275024L;
        @Id
        @GeneratedValue
        private Long id;
@@ -36,4 +42,5 @@ public class ArquivoRede implements java.io.Serializable {
        public byte[] getData() { return this.data; }
        public void setData(byte[] data) { this.data = data; }
        
+       
 }
\ No newline at end of file
index 20f1003..22ff69a 100644 (file)
@@ -2,6 +2,7 @@ package org.ufcspa.simdecs.entities;
 
 import java.io.Serializable;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
@@ -35,10 +36,10 @@ public class Nodo implements Serializable {
        @Column(length=10, nullable=true)
        private Long tempo;
        
-    @ManyToOne
-    @JoinColumn(name = "rede_id", referencedColumnName = "id", nullable = true)
-    @Index(name="nodo_rede_fk_i")
-       private Rede rede;
+    @ManyToOne(cascade=CascadeType.ALL)
+    @JoinColumn(name = "redeBayesiana_id", referencedColumnName = "id", nullable = true)
+    @Index(name="nodo_redeBayesiana_fk_i")
+       private RedeBayesiana redeBayesiana;
        
        public Long getId() {
                return id;
@@ -65,12 +66,12 @@ public class Nodo implements Serializable {
                this.tempo = tempo;
        }
        
-       public Rede getRede() {
-               return rede;
+       public RedeBayesiana getRedeBayesiana() {
+               return redeBayesiana;
        }
 
-       public void setRede(Rede rede) {
-               this.rede = rede;
+       public void setRedeBayesiana(RedeBayesiana rede) {
+               this.redeBayesiana = rede;
        }
 
        public String toString() {
index d89e0ea..a0fba2b 100644 (file)
@@ -27,7 +27,7 @@ public class PerguntaNodo implements Serializable {
        private Long id;
 
        @Column(length=100, nullable=false)
-       private String pergunta;
+       private String texto;
        
     @ManyToOne
     @JoinColumn(name = "nodo_id", referencedColumnName = "id", nullable = true)
@@ -40,11 +40,11 @@ public class PerguntaNodo implements Serializable {
        public void setId(Long id) {
                this.id = id;
        }
-       public String getPergunta() {
-               return pergunta;
+       public String getTexto() {
+               return texto;
        }
-       public void setPergunta(String pergunta) {
-               this.pergunta = pergunta;
+       public void setTexto(String pergunta) {
+               this.texto = pergunta;
        }
 
        public Nodo getNodo() {
@@ -56,7 +56,7 @@ public class PerguntaNodo implements Serializable {
        }
        
        public String toString() {
-               return id + " - " + pergunta;
+               return id + " - " + texto;
        }
 
        @Override
-package org.ufcspa.simdecs.entities;\r
-\r
-import java.io.Serializable;\r
-import java.util.Collection;\r
-\r
-import javax.persistence.Column;\r
-import javax.persistence.Entity;\r
-import javax.persistence.GeneratedValue;\r
-import javax.persistence.GenerationType;\r
-import javax.persistence.Id;\r
-import javax.persistence.JoinColumn;\r
-import javax.persistence.JoinTable;\r
-import javax.persistence.ManyToMany;\r
-import javax.persistence.OneToOne;\r
-import javax.persistence.SequenceGenerator;\r
-import javax.persistence.Table;\r
-import javax.persistence.UniqueConstraint;\r
-\r
-import org.hibernate.annotations.Index;\r
-\r
-@Entity\r
-//Short name: "rede"\r
-@Table(name="Rede")\r
-@SequenceGenerator(name = "sequenceRede", sequenceName = "sqRede", initialValue = 1, allocationSize=1)\r
-public class Rede implements Serializable {\r
-\r
-       private static final long serialVersionUID = -8764281348427990153L;\r
-\r
-       @GeneratedValue(generator = "sequenceRede", strategy = GenerationType.AUTO)\r
-       @Id\r
-       private Long id;\r
-\r
-       @Column(nullable=false, length=50)\r
-       private String nome;\r
-       \r
-    @OneToOne\r
-    @JoinColumn(name = "arquivoRede_id", referencedColumnName = "id", nullable = true)\r
-    @Index(name="rede_arquivoRede_fk_i")       \r
-    private ArquivoRede arquivo;\r
-\r
-       @Column(length=1, nullable=false)\r
-       private boolean aplicavelSexoMasculino;\r
-\r
-       @Column(length=1, nullable=false)\r
-       private boolean aplicavelSexoFeminino;\r
-\r
-    @ManyToMany\r
-    @JoinTable(        name = "FaixaEtariaRede",\r
-                       joinColumns = {@JoinColumn(name = "rede_id")},\r
-                       inverseJoinColumns = {@JoinColumn(name = "faiet_id")},\r
-                       uniqueConstraints={@UniqueConstraint(columnNames={"rede_id", "faiet_id"})})\r
-    private Collection<FaixaEtaria> faixasEtarias;\r
-\r
-    \r
-    public Long getId() {\r
-               return id;\r
-       }\r
-\r
-       public void setId(Long id) {\r
-               this.id = id;\r
-       }\r
-\r
-       public String getNome() {\r
-               return nome;\r
-       }\r
-\r
-       public void setNome(String nome) {\r
-               this.nome = nome;\r
-       }\r
-\r
-       public ArquivoRede getArquivo() {\r
-               return arquivo;\r
-       }\r
-\r
-       public void setArquivo(ArquivoRede arquivo) {\r
-               this.arquivo = arquivo;\r
-       }\r
-       public boolean isAplicavelSexoMasculino() {\r
-               return aplicavelSexoMasculino;\r
-       }\r
-\r
-       public void setAplicavelSexoMasculino(boolean aplicavelSexoMasculino) {\r
-               this.aplicavelSexoMasculino = aplicavelSexoMasculino;\r
-       }\r
-\r
-       public boolean isAplicavelSexoFeminino() {\r
-               return aplicavelSexoFeminino;\r
-       }\r
-\r
-       public void setAplicavelSexoFeminino(boolean aplicavelSexoFeminino) {\r
-               this.aplicavelSexoFeminino = aplicavelSexoFeminino;\r
-       }\r
-\r
-       public Collection<FaixaEtaria> getFaixasEtarias() {\r
-               return faixasEtarias;\r
-       }\r
-\r
-       public void setFaixasEtarias(Collection<FaixaEtaria> faixasEtarias) {\r
-               this.faixasEtarias = faixasEtarias;\r
-       }\r
-\r
-       @Override\r
-       public int hashCode() {\r
-               final int prime = 31;\r
-               int result = 1;\r
-               result = prime * result + ((id == null) ? 0 : id.hashCode());\r
-               return result;\r
-       }\r
-\r
-       @Override\r
-       public boolean equals(Object obj) {\r
-               if (this == obj)\r
-                       return true;\r
-               if (obj == null)\r
-                       return false;\r
-               if (getClass() != obj.getClass())\r
-                       return false;\r
-               Rede other = (Rede) obj;\r
-               if (id == null) {\r
-                       if (other.id != null)\r
-                               return false;\r
-               } else if (!id.equals(other.id))\r
-                       return false;\r
-               return true;\r
-       }\r
-\r
-}\r
+package org.ufcspa.simdecs.entities;
+
+import java.io.Serializable;
+import java.util.Collection;
+
+import javax.persistence.CascadeType;
+import javax.persistence.Column;
+import javax.persistence.Entity;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.GeneratedValue;
+import javax.persistence.JoinColumn;
+import javax.persistence.JoinTable;
+import javax.persistence.ManyToMany;
+import javax.persistence.OneToOne;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
+
+import org.hibernate.annotations.Index;
+
+
+@Entity
+//Short name: "redeBayesiana"
+@Table(name="RedeBayesiana")
+@SequenceGenerator(name = "sequenceRedeBayesiana", sequenceName = "sqRedeBayesiana", initialValue = 1, allocationSize=1)
+public class RedeBayesiana implements Serializable
+{
+       private static final long serialVersionUID = -8764281348427990153L;
+
+       @GeneratedValue(generator = "sequenceRedeBayesiana", strategy = GenerationType.AUTO)
+       @Id
+       private Long id;
+
+       @Column(nullable=false, length=50)
+       private String nome;
+
+       @Column(length=1, nullable=false)
+       private boolean aplicavelSexoMasculino;
+
+       @Column(length=1, nullable=false)
+       private boolean aplicavelSexoFeminino;
+
+    @ManyToMany
+    @JoinTable(        name = "FaixaEtariaRede",
+                       joinColumns = {@JoinColumn(name = "rede_id")},
+                       inverseJoinColumns = {@JoinColumn(name = "faiet_id")},
+                       uniqueConstraints={@UniqueConstraint(columnNames={"rede_id", "faiet_id"})})
+    private Collection<FaixaEtaria> faixasEtarias;
+    
+    @OneToOne(cascade=CascadeType.ALL)
+    @JoinColumn(name = "arquivoRedeBayesiana_id", referencedColumnName = "id", nullable = true)
+    @Index(name="rede_arquivo_fk_i")   
+       private ArquivoRedeBayesiana arquivo;
+       public ArquivoRedeBayesiana getArquivo() { return arquivo;      }
+       public void setArquivo(ArquivoRedeBayesiana arquivo) { this.arquivo = arquivo; }
+
+    
+    public Long getId() {
+               return id;
+       }
+
+       public void setId(Long id) {
+               this.id = id;
+       }
+
+       public String getNome() {
+               return nome;
+       }
+
+       public void setNome(String nome) {
+               this.nome = nome;
+       }
+
+       public boolean isAplicavelSexoMasculino() {
+               return aplicavelSexoMasculino;
+       }
+
+       public void setAplicavelSexoMasculino(boolean aplicavelSexoMasculino) {
+               this.aplicavelSexoMasculino = aplicavelSexoMasculino;
+       }
+
+       public boolean isAplicavelSexoFeminino() {
+               return aplicavelSexoFeminino;
+       }
+
+       public void setAplicavelSexoFeminino(boolean aplicavelSexoFeminino) {
+               this.aplicavelSexoFeminino = aplicavelSexoFeminino;
+       }
+
+       public Collection<FaixaEtaria> getFaixasEtarias() {
+               return faixasEtarias;
+       }
+
+       public void setFaixasEtarias(Collection<FaixaEtaria> faixasEtarias) {
+               this.faixasEtarias = faixasEtarias;
+       }
+
+       @Override
+       public int hashCode() {
+               final int prime = 31;
+               int result = 1;
+               result = prime * result + ((id == null) ? 0 : id.hashCode());
+               return result;
+       }
+
+       @Override
+       public boolean equals(Object obj) {
+               if (this == obj)
+                       return true;
+               if (obj == null)
+                       return false;
+               if (getClass() != obj.getClass())
+                       return false;
+               RedeBayesiana other = (RedeBayesiana) obj;
+               if (id == null) {
+                       if (other.id != null)
+                               return false;
+               } else if (!id.equals(other.id))
+                       return false;
+               return true;
+       }
+
+}
index 2e8bfbc..354a99e 100644 (file)
@@ -27,15 +27,15 @@ public class RespostaNodo implements Serializable {
        private Long id;
 
        @Column(length=100, nullable=false)
-       private String resposta;
+       private String texto;
        
        @Column(length=10, nullable=true)
        private Float percentual;
        
     @ManyToOne
-    @JoinColumn(name = "nodo_id", referencedColumnName = "id", nullable = true)
-    @Index(name="resposta_nodo_fk_i")
-       private Nodo nodo;
+    @JoinColumn(name = "perguntaNodo_id", referencedColumnName = "id", nullable = true)
+    @Index(name="respostaNodo_perguntaNodo_fk_i")
+       private PerguntaNodo pergunta;
        
        public Long getId() {
                return id;
@@ -43,11 +43,11 @@ public class RespostaNodo implements Serializable {
        public void setId(Long id) {
                this.id = id;
        }
-       public String getResposta() {
-               return resposta;
+       public String getTexto() {
+               return texto;
        }
-       public void setResposta(String resposta) {
-               this.resposta = resposta;
+       public void setTexto(String texto) {
+               this.texto = texto;
        }
        public Float getPercentual() {
                return percentual;
@@ -56,16 +56,16 @@ public class RespostaNodo implements Serializable {
                this.percentual = percentual;
        }
        
-       public Nodo getNodo() {
-               return nodo;
+       public PerguntaNodo getPergunta() {
+               return pergunta;
        }
 
-       public void getNodo(Nodo nodo) {
-               this.nodo = nodo;
+       public void getNodo(PerguntaNodo pergunta) {
+               this.pergunta = pergunta;
        }
 
        public String toString() {
-               return id + " - " + resposta + " - " + percentual ;
+               return id + " - " + texto + " - " + percentual ;
        }
 
        @Override