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

trunk/SIPRPSoft/src/siprp/clientes/MarcacaoPanel.java

@@ -28,8 +28,8 @@ import javax.swing.JPanel;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
-import siprp.CompanyDataLoader;
 import siprp.SingletonConstants;
+import siprp.companydataloaders.CompanyDataLoader;
 import siprp.data.Marcacao;
 import siprp.data.MarcacaoListLoader;
 import siprp.data.MarcacaoTrabalhadorConstants;

trunk/SIPRPSoft/src/siprp/companydataloaders/ClinicaAvenidaDataLoader.java

@@ -6,7 +6,6 @@
 
 package siprp.companydataloaders;
 
-import siprp.CompanyDataLoader;
 import siprp.SingletonConstants;
 
 import com.evolute.utils.Singleton;

trunk/SIPRPSoft/src/siprp/companydataloaders/CompanyDataLoader.java

@@ -4,7 +4,7 @@
  * Created on 25 de Janeiro de 2005, 13:18
  */
 
-package siprp;
+package siprp.companydataloaders;
 
 /**
  *

trunk/SIPRPSoft/src/siprp/companydataloaders/IBookDataLoader.java

@@ -6,7 +6,6 @@
 
 package siprp.companydataloaders;
 
-import siprp.CompanyDataLoader;
 import siprp.SingletonConstants;
 
 import com.evolute.utils.Singleton;

trunk/SIPRPSoft/src/siprp/companydataloaders/SIPRPPropertiesLoader.java

@@ -10,11 +10,6 @@ import com.evolute.utils.Singleton;
 public class SIPRPPropertiesLoader extends EvoAbstractPropertiesLoader 
 {
 	private static SIPRPPropertiesLoader instance;
-
-	public static final String DATA = "XDATAX";
-	public static final String NOME = "XNOMEX";
-	public static final String MORADA = "XMORADAX";
-	public static final String HORA = "XHORAX";
 	
 	private SIPRPPropertiesLoader()
 	{
@@ -46,10 +41,10 @@ public class SIPRPPropertiesLoader extends EvoAbstractPropertiesLoader
 		Singleton.setInstance( SingletonConstants.COMPANY_NAME, "SIPRP - Sociedade Ib\u00e9rica de Preven\u00e7\u00e3o de Riscos Profissionais" );
 		Singleton.setInstance( SingletonConstants.COMPANY_LOGO, "logo_combo.jpg" );
 		Singleton.setInstance( SingletonConstants.COMPANY_ACRONYM, "SIPRP" );
-		Singleton.setInstance( SingletonConstants.SUBJECT_CONSULTA, "SIPRP - Marca\u00E7\u00E3o de consulta de '" + NOME + "'");
-		Singleton.setInstance( SingletonConstants.LETTER_CONSULTA, "Vimos pelo presente informar que '" + NOME + "' dever\u00E1 comparecer "
+		Singleton.setInstance( SingletonConstants.SUBJECT_CONSULTA, "SIPRP - Marca\u00E7\u00E3o de consulta de '" + CompanyDataLoader.NOME + "'");
+		Singleton.setInstance( SingletonConstants.LETTER_CONSULTA, "Vimos pelo presente informar que '" + CompanyDataLoader.NOME + "' dever\u00E1 comparecer "
 						+ "nas nossas instala\u00E7\u00F5es para a realiza\u00E7\u00E3o da consulta de Medicina "
-						+ "do Trabalho, no dia '" + DATA + "', pelas 08H30."
+						+ "do Trabalho, no dia '" + CompanyDataLoader.DATA + "', pelas 08H30."
 						+ "%0A%0A"
 						+ "%0A%0A"
 						+ "Solicitamos, tamb\u00E9m, que o colaborador seja portador do Boletim de Vacinas e "
@@ -65,10 +60,10 @@ public class SIPRPPropertiesLoader extends EvoAbstractPropertiesLoader
 						+ "%0A%0AATRIUM SALDANHA"
 						+ "%0A%0APra\u00e7a Duque de Saldanha, 1 - 9\u00BAG"
 						+ "%0A%0A1050-094 Lisboa" );
-		Singleton.setInstance( SingletonConstants.SUBJECT_EXAMES, "SIPRP - Marca\u00E7\u00E3o de exame de '" + NOME + "'");
-		Singleton.setInstance( SingletonConstants.LETTER_EXAMES, "Vimos pelo presente informar que '" + NOME + "' dever\u00E1 comparecer "
+		Singleton.setInstance( SingletonConstants.SUBJECT_EXAMES, "SIPRP - Marca\u00E7\u00E3o de exame de '" + CompanyDataLoader.NOME + "'");
+		Singleton.setInstance( SingletonConstants.LETTER_EXAMES, "Vimos pelo presente informar que '" + CompanyDataLoader.NOME + "' dever\u00E1 comparecer "
 						+ "nas nossas instala\u00E7\u00F5es para a realiza\u00E7\u00E3o dos exames de Medicina "
-						+ "do Trabalho, no dia '" + DATA + "', pelas 08H30."
+						+ "do Trabalho, no dia '" + CompanyDataLoader.DATA + "', pelas 08H30."
 						+ "%0A%0A"
 						+ "Relembramos que o colaborador dever\u00E1 comparecer em jejum."
 						+ "%0A%0A"
@@ -77,9 +72,9 @@ public class SIPRPPropertiesLoader extends EvoAbstractPropertiesLoader
 						+ "ou respondendo ao remetente desta mensagem."
 						+ "%0A%0A%0A"
 						+ "Cumprimentos,%0A%0ASIPRP" );
-		Singleton.setInstance( SingletonConstants.SUBJECT_VISITA, "SIPRP - Marca\u00E7\u00E3o de visita de higiene e seguran\u00E7a a '" + NOME + "'" );
+		Singleton.setInstance( SingletonConstants.SUBJECT_VISITA, "SIPRP - Marca\u00E7\u00E3o de visita de higiene e seguran\u00E7a a '" + CompanyDataLoader.NOME + "'" );
 		Singleton.setInstance( SingletonConstants.LETTER_VISITA, "Vimos pelo presente informar que iremos efectuar a auditoria de Higiene e "
-					+ "Seguran\u00E7a \u00E0s vossas instala\u00E7\u00F5es de '" + NOME + "', no dia '" + DATA +  "'."
+					+ "Seguran\u00E7a \u00E0s vossas instala\u00E7\u00F5es de '" + CompanyDataLoader.NOME + "', no dia '" + CompanyDataLoader.DATA +  "'."
 					+ "%0A%0A"
 					+ "Agradecemos que nos confirme, pela mesma via, o nome do representante "
 					+ "da empresa que nos ir\u00E1 acompanhar e a vossa disponibilidade para a "

trunk/SIPRPSoft/src/siprp/higiene/marcacoes/MarcacoesHigieneWindow.java

@@ -30,9 +30,9 @@ import javax.swing.event.ListSelectionListener;
 
 import shst.SHSTTrackerInterface;
 import shst.higiene.marcacoes.MarcacoesHigieneInterface;
-import siprp.CompanyDataLoader;
 import siprp.SingletonConstants;
 import siprp.clientes.AvisosPanel;
+import siprp.companydataloaders.CompanyDataLoader;
 import siprp.data.AvisoConstants;
 import siprp.data.Marcacao;
 import siprp.data.outer.ContactosData;

trunk/SIPRPSoft/src/siprp/medicina/MedicinaWindow.java

@@ -29,10 +29,10 @@ import javax.swing.event.ListSelectionListener;
 
 import shst.SHSTTrackerInterface;
 import shst.medicina.MedicinaWindowInterface;
-import siprp.CompanyDataLoader;
 import siprp.FichaDataProvider;
 import siprp.SingletonConstants;
 import siprp.clientes.AvisosPanel;
+import siprp.companydataloaders.CompanyDataLoader;
 import siprp.data.AvisoConstants;
 import siprp.data.Marcacao;
 import siprp.data.outer.ContactosData;