From fbe4d3657e01660b9a8eb3b331b89729f91c1871 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tiago=20Sim=C3=A3o?= Date: Wed, 27 May 2009 19:10:11 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@1045 bb69d46d-e84e-40c8-a05a-06db0d633741 --- .../companydataloaders/SIPRPDataLoader.java | 18 +++++++++--------- .../gestao/email/AdicionarEmailsPanel.java | 2 +- .../AdicionarEquipamentosPanel.java | 2 +- .../equipamentos/GerirEquipamentosPanel.java | 2 +- .../legislacao/AdicionarLegislacaoPanel.java | 2 +- .../legislacao/GerirLegislacaoPanel.java | 4 ++-- .../AdicionarNormalizacaoPanel.java | 2 +- .../normalizacao/GerirNormalizacaoPanel.java | 4 ++-- .../gestao/postos/AdicionarAreasPanel.java | 2 +- .../higiene/gestao/postos/GerirAreasPanel.java | 2 +- .../gestao/riscos/AdicionarRiscosPanel.java | 2 +- .../gestao/riscos/GerirRiscosPanel.java | 2 +- .../relatorio/GerirMedidasRelatorioPanel.java | 2 +- .../relatorio/VerAreasRelatorioPanel.java | 2 +- .../common/src/leaf/ui/TreeInserterDialog.java | 6 +++--- trunk/common/src/leaf/ui/TreeTools.java | 9 ++++++--- 16 files changed, 33 insertions(+), 30 deletions(-) diff --git a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java index 50e51da4..ccb81d8b 100644 --- a/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java +++ b/trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java @@ -92,20 +92,20 @@ public class SIPRPDataLoader implements CompanyDataLoader // Singleton.setInstance( SingletonConstants.LOCAL_URL, "www.evolute.pt:5436" ); // Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local_3" ); // Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); -// - Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); - Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); - Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); - Singleton.setInstance( SingletonConstants.LOCAL_URL, "10.158.2.2:5432" ); - Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" ); - Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); // // Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); // Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); // Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); -// Singleton.setInstance( SingletonConstants.LOCAL_URL, "dbserver:5432" ); -// Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local3" ); +// Singleton.setInstance( SingletonConstants.LOCAL_URL, "10.158.2.2:5432" ); +// Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" ); // Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); +// + Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); + Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); + Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); + Singleton.setInstance( SingletonConstants.LOCAL_URL, "dbserver:5432" ); + Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local3" ); + Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); // // Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" ); diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/email/AdicionarEmailsPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/email/AdicionarEmailsPanel.java index 23cdf30c..2564d64c 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/email/AdicionarEmailsPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/email/AdicionarEmailsPanel.java @@ -95,7 +95,7 @@ public class AdicionarEmailsPanel extends AdicionarPanel { root.removeAllChildren(); TreeTools.merge( root, HigieneSegurancaLogic.getEmailsForEstabelecimento( estabelecimento ) ); - TreeTools.refreshTree( tree, root ); + TreeTools.refreshTree( tree, root, false ); } @Override diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/AdicionarEquipamentosPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/AdicionarEquipamentosPanel.java index eaa52011..7822f64d 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/AdicionarEquipamentosPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/AdicionarEquipamentosPanel.java @@ -219,7 +219,7 @@ public class AdicionarEquipamentosPanel extends JPanel } } setEnabled(); - TreeTools.refreshTree( tree, root ); + TreeTools.refreshTree( tree, root, false ); } public void setRelatorio( HsRelatorio relatorio ) diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/GerirEquipamentosPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/GerirEquipamentosPanel.java index 12857d2c..e2b65f3d 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/GerirEquipamentosPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/GerirEquipamentosPanel.java @@ -318,7 +318,7 @@ public class GerirEquipamentosPanel extends JPanel implements CaretListener, Lea { root.removeAllChildren(); TreeTools.merge( root, HigieneSegurancaLogic.getEquipamentosTree() ); - TreeTools.refreshTree( tree, root ); + TreeTools.refreshTree( tree, root, false ); setEnabled(); } diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/AdicionarLegislacaoPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/AdicionarLegislacaoPanel.java index c6ad2ec9..e003a23f 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/AdicionarLegislacaoPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/AdicionarLegislacaoPanel.java @@ -132,7 +132,7 @@ private static final long serialVersionUID = 1L; TreeTools.merge( root, HigieneSegurancaLogic.getLegislacaoTreeForEstabelecimento( estabelecimento ) ); } setEnabled(); - TreeTools.refreshTree( tree, root ); + TreeTools.refreshTree( tree, root, false ); } @Override diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/GerirLegislacaoPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/GerirLegislacaoPanel.java index 06622d69..97297151 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/GerirLegislacaoPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/GerirLegislacaoPanel.java @@ -452,8 +452,8 @@ public class GerirLegislacaoPanel extends JPanel implements LeafUIConstants rootCategorias.removeAllChildren(); TreeTools.merge( rootGeral, HigieneSegurancaLogic.getLegislacaoGeral() ); TreeTools.merge( rootCategorias, HigieneSegurancaLogic.getLegislacaoEspecifica() ); - TreeTools.refreshTree( treeGeral, rootGeral ); - TreeTools.refreshTree( treeCategorias, rootCategorias ); + TreeTools.refreshTree( treeGeral, rootGeral, false ); + TreeTools.refreshTree( treeCategorias, rootCategorias, false ); } private void refreshData() diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/AdicionarNormalizacaoPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/AdicionarNormalizacaoPanel.java index 84ac94df..d726a7a1 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/AdicionarNormalizacaoPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/AdicionarNormalizacaoPanel.java @@ -134,7 +134,7 @@ public class AdicionarNormalizacaoPanel extends AdicionarPanel { TreeTools.merge( root, HigieneSegurancaLogic.getNormalizacaoTreeForEstabelecimento( estabelecimento ) ); } - TreeTools.refreshTree( tree, root ); + TreeTools.refreshTree( tree, root, false ); } @Override diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/GerirNormalizacaoPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/GerirNormalizacaoPanel.java index e4882833..c6d60e16 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/GerirNormalizacaoPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/GerirNormalizacaoPanel.java @@ -505,8 +505,8 @@ public class GerirNormalizacaoPanel extends JPanel implements LeafUIConstants, C textCodigo.setText( "" ); TreeTools.merge( rootPortuguesa, HigieneSegurancaLogic.getNormalizacaoTree( true ) ); TreeTools.merge( rootInternacional, HigieneSegurancaLogic.getNormalizacaoTree( false ) ); - TreeTools.refreshTree( treePortuguesa, rootPortuguesa ); - TreeTools.refreshTree( treeInternacional, rootInternacional ); + TreeTools.refreshTree( treePortuguesa, rootPortuguesa, false ); + TreeTools.refreshTree( treeInternacional, rootInternacional, false ); } private void refreshData() diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/AdicionarAreasPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/AdicionarAreasPanel.java index b3e5619b..02f3fd27 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/AdicionarAreasPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/AdicionarAreasPanel.java @@ -227,7 +227,7 @@ public class AdicionarAreasPanel extends JPanel TreeTools.merge( root, HigieneSegurancaLogic.getAreasTree( estabelecimento ) ); } setEnabled(); - TreeTools.refreshTree( tree, root ); + TreeTools.refreshTree( tree, root, false ); } public void setEstabelecimento( Estabelecimentos estabelecimento ) diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/GerirAreasPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/GerirAreasPanel.java index 27943dd6..93964426 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/GerirAreasPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/GerirAreasPanel.java @@ -384,7 +384,7 @@ public class GerirAreasPanel extends JPanel implements LeafUIConstants } } setEnabled(); - TreeTools.refreshTree( tree, root ); + TreeTools.refreshTree( tree, root, false ); } private void addArea( HsArea area ) diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/AdicionarRiscosPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/AdicionarRiscosPanel.java index c80aba18..ce094682 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/AdicionarRiscosPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/AdicionarRiscosPanel.java @@ -287,7 +287,7 @@ public class AdicionarRiscosPanel extends JPanel } } setEnabled(); - TreeTools.refreshTree( tree, root ); + TreeTools.refreshTree( tree, root, false ); } public void setEmpresa( Empresas empresa ) diff --git a/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/GerirRiscosPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/GerirRiscosPanel.java index baba2658..85334e30 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/GerirRiscosPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/GerirRiscosPanel.java @@ -537,7 +537,7 @@ public class GerirRiscosPanel extends JPanel implements LeafUIConstants { root.removeAllChildren(); TreeTools.merge( root, HigieneSegurancaLogic.getRiscosTree() ); - TreeTools.refreshTree( tree, root ); + TreeTools.refreshTree( tree, root, false ); setEnabled(); } diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java index 553e3df5..826f64d3 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java @@ -319,7 +319,7 @@ public class GerirMedidasRelatorioPanel extends JPanel } setEnabled(); TreeTools.sort( root ); - TreeTools.refreshTree( tree, root ); + TreeTools.refreshTree( tree, root, false ); if( selectedMedida != null ) { selectMedida(); diff --git a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/VerAreasRelatorioPanel.java b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/VerAreasRelatorioPanel.java index 6cb2d286..cd20c8c0 100644 --- a/trunk/SIPRPSoft/src/siprp/higiene/relatorio/VerAreasRelatorioPanel.java +++ b/trunk/SIPRPSoft/src/siprp/higiene/relatorio/VerAreasRelatorioPanel.java @@ -142,7 +142,7 @@ public class VerAreasRelatorioPanel extends JPanel TreeTools.merge( root, HigieneSegurancaLogic.getAreasRelatorioTree( relatorio ) ); } TreeTools.sort( root ); - TreeTools.refreshTree( tree, root ); + TreeTools.refreshTree( tree, root, false ); } diff --git a/trunk/common/src/leaf/ui/TreeInserterDialog.java b/trunk/common/src/leaf/ui/TreeInserterDialog.java index d6a42fda..9aed6145 100644 --- a/trunk/common/src/leaf/ui/TreeInserterDialog.java +++ b/trunk/common/src/leaf/ui/TreeInserterDialog.java @@ -81,7 +81,7 @@ public class TreeInserterDialog extends JDialog setupLayout(); placeComponents(); startupListeners(); - TreeTools.refreshTree(allTree, allRoot); + TreeTools.refreshTree(allTree, allRoot, true); setEnabled(); this.setSize( 680, 400 ); this.setLocationRelativeTo( null ); @@ -208,8 +208,8 @@ public class TreeInserterDialog extends JDialog } removeNode( (DefaultMutableTreeNode) path.getLastPathComponent(), fromRoot ); } - TreeTools.refreshTree( from, fromRoot ); - TreeTools.refreshTree( to, toRoot ); + TreeTools.refreshTree( from, fromRoot, true ); + TreeTools.refreshTree( to, toRoot, true ); } } diff --git a/trunk/common/src/leaf/ui/TreeTools.java b/trunk/common/src/leaf/ui/TreeTools.java index 38e405c0..2f181489 100644 --- a/trunk/common/src/leaf/ui/TreeTools.java +++ b/trunk/common/src/leaf/ui/TreeTools.java @@ -45,12 +45,15 @@ public class TreeTools } }; - public static void refreshTree( JTree tree, DefaultMutableTreeNode node ) + public static void refreshTree( JTree tree, DefaultMutableTreeNode node, boolean expand ) { ((DefaultTreeModel) tree.getModel()).nodeStructureChanged( node ); - for( int i = 0; i < tree.getRowCount(); ++i) + if( expand ) { - tree.expandPath( tree.getPathForRow( i ) ); + for( int i = 0; i < tree.getRowCount(); ++i) + { + tree.expandPath( tree.getPathForRow( i ) ); + } } }