From 2eac072f8719af2747bc26f14349d0d876e420e9 Mon Sep 17 00:00:00 2001 From: Diogo Neves Date: Fri, 16 Jul 2010 18:28:51 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@1314 bb69d46d-e84e-40c8-a05a-06db0d633741 --- trunk/SIPRPSoft/src/siprp/data/Marcacao.java | 15 +++++++++------ .../src/siprp/medicina/MedicinaWindow.java | 2 +- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/trunk/SIPRPSoft/src/siprp/data/Marcacao.java b/trunk/SIPRPSoft/src/siprp/data/Marcacao.java index fa24c674..37f5ff99 100644 --- a/trunk/SIPRPSoft/src/siprp/data/Marcacao.java +++ b/trunk/SIPRPSoft/src/siprp/data/Marcacao.java @@ -332,20 +332,23 @@ public abstract class Marcacao extends BaseObject implements ColumnizedObject protected boolean preDelete( Marcacao object ) throws EvoDataException { + boolean result = false; try { - if( object instanceof MarcacoesTrabalhadorData && - ( ( Integer ) object.get( MarcacoesTrabalhadorData.TIPO ) ).intValue() == MarcacoesTrabalhadorData.TIPO_EXAMES ) + if( object instanceof MarcacoesTrabalhadorData ) { - ((MedicinaDataProvider)MedicinaDataProvider.getProvider()).deleteDetalhesRealizadosForMarcacao( ( Integer ) object.get( MarcacoesTrabalhadorData.ID ) ); - return true; + if ( ( ( Integer ) object.get( MarcacoesTrabalhadorData.TIPO ) ).intValue() == MarcacoesTrabalhadorData.TIPO_EXAMES ) + { + ((MedicinaDataProvider)MedicinaDataProvider.getProvider()).deleteDetalhesRealizadosForMarcacao( ( Integer ) object.get( MarcacoesTrabalhadorData.ID ) ); + } + result = true; } } - catch (Exception e) + catch ( Exception e ) { throw new EvoDataException( e ); } - return false; + return result; } protected boolean postDelete( Marcacao object ) diff --git a/trunk/SIPRPSoft/src/siprp/medicina/MedicinaWindow.java b/trunk/SIPRPSoft/src/siprp/medicina/MedicinaWindow.java index 46c47eca..da0bfcee 100644 --- a/trunk/SIPRPSoft/src/siprp/medicina/MedicinaWindow.java +++ b/trunk/SIPRPSoft/src/siprp/medicina/MedicinaWindow.java @@ -307,7 +307,7 @@ public class MedicinaWindow extends SIPRPTabbedWindow { int option = JOptionPane.showConfirmDialog( this, "Tem a certeza que quer apagar a marca\u00e7\u00e3o?", "Apagar", JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE ); - if( option == 0 ) + if( option == JOptionPane.OK_OPTION ) { switch( index ) {