From: Michele Silva Date: Wed, 8 Feb 2012 16:27:02 +0000 (-0200) Subject: Refactoring nas páginas de exibição de tabelas. X-Git-Url: http://200.18.67.61/gitweb/?a=commitdiff_plain;h=3d6e18dc34eae611794ece5ae42e849f443a970c;p=simdecs2.git Refactoring nas páginas de exibição de tabelas. --- diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..838458f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/dist/ \ No newline at end of file diff --git a/lib/casablanca-1.0.3.jar b/lib/casablanca-1.0.3.jar deleted file mode 100644 index 8a866e8..0000000 Binary files a/lib/casablanca-1.0.3.jar and /dev/null differ diff --git a/lib/postgresql-9.1-901.jdbc3.jar b/lib/postgresql-9.1-901.jdbc3.jar deleted file mode 100644 index 046eeca..0000000 Binary files a/lib/postgresql-9.1-901.jdbc3.jar and /dev/null differ diff --git a/lib/primefaces-3.0.1.jar b/lib/primefaces-3.0.1.jar deleted file mode 100644 index c811102..0000000 Binary files a/lib/primefaces-3.0.1.jar and /dev/null differ diff --git a/src/java/org/ufcspa/simdecs/entities/Nodo.java b/src/java/org/ufcspa/simdecs/entities/Nodo.java index c6c354f..ad1046f 100644 --- a/src/java/org/ufcspa/simdecs/entities/Nodo.java +++ b/src/java/org/ufcspa/simdecs/entities/Nodo.java @@ -44,8 +44,8 @@ public class Nodo implements Serializable, IdHolder, Comparable { @Column(nullable=true, length=30) private String tipo; - @Column(nullable=true, length=1) - private String bogus; + @Column(nullable=true) + private Boolean bogus; @OneToMany(cascade = javax.persistence.CascadeType.ALL, mappedBy="nodo") private List perguntas; @@ -139,11 +139,11 @@ public class Nodo implements Serializable, IdHolder, Comparable { this.tipo = tipo; } - public String getBogus() { + public Boolean getBogus() { return bogus; } - public void setBogus(String bogus) { + public void setBogus(Boolean bogus) { this.bogus = bogus; } diff --git a/src/java/org/ufcspa/simdecs/mb/bn/CharacterEncodingFilter.java b/src/java/org/ufcspa/simdecs/mb/bn/CharacterEncodingFilter.java new file mode 100644 index 0000000..59e382b --- /dev/null +++ b/src/java/org/ufcspa/simdecs/mb/bn/CharacterEncodingFilter.java @@ -0,0 +1,29 @@ +/* + * To change this template, choose Tools | Templates + * and open the template in the editor. + */ +package org.ufcspa.simdecs.mb.bn; + +import java.io.IOException; +import java.io.Serializable; +import javax.servlet.*; + +public class CharacterEncodingFilter implements Filter, Serializable +{ + private static final long serialVersionUID = -4246457499875267088L; + + @Override + public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws IOException, ServletException { + req.setCharacterEncoding("UTF-8"); + //resp.setCharacterEncoding("UTF-8"); + chain.doFilter(req, resp); + } + + @Override + public void init(FilterConfig filterConfig) throws ServletException { + } + + @Override + public void destroy() { + } +} diff --git a/src/java/org/ufcspa/simdecs/mb/bn/FileUploadController.java b/src/java/org/ufcspa/simdecs/mb/bn/FileUploadController.java index 4939330..7415116 100644 --- a/src/java/org/ufcspa/simdecs/mb/bn/FileUploadController.java +++ b/src/java/org/ufcspa/simdecs/mb/bn/FileUploadController.java @@ -23,9 +23,7 @@ import unbbayes.prs.bn.ProbabilisticNetwork; @ManagedBean @RequestScoped public class FileUploadController extends DefaultManagedBean { - - private static final Logger logger = Logger.getLogger("" + FileUploadController.class); - + private File saveUploadedFile(UploadedFile uploadedFile) throws IOException{ long unixTime = System.currentTimeMillis() / 1000L; @@ -35,7 +33,7 @@ public class FileUploadController extends DefaultManagedBean { while(in.available() != 0){ fout.write(in.read()); } - logger.log(Level.INFO, "Uploaded file saved in: {0}", file.getAbsolutePath()); + Logger.getLogger(FileUploadController.class.getName()).log(Level.INFO, "Uploaded file saved in: {0}", file.getAbsolutePath()); return file; } @@ -49,7 +47,7 @@ public class FileUploadController extends DefaultManagedBean { em.getTransaction().commit(); } - logger.log(Level.INFO, "Bayesian Network {0} persisted.", redeBayesiana.getNome()); + Logger.getLogger(FileUploadController.class.getName()).log(Level.INFO, "Bayesian Network {0} persisted.", redeBayesiana.getNome()); } @@ -68,15 +66,14 @@ public class FileUploadController extends DefaultManagedBean { ArrayList nodes = new ArrayList(); for (unbbayes.prs.Node prs_node: bn.getNodes()){ Nodo nodo = new Nodo(); - nodo.setNome(prs_node.getName()); - nodo.setBogus("N"); + nodo.setNome(prs_node.getName()); nodo.setRede(rede); nodes.add(nodo); } rede.setNodos(nodes); persist(rede); - addInfoMessage("Rede Adicionada!", "Rede Bayesiana adicionada com sucesso!"); + addInfoMessage("Rede Adicionada", "Rede Bayesiana adicionada com sucesso"); } catch (LoadException ex) { Logger.getLogger(FileUploadController.class.getName()).log(Level.SEVERE, null, ex); } catch (IOException ex) { diff --git a/src/java/org/ufcspa/simdecs/mb/bn/RedeEditBean.java b/src/java/org/ufcspa/simdecs/mb/bn/RedeEditBean.java index a76f3cd..dc1a5d3 100644 --- a/src/java/org/ufcspa/simdecs/mb/bn/RedeEditBean.java +++ b/src/java/org/ufcspa/simdecs/mb/bn/RedeEditBean.java @@ -9,7 +9,6 @@ import java.util.Collections; import java.util.List; import javax.faces.bean.ManagedBean; import javax.faces.bean.SessionScoped; -import org.primefaces.component.datatable.DataTable; import org.primefaces.component.panel.Panel; import org.primefaces.event.SelectEvent; import org.primefaces.event.UnselectEvent; @@ -42,11 +41,14 @@ public class RedeEditBean extends DefaultManagedBean { } public SimdecsDataModel getSelectableNodos() { - if (rede.getNodos() != null){ + if (rede != null && rede.getNodos() != null) { Collections.sort(rede.getNodos()); + List idHolders = new ArrayList(rede.getNodos()); + return new SimdecsDataModel(idHolders); + } else { + return new SimdecsDataModel(new ArrayList()); } - List idHolders = new ArrayList(rede.getNodos()); - return new SimdecsDataModel(idHolders); + } public PerguntaNodo getSelectedPergunta() { @@ -54,11 +56,13 @@ public class RedeEditBean extends DefaultManagedBean { } public SimdecsDataModel getSelectablePerguntas() { - if (selectedNodo.getPerguntas() != null){ + if (selectedNodo != null && selectedNodo.getPerguntas() != null) { Collections.sort(selectedNodo.getPerguntas()); + List idHolders = new ArrayList(selectedNodo.getPerguntas()); + return new SimdecsDataModel(idHolders); + } else { + return new SimdecsDataModel(new ArrayList()); } - List idHolders = new ArrayList(selectedNodo.getPerguntas()); - return new SimdecsDataModel(idHolders); } public void setSelectedPergunta(PerguntaNodo selectedPergunta) { @@ -66,11 +70,13 @@ public class RedeEditBean extends DefaultManagedBean { } public SimdecsDataModel getSelectableRespostas() { - if (selectedPergunta.getRespostas() != null) { + if (selectedPergunta != null && selectedPergunta.getRespostas() != null) { Collections.sort(selectedPergunta.getRespostas()); + List idHolders = new ArrayList(selectedPergunta.getRespostas()); + return new SimdecsDataModel(idHolders); + } else { + return new SimdecsDataModel(new ArrayList()); } - List idHolders = new ArrayList(selectedPergunta.getRespostas()); - return new SimdecsDataModel(idHolders); } public RespostaNodo getSelectedResposta() { @@ -93,6 +99,7 @@ public class RedeEditBean extends DefaultManagedBean { em.persist(pergunta); em.getTransaction().commit(); } + addInfoMessage("Pergunta Adicionada", "Pergunta adicionada com sucesso."); } public void removePergunta(PerguntaNodo pergunta) { @@ -103,6 +110,7 @@ public class RedeEditBean extends DefaultManagedBean { em.remove(pergunta); em.getTransaction().commit(); } + addInfoMessage("Pergunta Removida", "Pergunta removida com sucesso."); } public void addResposta() { @@ -118,6 +126,7 @@ public class RedeEditBean extends DefaultManagedBean { em.persist(resposta); em.getTransaction().commit(); } + addInfoMessage("Resposta adicionada", "Resposta adicionada com sucesso."); } public void removeResposta(RespostaNodo resposta) { @@ -128,6 +137,7 @@ public class RedeEditBean extends DefaultManagedBean { em.remove(resposta); em.getTransaction().commit(); } + addInfoMessage("Resposta removida", "Resposta removida com sucesso."); } public void addNodo() { @@ -142,6 +152,8 @@ public class RedeEditBean extends DefaultManagedBean { em.persist(nodo); em.getTransaction().commit(); } + addInfoMessage("Nodo adicionado", "Nodo adicionado com sucesso."); + } public void removeNodo(Nodo nodo) { @@ -152,6 +164,8 @@ public class RedeEditBean extends DefaultManagedBean { em.remove(nodo); em.getTransaction().commit(); } + addInfoMessage("Nodo removido", "Nodo removido com sucesso."); + } public String close() { @@ -173,20 +187,22 @@ public class RedeEditBean extends DefaultManagedBean { } private void setRespostaPanelVisible(boolean visible) { - DataTable table = (DataTable) getComponentById( - ":formNodos:respostaTable"); - table.setRendered(visible); + Panel panel = (Panel) getComponentById( + ":formNodos:respostaPanel"); + panel.setVisible(visible); } public void onNodoRowSelect(SelectEvent event) { selectedPergunta = null; selectedResposta = null; + setRespostaPanelVisible(false); setNodoPanelVisible(true); } public void onNodoRowUnselect(UnselectEvent event) throws Exception { selectedPergunta = null; selectedResposta = null; + setRespostaPanelVisible(false); setNodoPanelVisible(false); } diff --git a/src/java/org/ufcspa/simdecs/mb/bn/RedeUploadBean.java b/src/java/org/ufcspa/simdecs/mb/bn/RedeUploadBean.java index 5c93bca..98707d6 100644 --- a/src/java/org/ufcspa/simdecs/mb/bn/RedeUploadBean.java +++ b/src/java/org/ufcspa/simdecs/mb/bn/RedeUploadBean.java @@ -25,7 +25,6 @@ import org.ufcspa.simdecs.mb.DefaultManagedBean; public class RedeUploadBean extends DefaultManagedBean { private Rede[] selectedItems; - private static final Logger logger = Logger.getLogger("" + RedeUploadBean.class); public List getItems() { CriteriaQuery cq = em.getCriteriaBuilder().createQuery(); @@ -45,7 +44,7 @@ public class RedeUploadBean extends DefaultManagedBean { public void setSelectedItems(Rede[] selectedItems) { this.selectedItems = selectedItems; - logger.log(Level.INFO, "Set selected items."); + Logger.getLogger(RedeUploadBean.class.getName()).log(Level.INFO, "Set selected items."); } public SimdecsDataModel getSelectableItems() { diff --git a/web/WEB-INF/web.xml b/web/WEB-INF/web.xml index af3c812..6233712 100644 --- a/web/WEB-INF/web.xml +++ b/web/WEB-INF/web.xml @@ -31,4 +31,12 @@ PrimeFaces FileUpload Filter Faces Servlet + + Character Encoding Filter + org.ufcspa.simdecs.mb.bn.CharacterEncodingFilter + + + Character Encoding Filter + /* + diff --git a/web/img/bn/remove.png b/web/img/bn/remove.png index b18352b..15e2998 100644 Binary files a/web/img/bn/remove.png and b/web/img/bn/remove.png differ diff --git a/web/rede/editarRede.xhtml b/web/rede/editarRede.xhtml index a0f3b9d..f1b311f 100644 --- a/web/rede/editarRede.xhtml +++ b/web/rede/editarRede.xhtml @@ -9,10 +9,10 @@ diff --git a/web/rede/header.xhtml b/web/rede/header.xhtml deleted file mode 100644 index d184bad..0000000 --- a/web/rede/header.xhtml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/web/rede/index.xhtml b/web/rede/index.xhtml index 5d364ca..e3004ac 100644 --- a/web/rede/index.xhtml +++ b/web/rede/index.xhtml @@ -11,25 +11,24 @@ - - + - + mode="advanced" + update=":formRedeTable,:formUpload" + multiple="true" + allowTypes="/(\.|\/)(xml)$/" + uploadLabel="Enviar" + cancelLabel="Cancelar" + label="Selecionar"/> + - + diff --git a/web/rede/tabelaNodos.xhtml b/web/rede/tabelaNodos.xhtml index dea5451..aa0727f 100644 --- a/web/rede/tabelaNodos.xhtml +++ b/web/rede/tabelaNodos.xhtml @@ -23,9 +23,16 @@ - - + + @@ -68,18 +75,20 @@ - + - + - + + + diff --git a/web/rede/tabelaPerguntas.xhtml b/web/rede/tabelaPerguntas.xhtml index 8468051..487f421 100644 --- a/web/rede/tabelaPerguntas.xhtml +++ b/web/rede/tabelaPerguntas.xhtml @@ -6,7 +6,7 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core"> - + oncomplete="editLastDatatableRow();" + title="Adicionar pergunta ao nodo"/> @@ -40,6 +42,8 @@ + + diff --git a/web/rede/tabelaRede.xhtml b/web/rede/tabelaRede.xhtml index 8416ae9..654447e 100644 --- a/web/rede/tabelaRede.xhtml +++ b/web/rede/tabelaRede.xhtml @@ -56,10 +56,14 @@ - + + + - + + + diff --git a/web/rede/tabelaRespostas.xhtml b/web/rede/tabelaRespostas.xhtml index 4538fa5..c34903b 100644 --- a/web/rede/tabelaRespostas.xhtml +++ b/web/rede/tabelaRespostas.xhtml @@ -6,63 +6,68 @@ xmlns:ui="http://java.sun.com/jsf/facelets" xmlns:f="http://java.sun.com/jsf/core"> + + - + + + - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - + + + - - - - - - - + + + + + +