diff --git a/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java b/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java index 94e6a1e7..def9f742 100644 --- a/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java +++ b/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java @@ -129,12 +129,7 @@ public class SIPRPTracker extends WindowTracker public TrackableWindow create() throws Exception { - if( clientesWindow == null ) - { - clientesWindow = new ClientesWindow( avisos ); - clientesWindow.setTracker( SIPRPTracker.this ); - } - return clientesWindow; + return getClientesWindow(); } } ); @@ -167,12 +162,7 @@ public class SIPRPTracker extends WindowTracker public TrackableWindow create() throws Exception { - if( medicinaWindow == null ) - { - medicinaWindow = new MedicinaWindow(); - medicinaWindow.setTracker( SIPRPTracker.this ); - } - return medicinaWindow; + return getMedicinaWindow(); } } ); @@ -230,12 +220,7 @@ public class SIPRPTracker extends WindowTracker public TrackableWindow create() throws Exception { - if( higieneWindow == null ) - { - higieneWindow = new MarcacoesHigieneWindow(); - higieneWindow.setTracker( SIPRPTracker.this ); - } - return higieneWindow; + return getHigieneWindow(); } } ); @@ -293,13 +278,23 @@ public class SIPRPTracker extends WindowTracker setCreators( creators ); } - public ClientesWindow getClientesWindow() + public ClientesWindow getClientesWindow() throws Exception { + if( clientesWindow == null ) + { + clientesWindow = new ClientesWindow( avisos ); + clientesWindow.setTracker( SIPRPTracker.this ); + } return clientesWindow; } - public MedicinaWindow getMedicinaWindow() + public MedicinaWindow getMedicinaWindow() throws Exception { + if( medicinaWindow == null ) + { + medicinaWindow = new MedicinaWindow(); + medicinaWindow.setTracker( SIPRPTracker.this ); + } return medicinaWindow; } @@ -318,8 +313,13 @@ public class SIPRPTracker extends WindowTracker return medicinaProcessoWindow; } - public MarcacoesHigieneWindow getHigieneWindow() + public MarcacoesHigieneWindow getHigieneWindow() throws Exception { + if( higieneWindow == null ) + { + higieneWindow = new MarcacoesHigieneWindow(); + higieneWindow.setTracker( SIPRPTracker.this ); + } return higieneWindow; } diff --git a/trunk/SIPRPSoft/src/siprp/clientes/EstabelecimentoPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/EstabelecimentoPanel.java index c48c7bcb..7661b90a 100644 --- a/trunk/SIPRPSoft/src/siprp/clientes/EstabelecimentoPanel.java +++ b/trunk/SIPRPSoft/src/siprp/clientes/EstabelecimentoPanel.java @@ -47,6 +47,7 @@ import com.evolute.utils.dataui.ComponentController; import com.evolute.utils.dataui.ComponentsHashtable; import com.evolute.utils.dataui.ControllableComponent; import com.evolute.utils.documents.MaximumLengthDocument; +import com.evolute.utils.error.ErrorLogger; import com.evolute.utils.jdo.JDOProvider; import com.evolute.utils.tables.BaseTable; import com.evolute.utils.tables.ColumnizedObject; @@ -517,9 +518,15 @@ public class EstabelecimentoPanel extends JPanel } else { - tracker.getHigieneWindow().setVisible( true ); - tracker.getHigieneWindow().setEmpresaAndEstabelecimento( (Integer) empresa.get( EmpresaData.ID ), - ( Integer ) estabelecimento.get( EstabelecimentoData.ID ) ); + try + { + tracker.getHigieneWindow().setVisible( true ); + tracker.getHigieneWindow().setEmpresaAndEstabelecimento( (Integer) empresa.get( EmpresaData.ID ), + ( Integer ) estabelecimento.get( EstabelecimentoData.ID ) ); + } + catch (Exception ex) { + ErrorLogger.logException(ex); + } } } } diff --git a/trunk/SIPRPSoft/src/siprp/clientes/TrabalhadorPanel.java b/trunk/SIPRPSoft/src/siprp/clientes/TrabalhadorPanel.java index 506a29a1..5a21baea 100644 --- a/trunk/SIPRPSoft/src/siprp/clientes/TrabalhadorPanel.java +++ b/trunk/SIPRPSoft/src/siprp/clientes/TrabalhadorPanel.java @@ -20,6 +20,7 @@ import java.util.*; import com.evolute.utils.data.*; import com.evolute.utils.dataui.*; import com.evolute.utils.date.*; +import com.evolute.utils.error.ErrorLogger; import com.evolute.utils.metadb.*; import com.evolute.utils.tables.*; import com.evolute.utils.ui.*; @@ -504,12 +505,18 @@ public class TrabalhadorPanel extends JPanel } else { - EstabelecimentoData estabelecimento = ( EstabelecimentoData ) trabalhador.get( TrabalhadorData.ESTABELECIMENTO ); - EmpresaData empresa = ( EmpresaData ) estabelecimento.get( EstabelecimentoData.EMPRESA ); - tracker.getMedicinaWindow().setVisible( true ); - tracker.getMedicinaWindow().setEmpresaAndEstabelecimentoAndTrabalhador( (Integer) empresa.get( EmpresaData.ID ), - ( Integer ) estabelecimento.get( EstabelecimentoData.ID ), - ( Integer ) trabalhador.get( TrabalhadorData.ID ) ); + try + { + EstabelecimentoData estabelecimento = ( EstabelecimentoData ) trabalhador.get( TrabalhadorData.ESTABELECIMENTO ); + EmpresaData empresa = ( EmpresaData ) estabelecimento.get( EstabelecimentoData.EMPRESA ); + tracker.getMedicinaWindow().setVisible( true ); + tracker.getMedicinaWindow().setEmpresaAndEstabelecimentoAndTrabalhador( (Integer) empresa.get( EmpresaData.ID ), + ( Integer ) estabelecimento.get( EstabelecimentoData.ID ), + ( Integer ) trabalhador.get( TrabalhadorData.ID ) ); + } + catch (Exception ex) { + ErrorLogger.logException(ex); + } } } }