From 79f1af86e0d36fb522c7d66b27efaab99d6c2357 Mon Sep 17 00:00:00 2001 From: Michele Silva Date: Mon, 28 Nov 2011 04:40:12 -0200 Subject: [PATCH] Adicionadas perguntas aos nodos. --- .../seguro/admin/rede/ArquivoRedeBayesiana.xhtml | 2 +- SimDeCS/WebContent/seguro/admin/rede/Nodo.page.xml | 10 ++ SimDeCS/WebContent/seguro/admin/rede/Nodo.xhtml | 76 ++++++++++ .../WebContent/seguro/admin/rede/NodoEdit.page.xml | 37 +++++ .../WebContent/seguro/admin/rede/NodoEdit.xhtml | 94 ++++++++++++ .../seguro/admin/rede/PerguntaNodo.page.xml | 10 ++ .../seguro/admin/rede/PerguntaNodo.xhtml | 45 ++++++ .../seguro/admin/rede/PerguntaNodoEdit.page.xml | 37 +++++ .../seguro/admin/rede/PerguntaNodoEdit.xhtml | 80 +++++++++++ .../seguro/admin/rede/PerguntaNodoList.page.xml | 14 ++ .../seguro/admin/rede/PerguntaNodoList.xhtml | 150 ++++++++++++++++++++ .../seguro/admin/rede/RedeBayesiana.xhtml | 2 +- .../seguro/admin/rede/RedeBayesianaList.xhtml | 16 ++- .../org/ufcspa/simdecs/session/Authenticator.java | 8 +- .../crud/admin/ArquivoRedeBayesianaHome.java | 10 +- .../crud/admin/ArquivoRedeBayesianaList.java | 7 +- .../ufcspa/simdecs/session/crud/admin/Bean.java | 8 +- .../simdecs/session/crud/admin/GrupoHome.java | 5 + .../simdecs/session/crud/admin/GrupoList.java | 5 + .../session/crud/admin/InstituicaoHome.java | 5 + .../session/crud/admin/InstituicaoList.java | 5 + .../session/crud/admin/ListBeanPendente.java | 18 +--- .../simdecs/session/crud/admin/NodoHome.java | 47 ++++++ .../simdecs/session/crud/admin/NodoList.java | 32 ++++ .../session/crud/admin/PerguntaNodoHome.java | 47 ++++++ .../session/crud/admin/PerguntaNodoList.java | 32 ++++ .../simdecs/session/crud/admin/PrivilegioHome.java | 5 + .../simdecs/session/crud/admin/PrivilegioList.java | 5 + .../session/crud/admin/RedeBayesianaHome.java | 6 +- .../session/crud/admin/RedeBayesianaList.java | 7 +- .../simdecs/session/crud/admin/RegraHome.java | 5 + .../simdecs/session/crud/admin/RegraList.java | 5 + .../session/crud/admin/RespostaNodoHome.java | 47 ++++++ .../session/crud/admin/RespostaNodoList.java | 32 ++++ .../session/crud/admin/UsuarioGrupoList.java | 6 +- .../simdecs/session/crud/admin/UsuarioHome.java | 4 + .../crud/admin/UsuarioLisGrupoPickList.java | 10 +- .../simdecs/session/crud/admin/UsuarioList.java | 11 +- .../session/crud/defaults/SimDeCSEntityHome.java | 5 + .../session/crud/defaults/SimDeCSEntityQuery.java | 5 + .../simdecs/entities/ArquivoRedeBayesiana.java | 2 + .../main/org/ufcspa/simdecs/entities/Grupo.java | 1 - .../src/main/org/ufcspa/simdecs/entities/Nodo.java | 17 +++ .../org/ufcspa/simdecs/entities/PerguntaNodo.java | 20 +++- .../org/ufcspa/simdecs/entities/RedeBayesiana.java | 16 ++ .../main/org/ufcspa/simdecs/entities/Usuario.java | 3 +- 46 files changed, 958 insertions(+), 56 deletions(-) create mode 100644 SimDeCS/WebContent/seguro/admin/rede/Nodo.page.xml create mode 100644 SimDeCS/WebContent/seguro/admin/rede/Nodo.xhtml create mode 100644 SimDeCS/WebContent/seguro/admin/rede/NodoEdit.page.xml create mode 100644 SimDeCS/WebContent/seguro/admin/rede/NodoEdit.xhtml create mode 100644 SimDeCS/WebContent/seguro/admin/rede/PerguntaNodo.page.xml create mode 100644 SimDeCS/WebContent/seguro/admin/rede/PerguntaNodo.xhtml create mode 100644 SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoEdit.page.xml create mode 100644 SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoEdit.xhtml create mode 100644 SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoList.page.xml create mode 100644 SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoList.xhtml create mode 100644 SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/NodoHome.java create mode 100644 SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/NodoList.java create mode 100644 SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/PerguntaNodoHome.java create mode 100644 SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/PerguntaNodoList.java create mode 100644 SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RespostaNodoHome.java create mode 100644 SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RespostaNodoList.java diff --git a/SimDeCS/WebContent/seguro/admin/rede/ArquivoRedeBayesiana.xhtml b/SimDeCS/WebContent/seguro/admin/rede/ArquivoRedeBayesiana.xhtml index 0fbbfd0..31735ea 100644 --- a/SimDeCS/WebContent/seguro/admin/rede/ArquivoRedeBayesiana.xhtml +++ b/SimDeCS/WebContent/seguro/admin/rede/ArquivoRedeBayesiana.xhtml @@ -55,7 +55,7 @@ diff --git a/SimDeCS/WebContent/seguro/admin/rede/Nodo.page.xml b/SimDeCS/WebContent/seguro/admin/rede/Nodo.page.xml new file mode 100644 index 0000000..f4d26a1 --- /dev/null +++ b/SimDeCS/WebContent/seguro/admin/rede/Nodo.page.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/SimDeCS/WebContent/seguro/admin/rede/Nodo.xhtml b/SimDeCS/WebContent/seguro/admin/rede/Nodo.xhtml new file mode 100644 index 0000000..70eb213 --- /dev/null +++ b/SimDeCS/WebContent/seguro/admin/rede/Nodo.xhtml @@ -0,0 +1,76 @@ + + + + + + + Nodos + + + + Rede bayesiana + + + + + Nome + + + + + Custo + + + + + Tempo + + + +
+ + + + + + + + + + + + + + + + + + + + + +
+ + + + + +
+ + + + diff --git a/SimDeCS/WebContent/seguro/admin/rede/NodoEdit.page.xml b/SimDeCS/WebContent/seguro/admin/rede/NodoEdit.page.xml new file mode 100644 index 0000000..ad3e1cd --- /dev/null +++ b/SimDeCS/WebContent/seguro/admin/rede/NodoEdit.page.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SimDeCS/WebContent/seguro/admin/rede/NodoEdit.xhtml b/SimDeCS/WebContent/seguro/admin/rede/NodoEdit.xhtml new file mode 100644 index 0000000..889df93 --- /dev/null +++ b/SimDeCS/WebContent/seguro/admin/rede/NodoEdit.xhtml @@ -0,0 +1,94 @@ + + + + + + + + + #{nodoHome.managed ? 'Edit' : 'Add'} Nodo + + + + + Rede bayesiana id + + + + + + + Nome + + + + + + + + Custo + + + + + + + + Tempo + + + + + +
+ * + required fields +
+ + + +
+ + + + + + + + + +
+ + + + + diff --git a/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodo.page.xml b/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodo.page.xml new file mode 100644 index 0000000..b2ab3c7 --- /dev/null +++ b/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodo.page.xml @@ -0,0 +1,10 @@ + + + + + + + + diff --git a/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodo.xhtml b/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodo.xhtml new file mode 100644 index 0000000..ad7c5fd --- /dev/null +++ b/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodo.xhtml @@ -0,0 +1,45 @@ + + + + + + + Pergunta nodo Details + + + + Nodo id + + + + + Texto + + + +
+ + + +
+ + + + + +
+ + + + diff --git a/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoEdit.page.xml b/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoEdit.page.xml new file mode 100644 index 0000000..d73c8e8 --- /dev/null +++ b/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoEdit.page.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoEdit.xhtml b/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoEdit.xhtml new file mode 100644 index 0000000..2d1eb00 --- /dev/null +++ b/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoEdit.xhtml @@ -0,0 +1,80 @@ + + + + + + + + + #{perguntaNodoHome.managed ? 'Edit' : 'Add'} Pergunta nodo + + + + + Nodo + + + + + + + Texto + + + +
+ * + required fields +
+ + + +
+ + + + + + + + + + + +
+ + + + + diff --git a/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoList.page.xml b/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoList.page.xml new file mode 100644 index 0000000..b39477f --- /dev/null +++ b/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoList.page.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + diff --git a/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoList.xhtml b/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoList.xhtml new file mode 100644 index 0000000..373aed0 --- /dev/null +++ b/SimDeCS/WebContent/seguro/admin/rede/PerguntaNodoList.xhtml @@ -0,0 +1,150 @@ + + + + + + + + + + + Texto + + + + + Match + + + + + + + + +
+ + +
+ + + + + PerguntaNodo Search Results (#{empty perguntaNodoList.resultList ? 0 : (perguntaNodoList.paginated ? perguntaNodoList.resultCount : perguntaNodoList.resultList.size)}) +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Action + + + + #{' '} + + + + + + +
+ + +
+ + + + + + + + + + + + + + + + + +
+ + + + + + + + + + diff --git a/SimDeCS/WebContent/seguro/admin/rede/RedeBayesiana.xhtml b/SimDeCS/WebContent/seguro/admin/rede/RedeBayesiana.xhtml index 73a83e1..667c6a3 100644 --- a/SimDeCS/WebContent/seguro/admin/rede/RedeBayesiana.xhtml +++ b/SimDeCS/WebContent/seguro/admin/rede/RedeBayesiana.xhtml @@ -17,7 +17,7 @@ Nome - diff --git a/SimDeCS/WebContent/seguro/admin/rede/RedeBayesianaList.xhtml b/SimDeCS/WebContent/seguro/admin/rede/RedeBayesianaList.xhtml index f8cca35..f63ce26 100644 --- a/SimDeCS/WebContent/seguro/admin/rede/RedeBayesianaList.xhtml +++ b/SimDeCS/WebContent/seguro/admin/rede/RedeBayesianaList.xhtml @@ -31,6 +31,18 @@ value="#{redeBayesiana.id}"/> + + + + + + + + + + + + Arquivo @@ -52,8 +64,8 @@

- - + + diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/Authenticator.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/Authenticator.java index 6c642e8..c2723b0 100644 --- a/SimDeCS/src/hot/org/ufcspa/simdecs/session/Authenticator.java +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/Authenticator.java @@ -35,19 +35,19 @@ log.info("entrou no metodo autenticate"); .setParameter("senha", credentials.getPassword()) .getSingleResult(); } catch (NoResultException ne) { - log.info("Não encontrou usuário"); + log.info("N�o encontrou usu�rio"); return false; } -log.info("usuario nao é nulo"); +log.info("usuario nao � nulo"); - Iterator rolesIt = entityManager.createQuery("Select reg From Regra as reg inner join reg.grupos gru inner join gru.usuarios usu where usu.id=:idUsuario") + Iterator rolesIt = entityManager.createQuery("Select reg From Regra as reg inner join reg.grupos gru inner join gru.usuarios usu where usu.id=:idUsuario") .setParameter("idUsuario", usuario.getId()) .getResultList() .iterator(); while(rolesIt.hasNext()) - identity.addRole(((Regra) rolesIt.next()).getToken()); + identity.addRole(rolesIt.next().getToken()); log.info("authenticating {0}", credentials.getUsername()); diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ArquivoRedeBayesianaHome.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ArquivoRedeBayesianaHome.java index f596269..0d72208 100644 --- a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ArquivoRedeBayesianaHome.java +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ArquivoRedeBayesianaHome.java @@ -42,7 +42,7 @@ public class ArquivoRedeBayesianaHome extends SimDeCSEntityHome nodos = new ArrayList(); + for (int i = 0; i < nodes.size(); i++){ Nodo nodo = new Nodo(); nodo.setNome(nodes.get(i)); nodo.setRedeBayesiana(rede); entityManager.persist(nodo); + nodos.add(nodo); } + rede.setNodos(nodos); + entityManager.persist(rede); super.persist(); } 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 index 43f894e..410d3ea 100644 --- a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ArquivoRedeBayesianaList.java +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ArquivoRedeBayesianaList.java @@ -7,7 +7,12 @@ import org.ufcspa.simdecs.session.crud.defaults.SimDeCSEntityQuery; @Name("arquivoRedeBayesianaList") public class ArquivoRedeBayesianaList extends SimDeCSEntityQuery { - public ArquivoRedeBayesianaList() + /** + * + */ + private static final long serialVersionUID = 3839477205091884054L; + + public ArquivoRedeBayesianaList() { setEjbql("select arquivoRedeBayesiana from ArquivoRedeBayesiana arquivoRedeBayesiana"); } diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/Bean.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/Bean.java index c675043..8cc12a0 100644 --- a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/Bean.java +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/Bean.java @@ -5,14 +5,10 @@ import java.util.List; import javax.faces.model.SelectItem; import javax.persistence.EntityManager; -import javax.persistence.NoResultException; - import org.jboss.seam.annotations.In; -import org.jboss.annotation.factory.*; import org.jboss.seam.annotations.Factory; import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Out; import org.jboss.seam.international.StatusMessages; import org.jboss.seam.log.Log; import org.ufcspa.simdecs.entities.Grupo; @@ -57,8 +53,8 @@ public class Bean if (listaOrigem == null) { listaOrigem = new ArrayList(); - /* Criei esse objeto apenas a título de exemplo. - * Num caso real, você poderia buscar a lista do banco. + /* Criei esse objeto apenas a t�tulo de exemplo. + * Num caso real, voc� poderia buscar a lista do banco. */ Grupo o = new Grupo(); diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/GrupoHome.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/GrupoHome.java index f227feb..664f2d7 100644 --- a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/GrupoHome.java +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/GrupoHome.java @@ -7,6 +7,11 @@ import org.ufcspa.simdecs.session.crud.defaults.SimDeCSEntityHome; @Name("grupoHome") public class GrupoHome extends SimDeCSEntityHome { + /** + * + */ + private static final long serialVersionUID = 4764263148832027018L; + public void setGrupoId(Long id) { setId(id); } diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/GrupoList.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/GrupoList.java index 6c47fe8..6855331 100644 --- a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/GrupoList.java +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/GrupoList.java @@ -9,6 +9,11 @@ import org.ufcspa.simdecs.session.crud.defaults.SimDeCSEntityQuery; @Name("grupoList") public class GrupoList extends SimDeCSEntityQuery { + /** + * + */ + private static final long serialVersionUID = 3622169468069361029L; + private static final String EJBQL = "select grupo from Grupo grupo"; private static final String[] RESTRICTIONS = { "lower(grupo.nome) like lower(concat(#{grupoList.grupo.nome},'%'))", }; diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/InstituicaoHome.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/InstituicaoHome.java index 0ec8ff9..0d2fa03 100644 --- a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/InstituicaoHome.java +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/InstituicaoHome.java @@ -7,6 +7,11 @@ import org.ufcspa.simdecs.session.crud.defaults.SimDeCSEntityHome; @Name("instituicaoHome") public class InstituicaoHome extends SimDeCSEntityHome { + /** + * + */ + private static final long serialVersionUID = -8521176442499809609L; + public void setInstituicaoId(Long id) { setId(id); } diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/InstituicaoList.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/InstituicaoList.java index 91ddd83..32118e1 100644 --- a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/InstituicaoList.java +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/InstituicaoList.java @@ -9,6 +9,11 @@ import org.ufcspa.simdecs.session.crud.defaults.SimDeCSEntityQuery; @Name("instituicaoList") public class InstituicaoList extends SimDeCSEntityQuery { + /** + * + */ + private static final long serialVersionUID = -2917808467482202659L; + private static final String EJBQL = "select instituicao from Instituicao instituicao"; private static final String[] RESTRICTIONS = { diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ListBeanPendente.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ListBeanPendente.java index 36a8fd2..b6fe07d 100644 --- a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ListBeanPendente.java +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/ListBeanPendente.java @@ -1,34 +1,18 @@ package org.ufcspa.simdecs.session.crud.admin; import java.util.ArrayList; -import java.util.Collection; import java.util.List; -import javax.ejb.Remove; -import javax.ejb.Stateful; -import javax.ejb.Stateless; -import javax.faces.model.SelectItem; import javax.persistence.EntityManager; -import org.hibernate.loader.custom.Return; import org.jboss.seam.ScopeType; import org.jboss.seam.annotations.In; -import org.jboss.annotation.factory.*; -import org.jboss.seam.annotations.Begin; -import org.jboss.seam.annotations.Destroy; -import org.jboss.seam.annotations.End; -import org.jboss.seam.annotations.Factory; import org.jboss.seam.annotations.Logger; import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.Out; import org.jboss.seam.annotations.Scope; -import org.jboss.seam.annotations.datamodel.DataModel; -import org.jboss.seam.annotations.datamodel.DataModelSelection; import org.jboss.seam.international.StatusMessages; import org.jboss.seam.log.Log; -import org.omg.Security.Public; import org.ufcspa.simdecs.entities.Grupo; -import org.ufcspa.simdecs.entities.Usuario; @Name("listBeanPendente") @@ -98,7 +82,7 @@ public class ListBeanPendente // @Destroy // private void destruicaoObrigatoria() { // // TODO Auto-generated method stub -// log.info("Cahmado metodo de destruição obrigatoria"); +// log.info("Cahmado metodo de destrui��o obrigatoria"); // // } diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/NodoHome.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/NodoHome.java new file mode 100644 index 0000000..86c787f --- /dev/null +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/NodoHome.java @@ -0,0 +1,47 @@ +package org.ufcspa.simdecs.session.crud.admin; + +import org.jboss.seam.annotations.Name; +import org.jboss.seam.framework.EntityHome; +import org.ufcspa.simdecs.entities.Nodo; + +@Name("nodoHome") +public class NodoHome extends EntityHome { + + /** + * + */ + private static final long serialVersionUID = 722853289364906655L; + + public void setNodoId(Long id) { + setId(id); + } + + public Long getNodoId() { + return (Long) getId(); + } + + @Override + protected Nodo createInstance() { + Nodo nodo = new Nodo(); + return nodo; + } + + public void load() { + if (isIdDefined()) { + wire(); + } + } + + public void wire() { + getInstance(); + } + + public boolean isWired() { + return true; + } + + public Nodo getDefinedInstance() { + return isIdDefined() ? getInstance() : null; + } + +} diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/NodoList.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/NodoList.java new file mode 100644 index 0000000..1bed307 --- /dev/null +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/NodoList.java @@ -0,0 +1,32 @@ +package org.ufcspa.simdecs.session.crud.admin; + +import org.jboss.seam.annotations.Name; +import org.jboss.seam.framework.EntityQuery; +import org.ufcspa.simdecs.entities.Nodo; + +import java.util.Arrays; + +@Name("nodoList") +public class NodoList extends EntityQuery { + + /** + * + */ + private static final long serialVersionUID = 4305188605243779977L; + + private static final String EJBQL = "select nodo from Nodo nodo"; + + private static final String[] RESTRICTIONS = { "lower(nodo.nome) like lower(concat(#{nodoList.nodo.nome},'%'))", }; + + private Nodo nodo = new Nodo(); + + public NodoList() { + setEjbql(EJBQL); + setRestrictionExpressionStrings(Arrays.asList(RESTRICTIONS)); + setMaxResults(25); + } + + public Nodo getNodo() { + return nodo; + } +} diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/PerguntaNodoHome.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/PerguntaNodoHome.java new file mode 100644 index 0000000..e93a957 --- /dev/null +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/PerguntaNodoHome.java @@ -0,0 +1,47 @@ +package org.ufcspa.simdecs.session.crud.admin; + +import org.jboss.seam.annotations.Name; +import org.jboss.seam.framework.EntityHome; +import org.ufcspa.simdecs.entities.PerguntaNodo; + +@Name("perguntaNodoHome") +public class PerguntaNodoHome extends EntityHome { + + /** + * + */ + private static final long serialVersionUID = 74375829986025270L; + + public void setPerguntaNodoId(Long id) { + setId(id); + } + + public Long getPerguntaNodoId() { + return (Long) getId(); + } + + @Override + protected PerguntaNodo createInstance() { + PerguntaNodo perguntaNodo = new PerguntaNodo(); + return perguntaNodo; + } + + public void load() { + if (isIdDefined()) { + wire(); + } + } + + public void wire() { + getInstance(); + } + + public boolean isWired() { + return true; + } + + public PerguntaNodo getDefinedInstance() { + return isIdDefined() ? getInstance() : null; + } + +} diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/PerguntaNodoList.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/PerguntaNodoList.java new file mode 100644 index 0000000..c75347b --- /dev/null +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/PerguntaNodoList.java @@ -0,0 +1,32 @@ +package org.ufcspa.simdecs.session.crud.admin; + +import org.jboss.seam.annotations.Name; +import org.jboss.seam.framework.EntityQuery; +import org.ufcspa.simdecs.entities.PerguntaNodo; + +import java.util.Arrays; + +@Name("perguntaNodoList") +public class PerguntaNodoList extends EntityQuery { + + /** + * + */ + private static final long serialVersionUID = -8739179110184909334L; + + private static final String EJBQL = "select perguntaNodo from PerguntaNodo perguntaNodo"; + + private static final String[] RESTRICTIONS = { "lower(perguntaNodo.texto) like lower(concat(#{perguntaNodoList.perguntaNodo.texto},'%'))", }; + + private PerguntaNodo perguntaNodo = new PerguntaNodo(); + + public PerguntaNodoList() { + setEjbql(EJBQL); + setRestrictionExpressionStrings(Arrays.asList(RESTRICTIONS)); + setMaxResults(25); + } + + public PerguntaNodo getPerguntaNodo() { + return perguntaNodo; + } +} diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/PrivilegioHome.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/PrivilegioHome.java index 07dd39c..c1cff24 100644 --- a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/PrivilegioHome.java +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/PrivilegioHome.java @@ -7,6 +7,11 @@ import org.ufcspa.simdecs.session.crud.defaults.SimDeCSEntityHome; @Name("privilegioHome") public class PrivilegioHome extends SimDeCSEntityHome { + /** + * + */ + private static final long serialVersionUID = -2362914081641360734L; + public void setPrivilegioId(Long id) { setId(id); } diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/PrivilegioList.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/PrivilegioList.java index 95e2271..5e7c550 100644 --- a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/PrivilegioList.java +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/PrivilegioList.java @@ -9,6 +9,11 @@ import org.ufcspa.simdecs.session.crud.defaults.SimDeCSEntityQuery; @Name("privilegioList") public class PrivilegioList extends SimDeCSEntityQuery { + /** + * + */ + private static final long serialVersionUID = -2876283560310541559L; + private static final String EJBQL = "select privilegio from Privilegio privilegio"; private static final String[] RESTRICTIONS = { 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 index 23562d5..a236426 100644 --- a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RedeBayesianaHome.java +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RedeBayesianaHome.java @@ -10,7 +10,11 @@ import org.ufcspa.simdecs.entities.RedeBayesiana; @Name("redeBayesianaHome") public class RedeBayesianaHome extends EntityHome { - @RequestParameter Long redeBayesianaId; + /** + * + */ + private static final long serialVersionUID = 3958851307369078847L; + @RequestParameter Long redeBayesianaId; @Override public Object getId() 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 index 727c122..9064b7f 100644 --- a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RedeBayesianaList.java +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RedeBayesianaList.java @@ -7,7 +7,12 @@ import org.ufcspa.simdecs.entities.RedeBayesiana; @Name("redeBayesianaList") public class RedeBayesianaList extends EntityQuery { - public RedeBayesianaList() + /** + * + */ + private static final long serialVersionUID = -3591201472381575234L; + + public RedeBayesianaList() { setEjbql("select redeBayesiana from RedeBayesiana redeBayesiana"); } diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RegraHome.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RegraHome.java index 22ce650..bf5b084 100644 --- a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RegraHome.java +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RegraHome.java @@ -7,6 +7,11 @@ import org.ufcspa.simdecs.session.crud.defaults.SimDeCSEntityHome; @Name("regraHome") public class RegraHome extends SimDeCSEntityHome { + /** + * + */ + private static final long serialVersionUID = 499630688178460740L; + public void setRegraId(Long id) { setId(id); } diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RegraList.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RegraList.java index 159b8d7..8cec6bc 100644 --- a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RegraList.java +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RegraList.java @@ -9,6 +9,11 @@ import org.ufcspa.simdecs.session.crud.defaults.SimDeCSEntityQuery; @Name("regraList") public class RegraList extends SimDeCSEntityQuery { + /** + * + */ + private static final long serialVersionUID = -4966244468793558853L; + private static final String EJBQL = "select regra from Regra regra"; private static final String[] RESTRICTIONS = { diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RespostaNodoHome.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RespostaNodoHome.java new file mode 100644 index 0000000..ca841f0 --- /dev/null +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RespostaNodoHome.java @@ -0,0 +1,47 @@ +package org.ufcspa.simdecs.session.crud.admin; + +import org.jboss.seam.annotations.Name; +import org.jboss.seam.framework.EntityHome; +import org.ufcspa.simdecs.entities.RespostaNodo; + +@Name("respostaNodoHome") +public class RespostaNodoHome extends EntityHome { + + /** + * + */ + private static final long serialVersionUID = -3492778340553592740L; + + public void setRespostaNodoId(Long id) { + setId(id); + } + + public Long getRespostaNodoId() { + return (Long) getId(); + } + + @Override + protected RespostaNodo createInstance() { + RespostaNodo respostaNodo = new RespostaNodo(); + return respostaNodo; + } + + public void load() { + if (isIdDefined()) { + wire(); + } + } + + public void wire() { + getInstance(); + } + + public boolean isWired() { + return true; + } + + public RespostaNodo getDefinedInstance() { + return isIdDefined() ? getInstance() : null; + } + +} diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RespostaNodoList.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RespostaNodoList.java new file mode 100644 index 0000000..1390665 --- /dev/null +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/RespostaNodoList.java @@ -0,0 +1,32 @@ +package org.ufcspa.simdecs.session.crud.admin; + +import org.jboss.seam.annotations.Name; +import org.jboss.seam.framework.EntityQuery; +import org.ufcspa.simdecs.entities.RespostaNodo; + +import java.util.Arrays; + +@Name("respostaNodoList") +public class RespostaNodoList extends EntityQuery { + + /** + * + */ + private static final long serialVersionUID = 5827278245645390204L; + + private static final String EJBQL = "select respostaNodo from RespostaNodo respostaNodo"; + + private static final String[] RESTRICTIONS = { "lower(respostaNodo.texto) like lower(concat(#{respostaNodoList.respostaNodo.texto},'%'))", }; + + private RespostaNodo respostaNodo = new RespostaNodo(); + + public RespostaNodoList() { + setEjbql(EJBQL); + setRestrictionExpressionStrings(Arrays.asList(RESTRICTIONS)); + setMaxResults(25); + } + + public RespostaNodo getRespostaNodo() { + return respostaNodo; + } +} diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/UsuarioGrupoList.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/UsuarioGrupoList.java index a6ba07c..6c48309 100644 --- a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/UsuarioGrupoList.java +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/UsuarioGrupoList.java @@ -1,8 +1,6 @@ package org.ufcspa.simdecs.session.crud.admin; import java.util.Arrays; -import java.util.ArrayList; -import java.util.List; import org.jboss.seam.annotations.Name; import org.ufcspa.simdecs.entities.Grupo; import org.ufcspa.simdecs.session.crud.defaults.SimDeCSEntityQuery; @@ -11,6 +9,10 @@ import org.ufcspa.simdecs.session.crud.defaults.SimDeCSEntityQuery; public class UsuarioGrupoList extends SimDeCSEntityQuery { + /** + * + */ + private static final long serialVersionUID = 6735626710120816714L; private static final String EJBQL = "select grupo From Grupo as grupo inner join grupo.usuarios usu"; private static final String[] RESTRICTIONS = { "usu.id= #{usuarioList.usuario.id}"}; private Grupo grupo = new Grupo(); diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/UsuarioHome.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/UsuarioHome.java index 314dc27..fd560a5 100644 --- a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/UsuarioHome.java +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/UsuarioHome.java @@ -8,6 +8,10 @@ import org.ufcspa.simdecs.session.crud.defaults.SimDeCSEntityHome; @Name("usuarioHome") public class UsuarioHome extends SimDeCSEntityHome { + /** + * + */ + private static final long serialVersionUID = 5982275854657550313L; @In(create = true) UsuarioHome usuarioHome; diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/UsuarioLisGrupoPickList.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/UsuarioLisGrupoPickList.java index bad7e0e..0bec548 100644 --- a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/UsuarioLisGrupoPickList.java +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/UsuarioLisGrupoPickList.java @@ -3,11 +3,9 @@ package org.ufcspa.simdecs.session.crud.admin; import java.util.List; import java.util.ArrayList; import javax.faces.model.SelectItem; -import javax.faces.model.SelectItemGroup; import javax.persistence.EntityManager; import javax.persistence.NoResultException; import org.jboss.seam.annotations.Name; -import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Logger; import org.jboss.seam.log.Log; import org.ufcspa.simdecs.entities.Grupo; @@ -23,7 +21,7 @@ public class UsuarioLisGrupoPickList private EntityManager entityManager; // private List option; - private List listSelecionada; + private List listSelecionada; public List UsuarioLisGrupoPickList() { @@ -48,7 +46,7 @@ public class UsuarioLisGrupoPickList } } catch (NoResultException ne) { - log.info("Não encontrou grupo"); + log.info("N�o encontrou grupo"); // return false; } return listaSelect; @@ -58,11 +56,11 @@ public class UsuarioLisGrupoPickList - public List getListSelecionada() { + public List getListSelecionada() { return listSelecionada; } - public void setListSelecionada(List listSelecionada) { + public void setListSelecionada(List listSelecionada) { this.listSelecionada = listSelecionada; } } diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/UsuarioList.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/UsuarioList.java index 6bb44e9..8cd73d4 100644 --- a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/UsuarioList.java +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/admin/UsuarioList.java @@ -1,19 +1,18 @@ package org.ufcspa.simdecs.session.crud.admin; import java.util.Arrays; -import java.util.Collection; -import java.util.List; - import org.jboss.seam.annotations.Name; import org.ufcspa.simdecs.entities.Usuario; -import org.ufcspa.simdecs.entities.Grupo; import org.ufcspa.simdecs.session.crud.defaults.SimDeCSEntityQuery; -import com.lowagie.text.pdf.hyphenation.TernaryTree.Iterator; - @Name("usuarioList") public class UsuarioList extends SimDeCSEntityQuery { + /** + * + */ + private static final long serialVersionUID = 6934697367391562708L; + private static final String EJBQL = "select usuario from Usuario usuario"; private static final String[] RESTRICTIONS = { diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/defaults/SimDeCSEntityHome.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/defaults/SimDeCSEntityHome.java index f441e18..d8dc0f6 100644 --- a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/defaults/SimDeCSEntityHome.java +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/defaults/SimDeCSEntityHome.java @@ -5,6 +5,11 @@ import org.jboss.seam.framework.EntityHome; public abstract class SimDeCSEntityHome extends EntityHome { + /** + * + */ + private static final long serialVersionUID = 1123566132353938157L; + protected void initDefaultMessages() { super.initDefaultMessages(); diff --git a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/defaults/SimDeCSEntityQuery.java b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/defaults/SimDeCSEntityQuery.java index a5b9ab9..1d8267a 100644 --- a/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/defaults/SimDeCSEntityQuery.java +++ b/SimDeCS/src/hot/org/ufcspa/simdecs/session/crud/defaults/SimDeCSEntityQuery.java @@ -4,5 +4,10 @@ import org.jboss.seam.framework.EntityQuery; public abstract class SimDeCSEntityQuery extends EntityQuery { + /** + * + */ + private static final long serialVersionUID = 606413297188669078L; + } diff --git a/SimDeCS/src/main/org/ufcspa/simdecs/entities/ArquivoRedeBayesiana.java b/SimDeCS/src/main/org/ufcspa/simdecs/entities/ArquivoRedeBayesiana.java index 24fbcd5..e49e6d5 100644 --- a/SimDeCS/src/main/org/ufcspa/simdecs/entities/ArquivoRedeBayesiana.java +++ b/SimDeCS/src/main/org/ufcspa/simdecs/entities/ArquivoRedeBayesiana.java @@ -35,6 +35,8 @@ public class ArquivoRedeBayesiana implements java.io.Serializable { public String getContentType() { return this.contentType; } public void setContentType(String contentType) { this.contentType = contentType; } + + @Lob @Column(length = 2147483647) @Basic(fetch = FetchType.LAZY) diff --git a/SimDeCS/src/main/org/ufcspa/simdecs/entities/Grupo.java b/SimDeCS/src/main/org/ufcspa/simdecs/entities/Grupo.java index 7739649..2c31d4e 100644 --- a/SimDeCS/src/main/org/ufcspa/simdecs/entities/Grupo.java +++ b/SimDeCS/src/main/org/ufcspa/simdecs/entities/Grupo.java @@ -1,7 +1,6 @@ package org.ufcspa.simdecs.entities; import java.io.Serializable; -import java.util.Collection; import java.util.List; import javax.persistence.Column; diff --git a/SimDeCS/src/main/org/ufcspa/simdecs/entities/Nodo.java b/SimDeCS/src/main/org/ufcspa/simdecs/entities/Nodo.java index 22ff69a..fabfc34 100644 --- a/SimDeCS/src/main/org/ufcspa/simdecs/entities/Nodo.java +++ b/SimDeCS/src/main/org/ufcspa/simdecs/entities/Nodo.java @@ -1,6 +1,7 @@ package org.ufcspa.simdecs.entities; import java.io.Serializable; +import java.util.List; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -9,9 +10,12 @@ import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.JoinColumn; +import javax.persistence.JoinTable; import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; import javax.persistence.SequenceGenerator; import javax.persistence.Table; +import javax.persistence.UniqueConstraint; import org.hibernate.annotations.Index; @@ -40,6 +44,13 @@ public class Nodo implements Serializable { @JoinColumn(name = "redeBayesiana_id", referencedColumnName = "id", nullable = true) @Index(name="nodo_redeBayesiana_fk_i") private RedeBayesiana redeBayesiana; + + @OneToMany(cascade=CascadeType.ALL) + @JoinTable( name = "NodoPergunta", + joinColumns = {@JoinColumn(name = "nodo_id")}, + inverseJoinColumns = {@JoinColumn(name = "pergunta_id")}, + uniqueConstraints={@UniqueConstraint(columnNames={"nodo_id", "pergunta_id"})}) + private List perguntas; public Long getId() { return id; @@ -74,6 +85,12 @@ public class Nodo implements Serializable { this.redeBayesiana = rede; } + public List getPerguntas() { + return perguntas; + } + public void setPerguntas(List perguntas) { + this.perguntas = perguntas; + } public String toString() { return id + " - " + nome; } diff --git a/SimDeCS/src/main/org/ufcspa/simdecs/entities/PerguntaNodo.java b/SimDeCS/src/main/org/ufcspa/simdecs/entities/PerguntaNodo.java index a0fba2b..bcac879 100644 --- a/SimDeCS/src/main/org/ufcspa/simdecs/entities/PerguntaNodo.java +++ b/SimDeCS/src/main/org/ufcspa/simdecs/entities/PerguntaNodo.java @@ -1,16 +1,21 @@ package org.ufcspa.simdecs.entities; import java.io.Serializable; +import java.util.List; +import javax.persistence.CascadeType; 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.ManyToOne; +import javax.persistence.OneToMany; import javax.persistence.SequenceGenerator; import javax.persistence.Table; +import javax.persistence.UniqueConstraint; import org.hibernate.annotations.Index; @@ -34,6 +39,13 @@ public class PerguntaNodo implements Serializable { @Index(name="pergunta_nodo_fk_i") private Nodo nodo; + @OneToMany(cascade=CascadeType.ALL) + @JoinTable( name = "PerguntaResposta", + joinColumns = {@JoinColumn(name = "pergunta_id")}, + inverseJoinColumns = {@JoinColumn(name = "resposta_id")}, + uniqueConstraints={@UniqueConstraint(columnNames={"pergunta_id", "resposta_id"})}) + private List respostas; + public Long getId() { return id; } @@ -51,10 +63,16 @@ public class PerguntaNodo implements Serializable { return nodo; } - public void getNodo(Nodo nodo) { + public void setNodo(Nodo nodo) { this.nodo = nodo; } + public List getRespostas() { + return respostas; + } + public void setRespostas(List respostas) { + this.respostas = respostas; + } public String toString() { return id + " - " + texto; } diff --git a/SimDeCS/src/main/org/ufcspa/simdecs/entities/RedeBayesiana.java b/SimDeCS/src/main/org/ufcspa/simdecs/entities/RedeBayesiana.java index 6eb59d9..6ebebe6 100644 --- a/SimDeCS/src/main/org/ufcspa/simdecs/entities/RedeBayesiana.java +++ b/SimDeCS/src/main/org/ufcspa/simdecs/entities/RedeBayesiana.java @@ -2,6 +2,7 @@ package org.ufcspa.simdecs.entities; import java.io.Serializable; import java.util.Collection; +import java.util.List; import javax.persistence.CascadeType; import javax.persistence.Column; @@ -12,6 +13,7 @@ import javax.persistence.GeneratedValue; import javax.persistence.JoinColumn; import javax.persistence.JoinTable; import javax.persistence.ManyToMany; +import javax.persistence.OneToMany; import javax.persistence.OneToOne; import javax.persistence.SequenceGenerator; import javax.persistence.Table; @@ -54,6 +56,13 @@ public class RedeBayesiana implements Serializable private ArquivoRedeBayesiana arquivo; public ArquivoRedeBayesiana getArquivo() { return arquivo; } public void setArquivo(ArquivoRedeBayesiana arquivo) { this.arquivo = arquivo; } + + @OneToMany(cascade=CascadeType.ALL) + @JoinTable( name = "RedeBayesianaNodo", + joinColumns = {@JoinColumn(name = "rede_id")}, + inverseJoinColumns = {@JoinColumn(name = "nodo_id")}, + uniqueConstraints={@UniqueConstraint(columnNames={"rede_id", "nodo_id"})}) + private List nodos; public Long getId() { @@ -96,6 +105,13 @@ public class RedeBayesiana implements Serializable this.faixasEtarias = faixasEtarias; } + public List getNodos() { + return nodos; + } + public void setNodos(List nodos) { + this.nodos = nodos; + } + @Override public int hashCode() { final int prime = 31; diff --git a/SimDeCS/src/main/org/ufcspa/simdecs/entities/Usuario.java b/SimDeCS/src/main/org/ufcspa/simdecs/entities/Usuario.java index 5601f20..9263738 100644 --- a/SimDeCS/src/main/org/ufcspa/simdecs/entities/Usuario.java +++ b/SimDeCS/src/main/org/ufcspa/simdecs/entities/Usuario.java @@ -1,7 +1,6 @@ package org.ufcspa.simdecs.entities; import java.io.Serializable; -import java.util.Collection; import java.util.Date; import java.util.List; @@ -136,7 +135,7 @@ public class Usuario implements Serializable { if (sexo.equals("F") || sexo.equals("M")) this.sexo = sexo; else - throw new InvalidSexoException("O sexo deverá ser 'F' ou 'M'!"); + throw new InvalidSexoException("O sexo dever� ser 'F' ou 'M'!"); } public String getTelefone() { -- 1.7.6.4