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

trunk/PlanosActuacao/nbproject/build-impl.xml

@@ -537,7 +537,6 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.commons-logging-1.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.commons-logging-1.1.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.evolute.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.evolute.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.mail.jar-1}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.mail.jar-1" todir="${dist.ear.dir}"/>
-        <copyfiles files="${file.reference.shst.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.shst.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.log4j-1.2.15.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.log4j-1.2.15.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.xalan-2.7.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.xalan-2.7.0.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.xercesImpl-2.7.1.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.xercesImpl-2.7.1.jar" todir="${dist.ear.dir}"/>
@@ -545,10 +544,11 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.xml-apis-ext-1.3.04.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.xml-apis-ext-1.3.04.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.serializer-2.7.0.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.serializer-2.7.0.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${file.reference.cursos.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.cursos.jar" todir="${dist.ear.dir}"/>
+        <copyfiles files="${file.reference.shst.jar}" iftldtodir="${build.web.dir}/WEB-INF" manifestproperty="manifest.file.reference.shst.jar" todir="${dist.ear.dir}"/>
         <copyfiles files="${libs.exceptionhandler-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
         <mkdir dir="${build.web.dir}/META-INF"/>
         <manifest file="${build.web.dir}/META-INF/MANIFEST.MF" mode="update">
-            <attribute name="Class-Path" value="${manifest.libs.jsf12.classpath} ${manifest.libs.jstl11.classpath} ${manifest.libs.jsf12-support.classpath} ${manifest.libs.woodstock-components.classpath} ${manifest.libs.woodstock-theme-default.classpath} ${manifest.file.reference.jdom.jar} ${manifest.file.reference.ashwood-2.0.jar} ${manifest.file.reference.avalon-framework-4.2.0.jar} ${manifest.file.reference.activation.jar} ${manifest.file.reference.fop.jar} ${manifest.file.reference.jai_imageio.jar} ${manifest.file.reference.postgresql-8.4-701.jdbc4.jar} ${manifest.file.reference.evologger.jar} ${manifest.file.reference.batik-all-1.7.jar} ${manifest.file.reference.xmlgraphics-commons-1.3.1.jar} ${manifest.file.reference.commons-io-1.4.jar} ${manifest.file.reference.commons-collections-3.1.jar} ${manifest.file.reference.commons-lang-2.1.jar} ${manifest.file.reference.commons-logging-1.1.jar} ${manifest.file.reference.evolute.jar} ${manifest.file.reference.mail.jar-1} ${manifest.file.reference.shst.jar} ${manifest.file.reference.log4j-1.2.15.jar} ${manifest.file.reference.xalan-2.7.0.jar} ${manifest.file.reference.xercesImpl-2.7.1.jar} ${manifest.file.reference.xml-apis-1.3.04.jar} ${manifest.file.reference.xml-apis-ext-1.3.04.jar} ${manifest.file.reference.serializer-2.7.0.jar} ${manifest.file.reference.cursos.jar} "/>
+            <attribute name="Class-Path" value="${manifest.libs.jsf12.classpath} ${manifest.libs.jstl11.classpath} ${manifest.libs.jsf12-support.classpath} ${manifest.libs.woodstock-components.classpath} ${manifest.libs.woodstock-theme-default.classpath} ${manifest.file.reference.jdom.jar} ${manifest.file.reference.ashwood-2.0.jar} ${manifest.file.reference.avalon-framework-4.2.0.jar} ${manifest.file.reference.activation.jar} ${manifest.file.reference.fop.jar} ${manifest.file.reference.jai_imageio.jar} ${manifest.file.reference.postgresql-8.4-701.jdbc4.jar} ${manifest.file.reference.evologger.jar} ${manifest.file.reference.batik-all-1.7.jar} ${manifest.file.reference.xmlgraphics-commons-1.3.1.jar} ${manifest.file.reference.commons-io-1.4.jar} ${manifest.file.reference.commons-collections-3.1.jar} ${manifest.file.reference.commons-lang-2.1.jar} ${manifest.file.reference.commons-logging-1.1.jar} ${manifest.file.reference.evolute.jar} ${manifest.file.reference.mail.jar-1} ${manifest.file.reference.log4j-1.2.15.jar} ${manifest.file.reference.xalan-2.7.0.jar} ${manifest.file.reference.xercesImpl-2.7.1.jar} ${manifest.file.reference.xml-apis-1.3.04.jar} ${manifest.file.reference.xml-apis-ext-1.3.04.jar} ${manifest.file.reference.serializer-2.7.0.jar} ${manifest.file.reference.cursos.jar} ${manifest.file.reference.shst.jar} "/>
         </manifest>
     </target>
     <target depends="init" name="library-inclusion-in-archive" unless="dist.ear.dir">
@@ -573,7 +573,6 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.commons-logging-1.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.evolute.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.mail.jar-1}" todir="${build.web.dir}/WEB-INF/lib"/>
-        <copyfiles files="${file.reference.shst.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.log4j-1.2.15.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.xalan-2.7.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.xercesImpl-2.7.1.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
@@ -581,6 +580,7 @@ exists or setup the property manually. For example like this:
         <copyfiles files="${file.reference.xml-apis-ext-1.3.04.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.serializer-2.7.0.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${file.reference.cursos.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
+        <copyfiles files="${file.reference.shst.jar}" todir="${build.web.dir}/WEB-INF/lib"/>
         <copyfiles files="${libs.exceptionhandler-runtime.classpath}" todir="${build.web.dir}/WEB-INF/lib"/>
     </target>
     <target depends="init,compile,compile-jsps,-pre-dist,library-inclusion-in-manifest" if="do.tmp.war.package" name="do-ear-dist">

trunk/PlanosActuacao/nbproject/genfiles.properties

@@ -1,8 +1,8 @@
-build.xml.data.CRC32=62e730b3
+build.xml.data.CRC32=a4c2779c
 build.xml.script.CRC32=50b8b881
 build.xml.stylesheet.CRC32=c0ebde35@1.15.2.1
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=62e730b3
+nbproject/build-impl.xml.data.CRC32=a4c2779c
-nbproject/build-impl.xml.script.CRC32=1fbdeec4
+nbproject/build-impl.xml.script.CRC32=34b43bcc
 nbproject/build-impl.xml.stylesheet.CRC32=8ab4467e@1.15.2.1

trunk/PlanosActuacao/nbproject/project.properties

@@ -73,14 +73,14 @@ javac.classpath=\
     ${file.reference.commons-logging-1.1.jar}:\
     ${file.reference.evolute.jar}:\
     ${file.reference.mail.jar-1}:\
-    ${file.reference.shst.jar}:\
     ${file.reference.log4j-1.2.15.jar}:\
     ${file.reference.xalan-2.7.0.jar}:\
     ${file.reference.xercesImpl-2.7.1.jar}:\
     ${file.reference.xml-apis-1.3.04.jar}:\
     ${file.reference.xml-apis-ext-1.3.04.jar}:\
     ${file.reference.serializer-2.7.0.jar}:\
-    ${file.reference.cursos.jar}
+    ${file.reference.cursos.jar}:\
+    ${file.reference.shst.jar}
 # Space-separated list of extra javac options
 javac.compilerargs=
 javac.debug=true

trunk/PlanosActuacao/nbproject/project.xml

@@ -91,10 +91,6 @@
                     <file>${file.reference.mail.jar-1}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
-                <library>
-                    <file>${file.reference.shst.jar}</file>
-                    <path-in-war>WEB-INF/lib</path-in-war>
-                </library>
                 <library>
                     <file>${file.reference.log4j-1.2.15.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
@@ -123,6 +119,10 @@
                     <file>${file.reference.cursos.jar}</file>
                     <path-in-war>WEB-INF/lib</path-in-war>
                 </library>
+                <library>
+                    <file>${file.reference.shst.jar}</file>
+                    <path-in-war>WEB-INF/lib</path-in-war>
+                </library>
             </web-module-libraries>
             <web-module-additional-libraries>
                 <library>

trunk/PlanosActuacao/src/java/app.properties

@@ -26,3 +26,15 @@ username.siprp_local = postgres
 #database.siprp_local = siprp_local_3
 #username.siprp_local = postgres
 #password.siprp_local = Typein
+
+#server.siprp = www.evolute.pt
+#port.siprp = 5436
+#database.siprp = siprp
+#username.siprp = postgres
+#password.siprp = -rg2hpgsql
+#
+#server.siprp_local = www.evolute.pt
+#port.siprp_local = 5436
+#database.siprp_local = siprp_local_3
+#username.siprp_local = postgres
+#password.siprp_local = -rg2hpgsql

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/AptAppointment.java

@@ -134,30 +134,70 @@ public class AptAppointment extends com.evolute.entity.evo.EvoDataObject<com.evo
 		LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE );
 	}
 
-	public java.util.List<db.data.siprp_local.outer.AptSegurancaAlimentarData>fromAptSegurancaAlimentar_appointment_id()
+	public java.util.List<db.data.siprp_local.outer.AptOutrasVacinaData>fromAptOutrasVacina_appointment_id()
 	{
-		java.util.List<db.data.siprp_local.outer.AptSegurancaAlimentarData> result = null;
+		java.util.List<db.data.siprp_local.outer.AptOutrasVacinaData> result = new java.util.LinkedList< db.data.siprp_local.outer.AptOutrasVacinaData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.AptSegurancaAlimentarData.class , getPrimaryKey().getMap().get("id"), "appointment_id" );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.AptOutrasVacinaData.class , getPrimaryKey().getMap().get("id"), "appointment_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
-		catch( com.evolute.entity.evo.EvoDataException edex )
+		return result;
+	}
+
+	public java.util.List<db.data.siprp_local.outer.AptOutrasViajanteData>fromAptOutrasViajante_appointment_id()
+	{
+		java.util.List<db.data.siprp_local.outer.AptOutrasViajanteData> result = new java.util.LinkedList< db.data.siprp_local.outer.AptOutrasViajanteData >();
+		if ( getPrimaryKey() != null ) 
 		{
-			throw new RuntimeException( edex );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.AptOutrasViajanteData.class , getPrimaryKey().getMap().get("id"), "appointment_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
-	public java.util.List<db.data.siprp_local.outer.FilFileAppointmentData>fromFilFileAppointment_appointment_id()
+	public java.util.List<db.data.siprp_local.outer.AptSegurancaAlimentarData>fromAptSegurancaAlimentar_appointment_id()
 	{
-		java.util.List<db.data.siprp_local.outer.FilFileAppointmentData> result = null;
+		java.util.List<db.data.siprp_local.outer.AptSegurancaAlimentarData> result = new java.util.LinkedList< db.data.siprp_local.outer.AptSegurancaAlimentarData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.FilFileAppointmentData.class , getPrimaryKey().getMap().get("id"), "appointment_id" );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.AptSegurancaAlimentarData.class , getPrimaryKey().getMap().get("id"), "appointment_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
-		catch( com.evolute.entity.evo.EvoDataException edex )
+		return result;
-		{
+	}
-			throw new RuntimeException( edex );
+
+	public java.util.List<db.data.siprp_local.outer.FilFileAppointmentData>fromFilFileAppointment_appointment_id()
+	{
+		java.util.List<db.data.siprp_local.outer.FilFileAppointmentData> result = new java.util.LinkedList< db.data.siprp_local.outer.FilFileAppointmentData >();
+		if ( getPrimaryKey() != null ) 
+		{
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.FilFileAppointmentData.class , getPrimaryKey().getMap().get("id"), "appointment_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/AptOutrasVacina.java

@@ -0,0 +1,533 @@
+/*
+* AptOutrasVacina.java
+*
+* Generated by com.evutils.codegen.EntityObjectGenerator
+*
+* Use but DON'T TOUCH
+* -> (can't touch this)
+*/
+package db.data.siprp_local.inner;
+
+
+public class AptOutrasVacina extends com.evolute.entity.evo.EvoDataObject<com.evolute.entity.utils.IntegerPrimaryKey>
+{
+	private static final java.util.HashMap<String,Integer> FIELD_INDEXES = new java.util.HashMap<String,Integer>();
+
+	static
+	{
+		FIELD_INDEXES.put( AptOutrasVacina.ID, AptOutrasVacina.ID_INDEX );
+		FIELD_INDEXES.put( AptOutrasVacina.ID_FULL, AptOutrasVacina.ID_INDEX );
+		com.evolute.entity.evo.EvoDataObject.register( AptOutrasVacina.CLASS_IDENTIFIER, AptOutrasVacina.APPOINTMENT_ID, AptOutrasVacina.TO_APPOINTMENT_ID ); 
+		FIELD_INDEXES.put( AptOutrasVacina.APPOINTMENT_ID, AptOutrasVacina.APPOINTMENT_ID_INDEX );
+		FIELD_INDEXES.put( AptOutrasVacina.APPOINTMENT_ID_FULL, AptOutrasVacina.APPOINTMENT_ID_INDEX );
+		FIELD_INDEXES.put( AptOutrasVacina.TO_APPOINTMENT_ID, AptOutrasVacina.TO_APPOINTMENT_ID_INDEX );
+		com.evolute.entity.evo.EvoDataObject.register( AptOutrasVacina.CLASS_IDENTIFIER, AptOutrasVacina.TRABALHADOR_ID, AptOutrasVacina.TO_TRABALHADOR_ID ); 
+		FIELD_INDEXES.put( AptOutrasVacina.TRABALHADOR_ID, AptOutrasVacina.TRABALHADOR_ID_INDEX );
+		FIELD_INDEXES.put( AptOutrasVacina.TRABALHADOR_ID_FULL, AptOutrasVacina.TRABALHADOR_ID_INDEX );
+		FIELD_INDEXES.put( AptOutrasVacina.TO_TRABALHADOR_ID, AptOutrasVacina.TO_TRABALHADOR_ID_INDEX );
+		com.evolute.entity.evo.EvoDataObject.register( AptOutrasVacina.CLASS_IDENTIFIER, AptOutrasVacina.VACINA_TIPO, AptOutrasVacina.TO_VACINA_TIPO ); 
+		FIELD_INDEXES.put( AptOutrasVacina.VACINA_TIPO, AptOutrasVacina.VACINA_TIPO_INDEX );
+		FIELD_INDEXES.put( AptOutrasVacina.VACINA_TIPO_FULL, AptOutrasVacina.VACINA_TIPO_INDEX );
+		FIELD_INDEXES.put( AptOutrasVacina.TO_VACINA_TIPO, AptOutrasVacina.TO_VACINA_TIPO_INDEX );
+	}
+
+	private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
+
+
+	public static final com.evolute.entity.ForeignKey ForeignKeyappointment_idToapt_appointment = 
+		new com.evolute.entity.ForeignKey( AptOutrasVacina.class, AptOutrasVacina.APPOINTMENT_ID, db.data.siprp_local.outer.AptAppointmentData.class, db.data.siprp_local.outer.AptAppointmentData.ID );
+
+	public static final com.evolute.entity.ForeignKey ForeignKeytrabalhador_idTotrabalhadores = 
+		new com.evolute.entity.ForeignKey( AptOutrasVacina.class, AptOutrasVacina.TRABALHADOR_ID, db.data.siprp_local.outer.TrabalhadoresData.class, db.data.siprp_local.outer.TrabalhadoresData.ID );
+
+	public static final com.evolute.entity.ForeignKey ForeignKeyvacina_tipoTomed_vacina_tipo = 
+		new com.evolute.entity.ForeignKey( AptOutrasVacina.class, AptOutrasVacina.VACINA_TIPO, db.data.siprp_local.outer.MedVacinaTipoData.class, db.data.siprp_local.outer.MedVacinaTipoData.ORDEM );
+
+	public static final String TABLENAME = "apt_outras_vacina";
+
+
+	public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.apt_outras_vacina";
+
+	public static final int _INVALID__INDEX = -1;
+	public static final String ID = "id";
+	public static final String ID_FULL = "apt_outras_vacina.id";
+	public static final int ID_INDEX = 0;
+	public static final String APPOINTMENT_ID = "appointment_id";
+	public static final String APPOINTMENT_ID_FULL = "apt_outras_vacina.appointment_id";
+	public static final int APPOINTMENT_ID_INDEX = 1;
+	public static final String TO_APPOINTMENT_ID = "to_appointment_id";
+	public static final String TO_APPOINTMENT_ID_FULL = "apt_outras_vacina.to_appointment_id";
+	public static final int TO_APPOINTMENT_ID_INDEX = 2;
+	public static final String TRABALHADOR_ID = "trabalhador_id";
+	public static final String TRABALHADOR_ID_FULL = "apt_outras_vacina.trabalhador_id";
+	public static final int TRABALHADOR_ID_INDEX = 3;
+	public static final String TO_TRABALHADOR_ID = "to_trabalhador_id";
+	public static final String TO_TRABALHADOR_ID_FULL = "apt_outras_vacina.to_trabalhador_id";
+	public static final int TO_TRABALHADOR_ID_INDEX = 4;
+	public static final String VACINA_TIPO = "vacina_tipo";
+	public static final String VACINA_TIPO_FULL = "apt_outras_vacina.vacina_tipo";
+	public static final int VACINA_TIPO_INDEX = 5;
+	public static final String TO_VACINA_TIPO = "to_vacina_tipo";
+	public static final String TO_VACINA_TIPO_FULL = "apt_outras_vacina.to_vacina_tipo";
+	public static final int TO_VACINA_TIPO_INDEX = 6;
+
+	public static final String FIELD_NAMES[] = new String[]{
+		APPOINTMENT_ID, TO_APPOINTMENT_ID, TRABALHADOR_ID, TO_TRABALHADOR_ID, 
+		VACINA_TIPO, TO_VACINA_TIPO, };
+
+	public static final String FIELD_NAMES_FULL[] = new String[]{
+		TABLENAME + "." + APPOINTMENT_ID, TABLENAME + "." + TO_APPOINTMENT_ID, TABLENAME + "." + TRABALHADOR_ID, TABLENAME + "." + TO_TRABALHADOR_ID, 
+		TABLENAME + "." + VACINA_TIPO, TABLENAME + "." + TO_VACINA_TIPO, };
+
+	protected static final String DB_FIELD_NAMES[] = new String[]{
+		ID, APPOINTMENT_ID, TRABALHADOR_ID, VACINA_TIPO, };
+
+
+	protected static final String PK_FIELD_NAMES[] = new String[]{
+		ID, };
+
+
+	public static final String DEFAULT_LOAD_SET[] = new String[] {
+		ID, APPOINTMENT_ID, TRABALHADOR_ID, VACINA_TIPO, };
+
+	private Integer id;
+	private Integer appointment_id;
+	private db.data.siprp_local.outer.AptAppointmentData to_appointment_id;
+	private Integer trabalhador_id;
+	private db.data.siprp_local.outer.TrabalhadoresData to_trabalhador_id;
+	private Integer vacina_tipo;
+	private db.data.siprp_local.outer.MedVacinaTipoData to_vacina_tipo;
+
+	protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
+
+	public AptOutrasVacina()
+	{
+		super();
+		dirtyProperties = new boolean[]{ false, false, false, 
+			false, false, false, false };
+	}
+
+	public Integer getId()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.id;
+	}
+
+	public void setId( Integer id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( ID, id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.id = id;
+		LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE );
+	}
+
+	public Integer getAppointment_id()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( APPOINTMENT_ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.appointment_id;
+	}
+
+	public void setAppointment_id( Integer appointment_id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( APPOINTMENT_ID, appointment_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.appointment_id = appointment_id;
+		LAZY_LOADED_OBJECTS.put( APPOINTMENT_ID, Boolean.TRUE );
+	}
+
+	public db.data.siprp_local.outer.AptAppointmentData toAppointment_id()
+	{
+		try
+		{
+			prepare( TO_APPOINTMENT_ID );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		return this.to_appointment_id;
+	}
+
+	public void setToAppointment_id( db.data.siprp_local.outer.AptAppointmentData to_appointment_id )
+	{
+		try
+		{
+			preProcess( TO_APPOINTMENT_ID, to_appointment_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.to_appointment_id = to_appointment_id;
+	}
+
+	public Integer getTrabalhador_id()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( TRABALHADOR_ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.trabalhador_id;
+	}
+
+	public void setTrabalhador_id( Integer trabalhador_id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( TRABALHADOR_ID, trabalhador_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.trabalhador_id = trabalhador_id;
+		LAZY_LOADED_OBJECTS.put( TRABALHADOR_ID, Boolean.TRUE );
+	}
+
+	public db.data.siprp_local.outer.TrabalhadoresData toTrabalhador_id()
+	{
+		try
+		{
+			prepare( TO_TRABALHADOR_ID );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		return this.to_trabalhador_id;
+	}
+
+	public void setToTrabalhador_id( db.data.siprp_local.outer.TrabalhadoresData to_trabalhador_id )
+	{
+		try
+		{
+			preProcess( TO_TRABALHADOR_ID, to_trabalhador_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.to_trabalhador_id = to_trabalhador_id;
+	}
+
+	public Integer getVacina_tipo()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( VACINA_TIPO );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.vacina_tipo;
+	}
+
+	public void setVacina_tipo( Integer vacina_tipo )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( VACINA_TIPO, vacina_tipo );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.vacina_tipo = vacina_tipo;
+		LAZY_LOADED_OBJECTS.put( VACINA_TIPO, Boolean.TRUE );
+	}
+
+	public db.data.siprp_local.outer.MedVacinaTipoData toVacina_tipo()
+	{
+		try
+		{
+			prepare( TO_VACINA_TIPO );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		return this.to_vacina_tipo;
+	}
+
+	public void setToVacina_tipo( db.data.siprp_local.outer.MedVacinaTipoData to_vacina_tipo )
+	{
+		try
+		{
+			preProcess( TO_VACINA_TIPO, to_vacina_tipo );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.to_vacina_tipo = to_vacina_tipo;
+	}
+
+	public Object get( String fieldName )
+	{
+		Object value = null;
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case AptOutrasVacina.ID_INDEX:
+				value = getId();
+				break;
+			case AptOutrasVacina.APPOINTMENT_ID_INDEX:
+				value = getAppointment_id();
+				break;
+			case AptOutrasVacina.TO_APPOINTMENT_ID_INDEX:
+				value = toAppointment_id();
+				break;
+			case AptOutrasVacina.TRABALHADOR_ID_INDEX:
+				value = getTrabalhador_id();
+				break;
+			case AptOutrasVacina.TO_TRABALHADOR_ID_INDEX:
+				value = toTrabalhador_id();
+				break;
+			case AptOutrasVacina.VACINA_TIPO_INDEX:
+				value = getVacina_tipo();
+				break;
+			case AptOutrasVacina.TO_VACINA_TIPO_INDEX:
+				value = toVacina_tipo();
+				break;
+		}
+		return value;
+	}
+
+	public Object rawGet( String fieldName )
+	{
+		Object value = null;
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case AptOutrasVacina.ID_INDEX:
+				value = this.id;
+				break;
+			case AptOutrasVacina.APPOINTMENT_ID_INDEX:
+				value = this.appointment_id;
+				break;
+			case AptOutrasVacina.TO_APPOINTMENT_ID_INDEX:
+				value = this.to_appointment_id;
+				break;
+			case AptOutrasVacina.TRABALHADOR_ID_INDEX:
+				value = this.trabalhador_id;
+				break;
+			case AptOutrasVacina.TO_TRABALHADOR_ID_INDEX:
+				value = this.to_trabalhador_id;
+				break;
+			case AptOutrasVacina.VACINA_TIPO_INDEX:
+				value = this.vacina_tipo;
+				break;
+			case AptOutrasVacina.TO_VACINA_TIPO_INDEX:
+				value = this.to_vacina_tipo;
+				break;
+		}
+		return value;
+	}
+
+	public void set( String fieldName, Object value )
+	{
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case AptOutrasVacina.ID_INDEX:
+				setId( ( Integer ) value );
+				break;
+			case AptOutrasVacina.APPOINTMENT_ID_INDEX:
+				setAppointment_id( ( Integer ) value );
+				break;
+			case AptOutrasVacina.TO_APPOINTMENT_ID_INDEX:
+				setToAppointment_id( ( db.data.siprp_local.outer.AptAppointmentData ) value );
+				break;
+			case AptOutrasVacina.TRABALHADOR_ID_INDEX:
+				setTrabalhador_id( ( Integer ) value );
+				break;
+			case AptOutrasVacina.TO_TRABALHADOR_ID_INDEX:
+				setToTrabalhador_id( ( db.data.siprp_local.outer.TrabalhadoresData ) value );
+				break;
+			case AptOutrasVacina.VACINA_TIPO_INDEX:
+				setVacina_tipo( ( Integer ) value );
+				break;
+			case AptOutrasVacina.TO_VACINA_TIPO_INDEX:
+				setToVacina_tipo( ( db.data.siprp_local.outer.MedVacinaTipoData ) value );
+				break;
+		}
+	}
+
+	public void rawSet( String fieldName, Object value )
+	{
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case AptOutrasVacina.ID_INDEX:
+				this.id = ( Integer ) value;
+				break;
+			case AptOutrasVacina.APPOINTMENT_ID_INDEX:
+				this.appointment_id = ( Integer ) value;
+				break;
+			case AptOutrasVacina.TO_APPOINTMENT_ID_INDEX:
+				this.to_appointment_id = ( db.data.siprp_local.outer.AptAppointmentData ) value;
+				break;
+			case AptOutrasVacina.TRABALHADOR_ID_INDEX:
+				this.trabalhador_id = ( Integer ) value;
+				break;
+			case AptOutrasVacina.TO_TRABALHADOR_ID_INDEX:
+				this.to_trabalhador_id = ( db.data.siprp_local.outer.TrabalhadoresData ) value;
+				break;
+			case AptOutrasVacina.VACINA_TIPO_INDEX:
+				this.vacina_tipo = ( Integer ) value;
+				break;
+			case AptOutrasVacina.TO_VACINA_TIPO_INDEX:
+				this.to_vacina_tipo = ( db.data.siprp_local.outer.MedVacinaTipoData ) value;
+				break;
+		}
+	}
+
+	public String []getFieldNames()
+	{
+		return FIELD_NAMES;
+	}
+
+	public String []getFieldNamesFull()
+	{
+		return FIELD_NAMES_FULL;
+	}
+
+	public String []getDBFieldNames()
+	{
+		return DB_FIELD_NAMES;
+	}
+
+	public String []getPrimaryKeyNames()
+	{
+		return PK_FIELD_NAMES;
+	}
+
+	public String []getDefaultLoadSet()
+	{
+		return DEFAULT_LOAD_SET;
+	}
+
+	public String getPrimaryKeyName()
+	{
+		return PK_FIELD_NAMES[ 0 ];
+	}
+
+	public Class<?> getFieldClass( String fieldName )
+	{
+		Integer index = getFieldIndex( fieldName );
+		Class<?> theClass = null;
+		switch( index )
+		{
+			case AptOutrasVacina.ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case AptOutrasVacina.APPOINTMENT_ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case AptOutrasVacina.TO_APPOINTMENT_ID_INDEX:
+				theClass = db.data.siprp_local.outer.AptAppointmentData.class;
+				break;
+			case AptOutrasVacina.TRABALHADOR_ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case AptOutrasVacina.TO_TRABALHADOR_ID_INDEX:
+				theClass = db.data.siprp_local.outer.TrabalhadoresData.class;
+				break;
+			case AptOutrasVacina.VACINA_TIPO_INDEX:
+				theClass = Integer.class;
+				break;
+			case AptOutrasVacina.TO_VACINA_TIPO_INDEX:
+				theClass = db.data.siprp_local.outer.MedVacinaTipoData.class;
+				break;
+		}
+		return theClass;
+	}
+
+	public Integer getFieldIndex( String fieldName )
+	{
+		Integer index = FIELD_INDEXES.get( fieldName );
+		return index != null ? index : AptOutrasVacina._INVALID__INDEX;
+	}
+
+	public String getTableName()
+	{
+		return TABLENAME;
+	}
+
+	public String getClassIdentifier()
+	{
+		return CLASS_IDENTIFIER;
+	}
+
+	@Override
+	protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col )
+	{
+		if( primaryKey == null )
+		{
+			primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, AptOutrasVacina.PK_FIELD_NAMES );
+			primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) );
+		}
+		setId( ( Integer ) array.get( row, col + 0 ) );
+	}
+
+	@Override
+	public com.evolute.entity.utils.IntegerPrimaryKey getPrimaryKey()
+	{
+		return primaryKey;
+	}
+
+	public void initLazyLoadFields()
+	{
+	}
+
+	public boolean isPropertyLoaded( String fieldName )
+	{
+		if ( LAZY_LOADED_OBJECTS.get( fieldName ) == null )
+		{
+			return true;
+		}
+		else
+		{
+			return LAZY_LOADED_OBJECTS.get( fieldName );
+		}
+	}
+}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/AptOutrasViajante.java

@@ -0,0 +1,431 @@
+/*
+* AptOutrasViajante.java
+*
+* Generated by com.evutils.codegen.EntityObjectGenerator
+*
+* Use but DON'T TOUCH
+* -> (can't touch this)
+*/
+package db.data.siprp_local.inner;
+
+
+public class AptOutrasViajante extends com.evolute.entity.evo.EvoDataObject<com.evolute.entity.utils.IntegerPrimaryKey>
+{
+	private static final java.util.HashMap<String,Integer> FIELD_INDEXES = new java.util.HashMap<String,Integer>();
+
+	static
+	{
+		FIELD_INDEXES.put( AptOutrasViajante.ID, AptOutrasViajante.ID_INDEX );
+		FIELD_INDEXES.put( AptOutrasViajante.ID_FULL, AptOutrasViajante.ID_INDEX );
+		com.evolute.entity.evo.EvoDataObject.register( AptOutrasViajante.CLASS_IDENTIFIER, AptOutrasViajante.APPOINTMENT_ID, AptOutrasViajante.TO_APPOINTMENT_ID ); 
+		FIELD_INDEXES.put( AptOutrasViajante.APPOINTMENT_ID, AptOutrasViajante.APPOINTMENT_ID_INDEX );
+		FIELD_INDEXES.put( AptOutrasViajante.APPOINTMENT_ID_FULL, AptOutrasViajante.APPOINTMENT_ID_INDEX );
+		FIELD_INDEXES.put( AptOutrasViajante.TO_APPOINTMENT_ID, AptOutrasViajante.TO_APPOINTMENT_ID_INDEX );
+		com.evolute.entity.evo.EvoDataObject.register( AptOutrasViajante.CLASS_IDENTIFIER, AptOutrasViajante.TRABALHADOR_ID, AptOutrasViajante.TO_TRABALHADOR_ID ); 
+		FIELD_INDEXES.put( AptOutrasViajante.TRABALHADOR_ID, AptOutrasViajante.TRABALHADOR_ID_INDEX );
+		FIELD_INDEXES.put( AptOutrasViajante.TRABALHADOR_ID_FULL, AptOutrasViajante.TRABALHADOR_ID_INDEX );
+		FIELD_INDEXES.put( AptOutrasViajante.TO_TRABALHADOR_ID, AptOutrasViajante.TO_TRABALHADOR_ID_INDEX );
+	}
+
+	private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
+
+
+	public static final com.evolute.entity.ForeignKey ForeignKeyappointment_idToapt_appointment = 
+		new com.evolute.entity.ForeignKey( AptOutrasViajante.class, AptOutrasViajante.APPOINTMENT_ID, db.data.siprp_local.outer.AptAppointmentData.class, db.data.siprp_local.outer.AptAppointmentData.ID );
+
+	public static final com.evolute.entity.ForeignKey ForeignKeytrabalhador_idTotrabalhadores = 
+		new com.evolute.entity.ForeignKey( AptOutrasViajante.class, AptOutrasViajante.TRABALHADOR_ID, db.data.siprp_local.outer.TrabalhadoresData.class, db.data.siprp_local.outer.TrabalhadoresData.ID );
+
+	public static final String TABLENAME = "apt_outras_viajante";
+
+
+	public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.apt_outras_viajante";
+
+	public static final int _INVALID__INDEX = -1;
+	public static final String ID = "id";
+	public static final String ID_FULL = "apt_outras_viajante.id";
+	public static final int ID_INDEX = 0;
+	public static final String APPOINTMENT_ID = "appointment_id";
+	public static final String APPOINTMENT_ID_FULL = "apt_outras_viajante.appointment_id";
+	public static final int APPOINTMENT_ID_INDEX = 1;
+	public static final String TO_APPOINTMENT_ID = "to_appointment_id";
+	public static final String TO_APPOINTMENT_ID_FULL = "apt_outras_viajante.to_appointment_id";
+	public static final int TO_APPOINTMENT_ID_INDEX = 2;
+	public static final String TRABALHADOR_ID = "trabalhador_id";
+	public static final String TRABALHADOR_ID_FULL = "apt_outras_viajante.trabalhador_id";
+	public static final int TRABALHADOR_ID_INDEX = 3;
+	public static final String TO_TRABALHADOR_ID = "to_trabalhador_id";
+	public static final String TO_TRABALHADOR_ID_FULL = "apt_outras_viajante.to_trabalhador_id";
+	public static final int TO_TRABALHADOR_ID_INDEX = 4;
+
+	public static final String FIELD_NAMES[] = new String[]{
+		APPOINTMENT_ID, TO_APPOINTMENT_ID, TRABALHADOR_ID, TO_TRABALHADOR_ID, };
+
+	public static final String FIELD_NAMES_FULL[] = new String[]{
+		TABLENAME + "." + APPOINTMENT_ID, TABLENAME + "." + TO_APPOINTMENT_ID, TABLENAME + "." + TRABALHADOR_ID, TABLENAME + "." + TO_TRABALHADOR_ID, };
+
+	protected static final String DB_FIELD_NAMES[] = new String[]{
+		ID, APPOINTMENT_ID, TRABALHADOR_ID, };
+
+
+	protected static final String PK_FIELD_NAMES[] = new String[]{
+		ID, };
+
+
+	public static final String DEFAULT_LOAD_SET[] = new String[] {
+		ID, APPOINTMENT_ID, TRABALHADOR_ID, };
+
+	private Integer id;
+	private Integer appointment_id;
+	private db.data.siprp_local.outer.AptAppointmentData to_appointment_id;
+	private Integer trabalhador_id;
+	private db.data.siprp_local.outer.TrabalhadoresData to_trabalhador_id;
+
+	protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
+
+	public AptOutrasViajante()
+	{
+		super();
+		dirtyProperties = new boolean[]{ false, false, false, 
+			false, false };
+	}
+
+	public Integer getId()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.id;
+	}
+
+	public void setId( Integer id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( ID, id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.id = id;
+		LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE );
+	}
+
+	public Integer getAppointment_id()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( APPOINTMENT_ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.appointment_id;
+	}
+
+	public void setAppointment_id( Integer appointment_id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( APPOINTMENT_ID, appointment_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.appointment_id = appointment_id;
+		LAZY_LOADED_OBJECTS.put( APPOINTMENT_ID, Boolean.TRUE );
+	}
+
+	public db.data.siprp_local.outer.AptAppointmentData toAppointment_id()
+	{
+		try
+		{
+			prepare( TO_APPOINTMENT_ID );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		return this.to_appointment_id;
+	}
+
+	public void setToAppointment_id( db.data.siprp_local.outer.AptAppointmentData to_appointment_id )
+	{
+		try
+		{
+			preProcess( TO_APPOINTMENT_ID, to_appointment_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.to_appointment_id = to_appointment_id;
+	}
+
+	public Integer getTrabalhador_id()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( TRABALHADOR_ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.trabalhador_id;
+	}
+
+	public void setTrabalhador_id( Integer trabalhador_id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( TRABALHADOR_ID, trabalhador_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.trabalhador_id = trabalhador_id;
+		LAZY_LOADED_OBJECTS.put( TRABALHADOR_ID, Boolean.TRUE );
+	}
+
+	public db.data.siprp_local.outer.TrabalhadoresData toTrabalhador_id()
+	{
+		try
+		{
+			prepare( TO_TRABALHADOR_ID );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		return this.to_trabalhador_id;
+	}
+
+	public void setToTrabalhador_id( db.data.siprp_local.outer.TrabalhadoresData to_trabalhador_id )
+	{
+		try
+		{
+			preProcess( TO_TRABALHADOR_ID, to_trabalhador_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.to_trabalhador_id = to_trabalhador_id;
+	}
+
+	public Object get( String fieldName )
+	{
+		Object value = null;
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case AptOutrasViajante.ID_INDEX:
+				value = getId();
+				break;
+			case AptOutrasViajante.APPOINTMENT_ID_INDEX:
+				value = getAppointment_id();
+				break;
+			case AptOutrasViajante.TO_APPOINTMENT_ID_INDEX:
+				value = toAppointment_id();
+				break;
+			case AptOutrasViajante.TRABALHADOR_ID_INDEX:
+				value = getTrabalhador_id();
+				break;
+			case AptOutrasViajante.TO_TRABALHADOR_ID_INDEX:
+				value = toTrabalhador_id();
+				break;
+		}
+		return value;
+	}
+
+	public Object rawGet( String fieldName )
+	{
+		Object value = null;
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case AptOutrasViajante.ID_INDEX:
+				value = this.id;
+				break;
+			case AptOutrasViajante.APPOINTMENT_ID_INDEX:
+				value = this.appointment_id;
+				break;
+			case AptOutrasViajante.TO_APPOINTMENT_ID_INDEX:
+				value = this.to_appointment_id;
+				break;
+			case AptOutrasViajante.TRABALHADOR_ID_INDEX:
+				value = this.trabalhador_id;
+				break;
+			case AptOutrasViajante.TO_TRABALHADOR_ID_INDEX:
+				value = this.to_trabalhador_id;
+				break;
+		}
+		return value;
+	}
+
+	public void set( String fieldName, Object value )
+	{
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case AptOutrasViajante.ID_INDEX:
+				setId( ( Integer ) value );
+				break;
+			case AptOutrasViajante.APPOINTMENT_ID_INDEX:
+				setAppointment_id( ( Integer ) value );
+				break;
+			case AptOutrasViajante.TO_APPOINTMENT_ID_INDEX:
+				setToAppointment_id( ( db.data.siprp_local.outer.AptAppointmentData ) value );
+				break;
+			case AptOutrasViajante.TRABALHADOR_ID_INDEX:
+				setTrabalhador_id( ( Integer ) value );
+				break;
+			case AptOutrasViajante.TO_TRABALHADOR_ID_INDEX:
+				setToTrabalhador_id( ( db.data.siprp_local.outer.TrabalhadoresData ) value );
+				break;
+		}
+	}
+
+	public void rawSet( String fieldName, Object value )
+	{
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case AptOutrasViajante.ID_INDEX:
+				this.id = ( Integer ) value;
+				break;
+			case AptOutrasViajante.APPOINTMENT_ID_INDEX:
+				this.appointment_id = ( Integer ) value;
+				break;
+			case AptOutrasViajante.TO_APPOINTMENT_ID_INDEX:
+				this.to_appointment_id = ( db.data.siprp_local.outer.AptAppointmentData ) value;
+				break;
+			case AptOutrasViajante.TRABALHADOR_ID_INDEX:
+				this.trabalhador_id = ( Integer ) value;
+				break;
+			case AptOutrasViajante.TO_TRABALHADOR_ID_INDEX:
+				this.to_trabalhador_id = ( db.data.siprp_local.outer.TrabalhadoresData ) value;
+				break;
+		}
+	}
+
+	public String []getFieldNames()
+	{
+		return FIELD_NAMES;
+	}
+
+	public String []getFieldNamesFull()
+	{
+		return FIELD_NAMES_FULL;
+	}
+
+	public String []getDBFieldNames()
+	{
+		return DB_FIELD_NAMES;
+	}
+
+	public String []getPrimaryKeyNames()
+	{
+		return PK_FIELD_NAMES;
+	}
+
+	public String []getDefaultLoadSet()
+	{
+		return DEFAULT_LOAD_SET;
+	}
+
+	public String getPrimaryKeyName()
+	{
+		return PK_FIELD_NAMES[ 0 ];
+	}
+
+	public Class<?> getFieldClass( String fieldName )
+	{
+		Integer index = getFieldIndex( fieldName );
+		Class<?> theClass = null;
+		switch( index )
+		{
+			case AptOutrasViajante.ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case AptOutrasViajante.APPOINTMENT_ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case AptOutrasViajante.TO_APPOINTMENT_ID_INDEX:
+				theClass = db.data.siprp_local.outer.AptAppointmentData.class;
+				break;
+			case AptOutrasViajante.TRABALHADOR_ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case AptOutrasViajante.TO_TRABALHADOR_ID_INDEX:
+				theClass = db.data.siprp_local.outer.TrabalhadoresData.class;
+				break;
+		}
+		return theClass;
+	}
+
+	public Integer getFieldIndex( String fieldName )
+	{
+		Integer index = FIELD_INDEXES.get( fieldName );
+		return index != null ? index : AptOutrasViajante._INVALID__INDEX;
+	}
+
+	public String getTableName()
+	{
+		return TABLENAME;
+	}
+
+	public String getClassIdentifier()
+	{
+		return CLASS_IDENTIFIER;
+	}
+
+	@Override
+	protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col )
+	{
+		if( primaryKey == null )
+		{
+			primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, AptOutrasViajante.PK_FIELD_NAMES );
+			primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) );
+		}
+		setId( ( Integer ) array.get( row, col + 0 ) );
+	}
+
+	@Override
+	public com.evolute.entity.utils.IntegerPrimaryKey getPrimaryKey()
+	{
+		return primaryKey;
+	}
+
+	public void initLazyLoadFields()
+	{
+	}
+
+	public boolean isPropertyLoaded( String fieldName )
+	{
+		if ( LAZY_LOADED_OBJECTS.get( fieldName ) == null )
+		{
+			return true;
+		}
+		else
+		{
+			return LAZY_LOADED_OBJECTS.get( fieldName );
+		}
+	}
+}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/AptState.java

@@ -96,14 +96,17 @@ public class AptState extends com.evolute.entity.evo.EvoDataObject<com.evolute.e
 
 	public java.util.List<db.data.siprp_local.outer.AptAppointmentData>fromAptAppointment_state_id()
 	{
-		java.util.List<db.data.siprp_local.outer.AptAppointmentData> result = null;
+		java.util.List<db.data.siprp_local.outer.AptAppointmentData> result = new java.util.LinkedList< db.data.siprp_local.outer.AptAppointmentData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.AptAppointmentData.class , getPrimaryKey().getMap().get("id"), "state_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.AptAppointmentData.class , getPrimaryKey().getMap().get("id"), "state_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/Contactos.java

@@ -133,56 +133,68 @@ public class Contactos extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 
 	public java.util.List<db.data.siprp_local.outer.EmpresasData>fromEmpresas_contacto_1()
 	{
-		java.util.List<db.data.siprp_local.outer.EmpresasData> result = null;
+		java.util.List<db.data.siprp_local.outer.EmpresasData> result = new java.util.LinkedList< db.data.siprp_local.outer.EmpresasData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.EmpresasData.class , getPrimaryKey().getMap().get("id"), "contacto_1" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.EmpresasData.class , getPrimaryKey().getMap().get("id"), "contacto_1" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.EmpresasData>fromEmpresas_contacto_2()
 	{
-		java.util.List<db.data.siprp_local.outer.EmpresasData> result = null;
+		java.util.List<db.data.siprp_local.outer.EmpresasData> result = new java.util.LinkedList< db.data.siprp_local.outer.EmpresasData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.EmpresasData.class , getPrimaryKey().getMap().get("id"), "contacto_2" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.EmpresasData.class , getPrimaryKey().getMap().get("id"), "contacto_2" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.EstabelecimentosData>fromEstabelecimentos_contacto_id()
 	{
-		java.util.List<db.data.siprp_local.outer.EstabelecimentosData> result = null;
+		java.util.List<db.data.siprp_local.outer.EstabelecimentosData> result = new java.util.LinkedList< db.data.siprp_local.outer.EstabelecimentosData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
-			result = fromReference( db.data.siprp_local.outer.EstabelecimentosData.class , getPrimaryKey().getMap().get("id"), "contacto_id" );
-		}
-		catch( com.evolute.entity.evo.EvoDataException edex )
 		{
-			throw new RuntimeException( edex );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.EstabelecimentosData.class , getPrimaryKey().getMap().get("id"), "contacto_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.PrestadoresData>fromPrestadores_contacto_id()
 	{
-		java.util.List<db.data.siprp_local.outer.PrestadoresData> result = null;
+		java.util.List<db.data.siprp_local.outer.PrestadoresData> result = new java.util.LinkedList< db.data.siprp_local.outer.PrestadoresData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.PrestadoresData.class , getPrimaryKey().getMap().get("id"), "contacto_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.PrestadoresData.class , getPrimaryKey().getMap().get("id"), "contacto_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/CurArs.java

@@ -96,14 +96,17 @@ public class CurArs extends com.evolute.entity.evo.EvoDataObject<com.evolute.ent
 
 	public java.util.List<db.data.siprp_local.outer.CurFormandosData>fromCurFormandos_ars_id()
 	{
-		java.util.List<db.data.siprp_local.outer.CurFormandosData> result = null;
+		java.util.List<db.data.siprp_local.outer.CurFormandosData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurFormandosData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.CurFormandosData.class , getPrimaryKey().getMap().get("id"), "ars_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.CurFormandosData.class , getPrimaryKey().getMap().get("id"), "ars_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/CurAulas.java

@@ -124,28 +124,34 @@ public class CurAulas extends com.evolute.entity.evo.EvoDataObject<com.evolute.e
 
 	public java.util.List<db.data.siprp_local.outer.CurAulasFormadoresData>fromCurAulasFormadores_aula_id()
 	{
-		java.util.List<db.data.siprp_local.outer.CurAulasFormadoresData> result = null;
+		java.util.List<db.data.siprp_local.outer.CurAulasFormadoresData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurAulasFormadoresData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.CurAulasFormadoresData.class , getPrimaryKey().getMap().get("id"), "aula_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.CurAulasFormadoresData.class , getPrimaryKey().getMap().get("id"), "aula_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.CurTopicosAulasData>fromCurTopicosAulas_aula_id()
 	{
-		java.util.List<db.data.siprp_local.outer.CurTopicosAulasData> result = null;
+		java.util.List<db.data.siprp_local.outer.CurTopicosAulasData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurTopicosAulasData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.CurTopicosAulasData.class , getPrimaryKey().getMap().get("id"), "aula_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.CurTopicosAulasData.class , getPrimaryKey().getMap().get("id"), "aula_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/CurCursos.java

@@ -216,84 +216,119 @@ public class CurCursos extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 
 	public java.util.List<db.data.siprp_local.outer.CurDiasData>fromCurDias_curso_id()
 	{
-		java.util.List<db.data.siprp_local.outer.CurDiasData> result = null;
+		java.util.List<db.data.siprp_local.outer.CurDiasData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurDiasData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.CurDiasData.class , getPrimaryKey().getMap().get("id"), "curso_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.CurDiasData.class , getPrimaryKey().getMap().get("id"), "curso_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.CurFormadoresCursosData>fromCurFormadoresCursos_curso_id()
 	{
-		java.util.List<db.data.siprp_local.outer.CurFormadoresCursosData> result = null;
+		java.util.List<db.data.siprp_local.outer.CurFormadoresCursosData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurFormadoresCursosData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.CurFormadoresCursosData.class , getPrimaryKey().getMap().get("id"), "curso_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.CurFormadoresCursosData.class , getPrimaryKey().getMap().get("id"), "curso_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.CurFormandosCursosData>fromCurFormandosCursos_curso_id()
 	{
-		java.util.List<db.data.siprp_local.outer.CurFormandosCursosData> result = null;
+		java.util.List<db.data.siprp_local.outer.CurFormandosCursosData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurFormandosCursosData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
-			result = fromReference( db.data.siprp_local.outer.CurFormandosCursosData.class , getPrimaryKey().getMap().get("id"), "curso_id" );
-		}
-		catch( com.evolute.entity.evo.EvoDataException edex )
 		{
-			throw new RuntimeException( edex );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.CurFormandosCursosData.class , getPrimaryKey().getMap().get("id"), "curso_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.CurPagamentosData>fromCurPagamentos_curso_id()
 	{
-		java.util.List<db.data.siprp_local.outer.CurPagamentosData> result = null;
+		java.util.List<db.data.siprp_local.outer.CurPagamentosData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurPagamentosData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.CurPagamentosData.class , getPrimaryKey().getMap().get("id"), "curso_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.CurPagamentosData.class , getPrimaryKey().getMap().get("id"), "curso_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.CurPresencasData>fromCurPresencas_curso_id()
 	{
-		java.util.List<db.data.siprp_local.outer.CurPresencasData> result = null;
+		java.util.List<db.data.siprp_local.outer.CurPresencasData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurPresencasData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.CurPresencasData.class , getPrimaryKey().getMap().get("id"), "curso_id" );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.CurPresencasData.class , getPrimaryKey().getMap().get("id"), "curso_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
-		catch( com.evolute.entity.evo.EvoDataException edex )
+		return result;
+	}
+
+	public java.util.List<db.data.siprp_local.outer.CurQuestionarioRespostaData>fromCurQuestionarioResposta_curso_id()
+	{
+		java.util.List<db.data.siprp_local.outer.CurQuestionarioRespostaData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurQuestionarioRespostaData >();
+		if ( getPrimaryKey() != null ) 
 		{
-			throw new RuntimeException( edex );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.CurQuestionarioRespostaData.class , getPrimaryKey().getMap().get("id"), "curso_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.CurTopicosData>fromCurTopicos_curso_id()
 	{
-		java.util.List<db.data.siprp_local.outer.CurTopicosData> result = null;
+		java.util.List<db.data.siprp_local.outer.CurTopicosData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurTopicosData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.CurTopicosData.class , getPrimaryKey().getMap().get("id"), "curso_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.CurTopicosData.class , getPrimaryKey().getMap().get("id"), "curso_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/CurDias.java

@@ -118,14 +118,17 @@ public class CurDias extends com.evolute.entity.evo.EvoDataObject<com.evolute.en
 
 	public java.util.List<db.data.siprp_local.outer.CurAulasData>fromCurAulas_cur_dia_id()
 	{
-		java.util.List<db.data.siprp_local.outer.CurAulasData> result = null;
+		java.util.List<db.data.siprp_local.outer.CurAulasData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurAulasData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.CurAulasData.class , getPrimaryKey().getMap().get("id"), "cur_dia_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.CurAulasData.class , getPrimaryKey().getMap().get("id"), "cur_dia_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/CurFormadores.java

@@ -127,56 +127,68 @@ public class CurFormadores extends com.evolute.entity.evo.EvoDataObject<com.evol
 
 	public java.util.List<db.data.siprp_local.outer.CurAulasFormadoresData>fromCurAulasFormadores_formador_id()
 	{
-		java.util.List<db.data.siprp_local.outer.CurAulasFormadoresData> result = null;
+		java.util.List<db.data.siprp_local.outer.CurAulasFormadoresData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurAulasFormadoresData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.CurAulasFormadoresData.class , getPrimaryKey().getMap().get("id"), "formador_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.CurAulasFormadoresData.class , getPrimaryKey().getMap().get("id"), "formador_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.CurFormadoresCursosData>fromCurFormadoresCursos_formador_id()
 	{
-		java.util.List<db.data.siprp_local.outer.CurFormadoresCursosData> result = null;
+		java.util.List<db.data.siprp_local.outer.CurFormadoresCursosData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurFormadoresCursosData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.CurFormadoresCursosData.class , getPrimaryKey().getMap().get("id"), "formador_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.CurFormadoresCursosData.class , getPrimaryKey().getMap().get("id"), "formador_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.CurPresencasData>fromCurPresencas_formador_id()
 	{
-		java.util.List<db.data.siprp_local.outer.CurPresencasData> result = null;
+		java.util.List<db.data.siprp_local.outer.CurPresencasData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurPresencasData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
-			result = fromReference( db.data.siprp_local.outer.CurPresencasData.class , getPrimaryKey().getMap().get("id"), "formador_id" );
-		}
-		catch( com.evolute.entity.evo.EvoDataException edex )
 		{
-			throw new RuntimeException( edex );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.CurPresencasData.class , getPrimaryKey().getMap().get("id"), "formador_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.CurTopicosData>fromCurTopicos_formador_id()
 	{
-		java.util.List<db.data.siprp_local.outer.CurTopicosData> result = null;
+		java.util.List<db.data.siprp_local.outer.CurTopicosData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurTopicosData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.CurTopicosData.class , getPrimaryKey().getMap().get("id"), "formador_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.CurTopicosData.class , getPrimaryKey().getMap().get("id"), "formador_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/CurFormandos.java

@@ -141,42 +141,68 @@ public class CurFormandos extends com.evolute.entity.evo.EvoDataObject<com.evolu
 
 	public java.util.List<db.data.siprp_local.outer.CurFormandosCursosData>fromCurFormandosCursos_formando_id()
 	{
-		java.util.List<db.data.siprp_local.outer.CurFormandosCursosData> result = null;
+		java.util.List<db.data.siprp_local.outer.CurFormandosCursosData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurFormandosCursosData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.CurFormandosCursosData.class , getPrimaryKey().getMap().get("id"), "formando_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.CurFormandosCursosData.class , getPrimaryKey().getMap().get("id"), "formando_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.CurPagamentosData>fromCurPagamentos_formando_id()
 	{
-		java.util.List<db.data.siprp_local.outer.CurPagamentosData> result = null;
+		java.util.List<db.data.siprp_local.outer.CurPagamentosData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurPagamentosData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
-			result = fromReference( db.data.siprp_local.outer.CurPagamentosData.class , getPrimaryKey().getMap().get("id"), "formando_id" );
-		}
-		catch( com.evolute.entity.evo.EvoDataException edex )
 		{
-			throw new RuntimeException( edex );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.CurPagamentosData.class , getPrimaryKey().getMap().get("id"), "formando_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.CurPresencasData>fromCurPresencas_formando_id()
 	{
-		java.util.List<db.data.siprp_local.outer.CurPresencasData> result = null;
+		java.util.List<db.data.siprp_local.outer.CurPresencasData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurPresencasData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.CurPresencasData.class , getPrimaryKey().getMap().get("id"), "formando_id" );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.CurPresencasData.class , getPrimaryKey().getMap().get("id"), "formando_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
-		catch( com.evolute.entity.evo.EvoDataException edex )
+		return result;
+	}
+
+	public java.util.List<db.data.siprp_local.outer.CurQuestionarioRespostaData>fromCurQuestionarioResposta_formando_id()
+	{
+		java.util.List<db.data.siprp_local.outer.CurQuestionarioRespostaData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurQuestionarioRespostaData >();
+		if ( getPrimaryKey() != null ) 
 		{
-			throw new RuntimeException( edex );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.CurQuestionarioRespostaData.class , getPrimaryKey().getMap().get("id"), "formando_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/CurHospitais.java

@@ -96,14 +96,17 @@ public class CurHospitais extends com.evolute.entity.evo.EvoDataObject<com.evolu
 
 	public java.util.List<db.data.siprp_local.outer.CurFormandosData>fromCurFormandos_hospital_id()
 	{
-		java.util.List<db.data.siprp_local.outer.CurFormandosData> result = null;
+		java.util.List<db.data.siprp_local.outer.CurFormandosData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurFormandosData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.CurFormandosData.class , getPrimaryKey().getMap().get("id"), "hospital_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.CurFormandosData.class , getPrimaryKey().getMap().get("id"), "hospital_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/CurPagamentosTipos.java

@@ -96,14 +96,17 @@ public class CurPagamentosTipos extends com.evolute.entity.evo.EvoDataObject<com
 
 	public java.util.List<db.data.siprp_local.outer.CurPagamentosData>fromCurPagamentos_tipo_id()
 	{
-		java.util.List<db.data.siprp_local.outer.CurPagamentosData> result = null;
+		java.util.List<db.data.siprp_local.outer.CurPagamentosData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurPagamentosData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.CurPagamentosData.class , getPrimaryKey().getMap().get("id"), "tipo_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.CurPagamentosData.class , getPrimaryKey().getMap().get("id"), "tipo_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/CurQuestionario.java

@@ -0,0 +1,297 @@
+/*
+* CurQuestionario.java
+*
+* Generated by com.evutils.codegen.EntityObjectGenerator
+*
+* Use but DON'T TOUCH
+* -> (can't touch this)
+*/
+package db.data.siprp_local.inner;
+
+
+public class CurQuestionario extends com.evolute.entity.evo.EvoDataObject<com.evolute.entity.utils.IntegerPrimaryKey>
+{
+	private static final java.util.HashMap<String,Integer> FIELD_INDEXES = new java.util.HashMap<String,Integer>();
+
+	static
+	{
+		FIELD_INDEXES.put( CurQuestionario.ID, CurQuestionario.ID_INDEX );
+		FIELD_INDEXES.put( CurQuestionario.ID_FULL, CurQuestionario.ID_INDEX );
+		FIELD_INDEXES.put( CurQuestionario.NOME, CurQuestionario.NOME_INDEX );
+		FIELD_INDEXES.put( CurQuestionario.NOME_FULL, CurQuestionario.NOME_INDEX );
+	}
+
+	private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
+
+
+	public static final String TABLENAME = "cur_questionario";
+
+
+	public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.cur_questionario";
+
+	public static final int _INVALID__INDEX = -1;
+	public static final String ID = "id";
+	public static final String ID_FULL = "cur_questionario.id";
+	public static final int ID_INDEX = 0;
+	public static final String NOME = "nome";
+	public static final String NOME_FULL = "cur_questionario.nome";
+	public static final int NOME_INDEX = 1;
+
+	public static final String FIELD_NAMES[] = new String[]{
+		NOME, };
+
+	public static final String FIELD_NAMES_FULL[] = new String[]{
+		TABLENAME + "." + NOME, };
+
+	protected static final String DB_FIELD_NAMES[] = new String[]{
+		ID, NOME, };
+
+
+	protected static final String PK_FIELD_NAMES[] = new String[]{
+		ID, };
+
+
+	public static final String DEFAULT_LOAD_SET[] = new String[] {
+		ID, NOME, };
+
+	private Integer id;
+	private String nome;
+
+	protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
+
+	public CurQuestionario()
+	{
+		super();
+		dirtyProperties = new boolean[]{ false, false };
+	}
+
+	public Integer getId()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.id;
+	}
+
+	public void setId( Integer id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( ID, id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.id = id;
+		LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE );
+	}
+
+	public java.util.List<db.data.siprp_local.outer.CurQuestionarioPerguntaData>fromCurQuestionarioPergunta_questionario_id()
+	{
+		java.util.List<db.data.siprp_local.outer.CurQuestionarioPerguntaData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurQuestionarioPerguntaData >();
+		if ( getPrimaryKey() != null ) 
+		{
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.CurQuestionarioPerguntaData.class , getPrimaryKey().getMap().get("id"), "questionario_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
+		}
+		return result;
+	}
+
+	public String getNome()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( NOME );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.nome;
+	}
+
+	public void setNome( String nome )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( NOME, nome );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.nome = nome;
+		LAZY_LOADED_OBJECTS.put( NOME, Boolean.TRUE );
+	}
+
+	public Object get( String fieldName )
+	{
+		Object value = null;
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case CurQuestionario.ID_INDEX:
+				value = getId();
+				break;
+			case CurQuestionario.NOME_INDEX:
+				value = getNome();
+				break;
+		}
+		return value;
+	}
+
+	public Object rawGet( String fieldName )
+	{
+		Object value = null;
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case CurQuestionario.ID_INDEX:
+				value = this.id;
+				break;
+			case CurQuestionario.NOME_INDEX:
+				value = this.nome;
+				break;
+		}
+		return value;
+	}
+
+	public void set( String fieldName, Object value )
+	{
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case CurQuestionario.ID_INDEX:
+				setId( ( Integer ) value );
+				break;
+			case CurQuestionario.NOME_INDEX:
+				setNome( ( String ) value );
+				break;
+		}
+	}
+
+	public void rawSet( String fieldName, Object value )
+	{
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case CurQuestionario.ID_INDEX:
+				this.id = ( Integer ) value;
+				break;
+			case CurQuestionario.NOME_INDEX:
+				this.nome = ( String ) value;
+				break;
+		}
+	}
+
+	public String []getFieldNames()
+	{
+		return FIELD_NAMES;
+	}
+
+	public String []getFieldNamesFull()
+	{
+		return FIELD_NAMES_FULL;
+	}
+
+	public String []getDBFieldNames()
+	{
+		return DB_FIELD_NAMES;
+	}
+
+	public String []getPrimaryKeyNames()
+	{
+		return PK_FIELD_NAMES;
+	}
+
+	public String []getDefaultLoadSet()
+	{
+		return DEFAULT_LOAD_SET;
+	}
+
+	public String getPrimaryKeyName()
+	{
+		return PK_FIELD_NAMES[ 0 ];
+	}
+
+	public Class<?> getFieldClass( String fieldName )
+	{
+		Integer index = getFieldIndex( fieldName );
+		Class<?> theClass = null;
+		switch( index )
+		{
+			case CurQuestionario.ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case CurQuestionario.NOME_INDEX:
+				theClass = String.class;
+				break;
+		}
+		return theClass;
+	}
+
+	public Integer getFieldIndex( String fieldName )
+	{
+		Integer index = FIELD_INDEXES.get( fieldName );
+		return index != null ? index : CurQuestionario._INVALID__INDEX;
+	}
+
+	public String getTableName()
+	{
+		return TABLENAME;
+	}
+
+	public String getClassIdentifier()
+	{
+		return CLASS_IDENTIFIER;
+	}
+
+	@Override
+	protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col )
+	{
+		if( primaryKey == null )
+		{
+			primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, CurQuestionario.PK_FIELD_NAMES );
+			primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) );
+		}
+		setId( ( Integer ) array.get( row, col + 0 ) );
+	}
+
+	@Override
+	public com.evolute.entity.utils.IntegerPrimaryKey getPrimaryKey()
+	{
+		return primaryKey;
+	}
+
+	public void initLazyLoadFields()
+	{
+	}
+
+	public boolean isPropertyLoaded( String fieldName )
+	{
+		if ( LAZY_LOADED_OBJECTS.get( fieldName ) == null )
+		{
+			return true;
+		}
+		else
+		{
+			return LAZY_LOADED_OBJECTS.get( fieldName );
+		}
+	}
+}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/CurQuestionarioPergunta.java

@@ -0,0 +1,398 @@
+/*
+* CurQuestionarioPergunta.java
+*
+* Generated by com.evutils.codegen.EntityObjectGenerator
+*
+* Use but DON'T TOUCH
+* -> (can't touch this)
+*/
+package db.data.siprp_local.inner;
+
+
+public class CurQuestionarioPergunta extends com.evolute.entity.evo.EvoDataObject<com.evolute.entity.utils.IntegerPrimaryKey>
+{
+	private static final java.util.HashMap<String,Integer> FIELD_INDEXES = new java.util.HashMap<String,Integer>();
+
+	static
+	{
+		FIELD_INDEXES.put( CurQuestionarioPergunta.ID, CurQuestionarioPergunta.ID_INDEX );
+		FIELD_INDEXES.put( CurQuestionarioPergunta.ID_FULL, CurQuestionarioPergunta.ID_INDEX );
+		com.evolute.entity.evo.EvoDataObject.register( CurQuestionarioPergunta.CLASS_IDENTIFIER, CurQuestionarioPergunta.QUESTIONARIO_ID, CurQuestionarioPergunta.TO_QUESTIONARIO_ID ); 
+		FIELD_INDEXES.put( CurQuestionarioPergunta.QUESTIONARIO_ID, CurQuestionarioPergunta.QUESTIONARIO_ID_INDEX );
+		FIELD_INDEXES.put( CurQuestionarioPergunta.QUESTIONARIO_ID_FULL, CurQuestionarioPergunta.QUESTIONARIO_ID_INDEX );
+		FIELD_INDEXES.put( CurQuestionarioPergunta.TO_QUESTIONARIO_ID, CurQuestionarioPergunta.TO_QUESTIONARIO_ID_INDEX );
+		FIELD_INDEXES.put( CurQuestionarioPergunta.DESCRICAO, CurQuestionarioPergunta.DESCRICAO_INDEX );
+		FIELD_INDEXES.put( CurQuestionarioPergunta.DESCRICAO_FULL, CurQuestionarioPergunta.DESCRICAO_INDEX );
+	}
+
+	private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
+
+
+	public static final com.evolute.entity.ForeignKey ForeignKeyquestionario_idTocur_questionario = 
+		new com.evolute.entity.ForeignKey( CurQuestionarioPergunta.class, CurQuestionarioPergunta.QUESTIONARIO_ID, db.data.siprp_local.outer.CurQuestionarioData.class, db.data.siprp_local.outer.CurQuestionarioData.ID );
+
+	public static final String TABLENAME = "cur_questionario_pergunta";
+
+
+	public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.cur_questionario_pergunta";
+
+	public static final int _INVALID__INDEX = -1;
+	public static final String ID = "id";
+	public static final String ID_FULL = "cur_questionario_pergunta.id";
+	public static final int ID_INDEX = 0;
+	public static final String QUESTIONARIO_ID = "questionario_id";
+	public static final String QUESTIONARIO_ID_FULL = "cur_questionario_pergunta.questionario_id";
+	public static final int QUESTIONARIO_ID_INDEX = 1;
+	public static final String TO_QUESTIONARIO_ID = "to_questionario_id";
+	public static final String TO_QUESTIONARIO_ID_FULL = "cur_questionario_pergunta.to_questionario_id";
+	public static final int TO_QUESTIONARIO_ID_INDEX = 2;
+	public static final String DESCRICAO = "descricao";
+	public static final String DESCRICAO_FULL = "cur_questionario_pergunta.descricao";
+	public static final int DESCRICAO_INDEX = 3;
+
+	public static final String FIELD_NAMES[] = new String[]{
+		QUESTIONARIO_ID, TO_QUESTIONARIO_ID, DESCRICAO, };
+
+	public static final String FIELD_NAMES_FULL[] = new String[]{
+		TABLENAME + "." + QUESTIONARIO_ID, TABLENAME + "." + TO_QUESTIONARIO_ID, TABLENAME + "." + DESCRICAO, };
+
+	protected static final String DB_FIELD_NAMES[] = new String[]{
+		ID, QUESTIONARIO_ID, DESCRICAO, };
+
+
+	protected static final String PK_FIELD_NAMES[] = new String[]{
+		ID, };
+
+
+	public static final String DEFAULT_LOAD_SET[] = new String[] {
+		ID, QUESTIONARIO_ID, DESCRICAO, };
+
+	private Integer id;
+	private Integer questionario_id;
+	private db.data.siprp_local.outer.CurQuestionarioData to_questionario_id;
+	private String descricao;
+
+	protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
+
+	public CurQuestionarioPergunta()
+	{
+		super();
+		dirtyProperties = new boolean[]{ false, false, false, 
+			false };
+	}
+
+	public Integer getId()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.id;
+	}
+
+	public void setId( Integer id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( ID, id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.id = id;
+		LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE );
+	}
+
+	public java.util.List<db.data.siprp_local.outer.CurQuestionarioRespostaData>fromCurQuestionarioResposta_pergunta_id()
+	{
+		java.util.List<db.data.siprp_local.outer.CurQuestionarioRespostaData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurQuestionarioRespostaData >();
+		if ( getPrimaryKey() != null ) 
+		{
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.CurQuestionarioRespostaData.class , getPrimaryKey().getMap().get("id"), "pergunta_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
+		}
+		return result;
+	}
+
+	public Integer getQuestionario_id()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( QUESTIONARIO_ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.questionario_id;
+	}
+
+	public void setQuestionario_id( Integer questionario_id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( QUESTIONARIO_ID, questionario_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.questionario_id = questionario_id;
+		LAZY_LOADED_OBJECTS.put( QUESTIONARIO_ID, Boolean.TRUE );
+	}
+
+	public db.data.siprp_local.outer.CurQuestionarioData toQuestionario_id()
+	{
+		try
+		{
+			prepare( TO_QUESTIONARIO_ID );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		return this.to_questionario_id;
+	}
+
+	public void setToQuestionario_id( db.data.siprp_local.outer.CurQuestionarioData to_questionario_id )
+	{
+		try
+		{
+			preProcess( TO_QUESTIONARIO_ID, to_questionario_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.to_questionario_id = to_questionario_id;
+	}
+
+	public String getDescricao()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( DESCRICAO );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.descricao;
+	}
+
+	public void setDescricao( String descricao )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( DESCRICAO, descricao );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.descricao = descricao;
+		LAZY_LOADED_OBJECTS.put( DESCRICAO, Boolean.TRUE );
+	}
+
+	public Object get( String fieldName )
+	{
+		Object value = null;
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case CurQuestionarioPergunta.ID_INDEX:
+				value = getId();
+				break;
+			case CurQuestionarioPergunta.QUESTIONARIO_ID_INDEX:
+				value = getQuestionario_id();
+				break;
+			case CurQuestionarioPergunta.TO_QUESTIONARIO_ID_INDEX:
+				value = toQuestionario_id();
+				break;
+			case CurQuestionarioPergunta.DESCRICAO_INDEX:
+				value = getDescricao();
+				break;
+		}
+		return value;
+	}
+
+	public Object rawGet( String fieldName )
+	{
+		Object value = null;
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case CurQuestionarioPergunta.ID_INDEX:
+				value = this.id;
+				break;
+			case CurQuestionarioPergunta.QUESTIONARIO_ID_INDEX:
+				value = this.questionario_id;
+				break;
+			case CurQuestionarioPergunta.TO_QUESTIONARIO_ID_INDEX:
+				value = this.to_questionario_id;
+				break;
+			case CurQuestionarioPergunta.DESCRICAO_INDEX:
+				value = this.descricao;
+				break;
+		}
+		return value;
+	}
+
+	public void set( String fieldName, Object value )
+	{
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case CurQuestionarioPergunta.ID_INDEX:
+				setId( ( Integer ) value );
+				break;
+			case CurQuestionarioPergunta.QUESTIONARIO_ID_INDEX:
+				setQuestionario_id( ( Integer ) value );
+				break;
+			case CurQuestionarioPergunta.TO_QUESTIONARIO_ID_INDEX:
+				setToQuestionario_id( ( db.data.siprp_local.outer.CurQuestionarioData ) value );
+				break;
+			case CurQuestionarioPergunta.DESCRICAO_INDEX:
+				setDescricao( ( String ) value );
+				break;
+		}
+	}
+
+	public void rawSet( String fieldName, Object value )
+	{
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case CurQuestionarioPergunta.ID_INDEX:
+				this.id = ( Integer ) value;
+				break;
+			case CurQuestionarioPergunta.QUESTIONARIO_ID_INDEX:
+				this.questionario_id = ( Integer ) value;
+				break;
+			case CurQuestionarioPergunta.TO_QUESTIONARIO_ID_INDEX:
+				this.to_questionario_id = ( db.data.siprp_local.outer.CurQuestionarioData ) value;
+				break;
+			case CurQuestionarioPergunta.DESCRICAO_INDEX:
+				this.descricao = ( String ) value;
+				break;
+		}
+	}
+
+	public String []getFieldNames()
+	{
+		return FIELD_NAMES;
+	}
+
+	public String []getFieldNamesFull()
+	{
+		return FIELD_NAMES_FULL;
+	}
+
+	public String []getDBFieldNames()
+	{
+		return DB_FIELD_NAMES;
+	}
+
+	public String []getPrimaryKeyNames()
+	{
+		return PK_FIELD_NAMES;
+	}
+
+	public String []getDefaultLoadSet()
+	{
+		return DEFAULT_LOAD_SET;
+	}
+
+	public String getPrimaryKeyName()
+	{
+		return PK_FIELD_NAMES[ 0 ];
+	}
+
+	public Class<?> getFieldClass( String fieldName )
+	{
+		Integer index = getFieldIndex( fieldName );
+		Class<?> theClass = null;
+		switch( index )
+		{
+			case CurQuestionarioPergunta.ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case CurQuestionarioPergunta.QUESTIONARIO_ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case CurQuestionarioPergunta.TO_QUESTIONARIO_ID_INDEX:
+				theClass = db.data.siprp_local.outer.CurQuestionarioData.class;
+				break;
+			case CurQuestionarioPergunta.DESCRICAO_INDEX:
+				theClass = String.class;
+				break;
+		}
+		return theClass;
+	}
+
+	public Integer getFieldIndex( String fieldName )
+	{
+		Integer index = FIELD_INDEXES.get( fieldName );
+		return index != null ? index : CurQuestionarioPergunta._INVALID__INDEX;
+	}
+
+	public String getTableName()
+	{
+		return TABLENAME;
+	}
+
+	public String getClassIdentifier()
+	{
+		return CLASS_IDENTIFIER;
+	}
+
+	@Override
+	protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col )
+	{
+		if( primaryKey == null )
+		{
+			primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, CurQuestionarioPergunta.PK_FIELD_NAMES );
+			primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) );
+		}
+		setId( ( Integer ) array.get( row, col + 0 ) );
+	}
+
+	@Override
+	public com.evolute.entity.utils.IntegerPrimaryKey getPrimaryKey()
+	{
+		return primaryKey;
+	}
+
+	public void initLazyLoadFields()
+	{
+	}
+
+	public boolean isPropertyLoaded( String fieldName )
+	{
+		if ( LAZY_LOADED_OBJECTS.get( fieldName ) == null )
+		{
+			return true;
+		}
+		else
+		{
+			return LAZY_LOADED_OBJECTS.get( fieldName );
+		}
+	}
+}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/CurQuestionarioResposta.java

@@ -0,0 +1,583 @@
+/*
+* CurQuestionarioResposta.java
+*
+* Generated by com.evutils.codegen.EntityObjectGenerator
+*
+* Use but DON'T TOUCH
+* -> (can't touch this)
+*/
+package db.data.siprp_local.inner;
+
+
+public class CurQuestionarioResposta extends com.evolute.entity.evo.EvoDataObject<com.evolute.entity.utils.IntegerPrimaryKey>
+{
+	private static final java.util.HashMap<String,Integer> FIELD_INDEXES = new java.util.HashMap<String,Integer>();
+
+	static
+	{
+		FIELD_INDEXES.put( CurQuestionarioResposta.ID, CurQuestionarioResposta.ID_INDEX );
+		FIELD_INDEXES.put( CurQuestionarioResposta.ID_FULL, CurQuestionarioResposta.ID_INDEX );
+		com.evolute.entity.evo.EvoDataObject.register( CurQuestionarioResposta.CLASS_IDENTIFIER, CurQuestionarioResposta.PERGUNTA_ID, CurQuestionarioResposta.TO_PERGUNTA_ID ); 
+		FIELD_INDEXES.put( CurQuestionarioResposta.PERGUNTA_ID, CurQuestionarioResposta.PERGUNTA_ID_INDEX );
+		FIELD_INDEXES.put( CurQuestionarioResposta.PERGUNTA_ID_FULL, CurQuestionarioResposta.PERGUNTA_ID_INDEX );
+		FIELD_INDEXES.put( CurQuestionarioResposta.TO_PERGUNTA_ID, CurQuestionarioResposta.TO_PERGUNTA_ID_INDEX );
+		com.evolute.entity.evo.EvoDataObject.register( CurQuestionarioResposta.CLASS_IDENTIFIER, CurQuestionarioResposta.FORMANDO_ID, CurQuestionarioResposta.TO_FORMANDO_ID ); 
+		FIELD_INDEXES.put( CurQuestionarioResposta.FORMANDO_ID, CurQuestionarioResposta.FORMANDO_ID_INDEX );
+		FIELD_INDEXES.put( CurQuestionarioResposta.FORMANDO_ID_FULL, CurQuestionarioResposta.FORMANDO_ID_INDEX );
+		FIELD_INDEXES.put( CurQuestionarioResposta.TO_FORMANDO_ID, CurQuestionarioResposta.TO_FORMANDO_ID_INDEX );
+		com.evolute.entity.evo.EvoDataObject.register( CurQuestionarioResposta.CLASS_IDENTIFIER, CurQuestionarioResposta.CURSO_ID, CurQuestionarioResposta.TO_CURSO_ID ); 
+		FIELD_INDEXES.put( CurQuestionarioResposta.CURSO_ID, CurQuestionarioResposta.CURSO_ID_INDEX );
+		FIELD_INDEXES.put( CurQuestionarioResposta.CURSO_ID_FULL, CurQuestionarioResposta.CURSO_ID_INDEX );
+		FIELD_INDEXES.put( CurQuestionarioResposta.TO_CURSO_ID, CurQuestionarioResposta.TO_CURSO_ID_INDEX );
+		FIELD_INDEXES.put( CurQuestionarioResposta.RESPOSTA, CurQuestionarioResposta.RESPOSTA_INDEX );
+		FIELD_INDEXES.put( CurQuestionarioResposta.RESPOSTA_FULL, CurQuestionarioResposta.RESPOSTA_INDEX );
+	}
+
+	private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
+
+
+	public static final com.evolute.entity.ForeignKey ForeignKeypergunta_idTocur_questionario_pergunta = 
+		new com.evolute.entity.ForeignKey( CurQuestionarioResposta.class, CurQuestionarioResposta.PERGUNTA_ID, db.data.siprp_local.outer.CurQuestionarioPerguntaData.class, db.data.siprp_local.outer.CurQuestionarioPerguntaData.ID );
+
+	public static final com.evolute.entity.ForeignKey ForeignKeyformando_idTocur_formandos = 
+		new com.evolute.entity.ForeignKey( CurQuestionarioResposta.class, CurQuestionarioResposta.FORMANDO_ID, db.data.siprp_local.outer.CurFormandosData.class, db.data.siprp_local.outer.CurFormandosData.ID );
+
+	public static final com.evolute.entity.ForeignKey ForeignKeycurso_idTocur_cursos = 
+		new com.evolute.entity.ForeignKey( CurQuestionarioResposta.class, CurQuestionarioResposta.CURSO_ID, db.data.siprp_local.outer.CurCursosData.class, db.data.siprp_local.outer.CurCursosData.ID );
+
+	public static final String TABLENAME = "cur_questionario_resposta";
+
+
+	public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.cur_questionario_resposta";
+
+	public static final int _INVALID__INDEX = -1;
+	public static final String ID = "id";
+	public static final String ID_FULL = "cur_questionario_resposta.id";
+	public static final int ID_INDEX = 0;
+	public static final String PERGUNTA_ID = "pergunta_id";
+	public static final String PERGUNTA_ID_FULL = "cur_questionario_resposta.pergunta_id";
+	public static final int PERGUNTA_ID_INDEX = 1;
+	public static final String TO_PERGUNTA_ID = "to_pergunta_id";
+	public static final String TO_PERGUNTA_ID_FULL = "cur_questionario_resposta.to_pergunta_id";
+	public static final int TO_PERGUNTA_ID_INDEX = 2;
+	public static final String FORMANDO_ID = "formando_id";
+	public static final String FORMANDO_ID_FULL = "cur_questionario_resposta.formando_id";
+	public static final int FORMANDO_ID_INDEX = 3;
+	public static final String TO_FORMANDO_ID = "to_formando_id";
+	public static final String TO_FORMANDO_ID_FULL = "cur_questionario_resposta.to_formando_id";
+	public static final int TO_FORMANDO_ID_INDEX = 4;
+	public static final String CURSO_ID = "curso_id";
+	public static final String CURSO_ID_FULL = "cur_questionario_resposta.curso_id";
+	public static final int CURSO_ID_INDEX = 5;
+	public static final String TO_CURSO_ID = "to_curso_id";
+	public static final String TO_CURSO_ID_FULL = "cur_questionario_resposta.to_curso_id";
+	public static final int TO_CURSO_ID_INDEX = 6;
+	public static final String RESPOSTA = "resposta";
+	public static final String RESPOSTA_FULL = "cur_questionario_resposta.resposta";
+	public static final int RESPOSTA_INDEX = 7;
+
+	public static final String FIELD_NAMES[] = new String[]{
+		PERGUNTA_ID, TO_PERGUNTA_ID, FORMANDO_ID, TO_FORMANDO_ID, CURSO_ID, TO_CURSO_ID, 
+		RESPOSTA, };
+
+	public static final String FIELD_NAMES_FULL[] = new String[]{
+		TABLENAME + "." + PERGUNTA_ID, TABLENAME + "." + TO_PERGUNTA_ID, TABLENAME + "." + FORMANDO_ID, TABLENAME + "." + TO_FORMANDO_ID, TABLENAME + "." + CURSO_ID, TABLENAME + "." + TO_CURSO_ID, 
+		TABLENAME + "." + RESPOSTA, };
+
+	protected static final String DB_FIELD_NAMES[] = new String[]{
+		ID, PERGUNTA_ID, FORMANDO_ID, CURSO_ID, RESPOSTA, };
+
+
+	protected static final String PK_FIELD_NAMES[] = new String[]{
+		ID, };
+
+
+	public static final String DEFAULT_LOAD_SET[] = new String[] {
+		ID, PERGUNTA_ID, FORMANDO_ID, CURSO_ID, RESPOSTA, };
+
+	private Integer id;
+	private Integer pergunta_id;
+	private db.data.siprp_local.outer.CurQuestionarioPerguntaData to_pergunta_id;
+	private Integer formando_id;
+	private db.data.siprp_local.outer.CurFormandosData to_formando_id;
+	private Integer curso_id;
+	private db.data.siprp_local.outer.CurCursosData to_curso_id;
+	private Integer resposta;
+
+	protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
+
+	public CurQuestionarioResposta()
+	{
+		super();
+		dirtyProperties = new boolean[]{ false, false, false, 
+			false, false, false, false, false };
+	}
+
+	public Integer getId()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.id;
+	}
+
+	public void setId( Integer id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( ID, id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.id = id;
+		LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE );
+	}
+
+	public Integer getPergunta_id()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( PERGUNTA_ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.pergunta_id;
+	}
+
+	public void setPergunta_id( Integer pergunta_id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( PERGUNTA_ID, pergunta_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.pergunta_id = pergunta_id;
+		LAZY_LOADED_OBJECTS.put( PERGUNTA_ID, Boolean.TRUE );
+	}
+
+	public db.data.siprp_local.outer.CurQuestionarioPerguntaData toPergunta_id()
+	{
+		try
+		{
+			prepare( TO_PERGUNTA_ID );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		return this.to_pergunta_id;
+	}
+
+	public void setToPergunta_id( db.data.siprp_local.outer.CurQuestionarioPerguntaData to_pergunta_id )
+	{
+		try
+		{
+			preProcess( TO_PERGUNTA_ID, to_pergunta_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.to_pergunta_id = to_pergunta_id;
+	}
+
+	public Integer getFormando_id()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( FORMANDO_ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.formando_id;
+	}
+
+	public void setFormando_id( Integer formando_id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( FORMANDO_ID, formando_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.formando_id = formando_id;
+		LAZY_LOADED_OBJECTS.put( FORMANDO_ID, Boolean.TRUE );
+	}
+
+	public db.data.siprp_local.outer.CurFormandosData toFormando_id()
+	{
+		try
+		{
+			prepare( TO_FORMANDO_ID );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		return this.to_formando_id;
+	}
+
+	public void setToFormando_id( db.data.siprp_local.outer.CurFormandosData to_formando_id )
+	{
+		try
+		{
+			preProcess( TO_FORMANDO_ID, to_formando_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.to_formando_id = to_formando_id;
+	}
+
+	public Integer getCurso_id()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( CURSO_ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.curso_id;
+	}
+
+	public void setCurso_id( Integer curso_id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( CURSO_ID, curso_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.curso_id = curso_id;
+		LAZY_LOADED_OBJECTS.put( CURSO_ID, Boolean.TRUE );
+	}
+
+	public db.data.siprp_local.outer.CurCursosData toCurso_id()
+	{
+		try
+		{
+			prepare( TO_CURSO_ID );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		return this.to_curso_id;
+	}
+
+	public void setToCurso_id( db.data.siprp_local.outer.CurCursosData to_curso_id )
+	{
+		try
+		{
+			preProcess( TO_CURSO_ID, to_curso_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.to_curso_id = to_curso_id;
+	}
+
+	public Integer getResposta()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( RESPOSTA );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.resposta;
+	}
+
+	public void setResposta( Integer resposta )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( RESPOSTA, resposta );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.resposta = resposta;
+		LAZY_LOADED_OBJECTS.put( RESPOSTA, Boolean.TRUE );
+	}
+
+	public Object get( String fieldName )
+	{
+		Object value = null;
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case CurQuestionarioResposta.ID_INDEX:
+				value = getId();
+				break;
+			case CurQuestionarioResposta.PERGUNTA_ID_INDEX:
+				value = getPergunta_id();
+				break;
+			case CurQuestionarioResposta.TO_PERGUNTA_ID_INDEX:
+				value = toPergunta_id();
+				break;
+			case CurQuestionarioResposta.FORMANDO_ID_INDEX:
+				value = getFormando_id();
+				break;
+			case CurQuestionarioResposta.TO_FORMANDO_ID_INDEX:
+				value = toFormando_id();
+				break;
+			case CurQuestionarioResposta.CURSO_ID_INDEX:
+				value = getCurso_id();
+				break;
+			case CurQuestionarioResposta.TO_CURSO_ID_INDEX:
+				value = toCurso_id();
+				break;
+			case CurQuestionarioResposta.RESPOSTA_INDEX:
+				value = getResposta();
+				break;
+		}
+		return value;
+	}
+
+	public Object rawGet( String fieldName )
+	{
+		Object value = null;
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case CurQuestionarioResposta.ID_INDEX:
+				value = this.id;
+				break;
+			case CurQuestionarioResposta.PERGUNTA_ID_INDEX:
+				value = this.pergunta_id;
+				break;
+			case CurQuestionarioResposta.TO_PERGUNTA_ID_INDEX:
+				value = this.to_pergunta_id;
+				break;
+			case CurQuestionarioResposta.FORMANDO_ID_INDEX:
+				value = this.formando_id;
+				break;
+			case CurQuestionarioResposta.TO_FORMANDO_ID_INDEX:
+				value = this.to_formando_id;
+				break;
+			case CurQuestionarioResposta.CURSO_ID_INDEX:
+				value = this.curso_id;
+				break;
+			case CurQuestionarioResposta.TO_CURSO_ID_INDEX:
+				value = this.to_curso_id;
+				break;
+			case CurQuestionarioResposta.RESPOSTA_INDEX:
+				value = this.resposta;
+				break;
+		}
+		return value;
+	}
+
+	public void set( String fieldName, Object value )
+	{
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case CurQuestionarioResposta.ID_INDEX:
+				setId( ( Integer ) value );
+				break;
+			case CurQuestionarioResposta.PERGUNTA_ID_INDEX:
+				setPergunta_id( ( Integer ) value );
+				break;
+			case CurQuestionarioResposta.TO_PERGUNTA_ID_INDEX:
+				setToPergunta_id( ( db.data.siprp_local.outer.CurQuestionarioPerguntaData ) value );
+				break;
+			case CurQuestionarioResposta.FORMANDO_ID_INDEX:
+				setFormando_id( ( Integer ) value );
+				break;
+			case CurQuestionarioResposta.TO_FORMANDO_ID_INDEX:
+				setToFormando_id( ( db.data.siprp_local.outer.CurFormandosData ) value );
+				break;
+			case CurQuestionarioResposta.CURSO_ID_INDEX:
+				setCurso_id( ( Integer ) value );
+				break;
+			case CurQuestionarioResposta.TO_CURSO_ID_INDEX:
+				setToCurso_id( ( db.data.siprp_local.outer.CurCursosData ) value );
+				break;
+			case CurQuestionarioResposta.RESPOSTA_INDEX:
+				setResposta( ( Integer ) value );
+				break;
+		}
+	}
+
+	public void rawSet( String fieldName, Object value )
+	{
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case CurQuestionarioResposta.ID_INDEX:
+				this.id = ( Integer ) value;
+				break;
+			case CurQuestionarioResposta.PERGUNTA_ID_INDEX:
+				this.pergunta_id = ( Integer ) value;
+				break;
+			case CurQuestionarioResposta.TO_PERGUNTA_ID_INDEX:
+				this.to_pergunta_id = ( db.data.siprp_local.outer.CurQuestionarioPerguntaData ) value;
+				break;
+			case CurQuestionarioResposta.FORMANDO_ID_INDEX:
+				this.formando_id = ( Integer ) value;
+				break;
+			case CurQuestionarioResposta.TO_FORMANDO_ID_INDEX:
+				this.to_formando_id = ( db.data.siprp_local.outer.CurFormandosData ) value;
+				break;
+			case CurQuestionarioResposta.CURSO_ID_INDEX:
+				this.curso_id = ( Integer ) value;
+				break;
+			case CurQuestionarioResposta.TO_CURSO_ID_INDEX:
+				this.to_curso_id = ( db.data.siprp_local.outer.CurCursosData ) value;
+				break;
+			case CurQuestionarioResposta.RESPOSTA_INDEX:
+				this.resposta = ( Integer ) value;
+				break;
+		}
+	}
+
+	public String []getFieldNames()
+	{
+		return FIELD_NAMES;
+	}
+
+	public String []getFieldNamesFull()
+	{
+		return FIELD_NAMES_FULL;
+	}
+
+	public String []getDBFieldNames()
+	{
+		return DB_FIELD_NAMES;
+	}
+
+	public String []getPrimaryKeyNames()
+	{
+		return PK_FIELD_NAMES;
+	}
+
+	public String []getDefaultLoadSet()
+	{
+		return DEFAULT_LOAD_SET;
+	}
+
+	public String getPrimaryKeyName()
+	{
+		return PK_FIELD_NAMES[ 0 ];
+	}
+
+	public Class<?> getFieldClass( String fieldName )
+	{
+		Integer index = getFieldIndex( fieldName );
+		Class<?> theClass = null;
+		switch( index )
+		{
+			case CurQuestionarioResposta.ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case CurQuestionarioResposta.PERGUNTA_ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case CurQuestionarioResposta.TO_PERGUNTA_ID_INDEX:
+				theClass = db.data.siprp_local.outer.CurQuestionarioPerguntaData.class;
+				break;
+			case CurQuestionarioResposta.FORMANDO_ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case CurQuestionarioResposta.TO_FORMANDO_ID_INDEX:
+				theClass = db.data.siprp_local.outer.CurFormandosData.class;
+				break;
+			case CurQuestionarioResposta.CURSO_ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case CurQuestionarioResposta.TO_CURSO_ID_INDEX:
+				theClass = db.data.siprp_local.outer.CurCursosData.class;
+				break;
+			case CurQuestionarioResposta.RESPOSTA_INDEX:
+				theClass = Integer.class;
+				break;
+		}
+		return theClass;
+	}
+
+	public Integer getFieldIndex( String fieldName )
+	{
+		Integer index = FIELD_INDEXES.get( fieldName );
+		return index != null ? index : CurQuestionarioResposta._INVALID__INDEX;
+	}
+
+	public String getTableName()
+	{
+		return TABLENAME;
+	}
+
+	public String getClassIdentifier()
+	{
+		return CLASS_IDENTIFIER;
+	}
+
+	@Override
+	protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col )
+	{
+		if( primaryKey == null )
+		{
+			primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, CurQuestionarioResposta.PK_FIELD_NAMES );
+			primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) );
+		}
+		setId( ( Integer ) array.get( row, col + 0 ) );
+	}
+
+	@Override
+	public com.evolute.entity.utils.IntegerPrimaryKey getPrimaryKey()
+	{
+		return primaryKey;
+	}
+
+	public void initLazyLoadFields()
+	{
+	}
+
+	public boolean isPropertyLoaded( String fieldName )
+	{
+		if ( LAZY_LOADED_OBJECTS.get( fieldName ) == null )
+		{
+			return true;
+		}
+		else
+		{
+			return LAZY_LOADED_OBJECTS.get( fieldName );
+		}
+	}
+}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/CurTopicos.java

@@ -156,28 +156,34 @@ public class CurTopicos extends com.evolute.entity.evo.EvoDataObject<com.evolute
 
 	public java.util.List<db.data.siprp_local.outer.CurTopicosData>fromCurTopicos_parent_id()
 	{
-		java.util.List<db.data.siprp_local.outer.CurTopicosData> result = null;
+		java.util.List<db.data.siprp_local.outer.CurTopicosData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurTopicosData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.CurTopicosData.class , getPrimaryKey().getMap().get("id"), "parent_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.CurTopicosData.class , getPrimaryKey().getMap().get("id"), "parent_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.CurTopicosAulasData>fromCurTopicosAulas_topico_id()
 	{
-		java.util.List<db.data.siprp_local.outer.CurTopicosAulasData> result = null;
+		java.util.List<db.data.siprp_local.outer.CurTopicosAulasData> result = new java.util.LinkedList< db.data.siprp_local.outer.CurTopicosAulasData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.CurTopicosAulasData.class , getPrimaryKey().getMap().get("id"), "topico_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.CurTopicosAulasData.class , getPrimaryKey().getMap().get("id"), "topico_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/EcdOficial.java

@@ -115,14 +115,17 @@ public class EcdOficial extends com.evolute.entity.evo.EvoDataObject<com.evolute
 
 	public java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdData>fromTrabalhadoresEcd_ecd_oficial_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdData> result = null;
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdData.class , getPrimaryKey().getMap().get("id"), "ecd_oficial_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdData.class , getPrimaryKey().getMap().get("id"), "ecd_oficial_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/EmpresaPrecoPeriodicidadeTipo.java

@@ -96,14 +96,17 @@ public class EmpresaPrecoPeriodicidadeTipo extends com.evolute.entity.evo.EvoDat
 
 	public java.util.List<db.data.siprp_local.outer.EmpresaPrecoServicoData>fromEmpresaPrecoServico_empresa_preco_periodicidade_tipo_id()
 	{
-		java.util.List<db.data.siprp_local.outer.EmpresaPrecoServicoData> result = null;
+		java.util.List<db.data.siprp_local.outer.EmpresaPrecoServicoData> result = new java.util.LinkedList< db.data.siprp_local.outer.EmpresaPrecoServicoData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.EmpresaPrecoServicoData.class , getPrimaryKey().getMap().get("id"), "empresa_preco_periodicidade_tipo_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.EmpresaPrecoServicoData.class , getPrimaryKey().getMap().get("id"), "empresa_preco_periodicidade_tipo_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/EmpresaPrecoServicoTipo.java

@@ -96,14 +96,17 @@ public class EmpresaPrecoServicoTipo extends com.evolute.entity.evo.EvoDataObjec
 
 	public java.util.List<db.data.siprp_local.outer.EmpresaPrecoServicoData>fromEmpresaPrecoServico_empresa_preco_servico_tipo_id()
 	{
-		java.util.List<db.data.siprp_local.outer.EmpresaPrecoServicoData> result = null;
+		java.util.List<db.data.siprp_local.outer.EmpresaPrecoServicoData> result = new java.util.LinkedList< db.data.siprp_local.outer.EmpresaPrecoServicoData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.EmpresaPrecoServicoData.class , getPrimaryKey().getMap().get("id"), "empresa_preco_servico_tipo_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.EmpresaPrecoServicoData.class , getPrimaryKey().getMap().get("id"), "empresa_preco_servico_tipo_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/Empresas.java

@@ -417,154 +417,204 @@ public class Empresas extends com.evolute.entity.evo.EvoDataObject<com.evolute.e
 
 	public java.util.List<db.data.siprp_local.outer.AvisosData>fromAvisos_empresa_id()
 	{
-		java.util.List<db.data.siprp_local.outer.AvisosData> result = null;
+		java.util.List<db.data.siprp_local.outer.AvisosData> result = new java.util.LinkedList< db.data.siprp_local.outer.AvisosData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.AvisosData.class , getPrimaryKey().getMap().get("id"), "empresa_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.AvisosData.class , getPrimaryKey().getMap().get("id"), "empresa_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.EmpresaPrecoServicoData>fromEmpresaPrecoServico_empresa_id()
 	{
-		java.util.List<db.data.siprp_local.outer.EmpresaPrecoServicoData> result = null;
+		java.util.List<db.data.siprp_local.outer.EmpresaPrecoServicoData> result = new java.util.LinkedList< db.data.siprp_local.outer.EmpresaPrecoServicoData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.EmpresaPrecoServicoData.class , getPrimaryKey().getMap().get("id"), "empresa_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.EmpresaPrecoServicoData.class , getPrimaryKey().getMap().get("id"), "empresa_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.EstabelecimentosData>fromEstabelecimentos_empresa_id()
 	{
-		java.util.List<db.data.siprp_local.outer.EstabelecimentosData> result = null;
+		java.util.List<db.data.siprp_local.outer.EstabelecimentosData> result = new java.util.LinkedList< db.data.siprp_local.outer.EstabelecimentosData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.EstabelecimentosData.class , getPrimaryKey().getMap().get("id"), "empresa_id" );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.EstabelecimentosData.class , getPrimaryKey().getMap().get("id"), "empresa_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
-		catch( com.evolute.entity.evo.EvoDataException edex )
+		return result;
+	}
+
+	public java.util.List<db.data.siprp_local.outer.FilFileEmpresaData>fromFilFileEmpresa_empresa_id()
+	{
+		java.util.List<db.data.siprp_local.outer.FilFileEmpresaData> result = new java.util.LinkedList< db.data.siprp_local.outer.FilFileEmpresaData >();
+		if ( getPrimaryKey() != null ) 
 		{
-			throw new RuntimeException( edex );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.FilFileEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HsAreaData>fromHsArea_empresa_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsAreaData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsAreaData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsAreaData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsAreaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsAreaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HsEmailEmpresaData>fromHsEmailEmpresa_empresa_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsEmailEmpresaData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsEmailEmpresaData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsEmailEmpresaData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsEmailEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsEmailEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HsLegislacaoEmpresaData>fromHsLegislacaoEmpresa_empresa_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsLegislacaoEmpresaData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsLegislacaoEmpresaData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsLegislacaoEmpresaData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsLegislacaoEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsLegislacaoEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HsNormalizacaoEmpresaData>fromHsNormalizacaoEmpresa_empresa_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsNormalizacaoEmpresaData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsNormalizacaoEmpresaData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsNormalizacaoEmpresaData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsNormalizacaoEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsNormalizacaoEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HsRiscoEmpresaData>fromHsRiscoEmpresa_empresa_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsRiscoEmpresaData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsRiscoEmpresaData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsRiscoEmpresaData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsRiscoEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsRiscoEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.LembretesData>fromLembretes_empresa_id()
 	{
-		java.util.List<db.data.siprp_local.outer.LembretesData> result = null;
+		java.util.List<db.data.siprp_local.outer.LembretesData> result = new java.util.LinkedList< db.data.siprp_local.outer.LembretesData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "empresa_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "empresa_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.MarcacoesEmpresaData>fromMarcacoesEmpresa_empresa_id()
 	{
-		java.util.List<db.data.siprp_local.outer.MarcacoesEmpresaData> result = null;
+		java.util.List<db.data.siprp_local.outer.MarcacoesEmpresaData> result = new java.util.LinkedList< db.data.siprp_local.outer.MarcacoesEmpresaData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
-			result = fromReference( db.data.siprp_local.outer.MarcacoesEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" );
-		}
-		catch( com.evolute.entity.evo.EvoDataException edex )
 		{
-			throw new RuntimeException( edex );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.MarcacoesEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.PrtElementosProtocoloData>fromPrtElementosProtocolo_empresa_id()
 	{
-		java.util.List<db.data.siprp_local.outer.PrtElementosProtocoloData> result = null;
+		java.util.List<db.data.siprp_local.outer.PrtElementosProtocoloData> result = new java.util.LinkedList< db.data.siprp_local.outer.PrtElementosProtocoloData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.PrtElementosProtocoloData.class , getPrimaryKey().getMap().get("id"), "empresa_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.PrtElementosProtocoloData.class , getPrimaryKey().getMap().get("id"), "empresa_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/Estabelecimentos.java

@@ -232,154 +232,187 @@ public class Estabelecimentos extends com.evolute.entity.evo.EvoDataObject<com.e
 
 	public java.util.List<db.data.siprp_local.outer.AptSegurancaAlimentarData>fromAptSegurancaAlimentar_estabelecimento_id()
 	{
-		java.util.List<db.data.siprp_local.outer.AptSegurancaAlimentarData> result = null;
+		java.util.List<db.data.siprp_local.outer.AptSegurancaAlimentarData> result = new java.util.LinkedList< db.data.siprp_local.outer.AptSegurancaAlimentarData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.AptSegurancaAlimentarData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.AptSegurancaAlimentarData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.AvisosData>fromAvisos_estabelecimento_id()
 	{
-		java.util.List<db.data.siprp_local.outer.AvisosData> result = null;
+		java.util.List<db.data.siprp_local.outer.AvisosData> result = new java.util.LinkedList< db.data.siprp_local.outer.AvisosData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.AvisosData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.AvisosData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.EmailPlanoDeActuacaoData>fromEmailPlanoDeActuacao_estabelecimento_id()
 	{
-		java.util.List<db.data.siprp_local.outer.EmailPlanoDeActuacaoData> result = null;
+		java.util.List<db.data.siprp_local.outer.EmailPlanoDeActuacaoData> result = new java.util.LinkedList< db.data.siprp_local.outer.EmailPlanoDeActuacaoData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.EmailPlanoDeActuacaoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.EmailPlanoDeActuacaoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HistoricoEstabelecimentoData>fromHistoricoEstabelecimento_estabelecimento_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HistoricoEstabelecimentoData> result = null;
+		java.util.List<db.data.siprp_local.outer.HistoricoEstabelecimentoData> result = new java.util.LinkedList< db.data.siprp_local.outer.HistoricoEstabelecimentoData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HistoricoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HistoricoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HsEmailEstabelecimentoData>fromHsEmailEstabelecimento_estabelecimento_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsEmailEstabelecimentoData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsEmailEstabelecimentoData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsEmailEstabelecimentoData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsEmailEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsEmailEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData>fromHsLegislacaoEstabelecimento_estabelecimento_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HsNormalizacaoEstabelecimentoData>fromHsNormalizacaoEstabelecimento_estabelecimento_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsNormalizacaoEstabelecimentoData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsNormalizacaoEstabelecimentoData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsNormalizacaoEstabelecimentoData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsNormalizacaoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsNormalizacaoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HsPostoEstabelecimentoData>fromHsPostoEstabelecimento_estabelecimento_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsPostoEstabelecimentoData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsPostoEstabelecimentoData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsPostoEstabelecimentoData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsPostoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsPostoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.LembretesData>fromLembretes_estabelecimento_id()
 	{
-		java.util.List<db.data.siprp_local.outer.LembretesData> result = null;
+		java.util.List<db.data.siprp_local.outer.LembretesData> result = new java.util.LinkedList< db.data.siprp_local.outer.LembretesData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
-			result = fromReference( db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" );
-		}
-		catch( com.evolute.entity.evo.EvoDataException edex )
 		{
-			throw new RuntimeException( edex );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.MarcacoesEstabelecimentoData>fromMarcacoesEstabelecimento_estabelecimento_id()
 	{
-		java.util.List<db.data.siprp_local.outer.MarcacoesEstabelecimentoData> result = null;
+		java.util.List<db.data.siprp_local.outer.MarcacoesEstabelecimentoData> result = new java.util.LinkedList< db.data.siprp_local.outer.MarcacoesEstabelecimentoData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
-			result = fromReference( db.data.siprp_local.outer.MarcacoesEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" );
-		}
-		catch( com.evolute.entity.evo.EvoDataException edex )
 		{
-			throw new RuntimeException( edex );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.MarcacoesEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.TrabalhadoresData>fromTrabalhadores_estabelecimento_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresData> result = null;
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/EvoPessoa.java

@@ -174,28 +174,34 @@ public class EvoPessoa extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 
 	public java.util.List<db.data.siprp_local.outer.PesPessoaDocumentoData>fromPesPessoaDocumento_pessoa_id()
 	{
-		java.util.List<db.data.siprp_local.outer.PesPessoaDocumentoData> result = null;
+		java.util.List<db.data.siprp_local.outer.PesPessoaDocumentoData> result = new java.util.LinkedList< db.data.siprp_local.outer.PesPessoaDocumentoData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.PesPessoaDocumentoData.class , getPrimaryKey().getMap().get("id"), "pessoa_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.PesPessoaDocumentoData.class , getPrimaryKey().getMap().get("id"), "pessoa_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.TrabalhadoresData>fromTrabalhadores_pessoa_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresData> result = null;
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresData.class , getPrimaryKey().getMap().get("id"), "pessoa_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresData.class , getPrimaryKey().getMap().get("id"), "pessoa_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/EvoUsrPermission.java

@@ -115,14 +115,17 @@ public class EvoUsrPermission extends com.evolute.entity.evo.EvoDataObject<com.e
 
 	public java.util.List<db.data.siprp_local.outer.EvoUsrRolesPermissionsData>fromEvoUsrRolesPermissions_permission_id()
 	{
-		java.util.List<db.data.siprp_local.outer.EvoUsrRolesPermissionsData> result = null;
+		java.util.List<db.data.siprp_local.outer.EvoUsrRolesPermissionsData> result = new java.util.LinkedList< db.data.siprp_local.outer.EvoUsrRolesPermissionsData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.EvoUsrRolesPermissionsData.class , getPrimaryKey().getMap().get("id"), "permission_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.EvoUsrRolesPermissionsData.class , getPrimaryKey().getMap().get("id"), "permission_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/EvoUsrPreferences.java

@@ -0,0 +1,481 @@
+/*
+* EvoUsrPreferences.java
+*
+* Generated by com.evutils.codegen.EntityObjectGenerator
+*
+* Use but DON'T TOUCH
+* -> (can't touch this)
+*/
+package db.data.siprp_local.inner;
+
+
+public class EvoUsrPreferences extends com.evolute.entity.evo.EvoDataObject<com.evolute.entity.utils.IntegerPrimaryKey>
+{
+	private static final java.util.HashMap<String,Integer> FIELD_INDEXES = new java.util.HashMap<String,Integer>();
+
+	static
+	{
+		FIELD_INDEXES.put( EvoUsrPreferences.ID, EvoUsrPreferences.ID_INDEX );
+		FIELD_INDEXES.put( EvoUsrPreferences.ID_FULL, EvoUsrPreferences.ID_INDEX );
+		FIELD_INDEXES.put( EvoUsrPreferences.DELETED_STAMP, EvoUsrPreferences.DELETED_STAMP_INDEX );
+		FIELD_INDEXES.put( EvoUsrPreferences.DELETED_STAMP_FULL, EvoUsrPreferences.DELETED_STAMP_INDEX );
+		com.evolute.entity.evo.EvoDataObject.register( EvoUsrPreferences.CLASS_IDENTIFIER, EvoUsrPreferences.USER_ID, EvoUsrPreferences.TO_USER_ID ); 
+		FIELD_INDEXES.put( EvoUsrPreferences.USER_ID, EvoUsrPreferences.USER_ID_INDEX );
+		FIELD_INDEXES.put( EvoUsrPreferences.USER_ID_FULL, EvoUsrPreferences.USER_ID_INDEX );
+		FIELD_INDEXES.put( EvoUsrPreferences.TO_USER_ID, EvoUsrPreferences.TO_USER_ID_INDEX );
+		FIELD_INDEXES.put( EvoUsrPreferences.PROPERTY, EvoUsrPreferences.PROPERTY_INDEX );
+		FIELD_INDEXES.put( EvoUsrPreferences.PROPERTY_FULL, EvoUsrPreferences.PROPERTY_INDEX );
+		FIELD_INDEXES.put( EvoUsrPreferences.VALUE, EvoUsrPreferences.VALUE_INDEX );
+		FIELD_INDEXES.put( EvoUsrPreferences.VALUE_FULL, EvoUsrPreferences.VALUE_INDEX );
+	}
+
+	private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
+
+
+	public static final com.evolute.entity.ForeignKey ForeignKeyuser_idToevo_usr_user = 
+		new com.evolute.entity.ForeignKey( EvoUsrPreferences.class, EvoUsrPreferences.USER_ID, db.data.siprp_local.outer.EvoUsrUserData.class, db.data.siprp_local.outer.EvoUsrUserData.ID );
+
+	public static final String TABLENAME = "evo_usr_preferences";
+
+
+	public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.evo_usr_preferences";
+
+	public static final int _INVALID__INDEX = -1;
+	public static final String ID = "id";
+	public static final String ID_FULL = "evo_usr_preferences.id";
+	public static final int ID_INDEX = 0;
+	public static final String DELETED_STAMP = "deleted_stamp";
+	public static final String DELETED_STAMP_FULL = "evo_usr_preferences.deleted_stamp";
+	public static final int DELETED_STAMP_INDEX = 1;
+	public static final String USER_ID = "user_id";
+	public static final String USER_ID_FULL = "evo_usr_preferences.user_id";
+	public static final int USER_ID_INDEX = 2;
+	public static final String TO_USER_ID = "to_user_id";
+	public static final String TO_USER_ID_FULL = "evo_usr_preferences.to_user_id";
+	public static final int TO_USER_ID_INDEX = 3;
+	public static final String PROPERTY = "property";
+	public static final String PROPERTY_FULL = "evo_usr_preferences.property";
+	public static final int PROPERTY_INDEX = 4;
+	public static final String VALUE = "value";
+	public static final String VALUE_FULL = "evo_usr_preferences.value";
+	public static final int VALUE_INDEX = 5;
+
+	public static final String FIELD_NAMES[] = new String[]{
+		DELETED_STAMP, USER_ID, TO_USER_ID, PROPERTY, VALUE, };
+
+	public static final String FIELD_NAMES_FULL[] = new String[]{
+		TABLENAME + "." + DELETED_STAMP, TABLENAME + "." + USER_ID, TABLENAME + "." + TO_USER_ID, TABLENAME + "." + PROPERTY, TABLENAME + "." + VALUE, };
+
+	protected static final String DB_FIELD_NAMES[] = new String[]{
+		ID, DELETED_STAMP, USER_ID, PROPERTY, VALUE, };
+
+
+	protected static final String PK_FIELD_NAMES[] = new String[]{
+		ID, };
+
+
+	public static final String DEFAULT_LOAD_SET[] = new String[] {
+		ID, DELETED_STAMP, USER_ID, PROPERTY, VALUE, };
+
+	private Integer id;
+	private java.sql.Timestamp deleted_stamp;
+	private Integer user_id;
+	private db.data.siprp_local.outer.EvoUsrUserData to_user_id;
+	private String property;
+	private String value;
+
+	protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
+
+	public EvoUsrPreferences()
+	{
+		super();
+		dirtyProperties = new boolean[]{ false, false, false
+			, false, false, false };
+	}
+
+	public Integer getId()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.id;
+	}
+
+	public void setId( Integer id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( ID, id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.id = id;
+		LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE );
+	}
+
+	public java.sql.Timestamp getDeleted_stamp()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( DELETED_STAMP );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.deleted_stamp;
+	}
+
+	public void setDeleted_stamp( java.sql.Timestamp deleted_stamp )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( DELETED_STAMP, deleted_stamp );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.deleted_stamp = deleted_stamp;
+		LAZY_LOADED_OBJECTS.put( DELETED_STAMP, Boolean.TRUE );
+	}
+
+	public Integer getUser_id()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( USER_ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.user_id;
+	}
+
+	public void setUser_id( Integer user_id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( USER_ID, user_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.user_id = user_id;
+		LAZY_LOADED_OBJECTS.put( USER_ID, Boolean.TRUE );
+	}
+
+	public db.data.siprp_local.outer.EvoUsrUserData toUser_id()
+	{
+		try
+		{
+			prepare( TO_USER_ID );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		return this.to_user_id;
+	}
+
+	public void setToUser_id( db.data.siprp_local.outer.EvoUsrUserData to_user_id )
+	{
+		try
+		{
+			preProcess( TO_USER_ID, to_user_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.to_user_id = to_user_id;
+	}
+
+	public String getProperty()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( PROPERTY );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.property;
+	}
+
+	public void setProperty( String property )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( PROPERTY, property );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.property = property;
+		LAZY_LOADED_OBJECTS.put( PROPERTY, Boolean.TRUE );
+	}
+
+	public String getValue()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( VALUE );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.value;
+	}
+
+	public void setValue( String value )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( VALUE, value );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.value = value;
+		LAZY_LOADED_OBJECTS.put( VALUE, Boolean.TRUE );
+	}
+
+	public Object get( String fieldName )
+	{
+		Object value = null;
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case EvoUsrPreferences.ID_INDEX:
+				value = getId();
+				break;
+			case EvoUsrPreferences.DELETED_STAMP_INDEX:
+				value = getDeleted_stamp();
+				break;
+			case EvoUsrPreferences.USER_ID_INDEX:
+				value = getUser_id();
+				break;
+			case EvoUsrPreferences.TO_USER_ID_INDEX:
+				value = toUser_id();
+				break;
+			case EvoUsrPreferences.PROPERTY_INDEX:
+				value = getProperty();
+				break;
+			case EvoUsrPreferences.VALUE_INDEX:
+				value = getValue();
+				break;
+		}
+		return value;
+	}
+
+	public Object rawGet( String fieldName )
+	{
+		Object value = null;
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case EvoUsrPreferences.ID_INDEX:
+				value = this.id;
+				break;
+			case EvoUsrPreferences.DELETED_STAMP_INDEX:
+				value = this.deleted_stamp;
+				break;
+			case EvoUsrPreferences.USER_ID_INDEX:
+				value = this.user_id;
+				break;
+			case EvoUsrPreferences.TO_USER_ID_INDEX:
+				value = this.to_user_id;
+				break;
+			case EvoUsrPreferences.PROPERTY_INDEX:
+				value = this.property;
+				break;
+			case EvoUsrPreferences.VALUE_INDEX:
+				value = this.value;
+				break;
+		}
+		return value;
+	}
+
+	public void set( String fieldName, Object value )
+	{
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case EvoUsrPreferences.ID_INDEX:
+				setId( ( Integer ) value );
+				break;
+			case EvoUsrPreferences.DELETED_STAMP_INDEX:
+				setDeleted_stamp( ( java.sql.Timestamp ) value );
+				break;
+			case EvoUsrPreferences.USER_ID_INDEX:
+				setUser_id( ( Integer ) value );
+				break;
+			case EvoUsrPreferences.TO_USER_ID_INDEX:
+				setToUser_id( ( db.data.siprp_local.outer.EvoUsrUserData ) value );
+				break;
+			case EvoUsrPreferences.PROPERTY_INDEX:
+				setProperty( ( String ) value );
+				break;
+			case EvoUsrPreferences.VALUE_INDEX:
+				setValue( ( String ) value );
+				break;
+		}
+	}
+
+	public void rawSet( String fieldName, Object value )
+	{
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case EvoUsrPreferences.ID_INDEX:
+				this.id = ( Integer ) value;
+				break;
+			case EvoUsrPreferences.DELETED_STAMP_INDEX:
+				this.deleted_stamp = ( java.sql.Timestamp ) value;
+				break;
+			case EvoUsrPreferences.USER_ID_INDEX:
+				this.user_id = ( Integer ) value;
+				break;
+			case EvoUsrPreferences.TO_USER_ID_INDEX:
+				this.to_user_id = ( db.data.siprp_local.outer.EvoUsrUserData ) value;
+				break;
+			case EvoUsrPreferences.PROPERTY_INDEX:
+				this.property = ( String ) value;
+				break;
+			case EvoUsrPreferences.VALUE_INDEX:
+				this.value = ( String ) value;
+				break;
+		}
+	}
+
+	public String []getFieldNames()
+	{
+		return FIELD_NAMES;
+	}
+
+	public String []getFieldNamesFull()
+	{
+		return FIELD_NAMES_FULL;
+	}
+
+	public String []getDBFieldNames()
+	{
+		return DB_FIELD_NAMES;
+	}
+
+	public String []getPrimaryKeyNames()
+	{
+		return PK_FIELD_NAMES;
+	}
+
+	public String []getDefaultLoadSet()
+	{
+		return DEFAULT_LOAD_SET;
+	}
+
+	public String getPrimaryKeyName()
+	{
+		return PK_FIELD_NAMES[ 0 ];
+	}
+
+	public Class<?> getFieldClass( String fieldName )
+	{
+		Integer index = getFieldIndex( fieldName );
+		Class<?> theClass = null;
+		switch( index )
+		{
+			case EvoUsrPreferences.ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case EvoUsrPreferences.DELETED_STAMP_INDEX:
+				theClass = java.sql.Timestamp.class;
+				break;
+			case EvoUsrPreferences.USER_ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case EvoUsrPreferences.TO_USER_ID_INDEX:
+				theClass = db.data.siprp_local.outer.EvoUsrUserData.class;
+				break;
+			case EvoUsrPreferences.PROPERTY_INDEX:
+				theClass = String.class;
+				break;
+			case EvoUsrPreferences.VALUE_INDEX:
+				theClass = String.class;
+				break;
+		}
+		return theClass;
+	}
+
+	public Integer getFieldIndex( String fieldName )
+	{
+		Integer index = FIELD_INDEXES.get( fieldName );
+		return index != null ? index : EvoUsrPreferences._INVALID__INDEX;
+	}
+
+	public String getTableName()
+	{
+		return TABLENAME;
+	}
+
+	public String getClassIdentifier()
+	{
+		return CLASS_IDENTIFIER;
+	}
+
+	@Override
+	protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col )
+	{
+		if( primaryKey == null )
+		{
+			primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, EvoUsrPreferences.PK_FIELD_NAMES );
+			primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) );
+		}
+		setId( ( Integer ) array.get( row, col + 0 ) );
+	}
+
+	@Override
+	public com.evolute.entity.utils.IntegerPrimaryKey getPrimaryKey()
+	{
+		return primaryKey;
+	}
+
+	public void initLazyLoadFields()
+	{
+	}
+
+	public boolean isPropertyLoaded( String fieldName )
+	{
+		if ( LAZY_LOADED_OBJECTS.get( fieldName ) == null )
+		{
+			return true;
+		}
+		else
+		{
+			return LAZY_LOADED_OBJECTS.get( fieldName );
+		}
+	}
+}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/EvoUsrRole.java

@@ -102,28 +102,34 @@ public class EvoUsrRole extends com.evolute.entity.evo.EvoDataObject<com.evolute
 
 	public java.util.List<db.data.siprp_local.outer.EvoUsrRolesPermissionsData>fromEvoUsrRolesPermissions_role_id()
 	{
-		java.util.List<db.data.siprp_local.outer.EvoUsrRolesPermissionsData> result = null;
+		java.util.List<db.data.siprp_local.outer.EvoUsrRolesPermissionsData> result = new java.util.LinkedList< db.data.siprp_local.outer.EvoUsrRolesPermissionsData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.EvoUsrRolesPermissionsData.class , getPrimaryKey().getMap().get("id"), "role_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.EvoUsrRolesPermissionsData.class , getPrimaryKey().getMap().get("id"), "role_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.EvoUsrUsersRolesData>fromEvoUsrUsersRoles_role_id()
 	{
-		java.util.List<db.data.siprp_local.outer.EvoUsrUsersRolesData> result = null;
+		java.util.List<db.data.siprp_local.outer.EvoUsrUsersRolesData> result = new java.util.LinkedList< db.data.siprp_local.outer.EvoUsrUsersRolesData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.EvoUsrUsersRolesData.class , getPrimaryKey().getMap().get("id"), "role_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.EvoUsrUsersRolesData.class , getPrimaryKey().getMap().get("id"), "role_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/EvoUsrUser.java

@@ -166,30 +166,53 @@ public class EvoUsrUser extends com.evolute.entity.evo.EvoDataObject<com.evolute
 		LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE );
 	}
 
-	public java.util.List<db.data.siprp_local.outer.EvoUsrUsersRolesData>fromEvoUsrUsersRoles_user_id()
+	public java.util.List<db.data.siprp_local.outer.EvoUsrPreferencesData>fromEvoUsrPreferences_user_id()
 	{
-		java.util.List<db.data.siprp_local.outer.EvoUsrUsersRolesData> result = null;
+		java.util.List<db.data.siprp_local.outer.EvoUsrPreferencesData> result = new java.util.LinkedList< db.data.siprp_local.outer.EvoUsrPreferencesData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.EvoUsrUsersRolesData.class , getPrimaryKey().getMap().get("id"), "user_id" );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.EvoUsrPreferencesData.class , getPrimaryKey().getMap().get("id"), "user_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
-		catch( com.evolute.entity.evo.EvoDataException edex )
+		return result;
+	}
+
+	public java.util.List<db.data.siprp_local.outer.EvoUsrUsersRolesData>fromEvoUsrUsersRoles_user_id()
+	{
+		java.util.List<db.data.siprp_local.outer.EvoUsrUsersRolesData> result = new java.util.LinkedList< db.data.siprp_local.outer.EvoUsrUsersRolesData >();
+		if ( getPrimaryKey() != null ) 
 		{
-			throw new RuntimeException( edex );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.EvoUsrUsersRolesData.class , getPrimaryKey().getMap().get("id"), "user_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.FilFileData>fromFilFile_user_id()
 	{
-		java.util.List<db.data.siprp_local.outer.FilFileData> result = null;
+		java.util.List<db.data.siprp_local.outer.FilFileData> result = new java.util.LinkedList< db.data.siprp_local.outer.FilFileData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.FilFileData.class , getPrimaryKey().getMap().get("id"), "user_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.FilFileData.class , getPrimaryKey().getMap().get("id"), "user_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/Exames.java

@@ -221,16 +221,36 @@ public class Exames extends com.evolute.entity.evo.EvoDataObject<com.evolute.ent
 		LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE );
 	}
 
-	public java.util.List<db.data.siprp_local.outer.TrabalhadoresFichasAptidaoData>fromTrabalhadoresFichasAptidao_exame_id()
+	public java.util.List<db.data.siprp_local.outer.LembretesData>fromLembretes_exame_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresFichasAptidaoData> result = null;
+		java.util.List<db.data.siprp_local.outer.LembretesData> result = new java.util.LinkedList< db.data.siprp_local.outer.LembretesData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresFichasAptidaoData.class , getPrimaryKey().getMap().get("id"), "exame_id" );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "exame_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
-		catch( com.evolute.entity.evo.EvoDataException edex )
+		return result;
+	}
+
+	public java.util.List<db.data.siprp_local.outer.TrabalhadoresFichasAptidaoData>fromTrabalhadoresFichasAptidao_exame_id()
+	{
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresFichasAptidaoData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresFichasAptidaoData >();
+		if ( getPrimaryKey() != null ) 
 		{
-			throw new RuntimeException( edex );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresFichasAptidaoData.class , getPrimaryKey().getMap().get("id"), "exame_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/FilCategorias.java

@@ -0,0 +1,448 @@
+/*
+* FilCategorias.java
+*
+* Generated by com.evutils.codegen.EntityObjectGenerator
+*
+* Use but DON'T TOUCH
+* -> (can't touch this)
+*/
+package db.data.siprp_local.inner;
+
+
+public class FilCategorias extends com.evolute.entity.evo.EvoDataObject<com.evolute.entity.utils.IntegerPrimaryKey>
+{
+	private static final java.util.HashMap<String,Integer> FIELD_INDEXES = new java.util.HashMap<String,Integer>();
+
+	static
+	{
+		FIELD_INDEXES.put( FilCategorias.ID, FilCategorias.ID_INDEX );
+		FIELD_INDEXES.put( FilCategorias.ID_FULL, FilCategorias.ID_INDEX );
+		FIELD_INDEXES.put( FilCategorias.CODIGO, FilCategorias.CODIGO_INDEX );
+		FIELD_INDEXES.put( FilCategorias.CODIGO_FULL, FilCategorias.CODIGO_INDEX );
+		FIELD_INDEXES.put( FilCategorias.DESCRICAO, FilCategorias.DESCRICAO_INDEX );
+		FIELD_INDEXES.put( FilCategorias.DESCRICAO_FULL, FilCategorias.DESCRICAO_INDEX );
+		FIELD_INDEXES.put( FilCategorias.ORDEM, FilCategorias.ORDEM_INDEX );
+		FIELD_INDEXES.put( FilCategorias.ORDEM_FULL, FilCategorias.ORDEM_INDEX );
+		FIELD_INDEXES.put( FilCategorias.DELETED_STAMP, FilCategorias.DELETED_STAMP_INDEX );
+		FIELD_INDEXES.put( FilCategorias.DELETED_STAMP_FULL, FilCategorias.DELETED_STAMP_INDEX );
+	}
+
+	private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
+
+
+	public static final String TABLENAME = "fil_categorias";
+
+
+	public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.fil_categorias";
+
+	public static final int _INVALID__INDEX = -1;
+	public static final String ID = "id";
+	public static final String ID_FULL = "fil_categorias.id";
+	public static final int ID_INDEX = 0;
+	public static final String CODIGO = "codigo";
+	public static final String CODIGO_FULL = "fil_categorias.codigo";
+	public static final int CODIGO_INDEX = 1;
+	public static final String DESCRICAO = "descricao";
+	public static final String DESCRICAO_FULL = "fil_categorias.descricao";
+	public static final int DESCRICAO_INDEX = 2;
+	public static final String ORDEM = "ordem";
+	public static final String ORDEM_FULL = "fil_categorias.ordem";
+	public static final int ORDEM_INDEX = 3;
+	public static final String DELETED_STAMP = "deleted_stamp";
+	public static final String DELETED_STAMP_FULL = "fil_categorias.deleted_stamp";
+	public static final int DELETED_STAMP_INDEX = 4;
+
+	public static final String FIELD_NAMES[] = new String[]{
+		CODIGO, DESCRICAO, ORDEM, DELETED_STAMP, };
+
+	public static final String FIELD_NAMES_FULL[] = new String[]{
+		TABLENAME + "." + CODIGO, TABLENAME + "." + DESCRICAO, TABLENAME + "." + ORDEM, TABLENAME + "." + DELETED_STAMP, };
+
+	protected static final String DB_FIELD_NAMES[] = new String[]{
+		ID, CODIGO, DESCRICAO, ORDEM, DELETED_STAMP, };
+
+
+	protected static final String PK_FIELD_NAMES[] = new String[]{
+		ID, };
+
+
+	public static final String DEFAULT_LOAD_SET[] = new String[] {
+		ID, CODIGO, DESCRICAO, ORDEM, DELETED_STAMP, };
+
+	private Integer id;
+	private String codigo;
+	private String descricao;
+	private Integer ordem;
+	private java.sql.Timestamp deleted_stamp;
+
+	protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
+
+	public FilCategorias()
+	{
+		super();
+		dirtyProperties = new boolean[]{ false, false, false, 
+			false, false };
+	}
+
+	public Integer getId()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.id;
+	}
+
+	public void setId( Integer id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( ID, id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.id = id;
+		LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE );
+	}
+
+	public java.util.List<db.data.siprp_local.outer.FilFileEmpresaData>fromFilFileEmpresa_categoria_id()
+	{
+		java.util.List<db.data.siprp_local.outer.FilFileEmpresaData> result = new java.util.LinkedList< db.data.siprp_local.outer.FilFileEmpresaData >();
+		if ( getPrimaryKey() != null ) 
+		{
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.FilFileEmpresaData.class , getPrimaryKey().getMap().get("id"), "categoria_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
+		}
+		return result;
+	}
+
+	public String getCodigo()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( CODIGO );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.codigo;
+	}
+
+	public void setCodigo( String codigo )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( CODIGO, codigo );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.codigo = codigo;
+		LAZY_LOADED_OBJECTS.put( CODIGO, Boolean.TRUE );
+	}
+
+	public String getDescricao()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( DESCRICAO );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.descricao;
+	}
+
+	public void setDescricao( String descricao )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( DESCRICAO, descricao );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.descricao = descricao;
+		LAZY_LOADED_OBJECTS.put( DESCRICAO, Boolean.TRUE );
+	}
+
+	public Integer getOrdem()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( ORDEM );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.ordem;
+	}
+
+	public void setOrdem( Integer ordem )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( ORDEM, ordem );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.ordem = ordem;
+		LAZY_LOADED_OBJECTS.put( ORDEM, Boolean.TRUE );
+	}
+
+	public java.sql.Timestamp getDeleted_stamp()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( DELETED_STAMP );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.deleted_stamp;
+	}
+
+	public void setDeleted_stamp( java.sql.Timestamp deleted_stamp )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( DELETED_STAMP, deleted_stamp );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.deleted_stamp = deleted_stamp;
+		LAZY_LOADED_OBJECTS.put( DELETED_STAMP, Boolean.TRUE );
+	}
+
+	public Object get( String fieldName )
+	{
+		Object value = null;
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case FilCategorias.ID_INDEX:
+				value = getId();
+				break;
+			case FilCategorias.CODIGO_INDEX:
+				value = getCodigo();
+				break;
+			case FilCategorias.DESCRICAO_INDEX:
+				value = getDescricao();
+				break;
+			case FilCategorias.ORDEM_INDEX:
+				value = getOrdem();
+				break;
+			case FilCategorias.DELETED_STAMP_INDEX:
+				value = getDeleted_stamp();
+				break;
+		}
+		return value;
+	}
+
+	public Object rawGet( String fieldName )
+	{
+		Object value = null;
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case FilCategorias.ID_INDEX:
+				value = this.id;
+				break;
+			case FilCategorias.CODIGO_INDEX:
+				value = this.codigo;
+				break;
+			case FilCategorias.DESCRICAO_INDEX:
+				value = this.descricao;
+				break;
+			case FilCategorias.ORDEM_INDEX:
+				value = this.ordem;
+				break;
+			case FilCategorias.DELETED_STAMP_INDEX:
+				value = this.deleted_stamp;
+				break;
+		}
+		return value;
+	}
+
+	public void set( String fieldName, Object value )
+	{
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case FilCategorias.ID_INDEX:
+				setId( ( Integer ) value );
+				break;
+			case FilCategorias.CODIGO_INDEX:
+				setCodigo( ( String ) value );
+				break;
+			case FilCategorias.DESCRICAO_INDEX:
+				setDescricao( ( String ) value );
+				break;
+			case FilCategorias.ORDEM_INDEX:
+				setOrdem( ( Integer ) value );
+				break;
+			case FilCategorias.DELETED_STAMP_INDEX:
+				setDeleted_stamp( ( java.sql.Timestamp ) value );
+				break;
+		}
+	}
+
+	public void rawSet( String fieldName, Object value )
+	{
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case FilCategorias.ID_INDEX:
+				this.id = ( Integer ) value;
+				break;
+			case FilCategorias.CODIGO_INDEX:
+				this.codigo = ( String ) value;
+				break;
+			case FilCategorias.DESCRICAO_INDEX:
+				this.descricao = ( String ) value;
+				break;
+			case FilCategorias.ORDEM_INDEX:
+				this.ordem = ( Integer ) value;
+				break;
+			case FilCategorias.DELETED_STAMP_INDEX:
+				this.deleted_stamp = ( java.sql.Timestamp ) value;
+				break;
+		}
+	}
+
+	public String []getFieldNames()
+	{
+		return FIELD_NAMES;
+	}
+
+	public String []getFieldNamesFull()
+	{
+		return FIELD_NAMES_FULL;
+	}
+
+	public String []getDBFieldNames()
+	{
+		return DB_FIELD_NAMES;
+	}
+
+	public String []getPrimaryKeyNames()
+	{
+		return PK_FIELD_NAMES;
+	}
+
+	public String []getDefaultLoadSet()
+	{
+		return DEFAULT_LOAD_SET;
+	}
+
+	public String getPrimaryKeyName()
+	{
+		return PK_FIELD_NAMES[ 0 ];
+	}
+
+	public Class<?> getFieldClass( String fieldName )
+	{
+		Integer index = getFieldIndex( fieldName );
+		Class<?> theClass = null;
+		switch( index )
+		{
+			case FilCategorias.ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case FilCategorias.CODIGO_INDEX:
+				theClass = String.class;
+				break;
+			case FilCategorias.DESCRICAO_INDEX:
+				theClass = String.class;
+				break;
+			case FilCategorias.ORDEM_INDEX:
+				theClass = Integer.class;
+				break;
+			case FilCategorias.DELETED_STAMP_INDEX:
+				theClass = java.sql.Timestamp.class;
+				break;
+		}
+		return theClass;
+	}
+
+	public Integer getFieldIndex( String fieldName )
+	{
+		Integer index = FIELD_INDEXES.get( fieldName );
+		return index != null ? index : FilCategorias._INVALID__INDEX;
+	}
+
+	public String getTableName()
+	{
+		return TABLENAME;
+	}
+
+	public String getClassIdentifier()
+	{
+		return CLASS_IDENTIFIER;
+	}
+
+	@Override
+	protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col )
+	{
+		if( primaryKey == null )
+		{
+			primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, FilCategorias.PK_FIELD_NAMES );
+			primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) );
+		}
+		setId( ( Integer ) array.get( row, col + 0 ) );
+	}
+
+	@Override
+	public com.evolute.entity.utils.IntegerPrimaryKey getPrimaryKey()
+	{
+		return primaryKey;
+	}
+
+	public void initLazyLoadFields()
+	{
+	}
+
+	public boolean isPropertyLoaded( String fieldName )
+	{
+		if ( LAZY_LOADED_OBJECTS.get( fieldName ) == null )
+		{
+			return true;
+		}
+		else
+		{
+			return LAZY_LOADED_OBJECTS.get( fieldName );
+		}
+	}
+}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/FilFile.java

@@ -144,14 +144,51 @@ public class FilFile extends com.evolute.entity.evo.EvoDataObject<com.evolute.en
 
 	public java.util.List<db.data.siprp_local.outer.FilFileAppointmentData>fromFilFileAppointment_file_id()
 	{
-		java.util.List<db.data.siprp_local.outer.FilFileAppointmentData> result = null;
+		java.util.List<db.data.siprp_local.outer.FilFileAppointmentData> result = new java.util.LinkedList< db.data.siprp_local.outer.FilFileAppointmentData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.FilFileAppointmentData.class , getPrimaryKey().getMap().get("id"), "file_id" );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.FilFileAppointmentData.class , getPrimaryKey().getMap().get("id"), "file_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
-		catch( com.evolute.entity.evo.EvoDataException edex )
+		return result;
+	}
+
+	public java.util.List<db.data.siprp_local.outer.FilFileEmpresaData>fromFilFileEmpresa_file_id()
+	{
+		java.util.List<db.data.siprp_local.outer.FilFileEmpresaData> result = new java.util.LinkedList< db.data.siprp_local.outer.FilFileEmpresaData >();
+		if ( getPrimaryKey() != null ) 
 		{
-			throw new RuntimeException( edex );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.FilFileEmpresaData.class , getPrimaryKey().getMap().get("id"), "file_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
+		}
+		return result;
+	}
+
+	public java.util.List<db.data.siprp_local.outer.FilFileMarcacoesEstabelecimentoData>fromFilFileMarcacoesEstabelecimento_file_id()
+	{
+		java.util.List<db.data.siprp_local.outer.FilFileMarcacoesEstabelecimentoData> result = new java.util.LinkedList< db.data.siprp_local.outer.FilFileMarcacoesEstabelecimentoData >();
+		if ( getPrimaryKey() != null ) 
+		{
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.FilFileMarcacoesEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "file_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/FilFileEmpresa.java

@@ -0,0 +1,531 @@
+/*
+* FilFileEmpresa.java
+*
+* Generated by com.evutils.codegen.EntityObjectGenerator
+*
+* Use but DON'T TOUCH
+* -> (can't touch this)
+*/
+package db.data.siprp_local.inner;
+
+
+public class FilFileEmpresa extends com.evolute.entity.evo.EvoDataObject<com.evolute.entity.utils.IntegerPrimaryKey>
+{
+	private static final java.util.HashMap<String,Integer> FIELD_INDEXES = new java.util.HashMap<String,Integer>();
+
+	static
+	{
+		FIELD_INDEXES.put( FilFileEmpresa.ID, FilFileEmpresa.ID_INDEX );
+		FIELD_INDEXES.put( FilFileEmpresa.ID_FULL, FilFileEmpresa.ID_INDEX );
+		com.evolute.entity.evo.EvoDataObject.register( FilFileEmpresa.CLASS_IDENTIFIER, FilFileEmpresa.FILE_ID, FilFileEmpresa.TO_FILE_ID ); 
+		FIELD_INDEXES.put( FilFileEmpresa.FILE_ID, FilFileEmpresa.FILE_ID_INDEX );
+		FIELD_INDEXES.put( FilFileEmpresa.FILE_ID_FULL, FilFileEmpresa.FILE_ID_INDEX );
+		FIELD_INDEXES.put( FilFileEmpresa.TO_FILE_ID, FilFileEmpresa.TO_FILE_ID_INDEX );
+		com.evolute.entity.evo.EvoDataObject.register( FilFileEmpresa.CLASS_IDENTIFIER, FilFileEmpresa.EMPRESA_ID, FilFileEmpresa.TO_EMPRESA_ID ); 
+		FIELD_INDEXES.put( FilFileEmpresa.EMPRESA_ID, FilFileEmpresa.EMPRESA_ID_INDEX );
+		FIELD_INDEXES.put( FilFileEmpresa.EMPRESA_ID_FULL, FilFileEmpresa.EMPRESA_ID_INDEX );
+		FIELD_INDEXES.put( FilFileEmpresa.TO_EMPRESA_ID, FilFileEmpresa.TO_EMPRESA_ID_INDEX );
+		com.evolute.entity.evo.EvoDataObject.register( FilFileEmpresa.CLASS_IDENTIFIER, FilFileEmpresa.CATEGORIA_ID, FilFileEmpresa.TO_CATEGORIA_ID ); 
+		FIELD_INDEXES.put( FilFileEmpresa.CATEGORIA_ID, FilFileEmpresa.CATEGORIA_ID_INDEX );
+		FIELD_INDEXES.put( FilFileEmpresa.CATEGORIA_ID_FULL, FilFileEmpresa.CATEGORIA_ID_INDEX );
+		FIELD_INDEXES.put( FilFileEmpresa.TO_CATEGORIA_ID, FilFileEmpresa.TO_CATEGORIA_ID_INDEX );
+	}
+
+	private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
+
+
+	public static final com.evolute.entity.ForeignKey ForeignKeyfile_idTofil_file = 
+		new com.evolute.entity.ForeignKey( FilFileEmpresa.class, FilFileEmpresa.FILE_ID, db.data.siprp_local.outer.FilFileData.class, db.data.siprp_local.outer.FilFileData.ID );
+
+	public static final com.evolute.entity.ForeignKey ForeignKeyempresa_idToempresas = 
+		new com.evolute.entity.ForeignKey( FilFileEmpresa.class, FilFileEmpresa.EMPRESA_ID, db.data.siprp_local.outer.EmpresasData.class, db.data.siprp_local.outer.EmpresasData.ID );
+
+	public static final com.evolute.entity.ForeignKey ForeignKeycategoria_idTofil_categorias = 
+		new com.evolute.entity.ForeignKey( FilFileEmpresa.class, FilFileEmpresa.CATEGORIA_ID, db.data.siprp_local.outer.FilCategoriasData.class, db.data.siprp_local.outer.FilCategoriasData.ID );
+
+	public static final String TABLENAME = "fil_file_empresa";
+
+
+	public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.fil_file_empresa";
+
+	public static final int _INVALID__INDEX = -1;
+	public static final String ID = "id";
+	public static final String ID_FULL = "fil_file_empresa.id";
+	public static final int ID_INDEX = 0;
+	public static final String FILE_ID = "file_id";
+	public static final String FILE_ID_FULL = "fil_file_empresa.file_id";
+	public static final int FILE_ID_INDEX = 1;
+	public static final String TO_FILE_ID = "to_file_id";
+	public static final String TO_FILE_ID_FULL = "fil_file_empresa.to_file_id";
+	public static final int TO_FILE_ID_INDEX = 2;
+	public static final String EMPRESA_ID = "empresa_id";
+	public static final String EMPRESA_ID_FULL = "fil_file_empresa.empresa_id";
+	public static final int EMPRESA_ID_INDEX = 3;
+	public static final String TO_EMPRESA_ID = "to_empresa_id";
+	public static final String TO_EMPRESA_ID_FULL = "fil_file_empresa.to_empresa_id";
+	public static final int TO_EMPRESA_ID_INDEX = 4;
+	public static final String CATEGORIA_ID = "categoria_id";
+	public static final String CATEGORIA_ID_FULL = "fil_file_empresa.categoria_id";
+	public static final int CATEGORIA_ID_INDEX = 5;
+	public static final String TO_CATEGORIA_ID = "to_categoria_id";
+	public static final String TO_CATEGORIA_ID_FULL = "fil_file_empresa.to_categoria_id";
+	public static final int TO_CATEGORIA_ID_INDEX = 6;
+
+	public static final String FIELD_NAMES[] = new String[]{
+		FILE_ID, TO_FILE_ID, EMPRESA_ID, TO_EMPRESA_ID, CATEGORIA_ID, TO_CATEGORIA_ID, };
+
+	public static final String FIELD_NAMES_FULL[] = new String[]{
+		TABLENAME + "." + FILE_ID, TABLENAME + "." + TO_FILE_ID, TABLENAME + "." + EMPRESA_ID, TABLENAME + "." + TO_EMPRESA_ID, TABLENAME + "." + CATEGORIA_ID, TABLENAME + "." + TO_CATEGORIA_ID, };
+
+	protected static final String DB_FIELD_NAMES[] = new String[]{
+		ID, FILE_ID, EMPRESA_ID, CATEGORIA_ID, };
+
+
+	protected static final String PK_FIELD_NAMES[] = new String[]{
+		ID, };
+
+
+	public static final String DEFAULT_LOAD_SET[] = new String[] {
+		ID, FILE_ID, EMPRESA_ID, CATEGORIA_ID, };
+
+	private Integer id;
+	private Integer file_id;
+	private db.data.siprp_local.outer.FilFileData to_file_id;
+	private Integer empresa_id;
+	private db.data.siprp_local.outer.EmpresasData to_empresa_id;
+	private Integer categoria_id;
+	private db.data.siprp_local.outer.FilCategoriasData to_categoria_id;
+
+	protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
+
+	public FilFileEmpresa()
+	{
+		super();
+		dirtyProperties = new boolean[]{ false, false, false, 
+			false, false, false, false };
+	}
+
+	public Integer getId()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.id;
+	}
+
+	public void setId( Integer id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( ID, id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.id = id;
+		LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE );
+	}
+
+	public Integer getFile_id()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( FILE_ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.file_id;
+	}
+
+	public void setFile_id( Integer file_id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( FILE_ID, file_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.file_id = file_id;
+		LAZY_LOADED_OBJECTS.put( FILE_ID, Boolean.TRUE );
+	}
+
+	public db.data.siprp_local.outer.FilFileData toFile_id()
+	{
+		try
+		{
+			prepare( TO_FILE_ID );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		return this.to_file_id;
+	}
+
+	public void setToFile_id( db.data.siprp_local.outer.FilFileData to_file_id )
+	{
+		try
+		{
+			preProcess( TO_FILE_ID, to_file_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.to_file_id = to_file_id;
+	}
+
+	public Integer getEmpresa_id()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( EMPRESA_ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.empresa_id;
+	}
+
+	public void setEmpresa_id( Integer empresa_id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( EMPRESA_ID, empresa_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.empresa_id = empresa_id;
+		LAZY_LOADED_OBJECTS.put( EMPRESA_ID, Boolean.TRUE );
+	}
+
+	public db.data.siprp_local.outer.EmpresasData toEmpresa_id()
+	{
+		try
+		{
+			prepare( TO_EMPRESA_ID );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		return this.to_empresa_id;
+	}
+
+	public void setToEmpresa_id( db.data.siprp_local.outer.EmpresasData to_empresa_id )
+	{
+		try
+		{
+			preProcess( TO_EMPRESA_ID, to_empresa_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.to_empresa_id = to_empresa_id;
+	}
+
+	public Integer getCategoria_id()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( CATEGORIA_ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.categoria_id;
+	}
+
+	public void setCategoria_id( Integer categoria_id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( CATEGORIA_ID, categoria_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.categoria_id = categoria_id;
+		LAZY_LOADED_OBJECTS.put( CATEGORIA_ID, Boolean.TRUE );
+	}
+
+	public db.data.siprp_local.outer.FilCategoriasData toCategoria_id()
+	{
+		try
+		{
+			prepare( TO_CATEGORIA_ID );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		return this.to_categoria_id;
+	}
+
+	public void setToCategoria_id( db.data.siprp_local.outer.FilCategoriasData to_categoria_id )
+	{
+		try
+		{
+			preProcess( TO_CATEGORIA_ID, to_categoria_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.to_categoria_id = to_categoria_id;
+	}
+
+	public Object get( String fieldName )
+	{
+		Object value = null;
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case FilFileEmpresa.ID_INDEX:
+				value = getId();
+				break;
+			case FilFileEmpresa.FILE_ID_INDEX:
+				value = getFile_id();
+				break;
+			case FilFileEmpresa.TO_FILE_ID_INDEX:
+				value = toFile_id();
+				break;
+			case FilFileEmpresa.EMPRESA_ID_INDEX:
+				value = getEmpresa_id();
+				break;
+			case FilFileEmpresa.TO_EMPRESA_ID_INDEX:
+				value = toEmpresa_id();
+				break;
+			case FilFileEmpresa.CATEGORIA_ID_INDEX:
+				value = getCategoria_id();
+				break;
+			case FilFileEmpresa.TO_CATEGORIA_ID_INDEX:
+				value = toCategoria_id();
+				break;
+		}
+		return value;
+	}
+
+	public Object rawGet( String fieldName )
+	{
+		Object value = null;
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case FilFileEmpresa.ID_INDEX:
+				value = this.id;
+				break;
+			case FilFileEmpresa.FILE_ID_INDEX:
+				value = this.file_id;
+				break;
+			case FilFileEmpresa.TO_FILE_ID_INDEX:
+				value = this.to_file_id;
+				break;
+			case FilFileEmpresa.EMPRESA_ID_INDEX:
+				value = this.empresa_id;
+				break;
+			case FilFileEmpresa.TO_EMPRESA_ID_INDEX:
+				value = this.to_empresa_id;
+				break;
+			case FilFileEmpresa.CATEGORIA_ID_INDEX:
+				value = this.categoria_id;
+				break;
+			case FilFileEmpresa.TO_CATEGORIA_ID_INDEX:
+				value = this.to_categoria_id;
+				break;
+		}
+		return value;
+	}
+
+	public void set( String fieldName, Object value )
+	{
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case FilFileEmpresa.ID_INDEX:
+				setId( ( Integer ) value );
+				break;
+			case FilFileEmpresa.FILE_ID_INDEX:
+				setFile_id( ( Integer ) value );
+				break;
+			case FilFileEmpresa.TO_FILE_ID_INDEX:
+				setToFile_id( ( db.data.siprp_local.outer.FilFileData ) value );
+				break;
+			case FilFileEmpresa.EMPRESA_ID_INDEX:
+				setEmpresa_id( ( Integer ) value );
+				break;
+			case FilFileEmpresa.TO_EMPRESA_ID_INDEX:
+				setToEmpresa_id( ( db.data.siprp_local.outer.EmpresasData ) value );
+				break;
+			case FilFileEmpresa.CATEGORIA_ID_INDEX:
+				setCategoria_id( ( Integer ) value );
+				break;
+			case FilFileEmpresa.TO_CATEGORIA_ID_INDEX:
+				setToCategoria_id( ( db.data.siprp_local.outer.FilCategoriasData ) value );
+				break;
+		}
+	}
+
+	public void rawSet( String fieldName, Object value )
+	{
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case FilFileEmpresa.ID_INDEX:
+				this.id = ( Integer ) value;
+				break;
+			case FilFileEmpresa.FILE_ID_INDEX:
+				this.file_id = ( Integer ) value;
+				break;
+			case FilFileEmpresa.TO_FILE_ID_INDEX:
+				this.to_file_id = ( db.data.siprp_local.outer.FilFileData ) value;
+				break;
+			case FilFileEmpresa.EMPRESA_ID_INDEX:
+				this.empresa_id = ( Integer ) value;
+				break;
+			case FilFileEmpresa.TO_EMPRESA_ID_INDEX:
+				this.to_empresa_id = ( db.data.siprp_local.outer.EmpresasData ) value;
+				break;
+			case FilFileEmpresa.CATEGORIA_ID_INDEX:
+				this.categoria_id = ( Integer ) value;
+				break;
+			case FilFileEmpresa.TO_CATEGORIA_ID_INDEX:
+				this.to_categoria_id = ( db.data.siprp_local.outer.FilCategoriasData ) value;
+				break;
+		}
+	}
+
+	public String []getFieldNames()
+	{
+		return FIELD_NAMES;
+	}
+
+	public String []getFieldNamesFull()
+	{
+		return FIELD_NAMES_FULL;
+	}
+
+	public String []getDBFieldNames()
+	{
+		return DB_FIELD_NAMES;
+	}
+
+	public String []getPrimaryKeyNames()
+	{
+		return PK_FIELD_NAMES;
+	}
+
+	public String []getDefaultLoadSet()
+	{
+		return DEFAULT_LOAD_SET;
+	}
+
+	public String getPrimaryKeyName()
+	{
+		return PK_FIELD_NAMES[ 0 ];
+	}
+
+	public Class<?> getFieldClass( String fieldName )
+	{
+		Integer index = getFieldIndex( fieldName );
+		Class<?> theClass = null;
+		switch( index )
+		{
+			case FilFileEmpresa.ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case FilFileEmpresa.FILE_ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case FilFileEmpresa.TO_FILE_ID_INDEX:
+				theClass = db.data.siprp_local.outer.FilFileData.class;
+				break;
+			case FilFileEmpresa.EMPRESA_ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case FilFileEmpresa.TO_EMPRESA_ID_INDEX:
+				theClass = db.data.siprp_local.outer.EmpresasData.class;
+				break;
+			case FilFileEmpresa.CATEGORIA_ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case FilFileEmpresa.TO_CATEGORIA_ID_INDEX:
+				theClass = db.data.siprp_local.outer.FilCategoriasData.class;
+				break;
+		}
+		return theClass;
+	}
+
+	public Integer getFieldIndex( String fieldName )
+	{
+		Integer index = FIELD_INDEXES.get( fieldName );
+		return index != null ? index : FilFileEmpresa._INVALID__INDEX;
+	}
+
+	public String getTableName()
+	{
+		return TABLENAME;
+	}
+
+	public String getClassIdentifier()
+	{
+		return CLASS_IDENTIFIER;
+	}
+
+	@Override
+	protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col )
+	{
+		if( primaryKey == null )
+		{
+			primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, FilFileEmpresa.PK_FIELD_NAMES );
+			primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) );
+		}
+		setId( ( Integer ) array.get( row, col + 0 ) );
+	}
+
+	@Override
+	public com.evolute.entity.utils.IntegerPrimaryKey getPrimaryKey()
+	{
+		return primaryKey;
+	}
+
+	public void initLazyLoadFields()
+	{
+	}
+
+	public boolean isPropertyLoaded( String fieldName )
+	{
+		if ( LAZY_LOADED_OBJECTS.get( fieldName ) == null )
+		{
+			return true;
+		}
+		else
+		{
+			return LAZY_LOADED_OBJECTS.get( fieldName );
+		}
+	}
+}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/FilFileMarcacoesEstabelecimento.java

@@ -0,0 +1,431 @@
+/*
+* FilFileMarcacoesEstabelecimento.java
+*
+* Generated by com.evutils.codegen.EntityObjectGenerator
+*
+* Use but DON'T TOUCH
+* -> (can't touch this)
+*/
+package db.data.siprp_local.inner;
+
+
+public class FilFileMarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObject<com.evolute.entity.utils.IntegerPrimaryKey>
+{
+	private static final java.util.HashMap<String,Integer> FIELD_INDEXES = new java.util.HashMap<String,Integer>();
+
+	static
+	{
+		FIELD_INDEXES.put( FilFileMarcacoesEstabelecimento.ID, FilFileMarcacoesEstabelecimento.ID_INDEX );
+		FIELD_INDEXES.put( FilFileMarcacoesEstabelecimento.ID_FULL, FilFileMarcacoesEstabelecimento.ID_INDEX );
+		com.evolute.entity.evo.EvoDataObject.register( FilFileMarcacoesEstabelecimento.CLASS_IDENTIFIER, FilFileMarcacoesEstabelecimento.FILE_ID, FilFileMarcacoesEstabelecimento.TO_FILE_ID ); 
+		FIELD_INDEXES.put( FilFileMarcacoesEstabelecimento.FILE_ID, FilFileMarcacoesEstabelecimento.FILE_ID_INDEX );
+		FIELD_INDEXES.put( FilFileMarcacoesEstabelecimento.FILE_ID_FULL, FilFileMarcacoesEstabelecimento.FILE_ID_INDEX );
+		FIELD_INDEXES.put( FilFileMarcacoesEstabelecimento.TO_FILE_ID, FilFileMarcacoesEstabelecimento.TO_FILE_ID_INDEX );
+		com.evolute.entity.evo.EvoDataObject.register( FilFileMarcacoesEstabelecimento.CLASS_IDENTIFIER, FilFileMarcacoesEstabelecimento.MARCACAO_ID, FilFileMarcacoesEstabelecimento.TO_MARCACAO_ID ); 
+		FIELD_INDEXES.put( FilFileMarcacoesEstabelecimento.MARCACAO_ID, FilFileMarcacoesEstabelecimento.MARCACAO_ID_INDEX );
+		FIELD_INDEXES.put( FilFileMarcacoesEstabelecimento.MARCACAO_ID_FULL, FilFileMarcacoesEstabelecimento.MARCACAO_ID_INDEX );
+		FIELD_INDEXES.put( FilFileMarcacoesEstabelecimento.TO_MARCACAO_ID, FilFileMarcacoesEstabelecimento.TO_MARCACAO_ID_INDEX );
+	}
+
+	private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
+
+
+	public static final com.evolute.entity.ForeignKey ForeignKeyfile_idTofil_file = 
+		new com.evolute.entity.ForeignKey( FilFileMarcacoesEstabelecimento.class, FilFileMarcacoesEstabelecimento.FILE_ID, db.data.siprp_local.outer.FilFileData.class, db.data.siprp_local.outer.FilFileData.ID );
+
+	public static final com.evolute.entity.ForeignKey ForeignKeymarcacao_idTomarcacoes_estabelecimento = 
+		new com.evolute.entity.ForeignKey( FilFileMarcacoesEstabelecimento.class, FilFileMarcacoesEstabelecimento.MARCACAO_ID, db.data.siprp_local.outer.MarcacoesEstabelecimentoData.class, db.data.siprp_local.outer.MarcacoesEstabelecimentoData.ID );
+
+	public static final String TABLENAME = "fil_file_marcacoes_estabelecimento";
+
+
+	public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.fil_file_marcacoes_estabelecimento";
+
+	public static final int _INVALID__INDEX = -1;
+	public static final String ID = "id";
+	public static final String ID_FULL = "fil_file_marcacoes_estabelecimento.id";
+	public static final int ID_INDEX = 0;
+	public static final String FILE_ID = "file_id";
+	public static final String FILE_ID_FULL = "fil_file_marcacoes_estabelecimento.file_id";
+	public static final int FILE_ID_INDEX = 1;
+	public static final String TO_FILE_ID = "to_file_id";
+	public static final String TO_FILE_ID_FULL = "fil_file_marcacoes_estabelecimento.to_file_id";
+	public static final int TO_FILE_ID_INDEX = 2;
+	public static final String MARCACAO_ID = "marcacao_id";
+	public static final String MARCACAO_ID_FULL = "fil_file_marcacoes_estabelecimento.marcacao_id";
+	public static final int MARCACAO_ID_INDEX = 3;
+	public static final String TO_MARCACAO_ID = "to_marcacao_id";
+	public static final String TO_MARCACAO_ID_FULL = "fil_file_marcacoes_estabelecimento.to_marcacao_id";
+	public static final int TO_MARCACAO_ID_INDEX = 4;
+
+	public static final String FIELD_NAMES[] = new String[]{
+		FILE_ID, TO_FILE_ID, MARCACAO_ID, TO_MARCACAO_ID, };
+
+	public static final String FIELD_NAMES_FULL[] = new String[]{
+		TABLENAME + "." + FILE_ID, TABLENAME + "." + TO_FILE_ID, TABLENAME + "." + MARCACAO_ID, TABLENAME + "." + TO_MARCACAO_ID, };
+
+	protected static final String DB_FIELD_NAMES[] = new String[]{
+		ID, FILE_ID, MARCACAO_ID, };
+
+
+	protected static final String PK_FIELD_NAMES[] = new String[]{
+		ID, };
+
+
+	public static final String DEFAULT_LOAD_SET[] = new String[] {
+		ID, FILE_ID, MARCACAO_ID, };
+
+	private Integer id;
+	private Integer file_id;
+	private db.data.siprp_local.outer.FilFileData to_file_id;
+	private Integer marcacao_id;
+	private db.data.siprp_local.outer.MarcacoesEstabelecimentoData to_marcacao_id;
+
+	protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
+
+	public FilFileMarcacoesEstabelecimento()
+	{
+		super();
+		dirtyProperties = new boolean[]{ false, false, false, 
+			false, false };
+	}
+
+	public Integer getId()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.id;
+	}
+
+	public void setId( Integer id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( ID, id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.id = id;
+		LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE );
+	}
+
+	public Integer getFile_id()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( FILE_ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.file_id;
+	}
+
+	public void setFile_id( Integer file_id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( FILE_ID, file_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.file_id = file_id;
+		LAZY_LOADED_OBJECTS.put( FILE_ID, Boolean.TRUE );
+	}
+
+	public db.data.siprp_local.outer.FilFileData toFile_id()
+	{
+		try
+		{
+			prepare( TO_FILE_ID );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		return this.to_file_id;
+	}
+
+	public void setToFile_id( db.data.siprp_local.outer.FilFileData to_file_id )
+	{
+		try
+		{
+			preProcess( TO_FILE_ID, to_file_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.to_file_id = to_file_id;
+	}
+
+	public Integer getMarcacao_id()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( MARCACAO_ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.marcacao_id;
+	}
+
+	public void setMarcacao_id( Integer marcacao_id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( MARCACAO_ID, marcacao_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.marcacao_id = marcacao_id;
+		LAZY_LOADED_OBJECTS.put( MARCACAO_ID, Boolean.TRUE );
+	}
+
+	public db.data.siprp_local.outer.MarcacoesEstabelecimentoData toMarcacao_id()
+	{
+		try
+		{
+			prepare( TO_MARCACAO_ID );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		return this.to_marcacao_id;
+	}
+
+	public void setToMarcacao_id( db.data.siprp_local.outer.MarcacoesEstabelecimentoData to_marcacao_id )
+	{
+		try
+		{
+			preProcess( TO_MARCACAO_ID, to_marcacao_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.to_marcacao_id = to_marcacao_id;
+	}
+
+	public Object get( String fieldName )
+	{
+		Object value = null;
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case FilFileMarcacoesEstabelecimento.ID_INDEX:
+				value = getId();
+				break;
+			case FilFileMarcacoesEstabelecimento.FILE_ID_INDEX:
+				value = getFile_id();
+				break;
+			case FilFileMarcacoesEstabelecimento.TO_FILE_ID_INDEX:
+				value = toFile_id();
+				break;
+			case FilFileMarcacoesEstabelecimento.MARCACAO_ID_INDEX:
+				value = getMarcacao_id();
+				break;
+			case FilFileMarcacoesEstabelecimento.TO_MARCACAO_ID_INDEX:
+				value = toMarcacao_id();
+				break;
+		}
+		return value;
+	}
+
+	public Object rawGet( String fieldName )
+	{
+		Object value = null;
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case FilFileMarcacoesEstabelecimento.ID_INDEX:
+				value = this.id;
+				break;
+			case FilFileMarcacoesEstabelecimento.FILE_ID_INDEX:
+				value = this.file_id;
+				break;
+			case FilFileMarcacoesEstabelecimento.TO_FILE_ID_INDEX:
+				value = this.to_file_id;
+				break;
+			case FilFileMarcacoesEstabelecimento.MARCACAO_ID_INDEX:
+				value = this.marcacao_id;
+				break;
+			case FilFileMarcacoesEstabelecimento.TO_MARCACAO_ID_INDEX:
+				value = this.to_marcacao_id;
+				break;
+		}
+		return value;
+	}
+
+	public void set( String fieldName, Object value )
+	{
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case FilFileMarcacoesEstabelecimento.ID_INDEX:
+				setId( ( Integer ) value );
+				break;
+			case FilFileMarcacoesEstabelecimento.FILE_ID_INDEX:
+				setFile_id( ( Integer ) value );
+				break;
+			case FilFileMarcacoesEstabelecimento.TO_FILE_ID_INDEX:
+				setToFile_id( ( db.data.siprp_local.outer.FilFileData ) value );
+				break;
+			case FilFileMarcacoesEstabelecimento.MARCACAO_ID_INDEX:
+				setMarcacao_id( ( Integer ) value );
+				break;
+			case FilFileMarcacoesEstabelecimento.TO_MARCACAO_ID_INDEX:
+				setToMarcacao_id( ( db.data.siprp_local.outer.MarcacoesEstabelecimentoData ) value );
+				break;
+		}
+	}
+
+	public void rawSet( String fieldName, Object value )
+	{
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case FilFileMarcacoesEstabelecimento.ID_INDEX:
+				this.id = ( Integer ) value;
+				break;
+			case FilFileMarcacoesEstabelecimento.FILE_ID_INDEX:
+				this.file_id = ( Integer ) value;
+				break;
+			case FilFileMarcacoesEstabelecimento.TO_FILE_ID_INDEX:
+				this.to_file_id = ( db.data.siprp_local.outer.FilFileData ) value;
+				break;
+			case FilFileMarcacoesEstabelecimento.MARCACAO_ID_INDEX:
+				this.marcacao_id = ( Integer ) value;
+				break;
+			case FilFileMarcacoesEstabelecimento.TO_MARCACAO_ID_INDEX:
+				this.to_marcacao_id = ( db.data.siprp_local.outer.MarcacoesEstabelecimentoData ) value;
+				break;
+		}
+	}
+
+	public String []getFieldNames()
+	{
+		return FIELD_NAMES;
+	}
+
+	public String []getFieldNamesFull()
+	{
+		return FIELD_NAMES_FULL;
+	}
+
+	public String []getDBFieldNames()
+	{
+		return DB_FIELD_NAMES;
+	}
+
+	public String []getPrimaryKeyNames()
+	{
+		return PK_FIELD_NAMES;
+	}
+
+	public String []getDefaultLoadSet()
+	{
+		return DEFAULT_LOAD_SET;
+	}
+
+	public String getPrimaryKeyName()
+	{
+		return PK_FIELD_NAMES[ 0 ];
+	}
+
+	public Class<?> getFieldClass( String fieldName )
+	{
+		Integer index = getFieldIndex( fieldName );
+		Class<?> theClass = null;
+		switch( index )
+		{
+			case FilFileMarcacoesEstabelecimento.ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case FilFileMarcacoesEstabelecimento.FILE_ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case FilFileMarcacoesEstabelecimento.TO_FILE_ID_INDEX:
+				theClass = db.data.siprp_local.outer.FilFileData.class;
+				break;
+			case FilFileMarcacoesEstabelecimento.MARCACAO_ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case FilFileMarcacoesEstabelecimento.TO_MARCACAO_ID_INDEX:
+				theClass = db.data.siprp_local.outer.MarcacoesEstabelecimentoData.class;
+				break;
+		}
+		return theClass;
+	}
+
+	public Integer getFieldIndex( String fieldName )
+	{
+		Integer index = FIELD_INDEXES.get( fieldName );
+		return index != null ? index : FilFileMarcacoesEstabelecimento._INVALID__INDEX;
+	}
+
+	public String getTableName()
+	{
+		return TABLENAME;
+	}
+
+	public String getClassIdentifier()
+	{
+		return CLASS_IDENTIFIER;
+	}
+
+	@Override
+	protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col )
+	{
+		if( primaryKey == null )
+		{
+			primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, FilFileMarcacoesEstabelecimento.PK_FIELD_NAMES );
+			primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) );
+		}
+		setId( ( Integer ) array.get( row, col + 0 ) );
+	}
+
+	@Override
+	public com.evolute.entity.utils.IntegerPrimaryKey getPrimaryKey()
+	{
+		return primaryKey;
+	}
+
+	public void initLazyLoadFields()
+	{
+	}
+
+	public boolean isPropertyLoaded( String fieldName )
+	{
+		if ( LAZY_LOADED_OBJECTS.get( fieldName ) == null )
+		{
+			return true;
+		}
+		else
+		{
+			return LAZY_LOADED_OBJECTS.get( fieldName );
+		}
+	}
+}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/HsArea.java

@@ -124,14 +124,17 @@ public class HsArea extends com.evolute.entity.evo.EvoDataObject<com.evolute.ent
 
 	public java.util.List<db.data.siprp_local.outer.HsPostoData>fromHsPosto_area_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsPostoData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsPostoData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsPostoData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.HsPostoData.class , getPrimaryKey().getMap().get("id"), "area_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsPostoData.class , getPrimaryKey().getMap().get("id"), "area_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/HsEmail.java

@@ -96,28 +96,34 @@ public class HsEmail extends com.evolute.entity.evo.EvoDataObject<com.evolute.en
 
 	public java.util.List<db.data.siprp_local.outer.HsEmailEmpresaData>fromHsEmailEmpresa_email_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsEmailEmpresaData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsEmailEmpresaData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsEmailEmpresaData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsEmailEmpresaData.class , getPrimaryKey().getMap().get("id"), "email_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsEmailEmpresaData.class , getPrimaryKey().getMap().get("id"), "email_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HsEmailEstabelecimentoData>fromHsEmailEstabelecimento_email_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsEmailEstabelecimentoData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsEmailEstabelecimentoData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsEmailEstabelecimentoData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsEmailEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "email_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsEmailEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "email_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/HsLegislacao.java

@@ -118,28 +118,34 @@ public class HsLegislacao extends com.evolute.entity.evo.EvoDataObject<com.evolu
 
 	public java.util.List<db.data.siprp_local.outer.HsLegislacaoEmpresaData>fromHsLegislacaoEmpresa_legislacao_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsLegislacaoEmpresaData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsLegislacaoEmpresaData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsLegislacaoEmpresaData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.HsLegislacaoEmpresaData.class , getPrimaryKey().getMap().get("id"), "legislacao_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsLegislacaoEmpresaData.class , getPrimaryKey().getMap().get("id"), "legislacao_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData>fromHsLegislacaoEstabelecimento_legislacao_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "legislacao_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "legislacao_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/HsLegislacaoCategoria.java

@@ -102,14 +102,17 @@ public class HsLegislacaoCategoria extends com.evolute.entity.evo.EvoDataObject<
 
 	public java.util.List<db.data.siprp_local.outer.HsLegislacaoData>fromHsLegislacao_categoria_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsLegislacaoData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsLegislacaoData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsLegislacaoData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsLegislacaoData.class , getPrimaryKey().getMap().get("id"), "categoria_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsLegislacaoData.class , getPrimaryKey().getMap().get("id"), "categoria_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/HsMedida.java

@@ -109,28 +109,34 @@ public class HsMedida extends com.evolute.entity.evo.EvoDataObject<com.evolute.e
 
 	public java.util.List<db.data.siprp_local.outer.HsPostoMedidaData>fromHsPostoMedida_medida_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsPostoMedidaData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsPostoMedidaData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsPostoMedidaData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsPostoMedidaData.class , getPrimaryKey().getMap().get("id"), "medida_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsPostoMedidaData.class , getPrimaryKey().getMap().get("id"), "medida_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HsRiscoMedidaData>fromHsRiscoMedida_medida_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsRiscoMedidaData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsRiscoMedidaData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsRiscoMedidaData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsRiscoMedidaData.class , getPrimaryKey().getMap().get("id"), "medida_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsRiscoMedidaData.class , getPrimaryKey().getMap().get("id"), "medida_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/HsNormalizacao.java

@@ -115,28 +115,34 @@ public class HsNormalizacao extends com.evolute.entity.evo.EvoDataObject<com.evo
 
 	public java.util.List<db.data.siprp_local.outer.HsNormalizacaoEmpresaData>fromHsNormalizacaoEmpresa_normalizacao_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsNormalizacaoEmpresaData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsNormalizacaoEmpresaData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsNormalizacaoEmpresaData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.HsNormalizacaoEmpresaData.class , getPrimaryKey().getMap().get("id"), "normalizacao_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsNormalizacaoEmpresaData.class , getPrimaryKey().getMap().get("id"), "normalizacao_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HsNormalizacaoEstabelecimentoData>fromHsNormalizacaoEstabelecimento_normalizacao_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsNormalizacaoEstabelecimentoData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsNormalizacaoEstabelecimentoData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsNormalizacaoEstabelecimentoData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.HsNormalizacaoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "normalizacao_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsNormalizacaoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "normalizacao_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/HsPosto.java

@@ -124,42 +124,51 @@ public class HsPosto extends com.evolute.entity.evo.EvoDataObject<com.evolute.en
 
 	public java.util.List<db.data.siprp_local.outer.HsPostoEstabelecimentoData>fromHsPostoEstabelecimento_posto_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsPostoEstabelecimentoData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsPostoEstabelecimentoData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsPostoEstabelecimentoData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.HsPostoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "posto_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsPostoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "posto_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HsPostoMedidaData>fromHsPostoMedida_posto_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsPostoMedidaData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsPostoMedidaData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsPostoMedidaData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsPostoMedidaData.class , getPrimaryKey().getMap().get("id"), "posto_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsPostoMedidaData.class , getPrimaryKey().getMap().get("id"), "posto_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HsPostoRiscoData>fromHsPostoRisco_posto_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsPostoRiscoData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsPostoRiscoData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsPostoRiscoData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.HsPostoRiscoData.class , getPrimaryKey().getMap().get("id"), "posto_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsPostoRiscoData.class , getPrimaryKey().getMap().get("id"), "posto_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRelatorio.java

@@ -181,70 +181,85 @@ public class HsRelatorio extends com.evolute.entity.evo.EvoDataObject<com.evolut
 
 	public java.util.List<db.data.siprp_local.outer.HsRelatorioAreaData>fromHsRelatorioArea_relatorio_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsRelatorioAreaData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsRelatorioAreaData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioAreaData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.HsRelatorioAreaData.class , getPrimaryKey().getMap().get("id"), "relatorio_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsRelatorioAreaData.class , getPrimaryKey().getMap().get("id"), "relatorio_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HsRelatorioEquipamentoData>fromHsRelatorioEquipamento_hs_relatorio_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsRelatorioEquipamentoData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsRelatorioEquipamentoData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioEquipamentoData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsRelatorioEquipamentoData.class , getPrimaryKey().getMap().get("id"), "hs_relatorio_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsRelatorioEquipamentoData.class , getPrimaryKey().getMap().get("id"), "hs_relatorio_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HsRelatorioLegislacaoData>fromHsRelatorioLegislacao_hs_relatorio_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsRelatorioLegislacaoData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsRelatorioLegislacaoData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioLegislacaoData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsRelatorioLegislacaoData.class , getPrimaryKey().getMap().get("id"), "hs_relatorio_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsRelatorioLegislacaoData.class , getPrimaryKey().getMap().get("id"), "hs_relatorio_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HsRelatorioNormalizacaoData>fromHsRelatorioNormalizacao_hs_relatorio_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsRelatorioNormalizacaoData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsRelatorioNormalizacaoData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioNormalizacaoData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsRelatorioNormalizacaoData.class , getPrimaryKey().getMap().get("id"), "hs_relatorio_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsRelatorioNormalizacaoData.class , getPrimaryKey().getMap().get("id"), "hs_relatorio_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HsRelatorioRiscoData>fromHsRelatorioRisco_relatorio_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsRelatorioRiscoData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsRelatorioRiscoData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioRiscoData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.HsRelatorioRiscoData.class , getPrimaryKey().getMap().get("id"), "relatorio_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsRelatorioRiscoData.class , getPrimaryKey().getMap().get("id"), "relatorio_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRelatorioArea.java

@@ -130,14 +130,17 @@ public class HsRelatorioArea extends com.evolute.entity.evo.EvoDataObject<com.ev
 
 	public java.util.List<db.data.siprp_local.outer.HsRelatorioPostoData>fromHsRelatorioPosto_area_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsRelatorioPostoData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsRelatorioPostoData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioPostoData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.HsRelatorioPostoData.class , getPrimaryKey().getMap().get("id"), "area_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsRelatorioPostoData.class , getPrimaryKey().getMap().get("id"), "area_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRelatorioMedida.java

@@ -132,14 +132,17 @@ public class HsRelatorioMedida extends com.evolute.entity.evo.EvoDataObject<com.
 
 	public java.util.List<db.data.siprp_local.outer.HsRelatorioPostoMedidaData>fromHsRelatorioPostoMedida_medida_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsRelatorioPostoMedidaData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsRelatorioPostoMedidaData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioPostoMedidaData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.HsRelatorioPostoMedidaData.class , getPrimaryKey().getMap().get("id"), "medida_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsRelatorioPostoMedidaData.class , getPrimaryKey().getMap().get("id"), "medida_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRelatorioPosto.java

@@ -130,28 +130,34 @@ public class HsRelatorioPosto extends com.evolute.entity.evo.EvoDataObject<com.e
 
 	public java.util.List<db.data.siprp_local.outer.HsRelatorioPostoMedidaData>fromHsRelatorioPostoMedida_posto_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsRelatorioPostoMedidaData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsRelatorioPostoMedidaData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioPostoMedidaData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.HsRelatorioPostoMedidaData.class , getPrimaryKey().getMap().get("id"), "posto_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsRelatorioPostoMedidaData.class , getPrimaryKey().getMap().get("id"), "posto_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HsRelatorioPostoRiscoData>fromHsRelatorioPostoRisco_posto_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsRelatorioPostoRiscoData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsRelatorioPostoRiscoData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioPostoRiscoData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.HsRelatorioPostoRiscoData.class , getPrimaryKey().getMap().get("id"), "posto_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsRelatorioPostoRiscoData.class , getPrimaryKey().getMap().get("id"), "posto_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRelatorioRisco.java

@@ -27,6 +27,8 @@ public class HsRelatorioRisco extends com.evolute.entity.evo.EvoDataObject<com.e
 		FIELD_INDEXES.put( HsRelatorioRisco.DELETED_DATE_FULL, HsRelatorioRisco.DELETED_DATE_INDEX );
 		FIELD_INDEXES.put( HsRelatorioRisco.HS_RISCO_ID, HsRelatorioRisco.HS_RISCO_ID_INDEX );
 		FIELD_INDEXES.put( HsRelatorioRisco.HS_RISCO_ID_FULL, HsRelatorioRisco.HS_RISCO_ID_INDEX );
+		FIELD_INDEXES.put( HsRelatorioRisco.IS_PATRIMONIAL, HsRelatorioRisco.IS_PATRIMONIAL_INDEX );
+		FIELD_INDEXES.put( HsRelatorioRisco.IS_PATRIMONIAL_FULL, HsRelatorioRisco.IS_PATRIMONIAL_INDEX );
 	}
 
 	private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
@@ -59,15 +61,20 @@ public class HsRelatorioRisco extends com.evolute.entity.evo.EvoDataObject<com.e
 	public static final String HS_RISCO_ID = "hs_risco_id";
 	public static final String HS_RISCO_ID_FULL = "hs_relatorio_risco.hs_risco_id";
 	public static final int HS_RISCO_ID_INDEX = 5;
+	public static final String IS_PATRIMONIAL = "is_patrimonial";
+	public static final String IS_PATRIMONIAL_FULL = "hs_relatorio_risco.is_patrimonial";
+	public static final int IS_PATRIMONIAL_INDEX = 6;
 
 	public static final String FIELD_NAMES[] = new String[]{
-		RELATORIO_ID, TO_RELATORIO_ID, DESCRIPTION, DELETED_DATE, HS_RISCO_ID, };
+		RELATORIO_ID, TO_RELATORIO_ID, DESCRIPTION, DELETED_DATE, HS_RISCO_ID, 
+		IS_PATRIMONIAL, };
 
 	public static final String FIELD_NAMES_FULL[] = new String[]{
-		TABLENAME + "." + RELATORIO_ID, TABLENAME + "." + TO_RELATORIO_ID, TABLENAME + "." + DESCRIPTION, TABLENAME + "." + DELETED_DATE, TABLENAME + "." + HS_RISCO_ID, };
+		TABLENAME + "." + RELATORIO_ID, TABLENAME + "." + TO_RELATORIO_ID, TABLENAME + "." + DESCRIPTION, TABLENAME + "." + DELETED_DATE, TABLENAME + "." + HS_RISCO_ID, 
+		TABLENAME + "." + IS_PATRIMONIAL, };
 
 	protected static final String DB_FIELD_NAMES[] = new String[]{
-		ID, RELATORIO_ID, DESCRIPTION, DELETED_DATE, HS_RISCO_ID, };
+		ID, RELATORIO_ID, DESCRIPTION, DELETED_DATE, HS_RISCO_ID, IS_PATRIMONIAL, };
 
 
 	protected static final String PK_FIELD_NAMES[] = new String[]{
@@ -75,7 +82,7 @@ public class HsRelatorioRisco extends com.evolute.entity.evo.EvoDataObject<com.e
 
 
 	public static final String DEFAULT_LOAD_SET[] = new String[] {
-		ID, RELATORIO_ID, DESCRIPTION, DELETED_DATE, HS_RISCO_ID, };
+		ID, RELATORIO_ID, DESCRIPTION, DELETED_DATE, HS_RISCO_ID, IS_PATRIMONIAL, };
 
 	private Integer id;
 	private Integer relatorio_id;
@@ -83,6 +90,7 @@ public class HsRelatorioRisco extends com.evolute.entity.evo.EvoDataObject<com.e
 	private String description;
 	private java.sql.Timestamp deleted_date;
 	private Integer hs_risco_id;
+	private Boolean is_patrimonial;
 
 	protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
 
@@ -90,7 +98,7 @@ public class HsRelatorioRisco extends com.evolute.entity.evo.EvoDataObject<com.e
 	{
 		super();
 		dirtyProperties = new boolean[]{ false, false, false, 
-			false, false, false };
+			false, false, false, false };
 	}
 
 	public Integer getId()
@@ -124,28 +132,34 @@ public class HsRelatorioRisco extends com.evolute.entity.evo.EvoDataObject<com.e
 
 	public java.util.List<db.data.siprp_local.outer.HsRelatorioMedidaData>fromHsRelatorioMedida_risco_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsRelatorioMedidaData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsRelatorioMedidaData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioMedidaData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsRelatorioMedidaData.class , getPrimaryKey().getMap().get("id"), "risco_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsRelatorioMedidaData.class , getPrimaryKey().getMap().get("id"), "risco_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HsRelatorioPostoRiscoData>fromHsRelatorioPostoRisco_risco_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsRelatorioPostoRiscoData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsRelatorioPostoRiscoData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioPostoRiscoData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsRelatorioPostoRiscoData.class , getPrimaryKey().getMap().get("id"), "risco_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsRelatorioPostoRiscoData.class , getPrimaryKey().getMap().get("id"), "risco_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
@@ -292,6 +306,35 @@ public class HsRelatorioRisco extends com.evolute.entity.evo.EvoDataObject<com.e
 		LAZY_LOADED_OBJECTS.put( HS_RISCO_ID, Boolean.TRUE );
 	}
 
+	public Boolean getIs_patrimonial()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( IS_PATRIMONIAL );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.is_patrimonial;
+	}
+
+	public void setIs_patrimonial( Boolean is_patrimonial )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( IS_PATRIMONIAL, is_patrimonial );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.is_patrimonial = is_patrimonial;
+		LAZY_LOADED_OBJECTS.put( IS_PATRIMONIAL, Boolean.TRUE );
+	}
+
 	public Object get( String fieldName )
 	{
 		Object value = null;
@@ -316,6 +359,9 @@ public class HsRelatorioRisco extends com.evolute.entity.evo.EvoDataObject<com.e
 			case HsRelatorioRisco.HS_RISCO_ID_INDEX:
 				value = getHs_risco_id();
 				break;
+			case HsRelatorioRisco.IS_PATRIMONIAL_INDEX:
+				value = getIs_patrimonial();
+				break;
 		}
 		return value;
 	}
@@ -344,6 +390,9 @@ public class HsRelatorioRisco extends com.evolute.entity.evo.EvoDataObject<com.e
 			case HsRelatorioRisco.HS_RISCO_ID_INDEX:
 				value = this.hs_risco_id;
 				break;
+			case HsRelatorioRisco.IS_PATRIMONIAL_INDEX:
+				value = this.is_patrimonial;
+				break;
 		}
 		return value;
 	}
@@ -371,6 +420,9 @@ public class HsRelatorioRisco extends com.evolute.entity.evo.EvoDataObject<com.e
 			case HsRelatorioRisco.HS_RISCO_ID_INDEX:
 				setHs_risco_id( ( Integer ) value );
 				break;
+			case HsRelatorioRisco.IS_PATRIMONIAL_INDEX:
+				setIs_patrimonial( ( Boolean ) value );
+				break;
 		}
 	}
 
@@ -397,6 +449,9 @@ public class HsRelatorioRisco extends com.evolute.entity.evo.EvoDataObject<com.e
 			case HsRelatorioRisco.HS_RISCO_ID_INDEX:
 				this.hs_risco_id = ( Integer ) value;
 				break;
+			case HsRelatorioRisco.IS_PATRIMONIAL_INDEX:
+				this.is_patrimonial = ( Boolean ) value;
+				break;
 		}
 	}
 
@@ -454,6 +509,9 @@ public class HsRelatorioRisco extends com.evolute.entity.evo.EvoDataObject<com.e
 			case HsRelatorioRisco.HS_RISCO_ID_INDEX:
 				theClass = Integer.class;
 				break;
+			case HsRelatorioRisco.IS_PATRIMONIAL_INDEX:
+				theClass = Boolean.class;
+				break;
 		}
 		return theClass;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRelatorioRiscoValorQualitativo.java

@@ -96,28 +96,34 @@ public class HsRelatorioRiscoValorQualitativo extends com.evolute.entity.evo.Evo
 
 	public java.util.List<db.data.siprp_local.outer.HsPostoRiscoData>fromHsPostoRisco_valor_qualitativo()
 	{
-		java.util.List<db.data.siprp_local.outer.HsPostoRiscoData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsPostoRiscoData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsPostoRiscoData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsPostoRiscoData.class , getPrimaryKey().getMap().get("id"), "valor_qualitativo" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsPostoRiscoData.class , getPrimaryKey().getMap().get("id"), "valor_qualitativo" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HsRelatorioPostoRiscoData>fromHsRelatorioPostoRisco_valor_qualitativo_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsRelatorioPostoRiscoData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsRelatorioPostoRiscoData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioPostoRiscoData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsRelatorioPostoRiscoData.class , getPrimaryKey().getMap().get("id"), "valor_qualitativo_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsRelatorioPostoRiscoData.class , getPrimaryKey().getMap().get("id"), "valor_qualitativo_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRisco.java

@@ -25,6 +25,8 @@ public class HsRisco extends com.evolute.entity.evo.EvoDataObject<com.evolute.en
 		FIELD_INDEXES.put( HsRisco.DESCRIPTION_FULL, HsRisco.DESCRIPTION_INDEX );
 		FIELD_INDEXES.put( HsRisco.DELETED_DATE, HsRisco.DELETED_DATE_INDEX );
 		FIELD_INDEXES.put( HsRisco.DELETED_DATE_FULL, HsRisco.DELETED_DATE_INDEX );
+		FIELD_INDEXES.put( HsRisco.IS_PATRIMONIAL, HsRisco.IS_PATRIMONIAL_INDEX );
+		FIELD_INDEXES.put( HsRisco.IS_PATRIMONIAL_FULL, HsRisco.IS_PATRIMONIAL_INDEX );
 	}
 
 	private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
@@ -54,15 +56,18 @@ public class HsRisco extends com.evolute.entity.evo.EvoDataObject<com.evolute.en
 	public static final String DELETED_DATE = "deleted_date";
 	public static final String DELETED_DATE_FULL = "hs_risco.deleted_date";
 	public static final int DELETED_DATE_INDEX = 4;
+	public static final String IS_PATRIMONIAL = "is_patrimonial";
+	public static final String IS_PATRIMONIAL_FULL = "hs_risco.is_patrimonial";
+	public static final int IS_PATRIMONIAL_INDEX = 5;
 
 	public static final String FIELD_NAMES[] = new String[]{
-		TEMA_ID, TO_TEMA_ID, DESCRIPTION, DELETED_DATE, };
+		TEMA_ID, TO_TEMA_ID, DESCRIPTION, DELETED_DATE, IS_PATRIMONIAL, };
 
 	public static final String FIELD_NAMES_FULL[] = new String[]{
-		TABLENAME + "." + TEMA_ID, TABLENAME + "." + TO_TEMA_ID, TABLENAME + "." + DESCRIPTION, TABLENAME + "." + DELETED_DATE, };
+		TABLENAME + "." + TEMA_ID, TABLENAME + "." + TO_TEMA_ID, TABLENAME + "." + DESCRIPTION, TABLENAME + "." + DELETED_DATE, TABLENAME + "." + IS_PATRIMONIAL, };
 
 	protected static final String DB_FIELD_NAMES[] = new String[]{
-		ID, TEMA_ID, DESCRIPTION, DELETED_DATE, };
+		ID, TEMA_ID, DESCRIPTION, DELETED_DATE, IS_PATRIMONIAL, };
 
 
 	protected static final String PK_FIELD_NAMES[] = new String[]{
@@ -70,13 +75,14 @@ public class HsRisco extends com.evolute.entity.evo.EvoDataObject<com.evolute.en
 
 
 	public static final String DEFAULT_LOAD_SET[] = new String[] {
-		ID, TEMA_ID, DESCRIPTION, DELETED_DATE, };
+		ID, TEMA_ID, DESCRIPTION, DELETED_DATE, IS_PATRIMONIAL, };
 
 	private Integer id;
 	private Integer tema_id;
 	private db.data.siprp_local.outer.HsRiscoTemaData to_tema_id;
 	private String description;
 	private java.sql.Timestamp deleted_date;
+	private Boolean is_patrimonial;
 
 	protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
 
@@ -84,7 +90,7 @@ public class HsRisco extends com.evolute.entity.evo.EvoDataObject<com.evolute.en
 	{
 		super();
 		dirtyProperties = new boolean[]{ false, false, false, 
-			false, false };
+			false, false, false };
 	}
 
 	public Integer getId()
@@ -118,42 +124,51 @@ public class HsRisco extends com.evolute.entity.evo.EvoDataObject<com.evolute.en
 
 	public java.util.List<db.data.siprp_local.outer.HsPostoRiscoData>fromHsPostoRisco_risco_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsPostoRiscoData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsPostoRiscoData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsPostoRiscoData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
-			result = fromReference( db.data.siprp_local.outer.HsPostoRiscoData.class , getPrimaryKey().getMap().get("id"), "risco_id" );
-		}
-		catch( com.evolute.entity.evo.EvoDataException edex )
 		{
-			throw new RuntimeException( edex );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.HsPostoRiscoData.class , getPrimaryKey().getMap().get("id"), "risco_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HsRiscoEmpresaData>fromHsRiscoEmpresa_risco_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsRiscoEmpresaData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsRiscoEmpresaData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsRiscoEmpresaData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsRiscoEmpresaData.class , getPrimaryKey().getMap().get("id"), "risco_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsRiscoEmpresaData.class , getPrimaryKey().getMap().get("id"), "risco_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.HsRiscoMedidaData>fromHsRiscoMedida_risco_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsRiscoMedidaData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsRiscoMedidaData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsRiscoMedidaData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsRiscoMedidaData.class , getPrimaryKey().getMap().get("id"), "risco_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsRiscoMedidaData.class , getPrimaryKey().getMap().get("id"), "risco_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
@@ -271,6 +286,35 @@ public class HsRisco extends com.evolute.entity.evo.EvoDataObject<com.evolute.en
 		LAZY_LOADED_OBJECTS.put( DELETED_DATE, Boolean.TRUE );
 	}
 
+	public Boolean getIs_patrimonial()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( IS_PATRIMONIAL );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.is_patrimonial;
+	}
+
+	public void setIs_patrimonial( Boolean is_patrimonial )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( IS_PATRIMONIAL, is_patrimonial );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.is_patrimonial = is_patrimonial;
+		LAZY_LOADED_OBJECTS.put( IS_PATRIMONIAL, Boolean.TRUE );
+	}
+
 	public Object get( String fieldName )
 	{
 		Object value = null;
@@ -292,6 +336,9 @@ public class HsRisco extends com.evolute.entity.evo.EvoDataObject<com.evolute.en
 			case HsRisco.DELETED_DATE_INDEX:
 				value = getDeleted_date();
 				break;
+			case HsRisco.IS_PATRIMONIAL_INDEX:
+				value = getIs_patrimonial();
+				break;
 		}
 		return value;
 	}
@@ -317,6 +364,9 @@ public class HsRisco extends com.evolute.entity.evo.EvoDataObject<com.evolute.en
 			case HsRisco.DELETED_DATE_INDEX:
 				value = this.deleted_date;
 				break;
+			case HsRisco.IS_PATRIMONIAL_INDEX:
+				value = this.is_patrimonial;
+				break;
 		}
 		return value;
 	}
@@ -341,6 +391,9 @@ public class HsRisco extends com.evolute.entity.evo.EvoDataObject<com.evolute.en
 			case HsRisco.DELETED_DATE_INDEX:
 				setDeleted_date( ( java.sql.Timestamp ) value );
 				break;
+			case HsRisco.IS_PATRIMONIAL_INDEX:
+				setIs_patrimonial( ( Boolean ) value );
+				break;
 		}
 	}
 
@@ -364,6 +417,9 @@ public class HsRisco extends com.evolute.entity.evo.EvoDataObject<com.evolute.en
 			case HsRisco.DELETED_DATE_INDEX:
 				this.deleted_date = ( java.sql.Timestamp ) value;
 				break;
+			case HsRisco.IS_PATRIMONIAL_INDEX:
+				this.is_patrimonial = ( Boolean ) value;
+				break;
 		}
 	}
 
@@ -418,6 +474,9 @@ public class HsRisco extends com.evolute.entity.evo.EvoDataObject<com.evolute.en
 			case HsRisco.DELETED_DATE_INDEX:
 				theClass = java.sql.Timestamp.class;
 				break;
+			case HsRisco.IS_PATRIMONIAL_INDEX:
+				theClass = Boolean.class;
+				break;
 		}
 		return theClass;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRiscoTema.java

@@ -102,14 +102,17 @@ public class HsRiscoTema extends com.evolute.entity.evo.EvoDataObject<com.evolut
 
 	public java.util.List<db.data.siprp_local.outer.HsRiscoData>fromHsRisco_tema_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsRiscoData> result = null;
+		java.util.List<db.data.siprp_local.outer.HsRiscoData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsRiscoData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsRiscoData.class , getPrimaryKey().getMap().get("id"), "tema_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.HsRiscoData.class , getPrimaryKey().getMap().get("id"), "tema_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/Image.java

@@ -102,28 +102,34 @@ public class Image extends com.evolute.entity.evo.EvoDataObject<com.evolute.enti
 
 	public java.util.List<db.data.siprp_local.outer.EmpresasData>fromEmpresas_empresa_logo_id()
 	{
-		java.util.List<db.data.siprp_local.outer.EmpresasData> result = null;
+		java.util.List<db.data.siprp_local.outer.EmpresasData> result = new java.util.LinkedList< db.data.siprp_local.outer.EmpresasData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.EmpresasData.class , getPrimaryKey().getMap().get("id"), "empresa_logo_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.EmpresasData.class , getPrimaryKey().getMap().get("id"), "empresa_logo_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.MarcacoesTecnicosHstData>fromMarcacoesTecnicosHst_assinatura()
 	{
-		java.util.List<db.data.siprp_local.outer.MarcacoesTecnicosHstData> result = null;
+		java.util.List<db.data.siprp_local.outer.MarcacoesTecnicosHstData> result = new java.util.LinkedList< db.data.siprp_local.outer.MarcacoesTecnicosHstData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.MarcacoesTecnicosHstData.class , getPrimaryKey().getMap().get("id"), "assinatura" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.MarcacoesTecnicosHstData.class , getPrimaryKey().getMap().get("id"), "assinatura" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/Lembretes.java

@@ -63,6 +63,18 @@ public class Lembretes extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 		FIELD_INDEXES.put( Lembretes.TO_TRABALHADORES_ECDS_DATAS_ID, Lembretes.TO_TRABALHADORES_ECDS_DATAS_ID_INDEX );
 		FIELD_INDEXES.put( Lembretes.DELETED_DATE, Lembretes.DELETED_DATE_INDEX );
 		FIELD_INDEXES.put( Lembretes.DELETED_DATE_FULL, Lembretes.DELETED_DATE_INDEX );
+		com.evolute.entity.evo.EvoDataObject.register( Lembretes.CLASS_IDENTIFIER, Lembretes.EXAME_ID, Lembretes.TO_EXAME_ID ); 
+		FIELD_INDEXES.put( Lembretes.EXAME_ID, Lembretes.EXAME_ID_INDEX );
+		FIELD_INDEXES.put( Lembretes.EXAME_ID_FULL, Lembretes.EXAME_ID_INDEX );
+		FIELD_INDEXES.put( Lembretes.TO_EXAME_ID, Lembretes.TO_EXAME_ID_INDEX );
+		com.evolute.entity.evo.EvoDataObject.register( Lembretes.CLASS_IDENTIFIER, Lembretes.MARCACOES_EMPRESA_ID, Lembretes.TO_MARCACOES_EMPRESA_ID ); 
+		FIELD_INDEXES.put( Lembretes.MARCACOES_EMPRESA_ID, Lembretes.MARCACOES_EMPRESA_ID_INDEX );
+		FIELD_INDEXES.put( Lembretes.MARCACOES_EMPRESA_ID_FULL, Lembretes.MARCACOES_EMPRESA_ID_INDEX );
+		FIELD_INDEXES.put( Lembretes.TO_MARCACOES_EMPRESA_ID, Lembretes.TO_MARCACOES_EMPRESA_ID_INDEX );
+		FIELD_INDEXES.put( Lembretes.DATA_ALVO, Lembretes.DATA_ALVO_INDEX );
+		FIELD_INDEXES.put( Lembretes.DATA_ALVO_FULL, Lembretes.DATA_ALVO_INDEX );
+		FIELD_INDEXES.put( Lembretes.DATA_OLD, Lembretes.DATA_OLD_INDEX );
+		FIELD_INDEXES.put( Lembretes.DATA_OLD_FULL, Lembretes.DATA_OLD_INDEX );
 	}
 
 	private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
@@ -89,6 +101,12 @@ public class Lembretes extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 	public static final com.evolute.entity.ForeignKey ForeignKeytrabalhadores_ecds_datas_idTotrabalhadores_ecds_datas = 
 		new com.evolute.entity.ForeignKey( Lembretes.class, Lembretes.TRABALHADORES_ECDS_DATAS_ID, db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.class, db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.ID );
 
+	public static final com.evolute.entity.ForeignKey ForeignKeyexame_idToexames = 
+		new com.evolute.entity.ForeignKey( Lembretes.class, Lembretes.EXAME_ID, db.data.siprp_local.outer.ExamesData.class, db.data.siprp_local.outer.ExamesData.ID );
+
+	public static final com.evolute.entity.ForeignKey ForeignKeymarcacoes_empresa_idTomarcacoes_empresa = 
+		new com.evolute.entity.ForeignKey( Lembretes.class, Lembretes.MARCACOES_EMPRESA_ID, db.data.siprp_local.outer.MarcacoesEmpresaData.class, db.data.siprp_local.outer.MarcacoesEmpresaData.ID );
+
 	public static final String TABLENAME = "lembretes";
 
 
@@ -167,6 +185,24 @@ public class Lembretes extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 	public static final String DELETED_DATE = "deleted_date";
 	public static final String DELETED_DATE_FULL = "lembretes.deleted_date";
 	public static final int DELETED_DATE_INDEX = 23;
+	public static final String EXAME_ID = "exame_id";
+	public static final String EXAME_ID_FULL = "lembretes.exame_id";
+	public static final int EXAME_ID_INDEX = 24;
+	public static final String TO_EXAME_ID = "to_exame_id";
+	public static final String TO_EXAME_ID_FULL = "lembretes.to_exame_id";
+	public static final int TO_EXAME_ID_INDEX = 25;
+	public static final String MARCACOES_EMPRESA_ID = "marcacoes_empresa_id";
+	public static final String MARCACOES_EMPRESA_ID_FULL = "lembretes.marcacoes_empresa_id";
+	public static final int MARCACOES_EMPRESA_ID_INDEX = 26;
+	public static final String TO_MARCACOES_EMPRESA_ID = "to_marcacoes_empresa_id";
+	public static final String TO_MARCACOES_EMPRESA_ID_FULL = "lembretes.to_marcacoes_empresa_id";
+	public static final int TO_MARCACOES_EMPRESA_ID_INDEX = 27;
+	public static final String DATA_ALVO = "data_alvo";
+	public static final String DATA_ALVO_FULL = "lembretes.data_alvo";
+	public static final int DATA_ALVO_INDEX = 28;
+	public static final String DATA_OLD = "data_old";
+	public static final String DATA_OLD_FULL = "lembretes.data_old";
+	public static final int DATA_OLD_INDEX = 29;
 
 	public static final String FIELD_NAMES[] = new String[]{
 		TIPO_ID, DATA, DESCRICAO, TEXTO, EMPRESA_ID, TO_EMPRESA_ID, ESTABELECIMENTO_ID, 
@@ -175,7 +211,9 @@ public class Lembretes extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 		MARCACAO_TRABALHADOR_ID, TO_MARCACAO_TRABALHADOR_ID, ENVIAR_EMAIL, 
 		PERIODICIDADE_DIAS, PERIODICIDADE_MESES, ULTIMO_ENVIO, 
 		TRABALHADORES_CONSULTAS_DATAS_ID, TO_TRABALHADORES_CONSULTAS_DATAS_ID, 
-		TRABALHADORES_ECDS_DATAS_ID, TO_TRABALHADORES_ECDS_DATAS_ID, DELETED_DATE, };
+		TRABALHADORES_ECDS_DATAS_ID, TO_TRABALHADORES_ECDS_DATAS_ID, DELETED_DATE, 
+		EXAME_ID, TO_EXAME_ID, MARCACOES_EMPRESA_ID, TO_MARCACOES_EMPRESA_ID, 
+		DATA_ALVO, DATA_OLD, };
 
 	public static final String FIELD_NAMES_FULL[] = new String[]{
 		TABLENAME + "." + TIPO_ID, TABLENAME + "." + DATA, TABLENAME + "." + DESCRICAO, TABLENAME + "." + TEXTO, TABLENAME + "." + EMPRESA_ID, TABLENAME + "." + TO_EMPRESA_ID, TABLENAME + "." + ESTABELECIMENTO_ID, 
@@ -184,14 +222,16 @@ public class Lembretes extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 		TABLENAME + "." + MARCACAO_TRABALHADOR_ID, TABLENAME + "." + TO_MARCACAO_TRABALHADOR_ID, TABLENAME + "." + ENVIAR_EMAIL, 
 		TABLENAME + "." + PERIODICIDADE_DIAS, TABLENAME + "." + PERIODICIDADE_MESES, TABLENAME + "." + ULTIMO_ENVIO, 
 		TABLENAME + "." + TRABALHADORES_CONSULTAS_DATAS_ID, TABLENAME + "." + TO_TRABALHADORES_CONSULTAS_DATAS_ID, 
-		TABLENAME + "." + TRABALHADORES_ECDS_DATAS_ID, TABLENAME + "." + TO_TRABALHADORES_ECDS_DATAS_ID, TABLENAME + "." + DELETED_DATE, };
+		TABLENAME + "." + TRABALHADORES_ECDS_DATAS_ID, TABLENAME + "." + TO_TRABALHADORES_ECDS_DATAS_ID, TABLENAME + "." + DELETED_DATE, 
+		TABLENAME + "." + EXAME_ID, TABLENAME + "." + TO_EXAME_ID, TABLENAME + "." + MARCACOES_EMPRESA_ID, TABLENAME + "." + TO_MARCACOES_EMPRESA_ID, 
+		TABLENAME + "." + DATA_ALVO, TABLENAME + "." + DATA_OLD, };
 
 	protected static final String DB_FIELD_NAMES[] = new String[]{
 		ID, TIPO_ID, DATA, DESCRICAO, TEXTO, EMPRESA_ID, ESTABELECIMENTO_ID, TRABALHADOR_ID, 
 		MARCACAO_ESTABELECIMENTO_ID, MARCACAO_TRABALHADOR_ID, ENVIAR_EMAIL, 
 		PERIODICIDADE_DIAS, PERIODICIDADE_MESES, ULTIMO_ENVIO, 
 		TRABALHADORES_CONSULTAS_DATAS_ID, TRABALHADORES_ECDS_DATAS_ID, 
-		DELETED_DATE, };
+		DELETED_DATE, EXAME_ID, MARCACOES_EMPRESA_ID, DATA_ALVO, DATA_OLD, };
 
 
 	protected static final String PK_FIELD_NAMES[] = new String[]{
@@ -203,7 +243,7 @@ public class Lembretes extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 		MARCACAO_ESTABELECIMENTO_ID, MARCACAO_TRABALHADOR_ID, ENVIAR_EMAIL, 
 		PERIODICIDADE_DIAS, PERIODICIDADE_MESES, ULTIMO_ENVIO, 
 		TRABALHADORES_CONSULTAS_DATAS_ID, TRABALHADORES_ECDS_DATAS_ID, 
-		DELETED_DATE, };
+		DELETED_DATE, EXAME_ID, MARCACOES_EMPRESA_ID, DATA_ALVO, DATA_OLD, };
 
 	private Integer id;
 	private Integer tipo_id;
@@ -229,6 +269,12 @@ public class Lembretes extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 	private Integer trabalhadores_ecds_datas_id;
 	private db.data.siprp_local.outer.TrabalhadoresEcdsDatasData to_trabalhadores_ecds_datas_id;
 	private java.sql.Timestamp deleted_date;
+	private Integer exame_id;
+	private db.data.siprp_local.outer.ExamesData to_exame_id;
+	private Integer marcacoes_empresa_id;
+	private db.data.siprp_local.outer.MarcacoesEmpresaData to_marcacoes_empresa_id;
+	private java.util.Date data_alvo;
+	private java.util.Date data_old;
 
 	protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
 
@@ -238,7 +284,8 @@ public class Lembretes extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 		dirtyProperties = new boolean[]{ false, false, false, 
 			false, false, false, false, false, false, false, false, 
 			false, false, false, false, false, false, false, false, 
-			false, false, false, false, false };
+			false, false, false, false, false, false, false, false
+			, false, false, false };
 	}
 
 	public Integer getId()
@@ -916,6 +963,174 @@ public class Lembretes extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 		LAZY_LOADED_OBJECTS.put( DELETED_DATE, Boolean.TRUE );
 	}
 
+	public Integer getExame_id()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( EXAME_ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.exame_id;
+	}
+
+	public void setExame_id( Integer exame_id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( EXAME_ID, exame_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.exame_id = exame_id;
+		LAZY_LOADED_OBJECTS.put( EXAME_ID, Boolean.TRUE );
+	}
+
+	public db.data.siprp_local.outer.ExamesData toExame_id()
+	{
+		try
+		{
+			prepare( TO_EXAME_ID );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		return this.to_exame_id;
+	}
+
+	public void setToExame_id( db.data.siprp_local.outer.ExamesData to_exame_id )
+	{
+		try
+		{
+			preProcess( TO_EXAME_ID, to_exame_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.to_exame_id = to_exame_id;
+	}
+
+	public Integer getMarcacoes_empresa_id()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( MARCACOES_EMPRESA_ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.marcacoes_empresa_id;
+	}
+
+	public void setMarcacoes_empresa_id( Integer marcacoes_empresa_id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( MARCACOES_EMPRESA_ID, marcacoes_empresa_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.marcacoes_empresa_id = marcacoes_empresa_id;
+		LAZY_LOADED_OBJECTS.put( MARCACOES_EMPRESA_ID, Boolean.TRUE );
+	}
+
+	public db.data.siprp_local.outer.MarcacoesEmpresaData toMarcacoes_empresa_id()
+	{
+		try
+		{
+			prepare( TO_MARCACOES_EMPRESA_ID );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		return this.to_marcacoes_empresa_id;
+	}
+
+	public void setToMarcacoes_empresa_id( db.data.siprp_local.outer.MarcacoesEmpresaData to_marcacoes_empresa_id )
+	{
+		try
+		{
+			preProcess( TO_MARCACOES_EMPRESA_ID, to_marcacoes_empresa_id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.to_marcacoes_empresa_id = to_marcacoes_empresa_id;
+	}
+
+	public java.util.Date getData_alvo()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( DATA_ALVO );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.data_alvo;
+	}
+
+	public void setData_alvo( java.util.Date data_alvo )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( DATA_ALVO, data_alvo );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.data_alvo = data_alvo;
+		LAZY_LOADED_OBJECTS.put( DATA_ALVO, Boolean.TRUE );
+	}
+
+	public java.util.Date getData_old()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( DATA_OLD );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.data_old;
+	}
+
+	public void setData_old( java.util.Date data_old )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( DATA_OLD, data_old );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.data_old = data_old;
+		LAZY_LOADED_OBJECTS.put( DATA_OLD, Boolean.TRUE );
+	}
+
 	public Object get( String fieldName )
 	{
 		Object value = null;
@@ -994,6 +1209,24 @@ public class Lembretes extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 			case Lembretes.DELETED_DATE_INDEX:
 				value = getDeleted_date();
 				break;
+			case Lembretes.EXAME_ID_INDEX:
+				value = getExame_id();
+				break;
+			case Lembretes.TO_EXAME_ID_INDEX:
+				value = toExame_id();
+				break;
+			case Lembretes.MARCACOES_EMPRESA_ID_INDEX:
+				value = getMarcacoes_empresa_id();
+				break;
+			case Lembretes.TO_MARCACOES_EMPRESA_ID_INDEX:
+				value = toMarcacoes_empresa_id();
+				break;
+			case Lembretes.DATA_ALVO_INDEX:
+				value = getData_alvo();
+				break;
+			case Lembretes.DATA_OLD_INDEX:
+				value = getData_old();
+				break;
 		}
 		return value;
 	}
@@ -1076,6 +1309,24 @@ public class Lembretes extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 			case Lembretes.DELETED_DATE_INDEX:
 				value = this.deleted_date;
 				break;
+			case Lembretes.EXAME_ID_INDEX:
+				value = this.exame_id;
+				break;
+			case Lembretes.TO_EXAME_ID_INDEX:
+				value = this.to_exame_id;
+				break;
+			case Lembretes.MARCACOES_EMPRESA_ID_INDEX:
+				value = this.marcacoes_empresa_id;
+				break;
+			case Lembretes.TO_MARCACOES_EMPRESA_ID_INDEX:
+				value = this.to_marcacoes_empresa_id;
+				break;
+			case Lembretes.DATA_ALVO_INDEX:
+				value = this.data_alvo;
+				break;
+			case Lembretes.DATA_OLD_INDEX:
+				value = this.data_old;
+				break;
 		}
 		return value;
 	}
@@ -1157,6 +1408,24 @@ public class Lembretes extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 			case Lembretes.DELETED_DATE_INDEX:
 				setDeleted_date( ( java.sql.Timestamp ) value );
 				break;
+			case Lembretes.EXAME_ID_INDEX:
+				setExame_id( ( Integer ) value );
+				break;
+			case Lembretes.TO_EXAME_ID_INDEX:
+				setToExame_id( ( db.data.siprp_local.outer.ExamesData ) value );
+				break;
+			case Lembretes.MARCACOES_EMPRESA_ID_INDEX:
+				setMarcacoes_empresa_id( ( Integer ) value );
+				break;
+			case Lembretes.TO_MARCACOES_EMPRESA_ID_INDEX:
+				setToMarcacoes_empresa_id( ( db.data.siprp_local.outer.MarcacoesEmpresaData ) value );
+				break;
+			case Lembretes.DATA_ALVO_INDEX:
+				setData_alvo( ( java.util.Date ) value );
+				break;
+			case Lembretes.DATA_OLD_INDEX:
+				setData_old( ( java.util.Date ) value );
+				break;
 		}
 	}
 
@@ -1237,6 +1506,24 @@ public class Lembretes extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 			case Lembretes.DELETED_DATE_INDEX:
 				this.deleted_date = ( java.sql.Timestamp ) value;
 				break;
+			case Lembretes.EXAME_ID_INDEX:
+				this.exame_id = ( Integer ) value;
+				break;
+			case Lembretes.TO_EXAME_ID_INDEX:
+				this.to_exame_id = ( db.data.siprp_local.outer.ExamesData ) value;
+				break;
+			case Lembretes.MARCACOES_EMPRESA_ID_INDEX:
+				this.marcacoes_empresa_id = ( Integer ) value;
+				break;
+			case Lembretes.TO_MARCACOES_EMPRESA_ID_INDEX:
+				this.to_marcacoes_empresa_id = ( db.data.siprp_local.outer.MarcacoesEmpresaData ) value;
+				break;
+			case Lembretes.DATA_ALVO_INDEX:
+				this.data_alvo = ( java.util.Date ) value;
+				break;
+			case Lembretes.DATA_OLD_INDEX:
+				this.data_old = ( java.util.Date ) value;
+				break;
 		}
 	}
 
@@ -1348,6 +1635,24 @@ public class Lembretes extends com.evolute.entity.evo.EvoDataObject<com.evolute.
 			case Lembretes.DELETED_DATE_INDEX:
 				theClass = java.sql.Timestamp.class;
 				break;
+			case Lembretes.EXAME_ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case Lembretes.TO_EXAME_ID_INDEX:
+				theClass = db.data.siprp_local.outer.ExamesData.class;
+				break;
+			case Lembretes.MARCACOES_EMPRESA_ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case Lembretes.TO_MARCACOES_EMPRESA_ID_INDEX:
+				theClass = db.data.siprp_local.outer.MarcacoesEmpresaData.class;
+				break;
+			case Lembretes.DATA_ALVO_INDEX:
+				theClass = java.util.Date.class;
+				break;
+			case Lembretes.DATA_OLD_INDEX:
+				theClass = java.util.Date.class;
+				break;
 		}
 		return theClass;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/MarcacoesEmpresa.java

@@ -122,6 +122,23 @@ public class MarcacoesEmpresa extends com.evolute.entity.evo.EvoDataObject<com.e
 		LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE );
 	}
 
+	public java.util.List<db.data.siprp_local.outer.LembretesData>fromLembretes_marcacoes_empresa_id()
+	{
+		java.util.List<db.data.siprp_local.outer.LembretesData> result = new java.util.LinkedList< db.data.siprp_local.outer.LembretesData >();
+		if ( getPrimaryKey() != null ) 
+		{
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "marcacoes_empresa_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
+		}
+		return result;
+	}
+
 	public java.util.Date getData()
 	{
 		try

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/MarcacoesEstabelecimento.java

@@ -177,30 +177,53 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje
 		LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE );
 	}
 
-	public java.util.List<db.data.siprp_local.outer.HsRelatorioData>fromHsRelatorio_marcacao_id()
+	public java.util.List<db.data.siprp_local.outer.FilFileMarcacoesEstabelecimentoData>fromFilFileMarcacoesEstabelecimento_marcacao_id()
 	{
-		java.util.List<db.data.siprp_local.outer.HsRelatorioData> result = null;
+		java.util.List<db.data.siprp_local.outer.FilFileMarcacoesEstabelecimentoData> result = new java.util.LinkedList< db.data.siprp_local.outer.FilFileMarcacoesEstabelecimentoData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.HsRelatorioData.class , getPrimaryKey().getMap().get("id"), "marcacao_id" );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.FilFileMarcacoesEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "marcacao_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
-		catch( com.evolute.entity.evo.EvoDataException edex )
+		return result;
+	}
+
+	public java.util.List<db.data.siprp_local.outer.HsRelatorioData>fromHsRelatorio_marcacao_id()
+	{
+		java.util.List<db.data.siprp_local.outer.HsRelatorioData> result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioData >();
+		if ( getPrimaryKey() != null ) 
 		{
-			throw new RuntimeException( edex );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.HsRelatorioData.class , getPrimaryKey().getMap().get("id"), "marcacao_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.LembretesData>fromLembretes_marcacao_estabelecimento_id()
 	{
-		java.util.List<db.data.siprp_local.outer.LembretesData> result = null;
+		java.util.List<db.data.siprp_local.outer.LembretesData> result = new java.util.LinkedList< db.data.siprp_local.outer.LembretesData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "marcacao_estabelecimento_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "marcacao_estabelecimento_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/MarcacoesTecnicosHst.java

@@ -158,28 +158,34 @@ public class MarcacoesTecnicosHst extends com.evolute.entity.evo.EvoDataObject<c
 
 	public java.util.List<db.data.siprp_local.outer.MarcacoesEstabelecimentoData>fromMarcacoesEstabelecimento_tecnico_hst()
 	{
-		java.util.List<db.data.siprp_local.outer.MarcacoesEstabelecimentoData> result = null;
+		java.util.List<db.data.siprp_local.outer.MarcacoesEstabelecimentoData> result = new java.util.LinkedList< db.data.siprp_local.outer.MarcacoesEstabelecimentoData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.MarcacoesEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "tecnico_hst" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.MarcacoesEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "tecnico_hst" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.MarcacoesEstabelecimentoData>fromMarcacoesEstabelecimento_tecnico_superior_hst()
 	{
-		java.util.List<db.data.siprp_local.outer.MarcacoesEstabelecimentoData> result = null;
+		java.util.List<db.data.siprp_local.outer.MarcacoesEstabelecimentoData> result = new java.util.LinkedList< db.data.siprp_local.outer.MarcacoesEstabelecimentoData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.MarcacoesEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "tecnico_superior_hst" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.MarcacoesEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "tecnico_superior_hst" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/MarcacoesTrabalhador.java

@@ -194,42 +194,51 @@ public class MarcacoesTrabalhador extends com.evolute.entity.evo.EvoDataObject<c
 
 	public java.util.List<db.data.siprp_local.outer.LembretesData>fromLembretes_marcacao_trabalhador_id()
 	{
-		java.util.List<db.data.siprp_local.outer.LembretesData> result = null;
+		java.util.List<db.data.siprp_local.outer.LembretesData> result = new java.util.LinkedList< db.data.siprp_local.outer.LembretesData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "marcacao_trabalhador_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "marcacao_trabalhador_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.MarcacoesGruposRealizadosData>fromMarcacoesGruposRealizados_marcacao_trabalhador_id()
 	{
-		java.util.List<db.data.siprp_local.outer.MarcacoesGruposRealizadosData> result = null;
+		java.util.List<db.data.siprp_local.outer.MarcacoesGruposRealizadosData> result = new java.util.LinkedList< db.data.siprp_local.outer.MarcacoesGruposRealizadosData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.MarcacoesGruposRealizadosData.class , getPrimaryKey().getMap().get("id"), "marcacao_trabalhador_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.MarcacoesGruposRealizadosData.class , getPrimaryKey().getMap().get("id"), "marcacao_trabalhador_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData>fromMarcacoesTrabalhadorEstados_marcacao_id()
 	{
-		java.util.List<db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData> result = null;
+		java.util.List<db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData> result = new java.util.LinkedList< db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData.class , getPrimaryKey().getMap().get("id"), "marcacao_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData.class , getPrimaryKey().getMap().get("id"), "marcacao_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/MarcacoesTrabalhadorEstados.java

@@ -133,14 +133,17 @@ public class MarcacoesTrabalhadorEstados extends com.evolute.entity.evo.EvoDataO
 
 	public java.util.List<db.data.siprp_local.outer.MarcacoesGruposRealizadosData>fromMarcacoesGruposRealizados_marcacoes_trabalhador_estado_id()
 	{
-		java.util.List<db.data.siprp_local.outer.MarcacoesGruposRealizadosData> result = null;
+		java.util.List<db.data.siprp_local.outer.MarcacoesGruposRealizadosData> result = new java.util.LinkedList< db.data.siprp_local.outer.MarcacoesGruposRealizadosData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.MarcacoesGruposRealizadosData.class , getPrimaryKey().getMap().get("id"), "marcacoes_trabalhador_estado_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.MarcacoesGruposRealizadosData.class , getPrimaryKey().getMap().get("id"), "marcacoes_trabalhador_estado_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/MedVacinaTipo.java

@@ -0,0 +1,448 @@
+/*
+* MedVacinaTipo.java
+*
+* Generated by com.evutils.codegen.EntityObjectGenerator
+*
+* Use but DON'T TOUCH
+* -> (can't touch this)
+*/
+package db.data.siprp_local.inner;
+
+
+public class MedVacinaTipo extends com.evolute.entity.evo.EvoDataObject<com.evolute.entity.utils.IntegerPrimaryKey>
+{
+	private static final java.util.HashMap<String,Integer> FIELD_INDEXES = new java.util.HashMap<String,Integer>();
+
+	static
+	{
+		FIELD_INDEXES.put( MedVacinaTipo.ID, MedVacinaTipo.ID_INDEX );
+		FIELD_INDEXES.put( MedVacinaTipo.ID_FULL, MedVacinaTipo.ID_INDEX );
+		FIELD_INDEXES.put( MedVacinaTipo.CODIGO, MedVacinaTipo.CODIGO_INDEX );
+		FIELD_INDEXES.put( MedVacinaTipo.CODIGO_FULL, MedVacinaTipo.CODIGO_INDEX );
+		FIELD_INDEXES.put( MedVacinaTipo.DESCRICAO, MedVacinaTipo.DESCRICAO_INDEX );
+		FIELD_INDEXES.put( MedVacinaTipo.DESCRICAO_FULL, MedVacinaTipo.DESCRICAO_INDEX );
+		FIELD_INDEXES.put( MedVacinaTipo.ORDEM, MedVacinaTipo.ORDEM_INDEX );
+		FIELD_INDEXES.put( MedVacinaTipo.ORDEM_FULL, MedVacinaTipo.ORDEM_INDEX );
+		FIELD_INDEXES.put( MedVacinaTipo.DELETED_STAMP, MedVacinaTipo.DELETED_STAMP_INDEX );
+		FIELD_INDEXES.put( MedVacinaTipo.DELETED_STAMP_FULL, MedVacinaTipo.DELETED_STAMP_INDEX );
+	}
+
+	private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
+
+
+	public static final String TABLENAME = "med_vacina_tipo";
+
+
+	public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.med_vacina_tipo";
+
+	public static final int _INVALID__INDEX = -1;
+	public static final String ID = "id";
+	public static final String ID_FULL = "med_vacina_tipo.id";
+	public static final int ID_INDEX = 0;
+	public static final String CODIGO = "codigo";
+	public static final String CODIGO_FULL = "med_vacina_tipo.codigo";
+	public static final int CODIGO_INDEX = 1;
+	public static final String DESCRICAO = "descricao";
+	public static final String DESCRICAO_FULL = "med_vacina_tipo.descricao";
+	public static final int DESCRICAO_INDEX = 2;
+	public static final String ORDEM = "ordem";
+	public static final String ORDEM_FULL = "med_vacina_tipo.ordem";
+	public static final int ORDEM_INDEX = 3;
+	public static final String DELETED_STAMP = "deleted_stamp";
+	public static final String DELETED_STAMP_FULL = "med_vacina_tipo.deleted_stamp";
+	public static final int DELETED_STAMP_INDEX = 4;
+
+	public static final String FIELD_NAMES[] = new String[]{
+		CODIGO, DESCRICAO, ORDEM, DELETED_STAMP, };
+
+	public static final String FIELD_NAMES_FULL[] = new String[]{
+		TABLENAME + "." + CODIGO, TABLENAME + "." + DESCRICAO, TABLENAME + "." + ORDEM, TABLENAME + "." + DELETED_STAMP, };
+
+	protected static final String DB_FIELD_NAMES[] = new String[]{
+		ID, CODIGO, DESCRICAO, ORDEM, DELETED_STAMP, };
+
+
+	protected static final String PK_FIELD_NAMES[] = new String[]{
+		ID, };
+
+
+	public static final String DEFAULT_LOAD_SET[] = new String[] {
+		ID, CODIGO, DESCRICAO, ORDEM, DELETED_STAMP, };
+
+	private Integer id;
+	private String codigo;
+	private String descricao;
+	private Integer ordem;
+	private java.sql.Timestamp deleted_stamp;
+
+	protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
+
+	public MedVacinaTipo()
+	{
+		super();
+		dirtyProperties = new boolean[]{ false, false, false, 
+			false, false };
+	}
+
+	public Integer getId()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( ID );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.id;
+	}
+
+	public void setId( Integer id )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( ID, id );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.id = id;
+		LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE );
+	}
+
+	public String getCodigo()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( CODIGO );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.codigo;
+	}
+
+	public void setCodigo( String codigo )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( CODIGO, codigo );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.codigo = codigo;
+		LAZY_LOADED_OBJECTS.put( CODIGO, Boolean.TRUE );
+	}
+
+	public String getDescricao()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( DESCRICAO );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.descricao;
+	}
+
+	public void setDescricao( String descricao )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( DESCRICAO, descricao );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.descricao = descricao;
+		LAZY_LOADED_OBJECTS.put( DESCRICAO, Boolean.TRUE );
+	}
+
+	public Integer getOrdem()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( ORDEM );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.ordem;
+	}
+
+	public void setOrdem( Integer ordem )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( ORDEM, ordem );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.ordem = ordem;
+		LAZY_LOADED_OBJECTS.put( ORDEM, Boolean.TRUE );
+	}
+
+	public java.util.List<db.data.siprp_local.outer.AptOutrasVacinaData>fromAptOutrasVacina_vacina_tipo()
+	{
+		java.util.List<db.data.siprp_local.outer.AptOutrasVacinaData> result = new java.util.LinkedList< db.data.siprp_local.outer.AptOutrasVacinaData >();
+		if ( getPrimaryKey() != null ) 
+		{
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.AptOutrasVacinaData.class , getPrimaryKey().getMap().get("ordem"), "vacina_tipo" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
+		}
+		return result;
+	}
+
+	public java.sql.Timestamp getDeleted_stamp()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( DELETED_STAMP );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.deleted_stamp;
+	}
+
+	public void setDeleted_stamp( java.sql.Timestamp deleted_stamp )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( DELETED_STAMP, deleted_stamp );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.deleted_stamp = deleted_stamp;
+		LAZY_LOADED_OBJECTS.put( DELETED_STAMP, Boolean.TRUE );
+	}
+
+	public Object get( String fieldName )
+	{
+		Object value = null;
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case MedVacinaTipo.ID_INDEX:
+				value = getId();
+				break;
+			case MedVacinaTipo.CODIGO_INDEX:
+				value = getCodigo();
+				break;
+			case MedVacinaTipo.DESCRICAO_INDEX:
+				value = getDescricao();
+				break;
+			case MedVacinaTipo.ORDEM_INDEX:
+				value = getOrdem();
+				break;
+			case MedVacinaTipo.DELETED_STAMP_INDEX:
+				value = getDeleted_stamp();
+				break;
+		}
+		return value;
+	}
+
+	public Object rawGet( String fieldName )
+	{
+		Object value = null;
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case MedVacinaTipo.ID_INDEX:
+				value = this.id;
+				break;
+			case MedVacinaTipo.CODIGO_INDEX:
+				value = this.codigo;
+				break;
+			case MedVacinaTipo.DESCRICAO_INDEX:
+				value = this.descricao;
+				break;
+			case MedVacinaTipo.ORDEM_INDEX:
+				value = this.ordem;
+				break;
+			case MedVacinaTipo.DELETED_STAMP_INDEX:
+				value = this.deleted_stamp;
+				break;
+		}
+		return value;
+	}
+
+	public void set( String fieldName, Object value )
+	{
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case MedVacinaTipo.ID_INDEX:
+				setId( ( Integer ) value );
+				break;
+			case MedVacinaTipo.CODIGO_INDEX:
+				setCodigo( ( String ) value );
+				break;
+			case MedVacinaTipo.DESCRICAO_INDEX:
+				setDescricao( ( String ) value );
+				break;
+			case MedVacinaTipo.ORDEM_INDEX:
+				setOrdem( ( Integer ) value );
+				break;
+			case MedVacinaTipo.DELETED_STAMP_INDEX:
+				setDeleted_stamp( ( java.sql.Timestamp ) value );
+				break;
+		}
+	}
+
+	public void rawSet( String fieldName, Object value )
+	{
+		Integer index = getFieldIndex( fieldName );
+		switch( index )
+		{
+			case MedVacinaTipo.ID_INDEX:
+				this.id = ( Integer ) value;
+				break;
+			case MedVacinaTipo.CODIGO_INDEX:
+				this.codigo = ( String ) value;
+				break;
+			case MedVacinaTipo.DESCRICAO_INDEX:
+				this.descricao = ( String ) value;
+				break;
+			case MedVacinaTipo.ORDEM_INDEX:
+				this.ordem = ( Integer ) value;
+				break;
+			case MedVacinaTipo.DELETED_STAMP_INDEX:
+				this.deleted_stamp = ( java.sql.Timestamp ) value;
+				break;
+		}
+	}
+
+	public String []getFieldNames()
+	{
+		return FIELD_NAMES;
+	}
+
+	public String []getFieldNamesFull()
+	{
+		return FIELD_NAMES_FULL;
+	}
+
+	public String []getDBFieldNames()
+	{
+		return DB_FIELD_NAMES;
+	}
+
+	public String []getPrimaryKeyNames()
+	{
+		return PK_FIELD_NAMES;
+	}
+
+	public String []getDefaultLoadSet()
+	{
+		return DEFAULT_LOAD_SET;
+	}
+
+	public String getPrimaryKeyName()
+	{
+		return PK_FIELD_NAMES[ 0 ];
+	}
+
+	public Class<?> getFieldClass( String fieldName )
+	{
+		Integer index = getFieldIndex( fieldName );
+		Class<?> theClass = null;
+		switch( index )
+		{
+			case MedVacinaTipo.ID_INDEX:
+				theClass = Integer.class;
+				break;
+			case MedVacinaTipo.CODIGO_INDEX:
+				theClass = String.class;
+				break;
+			case MedVacinaTipo.DESCRICAO_INDEX:
+				theClass = String.class;
+				break;
+			case MedVacinaTipo.ORDEM_INDEX:
+				theClass = Integer.class;
+				break;
+			case MedVacinaTipo.DELETED_STAMP_INDEX:
+				theClass = java.sql.Timestamp.class;
+				break;
+		}
+		return theClass;
+	}
+
+	public Integer getFieldIndex( String fieldName )
+	{
+		Integer index = FIELD_INDEXES.get( fieldName );
+		return index != null ? index : MedVacinaTipo._INVALID__INDEX;
+	}
+
+	public String getTableName()
+	{
+		return TABLENAME;
+	}
+
+	public String getClassIdentifier()
+	{
+		return CLASS_IDENTIFIER;
+	}
+
+	@Override
+	protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col )
+	{
+		if( primaryKey == null )
+		{
+			primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, MedVacinaTipo.PK_FIELD_NAMES );
+			primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) );
+		}
+		setId( ( Integer ) array.get( row, col + 0 ) );
+	}
+
+	@Override
+	public com.evolute.entity.utils.IntegerPrimaryKey getPrimaryKey()
+	{
+		return primaryKey;
+	}
+
+	public void initLazyLoadFields()
+	{
+	}
+
+	public boolean isPropertyLoaded( String fieldName )
+	{
+		if ( LAZY_LOADED_OBJECTS.get( fieldName ) == null )
+		{
+			return true;
+		}
+		else
+		{
+			return LAZY_LOADED_OBJECTS.get( fieldName );
+		}
+	}
+}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/Medicos.java

@@ -109,28 +109,34 @@ public class Medicos extends com.evolute.entity.evo.EvoDataObject<com.evolute.en
 
 	public java.util.List<db.data.siprp_local.outer.EstabelecimentosData>fromEstabelecimentos_medico_id()
 	{
-		java.util.List<db.data.siprp_local.outer.EstabelecimentosData> result = null;
+		java.util.List<db.data.siprp_local.outer.EstabelecimentosData> result = new java.util.LinkedList< db.data.siprp_local.outer.EstabelecimentosData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.EstabelecimentosData.class , getPrimaryKey().getMap().get("id"), "medico_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.EstabelecimentosData.class , getPrimaryKey().getMap().get("id"), "medico_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.ExamesData>fromExames_medico_id()
 	{
-		java.util.List<db.data.siprp_local.outer.ExamesData> result = null;
+		java.util.List<db.data.siprp_local.outer.ExamesData> result = new java.util.LinkedList< db.data.siprp_local.outer.ExamesData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.ExamesData.class , getPrimaryKey().getMap().get("id"), "medico_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.ExamesData.class , getPrimaryKey().getMap().get("id"), "medico_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/PaisesContinentes.java

@@ -115,14 +115,17 @@ public class PaisesContinentes extends com.evolute.entity.evo.EvoDataObject<com.
 
 	public java.util.List<db.data.siprp_local.outer.PaisesData>fromPaises_continente_id()
 	{
-		java.util.List<db.data.siprp_local.outer.PaisesData> result = null;
+		java.util.List<db.data.siprp_local.outer.PaisesData> result = new java.util.LinkedList< db.data.siprp_local.outer.PaisesData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.PaisesData.class , getPrimaryKey().getMap().get("id"), "continente_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.PaisesData.class , getPrimaryKey().getMap().get("id"), "continente_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/PesDocumento.java

@@ -130,14 +130,17 @@ public class PesDocumento extends com.evolute.entity.evo.EvoDataObject<com.evolu
 
 	public java.util.List<db.data.siprp_local.outer.PesPessoaDocumentoData>fromPesPessoaDocumento_documento_id()
 	{
-		java.util.List<db.data.siprp_local.outer.PesPessoaDocumentoData> result = null;
+		java.util.List<db.data.siprp_local.outer.PesPessoaDocumentoData> result = new java.util.LinkedList< db.data.siprp_local.outer.PesPessoaDocumentoData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.PesPessoaDocumentoData.class , getPrimaryKey().getMap().get("id"), "documento_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.PesPessoaDocumentoData.class , getPrimaryKey().getMap().get("id"), "documento_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/PesDocumentoTipo.java

@@ -115,14 +115,17 @@ public class PesDocumentoTipo extends com.evolute.entity.evo.EvoDataObject<com.e
 
 	public java.util.List<db.data.siprp_local.outer.PesDocumentoData>fromPesDocumento_tipo_id()
 	{
-		java.util.List<db.data.siprp_local.outer.PesDocumentoData> result = null;
+		java.util.List<db.data.siprp_local.outer.PesDocumentoData> result = new java.util.LinkedList< db.data.siprp_local.outer.PesDocumentoData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.PesDocumentoData.class , getPrimaryKey().getMap().get("id"), "tipo_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.PesDocumentoData.class , getPrimaryKey().getMap().get("id"), "tipo_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/Prestadores.java

@@ -43,6 +43,8 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObject<com.evolut
 		FIELD_INDEXES.put( Prestadores.CONTRIBUINTE_FULL, Prestadores.CONTRIBUINTE_INDEX );
 		FIELD_INDEXES.put( Prestadores.OBSERVACOES, Prestadores.OBSERVACOES_INDEX );
 		FIELD_INDEXES.put( Prestadores.OBSERVACOES_FULL, Prestadores.OBSERVACOES_INDEX );
+		FIELD_INDEXES.put( Prestadores.DELETED_STAMP, Prestadores.DELETED_STAMP_INDEX );
+		FIELD_INDEXES.put( Prestadores.DELETED_STAMP_FULL, Prestadores.DELETED_STAMP_INDEX );
 	}
 
 	private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >();
@@ -99,18 +101,23 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObject<com.evolut
 	public static final String OBSERVACOES = "observacoes";
 	public static final String OBSERVACOES_FULL = "prestadores.observacoes";
 	public static final int OBSERVACOES_INDEX = 13;
+	public static final String DELETED_STAMP = "deleted_stamp";
+	public static final String DELETED_STAMP_FULL = "prestadores.deleted_stamp";
+	public static final int DELETED_STAMP_INDEX = 14;
 
 	public static final String FIELD_NAMES[] = new String[]{
 		NOME, NOME_PLAIN, MORADA, CODIGO_POSTAL, LOCALIDADE, LOCALIDADE_CP, CONTACTO_ID, 
-		TO_CONTACTO_ID, ACTIVO, FAZ_CONSULTAS, FAZ_ECDS, CONTRIBUINTE, OBSERVACOES, };
+		TO_CONTACTO_ID, ACTIVO, FAZ_CONSULTAS, FAZ_ECDS, CONTRIBUINTE, OBSERVACOES, 
+		DELETED_STAMP, };
 
 	public static final String FIELD_NAMES_FULL[] = new String[]{
 		TABLENAME + "." + NOME, TABLENAME + "." + NOME_PLAIN, TABLENAME + "." + MORADA, TABLENAME + "." + CODIGO_POSTAL, TABLENAME + "." + LOCALIDADE, TABLENAME + "." + LOCALIDADE_CP, TABLENAME + "." + CONTACTO_ID, 
-		TABLENAME + "." + TO_CONTACTO_ID, TABLENAME + "." + ACTIVO, TABLENAME + "." + FAZ_CONSULTAS, TABLENAME + "." + FAZ_ECDS, TABLENAME + "." + CONTRIBUINTE, TABLENAME + "." + OBSERVACOES, };
+		TABLENAME + "." + TO_CONTACTO_ID, TABLENAME + "." + ACTIVO, TABLENAME + "." + FAZ_CONSULTAS, TABLENAME + "." + FAZ_ECDS, TABLENAME + "." + CONTRIBUINTE, TABLENAME + "." + OBSERVACOES, 
+		TABLENAME + "." + DELETED_STAMP, };
 
 	protected static final String DB_FIELD_NAMES[] = new String[]{
 		ID, NOME, NOME_PLAIN, MORADA, CODIGO_POSTAL, LOCALIDADE, LOCALIDADE_CP, CONTACTO_ID, 
-		ACTIVO, FAZ_CONSULTAS, FAZ_ECDS, CONTRIBUINTE, OBSERVACOES, };
+		ACTIVO, FAZ_CONSULTAS, FAZ_ECDS, CONTRIBUINTE, OBSERVACOES, DELETED_STAMP, };
 
 
 	protected static final String PK_FIELD_NAMES[] = new String[]{
@@ -119,7 +126,7 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObject<com.evolut
 
 	public static final String DEFAULT_LOAD_SET[] = new String[] {
 		ID, NOME, NOME_PLAIN, MORADA, CODIGO_POSTAL, LOCALIDADE, LOCALIDADE_CP, CONTACTO_ID, 
-		ACTIVO, FAZ_CONSULTAS, FAZ_ECDS, CONTRIBUINTE, OBSERVACOES, };
+		ACTIVO, FAZ_CONSULTAS, FAZ_ECDS, CONTRIBUINTE, OBSERVACOES, DELETED_STAMP, };
 
 	private Integer id;
 	private String nome;
@@ -135,6 +142,7 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObject<com.evolut
 	private String faz_ecds;
 	private String contribuinte;
 	private String observacoes;
+	private java.sql.Timestamp deleted_stamp;
 
 	protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey;
 
@@ -143,7 +151,7 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObject<com.evolut
 		super();
 		dirtyProperties = new boolean[]{ false, false, false, 
 			false, false, false, false, false, false, false, false, 
-			false, false, false };
+			false, false, false, false };
 	}
 
 	public Integer getId()
@@ -177,168 +185,204 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObject<com.evolut
 
 	public java.util.List<db.data.siprp_local.outer.EstabelecimentosData>fromEstabelecimentos_prestador_consulta_id()
 	{
-		java.util.List<db.data.siprp_local.outer.EstabelecimentosData> result = null;
+		java.util.List<db.data.siprp_local.outer.EstabelecimentosData> result = new java.util.LinkedList< db.data.siprp_local.outer.EstabelecimentosData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.EstabelecimentosData.class , getPrimaryKey().getMap().get("id"), "prestador_consulta_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.EstabelecimentosData.class , getPrimaryKey().getMap().get("id"), "prestador_consulta_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.EstabelecimentosData>fromEstabelecimentos_prestador_ecds_id()
 	{
-		java.util.List<db.data.siprp_local.outer.EstabelecimentosData> result = null;
+		java.util.List<db.data.siprp_local.outer.EstabelecimentosData> result = new java.util.LinkedList< db.data.siprp_local.outer.EstabelecimentosData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.EstabelecimentosData.class , getPrimaryKey().getMap().get("id"), "prestador_ecds_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.EstabelecimentosData.class , getPrimaryKey().getMap().get("id"), "prestador_ecds_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.MarcacoesTrabalhadorData>fromMarcacoesTrabalhador_prestador_id()
 	{
-		java.util.List<db.data.siprp_local.outer.MarcacoesTrabalhadorData> result = null;
+		java.util.List<db.data.siprp_local.outer.MarcacoesTrabalhadorData> result = new java.util.LinkedList< db.data.siprp_local.outer.MarcacoesTrabalhadorData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.MarcacoesTrabalhadorData.class , getPrimaryKey().getMap().get("id"), "prestador_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.MarcacoesTrabalhadorData.class , getPrimaryKey().getMap().get("id"), "prestador_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData>fromMarcacoesTrabalhadorEstados_prestador_id()
 	{
-		java.util.List<db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData> result = null;
+		java.util.List<db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData> result = new java.util.LinkedList< db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData.class , getPrimaryKey().getMap().get("id"), "prestador_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData.class , getPrimaryKey().getMap().get("id"), "prestador_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.PrestadoresGruposProtocoloData>fromPrestadoresGruposProtocolo_prestador_id()
 	{
-		java.util.List<db.data.siprp_local.outer.PrestadoresGruposProtocoloData> result = null;
+		java.util.List<db.data.siprp_local.outer.PrestadoresGruposProtocoloData> result = new java.util.LinkedList< db.data.siprp_local.outer.PrestadoresGruposProtocoloData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.PrestadoresGruposProtocoloData.class , getPrimaryKey().getMap().get("id"), "prestador_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.PrestadoresGruposProtocoloData.class , getPrimaryKey().getMap().get("id"), "prestador_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.PrtGruposProtocoloData>fromPrtGruposProtocolo_analisador_id()
 	{
-		java.util.List<db.data.siprp_local.outer.PrtGruposProtocoloData> result = null;
+		java.util.List<db.data.siprp_local.outer.PrtGruposProtocoloData> result = new java.util.LinkedList< db.data.siprp_local.outer.PrtGruposProtocoloData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.PrtGruposProtocoloData.class , getPrimaryKey().getMap().get("id"), "analisador_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.PrtGruposProtocoloData.class , getPrimaryKey().getMap().get("id"), "analisador_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.TrabalhadoresConsultasData>fromTrabalhadoresConsultas_prestador_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresConsultasData> result = null;
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresConsultasData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresConsultasData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresConsultasData.class , getPrimaryKey().getMap().get("id"), "prestador_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresConsultasData.class , getPrimaryKey().getMap().get("id"), "prestador_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.TrabalhadoresConsultasDatasData>fromTrabalhadoresConsultasDatas_prestador_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresConsultasDatasData> result = null;
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresConsultasDatasData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresConsultasDatasData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresConsultasDatasData.class , getPrimaryKey().getMap().get("id"), "prestador_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresConsultasDatasData.class , getPrimaryKey().getMap().get("id"), "prestador_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdData>fromTrabalhadoresEcd_analisador_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdData> result = null;
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdData.class , getPrimaryKey().getMap().get("id"), "analisador_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdData.class , getPrimaryKey().getMap().get("id"), "analisador_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsAnaliseData>fromTrabalhadoresEcdsAnalise_prestador_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsAnaliseData> result = null;
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsAnaliseData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdsAnaliseData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsAnaliseData.class , getPrimaryKey().getMap().get("id"), "prestador_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsAnaliseData.class , getPrimaryKey().getMap().get("id"), "prestador_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsDatasData>fromTrabalhadoresEcdsDatas_prestador_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsDatasData> result = null;
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsDatasData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdsDatasData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.class , getPrimaryKey().getMap().get("id"), "prestador_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.class , getPrimaryKey().getMap().get("id"), "prestador_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsDatasData>fromTrabalhadoresEcdsDatas_analisador_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsDatasData> result = null;
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsDatasData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdsDatasData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.class , getPrimaryKey().getMap().get("id"), "analisador_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.class , getPrimaryKey().getMap().get("id"), "analisador_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
@@ -717,6 +761,35 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObject<com.evolut
 		LAZY_LOADED_OBJECTS.put( OBSERVACOES, Boolean.TRUE );
 	}
 
+	public java.sql.Timestamp getDeleted_stamp()
+	{
+		try
+		{
+			setLastAccess( System.currentTimeMillis() );
+			prepare( DELETED_STAMP );
+		}
+		catch( java.lang.Exception ex )
+		{
+			throw new RuntimeException( ex );
+		}
+		return this.deleted_stamp;
+	}
+
+	public void setDeleted_stamp( java.sql.Timestamp deleted_stamp )
+	{
+		try
+		{
+			setLockedForRefresh( true );
+			preProcess( DELETED_STAMP, deleted_stamp );
+		}
+		catch( com.evolute.entity.evo.EvoDataException edex )
+		{
+			throw new RuntimeException( edex );
+		}
+		this.deleted_stamp = deleted_stamp;
+		LAZY_LOADED_OBJECTS.put( DELETED_STAMP, Boolean.TRUE );
+	}
+
 	public Object get( String fieldName )
 	{
 		Object value = null;
@@ -765,6 +838,9 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObject<com.evolut
 			case Prestadores.OBSERVACOES_INDEX:
 				value = getObservacoes();
 				break;
+			case Prestadores.DELETED_STAMP_INDEX:
+				value = getDeleted_stamp();
+				break;
 		}
 		return value;
 	}
@@ -817,6 +893,9 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObject<com.evolut
 			case Prestadores.OBSERVACOES_INDEX:
 				value = this.observacoes;
 				break;
+			case Prestadores.DELETED_STAMP_INDEX:
+				value = this.deleted_stamp;
+				break;
 		}
 		return value;
 	}
@@ -868,6 +947,9 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObject<com.evolut
 			case Prestadores.OBSERVACOES_INDEX:
 				setObservacoes( ( String ) value );
 				break;
+			case Prestadores.DELETED_STAMP_INDEX:
+				setDeleted_stamp( ( java.sql.Timestamp ) value );
+				break;
 		}
 	}
 
@@ -918,6 +1000,9 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObject<com.evolut
 			case Prestadores.OBSERVACOES_INDEX:
 				this.observacoes = ( String ) value;
 				break;
+			case Prestadores.DELETED_STAMP_INDEX:
+				this.deleted_stamp = ( java.sql.Timestamp ) value;
+				break;
 		}
 	}
 
@@ -999,6 +1084,9 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObject<com.evolut
 			case Prestadores.OBSERVACOES_INDEX:
 				theClass = String.class;
 				break;
+			case Prestadores.DELETED_STAMP_INDEX:
+				theClass = java.sql.Timestamp.class;
+				break;
 		}
 		return theClass;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/PrtGruposProtocolo.java

@@ -130,56 +130,68 @@ public class PrtGruposProtocolo extends com.evolute.entity.evo.EvoDataObject<com
 
 	public java.util.List<db.data.siprp_local.outer.MarcacoesGruposRealizadosData>fromMarcacoesGruposRealizados_grupo_protocolo_id()
 	{
-		java.util.List<db.data.siprp_local.outer.MarcacoesGruposRealizadosData> result = null;
+		java.util.List<db.data.siprp_local.outer.MarcacoesGruposRealizadosData> result = new java.util.LinkedList< db.data.siprp_local.outer.MarcacoesGruposRealizadosData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.MarcacoesGruposRealizadosData.class , getPrimaryKey().getMap().get("id"), "grupo_protocolo_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.MarcacoesGruposRealizadosData.class , getPrimaryKey().getMap().get("id"), "grupo_protocolo_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.PrestadoresGruposProtocoloData>fromPrestadoresGruposProtocolo_grupo_protocolo_id()
 	{
-		java.util.List<db.data.siprp_local.outer.PrestadoresGruposProtocoloData> result = null;
+		java.util.List<db.data.siprp_local.outer.PrestadoresGruposProtocoloData> result = new java.util.LinkedList< db.data.siprp_local.outer.PrestadoresGruposProtocoloData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.PrestadoresGruposProtocoloData.class , getPrimaryKey().getMap().get("id"), "grupo_protocolo_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.PrestadoresGruposProtocoloData.class , getPrimaryKey().getMap().get("id"), "grupo_protocolo_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.PrtTiposElementosProtocoloData>fromPrtTiposElementosProtocolo_grupo_protocolo_id()
 	{
-		java.util.List<db.data.siprp_local.outer.PrtTiposElementosProtocoloData> result = null;
+		java.util.List<db.data.siprp_local.outer.PrtTiposElementosProtocoloData> result = new java.util.LinkedList< db.data.siprp_local.outer.PrtTiposElementosProtocoloData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
-			result = fromReference( db.data.siprp_local.outer.PrtTiposElementosProtocoloData.class , getPrimaryKey().getMap().get("id"), "grupo_protocolo_id" );
-		}
-		catch( com.evolute.entity.evo.EvoDataException edex )
 		{
-			throw new RuntimeException( edex );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.PrtTiposElementosProtocoloData.class , getPrimaryKey().getMap().get("id"), "grupo_protocolo_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsAnaliseData>fromTrabalhadoresEcdsAnalise_grupo_ecds_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsAnaliseData> result = null;
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsAnaliseData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdsAnaliseData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsAnaliseData.class , getPrimaryKey().getMap().get("id"), "grupo_ecds_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsAnaliseData.class , getPrimaryKey().getMap().get("id"), "grupo_ecds_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/PrtTiposElementosProtocolo.java

@@ -124,28 +124,34 @@ public class PrtTiposElementosProtocolo extends com.evolute.entity.evo.EvoDataOb
 
 	public java.util.List<db.data.siprp_local.outer.PrtElementosProtocoloData>fromPrtElementosProtocolo_tipo_elemento_protocolo_id()
 	{
-		java.util.List<db.data.siprp_local.outer.PrtElementosProtocoloData> result = null;
+		java.util.List<db.data.siprp_local.outer.PrtElementosProtocoloData> result = new java.util.LinkedList< db.data.siprp_local.outer.PrtElementosProtocoloData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.PrtElementosProtocoloData.class , getPrimaryKey().getMap().get("id"), "tipo_elemento_protocolo_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.PrtElementosProtocoloData.class , getPrimaryKey().getMap().get("id"), "tipo_elemento_protocolo_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdData>fromTrabalhadoresEcd_ecd_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdData> result = null;
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdData.class , getPrimaryKey().getMap().get("id"), "ecd_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdData.class , getPrimaryKey().getMap().get("id"), "ecd_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/TiposExamesComp.java

@@ -102,14 +102,17 @@ public class TiposExamesComp extends com.evolute.entity.evo.EvoDataObject<com.ev
 
 	public java.util.List<db.data.siprp_local.outer.ExamesPerfisData>fromExamesPerfis_tipo()
 	{
-		java.util.List<db.data.siprp_local.outer.ExamesPerfisData> result = null;
+		java.util.List<db.data.siprp_local.outer.ExamesPerfisData> result = new java.util.LinkedList< db.data.siprp_local.outer.ExamesPerfisData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.ExamesPerfisData.class , getPrimaryKey().getMap().get("id"), "tipo" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.ExamesPerfisData.class , getPrimaryKey().getMap().get("id"), "tipo" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/Trabalhadores.java

@@ -263,100 +263,155 @@ public class Trabalhadores extends com.evolute.entity.evo.EvoDataObject<com.evol
 		LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE );
 	}
 
-	public java.util.List<db.data.siprp_local.outer.AvisosData>fromAvisos_trabalhador_id()
+	public java.util.List<db.data.siprp_local.outer.AptOutrasVacinaData>fromAptOutrasVacina_trabalhador_id()
 	{
-		java.util.List<db.data.siprp_local.outer.AvisosData> result = null;
+		java.util.List<db.data.siprp_local.outer.AptOutrasVacinaData> result = new java.util.LinkedList< db.data.siprp_local.outer.AptOutrasVacinaData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.AvisosData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.AptOutrasVacinaData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
-		catch( com.evolute.entity.evo.EvoDataException edex )
+		return result;
+	}
+
+	public java.util.List<db.data.siprp_local.outer.AptOutrasViajanteData>fromAptOutrasViajante_trabalhador_id()
+	{
+		java.util.List<db.data.siprp_local.outer.AptOutrasViajanteData> result = new java.util.LinkedList< db.data.siprp_local.outer.AptOutrasViajanteData >();
+		if ( getPrimaryKey() != null ) 
 		{
-			throw new RuntimeException( edex );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.AptOutrasViajanteData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
-	public java.util.List<db.data.siprp_local.outer.ExamesData>fromExames_trabalhador_id()
+	public java.util.List<db.data.siprp_local.outer.AvisosData>fromAvisos_trabalhador_id()
 	{
-		java.util.List<db.data.siprp_local.outer.ExamesData> result = null;
+		java.util.List<db.data.siprp_local.outer.AvisosData> result = new java.util.LinkedList< db.data.siprp_local.outer.AvisosData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.ExamesData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.AvisosData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
-		catch( com.evolute.entity.evo.EvoDataException edex )
+		return result;
+	}
+
+	public java.util.List<db.data.siprp_local.outer.ExamesData>fromExames_trabalhador_id()
+	{
+		java.util.List<db.data.siprp_local.outer.ExamesData> result = new java.util.LinkedList< db.data.siprp_local.outer.ExamesData >();
+		if ( getPrimaryKey() != null ) 
 		{
-			throw new RuntimeException( edex );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.ExamesData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.LembretesData>fromLembretes_trabalhador_id()
 	{
-		java.util.List<db.data.siprp_local.outer.LembretesData> result = null;
+		java.util.List<db.data.siprp_local.outer.LembretesData> result = new java.util.LinkedList< db.data.siprp_local.outer.LembretesData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
-			result = fromReference( db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" );
-		}
-		catch( com.evolute.entity.evo.EvoDataException edex )
 		{
-			throw new RuntimeException( edex );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.MarcacoesTrabalhadorData>fromMarcacoesTrabalhador_trabalhador_id()
 	{
-		java.util.List<db.data.siprp_local.outer.MarcacoesTrabalhadorData> result = null;
+		java.util.List<db.data.siprp_local.outer.MarcacoesTrabalhadorData> result = new java.util.LinkedList< db.data.siprp_local.outer.MarcacoesTrabalhadorData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
-			result = fromReference( db.data.siprp_local.outer.MarcacoesTrabalhadorData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" );
-		}
-		catch( com.evolute.entity.evo.EvoDataException edex )
 		{
-			throw new RuntimeException( edex );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.MarcacoesTrabalhadorData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.TrabalhadoresConsultasData>fromTrabalhadoresConsultas_trabalhador_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresConsultasData> result = null;
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresConsultasData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresConsultasData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresConsultasData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresConsultasData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsData>fromTrabalhadoresEcds_trabalhador_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsData> result = null;
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdsData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" );
-		}
-		catch( com.evolute.entity.evo.EvoDataException edex )
 		{
-			throw new RuntimeException( edex );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.TrabalhadoresProcessoData>fromTrabalhadoresProcesso_trabalhador_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresProcessoData> result = null;
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresProcessoData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresProcessoData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresProcessoData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresProcessoData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresConsultas.java

@@ -150,14 +150,17 @@ public class TrabalhadoresConsultas extends com.evolute.entity.evo.EvoDataObject
 
 	public java.util.List<db.data.siprp_local.outer.TrabalhadoresConsultasDatasData>fromTrabalhadoresConsultasDatas_trabalhadores_consultas_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresConsultasDatasData> result = null;
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresConsultasDatasData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresConsultasDatasData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresConsultasDatasData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_consultas_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresConsultasDatasData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_consultas_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresConsultasDatas.java

@@ -135,42 +135,51 @@ public class TrabalhadoresConsultasDatas extends com.evolute.entity.evo.EvoDataO
 
 	public java.util.List<db.data.siprp_local.outer.LembretesData>fromLembretes_trabalhadores_consultas_datas_id()
 	{
-		java.util.List<db.data.siprp_local.outer.LembretesData> result = null;
+		java.util.List<db.data.siprp_local.outer.LembretesData> result = new java.util.LinkedList< db.data.siprp_local.outer.LembretesData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_consultas_datas_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_consultas_datas_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.TrabalhadoresConsultasDatasEmailsData>fromTrabalhadoresConsultasDatasEmails_trabalhadores_consultas_datas_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresConsultasDatasEmailsData> result = null;
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresConsultasDatasEmailsData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresConsultasDatasEmailsData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresConsultasDatasEmailsData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_consultas_datas_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresConsultasDatasEmailsData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_consultas_datas_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.TrabalhadoresConsultasDatasObservacoesData>fromTrabalhadoresConsultasDatasObservacoes_trabalhadores_consultas_datas_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresConsultasDatasObservacoesData> result = null;
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresConsultasDatasObservacoesData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresConsultasDatasObservacoesData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresConsultasDatasObservacoesData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_consultas_datas_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresConsultasDatasObservacoesData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_consultas_datas_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresEcds.java

@@ -133,14 +133,17 @@ public class TrabalhadoresEcds extends com.evolute.entity.evo.EvoDataObject<com.
 
 	public java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsDatasData>fromTrabalhadoresEcdsDatas_trabalhadores_ecds_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsDatasData> result = null;
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsDatasData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdsDatasData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_ecds_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_ecds_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresEcdsDatas.java

@@ -164,56 +164,68 @@ public class TrabalhadoresEcdsDatas extends com.evolute.entity.evo.EvoDataObject
 
 	public java.util.List<db.data.siprp_local.outer.LembretesData>fromLembretes_trabalhadores_ecds_datas_id()
 	{
-		java.util.List<db.data.siprp_local.outer.LembretesData> result = null;
+		java.util.List<db.data.siprp_local.outer.LembretesData> result = new java.util.LinkedList< db.data.siprp_local.outer.LembretesData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_ecds_datas_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_ecds_datas_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdData>fromTrabalhadoresEcd_trabalhadores_ecds_datas_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdData> result = null;
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_ecds_datas_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_ecds_datas_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsDatasEmailsData>fromTrabalhadoresEcdsDatasEmails_trabalhadores_ecds_datas_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsDatasEmailsData> result = null;
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsDatasEmailsData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdsDatasEmailsData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsDatasEmailsData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_ecds_datas_id" );
-		}
-		catch( com.evolute.entity.evo.EvoDataException edex )
 		{
-			throw new RuntimeException( edex );
+			try
+			{
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsDatasEmailsData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_ecds_datas_id" );
+			}
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsDatasObservacoesData>fromTrabalhadoresEcdsDatasObservacoes_trabalhadores_ecds_datas_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsDatasObservacoesData> result = null;
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsDatasObservacoesData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdsDatasObservacoesData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsDatasObservacoesData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_ecds_datas_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsDatasObservacoesData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_ecds_datas_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresProcesso.java

@@ -144,42 +144,51 @@ public class TrabalhadoresProcesso extends com.evolute.entity.evo.EvoDataObject<
 
 	public java.util.List<db.data.siprp_local.outer.TrabalhadoresConsultasData>fromTrabalhadoresConsultas_processo_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresConsultasData> result = null;
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresConsultasData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresConsultasData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresConsultasData.class , getPrimaryKey().getMap().get("id"), "processo_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresConsultasData.class , getPrimaryKey().getMap().get("id"), "processo_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsData>fromTrabalhadoresEcds_processo_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsData> result = null;
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresEcdsData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdsData >();
-		try
+		if ( getPrimaryKey() != null ) 
 		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsData.class , getPrimaryKey().getMap().get("id"), "processo_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsData.class , getPrimaryKey().getMap().get("id"), "processo_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}
 
 	public java.util.List<db.data.siprp_local.outer.TrabalhadoresFichasAptidaoData>fromTrabalhadoresFichasAptidao_processo_id()
 	{
-		java.util.List<db.data.siprp_local.outer.TrabalhadoresFichasAptidaoData> result = null;
+		java.util.List<db.data.siprp_local.outer.TrabalhadoresFichasAptidaoData> result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresFichasAptidaoData >();
-		try
+		if ( getPrimaryKey() != null ) 
-		{
+		{
-			result = fromReference( db.data.siprp_local.outer.TrabalhadoresFichasAptidaoData.class , getPrimaryKey().getMap().get("id"), "processo_id" );
+			try
-		}
+			{
-		catch( com.evolute.entity.evo.EvoDataException edex )
+				result = fromReference( db.data.siprp_local.outer.TrabalhadoresFichasAptidaoData.class , getPrimaryKey().getMap().get("id"), "processo_id" );
-		{
+			}
-			throw new RuntimeException( edex );
+			catch( com.evolute.entity.evo.EvoDataException edex )
+			{
+				throw new RuntimeException( edex );
+			}
 		}
 		return result;
 	}

trunk/PlanosActuacao/src/java/db/data/siprp_local/inner/package.xml

@@ -47,6 +47,50 @@
 			<extension vendor-name="evolute" key="java-type" value="java.sql.Timestamp"/>
 		</field>
 	</class>
+	<class name="AptOutrasVacina" identity-type="application" table="apt_outras_vacina" >
+		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="apt_outras_vacina_id_seq">
+			<column name="id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="visible" value="false"/>
+		</field>
+		<field name="appointment_id" null-value="exception">
+			<column name="appointment_id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="referenced-table" value="apt_appointment"/>
+			<extension vendor-name="evolute" key="referenced-column" value="id"/>
+		</field>
+		<field name="trabalhador_id" null-value="exception">
+			<column name="trabalhador_id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="referenced-table" value="trabalhadores"/>
+			<extension vendor-name="evolute" key="referenced-column" value="id"/>
+		</field>
+		<field name="vacina_tipo" null-value="exception">
+			<column name="vacina_tipo"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="referenced-table" value="med_vacina_tipo"/>
+			<extension vendor-name="evolute" key="referenced-column" value="ordem"/>
+		</field>
+	</class>
+	<class name="AptOutrasViajante" identity-type="application" table="apt_outras_viajante" >
+		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="apt_outras_viajante_id_seq">
+			<column name="id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="visible" value="false"/>
+		</field>
+		<field name="appointment_id" null-value="exception">
+			<column name="appointment_id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="referenced-table" value="apt_appointment"/>
+			<extension vendor-name="evolute" key="referenced-column" value="id"/>
+		</field>
+		<field name="trabalhador_id" null-value="exception">
+			<column name="trabalhador_id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="referenced-table" value="trabalhadores"/>
+			<extension vendor-name="evolute" key="referenced-column" value="id"/>
+		</field>
+	</class>
 	<class name="AptSegurancaAlimentar" identity-type="application" table="apt_seguranca_alimentar" >
 		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="apt_seguranca_alimentar_id_seq">
 			<column name="id"/>
@@ -557,6 +601,63 @@
 			<extension vendor-name="evolute" key="java-type" value="java.sql.Timestamp"/>
 		</field>
 	</class>
+	<class name="CurQuestionario" identity-type="application" table="cur_questionario" >
+		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="cur_questionario_id_seq">
+			<column name="id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="visible" value="false"/>
+		</field>
+		<field name="nome" null-value="exception">
+			<column name="nome" length="256"/>
+			<extension vendor-name="evolute" key="java-type" value="String"/>
+		</field>
+	</class>
+	<class name="CurQuestionarioPergunta" identity-type="application" table="cur_questionario_pergunta" >
+		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="cur_questionario_pergunta_id_seq">
+			<column name="id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="visible" value="false"/>
+		</field>
+		<field name="questionario_id" null-value="exception">
+			<column name="questionario_id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="referenced-table" value="cur_questionario"/>
+			<extension vendor-name="evolute" key="referenced-column" value="id"/>
+		</field>
+		<field name="descricao" null-value="exception">
+			<column name="descricao" length="512"/>
+			<extension vendor-name="evolute" key="java-type" value="String"/>
+		</field>
+	</class>
+	<class name="CurQuestionarioResposta" identity-type="application" table="cur_questionario_resposta" >
+		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="cur_questionario_resposta_id_seq">
+			<column name="id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="visible" value="false"/>
+		</field>
+		<field name="pergunta_id" null-value="exception">
+			<column name="pergunta_id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="referenced-table" value="cur_questionario_pergunta"/>
+			<extension vendor-name="evolute" key="referenced-column" value="id"/>
+		</field>
+		<field name="formando_id" null-value="exception">
+			<column name="formando_id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="referenced-table" value="cur_formandos"/>
+			<extension vendor-name="evolute" key="referenced-column" value="id"/>
+		</field>
+		<field name="curso_id" null-value="exception">
+			<column name="curso_id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="referenced-table" value="cur_cursos"/>
+			<extension vendor-name="evolute" key="referenced-column" value="id"/>
+		</field>
+		<field name="resposta">
+			<column name="resposta"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+		</field>
+	</class>
 	<class name="CurTopicos" identity-type="application" table="cur_topicos" >
 		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="cur_topicos_id_seq">
 			<column name="id"/>
@@ -1156,6 +1257,31 @@
 			<extension vendor-name="evolute" key="java-type" value="java.sql.Timestamp"/>
 		</field>
 	</class>
+	<class name="EvoUsrPreferences" identity-type="application" table="evo_usr_preferences" >
+		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="evo_usr_preferences_id_seq">
+			<column name="id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="visible" value="false"/>
+		</field>
+		<field name="deleted_stamp" persistence-modifier="persistent">
+			<column name="deleted_stamp"/>
+			<extension vendor-name="evolute" key="java-type" value="java.sql.Timestamp"/>
+		</field>
+		<field name="user_id" null-value="exception">
+			<column name="user_id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="referenced-table" value="evo_usr_user"/>
+			<extension vendor-name="evolute" key="referenced-column" value="id"/>
+		</field>
+		<field name="property" null-value="exception">
+			<column name="property" length="256"/>
+			<extension vendor-name="evolute" key="java-type" value="String"/>
+		</field>
+		<field name="value">
+			<column name="value" length="1024"/>
+			<extension vendor-name="evolute" key="java-type" value="String"/>
+		</field>
+	</class>
 	<class name="EvoUsrRole" identity-type="application" table="evo_usr_role" >
 		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="evo_usr_role_id_seq">
 			<column name="id"/>
@@ -1385,6 +1511,29 @@
 			<extension vendor-name="datanucleus" key="strategy-when-notnull" value="false"/>
 		</field>
 	</class>
+	<class name="FilCategorias" identity-type="application" table="fil_categorias" >
+		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="fil_categorias_id_seq">
+			<column name="id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="visible" value="false"/>
+		</field>
+		<field name="codigo" null-value="exception">
+			<column name="codigo" length="64"/>
+			<extension vendor-name="evolute" key="java-type" value="String"/>
+		</field>
+		<field name="descricao" null-value="exception">
+			<column name="descricao" length="255"/>
+			<extension vendor-name="evolute" key="java-type" value="String"/>
+		</field>
+		<field name="ordem" null-value="default">
+			<column name="ordem"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+		</field>
+		<field name="deleted_stamp" persistence-modifier="persistent">
+			<column name="deleted_stamp"/>
+			<extension vendor-name="evolute" key="java-type" value="java.sql.Timestamp"/>
+		</field>
+	</class>
 	<class name="FilFile" identity-type="application" table="fil_file" >
 		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="fil_file_id_seq">
 			<column name="id"/>
@@ -1442,6 +1591,50 @@
 			<extension vendor-name="evolute" key="referenced-column" value="id"/>
 		</field>
 	</class>
+	<class name="FilFileEmpresa" identity-type="application" table="fil_file_empresa" >
+		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="fil_file_empresa_id_seq">
+			<column name="id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="visible" value="false"/>
+		</field>
+		<field name="file_id" null-value="exception">
+			<column name="file_id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="referenced-table" value="fil_file"/>
+			<extension vendor-name="evolute" key="referenced-column" value="id"/>
+		</field>
+		<field name="empresa_id" null-value="exception">
+			<column name="empresa_id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="referenced-table" value="empresas"/>
+			<extension vendor-name="evolute" key="referenced-column" value="id"/>
+		</field>
+		<field name="categoria_id">
+			<column name="categoria_id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="referenced-table" value="fil_categorias"/>
+			<extension vendor-name="evolute" key="referenced-column" value="id"/>
+		</field>
+	</class>
+	<class name="FilFileMarcacoesEstabelecimento" identity-type="application" table="fil_file_marcacoes_estabelecimento" >
+		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="fil_file_marcacoes_estabelecimento_id_seq">
+			<column name="id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="visible" value="false"/>
+		</field>
+		<field name="file_id" null-value="exception">
+			<column name="file_id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="referenced-table" value="fil_file"/>
+			<extension vendor-name="evolute" key="referenced-column" value="id"/>
+		</field>
+		<field name="marcacao_id" null-value="exception">
+			<column name="marcacao_id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="referenced-table" value="marcacoes_estabelecimento"/>
+			<extension vendor-name="evolute" key="referenced-column" value="id"/>
+		</field>
+	</class>
 	<class name="HistoricoEstabelecimento" identity-type="application" table="historico_estabelecimento" >
 		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="historico_estabelecimento_id_seq">
 			<column name="id"/>
@@ -2108,6 +2301,10 @@
 			<column name="hs_risco_id"/>
 			<extension vendor-name="evolute" key="java-type" value="Integer"/>
 		</field>
+		<field name="is_patrimonial" null-value="default">
+			<column name="is_patrimonial"/>
+			<extension vendor-name="evolute" key="java-type" value="Boolean"/>
+		</field>
 	</class>
 	<class name="HsRelatorioRiscoValorQualitativo" identity-type="application" table="hs_relatorio_risco_valor_qualitativo" >
 		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="hs_relatorio_risco_valor_qualitativo_id_seq">
@@ -2140,6 +2337,10 @@
 			<column name="deleted_date"/>
 			<extension vendor-name="evolute" key="java-type" value="java.sql.Timestamp"/>
 		</field>
+		<field name="is_patrimonial" null-value="default">
+			<column name="is_patrimonial"/>
+			<extension vendor-name="evolute" key="java-type" value="Boolean"/>
+		</field>
 	</class>
 	<class name="HsRiscoEmpresa" identity-type="application" objectid-class="db.data.siprp_local.inner.HsRiscoEmpresaID" table="hs_risco_empresa" >
 		<field name="risco_id" primary-key="true" null-value="exception">
@@ -2294,6 +2495,26 @@
 			<column name="deleted_date"/>
 			<extension vendor-name="evolute" key="java-type" value="java.sql.Timestamp"/>
 		</field>
+		<field name="exame_id">
+			<column name="exame_id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="referenced-table" value="exames"/>
+			<extension vendor-name="evolute" key="referenced-column" value="id"/>
+		</field>
+		<field name="marcacoes_empresa_id">
+			<column name="marcacoes_empresa_id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="referenced-table" value="marcacoes_empresa"/>
+			<extension vendor-name="evolute" key="referenced-column" value="id"/>
+		</field>
+		<field name="data_alvo">
+			<column name="data_alvo"/>
+			<extension vendor-name="evolute" key="java-type" value="java.util.Date"/>
+		</field>
+		<field name="data_old">
+			<column name="data_old"/>
+			<extension vendor-name="evolute" key="java-type" value="java.util.Date"/>
+		</field>
 	</class>
 	<class name="LembretesTipos" identity-type="application" table="lembretes_tipos" >
 		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="lembretes_tipos_id_seq">
@@ -2553,6 +2774,29 @@
 			<extension vendor-name="evolute" key="referenced-column" value="id"/>
 		</field>
 	</class>
+	<class name="MedVacinaTipo" identity-type="application" table="med_vacina_tipo" >
+		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="med_vacina_tipo_id_seq">
+			<column name="id"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+			<extension vendor-name="evolute" key="visible" value="false"/>
+		</field>
+		<field name="codigo">
+			<column name="codigo" length="2147483647"/>
+			<extension vendor-name="evolute" key="java-type" value="String"/>
+		</field>
+		<field name="descricao">
+			<column name="descricao" length="2147483647"/>
+			<extension vendor-name="evolute" key="java-type" value="String"/>
+		</field>
+		<field name="ordem" null-value="exception">
+			<column name="ordem"/>
+			<extension vendor-name="evolute" key="java-type" value="Integer"/>
+		</field>
+		<field name="deleted_stamp" persistence-modifier="persistent">
+			<column name="deleted_stamp"/>
+			<extension vendor-name="evolute" key="java-type" value="java.sql.Timestamp"/>
+		</field>
+	</class>
 	<class name="Medicos" identity-type="application" table="medicos" >
 		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="medicos_id_seq">
 			<column name="id"/>
@@ -2755,6 +2999,10 @@
 			<column name="observacoes" length="65535"/>
 			<extension vendor-name="evolute" key="java-type" value="String"/>
 		</field>
+		<field name="deleted_stamp" persistence-modifier="persistent">
+			<column name="deleted_stamp"/>
+			<extension vendor-name="evolute" key="java-type" value="java.sql.Timestamp"/>
+		</field>
 	</class>
 	<class name="PrestadoresGruposProtocolo" identity-type="application" table="prestadores_grupos_protocolo" >
 		<field name="id" primary-key="true" null-value="exception" value-strategy="sequence" sequence="prestadores_grupos_protocolo_id_seq">

trunk/PlanosActuacao/src/java/db/data/siprp_local/outer/AptOutrasVacinaData.java

@@ -0,0 +1,18 @@
+/*
+* AptOutrasVacinaData.java
+*
+* Generated by com.evutils.codegen.EntityObjectGenerator
+*
+* Edit at will
+*/
+package db.data.siprp_local.outer;
+
+
+public final class AptOutrasVacinaData extends db.data.siprp_local.inner.AptOutrasVacina
+{
+
+	public AptOutrasVacinaData()
+	{
+		super();
+	}
+}

trunk/PlanosActuacao/src/java/db/data/siprp_local/outer/AptOutrasViajanteData.java

@@ -0,0 +1,18 @@
+/*
+* AptOutrasViajanteData.java
+*
+* Generated by com.evutils.codegen.EntityObjectGenerator
+*
+* Edit at will
+*/
+package db.data.siprp_local.outer;
+
+
+public final class AptOutrasViajanteData extends db.data.siprp_local.inner.AptOutrasViajante
+{
+
+	public AptOutrasViajanteData()
+	{
+		super();
+	}
+}

trunk/PlanosActuacao/src/java/db/data/siprp_local/outer/CurQuestionarioData.java

@@ -0,0 +1,18 @@
+/*
+* CurQuestionarioData.java
+*
+* Generated by com.evutils.codegen.EntityObjectGenerator
+*
+* Edit at will
+*/
+package db.data.siprp_local.outer;
+
+
+public final class CurQuestionarioData extends db.data.siprp_local.inner.CurQuestionario
+{
+
+	public CurQuestionarioData()
+	{
+		super();
+	}
+}

trunk/PlanosActuacao/src/java/db/data/siprp_local/outer/CurQuestionarioPerguntaData.java

@@ -0,0 +1,18 @@
+/*
+* CurQuestionarioPerguntaData.java
+*
+* Generated by com.evutils.codegen.EntityObjectGenerator
+*
+* Edit at will
+*/
+package db.data.siprp_local.outer;
+
+
+public final class CurQuestionarioPerguntaData extends db.data.siprp_local.inner.CurQuestionarioPergunta
+{
+
+	public CurQuestionarioPerguntaData()
+	{
+		super();
+	}
+}

trunk/PlanosActuacao/src/java/db/data/siprp_local/outer/CurQuestionarioRespostaData.java

@@ -0,0 +1,18 @@
+/*
+* CurQuestionarioRespostaData.java
+*
+* Generated by com.evutils.codegen.EntityObjectGenerator
+*
+* Edit at will
+*/
+package db.data.siprp_local.outer;
+
+
+public final class CurQuestionarioRespostaData extends db.data.siprp_local.inner.CurQuestionarioResposta
+{
+
+	public CurQuestionarioRespostaData()
+	{
+		super();
+	}
+}

trunk/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrPreferencesData.java

@@ -0,0 +1,18 @@
+/*
+* EvoUsrPreferencesData.java
+*
+* Generated by com.evutils.codegen.EntityObjectGenerator
+*
+* Edit at will
+*/
+package db.data.siprp_local.outer;
+
+
+public final class EvoUsrPreferencesData extends db.data.siprp_local.inner.EvoUsrPreferences
+{
+
+	public EvoUsrPreferencesData()
+	{
+		super();
+	}
+}

trunk/PlanosActuacao/src/java/db/data/siprp_local/outer/FilCategoriasData.java

@@ -0,0 +1,18 @@
+/*
+* FilCategoriasData.java
+*
+* Generated by com.evutils.codegen.EntityObjectGenerator
+*
+* Edit at will
+*/
+package db.data.siprp_local.outer;
+
+
+public final class FilCategoriasData extends db.data.siprp_local.inner.FilCategorias
+{
+
+	public FilCategoriasData()
+	{
+		super();
+	}
+}

trunk/PlanosActuacao/src/java/db/data/siprp_local/outer/FilFileEmpresaData.java

@@ -0,0 +1,18 @@
+/*
+* FilFileEmpresaData.java
+*
+* Generated by com.evutils.codegen.EntityObjectGenerator
+*
+* Edit at will
+*/
+package db.data.siprp_local.outer;
+
+
+public final class FilFileEmpresaData extends db.data.siprp_local.inner.FilFileEmpresa
+{
+
+	public FilFileEmpresaData()
+	{
+		super();
+	}
+}

trunk/PlanosActuacao/src/java/db/data/siprp_local/outer/FilFileMarcacoesEstabelecimentoData.java

@@ -0,0 +1,18 @@
+/*
+* FilFileMarcacoesEstabelecimentoData.java
+*
+* Generated by com.evutils.codegen.EntityObjectGenerator
+*
+* Edit at will
+*/
+package db.data.siprp_local.outer;
+
+
+public final class FilFileMarcacoesEstabelecimentoData extends db.data.siprp_local.inner.FilFileMarcacoesEstabelecimento
+{
+
+	public FilFileMarcacoesEstabelecimentoData()
+	{
+		super();
+	}
+}

trunk/PlanosActuacao/src/java/db/data/siprp_local/outer/MedVacinaTipoData.java

@@ -0,0 +1,18 @@
+/*
+* MedVacinaTipoData.java
+*
+* Generated by com.evutils.codegen.EntityObjectGenerator
+*
+* Edit at will
+*/
+package db.data.siprp_local.outer;
+
+
+public final class MedVacinaTipoData extends db.data.siprp_local.inner.MedVacinaTipo
+{
+
+	public MedVacinaTipoData()
+	{
+		super();
+	}
+}

trunk/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java

@@ -622,12 +622,12 @@ public class ListaPlanos extends AbstractPageBean
 
 	private void createPdf( Integer pID, boolean withPatrimoniais )
 	{
-		PlanoActuacaoPDFCreator pdfCreator = new PlanoActuacaoPDFCreator();
         try
         {
+			PlanoActuacaoPDFCreator pdfCreator = new PlanoActuacaoPDFCreator();
+
 			System.out.println( "CREATING PDF ..." );
-            byte[] pdf = pdfCreator.createPDF( pID, true );
+			byte[] pdf = pdfCreator.createPDF( pID, true, withPatrimoniais );
-//			byte[] pdf = pdfCreator.createPDF( pID, true, withPatrimoniais );
 			System.out.println( "\t.. DONE !" );
             showPdf( pdf );
         }