From: Michele Silva Date: Mon, 28 Nov 2011 03:11:50 +0000 (-0200) Subject: Refactorings for RedeBayesiana and ArquivoRedeBayesiana. X-Git-Url: http://200.18.67.61/gitweb/?a=commitdiff_plain;h=d1c23fc50533eb927023881b2a812b655ff69c18;p=simdecs_seam.git Refactorings for RedeBayesiana and ArquivoRedeBayesiana. --- diff --git a/SimDeCS/WebContent/layout/menu.xhtml b/SimDeCS/WebContent/layout/menu.xhtml index 0c2b532..44fe524 100644 --- a/SimDeCS/WebContent/layout/menu.xhtml +++ b/SimDeCS/WebContent/layout/menu.xhtml @@ -46,10 +46,10 @@ includePageParams="false" propagation="none"/> - - + diff --git a/SimDeCS/WebContent/layout/template.xhtml b/SimDeCS/WebContent/layout/template.xhtml index 23c3caa..6eabb97 100644 --- a/SimDeCS/WebContent/layout/template.xhtml +++ b/SimDeCS/WebContent/layout/template.xhtml @@ -29,7 +29,7 @@
-

Desenvolvido pela UFCSPA- Universidade Federal de Ciências da Saúde de Porto Alegre

+

Desenvolvido pela UFCSPA - Universidade Federal de Ciências da Saúde de Porto Alegre

diff --git a/SimDeCS/WebContent/seguro/admin/rede/ArquivoRede.xhtml b/SimDeCS/WebContent/seguro/admin/rede/ArquivoRedeBayesiana.xhtml similarity index 67% rename from SimDeCS/WebContent/seguro/admin/rede/ArquivoRede.xhtml rename to SimDeCS/WebContent/seguro/admin/rede/ArquivoRedeBayesiana.xhtml index 4e863b1..0fbbfd0 100644 --- a/SimDeCS/WebContent/seguro/admin/rede/ArquivoRede.xhtml +++ b/SimDeCS/WebContent/seguro/admin/rede/ArquivoRedeBayesiana.xhtml @@ -19,25 +19,25 @@ Arquivo + data="#{arquivoRedeBayesianaHome.instance.data}" + contentType="#{arquivoRedeBayesianaHome.instance.contentType}" + fileName="#{arquivoRedeBayesianaHome.instance.nome}" + fileSize="#{arquivoRedeBayesianaHome.instance.tamanho}" /> Nome - + Tipo - + Tamanho - +
@@ -45,18 +45,18 @@
+ action="#{arquivoRedeBayesianaHome.saveNetwork}" + rendered="#{!arquivoRedeBayesianaHome.managed}"/> + rendered="#{arquivoRedeBayesianaHome.managed}"> + view="/seguro/admin/rede/RedeBayesianaList.xhtml"/>
diff --git a/SimDeCS/WebContent/seguro/admin/rede/ArquivoRedeList.xhtml b/SimDeCS/WebContent/seguro/admin/rede/ArquivoRedeBayesianaList.xhtml similarity index 63% rename from SimDeCS/WebContent/seguro/admin/rede/ArquivoRedeList.xhtml rename to SimDeCS/WebContent/seguro/admin/rede/ArquivoRedeBayesianaList.xhtml index 9e45e6a..8233c35 100644 --- a/SimDeCS/WebContent/seguro/admin/rede/ArquivoRedeList.xhtml +++ b/SimDeCS/WebContent/seguro/admin/rede/ArquivoRedeBayesianaList.xhtml @@ -19,36 +19,32 @@ - + Arquivo - - + + Tipo - #{arquivoRede.contentType} + #{arquivoRedeBayesiana.contentType} Tamanho (bytes) - #{arquivoRede.tamanho} + #{arquivoRedeBayesiana.tamanho} Ações - - + +

- - - -

- - + + @@ -60,7 +56,7 @@
+ view="/seguro/admin/rede/ArquivoRedeBayesiana.xhtml"/>
diff --git a/SimDeCS/WebContent/seguro/admin/rede/RedeBayesiana.xhtml b/SimDeCS/WebContent/seguro/admin/rede/RedeBayesiana.xhtml new file mode 100644 index 0000000..73a83e1 --- /dev/null +++ b/SimDeCS/WebContent/seguro/admin/rede/RedeBayesiana.xhtml @@ -0,0 +1,39 @@ + + + + + + + + + Rede Bayesiana + + + Nome + + + +
+ + + +
+ +
+ + + + + + diff --git a/SimDeCS/WebContent/seguro/admin/rede/RedeBayesianaList.xhtml b/SimDeCS/WebContent/seguro/admin/rede/RedeBayesianaList.xhtml new file mode 100644 index 0000000..f8cca35 --- /dev/null +++ b/SimDeCS/WebContent/seguro/admin/rede/RedeBayesianaList.xhtml @@ -0,0 +1,73 @@ + + + + + + + Redes Bayesianas Cadastradas + +
+ + + + + + Nome + + + + + + + Arquivo + + + + + + Tipo + #{redeBayesiana.arquivo.contentType} + + + Tamanho (bytes) + #{redeBayesiana.arquivo.tamanho} + + + Ações + + + +

+ + + + + + +
+ + + +
+ +
+ + + + diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ArquivoRedeHome.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ArquivoRedeBayesianaHome.java similarity index 84% rename from SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ArquivoRedeHome.java rename to SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ArquivoRedeBayesianaHome.java index dfdbdf9..f596269 100644 --- a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ArquivoRedeHome.java +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ArquivoRedeBayesianaHome.java @@ -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 +@Name("arquivoRedeBayesianaHome") +public class ArquivoRedeBayesianaHome extends SimDeCSEntityHome { private static final long serialVersionUID = 1L; @@ -54,15 +54,16 @@ public class ArquivoRedeHome extends SimDeCSEntityHome ArrayList 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 index 0000000..43f894e --- /dev/null +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ArquivoRedeBayesianaList.java @@ -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 +{ + 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 index 369a218..0000000 --- a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ArquivoRedeList.java +++ /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 -{ - public ArquivoRedeList() - { - setEjbql("select arquivoRede from ArquivoRede arquivoRede"); - } -} diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/DownloadArquivoRede.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/DownloadArquivoRedeBayesiana.java similarity index 70% rename from SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/DownloadArquivoRede.java rename to SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/DownloadArquivoRedeBayesiana.java index 61dcbcf..afc7e25 100644 --- a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/DownloadArquivoRede.java +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/DownloadArquivoRedeBayesiana.java @@ -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 index 0000000..23562d5 --- /dev/null +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RedeBayesianaHome.java @@ -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 +{ + @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 index 0000000..727c122 --- /dev/null +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RedeBayesianaList.java @@ -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 +{ + public RedeBayesianaList() + { + setEjbql("select redeBayesiana from RedeBayesiana redeBayesiana"); + } +} diff --git a/SimDeCS/src/main/org/ufcspa/simdecs/entities/ArquivoRede.java b/SimDeCS/src/main/org/ufcspa/simdecs/entities/ArquivoRedeBayesiana.java similarity index 82% rename from SimDeCS/src/main/org/ufcspa/simdecs/entities/ArquivoRede.java rename to SimDeCS/src/main/org/ufcspa/simdecs/entities/ArquivoRedeBayesiana.java index f72bb19..24fbcd5 100644 --- a/SimDeCS/src/main/org/ufcspa/simdecs/entities/ArquivoRede.java +++ b/SimDeCS/src/main/org/ufcspa/simdecs/entities/ArquivoRedeBayesiana.java @@ -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 diff --git a/SimDeCS/src/main/org/ufcspa/simdecs/entities/Nodo.java b/SimDeCS/src/main/org/ufcspa/simdecs/entities/Nodo.java index 20f1003..22ff69a 100644 --- a/SimDeCS/src/main/org/ufcspa/simdecs/entities/Nodo.java +++ b/SimDeCS/src/main/org/ufcspa/simdecs/entities/Nodo.java @@ -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() { diff --git a/SimDeCS/src/main/org/ufcspa/simdecs/entities/PerguntaNodo.java b/SimDeCS/src/main/org/ufcspa/simdecs/entities/PerguntaNodo.java index d89e0ea..a0fba2b 100644 --- a/SimDeCS/src/main/org/ufcspa/simdecs/entities/PerguntaNodo.java +++ b/SimDeCS/src/main/org/ufcspa/simdecs/entities/PerguntaNodo.java @@ -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 diff --git a/SimDeCS/src/main/org/ufcspa/simdecs/entities/Rede.java b/SimDeCS/src/main/org/ufcspa/simdecs/entities/RedeBayesiana.java similarity index 76% rename from SimDeCS/src/main/org/ufcspa/simdecs/entities/Rede.java rename to SimDeCS/src/main/org/ufcspa/simdecs/entities/RedeBayesiana.java index 25451b2..6eb59d9 100644 --- a/SimDeCS/src/main/org/ufcspa/simdecs/entities/Rede.java +++ b/SimDeCS/src/main/org/ufcspa/simdecs/entities/RedeBayesiana.java @@ -1,127 +1,124 @@ -package org.ufcspa.simdecs.entities; - -import java.io.Serializable; -import java.util.Collection; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -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: "rede" -@Table(name="Rede") -@SequenceGenerator(name = "sequenceRede", sequenceName = "sqRede", initialValue = 1, allocationSize=1) -public class Rede implements Serializable { - - private static final long serialVersionUID = -8764281348427990153L; - - @GeneratedValue(generator = "sequenceRede", strategy = GenerationType.AUTO) - @Id - private Long id; - - @Column(nullable=false, length=50) - private String nome; - - @OneToOne - @JoinColumn(name = "arquivoRede_id", referencedColumnName = "id", nullable = true) - @Index(name="rede_arquivoRede_fk_i") - private ArquivoRede arquivo; - - @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 faixasEtarias; - - - 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 ArquivoRede getArquivo() { - return arquivo; - } - - public void setArquivo(ArquivoRede arquivo) { - this.arquivo = arquivo; - } - 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 getFaixasEtarias() { - return faixasEtarias; - } - - public void setFaixasEtarias(Collection 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; - Rede other = (Rede) obj; - if (id == null) { - if (other.id != null) - return false; - } else if (!id.equals(other.id)) - return false; - return true; - } - -} +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 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 getFaixasEtarias() { + return faixasEtarias; + } + + public void setFaixasEtarias(Collection 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; + } + +} diff --git a/SimDeCS/src/main/org/ufcspa/simdecs/entities/RespostaNodo.java b/SimDeCS/src/main/org/ufcspa/simdecs/entities/RespostaNodo.java index 2e8bfbc..354a99e 100644 --- a/SimDeCS/src/main/org/ufcspa/simdecs/entities/RespostaNodo.java +++ b/SimDeCS/src/main/org/ufcspa/simdecs/entities/RespostaNodo.java @@ -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