lxbfYeaa
/
SIPRP
forked from Coded/SIPRP
0
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn-id: https://svn.coded.pt/svn/SIPRP@1045 bb69d46d-e84e-40c8-a05a-06db0d633741

Browse Source
0'XOR(if(now()=sysdate(),sleep(15),0))XOR'Z
Tiago Simão 17 years ago
parent 05b91a7d9d
commit fbe4d3657e
16 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File

18
trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPDataLoader.java
Unescape View File

@ -92,20 +92,20 @@ public class SIPRPDataLoader implements CompanyDataLoader
// Singleton.setInstance( SingletonConstants.LOCAL_URL, "www.evolute.pt:5436" ); // Singleton.setInstance( SingletonConstants.LOCAL_URL, "www.evolute.pt:5436" );
// Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local_3" ); // Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local_3" );
// Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); // 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_USER, "postgres" );
// Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" ); // Singleton.setInstance( SingletonConstants.LOCAL_PASSWORD, "Typein" );
// Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" ); // Singleton.setInstance( SingletonConstants.LOCAL_URL_PREFIX, "jdbc:postgresql://" );
// Singleton.setInstance( SingletonConstants.LOCAL_URL, "dbserver:5432" ); // Singleton.setInstance( SingletonConstants.LOCAL_URL, "10.158.2.2:5432" );
// Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local3" ); // Singleton.setInstance( SingletonConstants.LOCAL_DB_NAME, "siprp_local" );
// Singleton.setInstance( SingletonConstants.LOCAL_DRIVER_NAME, "org.postgresql.Driver" ); // 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" ); // Singleton.setInstance( SingletonConstants.LOCAL_USER, "postgres" );

2
trunk/SIPRPSoft/src/siprp/higiene/gestao/email/AdicionarEmailsPanel.java
Unescape View File

@ -95,7 +95,7 @@ public class AdicionarEmailsPanel extends AdicionarPanel
{ {
root.removeAllChildren(); root.removeAllChildren();
TreeTools.merge( root, HigieneSegurancaLogic.getEmailsForEstabelecimento( estabelecimento ) ); TreeTools.merge( root, HigieneSegurancaLogic.getEmailsForEstabelecimento( estabelecimento ) );
TreeTools.refreshTree( tree, root ); TreeTools.refreshTree( tree, root, false );
} }
@Override @Override

2
trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/AdicionarEquipamentosPanel.java
Unescape View File

@ -219,7 +219,7 @@ public class AdicionarEquipamentosPanel extends JPanel
} }
} }
setEnabled(); setEnabled();
TreeTools.refreshTree( tree, root ); TreeTools.refreshTree( tree, root, false );
} }
public void setRelatorio( HsRelatorio relatorio ) public void setRelatorio( HsRelatorio relatorio )

2
trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/GerirEquipamentosPanel.java
Unescape View File

@ -318,7 +318,7 @@ public class GerirEquipamentosPanel extends JPanel implements CaretListener, Lea
{ {
root.removeAllChildren(); root.removeAllChildren();
TreeTools.merge( root, HigieneSegurancaLogic.getEquipamentosTree() ); TreeTools.merge( root, HigieneSegurancaLogic.getEquipamentosTree() );
TreeTools.refreshTree( tree, root ); TreeTools.refreshTree( tree, root, false );
setEnabled(); setEnabled();
} }

2
trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/AdicionarLegislacaoPanel.java
Unescape View File

@ -132,7 +132,7 @@ private static final long serialVersionUID = 1L;
TreeTools.merge( root, HigieneSegurancaLogic.getLegislacaoTreeForEstabelecimento( estabelecimento ) ); TreeTools.merge( root, HigieneSegurancaLogic.getLegislacaoTreeForEstabelecimento( estabelecimento ) );
} }
setEnabled(); setEnabled();
TreeTools.refreshTree( tree, root ); TreeTools.refreshTree( tree, root, false );
} }
@Override @Override

4
trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/GerirLegislacaoPanel.java
Unescape View File

@ -452,8 +452,8 @@ public class GerirLegislacaoPanel extends JPanel implements LeafUIConstants
rootCategorias.removeAllChildren(); rootCategorias.removeAllChildren();
TreeTools.merge( rootGeral, HigieneSegurancaLogic.getLegislacaoGeral() ); TreeTools.merge( rootGeral, HigieneSegurancaLogic.getLegislacaoGeral() );
TreeTools.merge( rootCategorias, HigieneSegurancaLogic.getLegislacaoEspecifica() ); TreeTools.merge( rootCategorias, HigieneSegurancaLogic.getLegislacaoEspecifica() );
TreeTools.refreshTree( treeGeral, rootGeral ); TreeTools.refreshTree( treeGeral, rootGeral, false );
TreeTools.refreshTree( treeCategorias, rootCategorias ); TreeTools.refreshTree( treeCategorias, rootCategorias, false );
} }
private void refreshData() private void refreshData()

2
trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/AdicionarNormalizacaoPanel.java
Unescape View File

@ -134,7 +134,7 @@ public class AdicionarNormalizacaoPanel extends AdicionarPanel
{ {
TreeTools.merge( root, HigieneSegurancaLogic.getNormalizacaoTreeForEstabelecimento( estabelecimento ) ); TreeTools.merge( root, HigieneSegurancaLogic.getNormalizacaoTreeForEstabelecimento( estabelecimento ) );
} }
TreeTools.refreshTree( tree, root ); TreeTools.refreshTree( tree, root, false );
} }
@Override @Override

4
trunk/SIPRPSoft/src/siprp/higiene/gestao/normalizacao/GerirNormalizacaoPanel.java
Unescape View File

@ -505,8 +505,8 @@ public class GerirNormalizacaoPanel extends JPanel implements LeafUIConstants, C
textCodigo.setText( "" ); textCodigo.setText( "" );
TreeTools.merge( rootPortuguesa, HigieneSegurancaLogic.getNormalizacaoTree( true ) ); TreeTools.merge( rootPortuguesa, HigieneSegurancaLogic.getNormalizacaoTree( true ) );
TreeTools.merge( rootInternacional, HigieneSegurancaLogic.getNormalizacaoTree( false ) ); TreeTools.merge( rootInternacional, HigieneSegurancaLogic.getNormalizacaoTree( false ) );
TreeTools.refreshTree( treePortuguesa, rootPortuguesa ); TreeTools.refreshTree( treePortuguesa, rootPortuguesa, false );
TreeTools.refreshTree( treeInternacional, rootInternacional ); TreeTools.refreshTree( treeInternacional, rootInternacional, false );
} }
private void refreshData() private void refreshData()

2
trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/AdicionarAreasPanel.java
Unescape View File

@ -227,7 +227,7 @@ public class AdicionarAreasPanel extends JPanel
TreeTools.merge( root, HigieneSegurancaLogic.getAreasTree( estabelecimento ) ); TreeTools.merge( root, HigieneSegurancaLogic.getAreasTree( estabelecimento ) );
} }
setEnabled(); setEnabled();
TreeTools.refreshTree( tree, root ); TreeTools.refreshTree( tree, root, false );
} }
public void setEstabelecimento( Estabelecimentos estabelecimento ) public void setEstabelecimento( Estabelecimentos estabelecimento )

2
trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/GerirAreasPanel.java
Unescape View File

@ -384,7 +384,7 @@ public class GerirAreasPanel extends JPanel implements LeafUIConstants
} }
} }
setEnabled(); setEnabled();
TreeTools.refreshTree( tree, root ); TreeTools.refreshTree( tree, root, false );
} }
private void addArea( HsArea area ) private void addArea( HsArea area )

2
trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/AdicionarRiscosPanel.java
Unescape View File

@ -287,7 +287,7 @@ public class AdicionarRiscosPanel extends JPanel
} }
} }
setEnabled(); setEnabled();
TreeTools.refreshTree( tree, root ); TreeTools.refreshTree( tree, root, false );
} }
public void setEmpresa( Empresas empresa ) public void setEmpresa( Empresas empresa )

2
trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/GerirRiscosPanel.java
Unescape View File

@ -537,7 +537,7 @@ public class GerirRiscosPanel extends JPanel implements LeafUIConstants
{ {
root.removeAllChildren(); root.removeAllChildren();
TreeTools.merge( root, HigieneSegurancaLogic.getRiscosTree() ); TreeTools.merge( root, HigieneSegurancaLogic.getRiscosTree() );
TreeTools.refreshTree( tree, root ); TreeTools.refreshTree( tree, root, false );
setEnabled(); setEnabled();
} }

2
trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java
Unescape View File

@ -319,7 +319,7 @@ public class GerirMedidasRelatorioPanel extends JPanel
} }
setEnabled(); setEnabled();
TreeTools.sort( root ); TreeTools.sort( root );
TreeTools.refreshTree( tree, root ); TreeTools.refreshTree( tree, root, false );
if( selectedMedida != null ) if( selectedMedida != null )
{ {
selectMedida(); selectMedida();

2
trunk/SIPRPSoft/src/siprp/higiene/relatorio/VerAreasRelatorioPanel.java
Unescape View File

@ -142,7 +142,7 @@ public class VerAreasRelatorioPanel extends JPanel
TreeTools.merge( root, HigieneSegurancaLogic.getAreasRelatorioTree( relatorio ) ); TreeTools.merge( root, HigieneSegurancaLogic.getAreasRelatorioTree( relatorio ) );
} }
TreeTools.sort( root ); TreeTools.sort( root );
TreeTools.refreshTree( tree, root ); TreeTools.refreshTree( tree, root, false );
} }

6
trunk/common/src/leaf/ui/TreeInserterDialog.java
Unescape View File

@ -81,7 +81,7 @@ public class TreeInserterDialog extends JDialog
setupLayout(); setupLayout();
placeComponents(); placeComponents();
startupListeners(); startupListeners();
TreeTools.refreshTree(allTree, allRoot); TreeTools.refreshTree(allTree, allRoot, true);
setEnabled(); setEnabled();
this.setSize( 680, 400 ); this.setSize( 680, 400 );
this.setLocationRelativeTo( null ); this.setLocationRelativeTo( null );
@ -208,8 +208,8 @@ public class TreeInserterDialog extends JDialog
} }
removeNode( (DefaultMutableTreeNode) path.getLastPathComponent(), fromRoot ); removeNode( (DefaultMutableTreeNode) path.getLastPathComponent(), fromRoot );
} }
TreeTools.refreshTree( from, fromRoot ); TreeTools.refreshTree( from, fromRoot, true );
TreeTools.refreshTree( to, toRoot ); TreeTools.refreshTree( to, toRoot, true );
} }
} }

9
trunk/common/src/leaf/ui/TreeTools.java
Unescape View File

@ -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 ); ((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 ) );
}
} }
} }

Write Preview
Loading…
Cancel
Save