diff --git a/trunk/SIPRPSoft/lib/shst.jar b/trunk/SIPRPSoft/lib/shst.jar index 65ff8e75..7ef75e26 100644 Binary files a/trunk/SIPRPSoft/lib/shst.jar and b/trunk/SIPRPSoft/lib/shst.jar differ diff --git a/trunk/SIPRPSoft/properties/version.properties b/trunk/SIPRPSoft/properties/version.properties index 36b47dce..5c3e7a7f 100644 --- a/trunk/SIPRPSoft/properties/version.properties +++ b/trunk/SIPRPSoft/properties/version.properties @@ -1,6 +1,6 @@ #siprpsoft versioning file -#Fri Sep 17 13:30:42 WEST 2010 +#Tue Sep 28 16:00:33 WEST 2010 major=12 name=siprpsoft minor=2 -build=16 +build=17 diff --git a/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java b/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java index bfcb6b5f..257c243e 100644 --- a/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java +++ b/trunk/SIPRPSoft/src/siprp/SIPRPTracker.java @@ -17,10 +17,10 @@ import shst.SHSTTrackerInterface; import shst.companydataloaders.SIPRPPropertiesLoader; import shst.cursos.CursosWindowAdapter; import shst.higiene.gestao.GestaoRelatorioWindow; -import shst.higiene.mapa.MapaHigieneWindow; -import shst.higiene.marcacoes.MarcacoesHigieneInterface; -import shst.higiene.marcacoes.MarcacoesHigieneWindow; import shst.higiene.relatorio.RelatorioHigieneSegurancaWindow; +import shst.higiene.trabalho.mapa.HSTrabalhoMapaWindow; +import shst.higiene.trabalho.marcacoes.MarcacoesHigieneInterface; +import shst.higiene.trabalho.marcacoes.MarcacoesHigieneWindow; import shst.impressaofichas.ImpressaoFichasWindow; import shst.lembretes.LembretesMultiWindow; import shst.medicina.MedicinaWindow; @@ -236,12 +236,12 @@ public class SIPRPTracker extends WindowTracker implements SHSTTrackerInterface } } ); - higieneNode.add( new DefaultMutableTreeNode( MapaHigieneWindow.TITLE ) ); - creators.put( MapaHigieneWindow.TITLE, new WindowCreator() { + higieneNode.add( new DefaultMutableTreeNode( HSTrabalhoMapaWindow.TITLE ) ); + creators.put( HSTrabalhoMapaWindow.TITLE, new WindowCreator() { public TrackableWindow create() throws Exception { - return new MapaHigieneWindow(); + return new HSTrabalhoMapaWindow(); } } ); higieneNode.add( new DefaultMutableTreeNode( GestaoRelatorioWindow.TITLE ) );