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

trunk/SIPRPSoft/src/siprp/higiene/gestao/equipamentos/AdicionarEquipamentosPanel.java

@@ -2,7 +2,6 @@ package siprp.higiene.gestao.equipamentos;
 
 import static com.evolute.utils.strings.UnicodeLatin1Map.atilde;
 import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil;
-import static com.evolute.utils.strings.UnicodeLatin1Map.eacute;
 import info.clearthought.layout.TableLayout;
 import info.clearthought.layout.TableLayoutConstraints;
 
@@ -21,6 +20,7 @@ import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
 import leaf.ui.LeafButton;
+import leaf.ui.LeafError;
 import leaf.ui.LeafIconButton;
 import leaf.ui.TreeTools;
 import siprp.database.cayenne.objects.HsEquipamentoMedico;
@@ -73,10 +73,11 @@ public class AdicionarEquipamentosPanel extends JPanel
 
 	private void setupLayout()
 	{
-		TableLayout layout = new TableLayout(
+		TableLayout layout = new TableLayout( new double[] {
-				new double[]{ TableLayout.MINIMUM, TableLayout.FILL },
+				TableLayout.MINIMUM, TableLayout.FILL
-				new double[]{ TableLayout.FILL }
+		}, new double[] {
-				);
+			TableLayout.FILL
+		} );
 		layout.setHGap( 5 );
 		layout.setVGap( 5 );
 		setLayout( layout );
@@ -85,10 +86,11 @@ public class AdicionarEquipamentosPanel extends JPanel
 	private void placeComponents()
 	{
 		JPanel panel = new JPanel();
-		TableLayout layout = new TableLayout(
+		TableLayout layout = new TableLayout( new double[] {
-				new double[]{ TableLayout.MINIMUM },
+			TableLayout.MINIMUM
-				new double[]{ TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.FILL }
+		}, new double[] {
-				);
+				TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.FILL
+		} );
 		layout.setHGap( 5 );
 		layout.setVGap( 5 );
 		panel.setLayout( layout );
@@ -101,14 +103,15 @@ public class AdicionarEquipamentosPanel extends JPanel
 
 	private void startupListeners()
 	{
-		tree.getSelectionModel().addTreeSelectionListener( new TreeSelectionListener(){
+		tree.getSelectionModel().addTreeSelectionListener( new TreeSelectionListener()
+		{
 			@Override
 			public void valueChanged( TreeSelectionEvent e )
 			{
 				setEnabled();
 				TreePath path = tree.getSelectionPath();
 				Object object = path == null ? null : path.getLastPathComponent();
-				HsRelatorioEquipamentoMedico rel = object == null ? null : ( (object instanceof HsRelatorioEquipamentoMedico) ? (HsRelatorioEquipamentoMedico) ((EquipamentoNode) object).getUserObject() : null); 
+				HsRelatorioEquipamentoMedico rel = object == null ? null : ((object instanceof HsRelatorioEquipamentoMedico) ? (HsRelatorioEquipamentoMedico) ((EquipamentoNode) object).getUserObject() : null);
 				firePropertyChange( SELECTION_CHANGED, null, rel == null ? null : rel.getToHsRelatorio() );
 			}
 		} );
@@ -131,6 +134,8 @@ public class AdicionarEquipamentosPanel extends JPanel
 	}
 
 	private void add()
+	{
+		try
 		{
 			if( relatorio != null )
 			{
@@ -147,9 +152,15 @@ public class AdicionarEquipamentosPanel extends JPanel
 					refresh();
 				}
 			}
+		} catch( Exception e )
+		{
+			e.printStackTrace();
+		}
 	}
 
 	private void rem()
+	{
+		try
 		{
 			TreePath path = tree.getSelectionPath();
 			if( path != null )
@@ -157,11 +168,15 @@ public class AdicionarEquipamentosPanel extends JPanel
 				Object object = path.getLastPathComponent();
 				if( object instanceof EquipamentoNode )
 				{
-				HsRelatorioEquipamentoMedico rel = ((HsRelatorioEquipamentoMedico)((EquipamentoNode) object).getUserObject());
+					HsRelatorioEquipamentoMedico rel = ((HsRelatorioEquipamentoMedico) ((EquipamentoNode) object).getUserObject());
 					rel.delete();
 				}
 			}
 			refresh();
+		} catch( Exception e )
+		{
+			LeafError.error(e);
+		}
 	}
 
 	private void setEnabled()
@@ -177,19 +192,17 @@ public class AdicionarEquipamentosPanel extends JPanel
 		{
 			for( HsRelatorioEquipamentoMedico rel : relatorio.getHsRelatorioEquipamentoMedicoArray() )
 			{
-				root.add( new EquipamentoNode(rel) );
+				root.add( new EquipamentoNode( rel ) );
 			}
 		}
 		setEnabled();
 		TreeTools.refreshTree( tree, root );
 	}
 
-
 	public void setRelatorio( HsRelatorio relatorio )
 	{
 		this.relatorio = relatorio;
 		refresh();
 	}
 
-
 }

trunk/SIPRPSoft/src/siprp/higiene/gestao/legislacao/GerirLegislacaoPanel.java

@@ -28,6 +28,7 @@ import javax.swing.tree.TreeSelectionModel;
 
 import leaf.data.Validator;
 import leaf.ui.LeafButton;
+import leaf.ui.LeafError;
 import leaf.ui.LeafTextAreaEditor;
 import leaf.ui.TreeTools;
 import siprp.database.cayenne.objects.HsLegislacao;
@@ -75,7 +76,7 @@ public class GerirLegislacaoPanel extends JPanel
 
 	private final DefaultTreeModel modelCategorias = new DefaultTreeModel( rootCategorias );
 
-	private final JTree treeCategorias = new JTree(modelCategorias);
+	private final JTree treeCategorias = new JTree( modelCategorias );
 
 	private final JScrollPane scrollCategorias = new JScrollPane( treeCategorias );
 
@@ -153,7 +154,6 @@ public class GerirLegislacaoPanel extends JPanel
 
 	private void placeComponents()
 	{
-
 		panelButtonsGeral.add( buttonGeralCriar );
 		panelButtonsGeral.add( buttonGeralRemover );
 
@@ -189,7 +189,7 @@ public class GerirLegislacaoPanel extends JPanel
 					Object last = selectionPath.getLastPathComponent();
 					if( last instanceof DefaultMutableTreeNode )
 					{
-						Object userObject = ((DefaultMutableTreeNode)last).getUserObject();
+						Object userObject = ((DefaultMutableTreeNode) last).getUserObject();
 						if( userObject instanceof HsLegislacao )
 						{
 							selectedLegislacaoEspecifica = (HsLegislacao) userObject;
@@ -222,7 +222,7 @@ public class GerirLegislacaoPanel extends JPanel
 					Object last = selectionPath.getLastPathComponent();
 					if( last instanceof DefaultMutableTreeNode )
 					{
-						Object userObject = ((DefaultMutableTreeNode)last).getUserObject();
+						Object userObject = ((DefaultMutableTreeNode) last).getUserObject();
 						if( userObject instanceof HsLegislacao )
 						{
 							selectedLegislacaoGeral = (HsLegislacao) userObject;
@@ -244,6 +244,8 @@ public class GerirLegislacaoPanel extends JPanel
 		{
 			@Override
 			public void propertyChange( PropertyChangeEvent evt )
+			{
+				try
 				{
 					String newValue = (String) evt.getNewValue();
 					if( selectedLegislacaoEspecifica != null )
@@ -257,6 +259,10 @@ public class GerirLegislacaoPanel extends JPanel
 						selectedLegislacaoGeral.save();
 					}
 					reload();
+				} catch( Exception e )
+				{
+					LeafError.error( e );
+				}
 			}
 		} );
 		buttonCategoriaCriar.addActionListener( new ActionListener()
@@ -318,6 +324,8 @@ public class GerirLegislacaoPanel extends JPanel
 	}
 
 	private void criarCategoria()
+	{
+		try
 		{
 			String categoriaString = JOptionPane.showInputDialog( this, "Nova categoria", "" );
 			if( categoriaString != null )
@@ -327,9 +335,15 @@ public class GerirLegislacaoPanel extends JPanel
 				novaCategoria.save();
 				reload();
 			}
+		} catch( Exception e )
+		{
+			LeafError.error( e );
+		}
 	}
 
 	private void editarCategoria()
+	{
+		try
 		{
 			if( selectedCategoria != null )
 			{
@@ -341,6 +355,10 @@ public class GerirLegislacaoPanel extends JPanel
 					reload();
 				}
 			}
+		} catch( Exception e )
+		{
+			LeafError.error( e );
+		}
 	}
 
 	private void removerCategoria()
@@ -352,6 +370,8 @@ public class GerirLegislacaoPanel extends JPanel
 	}
 
 	private void criarCategoriaLegislacao()
+	{
+		try
 		{
 			if( selectedCategoria != null )
 			{
@@ -361,9 +381,15 @@ public class GerirLegislacaoPanel extends JPanel
 				novaLegislacao.save();
 				reload();
 			}
+		} catch( Exception e )
+		{
+			LeafError.error( e );
+		}
 	}
 
 	private void removerCategoriaLegislacao()
+	{
+		try
 		{
 			if( selectedLegislacaoEspecifica != null )
 			{
@@ -371,9 +397,15 @@ public class GerirLegislacaoPanel extends JPanel
 				selectedLegislacaoEspecifica.save();
 				reload();
 			}
+		} catch( Exception e )
+		{
+			LeafError.error( e );
+		}
 	}
 
 	private void removerGeral()
+	{
+		try
 		{
 			if( selectedLegislacaoGeral != null )
 			{
@@ -381,14 +413,24 @@ public class GerirLegislacaoPanel extends JPanel
 				selectedLegislacaoGeral.save();
 				reload();
 			}
+		} catch( Exception e )
+		{
+			LeafError.error( e );
+		}
 	}
 
 	private void criarGeral()
+	{
+		try
 		{
 			HsLegislacao legislacao = new HsLegislacao();
 			legislacao.setDescription( "" );
 			legislacao.save();
 			reload();
+		} catch( Exception e )
+		{
+			LeafError.error( e );
+		}
 	}
 
 	private void reload()

trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/AdicionarAreasPanel.java

@@ -17,6 +17,7 @@ import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
 import leaf.ui.LeafButton;
+import leaf.ui.LeafError;
 import leaf.ui.TreeInserterDialog;
 import leaf.ui.TreeTools;
 import siprp.database.cayenne.objects.Estabelecimentos;
@@ -33,9 +34,9 @@ public class AdicionarAreasPanel extends JPanel
 
 	public static final String SELECTION_CHANGED = "SELECTION_CHANGED";
 
-	private final LeafButton buttonAdicionar = new LeafButton("Adicionar");
+	private final LeafButton buttonAdicionar = new LeafButton( "Adicionar" );
 
-	private final LeafButton buttonRemover = new LeafButton("Remover");
+	private final LeafButton buttonRemover = new LeafButton( "Remover" );
 
 	private final DefaultMutableTreeNode root = new DefaultMutableTreeNode();
 
@@ -65,10 +66,11 @@ public class AdicionarAreasPanel extends JPanel
 
 	private void setupLayout()
 	{
-		TableLayout layout = new TableLayout(
+		TableLayout layout = new TableLayout( new double[] {
-				new double[]{ TableLayout.FILL },
+			TableLayout.FILL
-				new double[]{ TableLayout.MINIMUM, TableLayout.FILL }
+		}, new double[] {
-				);
+				TableLayout.MINIMUM, TableLayout.FILL
+		} );
 		layout.setHGap( 5 );
 		layout.setVGap( 5 );
 		setLayout( layout );
@@ -77,10 +79,11 @@ public class AdicionarAreasPanel extends JPanel
 	private void placeComponents()
 	{
 		JPanel panel = new JPanel();
-		TableLayout layout = new TableLayout(
+		TableLayout layout = new TableLayout( new double[] {
-				new double[]{ TableLayout.MINIMUM, TableLayout.FILL, TableLayout.MINIMUM },
+				TableLayout.MINIMUM, TableLayout.FILL, TableLayout.MINIMUM
-				new double[]{ TableLayout.MINIMUM }
+		}, new double[] {
-				);
+			TableLayout.MINIMUM
+		} );
 		layout.setHGap( 5 );
 		layout.setVGap( 5 );
 		panel.setLayout( layout );
@@ -93,14 +96,15 @@ public class AdicionarAreasPanel extends JPanel
 
 	private void startupListeners()
 	{
-		tree.getSelectionModel().addTreeSelectionListener( new TreeSelectionListener(){
+		tree.getSelectionModel().addTreeSelectionListener( new TreeSelectionListener()
+		{
 			@Override
 			public void valueChanged( TreeSelectionEvent e )
 			{
 				setEnabled();
 				TreePath path = tree.getSelectionPath();
 				Object object = path == null ? null : path.getLastPathComponent();
-				HsPosto posto = object == null ? null : ( (object instanceof PostoNode) ? (HsPosto) ((PostoNode) object).getUserObject() : null); 
+				HsPosto posto = object == null ? null : ((object instanceof PostoNode) ? (HsPosto) ((PostoNode) object).getUserObject() : null);
 				firePropertyChange( SELECTION_CHANGED, null, posto );
 			}
 		} );
@@ -126,12 +130,14 @@ public class AdicionarAreasPanel extends JPanel
 	{
 		DefaultMutableTreeNode allPostos = HigieneSegurancaLogic.getAreasTree( estabelecimento.getToEmpresas() );
 		TreeTools.removeAll( allPostos, HigieneSegurancaLogic.getPostosTree( estabelecimento ) );
-		TreeInserterDialog dialog = new TreeInserterDialog("Adicionar Postos de Trabalho", allPostos );
+		TreeInserterDialog dialog = new TreeInserterDialog( "Adicionar Postos de Trabalho", allPostos );
 		save( dialog.getResult() );
 		refresh();
 	}
 
 	private void save( DefaultMutableTreeNode toadd )
+	{
+		try
 		{
 			Object obj = toadd.getUserObject();
 			if( obj instanceof HsPosto )
@@ -148,6 +154,10 @@ public class AdicionarAreasPanel extends JPanel
 					save( (DefaultMutableTreeNode) toadd.getChildAt( i ) );
 				}
 			}
+		} catch( Exception e )
+		{
+			LeafError.error( e );
+		}
 	}
 
 	private void rem()
@@ -158,14 +168,14 @@ public class AdicionarAreasPanel extends JPanel
 			Object object = path.getLastPathComponent();
 			if( object instanceof PostoNode )
 			{
-				HsPosto posto = ((HsPosto)((PostoNode) object).getUserObject());
+				HsPosto posto = ((HsPosto) ((PostoNode) object).getUserObject());
 				remPosto( posto );
 			}
 			else if( object instanceof AreaNode )
 			{
-				for( int i = 0; i < ((AreaNode)object).getChildCount(); ++i )
+				for( int i = 0; i < ((AreaNode) object).getChildCount(); ++i )
 				{
-					PostoNode postoNode = (PostoNode) ((AreaNode)object).getChildAt( i );
+					PostoNode postoNode = (PostoNode) ((AreaNode) object).getChildAt( i );
 					remPosto( (HsPosto) postoNode.getUserObject() );
 				}
 			}
@@ -174,6 +184,8 @@ public class AdicionarAreasPanel extends JPanel
 	}
 
 	private void remPosto( HsPosto posto )
+	{
+		try
 		{
 			HsPostoEstabelecimento toDelete = null;
 			for( HsPostoEstabelecimento rel : posto.getHsPostoEstabelecimentoArray() )
@@ -189,6 +201,11 @@ public class AdicionarAreasPanel extends JPanel
 				toDelete.delete();
 			}
 		}
+		catch( Exception e )
+		{
+			LeafError.error( e );
+		}
+	}
 
 	private void setEnabled()
 	{
@@ -207,7 +224,6 @@ public class AdicionarAreasPanel extends JPanel
 		TreeTools.refreshTree( tree, root );
 	}
 
-
 	public void setEstabelecimento( Estabelecimentos estabelecimento )
 	{
 		this.estabelecimento = estabelecimento;

trunk/SIPRPSoft/src/siprp/higiene/gestao/postos/GerirAreasPanel.java

@@ -26,6 +26,7 @@ import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
 import leaf.ui.LeafButton;
+import leaf.ui.LeafError;
 import leaf.ui.TreeTools;
 import siprp.database.cayenne.objects.Empresas;
 import siprp.database.cayenne.objects.HsArea;
@@ -170,6 +171,8 @@ public class GerirAreasPanel extends JPanel
 	}
 	
 	private void criarArea()
+	{
+		try
 		{
 			if( empresa != null )
 			{
@@ -183,9 +186,15 @@ public class GerirAreasPanel extends JPanel
 					refresh();
 				}
 			}
+		} catch( Exception e )
+		{
+			LeafError.error(e);
+		}
 	}
 	
 	private void removerArea()
+	{
+		try
 		{
 			HsArea area = getSelectedArea();
 			if( area != null )
@@ -193,9 +202,15 @@ public class GerirAreasPanel extends JPanel
 				area.delete();
 				refresh();
 			}
+		} catch( Exception e )
+		{
+			LeafError.error(e);
+		}
 	}
 	
 	private void criarPosto()
+	{
+		try
 		{
 			HsArea area = getSelectedArea();
 			if( area != null )
@@ -211,9 +226,15 @@ public class GerirAreasPanel extends JPanel
 				}
 				refresh();
 			}
+		} catch( Exception e )
+		{
+			LeafError.error(e);
+		}
 	}
 	
 	private void removerPosto()
+	{
+		try
 		{
 			HsPosto posto = getSelectedPosto();
 			if( posto != null )
@@ -222,6 +243,10 @@ public class GerirAreasPanel extends JPanel
 				posto.save();
 				refresh();
 			}
+		} catch( Exception e )
+		{
+			LeafError.error(e);
+		}
 	}
 	
 	private HsArea getSelectedArea()

trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/AdicionarRiscosPanel.java

@@ -17,13 +17,13 @@ import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
 import leaf.ui.LeafButton;
+import leaf.ui.LeafError;
 import leaf.ui.TreeInserterDialog;
 import leaf.ui.TreeTools;
 import siprp.database.cayenne.objects.BaseObject;
 import siprp.database.cayenne.objects.Empresas;
 import siprp.database.cayenne.objects.HsPosto;
 import siprp.database.cayenne.objects.HsPostoRisco;
-import siprp.database.cayenne.objects.HsRelatorioPosto;
 import siprp.database.cayenne.objects.HsRisco;
 import siprp.database.cayenne.objects.HsRiscoEmpresa;
 import siprp.logic.HigieneSegurancaLogic;
@@ -36,9 +36,9 @@ public class AdicionarRiscosPanel extends JPanel
 
 	public static final String SELECTION_CHANGED = "RISCOS_SELECTION_CHANGED";
 
-	private final LeafButton buttonAdicionar = new LeafButton("Adicionar");
+	private final LeafButton buttonAdicionar = new LeafButton( "Adicionar" );
 
-	private final LeafButton buttonRemover = new LeafButton("Remover");
+	private final LeafButton buttonRemover = new LeafButton( "Remover" );
 
 	private final DefaultMutableTreeNode root = new DefaultMutableTreeNode();
 
@@ -70,10 +70,11 @@ public class AdicionarRiscosPanel extends JPanel
 
 	private void setupLayout()
 	{
-		TableLayout layout = new TableLayout(
+		TableLayout layout = new TableLayout( new double[] {
-				new double[]{ TableLayout.FILL },
+			TableLayout.FILL
-				new double[]{ TableLayout.MINIMUM, TableLayout.FILL }
+		}, new double[] {
-				);
+				TableLayout.MINIMUM, TableLayout.FILL
+		} );
 		layout.setHGap( 5 );
 		layout.setVGap( 5 );
 		setLayout( layout );
@@ -82,10 +83,11 @@ public class AdicionarRiscosPanel extends JPanel
 	private void placeComponents()
 	{
 		JPanel panel = new JPanel();
-		TableLayout layout = new TableLayout(
+		TableLayout layout = new TableLayout( new double[] {
-				new double[]{ TableLayout.MINIMUM, TableLayout.FILL, TableLayout.MINIMUM },
+				TableLayout.MINIMUM, TableLayout.FILL, TableLayout.MINIMUM
-				new double[]{ TableLayout.MINIMUM }
+		}, new double[] {
-				);
+			TableLayout.MINIMUM
+		} );
 		layout.setHGap( 5 );
 		layout.setVGap( 5 );
 		panel.setLayout( layout );
@@ -114,7 +116,8 @@ public class AdicionarRiscosPanel extends JPanel
 				rem();
 			}
 		} );
-		tree.getSelectionModel().addTreeSelectionListener( new TreeSelectionListener(){
+		tree.getSelectionModel().addTreeSelectionListener( new TreeSelectionListener()
+		{
 			@Override
 			public void valueChanged( TreeSelectionEvent e )
 			{
@@ -132,12 +135,12 @@ public class AdicionarRiscosPanel extends JPanel
 	private void add()
 	{
 		DefaultMutableTreeNode allRiscos = getAllRiscos();
-		TreeTools.removeAll( allRiscos, getRiscosTree( ) );
+		TreeTools.removeAll( allRiscos, getRiscosTree() );
 		TreeInserterDialog dialog = new TreeInserterDialog( "Adicionar Riscos", allRiscos );
 		DefaultMutableTreeNode result = dialog.getResult();
 		if( result != null )
 		{
-			addResult(result);
+			addResult( result );
 			refresh();
 		}
 		setEnabled();
@@ -156,6 +159,7 @@ public class AdicionarRiscosPanel extends JPanel
 		}
 		return result;
 	}
+
 	private DefaultMutableTreeNode getRiscosTree()
 	{
 		DefaultMutableTreeNode result = new DefaultMutableTreeNode();
@@ -181,6 +185,8 @@ public class AdicionarRiscosPanel extends JPanel
 	}
 
 	private void addResult( DefaultMutableTreeNode root )
+	{
+		try
 		{
 			if( root != null )
 			{
@@ -197,7 +203,7 @@ public class AdicionarRiscosPanel extends JPanel
 					else if( posto != null )
 					{
 						HsPostoRisco rel = new HsPostoRisco();
-					rel.setToHsPosto( posto);
+						rel.setToHsPosto( posto );
 						rel.setToHsRisco( risco );
 						rel.save();
 					}
@@ -208,13 +214,18 @@ public class AdicionarRiscosPanel extends JPanel
 					addResult( child );
 				}
 			}
+		} catch( Exception e )
+		{
+			LeafError.error( e );
+		}
 	}
 
-	
 	private void rem()
+	{
+		try
 		{
 			TreePath path = tree.getSelectionPath();
-		if (path != null)
+			if( path != null )
 			{
 				DefaultMutableTreeNode node = (DefaultMutableTreeNode) path.getLastPathComponent();
 				Object obj = node.getUserObject();
@@ -224,6 +235,10 @@ public class AdicionarRiscosPanel extends JPanel
 					refresh();
 				}
 			}
+		} catch( Exception e )
+		{
+			LeafError.error( e );
+		}
 	}
 
 	private void setEnabled()

trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/GerirMedidaPanel.java

@@ -15,6 +15,7 @@ import javax.swing.event.CaretEvent;
 import javax.swing.event.CaretListener;
 
 import leaf.ui.LeafButton;
+import leaf.ui.LeafError;
 import siprp.database.cayenne.objects.HsMedida;
 
 import com.evolute.utils.images.ImageException;
@@ -31,21 +32,17 @@ public class GerirMedidaPanel extends JPanel
 
 	private static final String ICON_NAME_REVERT = "siprp/higiene/gestao/riscos/revert.png";
 
-	private LeafButton buttonSaveMedida;
-	
-	private LeafButton buttonRevertMedida;
-	
 	private LeafButton buttonSaveRequesito;
 
 	private LeafButton buttonRevertRequesito;
 
 	private final JTextArea fieldTextMedida = new JTextArea();
 
-	private final JScrollPane scrollMedida = new JScrollPane(fieldTextMedida);
+	private final JScrollPane scrollMedida = new JScrollPane( fieldTextMedida );
 
 	private final JTextArea fieldTextRequisitosLegais = new JTextArea();
 
-	private final JScrollPane scrollRequesitos = new JScrollPane(fieldTextRequisitosLegais);
+	private final JScrollPane scrollRequesitos = new JScrollPane( fieldTextRequisitosLegais );
 
 	private HsMedida medida = null;
 
@@ -53,8 +50,6 @@ public class GerirMedidaPanel extends JPanel
 	{
 		try
 		{
-			buttonSaveMedida = new LeafButton( ImageIconLoader.loadImageIcon( ICON_NAME_SAVE ) );
-			buttonRevertMedida = new LeafButton( ImageIconLoader.loadImageIcon( ICON_NAME_REVERT ) );
 			buttonSaveRequesito = new LeafButton( ImageIconLoader.loadImageIcon( ICON_NAME_SAVE ) );
 			buttonRevertRequesito = new LeafButton( ImageIconLoader.loadImageIcon( ICON_NAME_REVERT ) );
 		} catch( ImageException e )
@@ -77,10 +72,8 @@ public class GerirMedidaPanel extends JPanel
 		scrollMedida.setVerticalScrollBarPolicy( JScrollPane.VERTICAL_SCROLLBAR_ALWAYS );
 		scrollRequesitos.setHorizontalScrollBarPolicy( JScrollPane.HORIZONTAL_SCROLLBAR_NEVER );
 		scrollRequesitos.setVerticalScrollBarPolicy( JScrollPane.VERTICAL_SCROLLBAR_ALWAYS );
-		buttonSaveMedida.setMargin( new Insets(0,0,0,0) );
+		buttonSaveRequesito.setMargin( new Insets( 0, 0, 0, 0 ) );
-		buttonSaveRequesito.setMargin( new Insets(0,0,0,0) );
+		buttonRevertRequesito.setMargin( new Insets( 0, 0, 0, 0 ) );
-		buttonRevertMedida.setMargin( new Insets(0,0,0,0) );
-		buttonRevertRequesito.setMargin( new Insets(0,0,0,0) );
 	}
 
 	private void setupListeners()
@@ -101,14 +94,6 @@ public class GerirMedidaPanel extends JPanel
 				setEnabled();
 			}
 		} );
-		buttonSaveMedida.addActionListener( new ActionListener()
-		{
-			@Override
-			public void actionPerformed( ActionEvent e )
-			{
-				saveMedida();
-			}
-		} );
 		buttonSaveRequesito.addActionListener( new ActionListener()
 		{
 			@Override
@@ -117,14 +102,6 @@ public class GerirMedidaPanel extends JPanel
 				saveRequesito();
 			}
 		} );
-		buttonRevertMedida.addActionListener( new ActionListener()
-		{
-			@Override
-			public void actionPerformed( ActionEvent e )
-			{
-				revertMedida();
-			}
-		} );
 		buttonRevertRequesito.addActionListener( new ActionListener()
 		{
 			@Override
@@ -137,10 +114,11 @@ public class GerirMedidaPanel extends JPanel
 
 	private void startupLayout()
 	{
-		TableLayout	layout = new TableLayout(
+		TableLayout layout = new TableLayout( new double[] {
-				new double[]{ TableLayout.FILL, TableLayout.MINIMUM, TableLayout.MINIMUM }, 
+				TableLayout.FILL, TableLayout.MINIMUM, TableLayout.MINIMUM
-				new double[]{ TableLayout.MINIMUM, TableLayout.FILL, TableLayout.MINIMUM, TableLayout.FILL }
+		}, new double[] {
-		);
+				TableLayout.MINIMUM, TableLayout.FILL, TableLayout.MINIMUM, TableLayout.FILL
+		} );
 		layout.setHGap( 5 );
 		layout.setVGap( 5 );
 		setLayout( layout );
@@ -148,14 +126,12 @@ public class GerirMedidaPanel extends JPanel
 
 	private void placeComponents()
 	{
-		add( new JLabel("Requisitos legais"), new TableLayoutConstraints(0,0) );
+		add( new JLabel( "Requisitos legais" ), new TableLayoutConstraints( 0, 0 ) );
-		add( buttonSaveRequesito, new TableLayoutConstraints(1,0) );
+		add( buttonSaveRequesito, new TableLayoutConstraints( 1, 0 ) );
-		add( buttonRevertRequesito, new TableLayoutConstraints(2,0) );
+		add( buttonRevertRequesito, new TableLayoutConstraints( 2, 0 ) );
-		add( scrollRequesitos, new TableLayoutConstraints(0,1,2,1) );
+		add( scrollRequesitos, new TableLayoutConstraints( 0, 1, 2, 1 ) );
-		add( new JLabel("Medida"), new TableLayoutConstraints(0,2) );
+		add( new JLabel( "Medida" ), new TableLayoutConstraints( 0, 2 ) );
-		add( buttonSaveMedida, new TableLayoutConstraints(1,2) );
+		add( scrollMedida, new TableLayoutConstraints( 0, 3, 2, 3 ) );
-		add( buttonRevertMedida, new TableLayoutConstraints(2,2) );
-		add( scrollMedida, new TableLayoutConstraints(0,3,2,3) );
 	}
 
 	private void setEnabled()
@@ -167,41 +143,26 @@ public class GerirMedidaPanel extends JPanel
 			medidaChanged = !fieldTextMedida.getText().equals( medida.getDescription() );
 			requesitoChanged = !fieldTextRequisitosLegais.getText().equals( medida.getRequesitosLegais() );
 		}
-		buttonSaveMedida.setEnabled( medidaChanged );
+		buttonSaveRequesito.setEnabled( requesitoChanged || medidaChanged );
-		buttonSaveRequesito.setEnabled( requesitoChanged );
+		buttonRevertRequesito.setEnabled( requesitoChanged || medidaChanged );
-		buttonRevertMedida.setEnabled( medidaChanged );
-		buttonRevertRequesito.setEnabled( requesitoChanged );
-	}
-	
-	private void saveMedida()
-	{
-		if( medida != null )
-		{
-			medida.setDescription( fieldTextMedida.getText() );
-			medida.save();
-			refresh();
-		}
-		setEnabled();
 	}
 
 	private void saveRequesito()
+	{
+		try
 		{
 			if( medida != null )
 			{
-			medida.setRequesitosLegais(fieldTextRequisitosLegais.getText() );
+				medida.setRequesitosLegais( fieldTextRequisitosLegais.getText() );
+				medida.setDescription( fieldTextMedida.getText() );
 				medida.save();
 				refresh();
 			}
 			setEnabled();
-	}
+		} catch( Exception e )
-	
-	private void revertMedida()
-	{
-		if( medida != null )
 		{
-			fieldTextMedida.setText( medida.getDescription() );
+			LeafError.error( e );
 		}
-		setEnabled();
 	}
 
 	private void revertRequesito()
@@ -209,6 +170,7 @@ public class GerirMedidaPanel extends JPanel
 		if( medida != null )
 		{
 			fieldTextRequisitosLegais.setText( medida.getRequesitosLegais() );
+			fieldTextMedida.setText( medida.getDescription() );
 		}
 		setEnabled();
 	}
@@ -231,5 +193,4 @@ public class GerirMedidaPanel extends JPanel
 		return this.medida;
 	}
 
-	
 }

trunk/SIPRPSoft/src/siprp/higiene/gestao/riscos/GerirRiscosPanel.java

@@ -1,6 +1,6 @@
 package siprp.higiene.gestao.riscos;
 
-import static com.evolute.utils.strings.UnicodeLatin1Map.atilde;
+import static com.evolute.utils.strings.UnicodeLatin1Map.*;
 import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil;
 import info.clearthought.layout.TableLayout;
 import info.clearthought.layout.TableLayoutConstraints;
@@ -26,6 +26,7 @@ import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
 import leaf.ui.LeafButton;
+import leaf.ui.LeafError;
 import leaf.ui.TreeTools;
 import siprp.database.cayenne.objects.HsMedida;
 import siprp.database.cayenne.objects.HsRisco;
@@ -157,14 +158,15 @@ public class GerirRiscosPanel extends JPanel
 				removerMedida();
 			}
 		} );
-		tree.getSelectionModel().addTreeSelectionListener( new TreeSelectionListener(){
+		tree.getSelectionModel().addTreeSelectionListener( new TreeSelectionListener()
+		{
 			@Override
 			public void valueChanged( TreeSelectionEvent e )
 			{
 				setEnabled();
 				selectCard();
 			}
-		});
+		} );
 		panelDataMedida.addPropertyChangeListener( GerirMedidaPanel.MEDIDA_CHANGED, new PropertyChangeListener()
 		{
 			@Override
@@ -175,10 +177,12 @@ public class GerirRiscosPanel extends JPanel
 					refresh();
 				}
 			}
-		});
+		} );
 	}
 
 	private void criarTema()
+	{
+		try
 		{
 			String temaString = JOptionPane.showInputDialog( this, "Criar tema", "Descri" + ccedil + atilde + "o", JOptionPane.QUESTION_MESSAGE );
 			if( temaString != null )
@@ -188,9 +192,15 @@ public class GerirRiscosPanel extends JPanel
 				tema.save();
 				refresh();
 			}
+		} catch( Exception e )
+		{
+			LeafError.error( e );
+		}
 	}
 
 	private void editarTema()
+	{
+		try
 		{
 			HsRiscoTema tema = getSelectedTema();
 			if( tema != null )
@@ -203,9 +213,15 @@ public class GerirRiscosPanel extends JPanel
 					refresh();
 				}
 			}
+		} catch( Exception e )
+		{
+			LeafError.error( e );
+		}
 	}
 
 	private void removerTema()
+	{
+		try
 		{
 			HsRiscoTema tema = getSelectedTema();
 			if( tema != null )
@@ -213,9 +229,15 @@ public class GerirRiscosPanel extends JPanel
 				tema.delete();
 				refresh();
 			}
+		} catch( Exception e )
+		{
+			LeafError.error( e );
+		}
 	}
 
 	private void criarRisco()
+	{
+		try
 		{
 			HsRiscoTema tema = getSelectedTema();
 			if( tema == null )
@@ -246,9 +268,15 @@ public class GerirRiscosPanel extends JPanel
 					refresh();
 				}
 			}
+		} catch( Exception e )
+		{
+			LeafError.error( e );
+		}
 	}
 
 	private void editarRisco()
+	{
+		try
 		{
 			HsRisco risco = getSelectedRisco();
 			if( risco != null )
@@ -261,19 +289,45 @@ public class GerirRiscosPanel extends JPanel
 					refresh();
 				}
 			}
+		} catch( Exception e )
+		{
+			LeafError.error( e );
+		}
 	}
 
 	private void removerRisco()
+	{
+		try
 		{
 			HsRisco risco = getSelectedRisco();
-		if( risco != null )
+			if( risco != null && removerRiscoOK(risco) )
 			{
 				risco.delete();
 				refresh();
 			}
 		}
+		catch( Exception e )
+		{
+			LeafError.error( e );
+		}
+	}
+	
+	private boolean removerRiscoOK( HsRisco risco )
+	{
+		boolean result = true;
+		if( risco.getHsRiscoEmpresaArray().size() > 0 )
+		{
+			if( JOptionPane.NO_OPTION == JOptionPane.showConfirmDialog( this, "Este risco est" + aacute + " associado a uma ou mais empresas, \n tem a certeza que o deseja remover?", "Aviso", JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE ) )
+			{
+				result = false;
+			}
+		}
+		return result;
+	}
 
 	private void criarMedida()
+	{
+		try
 		{
 			HsRisco risco = getSelectedRisco();
 			if( risco == null )
@@ -296,9 +350,15 @@ public class GerirRiscosPanel extends JPanel
 				rel.save();
 				refresh();
 			}
+		} catch( Exception e )
+		{
+			LeafError.error( e );
+		}
 	}
 
 	private void removerMedida()
+	{
+		try
 		{
 			HsRiscoMedida medida = getSelectedMedida();
 			if( medida != null )
@@ -306,6 +366,10 @@ public class GerirRiscosPanel extends JPanel
 				medida.delete();
 				refresh();
 			}
+		} catch( Exception e )
+		{
+			LeafError.error( e );
+		}
 	}
 
 	private HsRiscoTema getSelectedTema()
@@ -364,42 +428,47 @@ public class GerirRiscosPanel extends JPanel
 
 	private void startupLayout()
 	{
-		TableLayout layout = new TableLayout(
+		TableLayout layout = new TableLayout( new double[] {
-				new double[]{ TableLayout.MINIMUM, TableLayout.PREFERRED, TableLayout.FILL },
+				TableLayout.MINIMUM, TableLayout.PREFERRED, TableLayout.FILL
-				new double[]{ TableLayout.FILL }
+		}, new double[] {
-				);
+			TableLayout.FILL
+		} );
 		layout.setHGap( 5 );
 		layout.setVGap( 5 );
 		setLayout( layout );
 
-		layout = new TableLayout(
+		layout = new TableLayout( new double[] {
-				new double[]{ TableLayout.MINIMUM }, 
+			TableLayout.MINIMUM
-				new double[]{ TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.FILL }
+		}, new double[] {
-		);
+				TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.FILL
+		} );
 		layout.setHGap( 5 );
 		layout.setVGap( 5 );
 		panelButtons.setLayout( layout );
 
-		layout = new TableLayout(
+		layout = new TableLayout( new double[] {
-				new double[]{ TableLayout.FILL }, 
+			TableLayout.FILL
-				new double[]{ TableLayout.FILL }
+		}, new double[] {
-		);
+			TableLayout.FILL
+		} );
 		layout.setHGap( 5 );
 		layout.setVGap( 5 );
 		panelTree.setLayout( layout );
 
-		layout = new TableLayout(
+		layout = new TableLayout( new double[] {
-				new double[]{ TableLayout.FILL }, 
+			TableLayout.FILL
-				new double[]{ TableLayout.FILL }
+		}, new double[] {
-		);
+			TableLayout.FILL
+		} );
 		layout.setHGap( 5 );
 		layout.setVGap( 5 );
 		panelDataTema.setLayout( layout );
 
-		layout = new TableLayout(
+		layout = new TableLayout( new double[] {
-				new double[]{ TableLayout.FILL }, 
+			TableLayout.FILL
-				new double[]{ TableLayout.FILL }
+		}, new double[] {
-		);
+			TableLayout.FILL
+		} );
 		layout.setHGap( 5 );
 		layout.setVGap( 5 );
 		panelDataRisco.setLayout( layout );
@@ -441,7 +510,6 @@ public class GerirRiscosPanel extends JPanel
 		add( panelData, new TableLayoutConstraints( 2, 0 ) );
 	}
 
-	
 	private void selectCard()
 	{
 		HsRiscoTema tema = getSelectedTema();

trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidaRelatorioPanel.java

@@ -18,6 +18,7 @@ import javax.swing.event.CaretEvent;
 import javax.swing.event.CaretListener;
 
 import leaf.ui.LeafButton;
+import leaf.ui.LeafError;
 import siprp.database.cayenne.objects.HsRelatorioPostoMedida;
 
 import com.evolute.utils.images.ImageException;
@@ -42,15 +43,15 @@ public class GerirMedidaRelatorioPanel extends JPanel
 
 	private LeafButton buttonRevertRequesito;
 
-	private final JCheckBox checkPlanoActuacao = new JCheckBox("Plano de actua" + ccedil + atilde + "o");
+	private final JCheckBox checkPlanoActuacao = new JCheckBox( "Plano de actua" + ccedil + atilde + "o" );
 
 	private final JTextArea fieldTextMedida = new JTextArea();
 
-	private final JScrollPane scrollMedida = new JScrollPane(fieldTextMedida);
+	private final JScrollPane scrollMedida = new JScrollPane( fieldTextMedida );
 
 	private final JTextArea fieldTextRequisitosLegais = new JTextArea();
 
-	private final JScrollPane scrollRequesitos = new JScrollPane(fieldTextRequisitosLegais);
+	private final JScrollPane scrollRequesitos = new JScrollPane( fieldTextRequisitosLegais );
 
 	private HsRelatorioPostoMedida relacao = null;
 
@@ -82,10 +83,10 @@ public class GerirMedidaRelatorioPanel extends JPanel
 		scrollMedida.setVerticalScrollBarPolicy( JScrollPane.VERTICAL_SCROLLBAR_ALWAYS );
 		scrollRequesitos.setHorizontalScrollBarPolicy( JScrollPane.HORIZONTAL_SCROLLBAR_NEVER );
 		scrollRequesitos.setVerticalScrollBarPolicy( JScrollPane.VERTICAL_SCROLLBAR_ALWAYS );
-		buttonSaveMedida.setMargin( new Insets(0,0,0,0) );
+		buttonSaveMedida.setMargin( new Insets( 0, 0, 0, 0 ) );
-		buttonSaveRequesito.setMargin( new Insets(0,0,0,0) );
+		buttonSaveRequesito.setMargin( new Insets( 0, 0, 0, 0 ) );
-		buttonRevertMedida.setMargin( new Insets(0,0,0,0) );
+		buttonRevertMedida.setMargin( new Insets( 0, 0, 0, 0 ) );
-		buttonRevertRequesito.setMargin( new Insets(0,0,0,0) );
+		buttonRevertRequesito.setMargin( new Insets( 0, 0, 0, 0 ) );
 	}
 
 	private void setupListeners()
@@ -150,10 +151,11 @@ public class GerirMedidaRelatorioPanel extends JPanel
 
 	private void startupLayout()
 	{
-		TableLayout	layout = new TableLayout(
+		TableLayout layout = new TableLayout( new double[] {
-				new double[]{ TableLayout.FILL, TableLayout.MINIMUM, TableLayout.MINIMUM }, 
+				TableLayout.FILL, TableLayout.MINIMUM, TableLayout.MINIMUM
-				new double[]{ TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.FILL, TableLayout.MINIMUM, TableLayout.FILL }
+		}, new double[] {
-		);
+				TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.FILL, TableLayout.MINIMUM, TableLayout.FILL
+		} );
 		layout.setHGap( 5 );
 		layout.setVGap( 5 );
 		setLayout( layout );
@@ -162,23 +164,24 @@ public class GerirMedidaRelatorioPanel extends JPanel
 	private void placeComponents()
 	{
 		JPanel panel = new JPanel();
-		TableLayout	layout = new TableLayout(
+		TableLayout layout = new TableLayout( new double[] {
-				new double[]{ TableLayout.MINIMUM, TableLayout.FILL }, 
+				TableLayout.MINIMUM, TableLayout.FILL
-				new double[]{ TableLayout.MINIMUM }
+		}, new double[] {
-		);
+			TableLayout.MINIMUM
+		} );
 		layout.setHGap( 5 );
 		layout.setVGap( 5 );
 		panel.setLayout( layout );
-		panel.add( checkPlanoActuacao, new TableLayoutConstraints(0,0) );
+		panel.add( checkPlanoActuacao, new TableLayoutConstraints( 0, 0 ) );
-		add( panel, new TableLayoutConstraints(0,0,2,0) );
+		add( panel, new TableLayoutConstraints( 0, 0, 2, 0 ) );
-		add( new JLabel("Requisitos legais"), new TableLayoutConstraints(0,1) );
+		add( new JLabel( "Requisitos legais" ), new TableLayoutConstraints( 0, 1 ) );
-		add( buttonSaveRequesito, new TableLayoutConstraints(1,1) );
+		add( buttonSaveRequesito, new TableLayoutConstraints( 1, 1 ) );
-		add( buttonRevertRequesito, new TableLayoutConstraints(2,1) );
+		add( buttonRevertRequesito, new TableLayoutConstraints( 2, 1 ) );
-		add( scrollRequesitos, new TableLayoutConstraints(0,2,2,2) );
+		add( scrollRequesitos, new TableLayoutConstraints( 0, 2, 2, 2 ) );
-		add( new JLabel("Medida"), new TableLayoutConstraints(0,3) );
+		add( new JLabel( "Medida" ), new TableLayoutConstraints( 0, 3 ) );
-		add( buttonSaveMedida, new TableLayoutConstraints(1,3) );
+		add( buttonSaveMedida, new TableLayoutConstraints( 1, 3 ) );
-		add( buttonRevertMedida, new TableLayoutConstraints(2,3) );
+		add( buttonRevertMedida, new TableLayoutConstraints( 2, 3 ) );
-		add( scrollMedida, new TableLayoutConstraints(0,4,2,4) );
+		add( scrollMedida, new TableLayoutConstraints( 0, 4, 2, 4 ) );
 	}
 
 	private void setEnabled()
@@ -214,6 +217,8 @@ public class GerirMedidaRelatorioPanel extends JPanel
 	}
 
 	private void savePlano()
+	{
+		try
 		{
 			if( relacao != null )
 			{
@@ -221,9 +226,15 @@ public class GerirMedidaRelatorioPanel extends JPanel
 				relacao.save();
 				firePropertyChange( MEDIDA_CHANGED, null, relacao );
 			}
+		} catch( Exception e )
+		{
+			LeafError.error( e );
+		}
 	}
 
 	private void saveMedida()
+	{
+		try
 		{
 			if( relacao != null )
 			{
@@ -232,17 +243,27 @@ public class GerirMedidaRelatorioPanel extends JPanel
 				refresh();
 			}
 			setEnabled();
+		} catch( Exception e )
+		{
+			LeafError.error( e );
+		}
 	}
 
 	private void saveRequesito()
+	{
+		try
 		{
 			if( relacao != null )
 			{
-			relacao.getToHsRelatorioMedida().setRequesitosLegais(fieldTextRequisitosLegais.getText() );
+				relacao.getToHsRelatorioMedida().setRequesitosLegais( fieldTextRequisitosLegais.getText() );
 				relacao.save();
 				refresh();
 			}
 			setEnabled();
+		} catch( Exception e )
+		{
+			LeafError.error( e );
+		}
 	}
 
 	private void revertMedida()
@@ -273,9 +294,8 @@ public class GerirMedidaRelatorioPanel extends JPanel
 		this.relacao = medida;
 		fieldTextMedida.setText( medida == null ? null : medida.getToHsRelatorioMedida().getDescription() );
 		fieldTextRequisitosLegais.setText( medida == null ? null : medida.getToHsRelatorioMedida().getRequesitosLegais() );
-		checkPlanoActuacao.setSelected( medida == null ? false : ( medida.getIsPlanoActuacao() == null ? false : medida.getIsPlanoActuacao() ) );
+		checkPlanoActuacao.setSelected( medida == null ? false : (medida.getIsPlanoActuacao() == null ? false : medida.getIsPlanoActuacao()) );
 		setEnabled();
 	}
 
-	
 }

trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirMedidasRelatorioPanel.java

@@ -20,6 +20,7 @@ import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
 import leaf.ui.LeafButton;
+import leaf.ui.LeafError;
 import leaf.ui.TreeTools;
 import siprp.database.cayenne.objects.HsRelatorioMedida;
 import siprp.database.cayenne.objects.HsRelatorioPosto;
@@ -39,9 +40,9 @@ public class GerirMedidasRelatorioPanel extends JPanel
 
 	public static final String VALUE_CHANGED = "VALUE_CHANGED";
 
-	private final LeafButton buttonAdicionar = new LeafButton("Adicionar");
+	private final LeafButton buttonAdicionar = new LeafButton( "Adicionar" );
 
-	private final LeafButton buttonRemover = new LeafButton("Remover");
+	private final LeafButton buttonRemover = new LeafButton( "Remover" );
 
 	private final DefaultMutableTreeNode root = new DefaultMutableTreeNode();
 
@@ -67,20 +68,20 @@ public class GerirMedidasRelatorioPanel extends JPanel
 		buttonRemover.setEnabled( false );
 		tree.setRootVisible( false );
 		tree.getSelectionModel().setSelectionMode( TreeSelectionModel.SINGLE_TREE_SELECTION );
-		tree.setCellRenderer(new DefaultTreeCellRenderer()
+		tree.setCellRenderer( new DefaultTreeCellRenderer()
 		{
 
 			private static final long serialVersionUID = 1L;
 
-			public Component getTreeCellRendererComponent(JTree pTree, Object pValue, boolean pIsSelected, boolean pIsExpanded, boolean pIsLeaf, int pRow, boolean pHasFocus)
+			public Component getTreeCellRendererComponent( JTree pTree, Object pValue, boolean pIsSelected, boolean pIsExpanded, boolean pIsLeaf, int pRow, boolean pHasFocus )
 			{
-				super.getTreeCellRendererComponent(pTree, pValue, pIsSelected, pIsExpanded, pIsLeaf, pRow, pHasFocus);
+				super.getTreeCellRendererComponent( pTree, pValue, pIsSelected, pIsExpanded, pIsLeaf, pRow, pHasFocus );
-				boolean highlight= false;
+				boolean highlight = false;
 				Color highColor = null;
 				Color lowColor = null;
 				if( pValue instanceof RiscoRelatorioNode )
 				{
-					Object userObject = ((RiscoRelatorioNode)pValue).getUserObject();
+					Object userObject = ((RiscoRelatorioNode) pValue).getUserObject();
 					if( userObject instanceof HsRelatorioPostoRisco )
 					{
 						highlight = HigieneSegurancaLogic.isRelatorioRiscoPreenchido( (HsRelatorioPostoRisco) userObject );
@@ -90,7 +91,7 @@ public class GerirMedidasRelatorioPanel extends JPanel
 				}
 				else if( pValue instanceof MedidaRelatorioNode )
 				{
-					Object userObject = ((MedidaRelatorioNode)pValue).getUserObject();
+					Object userObject = ((MedidaRelatorioNode) pValue).getUserObject();
 					if( userObject instanceof HsRelatorioPostoMedida )
 					{
 						HsRelatorioPostoMedida medida = (HsRelatorioPostoMedida) userObject;
@@ -111,17 +112,18 @@ public class GerirMedidasRelatorioPanel extends JPanel
 				{
 					setOpaque( false );
 				}
-			    return(this);
+				return (this);
 			}
-			});
+		} );
 	}
 
 	private void setupLayout()
 	{
-		TableLayout layout = new TableLayout(
+		TableLayout layout = new TableLayout( new double[] {
-				new double[]{ TableLayout.FILL },
+			TableLayout.FILL
-				new double[]{ TableLayout.MINIMUM, TableLayout.FILL }
+		}, new double[] {
-				);
+				TableLayout.MINIMUM, TableLayout.FILL
+		} );
 		layout.setHGap( 5 );
 		layout.setVGap( 5 );
 		setLayout( layout );
@@ -130,10 +132,11 @@ public class GerirMedidasRelatorioPanel extends JPanel
 	private void placeComponents()
 	{
 		JPanel panel = new JPanel();
-		TableLayout layout = new TableLayout(
+		TableLayout layout = new TableLayout( new double[] {
-				new double[]{ TableLayout.MINIMUM, TableLayout.FILL, TableLayout.MINIMUM },
+				TableLayout.MINIMUM, TableLayout.FILL, TableLayout.MINIMUM
-				new double[]{ TableLayout.MINIMUM }
+		}, new double[] {
-				);
+			TableLayout.MINIMUM
+		} );
 		layout.setHGap( 5 );
 		layout.setVGap( 5 );
 		panel.setLayout( layout );
@@ -146,7 +149,8 @@ public class GerirMedidasRelatorioPanel extends JPanel
 
 	private void startupListeners()
 	{
-		tree.getSelectionModel().addTreeSelectionListener( new TreeSelectionListener(){
+		tree.getSelectionModel().addTreeSelectionListener( new TreeSelectionListener()
+		{
 			@Override
 			public void valueChanged( TreeSelectionEvent e )
 			{
@@ -157,12 +161,12 @@ public class GerirMedidasRelatorioPanel extends JPanel
 					Object selection = path.getLastPathComponent();
 					if( selection instanceof RiscoRelatorioNode )
 					{
-						object = selection == null ? null : ((RiscoRelatorioNode)selection).getUserObject();
+						object = selection == null ? null : ((RiscoRelatorioNode) selection).getUserObject();
 
 					}
 					else if( selection instanceof MedidaRelatorioNode )
 					{
-						object = selection == null ? null : ((MedidaRelatorioNode)selection).getUserObject();
+						object = selection == null ? null : ((MedidaRelatorioNode) selection).getUserObject();
 					}
 				}
 				setEnabled();
@@ -202,7 +206,7 @@ public class GerirMedidasRelatorioPanel extends JPanel
 			Object selection = path.getLastPathComponent();
 			if( selection instanceof RiscoRelatorioNode )
 			{
-				result = selection == null ? null : (HsRelatorioPostoRisco) ((RiscoRelatorioNode)selection).getUserObject();
+				result = selection == null ? null : (HsRelatorioPostoRisco) ((RiscoRelatorioNode) selection).getUserObject();
 			}
 		}
 		return result;
@@ -217,13 +221,15 @@ public class GerirMedidasRelatorioPanel extends JPanel
 			Object selection = path.getLastPathComponent();
 			if( selection instanceof MedidaRelatorioNode )
 			{
-				result = selection == null ? null : (HsRelatorioPostoMedida) ((MedidaRelatorioNode)selection).getUserObject();
+				result = selection == null ? null : (HsRelatorioPostoMedida) ((MedidaRelatorioNode) selection).getUserObject();
 			}
 		}
 		return result;
 	}
 
 	private void add()
+	{
+		try
 		{
 			HsRelatorioPostoRisco postoRisco = getSelectedRisco();
 			if( posto != null )
@@ -239,9 +245,15 @@ public class GerirMedidasRelatorioPanel extends JPanel
 			}
 			refresh();
 			setEnabled();
+		} catch( Exception e )
+		{
+			LeafError.error( e );
+		}
 	}
 
 	private void rem()
+	{
+		try
 		{
 			TreePath path = tree.getSelectionPath();
 			if( path != null )
@@ -249,20 +261,24 @@ public class GerirMedidasRelatorioPanel extends JPanel
 				Object selection = path.getLastPathComponent();
 				if( selection instanceof MedidaRelatorioNode )
 				{
-				HsRelatorioPostoMedida rel = selection == null ? null : (HsRelatorioPostoMedida) ((MedidaRelatorioNode)selection).getUserObject();
+					HsRelatorioPostoMedida rel = selection == null ? null : (HsRelatorioPostoMedida) ((MedidaRelatorioNode) selection).getUserObject();
 					rel.getToHsRelatorioMedida().delete();
 					rel.delete();
 				}
 			}
 			refresh();
 			setEnabled();
+		} catch( Exception e )
+		{
+			LeafError.error( e );
+		}
 	}
 
 	private void setEnabled()
 	{
 		boolean add = false;
 		boolean rem = false;
-		if( posto!= null )
+		if( posto != null )
 		{
 			if( posto.getToHsRelatorioArea() != null && posto.getToHsRelatorioArea().getToHsRelatorio() != null && posto.getToHsRelatorioArea().getToHsRelatorio().getIsSubmetido() == null )
 			{
@@ -287,7 +303,7 @@ public class GerirMedidasRelatorioPanel extends JPanel
 				{
 					for( HsRelatorioPostoMedida medidaRel : medida.getHsRelatorioPostoMedidaArray() )
 					{
-						node.add( new MedidaRelatorioNode(medidaRel) );
+						node.add( new MedidaRelatorioNode( medidaRel ) );
 					}
 				}
 				root.add( node );

trunk/SIPRPSoft/src/siprp/higiene/relatorio/GerirValoresRiscoPanel.java

@@ -1,5 +1,6 @@
 package siprp.higiene.relatorio;
 
+import static com.evolute.utils.strings.UnicodeLatin1Map.aacute;
 import info.clearthought.layout.TableLayout;
 import info.clearthought.layout.TableLayoutConstraints;
 
@@ -18,13 +19,12 @@ import javax.swing.event.CaretEvent;
 import javax.swing.event.CaretListener;
 
 import leaf.ui.LeafButton;
+import leaf.ui.LeafError;
 import leaf.ui.LeafIconButton;
 import siprp.database.cayenne.objects.HsRelatorioPostoRisco;
 import siprp.database.cayenne.objects.HsRelatorioRiscoValorQualitativo;
 import siprp.logic.HigieneSegurancaLogic;
 
-import static com.evolute.utils.strings.UnicodeLatin1Map.*;
-
 public class GerirValoresRiscoPanel extends JPanel implements ActionListener, CaretListener
 {
 
@@ -247,6 +247,8 @@ public class GerirValoresRiscoPanel extends JPanel implements ActionListener, Ca
 	}
 
 	private void save()
+	{
+		try
 		{
 			if( valoresRisco != null )
 			{
@@ -269,9 +271,9 @@ public class GerirValoresRiscoPanel extends JPanel implements ActionListener, Ca
 						{
 							ok = false;
 						}
-					if(!ok || !HigieneSegurancaLogic.isProbabilidadeValida( probabilidade ) )
+						if( !ok || !HigieneSegurancaLogic.isProbabilidadeValida( probabilidade ) )
 						{
-						error(true);
+							error( true );
 						}
 					}
 					if( textSeveridade.getText() != null && !textSeveridade.getText().trim().equals( "" ) )
@@ -285,9 +287,9 @@ public class GerirValoresRiscoPanel extends JPanel implements ActionListener, Ca
 							{
 								ok = false;
 							}
-						if(!ok || !HigieneSegurancaLogic.isSeveridadeValida( severidade ) )
+							if( !ok || !HigieneSegurancaLogic.isSeveridadeValida( severidade ) )
 							{
-							error(false);
+								error( false );
 							}
 						}
 					}
@@ -302,6 +304,10 @@ public class GerirValoresRiscoPanel extends JPanel implements ActionListener, Ca
 				refresh();
 				setEnabled();
 			}
+		} catch( Exception e )
+		{
+			LeafError.error( e );
+		}
 	}
 
 	@Override

trunk/SIPRPSoft/src/siprp/higiene/relatorio/PanelRelatorio.java

@@ -30,6 +30,7 @@ import javax.swing.event.CaretListener;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
+import leaf.ui.LeafError;
 import leaf.ui.LeafIconButton;
 import siprp.database.cayenne.objects.HsRelatorio;
 import siprp.database.cayenne.objects.MarcacoesEstabelecimento;
@@ -221,6 +222,8 @@ public class PanelRelatorio extends JPanel implements CaretListener, ChangeListe
 	}
 	
 	private void submit()
+	{
+		try
 		{
 			if( relatorio != null )
 			{
@@ -229,23 +232,29 @@ public class PanelRelatorio extends JPanel implements CaretListener, ChangeListe
 				refresh();
 				setRelatorio( relatorio, false );
 			}
+		} catch( Exception e )
+		{
+			LeafError.error(e);
+		}
 	}
 	
 	private void save()
+	{
+		try
 		{
 			if( relatorio != null )
 			{
 				relatorio.setData( dataRelatorio.getDate() );
 				relatorio.setAvaliacaoInicial( radioInicial.isSelected() );
-//			MarcacoesEstabelecimento marcacao = relatorio.getToHsMarcacoesEstabelecimento();
+	//			MarcacoesEstabelecimento marcacao = relatorio.getToHsMarcacoesEstabelecimento();
-//			if( marcacao != null )
+	//			if( marcacao != null )
-//			{
+	//			{
-//				MarcacoesTecnicosHst tecnico = marcacao.getToMarcacoesTecnicosHst();
+	//				MarcacoesTecnicosHst tecnico = marcacao.getToMarcacoesTecnicosHst();
-//				if( tecnico != null )
+	//				if( tecnico != null )
-//				{
+	//				{
-//					tecnico.setNome( fieldTecnico.getText() );
+	//					tecnico.setNome( fieldTecnico.getText() );
-//				}
+	//				}
-//			}
+	//			}
 			}
 			relatorio.setAcompanhante1( fieldNome1.getText() );
 			relatorio.setAcompanhante2( fieldNome2.getText() );
@@ -258,6 +267,10 @@ public class PanelRelatorio extends JPanel implements CaretListener, ChangeListe
 			refresh();
 			buttonRevert.setEnabled( false );
 			buttonSave.setEnabled( false );
+		} catch( Exception e )
+		{
+			LeafError.error(e);
+		}
 	}
 	
 	private void revert()

trunk/SIPRPSoft/src/siprp/higiene/relatorio/RelatorioHigieneSegurancaWindow.java

@@ -19,6 +19,7 @@ import javax.swing.JFrame;
 import javax.swing.JLabel;
 import javax.swing.SwingUtilities;
 
+import leaf.ui.LeafError;
 import siprp.database.cayenne.objects.Empresas;
 import siprp.database.cayenne.objects.Estabelecimentos;
 import siprp.database.cayenne.objects.HsRelatorio;
@@ -159,6 +160,8 @@ public class RelatorioHigieneSegurancaWindow extends JFrame implements Trackable
 	}
 	
 	private void fillRelatorio( MarcacoesEstabelecimento visita )
+	{
+		try
 		{
 			boolean carregarDadosEstabelecimento = false;
 			panelRelatorio.setRelatorio( null, carregarDadosEstabelecimento );
@@ -186,6 +189,10 @@ public class RelatorioHigieneSegurancaWindow extends JFrame implements Trackable
 				}
 				panelRelatorio.setRelatorio( relatorio, carregarDadosEstabelecimento );;
 			}
+		} catch( Exception e )
+		{
+			LeafError.error(e);
+		}
 	}
 	
 	@Override

trunk/SIPRPSoft/src/siprp/medicina/exames/logic/RecepcaoExamesLogic.java

@@ -1,57 +1,62 @@
 package siprp.medicina.exames.logic;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
+import leaf.ui.LeafError;
 import leaf.ui.LeafLogic;
 import siprp.database.cayenne.objects.Prestadores;
 import siprp.database.cayenne.objects.TrabalhadoresEcd;
 import siprp.database.cayenne.providers.MedicinaDAO;
-import siprp.medicina.processo.data.TrabalhadoresEcdData;
 
 public class RecepcaoExamesLogic extends LeafLogic
 {
 
-	@Action(isSave=true)
+	@Action(isSave = true)
 	public final static String ACTION_SELECT_ANALISADOR = "ACTION_SELECT_ANALISADOR";
 
-	@Action(isSave=false)
+	@Action(isSave = false)
 	public final static String ACTION_SELECT_EXAME = "ACTION_SELECT_EXAME";
 
-	@Action(isSave=false)
+	@Action(isSave = false)
 	public final static String ACTION_FILL_EXAMES = "ACTION_FILL_EXAMES";
 
-	@Action(isSave=true)
+	@Action(isSave = true)
 	public final static String ACTION_RECEBER_EXAMES = "ACTION_RECEBER_EXAMES";
 
-	@Action(isSave=false)
+	@Action(isSave = false)
 	public final static String ACTION_SORT = "ACTION_SORT";
 
 	public Prestadores currentAnalisador = null;
 
 	private MedicinaDAO dao = new MedicinaDAO();
 
-	@LeafLogicActionBinding(actions=ACTION_SELECT_ANALISADOR)
+	@LeafLogicActionBinding(actions = ACTION_SELECT_ANALISADOR)
-	public void getExamesForAnalisador(Prestadores analisador)
+	public void getExamesForAnalisador( Prestadores analisador )
 	{
 		currentAnalisador = analisador;
-		if(analisador != null)
+		if( analisador != null )
 		{
-			Collection<TrabalhadoresEcd> result = dao.getPendingExamesForAnalisador(currentAnalisador);
+			Collection<TrabalhadoresEcd> result = dao.getPendingExamesForAnalisador( currentAnalisador );
 			runAction( ACTION_FILL_EXAMES, result );
 		}
 	}
 
-	@LeafLogicActionBinding(actions=ACTION_RECEBER_EXAMES)
+	@LeafLogicActionBinding(actions = ACTION_RECEBER_EXAMES)
-	public void receberExames(List<TrabalhadoresEcd> ecds)
+	public void receberExames( List<TrabalhadoresEcd> ecds )
 	{
-		if(ecds != null)
+		try
+		{
+			if( ecds != null )
 			{
 				for( TrabalhadoresEcd ecd : ecds )
 				{
-				dao.saveObject( ecd );
+					ecd.save();
+				}
 			}
+		} catch( Exception e )
+		{
+			LeafError.error( e );
 		}
 	}
 

trunk/SIPRPSoft/src/siprp/medicina/prestadores/PrestadoresWindow.java

@@ -9,18 +9,8 @@
 
 package siprp.medicina.prestadores;
 
-import com.evolute.utils.Singleton;
+import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil;
-import static com.evolute.utils.strings.UnicodeLatin1Map.*;
+import static com.evolute.utils.strings.UnicodeLatin1Map.otilde;
-import com.evolute.utils.data.IDObject;
-import com.evolute.utils.dataui.ComponentController;
-import com.evolute.utils.dataui.ComponentsHashtable;
-import com.evolute.utils.dataui.JDOControllable;
-import com.evolute.utils.dataui.JTextComponentPlainFillerSaver;
-import com.evolute.utils.jdo.JDOProvider;
-import com.evolute.utils.ui.DialogException;
-import com.evolute.utils.ui.panel.CheckBoxPanel;
-import com.evolute.utils.ui.search.SearchDialog;
-import com.evolute.utils.ui.window.EditorWindow;
 import info.clearthought.layout.TableLayout;
 import info.clearthought.layout.TableLayoutConstraints;
 
@@ -35,6 +25,7 @@ import java.util.Hashtable;
 import java.util.List;
 import java.util.Map;
 import java.util.Vector;
+
 import javax.swing.BorderFactory;
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
@@ -45,6 +36,8 @@ import javax.swing.JSeparator;
 import javax.swing.JTabbedPane;
 import javax.swing.JTextArea;
 import javax.swing.JTextField;
+
+import leaf.ui.LeafError;
 import siprp.clientes.ClientesDataProvider;
 import siprp.clientes.ContactoPanel;
 import siprp.data.ContactoData;
@@ -53,6 +46,18 @@ import siprp.database.cayenne.objects.PrtGruposProtocolo;
 import siprp.database.cayenne.providers.MedicinaDAO;
 import siprp.medicina.prestadores.data.PrestadoresData;
 
+import com.evolute.utils.Singleton;
+import com.evolute.utils.data.IDObject;
+import com.evolute.utils.dataui.ComponentController;
+import com.evolute.utils.dataui.ComponentsHashtable;
+import com.evolute.utils.dataui.JDOControllable;
+import com.evolute.utils.dataui.JTextComponentPlainFillerSaver;
+import com.evolute.utils.jdo.JDOProvider;
+import com.evolute.utils.ui.DialogException;
+import com.evolute.utils.ui.panel.CheckBoxPanel;
+import com.evolute.utils.ui.search.SearchDialog;
+import com.evolute.utils.ui.window.EditorWindow;
+
 /**
  * 
  * @author fpalma
@@ -75,7 +80,7 @@ public class PrestadoresWindow extends EditorWindow
 	protected ContactoPanel contactoPanel;
 	protected JTextField contribuinteText;
 
-	private final JLabel labelObservacoes = new JLabel("Observa"+ccedil+otilde+"es");
+	private final JLabel labelObservacoes = new JLabel( "Observa" + ccedil + otilde + "es" );
 	private final JTextArea textObservacoes = new JTextArea();
 
 	protected PrestadoresDataProvider provider;
@@ -119,13 +124,13 @@ public class PrestadoresWindow extends EditorWindow
 	private void setupComponents()
 	{
 		setTitle( TITLE );
-		setSize( 800, 600);
+		setSize( 800, 600 );
 		tabbedPane.addTab( "Prestadores", prestadoresPanel );
 		tabbedPane.addTab( "Analisadores", analisadoresPanel );
 
 		setupAnalisadoresTab();
 		setupPrestadoresTab();
-//		pack();
+		// pack();
 	}
 
 	private void setupPrestadoresTab()
@@ -175,17 +180,7 @@ public class PrestadoresWindow extends EditorWindow
 					TableLayout.MINIMUM, TableLayout.PREFERRED, TableLayout.PREFERRED, TableLayout.FILL
 			};
 			double rows[] = new double[] {
-					TableLayout.MINIMUM,
+					TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.FILL, TableLayout.PREFERRED, TableLayout.PREFERRED, TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.MINIMUM, TableLayout.FILL
-					TableLayout.MINIMUM,
-					TableLayout.MINIMUM,
-					TableLayout.FILL,
-					TableLayout.PREFERRED,
-					TableLayout.PREFERRED,
-					TableLayout.MINIMUM,
-					TableLayout.MINIMUM,
-					TableLayout.MINIMUM,
-					TableLayout.MINIMUM,
-					TableLayout.FILL
 			};
 			TableLayout tableLayout = new TableLayout( cols, rows );
 			prestadoresPanel.setLayout( tableLayout );
@@ -216,7 +211,7 @@ public class PrestadoresWindow extends EditorWindow
 			prestadoresPanel.add( contribuinteLabel, new TableLayoutConstraints( 0, 8 ) );
 			prestadoresPanel.add( contribuinteText, new TableLayoutConstraints( 1, 8 ) );
 			prestadoresPanel.add( labelObservacoes, new TableLayoutConstraints( 0, 9 ) );
-			prestadoresPanel.add( textObservacoes, new TableLayoutConstraints( 0, 10,3,10 ) );
+			prestadoresPanel.add( textObservacoes, new TableLayoutConstraints( 0, 10, 3, 10 ) );
 		} catch( Exception e )
 		{
 			e.printStackTrace();
@@ -413,6 +408,8 @@ public class PrestadoresWindow extends EditorWindow
 
 			@Override
 			public void itemStateChanged( ItemEvent itemEvent )
+			{
+				try
 				{
 					if( ItemEvent.SELECTED == itemEvent.getStateChange() )
 					{
@@ -423,11 +420,15 @@ public class PrestadoresWindow extends EditorWindow
 							{
 								Prestadores analisador = (Prestadores) combo.getSelectedItem();
 								grupo.setToAnalisador( Prestadores.prestadorNulo.equals( analisador ) ? null : analisador );
-							medicinaCayenneDAO.saveObject( grupo );
+								grupo.save();
 								shout( "Tipo de ECD: " + grupo.getDescricao() + " -> Analisador: " + analisador.getNome() + " [guardado]" );
 							}
 						}
 					}
+				} catch( Exception e )
+				{
+					LeafError.error( e );
+				}
 			}
 
 		} );

trunk/SIPRPSoft/src/siprp/medicina/processo/logic/MedicinaProcessoLogic.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 
+import leaf.ui.LeafError;
 import leaf.ui.LeafLogic;
 import leaf.ui.LeafWindow.LeafObject;
 import siprp.MedicinaConstants;
@@ -225,7 +226,9 @@ public class MedicinaProcessoLogic extends LeafLogic
 	})
 	public TrabalhadoresConsultas currentConsulta = null;
 
-	@LeafObject(useWith = { SAVE_CONSULTA_MARCACAO, APAGAR_CONSULTA_MARCACAO } )
+	@LeafObject(useWith = {
+			SAVE_CONSULTA_MARCACAO, APAGAR_CONSULTA_MARCACAO
+	})
 	public TrabalhadoresConsultasDatas currentConsultaMarcacao = null;
 
 	@LeafObject(useWith = SAVE_CONSULTA_MARCACAO_EMAIL)
@@ -603,6 +606,8 @@ public class MedicinaProcessoLogic extends LeafLogic
 				{
 					@Override
 					public void exameSaved( Integer trabalhadorID, Integer exameID )
+					{
+						try
 						{
 							if( trabalhadorID != null && exameID != null )
 							{
@@ -613,11 +618,15 @@ public class MedicinaProcessoLogic extends LeafLogic
 									if( exame != null )
 									{
 										currentFicha.setToExames( exame );
-									provider.saveObject( currentFicha );
+										currentFicha.save();
 										runAction( REFRESH );
 									}
 								}
 							}
+						} catch( Exception e )
+						{
+							LeafError.error( e );
+						}
 					}
 				} );
 			}
@@ -635,15 +644,15 @@ public class MedicinaProcessoLogic extends LeafLogic
 			List<TrabalhadoresConsultas> consultas = currentProcesso.getTrabalhadoresConsultasArray();
 			for( TrabalhadoresConsultas consulta : consultas )
 			{
-				if( new Integer(MedicinaConstants.ESTADO_REALIZADO).equals( consulta.getEstado() ))
+				if( new Integer( MedicinaConstants.ESTADO_REALIZADO ).equals( consulta.getEstado() ) )
 				{
 					List<TrabalhadoresConsultasDatas> marcacoes = consulta.getTrabalhadoresConsultasDatasArray();
 					for( TrabalhadoresConsultasDatas marcacao : marcacoes )
 					{
-						if( new Integer(MedicinaConstants.ESTADO_REALIZADO).equals( marcacao.getEstado() ))
+						if( new Integer( MedicinaConstants.ESTADO_REALIZADO ).equals( marcacao.getEstado() ) )
 						{
 							Date marcacaoDate = marcacao.getData();
-							if( marcacaoDate != null && (result == null || result.before( marcacaoDate ) ) )
+							if( marcacaoDate != null && (result == null || result.before( marcacaoDate )) )
 							{
 								result = marcacaoDate;
 							}
@@ -784,8 +793,14 @@ public class MedicinaProcessoLogic extends LeafLogic
 	})
 	public void saveObject( BaseObject object )
 	{
-		provider.saveObject( object );
+		try
+		{
+			object.save();
 			runActionLater( REFRESH );
+		} catch( Exception e )
+		{
+			LeafError.error(e);
+		}
 	}
 
 	@LeafLogicActionBinding(actions = {
@@ -805,6 +820,8 @@ public class MedicinaProcessoLogic extends LeafLogic
 	}
 
 	private void apagarConsulta( TrabalhadoresConsultas consulta )
+	{
+		try
 		{
 			List<TrabalhadoresConsultasDatas> marcacoes = consulta.getTrabalhadoresConsultasDatasArray();
 			if( marcacoes != null )
@@ -816,7 +833,7 @@ public class MedicinaProcessoLogic extends LeafLogic
 					{
 						for( TrabalhadoresConsultasDatasEmails email : emails )
 						{
-						provider.deleteObject( email );
+							email.delete();
 						}
 					}
 					List<TrabalhadoresConsultasDatasObservacoes> observacoes = marcacao.getTrabalhadoresConsultasDatasObservacoesArray();
@@ -824,16 +841,22 @@ public class MedicinaProcessoLogic extends LeafLogic
 					{
 						for( TrabalhadoresConsultasDatasObservacoes observacao : observacoes )
 						{
-						provider.deleteObject( observacao );
+							observacao.delete();
 						}
 					}
-				provider.deleteObject( marcacao );
+					marcacao.delete();
 				}
-			provider.deleteObject( consulta );
+				consulta.delete();
+			}
+		} catch( Exception e )
+		{
+			LeafError.error(e);
 		}
 	}
 
 	private void apagarExame( TrabalhadoresEcds exame )
+	{
+		try
 		{
 			List<TrabalhadoresEcdsDatas> marcacoes = exame.getTrabalhadoresEcdsDatasArray();
 			if( marcacoes != null )
@@ -845,7 +868,7 @@ public class MedicinaProcessoLogic extends LeafLogic
 					{
 						for( TrabalhadoresEcd ecd : ecds )
 						{
-						provider.deleteObject( ecd );
+							ecd.delete();
 						}
 					}
 					List<TrabalhadoresEcdsDatasEmails> emails = marcacao.getTrabalhadoresEcdsDatasEmailsArray();
@@ -853,7 +876,7 @@ public class MedicinaProcessoLogic extends LeafLogic
 					{
 						for( TrabalhadoresEcdsDatasEmails email : emails )
 						{
-						provider.deleteObject( email );
+							email.delete();
 						}
 					}
 					List<TrabalhadoresEcdsDatasObservacoes> observacoes = marcacao.getTrabalhadoresEcdsDatasObservacoesArray();
@@ -861,12 +884,16 @@ public class MedicinaProcessoLogic extends LeafLogic
 					{
 						for( TrabalhadoresEcdsDatasObservacoes observacao : observacoes )
 						{
-						provider.deleteObject( observacao );
+							observacao.delete();
+						}
 					}
+					marcacao.delete();
 				}
-				provider.deleteObject( marcacao );
+				exame.delete();
 			}
-			provider.deleteObject( exame );
+		} catch( Exception e )
+		{
+			LeafError.error(e);
 		}
 	}
 

trunk/common/src/SIPRPMap.map.xml

@@ -1864,6 +1864,7 @@
 	<obj-relationship name="hsPostoRiscoArray" source="HsRelatorioRiscoValorQualitativo" target="HsPostoRisco" db-relationship-path="hsPostoRiscoArray"/>
 	<obj-relationship name="hsRelatorioPostoRiscoArray" source="HsRelatorioRiscoValorQualitativo" target="HsRelatorioPostoRisco" db-relationship-path="hsRelatorioPostoRiscoArray"/>
 	<obj-relationship name="hsPostoRiscoArray" source="HsRisco" target="HsPostoRisco" deleteRule="Cascade" db-relationship-path="hsPostoRiscoArray"/>
+	<obj-relationship name="hsRiscoEmpresaArray" source="HsRisco" target="HsRiscoEmpresa" deleteRule="Cascade" db-relationship-path="hsRiscoEmpresaArray"/>
 	<obj-relationship name="hsRiscoMedidaArray" source="HsRisco" target="HsRiscoMedida" deleteRule="Cascade" db-relationship-path="hsRiscoMedidaArray"/>
 	<obj-relationship name="toHsRiscoTema" source="HsRisco" target="HsRiscoTema" deleteRule="Nullify" db-relationship-path="toHsRiscoTema"/>
 	<obj-relationship name="toEmpresa" source="HsRiscoEmpresa" target="Empresas" deleteRule="Nullify" db-relationship-path="toEmpresa"/>

trunk/common/src/leaf/ui/LeafError.java

@@ -0,0 +1,20 @@
+package leaf.ui;
+
+import javax.swing.JOptionPane;
+
+import com.evolute.utils.error.ErrorLogger;
+
+public class LeafError
+{
+	
+	public static void error( Throwable e )
+	{
+		if( e != null )
+		{
+			ErrorLogger.logException( e );
+			e.printStackTrace(System.out);
+			JOptionPane.showMessageDialog( null, "Detalhes: \n"+e.getMessage(), "Erro!", JOptionPane.ERROR_MESSAGE );
+		}
+	}
+	
+}

trunk/common/src/leaf/ui/TreeInserterDialog.java

@@ -29,9 +29,9 @@ public class TreeInserterDialog extends JDialog
 
 	private static final long serialVersionUID = 1L;
 	
-	private static final Dimension allDimension = new Dimension(300,500);
+	private static final Dimension ALL_DIMENSION = new Dimension(300,500);
 	
-	private static final Dimension newDimension = new Dimension(300,400);
+	private static final Dimension NEW_DIMENSION = new Dimension(300,400);
 	
 	private static final String ICON_NAME_ADD = "leaf/ui/icons/add.png";
 	
@@ -98,12 +98,12 @@ public class TreeInserterDialog extends JDialog
 		allScroll.setHorizontalScrollBarPolicy( JScrollPane.HORIZONTAL_SCROLLBAR_NEVER );
 		newScroll.setVerticalScrollBarPolicy( JScrollPane.VERTICAL_SCROLLBAR_ALWAYS );
 		newScroll.setHorizontalScrollBarPolicy( JScrollPane.HORIZONTAL_SCROLLBAR_NEVER );
-		allScroll.setPreferredSize( allDimension );
+		allScroll.setPreferredSize( ALL_DIMENSION );
-		newScroll.setPreferredSize( newDimension );
+		newScroll.setPreferredSize( NEW_DIMENSION );
 		buttonAdd.setToolTipText( "Adicionar" );
 		buttonRemove.setToolTipText( "Remover" );
-		buttonAdd.setMargin( new Insets(4,4,4,4) );
+		buttonAdd.setMargin( new Insets(0,0,0,0) );
-		buttonRemove.setMargin( new Insets(4,4,4,4) );
+		buttonRemove.setMargin( new Insets(0,0,0,0) );
 	}
 	
 	private void setupLayout()

trunk/common/src/siprp/database/cayenne/objects/BaseObject.java

@@ -6,7 +6,7 @@ import java.util.Locale;
 import org.apache.cayenne.CayenneDataObject;
 import org.apache.cayenne.PersistenceState;
 
-import siprp.database.cayenne.providers.MedicinaDAO;
+import siprp.database.cayenne.providers.MainDAO;
 
 import com.evolute.utils.strings.UnicodeChecker;
 
@@ -19,7 +19,7 @@ public class BaseObject extends CayenneDataObject
 	
 	private static final long serialVersionUID = 1L;
 	
-	protected static MedicinaDAO medicinaProvider = new MedicinaDAO();
+	protected static MainDAO dao = new MainDAO();
 	
 	protected static final DateFormat sdf = DateFormat.getDateInstance( DateFormat.SHORT, new Locale( "pt", "PT" ) );
 
@@ -45,16 +45,29 @@ public class BaseObject extends CayenneDataObject
 		return getPersistenceState() == PersistenceState.MODIFIED;
 	}
 	
-	public void save()
+	public void commit()
 	{
-		medicinaProvider.saveObject( this );
+		dao.commit();
-		medicinaProvider.commit();
 	}
 	
-	public void delete()
+	public void rollback()
 	{
-		medicinaProvider.deleteObject( this );
+		dao.rollback();
-		medicinaProvider.commit();
+	}
+	
+	public void save() throws Exception
+	{
+		if( isTransient() )
+		{
+			dao.getContext().registerNewObject( this );
+		}
+		commit();
+	}
+	
+	public void delete() throws Exception
+	{
+		dao.getContext().deleteObject( this );
+		commit();
 	}
 	
 	protected String parseToUnicode( String string )

trunk/common/src/siprp/database/cayenne/objects/HsRiscoMedida.java

@@ -8,7 +8,7 @@ public class HsRiscoMedida extends _HsRiscoMedida {
 	@Override
 	public String toString()
 	{
-		String d = getToHsMedida().getRequesitosLegais();
+		String d = getToHsMedida() == null ? null : getToHsMedida().getRequesitosLegais();
 		return d == null ? " " : d.substring( 0, Math.min( 20, d.length() ) ) + "...";
 	}
 }

trunk/common/src/siprp/database/cayenne/objects/Prestadores.java

@@ -3,8 +3,7 @@ package siprp.database.cayenne.objects;
 import java.util.List;
 
 import siprp.database.cayenne.objects.auto._Prestadores;
-
+import siprp.database.cayenne.providers.MedicinaDAO;
-import com.evolute.utils.strings.UnicodeChecker;
 
 public class Prestadores extends _Prestadores {
 
@@ -59,7 +58,7 @@ public class Prestadores extends _Prestadores {
 	
 	public static List<Prestadores> getAllPrestadores()
 	{
-		List<Prestadores> result = medicinaProvider.getAllPrestadores();
+		List<Prestadores> result = new MedicinaDAO().getAllPrestadores();
 		result.add( 0, prestadorNulo);
 		return result;
 	}

trunk/common/src/siprp/database/cayenne/objects/auto/_HsRisco.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import siprp.database.cayenne.objects.BaseObject;
 import siprp.database.cayenne.objects.HsPostoRisco;
+import siprp.database.cayenne.objects.HsRiscoEmpresa;
 import siprp.database.cayenne.objects.HsRiscoMedida;
 import siprp.database.cayenne.objects.HsRiscoTema;
 
@@ -19,6 +20,7 @@ public abstract class _HsRisco extends BaseObject {
     public static final String DELETED_DATE_PROPERTY = "deletedDate";
     public static final String DESCRIPTION_PROPERTY = "description";
     public static final String HS_POSTO_RISCO_ARRAY_PROPERTY = "hsPostoRiscoArray";
+    public static final String HS_RISCO_EMPRESA_ARRAY_PROPERTY = "hsRiscoEmpresaArray";
     public static final String HS_RISCO_MEDIDA_ARRAY_PROPERTY = "hsRiscoMedidaArray";
     public static final String TO_HS_RISCO_TEMA_PROPERTY = "toHsRiscoTema";
 
@@ -50,6 +52,18 @@ public abstract class _HsRisco extends BaseObject {
     }
 
 
+    public void addToHsRiscoEmpresaArray(HsRiscoEmpresa obj) {
+        addToManyTarget("hsRiscoEmpresaArray", obj, true);
+    }
+    public void removeFromHsRiscoEmpresaArray(HsRiscoEmpresa obj) {
+        removeToManyTarget("hsRiscoEmpresaArray", obj, true);
+    }
+    @SuppressWarnings("unchecked")
+    public List<HsRiscoEmpresa> getHsRiscoEmpresaArray() {
+        return (List<HsRiscoEmpresa>)readProperty("hsRiscoEmpresaArray");
+    }
+
+
     public void addToHsRiscoMedidaArray(HsRiscoMedida obj) {
         addToManyTarget("hsRiscoMedidaArray", obj, true);
     }

trunk/common/src/siprp/database/cayenne/providers/MainDAO.java

@@ -2,8 +2,6 @@ package siprp.database.cayenne.providers;
 
 import org.apache.cayenne.access.DataContext;
 
-import siprp.database.cayenne.objects.BaseObject;
-
 public class MainDAO
 {
 	protected static DataContext context = null;
@@ -21,31 +19,15 @@ public class MainDAO
 		context.commitChanges();
 	}
 	
-	public BaseObject saveObject( BaseObject object )
+	public void rollback()
-	{
-		if( object != null )
-		{
-			if( object.isTransient() )
 	{
-				context.registerNewObject( object );
+		context.rollbackChanges();
-			}
+		context.unregisterObjects( context.uncommittedObjects() );
-			context.commitChanges();
-		}
-		return object;
 	}
 	
-	public void deleteObject( BaseObject object )
+	public DataContext getContext()
 	{
-		if( object != null )
+		return context;
-		{
-			context.deleteObject( object );
-			context.commitChanges();
-		}
 	}
 	
-	public void rollback()
-	{
-		context.rollbackChanges();
-		context.unregisterObjects( context.uncommittedObjects() );
-	}
 }

trunk/common/src/siprp/database/cayenne/providers/PlanoActuacaoDAO.java

@@ -40,6 +40,7 @@ public class PlanoActuacaoDAO extends MainDAO
 	{
 		SelectQuery query = new SelectQuery( HsRiscoTema.class );
 		query.andQualifier( ExpressionFactory.matchExp( HsRiscoTema.DELETED_DATE_PROPERTY, null ) );
+		query.addOrdering( HsRiscoTema.DESCRIPTION_PROPERTY, true );
 		return context.performQuery( query );
 	}
 

trunk/common/src/siprp/logic/HigieneSegurancaLogic.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 
+import leaf.ui.LeafError;
 import leaf.ui.TreeTools;
 import siprp.database.cayenne.objects.Empresas;
 import siprp.database.cayenne.objects.Estabelecimentos;
@@ -168,6 +169,8 @@ public class HigieneSegurancaLogic
 	}
 
 	public static void reverterRelatorio( HsRelatorio relatorio )
+	{
+		try
 		{
 			if(relatorio != null)
 			{
@@ -186,6 +189,10 @@ public class HigieneSegurancaLogic
 						relatorio.save();
 					}
 			}
+		} catch( Exception e )
+		{
+			LeafError.error(e);
+		}
 	}
 	
 	private static void reverterPostos( HsRelatorio relatorio, List<HsPostoEstabelecimento> postos )