From a88b2c5116e562cfdc10978f57ccc4e5ce37f0c5 Mon Sep 17 00:00:00 2001 From: Diogo Neves Date: Wed, 6 Apr 2011 09:59:04 +0000 Subject: [PATCH] git-svn-id: https://svn.coded.pt/svn/SIPRP@1647 bb69d46d-e84e-40c8-a05a-06db0d633741 --- .../PlanosActuacao/.classpath | 54 ++ .../PlanosActuacao/.project | 17 + .../.settings/org.eclipse.jdt.core.prefs | 12 + .../PlanosActuacao/lib/el-api.jar | Bin 0 -> 33410 bytes .../PlanosActuacao/lib/servlet-api.jar | Bin 0 -> 88210 bytes .../siprp/planosactuacao}/db/DBConstants.java | 2 +- .../db/DBPropertiesLoader.java | 2 +- .../db/data/siprp/inner/Acidentados.java | 30 +- .../db/data/siprp/inner/Actualizacao.java | 5 +- .../data/siprp/inner/AnalisesAcidentes.java | 78 ++- .../db/data/siprp/inner/Avisos.java | 47 +- .../db/data/siprp/inner/Causas.java | 24 +- .../db/data/siprp/inner/Contactos.java | 5 +- .../db/data/siprp/inner/Controle.java | 24 +- .../db/data/siprp/inner/Departamentos.java | 36 +- .../db/data/siprp/inner/Empresas.java | 23 +- .../db/data/siprp/inner/Errors.java | 5 +- .../db/data/siprp/inner/Estabelecimentos.java | 37 +- .../db/data/siprp/inner/EstadoMedidas.java | 30 +- .../db/data/siprp/inner/Exames.java | 33 +- .../db/data/siprp/inner/ExamesPerfis.java | 19 +- .../siprp/inner/HistoricoEstabelecimento.java | 19 +- .../db/data/siprp/inner/MarcacoesEmpresa.java | 19 +- .../siprp/inner/MarcacoesEstabelecimento.java | 5 +- .../siprp/inner/MarcacoesTrabalhador.java | 19 +- .../db/data/siprp/inner/Medicos.java | 11 +- .../db/data/siprp/inner/Medidas.java | 38 +- .../db/data/siprp/inner/NotNoticias.java | 24 +- .../db/data/siprp/inner/Permissoes.java | 24 +- .../db/data/siprp/inner/PlanoAreas.java | 44 +- .../db/data/siprp/inner/PlanoMedidas.java | 58 +- .../data/siprp/inner/PlanoPostosTrabalho.java | 38 +- .../db/data/siprp/inner/PlanoRiscos.java | 44 +- .../db/data/siprp/inner/PlanosActuacao.java | 72 ++- .../db/data/siprp/inner/Properties.java | 5 +- .../db/data/siprp/inner/Recomendacoes.java | 38 +- .../db/data/siprp/inner/RiscoValoresTemp.java | 5 +- .../db/data/siprp/inner/Roles.java | 5 +- .../db/data/siprp/inner/Seccoes.java | 44 +- .../db/data/siprp/inner/TiposExamesComp.java | 11 +- .../data/siprp/inner/TiposUtilizadores.java | 24 +- .../db/data/siprp/inner/Trabalhadores.java | 37 +- .../db/data/siprp/inner/Users.java | 5 +- .../db/data/siprp/inner/Utilizadores.java | 42 +- .../db/data/siprp}/inner/Version.java | 24 +- .../db/data/siprp/inner/package.xml | 2 +- .../db/data/siprp/outer/AcidentadosData.java | 18 + .../db/data/siprp/outer/ActualizacaoData.java | 18 + .../siprp/outer/AnalisesAcidentesData.java | 18 + .../db/data/siprp/outer/AvisosData.java | 18 + .../db/data/siprp/outer/CausasData.java | 18 + .../db/data/siprp/outer/ContactosData.java | 18 + .../db/data/siprp/outer/ControleData.java | 18 + .../data/siprp/outer/DepartamentosData.java | 18 + .../db/data/siprp/outer/EmpresasData.java | 18 + .../db/data/siprp/outer/ErrorsData.java | 18 + .../siprp/outer/EstabelecimentosData.java | 18 + .../data/siprp/outer/EstadoMedidasData.java | 18 + .../db/data/siprp/outer/ExamesData.java | 18 + .../db/data/siprp/outer/ExamesPerfisData.java | 18 + .../outer/HistoricoEstabelecimentoData.java | 18 + .../siprp/outer/MarcacoesEmpresaData.java | 18 + .../outer/MarcacoesEstabelecimentoData.java | 18 + .../siprp/outer/MarcacoesTrabalhadorData.java | 18 + .../db/data/siprp/outer/MedicosData.java | 18 + .../db/data/siprp/outer/MedidasData.java | 18 + .../db/data/siprp/outer/NotNoticiasData.java | 18 + .../db/data/siprp/outer/PermissoesData.java | 18 + .../db/data/siprp/outer/PlanoAreasData.java | 18 + .../db/data/siprp/outer/PlanoMedidasData.java | 18 + .../siprp/outer/PlanoPostosTrabalhoData.java | 18 + .../db/data/siprp/outer/PlanoRiscosData.java | 18 + .../data/siprp/outer/PlanosActuacaoData.java | 18 + .../db/data/siprp/outer/PropertiesData.java | 18 + .../data/siprp/outer/RecomendacoesData.java | 18 + .../siprp/outer/RiscoValoresTempData.java | 18 + .../db/data/siprp/outer/RolesData.java | 18 + .../db/data/siprp/outer/SeccoesData.java | 18 + .../data/siprp/outer/TiposExamesCompData.java | 18 + .../siprp/outer/TiposUtilizadoresData.java | 18 + .../data/siprp/outer/TrabalhadoresData.java | 18 + .../db/data/siprp/outer/UsersData.java | 18 + .../db/data/siprp/outer/UtilizadoresData.java | 18 + .../db/data/siprp/outer/VersionData.java | 18 + .../data/siprp_local/inner/Actualizacao.java | 24 +- .../siprp_local/inner/AptAppointment.java | 62 +- .../siprp_local/inner/AptOutrasVacina.java | 66 +- .../siprp_local/inner/AptOutrasViajante.java | 52 +- .../inner/AptSegurancaAlimentar.java | 52 +- .../db/data/siprp_local/inner/AptState.java | 11 +- .../db/data/siprp_local/inner/Avisos.java | 66 +- .../db/data/siprp_local/inner/Contactos.java | 48 +- .../db/data/siprp_local/inner/CurArs.java | 30 +- .../db/data/siprp_local/inner/CurAulas.java | 50 +- .../siprp_local/inner/CurAulasFormadores.java | 33 +- .../db/data/siprp_local/inner/CurCursos.java | 66 +- .../db/data/siprp_local/inner/CurDias.java | 44 +- .../data/siprp_local/inner/CurFormadores.java | 48 +- .../inner/CurFormadoresCursos.java | 33 +- .../data/siprp_local/inner/CurFormandos.java | 76 ++- .../siprp_local/inner/CurFormandosCursos.java | 33 +- .../data/siprp_local/inner/CurHospitais.java | 11 +- .../inner/CurNumeroCertificado.java | 24 +- .../inner/CurNumeroCertificadoFormador.java | 24 +- .../data/siprp_local/inner/CurPagamentos.java | 66 +- .../siprp_local/inner/CurPagamentosTipos.java | 30 +- .../data/siprp_local/inner/CurPresencas.java | 66 +- .../siprp_local/inner/CurQuestionario.java | 30 +- .../inner/CurQuestionarioPergunta.java | 44 +- .../inner/CurQuestionarioResposta.java | 66 +- .../db/data/siprp_local/inner/CurTopicos.java | 78 ++- .../siprp_local/inner/CurTopicosAulas.java | 33 +- .../db/data/siprp_local/inner/EcdOficial.java | 30 +- .../inner/EmailPlanoDeActuacao.java | 38 +- .../inner/EmpresaPrecoPeriodicidadeTipo.java | 30 +- .../inner/EmpresaPrecoServico.java | 66 +- .../inner/EmpresaPrecoServicoTipo.java | 30 +- .../db/data/siprp_local/inner/Empresas.java | 138 ++-- .../db/data/siprp_local/inner/Errors.java | 24 +- .../siprp_local/inner/Estabelecimentos.java | 160 ++--- .../db/data/siprp_local/inner/Etiquetas.java | 24 +- .../db/data/siprp_local/inner/EvoPessoa.java | 36 +- .../siprp_local/inner/EvoTaskSyncRequest.java | 601 ++++++++++++++++++ .../inner/EvoTaskSyncRequestState.java | 464 ++++++++++++++ .../db/data/siprp_local/inner/EvoUpdate.java | 24 +- .../siprp_local/inner/EvoUsrPermission.java | 30 +- .../siprp_local/inner/EvoUsrPreferences.java | 38 +- .../db/data/siprp_local/inner/EvoUsrRole.java | 36 +- .../inner/EvoUsrRolesPermissions.java | 52 +- .../db/data/siprp_local/inner/EvoUsrUser.java | 42 +- .../siprp_local/inner/EvoUsrUsersRoles.java | 52 +- .../db/data/siprp_local/inner/Exames.java | 64 +- .../data/siprp_local/inner/ExamesPerfis.java | 38 +- .../siprp_local/inner/ExamesPortaria.java | 24 +- .../data/siprp_local/inner/FilCategorias.java | 30 +- .../db/data/siprp_local/inner/FilFile.java | 56 +- .../siprp_local/inner/FilFileAppointment.java | 52 +- .../siprp_local/inner/FilFileEmpresa.java | 66 +- .../FilFileMarcacoesEstabelecimento.java | 52 +- .../inner/HistoricoEstabelecimento.java | 38 +- .../db/data/siprp_local/inner/HsArea.java | 44 +- .../db/data/siprp_local/inner/HsEmail.java | 36 +- .../siprp_local/inner/HsEmailEmpresa.java | 33 +- .../inner/HsEmailEstabelecimento.java | 33 +- .../data/siprp_local/inner/HsEquipamento.java | 24 +- .../data/siprp_local/inner/HsLegislacao.java | 50 +- .../inner/HsLegislacaoCategoria.java | 30 +- .../inner/HsLegislacaoEmpresa.java | 33 +- .../inner/HsLegislacaoEstabelecimento.java | 33 +- .../db/data/siprp_local/inner/HsMedida.java | 36 +- .../siprp_local/inner/HsNormalizacao.java | 36 +- .../inner/HsNormalizacaoEmpresa.java | 33 +- .../inner/HsNormalizacaoEstabelecimento.java | 33 +- .../db/data/siprp_local/inner/HsPosto.java | 56 +- .../inner/HsPostoEstabelecimento.java | 33 +- .../data/siprp_local/inner/HsPostoMedida.java | 33 +- .../data/siprp_local/inner/HsPostoRisco.java | 47 +- .../data/siprp_local/inner/HsRelatorio.java | 68 +- .../siprp_local/inner/HsRelatorioArea.java | 44 +- .../inner/HsRelatorioEquipamento.java | 38 +- .../inner/HsRelatorioLegislacao.java | 38 +- .../siprp_local/inner/HsRelatorioMedida.java | 44 +- .../inner/HsRelatorioNormalizacao.java | 38 +- .../siprp_local/inner/HsRelatorioPosto.java | 50 +- .../inner/HsRelatorioPostoMedida.java | 33 +- .../inner/HsRelatorioPostoRisco.java | 47 +- .../siprp_local/inner/HsRelatorioRisco.java | 50 +- .../HsRelatorioRiscoValorQualitativo.java | 36 +- .../db/data/siprp_local/inner/HsRisco.java | 56 +- .../siprp_local/inner/HsRiscoEmpresa.java | 33 +- .../data/siprp_local/inner/HsRiscoMedida.java | 33 +- .../data/siprp_local/inner/HsRiscoTema.java | 30 +- .../db/data/siprp_local/inner/Ids.java | 5 +- .../db/data/siprp_local/inner/Image.java | 36 +- .../db/data/siprp_local/inner/Lembretes.java | 150 +++-- .../siprp_local/inner/LembretesTipos.java | 24 +- .../siprp_local/inner/MarcacoesEmpresa.java | 44 +- .../inner/MarcacoesEstabelecimento.java | 144 +++-- .../inner/MarcacoesGruposRealizados.java | 66 +- .../inner/MarcacoesTecnicosHst.java | 50 +- .../inner/MarcacoesTrabalhador.java | 70 +- .../inner/MarcacoesTrabalhadorEstados.java | 58 +- .../data/siprp_local/inner/MedVacinaTipo.java | 30 +- .../db/data/siprp_local/inner/Medicos.java | 36 +- .../db/data/siprp_local/inner/Paises.java | 38 +- .../siprp_local/inner/PaisesContinentes.java | 30 +- .../data/siprp_local/inner/PesDocumento.java | 44 +- .../siprp_local/inner/PesDocumentoTipo.java | 30 +- .../siprp_local/inner/PesPessoaDocumento.java | 52 +- .../data/siprp_local/inner/Prestadores.java | 110 ++-- .../inner/PrestadoresGruposProtocolo.java | 52 +- .../inner/PrtElementosProtocolo.java | 52 +- .../siprp_local/inner/PrtGruposProtocolo.java | 62 +- .../inner/PrtTiposElementosProtocolo.java | 50 +- .../siprp_local/inner/TiposExamesComp.java | 30 +- .../data/siprp_local/inner/Trabalhadores.java | 106 +-- .../inner/TrabalhadoresConsultas.java | 72 ++- .../inner/TrabalhadoresConsultasDatas.java | 70 +- .../TrabalhadoresConsultasDatasEmails.java | 38 +- ...rabalhadoresConsultasDatasObservacoes.java | 38 +- .../siprp_local/inner/TrabalhadoresEcd.java | 80 ++- .../siprp_local/inner/TrabalhadoresEcds.java | 58 +- .../inner/TrabalhadoresEcdsAnalise.java | 52 +- .../inner/TrabalhadoresEcdsDatas.java | 90 +-- .../inner/TrabalhadoresEcdsDatasEmails.java | 38 +- .../TrabalhadoresEcdsDatasObservacoes.java | 38 +- .../inner/TrabalhadoresFichasAptidao.java | 52 +- .../inner/TrabalhadoresProcesso.java | 56 +- .../db/data/siprp_local/inner/Versao.java | 5 +- .../db/data/siprp_local}/inner/Version.java | 24 +- .../db/data/siprp_local/inner/package.xml | 96 ++- .../siprp_local/outer/ActualizacaoData.java | 18 + .../siprp_local/outer/AptAppointmentData.java | 18 + .../outer/AptOutrasVacinaData.java | 18 + .../outer/AptOutrasViajanteData.java | 18 + .../outer/AptSegurancaAlimentarData.java | 18 + .../data/siprp_local/outer/AptStateData.java | 18 + .../db/data/siprp_local/outer/AvisosData.java | 18 + .../data/siprp_local/outer/ContactosData.java | 18 + .../db/data/siprp_local/outer/CurArsData.java | 18 + .../data/siprp_local/outer/CurAulasData.java | 18 + .../outer/CurAulasFormadoresData.java | 18 + .../data/siprp_local/outer/CurCursosData.java | 18 + .../data/siprp_local/outer/CurDiasData.java | 18 + .../outer/CurFormadoresCursosData.java | 18 + .../siprp_local/outer/CurFormadoresData.java | 18 + .../outer/CurFormandosCursosData.java | 18 + .../siprp_local/outer/CurFormandosData.java | 18 + .../siprp_local/outer/CurHospitaisData.java | 18 + .../outer/CurNumeroCertificadoData.java | 18 + .../CurNumeroCertificadoFormadorData.java | 18 + .../siprp_local/outer/CurPagamentosData.java | 18 + .../outer/CurPagamentosTiposData.java | 18 + .../siprp_local/outer/CurPresencasData.java | 18 + .../outer/CurQuestionarioData.java | 18 + .../outer/CurQuestionarioPerguntaData.java | 18 + .../outer/CurQuestionarioRespostaData.java | 18 + .../outer/CurTopicosAulasData.java | 18 + .../siprp_local/outer/CurTopicosData.java | 18 + .../siprp_local/outer/EcdOficialData.java | 18 + .../outer/EmailPlanoDeActuacaoData.java | 18 + .../EmpresaPrecoPeriodicidadeTipoData.java | 18 + .../outer/EmpresaPrecoServicoData.java | 18 + .../outer/EmpresaPrecoServicoTipoData.java | 18 + .../data/siprp_local/outer/EmpresasData.java | 18 + .../db/data/siprp_local/outer/ErrorsData.java | 18 + .../outer/EstabelecimentosData.java | 18 + .../data/siprp_local/outer/EtiquetasData.java | 18 + .../data/siprp_local/outer/EvoPessoaData.java | 18 + .../outer/EvoTaskSyncRequestData.java | 18 + .../outer/EvoTaskSyncRequestStateData.java | 18 + .../data/siprp_local/outer/EvoUpdateData.java | 18 + .../outer/EvoUsrPermissionData.java | 18 + .../outer/EvoUsrPreferencesData.java | 18 + .../siprp_local/outer/EvoUsrRoleData.java | 18 + .../outer/EvoUsrRolesPermissionsData.java | 18 + .../siprp_local/outer/EvoUsrUserData.java | 18 + .../outer/EvoUsrUsersRolesData.java | 18 + .../db/data/siprp_local/outer/ExamesData.java | 18 + .../siprp_local/outer/ExamesPerfisData.java | 18 + .../siprp_local/outer/ExamesPortariaData.java | 18 + .../siprp_local/outer/FilCategoriasData.java | 18 + .../outer/FilFileAppointmentData.java | 18 + .../data/siprp_local/outer/FilFileData.java | 18 + .../siprp_local/outer/FilFileEmpresaData.java | 18 + .../FilFileMarcacoesEstabelecimentoData.java | 18 + .../outer/HistoricoEstabelecimentoData.java | 18 + .../db/data/siprp_local/outer/HsAreaData.java | 18 + .../data/siprp_local/outer/HsEmailData.java | 18 + .../siprp_local/outer/HsEmailEmpresaData.java | 18 + .../outer/HsEmailEstabelecimentoData.java | 18 + .../siprp_local/outer/HsEquipamentoData.java | 18 + .../outer/HsLegislacaoCategoriaData.java | 18 + .../siprp_local/outer/HsLegislacaoData.java | 18 + .../outer/HsLegislacaoEmpresaData.java | 18 + .../HsLegislacaoEstabelecimentoData.java | 18 + .../data/siprp_local/outer/HsMedidaData.java | 18 + .../siprp_local/outer/HsNormalizacaoData.java | 18 + .../outer/HsNormalizacaoEmpresaData.java | 18 + .../HsNormalizacaoEstabelecimentoData.java | 18 + .../data/siprp_local/outer/HsPostoData.java | 18 + .../outer/HsPostoEstabelecimentoData.java | 18 + .../siprp_local/outer/HsPostoMedidaData.java | 18 + .../siprp_local/outer/HsPostoRiscoData.java | 18 + .../outer/HsRelatorioAreaData.java | 18 + .../siprp_local/outer/HsRelatorioData.java | 18 + .../outer/HsRelatorioEquipamentoData.java | 18 + .../outer/HsRelatorioLegislacaoData.java | 18 + .../outer/HsRelatorioMedidaData.java | 18 + .../outer/HsRelatorioNormalizacaoData.java | 18 + .../outer/HsRelatorioPostoData.java | 18 + .../outer/HsRelatorioPostoMedidaData.java | 18 + .../outer/HsRelatorioPostoRiscoData.java | 18 + .../outer/HsRelatorioRiscoData.java | 18 + .../HsRelatorioRiscoValorQualitativoData.java | 4 +- .../data/siprp_local/outer/HsRiscoData.java | 18 + .../siprp_local/outer/HsRiscoEmpresaData.java | 18 + .../siprp_local/outer/HsRiscoMedidaData.java | 18 + .../siprp_local/outer/HsRiscoTemaData.java | 18 + .../db/data/siprp_local/outer/IdsData.java | 18 + .../db/data/siprp_local/outer/ImageData.java | 18 + .../data/siprp_local/outer/LembretesData.java | 18 + .../siprp_local/outer/LembretesTiposData.java | 18 + .../outer/MarcacoesEmpresaData.java | 18 + .../outer/MarcacoesEstabelecimentoData.java | 18 + .../outer/MarcacoesGruposRealizadosData.java | 18 + .../outer/MarcacoesTecnicosHstData.java | 18 + .../outer/MarcacoesTrabalhadorData.java | 18 + .../MarcacoesTrabalhadorEstadosData.java | 18 + .../siprp_local/outer/MedVacinaTipoData.java | 18 + .../data/siprp_local/outer/MedicosData.java | 18 + .../outer/PaisesContinentesData.java | 18 + .../db/data/siprp_local/outer/PaisesData.java | 18 + .../siprp_local/outer/PesDocumentoData.java | 18 + .../outer/PesDocumentoTipoData.java | 18 + .../outer/PesPessoaDocumentoData.java | 18 + .../siprp_local/outer/PrestadoresData.java | 18 + .../outer/PrestadoresGruposProtocoloData.java | 18 + .../outer/PrtElementosProtocoloData.java | 18 + .../outer/PrtGruposProtocoloData.java | 18 + .../outer/PrtTiposElementosProtocoloData.java | 18 + .../outer/TiposExamesCompData.java | 18 + .../outer/TrabalhadoresConsultasData.java | 18 + .../TrabalhadoresConsultasDatasData.java | 18 + ...TrabalhadoresConsultasDatasEmailsData.java | 4 +- ...lhadoresConsultasDatasObservacoesData.java | 4 +- .../siprp_local/outer/TrabalhadoresData.java | 18 + .../outer/TrabalhadoresEcdData.java | 18 + .../outer/TrabalhadoresEcdsAnaliseData.java | 18 + .../outer/TrabalhadoresEcdsData.java | 18 + .../outer/TrabalhadoresEcdsDatasData.java | 18 + .../TrabalhadoresEcdsDatasEmailsData.java | 18 + ...TrabalhadoresEcdsDatasObservacoesData.java | 4 +- .../outer/TrabalhadoresFichasAptidaoData.java | 18 + .../outer/TrabalhadoresProcessoData.java | 18 + .../db/data/siprp_local/outer/VersaoData.java | 18 + .../data/siprp_local/outer/VersionData.java | 18 + .../planosactuacao}/db/entidades/Area.java | 2 +- .../db/entidades/EstadoMedida.java | 2 +- .../planosactuacao}/db/entidades/Medida.java | 2 +- .../db/entidades/PlanoActuacao.java | 5 +- .../db/entidades/PostoTrabalho.java | 2 +- .../planosactuacao}/db/entidades/Risco.java | 2 +- .../db/entidades/Utilizador.java | 2 +- .../planosactuacao}/db/entidades/Valor.java | 2 +- .../providers/CreatePlanosDataProvider.java | 41 +- .../db/providers/EvoBaseProvider.java | 22 +- .../db/providers/GenericDataProvider.java | 9 +- .../db/providers/PlanosDataProvider.java | 45 +- .../db/providers/RelatoriosDataProvider.java | 23 +- .../db/providers/RiscoLogic.java | 11 +- .../providers/UtilizadoresDataProvider.java | 15 +- .../db/providers/UtilizadoresLogic.java | 4 +- .../siprp/planosactuacao}/global/Global.java | 20 +- .../siprp/planosactuacao}/mail/Mail.java | 2 +- .../planosactuacao}/pagination/Pagina.java | 8 +- .../pagination/Pagination.java | 15 +- .../pagination/PaginationNormais.java | 12 +- .../pagination/PaginationPatrimoniais.java | 12 +- .../phaselistener/ContextListener.java | 21 +- .../phaselistener/MainPhaseListener.java | 20 +- .../phaselistener/SessionListener.java | 3 +- .../planosactuacao/ApplicationBean1.java | 2 +- .../planosactuacao/Bundle.properties | 0 .../planosactuacao}/planosactuacao/Dummy.java | 15 +- .../planosactuacao/EditarPlano.java | 96 +-- .../planosactuacao/EnviarCorrecao.java | 32 +- .../planosactuacao}/planosactuacao/Erro.java | 2 +- .../planosactuacao/Footer.java | 2 +- .../planosactuacao/Header.java | 15 +- .../planosactuacao/ListaPlanos.java | 41 +- .../planosactuacao}/planosactuacao/Login.java | 11 +- .../planosactuacao/PlanosActuacao.java | 35 +- .../planosactuacao/RequestBean1.java | 2 +- .../planosactuacao/SessionBean1.java | 47 +- .../planosactuacao}/planosactuacao/Test.java | 15 +- .../planosactuacao/ViewPlano.java | 28 +- .../PlanosActualDataProvider.java | 2 +- .../PlanosConcluidosDataProvider.java | 2 +- .../PlanosSeguimentoDataProvider.java | 2 +- .../planosactuacao}/utils/JSFHTTPUtils.java | 2 +- .../siprp/planosactuacao}/utils/JSFUtils.java | 8 +- .../siprp/planosactuacao}/utils/Logos.java | 10 +- .../utils/PlanosActuacaoLogger.java | 2 +- .../planosactuacao}/utils/PlanosUpdater.java | 10 +- .../siprp/planosactuacao}/utils/Utils.java | 90 +-- .../viewhandler/CustomViewHandler.java | 4 +- .../PlanosActuacao/src/java/app.properties | 40 -- .../db/data/siprp/outer/AcidentadosData.java | 18 - .../db/data/siprp/outer/ActualizacaoData.java | 18 - .../siprp/outer/AnalisesAcidentesData.java | 18 - .../java/db/data/siprp/outer/AvisosData.java | 18 - .../java/db/data/siprp/outer/CausasData.java | 18 - .../db/data/siprp/outer/ContactosData.java | 18 - .../db/data/siprp/outer/ControleData.java | 18 - .../data/siprp/outer/DepartamentosData.java | 18 - .../db/data/siprp/outer/EmpresasData.java | 18 - .../java/db/data/siprp/outer/ErrorsData.java | 18 - .../siprp/outer/EstabelecimentosData.java | 18 - .../data/siprp/outer/EstadoMedidasData.java | 18 - .../java/db/data/siprp/outer/ExamesData.java | 18 - .../db/data/siprp/outer/ExamesPerfisData.java | 18 - .../outer/HistoricoEstabelecimentoData.java | 18 - .../siprp/outer/MarcacoesEmpresaData.java | 18 - .../outer/MarcacoesEstabelecimentoData.java | 18 - .../siprp/outer/MarcacoesTrabalhadorData.java | 18 - .../java/db/data/siprp/outer/MedicosData.java | 18 - .../java/db/data/siprp/outer/MedidasData.java | 18 - .../db/data/siprp/outer/NotNoticiasData.java | 18 - .../db/data/siprp/outer/PermissoesData.java | 18 - .../db/data/siprp/outer/PlanoAreasData.java | 18 - .../db/data/siprp/outer/PlanoMedidasData.java | 18 - .../siprp/outer/PlanoPostosTrabalhoData.java | 18 - .../db/data/siprp/outer/PlanoRiscosData.java | 18 - .../data/siprp/outer/PlanosActuacaoData.java | 18 - .../db/data/siprp/outer/PropertiesData.java | 18 - .../data/siprp/outer/RecomendacoesData.java | 18 - .../siprp/outer/RiscoValoresTempData.java | 18 - .../java/db/data/siprp/outer/RolesData.java | 18 - .../java/db/data/siprp/outer/SeccoesData.java | 18 - .../data/siprp/outer/TiposExamesCompData.java | 18 - .../siprp/outer/TiposUtilizadoresData.java | 18 - .../data/siprp/outer/TrabalhadoresData.java | 18 - .../java/db/data/siprp/outer/UsersData.java | 18 - .../db/data/siprp/outer/UtilizadoresData.java | 18 - .../java/db/data/siprp/outer/VersionData.java | 18 - .../siprp_local/outer/ActualizacaoData.java | 18 - .../siprp_local/outer/AptAppointmentData.java | 18 - .../outer/AptOutrasVacinaData.java | 18 - .../outer/AptOutrasViajanteData.java | 18 - .../outer/AptSegurancaAlimentarData.java | 18 - .../data/siprp_local/outer/AptStateData.java | 18 - .../db/data/siprp_local/outer/AvisosData.java | 18 - .../data/siprp_local/outer/ContactosData.java | 18 - .../db/data/siprp_local/outer/CurArsData.java | 18 - .../data/siprp_local/outer/CurAulasData.java | 18 - .../outer/CurAulasFormadoresData.java | 18 - .../data/siprp_local/outer/CurCursosData.java | 18 - .../data/siprp_local/outer/CurDiasData.java | 18 - .../outer/CurFormadoresCursosData.java | 18 - .../siprp_local/outer/CurFormadoresData.java | 18 - .../outer/CurFormandosCursosData.java | 18 - .../siprp_local/outer/CurFormandosData.java | 18 - .../siprp_local/outer/CurHospitaisData.java | 18 - .../outer/CurNumeroCertificadoData.java | 18 - .../CurNumeroCertificadoFormadorData.java | 18 - .../siprp_local/outer/CurPagamentosData.java | 18 - .../outer/CurPagamentosTiposData.java | 18 - .../siprp_local/outer/CurPresencasData.java | 18 - .../outer/CurQuestionarioData.java | 18 - .../outer/CurQuestionarioPerguntaData.java | 18 - .../outer/CurQuestionarioRespostaData.java | 18 - .../outer/CurTopicosAulasData.java | 18 - .../siprp_local/outer/CurTopicosData.java | 18 - .../siprp_local/outer/EcdOficialData.java | 18 - .../outer/EmailPlanoDeActuacaoData.java | 18 - .../EmpresaPrecoPeriodicidadeTipoData.java | 18 - .../outer/EmpresaPrecoServicoData.java | 18 - .../outer/EmpresaPrecoServicoTipoData.java | 18 - .../data/siprp_local/outer/EmpresasData.java | 18 - .../db/data/siprp_local/outer/ErrorsData.java | 18 - .../outer/EstabelecimentosData.java | 18 - .../data/siprp_local/outer/EtiquetasData.java | 18 - .../data/siprp_local/outer/EvoPessoaData.java | 18 - .../data/siprp_local/outer/EvoUpdateData.java | 18 - .../outer/EvoUsrPermissionData.java | 18 - .../outer/EvoUsrPreferencesData.java | 18 - .../siprp_local/outer/EvoUsrRoleData.java | 18 - .../outer/EvoUsrRolesPermissionsData.java | 18 - .../siprp_local/outer/EvoUsrUserData.java | 18 - .../outer/EvoUsrUsersRolesData.java | 18 - .../db/data/siprp_local/outer/ExamesData.java | 18 - .../siprp_local/outer/ExamesPerfisData.java | 18 - .../siprp_local/outer/ExamesPortariaData.java | 18 - .../siprp_local/outer/FilCategoriasData.java | 18 - .../outer/FilFileAppointmentData.java | 18 - .../data/siprp_local/outer/FilFileData.java | 18 - .../siprp_local/outer/FilFileEmpresaData.java | 18 - .../FilFileMarcacoesEstabelecimentoData.java | 18 - .../outer/HistoricoEstabelecimentoData.java | 18 - .../db/data/siprp_local/outer/HsAreaData.java | 18 - .../data/siprp_local/outer/HsEmailData.java | 18 - .../siprp_local/outer/HsEmailEmpresaData.java | 18 - .../outer/HsEmailEstabelecimentoData.java | 18 - .../siprp_local/outer/HsEquipamentoData.java | 18 - .../outer/HsLegislacaoCategoriaData.java | 18 - .../siprp_local/outer/HsLegislacaoData.java | 18 - .../outer/HsLegislacaoEmpresaData.java | 18 - .../HsLegislacaoEstabelecimentoData.java | 18 - .../data/siprp_local/outer/HsMedidaData.java | 18 - .../siprp_local/outer/HsNormalizacaoData.java | 18 - .../outer/HsNormalizacaoEmpresaData.java | 18 - .../HsNormalizacaoEstabelecimentoData.java | 18 - .../data/siprp_local/outer/HsPostoData.java | 18 - .../outer/HsPostoEstabelecimentoData.java | 18 - .../siprp_local/outer/HsPostoMedidaData.java | 18 - .../siprp_local/outer/HsPostoRiscoData.java | 18 - .../outer/HsRelatorioAreaData.java | 18 - .../siprp_local/outer/HsRelatorioData.java | 18 - .../outer/HsRelatorioEquipamentoData.java | 18 - .../outer/HsRelatorioLegislacaoData.java | 18 - .../outer/HsRelatorioMedidaData.java | 18 - .../outer/HsRelatorioNormalizacaoData.java | 18 - .../outer/HsRelatorioPostoData.java | 18 - .../outer/HsRelatorioPostoMedidaData.java | 18 - .../outer/HsRelatorioPostoRiscoData.java | 18 - .../outer/HsRelatorioRiscoData.java | 18 - .../data/siprp_local/outer/HsRiscoData.java | 18 - .../siprp_local/outer/HsRiscoEmpresaData.java | 18 - .../siprp_local/outer/HsRiscoMedidaData.java | 18 - .../siprp_local/outer/HsRiscoTemaData.java | 18 - .../db/data/siprp_local/outer/IdsData.java | 18 - .../db/data/siprp_local/outer/ImageData.java | 18 - .../data/siprp_local/outer/LembretesData.java | 18 - .../siprp_local/outer/LembretesTiposData.java | 18 - .../outer/MarcacoesEmpresaData.java | 18 - .../outer/MarcacoesEstabelecimentoData.java | 18 - .../outer/MarcacoesGruposRealizadosData.java | 18 - .../outer/MarcacoesTecnicosHstData.java | 18 - .../outer/MarcacoesTrabalhadorData.java | 18 - .../MarcacoesTrabalhadorEstadosData.java | 18 - .../siprp_local/outer/MedVacinaTipoData.java | 18 - .../data/siprp_local/outer/MedicosData.java | 18 - .../outer/PaisesContinentesData.java | 18 - .../db/data/siprp_local/outer/PaisesData.java | 18 - .../siprp_local/outer/PesDocumentoData.java | 18 - .../outer/PesDocumentoTipoData.java | 18 - .../outer/PesPessoaDocumentoData.java | 18 - .../siprp_local/outer/PrestadoresData.java | 18 - .../outer/PrestadoresGruposProtocoloData.java | 18 - .../outer/PrtElementosProtocoloData.java | 18 - .../outer/PrtGruposProtocoloData.java | 18 - .../outer/PrtTiposElementosProtocoloData.java | 18 - .../outer/TiposExamesCompData.java | 18 - .../outer/TrabalhadoresConsultasData.java | 18 - .../TrabalhadoresConsultasDatasData.java | 18 - .../siprp_local/outer/TrabalhadoresData.java | 18 - .../outer/TrabalhadoresEcdData.java | 18 - .../outer/TrabalhadoresEcdsAnaliseData.java | 18 - .../outer/TrabalhadoresEcdsData.java | 18 - .../outer/TrabalhadoresEcdsDatasData.java | 18 - .../TrabalhadoresEcdsDatasEmailsData.java | 18 - .../outer/TrabalhadoresFichasAptidaoData.java | 18 - .../outer/TrabalhadoresProcessoData.java | 18 - .../db/data/siprp_local/outer/VersaoData.java | 18 - .../data/siprp_local/outer/VersionData.java | 18 - 546 files changed, 9013 insertions(+), 5722 deletions(-) create mode 100644 branches/NetbeansIndependency/PlanosActuacao/.classpath create mode 100644 branches/NetbeansIndependency/PlanosActuacao/.project create mode 100644 branches/NetbeansIndependency/PlanosActuacao/.settings/org.eclipse.jdt.core.prefs create mode 100644 branches/NetbeansIndependency/PlanosActuacao/lib/el-api.jar create mode 100644 branches/NetbeansIndependency/PlanosActuacao/lib/servlet-api.jar rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/DBConstants.java (97%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/DBPropertiesLoader.java (97%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/Acidentados.java (96%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/Actualizacao.java (94%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/AnalisesAcidentes.java (97%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/Avisos.java (88%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/Causas.java (92%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/Contactos.java (98%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/Controle.java (92%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/Departamentos.java (82%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/Empresas.java (93%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/Errors.java (97%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/Estabelecimentos.java (88%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/EstadoMedidas.java (88%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/Exames.java (94%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/ExamesPerfis.java (90%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/HistoricoEstabelecimento.java (90%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/MarcacoesEmpresa.java (92%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/MarcacoesEstabelecimento.java (98%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/MarcacoesTrabalhador.java (93%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/Medicos.java (92%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/Medidas.java (85%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/NotNoticias.java (94%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/Permissoes.java (92%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/PlanoAreas.java (84%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/PlanoMedidas.java (83%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/PlanoPostosTrabalho.java (88%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/PlanoRiscos.java (93%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/PlanosActuacao.java (95%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/Properties.java (94%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/Recomendacoes.java (86%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/RiscoValoresTemp.java (93%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/Roles.java (94%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/Seccoes.java (84%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/TiposExamesComp.java (91%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/TiposUtilizadores.java (94%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/Trabalhadores.java (92%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/Users.java (94%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/Utilizadores.java (94%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java/db/data/siprp_local => com/evolute/siprp/planosactuacao/db/data/siprp}/inner/Version.java (92%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp/inner/package.xml (99%) create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/AcidentadosData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/ActualizacaoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/AnalisesAcidentesData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/AvisosData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/CausasData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/ContactosData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/ControleData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/DepartamentosData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/EmpresasData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/ErrorsData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/EstabelecimentosData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/EstadoMedidasData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/ExamesData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/ExamesPerfisData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/HistoricoEstabelecimentoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/MarcacoesEmpresaData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/MarcacoesEstabelecimentoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/MarcacoesTrabalhadorData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/MedicosData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/MedidasData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/NotNoticiasData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PermissoesData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PlanoAreasData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PlanoMedidasData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PlanoPostosTrabalhoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PlanoRiscosData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PlanosActuacaoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PropertiesData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/RecomendacoesData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/RiscoValoresTempData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/RolesData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/SeccoesData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/TiposExamesCompData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/TiposUtilizadoresData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/TrabalhadoresData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/UsersData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/UtilizadoresData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/VersionData.java rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/Actualizacao.java (90%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/AptAppointment.java (80%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/AptOutrasVacina.java (80%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/AptOutrasViajante.java (82%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/AptSegurancaAlimentar.java (84%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/AptState.java (89%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/Avisos.java (86%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/Contactos.java (84%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/CurArs.java (83%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/CurAulas.java (82%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/CurAulasFormadores.java (84%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/CurCursos.java (88%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/CurDias.java (84%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/CurFormadores.java (84%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/CurFormadoresCursos.java (86%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/CurFormandos.java (77%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/CurFormandosCursos.java (89%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/CurHospitais.java (88%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/CurNumeroCertificado.java (92%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/CurNumeroCertificadoFormador.java (92%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/CurPagamentos.java (84%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/CurPagamentosTipos.java (84%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/CurPresencas.java (83%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/CurQuestionario.java (83%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/CurQuestionarioPergunta.java (82%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/CurQuestionarioResposta.java (82%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/CurTopicos.java (80%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/CurTopicosAulas.java (84%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/EcdOficial.java (89%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/EmailPlanoDeActuacao.java (86%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/EmpresaPrecoPeriodicidadeTipo.java (83%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/EmpresaPrecoServico.java (85%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/EmpresaPrecoServicoTipo.java (83%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/Empresas.java (89%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/Errors.java (94%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/Estabelecimentos.java (76%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/Etiquetas.java (97%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/EvoPessoa.java (93%) create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/EvoTaskSyncRequest.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/EvoTaskSyncRequestState.java rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/EvoUpdate.java (92%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/EvoUsrPermission.java (89%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/EvoUsrPreferences.java (89%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/EvoUsrRole.java (81%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/EvoUsrRolesPermissions.java (83%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/EvoUsrUser.java (90%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/EvoUsrUsersRoles.java (81%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/Exames.java (90%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/ExamesPerfis.java (87%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/ExamesPortaria.java (92%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/FilCategorias.java (90%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/FilFile.java (84%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/FilFileAppointment.java (82%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/FilFileEmpresa.java (80%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/FilFileMarcacoesEstabelecimento.java (82%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HistoricoEstabelecimento.java (87%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsArea.java (85%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsEmail.java (78%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsEmailEmpresa.java (82%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsEmailEstabelecimento.java (83%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsEquipamento.java (94%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsLegislacao.java (80%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsLegislacaoCategoria.java (87%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsLegislacaoEmpresa.java (82%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsLegislacaoEstabelecimento.java (84%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsMedida.java (85%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsNormalizacao.java (85%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsNormalizacaoEmpresa.java (82%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsNormalizacaoEstabelecimento.java (83%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsPosto.java (80%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsPostoEstabelecimento.java (83%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsPostoMedida.java (82%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsPostoRisco.java (86%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsRelatorio.java (85%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsRelatorioArea.java (87%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsRelatorioEquipamento.java (91%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsRelatorioLegislacao.java (90%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsRelatorioMedida.java (87%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsRelatorioNormalizacao.java (90%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsRelatorioPosto.java (84%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsRelatorioPostoMedida.java (84%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsRelatorioPostoRisco.java (84%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsRelatorioRisco.java (84%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsRelatorioRiscoValorQualitativo.java (79%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsRisco.java (80%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsRiscoEmpresa.java (82%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsRiscoMedida.java (82%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/HsRiscoTema.java (87%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/Ids.java (95%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/Image.java (82%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/Lembretes.java (84%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/LembretesTipos.java (94%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/MarcacoesEmpresa.java (85%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/MarcacoesEstabelecimento.java (77%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/MarcacoesGruposRealizados.java (81%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/MarcacoesTecnicosHst.java (88%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/MarcacoesTrabalhador.java (87%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/MarcacoesTrabalhadorEstados.java (82%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/MedVacinaTipo.java (90%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/Medicos.java (84%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/Paises.java (90%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/PaisesContinentes.java (90%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/PesDocumento.java (86%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/PesDocumentoTipo.java (90%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/PesPessoaDocumento.java (82%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/Prestadores.java (76%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/PrestadoresGruposProtocolo.java (82%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/PrtElementosProtocolo.java (83%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/PrtGruposProtocolo.java (78%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/PrtTiposElementosProtocolo.java (83%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/TiposExamesComp.java (87%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/Trabalhadores.java (86%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/TrabalhadoresConsultas.java (81%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/TrabalhadoresConsultasDatas.java (78%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/TrabalhadoresConsultasDatasEmails.java (90%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/TrabalhadoresConsultasDatasObservacoes.java (86%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/TrabalhadoresEcd.java (84%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/TrabalhadoresEcds.java (81%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/TrabalhadoresEcdsAnalise.java (83%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/TrabalhadoresEcdsDatas.java (79%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/TrabalhadoresEcdsDatasEmails.java (90%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/TrabalhadoresEcdsDatasObservacoes.java (86%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/TrabalhadoresFichasAptidao.java (82%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/TrabalhadoresProcesso.java (84%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/Versao.java (93%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java/db/data/siprp => com/evolute/siprp/planosactuacao/db/data/siprp_local}/inner/Version.java (92%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/inner/package.xml (96%) create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ActualizacaoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/AptAppointmentData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/AptOutrasVacinaData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/AptOutrasViajanteData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/AptSegurancaAlimentarData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/AptStateData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/AvisosData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ContactosData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurArsData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurAulasData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurAulasFormadoresData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurCursosData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurDiasData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurFormadoresCursosData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurFormadoresData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurFormandosCursosData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurFormandosData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurHospitaisData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurNumeroCertificadoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurNumeroCertificadoFormadorData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurPagamentosData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurPagamentosTiposData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurPresencasData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurQuestionarioData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurQuestionarioPerguntaData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurQuestionarioRespostaData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurTopicosAulasData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurTopicosData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EcdOficialData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EmailPlanoDeActuacaoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EmpresaPrecoPeriodicidadeTipoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EmpresaPrecoServicoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EmpresaPrecoServicoTipoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EmpresasData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ErrorsData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EstabelecimentosData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EtiquetasData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoPessoaData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoTaskSyncRequestData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoTaskSyncRequestStateData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUpdateData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUsrPermissionData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUsrPreferencesData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUsrRoleData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUsrRolesPermissionsData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUsrUserData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUsrUsersRolesData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ExamesData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ExamesPerfisData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ExamesPortariaData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/FilCategoriasData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/FilFileAppointmentData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/FilFileData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/FilFileEmpresaData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/FilFileMarcacoesEstabelecimentoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HistoricoEstabelecimentoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsAreaData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsEmailData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsEmailEmpresaData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsEmailEstabelecimentoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsEquipamentoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsLegislacaoCategoriaData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsLegislacaoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsLegislacaoEmpresaData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsLegislacaoEstabelecimentoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsMedidaData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsNormalizacaoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsNormalizacaoEmpresaData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsNormalizacaoEstabelecimentoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsPostoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsPostoEstabelecimentoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsPostoMedidaData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsPostoRiscoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioAreaData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioEquipamentoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioLegislacaoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioMedidaData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioNormalizacaoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioPostoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioPostoMedidaData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioPostoRiscoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioRiscoData.java rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/outer/HsRelatorioRiscoValorQualitativoData.java (61%) create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRiscoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRiscoEmpresaData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRiscoMedidaData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRiscoTemaData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/IdsData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ImageData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/LembretesData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/LembretesTiposData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MarcacoesEmpresaData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MarcacoesEstabelecimentoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MarcacoesGruposRealizadosData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MarcacoesTecnicosHstData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MarcacoesTrabalhadorData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MarcacoesTrabalhadorEstadosData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MedVacinaTipoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MedicosData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PaisesContinentesData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PaisesData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PesDocumentoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PesDocumentoTipoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PesPessoaDocumentoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PrestadoresData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PrestadoresGruposProtocoloData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PrtElementosProtocoloData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PrtGruposProtocoloData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PrtTiposElementosProtocoloData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TiposExamesCompData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresConsultasData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresConsultasDatasData.java rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/outer/TrabalhadoresConsultasDatasEmailsData.java (61%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/outer/TrabalhadoresConsultasDatasObservacoesData.java (61%) create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresEcdData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresEcdsAnaliseData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresEcdsData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresEcdsDatasData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresEcdsDatasEmailsData.java rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/data/siprp_local/outer/TrabalhadoresEcdsDatasObservacoesData.java (61%) create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresFichasAptidaoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresProcessoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/VersaoData.java create mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/VersionData.java rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/entidades/Area.java (95%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/entidades/EstadoMedida.java (90%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/entidades/Medida.java (96%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/entidades/PlanoActuacao.java (99%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/entidades/PostoTrabalho.java (95%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/entidades/Risco.java (98%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/entidades/Utilizador.java (99%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/entidades/Valor.java (97%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/providers/CreatePlanosDataProvider.java (97%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/providers/EvoBaseProvider.java (98%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/providers/GenericDataProvider.java (96%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/providers/PlanosDataProvider.java (95%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/providers/RelatoriosDataProvider.java (97%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/providers/RiscoLogic.java (89%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/providers/UtilizadoresDataProvider.java (97%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/db/providers/UtilizadoresLogic.java (86%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/global/Global.java (87%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/mail/Mail.java (98%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/pagination/Pagina.java (94%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/pagination/Pagination.java (91%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/pagination/PaginationNormais.java (59%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/pagination/PaginationPatrimoniais.java (59%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/phaselistener/ContextListener.java (90%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/phaselistener/MainPhaseListener.java (93%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/phaselistener/SessionListener.java (92%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/planosactuacao/ApplicationBean1.java (98%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/planosactuacao/Bundle.properties (100%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/planosactuacao/Dummy.java (97%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/planosactuacao/EditarPlano.java (96%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/planosactuacao/EnviarCorrecao.java (93%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/planosactuacao/Erro.java (98%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/planosactuacao/Footer.java (98%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/planosactuacao/Header.java (96%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/planosactuacao/ListaPlanos.java (97%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/planosactuacao/Login.java (97%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/planosactuacao/PlanosActuacao.java (94%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/planosactuacao/RequestBean1.java (98%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/planosactuacao/SessionBean1.java (85%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/planosactuacao/Test.java (79%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/planosactuacao/ViewPlano.java (98%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/tabledataproviders/PlanosActualDataProvider.java (83%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/tabledataproviders/PlanosConcluidosDataProvider.java (84%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/tabledataproviders/PlanosSeguimentoDataProvider.java (84%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/utils/JSFHTTPUtils.java (90%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/utils/JSFUtils.java (95%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/utils/Logos.java (88%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/utils/PlanosActuacaoLogger.java (96%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/utils/PlanosUpdater.java (96%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/utils/Utils.java (52%) rename branches/NetbeansIndependency/PlanosActuacao/src/{java => com/evolute/siprp/planosactuacao}/viewhandler/CustomViewHandler.java (97%) delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/app.properties delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/AcidentadosData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/ActualizacaoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/AnalisesAcidentesData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/AvisosData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/CausasData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/ContactosData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/ControleData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/DepartamentosData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/EmpresasData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/ErrorsData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/EstabelecimentosData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/EstadoMedidasData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/ExamesData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/ExamesPerfisData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/HistoricoEstabelecimentoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/MarcacoesEmpresaData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/MarcacoesEstabelecimentoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/MarcacoesTrabalhadorData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/MedicosData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/MedidasData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/NotNoticiasData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PermissoesData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PlanoAreasData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PlanoMedidasData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PlanoPostosTrabalhoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PlanoRiscosData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PlanosActuacaoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PropertiesData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/RecomendacoesData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/RiscoValoresTempData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/RolesData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/SeccoesData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/TiposExamesCompData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/TiposUtilizadoresData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/TrabalhadoresData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/UsersData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/UtilizadoresData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/VersionData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ActualizacaoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/AptAppointmentData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/AptOutrasVacinaData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/AptOutrasViajanteData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/AptSegurancaAlimentarData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/AptStateData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/AvisosData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ContactosData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurArsData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurAulasData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurAulasFormadoresData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurCursosData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurDiasData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurFormadoresCursosData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurFormadoresData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurFormandosCursosData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurFormandosData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurHospitaisData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurNumeroCertificadoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurNumeroCertificadoFormadorData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurPagamentosData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurPagamentosTiposData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurPresencasData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurQuestionarioData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurQuestionarioPerguntaData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurQuestionarioRespostaData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurTopicosAulasData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurTopicosData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EcdOficialData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EmailPlanoDeActuacaoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EmpresaPrecoPeriodicidadeTipoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EmpresaPrecoServicoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EmpresaPrecoServicoTipoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EmpresasData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ErrorsData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EstabelecimentosData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EtiquetasData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoPessoaData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUpdateData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrPermissionData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrPreferencesData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrRoleData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrRolesPermissionsData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrUserData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrUsersRolesData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ExamesData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ExamesPerfisData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ExamesPortariaData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/FilCategoriasData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/FilFileAppointmentData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/FilFileData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/FilFileEmpresaData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/FilFileMarcacoesEstabelecimentoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HistoricoEstabelecimentoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsAreaData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsEmailData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsEmailEmpresaData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsEmailEstabelecimentoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsEquipamentoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsLegislacaoCategoriaData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsLegislacaoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsLegislacaoEmpresaData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsLegislacaoEstabelecimentoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsMedidaData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsNormalizacaoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsNormalizacaoEmpresaData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsNormalizacaoEstabelecimentoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsPostoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsPostoEstabelecimentoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsPostoMedidaData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsPostoRiscoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioAreaData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioEquipamentoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioLegislacaoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioMedidaData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioNormalizacaoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioPostoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioPostoMedidaData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioPostoRiscoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioRiscoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRiscoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRiscoEmpresaData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRiscoMedidaData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRiscoTemaData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/IdsData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ImageData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/LembretesData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/LembretesTiposData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MarcacoesEmpresaData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MarcacoesEstabelecimentoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MarcacoesGruposRealizadosData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MarcacoesTecnicosHstData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MarcacoesTrabalhadorData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MarcacoesTrabalhadorEstadosData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MedVacinaTipoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MedicosData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PaisesContinentesData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PaisesData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PesDocumentoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PesDocumentoTipoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PesPessoaDocumentoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PrestadoresData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PrestadoresGruposProtocoloData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PrtElementosProtocoloData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PrtGruposProtocoloData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PrtTiposElementosProtocoloData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TiposExamesCompData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresConsultasData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresConsultasDatasData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresEcdData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresEcdsAnaliseData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresEcdsData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresEcdsDatasData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresEcdsDatasEmailsData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresFichasAptidaoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresProcessoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/VersaoData.java delete mode 100644 branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/VersionData.java diff --git a/branches/NetbeansIndependency/PlanosActuacao/.classpath b/branches/NetbeansIndependency/PlanosActuacao/.classpath new file mode 100644 index 00000000..c4ae9e06 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/.classpath @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/branches/NetbeansIndependency/PlanosActuacao/.project b/branches/NetbeansIndependency/PlanosActuacao/.project new file mode 100644 index 00000000..d69ce0a3 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/.project @@ -0,0 +1,17 @@ + + + PlanosActuacao + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + diff --git a/branches/NetbeansIndependency/PlanosActuacao/.settings/org.eclipse.jdt.core.prefs b/branches/NetbeansIndependency/PlanosActuacao/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 00000000..ecd9f121 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,12 @@ +#Wed Apr 06 10:10:37 WEST 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.debug.lineNumber=generate +org.eclipse.jdt.core.compiler.debug.localVariable=generate +org.eclipse.jdt.core.compiler.debug.sourceFile=generate +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 diff --git a/branches/NetbeansIndependency/PlanosActuacao/lib/el-api.jar b/branches/NetbeansIndependency/PlanosActuacao/lib/el-api.jar new file mode 100644 index 0000000000000000000000000000000000000000..b743276102bf2229f70324ad1bb46b5903e70dde GIT binary patch literal 33410 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 E4{d~!wEzGB literal 0 HcmV?d00001 diff --git a/branches/NetbeansIndependency/PlanosActuacao/lib/servlet-api.jar b/branches/NetbeansIndependency/PlanosActuacao/lib/servlet-api.jar new file mode 100644 index 0000000000000000000000000000000000000000..8f0c41ebbaddfc8367b651aace626e9100adf1b5 GIT binary patch literal 88210 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̤DzgWMKrVk@6fY&tdX`K(Q5 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 (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class Acidentados extends com.evolute.entity.evo.EvoDataObject @@ -57,7 +57,7 @@ public class Acidentados extends com.evolute.entity.evo.EvoDataObjectfromAnalisesAcidentes_acidentado_id() + public java.util.ListfromAnalisesAcidentes_acidentado_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.AnalisesAcidentesData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.AnalisesAcidentesData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.AnalisesAcidentesData.class , getPrimaryKey().getMap().get("id"), "acidentado_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.AnalisesAcidentesData.class , getPrimaryKey().getMap().get("id"), "acidentado_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -1033,12 +1033,28 @@ public class Acidentados extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class Actualizacao extends com.evolute.entity.evo.EvoDataObject @@ -23,7 +23,7 @@ public class Actualizacao extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class AnalisesAcidentes extends com.evolute.entity.evo.EvoDataObject @@ -239,18 +239,18 @@ public class AnalisesAcidentes extends com.evolute.entity.evo.EvoDataObjectfromMedidas_analise_id() + public java.util.ListfromMedidas_analise_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.MedidasData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.MedidasData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.MedidasData.class , getPrimaryKey().getMap().get("id"), "analise_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.MedidasData.class , getPrimaryKey().getMap().get("id"), "analise_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -884,14 +884,14 @@ public class AnalisesAcidentes extends com.evolute.entity.evo.EvoDataObjectfromRecomendacoes_analise_id() + public java.util.ListfromRecomendacoes_analise_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.RecomendacoesData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.RecomendacoesData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.RecomendacoesData.class , getPrimaryKey().getMap().get("id"), "analise_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.RecomendacoesData.class , getPrimaryKey().getMap().get("id"), "analise_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -959,7 +959,7 @@ public class AnalisesAcidentes extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class Avisos extends com.evolute.entity.evo.EvoDataObject @@ -45,18 +45,18 @@ public class Avisos extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class Causas extends com.evolute.entity.evo.EvoDataObject @@ -29,7 +29,7 @@ public class Causas extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class Contactos extends com.evolute.entity.evo.EvoDataObject @@ -37,7 +37,7 @@ public class Contactos extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class Controle extends com.evolute.entity.evo.EvoDataObject @@ -29,7 +29,7 @@ public class Controle extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class Departamentos extends com.evolute.entity.evo.EvoDataObject @@ -29,7 +29,7 @@ public class Departamentos extends com.evolute.entity.evo.EvoDataObjectfromAnalisesAcidentes_departamento_id() + public java.util.ListfromAnalisesAcidentes_departamento_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.AnalisesAcidentesData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.AnalisesAcidentesData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.AnalisesAcidentesData.class , getPrimaryKey().getMap().get("id"), "departamento_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.AnalisesAcidentesData.class , getPrimaryKey().getMap().get("id"), "departamento_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -117,14 +117,14 @@ public class Departamentos extends com.evolute.entity.evo.EvoDataObjectfromSeccoes_departamento_id() + public java.util.ListfromSeccoes_departamento_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.SeccoesData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.SeccoesData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.SeccoesData.class , getPrimaryKey().getMap().get("id"), "departamento_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.SeccoesData.class , getPrimaryKey().getMap().get("id"), "departamento_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -332,12 +332,28 @@ public class Departamentos extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class Empresas extends com.evolute.entity.evo.EvoDataObject @@ -55,7 +55,7 @@ public class Empresas extends com.evolute.entity.evo.EvoDataObjectfromAvisos_empresa_id() + public java.util.ListfromAvisos_empresa_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.AvisosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.AvisosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.AvisosData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.AvisosData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -203,14 +203,14 @@ public class Empresas extends com.evolute.entity.evo.EvoDataObjectfromEstabelecimentos_empresa_id() + public java.util.ListfromEstabelecimentos_empresa_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.EstabelecimentosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.EstabelecimentosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.EstabelecimentosData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.EstabelecimentosData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -220,14 +220,14 @@ public class Empresas extends com.evolute.entity.evo.EvoDataObjectfromMarcacoesEmpresa_empresa_id() + public java.util.ListfromMarcacoesEmpresa_empresa_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.MarcacoesEmpresaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.MarcacoesEmpresaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.MarcacoesEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.MarcacoesEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -1007,6 +1007,7 @@ public class Empresas extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class Errors extends com.evolute.entity.evo.EvoDataObject @@ -33,7 +33,7 @@ public class Errors extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class Estabelecimentos extends com.evolute.entity.evo.EvoDataObject @@ -43,12 +43,12 @@ public class Estabelecimentos extends com.evolute.entity.evo.EvoDataObjectfromAvisos_estabelecimento_id() + public java.util.ListfromAvisos_estabelecimento_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.AvisosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.AvisosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.AvisosData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.AvisosData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -173,14 +173,14 @@ public class Estabelecimentos extends com.evolute.entity.evo.EvoDataObjectfromHistoricoEstabelecimento_estabelecimento_id() + public java.util.ListfromHistoricoEstabelecimento_estabelecimento_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.HistoricoEstabelecimentoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.HistoricoEstabelecimentoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.HistoricoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.HistoricoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -190,14 +190,14 @@ public class Estabelecimentos extends com.evolute.entity.evo.EvoDataObjectfromTrabalhadores_estabelecimento_id() + public java.util.ListfromTrabalhadores_estabelecimento_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.TrabalhadoresData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.TrabalhadoresData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.TrabalhadoresData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.TrabalhadoresData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -236,7 +236,7 @@ public class Estabelecimentos extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class EstadoMedidas extends com.evolute.entity.evo.EvoDataObject @@ -31,7 +31,7 @@ public class EstadoMedidas extends com.evolute.entity.evo.EvoDataObjectfromPlanoMedidas_estado_medidas_id() + public java.util.ListfromPlanoMedidas_estado_medidas_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.PlanoMedidasData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanoMedidasData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.PlanoMedidasData.class , getPrimaryKey().getMap().get("id"), "estado_medidas_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanoMedidasData.class , getPrimaryKey().getMap().get("id"), "estado_medidas_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -366,12 +366,28 @@ public class EstadoMedidas extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class Exames extends com.evolute.entity.evo.EvoDataObject @@ -57,15 +57,15 @@ public class Exames extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class ExamesPerfis extends com.evolute.entity.evo.EvoDataObject @@ -31,12 +31,12 @@ public class ExamesPerfis extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class HistoricoEstabelecimento extends com.evolute.entity.evo.EvoDataObject @@ -31,12 +31,12 @@ public class HistoricoEstabelecimento extends com.evolute.entity.evo.EvoDataObje public static final com.evolute.entity.ForeignKey ForeignKeyestabelecimento_idToestabelecimentos = - new com.evolute.entity.ForeignKey( HistoricoEstabelecimento.class, HistoricoEstabelecimento.ESTABELECIMENTO_ID, db.data.siprp.outer.EstabelecimentosData.class, db.data.siprp.outer.EstabelecimentosData.ID ); + new com.evolute.entity.ForeignKey( HistoricoEstabelecimento.class, HistoricoEstabelecimento.ESTABELECIMENTO_ID, com.evolute.siprp.planosactuacao.db.data.siprp.outer.EstabelecimentosData.class, com.evolute.siprp.planosactuacao.db.data.siprp.outer.EstabelecimentosData.ID ); public static final String TABLENAME = "historico_estabelecimento"; - public static final String CLASS_IDENTIFIER = "db.data.siprp.inner.historico_estabelecimento"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp.inner.historico_estabelecimento"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -74,7 +74,7 @@ public class HistoricoEstabelecimento extends com.evolute.entity.evo.EvoDataObje private Integer id; private Integer estabelecimento_id; - private db.data.siprp.outer.EstabelecimentosData to_estabelecimento_id; + private com.evolute.siprp.planosactuacao.db.data.siprp.outer.EstabelecimentosData to_estabelecimento_id; private java.util.Date data; private String texto; @@ -145,7 +145,7 @@ public class HistoricoEstabelecimento extends com.evolute.entity.evo.EvoDataObje LAZY_LOADED_OBJECTS.put( ESTABELECIMENTO_ID, Boolean.TRUE ); } - public db.data.siprp.outer.EstabelecimentosData toEstabelecimento_id() + public com.evolute.siprp.planosactuacao.db.data.siprp.outer.EstabelecimentosData toEstabelecimento_id() { try { @@ -158,7 +158,7 @@ public class HistoricoEstabelecimento extends com.evolute.entity.evo.EvoDataObje return this.to_estabelecimento_id; } - public void setToEstabelecimento_id( db.data.siprp.outer.EstabelecimentosData to_estabelecimento_id ) + public void setToEstabelecimento_id( com.evolute.siprp.planosactuacao.db.data.siprp.outer.EstabelecimentosData to_estabelecimento_id ) { try { @@ -291,7 +291,7 @@ public class HistoricoEstabelecimento extends com.evolute.entity.evo.EvoDataObje setEstabelecimento_id( ( Integer ) value ); break; case HistoricoEstabelecimento.TO_ESTABELECIMENTO_ID_INDEX: - setToEstabelecimento_id( ( db.data.siprp.outer.EstabelecimentosData ) value ); + setToEstabelecimento_id( ( com.evolute.siprp.planosactuacao.db.data.siprp.outer.EstabelecimentosData ) value ); break; case HistoricoEstabelecimento.DATA_INDEX: setData( ( java.util.Date ) value ); @@ -314,7 +314,7 @@ public class HistoricoEstabelecimento extends com.evolute.entity.evo.EvoDataObje this.estabelecimento_id = ( Integer ) value; break; case HistoricoEstabelecimento.TO_ESTABELECIMENTO_ID_INDEX: - this.to_estabelecimento_id = ( db.data.siprp.outer.EstabelecimentosData ) value; + this.to_estabelecimento_id = ( com.evolute.siprp.planosactuacao.db.data.siprp.outer.EstabelecimentosData ) value; break; case HistoricoEstabelecimento.DATA_INDEX: this.data = ( java.util.Date ) value; @@ -368,7 +368,7 @@ public class HistoricoEstabelecimento extends com.evolute.entity.evo.EvoDataObje theClass = Integer.class; break; case HistoricoEstabelecimento.TO_ESTABELECIMENTO_ID_INDEX: - theClass = db.data.siprp.outer.EstabelecimentosData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp.outer.EstabelecimentosData.class; break; case HistoricoEstabelecimento.DATA_INDEX: theClass = java.util.Date.class; @@ -399,6 +399,7 @@ public class HistoricoEstabelecimento extends com.evolute.entity.evo.EvoDataObje @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, HistoricoEstabelecimento.PK_FIELD_NAMES ); diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/inner/MarcacoesEmpresa.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/inner/MarcacoesEmpresa.java similarity index 92% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/inner/MarcacoesEmpresa.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/inner/MarcacoesEmpresa.java index 14a69140..663ebe0c 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/inner/MarcacoesEmpresa.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/inner/MarcacoesEmpresa.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class MarcacoesEmpresa extends com.evolute.entity.evo.EvoDataObject @@ -33,12 +33,12 @@ public class MarcacoesEmpresa extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObject @@ -35,7 +35,7 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje public static final String TABLENAME = "marcacoes_estabelecimento"; - public static final String CLASS_IDENTIFIER = "db.data.siprp.inner.marcacoes_estabelecimento"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp.inner.marcacoes_estabelecimento"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -449,6 +449,7 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, MarcacoesEstabelecimento.PK_FIELD_NAMES ); diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/inner/MarcacoesTrabalhador.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/inner/MarcacoesTrabalhador.java similarity index 93% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/inner/MarcacoesTrabalhador.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/inner/MarcacoesTrabalhador.java index b45dc69a..730188eb 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/inner/MarcacoesTrabalhador.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/inner/MarcacoesTrabalhador.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class MarcacoesTrabalhador extends com.evolute.entity.evo.EvoDataObject @@ -37,12 +37,12 @@ public class MarcacoesTrabalhador extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class Medicos extends com.evolute.entity.evo.EvoDataObject @@ -31,7 +31,7 @@ public class Medicos extends com.evolute.entity.evo.EvoDataObjectfromExames_medico_id() + public java.util.ListfromExames_medico_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.ExamesData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.ExamesData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.ExamesData.class , getPrimaryKey().getMap().get("id"), "medico_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.ExamesData.class , getPrimaryKey().getMap().get("id"), "medico_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -366,6 +366,7 @@ public class Medicos extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class Medidas extends com.evolute.entity.evo.EvoDataObject @@ -29,12 +29,12 @@ public class Medidas extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class NotNoticias extends com.evolute.entity.evo.EvoDataObject @@ -33,7 +33,7 @@ public class NotNoticias extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class Permissoes extends com.evolute.entity.evo.EvoDataObject @@ -29,7 +29,7 @@ public class Permissoes extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class PlanoAreas extends com.evolute.entity.evo.EvoDataObject @@ -31,12 +31,12 @@ public class PlanoAreas extends com.evolute.entity.evo.EvoDataObjectfromPlanoRiscos_area_id() + public java.util.ListfromPlanoRiscos_area_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.PlanoRiscosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanoRiscosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.PlanoRiscosData.class , getPrimaryKey().getMap().get("id"), "area_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanoRiscosData.class , getPrimaryKey().getMap().get("id"), "area_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -308,7 +308,7 @@ public class PlanoAreas extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class PlanoMedidas extends com.evolute.entity.evo.EvoDataObject @@ -35,15 +35,15 @@ public class PlanoMedidas extends com.evolute.entity.evo.EvoDataObjectfromPlanoPostosTrabalho_medida_id() + public java.util.ListfromPlanoPostosTrabalho_medida_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.PlanoPostosTrabalhoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanoPostosTrabalhoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.PlanoPostosTrabalhoData.class , getPrimaryKey().getMap().get("id"), "medida_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanoPostosTrabalhoData.class , getPrimaryKey().getMap().get("id"), "medida_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -292,7 +292,7 @@ public class PlanoMedidas extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class PlanoPostosTrabalho extends com.evolute.entity.evo.EvoDataObject @@ -31,12 +31,12 @@ public class PlanoPostosTrabalho extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class PlanoRiscos extends com.evolute.entity.evo.EvoDataObject @@ -53,12 +53,12 @@ public class PlanoRiscos extends com.evolute.entity.evo.EvoDataObjectfromPlanoMedidas_risco_id() + public java.util.ListfromPlanoMedidas_risco_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.PlanoMedidasData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanoMedidasData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.PlanoMedidasData.class , getPrimaryKey().getMap().get("id"), "risco_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanoMedidasData.class , getPrimaryKey().getMap().get("id"), "risco_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -771,7 +771,7 @@ public class PlanoRiscos extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class PlanosActuacao extends com.evolute.entity.evo.EvoDataObject @@ -101,18 +101,18 @@ public class PlanosActuacao extends com.evolute.entity.evo.EvoDataObjectfromPlanoAreas_plano_id() + public java.util.ListfromPlanoAreas_plano_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.PlanoAreasData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanoAreasData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.PlanoAreasData.class , getPrimaryKey().getMap().get("id"), "plano_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanoAreasData.class , getPrimaryKey().getMap().get("id"), "plano_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -1808,7 +1808,7 @@ public class PlanosActuacao extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class Properties extends com.evolute.entity.evo.EvoDataObject @@ -23,7 +23,7 @@ public class Properties extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class Recomendacoes extends com.evolute.entity.evo.EvoDataObject @@ -29,12 +29,12 @@ public class Recomendacoes extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class RiscoValoresTemp extends com.evolute.entity.evo.EvoDataObject @@ -23,7 +23,7 @@ public class RiscoValoresTemp extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class Roles extends com.evolute.entity.evo.EvoDataObject @@ -23,7 +23,7 @@ public class Roles extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class Seccoes extends com.evolute.entity.evo.EvoDataObject @@ -31,12 +31,12 @@ public class Seccoes extends com.evolute.entity.evo.EvoDataObjectfromAnalisesAcidentes_seccao_id() + public java.util.ListfromAnalisesAcidentes_seccao_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.AnalisesAcidentesData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.AnalisesAcidentesData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.AnalisesAcidentesData.class , getPrimaryKey().getMap().get("id"), "seccao_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.AnalisesAcidentesData.class , getPrimaryKey().getMap().get("id"), "seccao_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -191,7 +191,7 @@ public class Seccoes extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class TiposExamesComp extends com.evolute.entity.evo.EvoDataObject @@ -29,7 +29,7 @@ public class TiposExamesComp extends com.evolute.entity.evo.EvoDataObjectfromExamesPerfis_tipo() + public java.util.ListfromExamesPerfis_tipo() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.ExamesPerfisData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.ExamesPerfisData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.ExamesPerfisData.class , getPrimaryKey().getMap().get("id"), "tipo" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.ExamesPerfisData.class , getPrimaryKey().getMap().get("id"), "tipo" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -315,6 +315,7 @@ public class TiposExamesComp extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class TiposUtilizadores extends com.evolute.entity.evo.EvoDataObject @@ -33,7 +33,7 @@ public class TiposUtilizadores extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class Trabalhadores extends com.evolute.entity.evo.EvoDataObject @@ -55,12 +55,12 @@ public class Trabalhadores extends com.evolute.entity.evo.EvoDataObjectfromAvisos_trabalhador_id() + public java.util.ListfromAvisos_trabalhador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.AvisosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.AvisosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.AvisosData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.AvisosData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -216,14 +216,14 @@ public class Trabalhadores extends com.evolute.entity.evo.EvoDataObjectfromExames_trabalhador_id() + public java.util.ListfromExames_trabalhador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.ExamesData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.ExamesData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.ExamesData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.ExamesData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -233,14 +233,14 @@ public class Trabalhadores extends com.evolute.entity.evo.EvoDataObjectfromMarcacoesTrabalhador_trabalhador_id() + public java.util.ListfromMarcacoesTrabalhador_trabalhador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.MarcacoesTrabalhadorData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.MarcacoesTrabalhadorData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.MarcacoesTrabalhadorData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.MarcacoesTrabalhadorData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -598,7 +598,7 @@ public class Trabalhadores extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class Users extends com.evolute.entity.evo.EvoDataObject @@ -23,7 +23,7 @@ public class Users extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class Utilizadores extends com.evolute.entity.evo.EvoDataObject @@ -63,7 +63,7 @@ public class Utilizadores extends com.evolute.entity.evo.EvoDataObjectfromPlanosActuacao_user_dir_loja() + public java.util.ListfromPlanosActuacao_user_dir_loja() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.PlanosActuacaoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanosActuacaoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.PlanosActuacaoData.class , getPrimaryKey().getMap().get("id"), "user_dir_loja" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanosActuacaoData.class , getPrimaryKey().getMap().get("id"), "user_dir_loja" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -230,14 +230,14 @@ public class Utilizadores extends com.evolute.entity.evo.EvoDataObjectfromPlanosActuacao_user_dns() + public java.util.ListfromPlanosActuacao_user_dns() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.PlanosActuacaoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanosActuacaoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.PlanosActuacaoData.class , getPrimaryKey().getMap().get("id"), "user_dns" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanosActuacaoData.class , getPrimaryKey().getMap().get("id"), "user_dns" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -247,14 +247,14 @@ public class Utilizadores extends com.evolute.entity.evo.EvoDataObjectfromPlanosActuacao_user_hs() + public java.util.ListfromPlanosActuacao_user_hs() { - java.util.List result = new java.util.LinkedList< db.data.siprp.outer.PlanosActuacaoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanosActuacaoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp.outer.PlanosActuacaoData.class , getPrimaryKey().getMap().get("id"), "user_hs" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanosActuacaoData.class , getPrimaryKey().getMap().get("id"), "user_hs" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -1210,12 +1210,28 @@ public class Utilizadores extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp.inner; public class Version extends com.evolute.entity.evo.EvoDataObject @@ -29,7 +29,7 @@ public class Version extends com.evolute.entity.evo.EvoDataObject - + diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/AcidentadosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/AcidentadosData.java new file mode 100644 index 00000000..bc6ee3c6 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/AcidentadosData.java @@ -0,0 +1,18 @@ +/* +* AcidentadosData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class AcidentadosData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.Acidentados +{ + + public AcidentadosData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/ActualizacaoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/ActualizacaoData.java new file mode 100644 index 00000000..2d17dead --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/ActualizacaoData.java @@ -0,0 +1,18 @@ +/* +* ActualizacaoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class ActualizacaoData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.Actualizacao +{ + + public ActualizacaoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/AnalisesAcidentesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/AnalisesAcidentesData.java new file mode 100644 index 00000000..354b457e --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/AnalisesAcidentesData.java @@ -0,0 +1,18 @@ +/* +* AnalisesAcidentesData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class AnalisesAcidentesData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.AnalisesAcidentes +{ + + public AnalisesAcidentesData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/AvisosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/AvisosData.java new file mode 100644 index 00000000..2b5cf9e5 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/AvisosData.java @@ -0,0 +1,18 @@ +/* +* AvisosData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class AvisosData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.Avisos +{ + + public AvisosData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/CausasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/CausasData.java new file mode 100644 index 00000000..43a7ea58 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/CausasData.java @@ -0,0 +1,18 @@ +/* +* CausasData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class CausasData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.Causas +{ + + public CausasData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/ContactosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/ContactosData.java new file mode 100644 index 00000000..bc3d9948 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/ContactosData.java @@ -0,0 +1,18 @@ +/* +* ContactosData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class ContactosData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.Contactos +{ + + public ContactosData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/ControleData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/ControleData.java new file mode 100644 index 00000000..4076d937 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/ControleData.java @@ -0,0 +1,18 @@ +/* +* ControleData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class ControleData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.Controle +{ + + public ControleData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/DepartamentosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/DepartamentosData.java new file mode 100644 index 00000000..5190c7bc --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/DepartamentosData.java @@ -0,0 +1,18 @@ +/* +* DepartamentosData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class DepartamentosData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.Departamentos +{ + + public DepartamentosData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/EmpresasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/EmpresasData.java new file mode 100644 index 00000000..fe37d7fb --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/EmpresasData.java @@ -0,0 +1,18 @@ +/* +* EmpresasData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class EmpresasData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.Empresas +{ + + public EmpresasData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/ErrorsData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/ErrorsData.java new file mode 100644 index 00000000..3438879a --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/ErrorsData.java @@ -0,0 +1,18 @@ +/* +* ErrorsData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class ErrorsData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.Errors +{ + + public ErrorsData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/EstabelecimentosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/EstabelecimentosData.java new file mode 100644 index 00000000..2a3ae764 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/EstabelecimentosData.java @@ -0,0 +1,18 @@ +/* +* EstabelecimentosData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class EstabelecimentosData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.Estabelecimentos +{ + + public EstabelecimentosData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/EstadoMedidasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/EstadoMedidasData.java new file mode 100644 index 00000000..bd039d5d --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/EstadoMedidasData.java @@ -0,0 +1,18 @@ +/* +* EstadoMedidasData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class EstadoMedidasData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.EstadoMedidas +{ + + public EstadoMedidasData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/ExamesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/ExamesData.java new file mode 100644 index 00000000..cc91be1e --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/ExamesData.java @@ -0,0 +1,18 @@ +/* +* ExamesData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class ExamesData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.Exames +{ + + public ExamesData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/ExamesPerfisData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/ExamesPerfisData.java new file mode 100644 index 00000000..0e59193b --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/ExamesPerfisData.java @@ -0,0 +1,18 @@ +/* +* ExamesPerfisData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class ExamesPerfisData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.ExamesPerfis +{ + + public ExamesPerfisData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/HistoricoEstabelecimentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/HistoricoEstabelecimentoData.java new file mode 100644 index 00000000..9d429735 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/HistoricoEstabelecimentoData.java @@ -0,0 +1,18 @@ +/* +* HistoricoEstabelecimentoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class HistoricoEstabelecimentoData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.HistoricoEstabelecimento +{ + + public HistoricoEstabelecimentoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/MarcacoesEmpresaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/MarcacoesEmpresaData.java new file mode 100644 index 00000000..5d4884d5 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/MarcacoesEmpresaData.java @@ -0,0 +1,18 @@ +/* +* MarcacoesEmpresaData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class MarcacoesEmpresaData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.MarcacoesEmpresa +{ + + public MarcacoesEmpresaData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/MarcacoesEstabelecimentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/MarcacoesEstabelecimentoData.java new file mode 100644 index 00000000..27e56a28 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/MarcacoesEstabelecimentoData.java @@ -0,0 +1,18 @@ +/* +* MarcacoesEstabelecimentoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class MarcacoesEstabelecimentoData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.MarcacoesEstabelecimento +{ + + public MarcacoesEstabelecimentoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/MarcacoesTrabalhadorData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/MarcacoesTrabalhadorData.java new file mode 100644 index 00000000..dce9c5ea --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/MarcacoesTrabalhadorData.java @@ -0,0 +1,18 @@ +/* +* MarcacoesTrabalhadorData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class MarcacoesTrabalhadorData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.MarcacoesTrabalhador +{ + + public MarcacoesTrabalhadorData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/MedicosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/MedicosData.java new file mode 100644 index 00000000..fd6c3864 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/MedicosData.java @@ -0,0 +1,18 @@ +/* +* MedicosData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class MedicosData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.Medicos +{ + + public MedicosData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/MedidasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/MedidasData.java new file mode 100644 index 00000000..55780e58 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/MedidasData.java @@ -0,0 +1,18 @@ +/* +* MedidasData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class MedidasData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.Medidas +{ + + public MedidasData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/NotNoticiasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/NotNoticiasData.java new file mode 100644 index 00000000..68aef09f --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/NotNoticiasData.java @@ -0,0 +1,18 @@ +/* +* NotNoticiasData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class NotNoticiasData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.NotNoticias +{ + + public NotNoticiasData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PermissoesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PermissoesData.java new file mode 100644 index 00000000..dc4270c7 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PermissoesData.java @@ -0,0 +1,18 @@ +/* +* PermissoesData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class PermissoesData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.Permissoes +{ + + public PermissoesData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PlanoAreasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PlanoAreasData.java new file mode 100644 index 00000000..984be1a2 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PlanoAreasData.java @@ -0,0 +1,18 @@ +/* +* PlanoAreasData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class PlanoAreasData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.PlanoAreas +{ + + public PlanoAreasData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PlanoMedidasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PlanoMedidasData.java new file mode 100644 index 00000000..18ac51a7 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PlanoMedidasData.java @@ -0,0 +1,18 @@ +/* +* PlanoMedidasData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class PlanoMedidasData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.PlanoMedidas +{ + + public PlanoMedidasData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PlanoPostosTrabalhoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PlanoPostosTrabalhoData.java new file mode 100644 index 00000000..cc3d0e28 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PlanoPostosTrabalhoData.java @@ -0,0 +1,18 @@ +/* +* PlanoPostosTrabalhoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class PlanoPostosTrabalhoData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.PlanoPostosTrabalho +{ + + public PlanoPostosTrabalhoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PlanoRiscosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PlanoRiscosData.java new file mode 100644 index 00000000..8dc5dfe2 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PlanoRiscosData.java @@ -0,0 +1,18 @@ +/* +* PlanoRiscosData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class PlanoRiscosData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.PlanoRiscos +{ + + public PlanoRiscosData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PlanosActuacaoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PlanosActuacaoData.java new file mode 100644 index 00000000..edaeb096 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PlanosActuacaoData.java @@ -0,0 +1,18 @@ +/* +* PlanosActuacaoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class PlanosActuacaoData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.PlanosActuacao +{ + + public PlanosActuacaoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PropertiesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PropertiesData.java new file mode 100644 index 00000000..bc6fe572 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/PropertiesData.java @@ -0,0 +1,18 @@ +/* +* PropertiesData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class PropertiesData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.Properties +{ + + public PropertiesData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/RecomendacoesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/RecomendacoesData.java new file mode 100644 index 00000000..4851bf2f --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/RecomendacoesData.java @@ -0,0 +1,18 @@ +/* +* RecomendacoesData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class RecomendacoesData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.Recomendacoes +{ + + public RecomendacoesData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/RiscoValoresTempData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/RiscoValoresTempData.java new file mode 100644 index 00000000..776522cc --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/RiscoValoresTempData.java @@ -0,0 +1,18 @@ +/* +* RiscoValoresTempData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class RiscoValoresTempData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.RiscoValoresTemp +{ + + public RiscoValoresTempData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/RolesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/RolesData.java new file mode 100644 index 00000000..7e949e08 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/RolesData.java @@ -0,0 +1,18 @@ +/* +* RolesData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class RolesData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.Roles +{ + + public RolesData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/SeccoesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/SeccoesData.java new file mode 100644 index 00000000..d4962370 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/SeccoesData.java @@ -0,0 +1,18 @@ +/* +* SeccoesData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class SeccoesData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.Seccoes +{ + + public SeccoesData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/TiposExamesCompData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/TiposExamesCompData.java new file mode 100644 index 00000000..b04b012f --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/TiposExamesCompData.java @@ -0,0 +1,18 @@ +/* +* TiposExamesCompData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class TiposExamesCompData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.TiposExamesComp +{ + + public TiposExamesCompData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/TiposUtilizadoresData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/TiposUtilizadoresData.java new file mode 100644 index 00000000..47536b94 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/TiposUtilizadoresData.java @@ -0,0 +1,18 @@ +/* +* TiposUtilizadoresData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class TiposUtilizadoresData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.TiposUtilizadores +{ + + public TiposUtilizadoresData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/TrabalhadoresData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/TrabalhadoresData.java new file mode 100644 index 00000000..63253845 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/TrabalhadoresData.java @@ -0,0 +1,18 @@ +/* +* TrabalhadoresData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class TrabalhadoresData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.Trabalhadores +{ + + public TrabalhadoresData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/UsersData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/UsersData.java new file mode 100644 index 00000000..3abd863f --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/UsersData.java @@ -0,0 +1,18 @@ +/* +* UsersData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class UsersData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.Users +{ + + public UsersData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/UtilizadoresData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/UtilizadoresData.java new file mode 100644 index 00000000..09303577 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/UtilizadoresData.java @@ -0,0 +1,18 @@ +/* +* UtilizadoresData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class UtilizadoresData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.Utilizadores +{ + + public UtilizadoresData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/VersionData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/VersionData.java new file mode 100644 index 00000000..6d16923b --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp/outer/VersionData.java @@ -0,0 +1,18 @@ +/* +* VersionData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp.outer; + + +public final class VersionData extends com.evolute.siprp.planosactuacao.db.data.siprp.inner.Version +{ + + public VersionData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/Actualizacao.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/Actualizacao.java similarity index 90% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/Actualizacao.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/Actualizacao.java index aa015d0a..fcb7de37 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/Actualizacao.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/Actualizacao.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class Actualizacao extends com.evolute.entity.evo.EvoDataObject @@ -27,7 +27,7 @@ public class Actualizacao extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class AptAppointment extends com.evolute.entity.evo.EvoDataObject @@ -37,12 +37,12 @@ public class AptAppointment extends com.evolute.entity.evo.EvoDataObjectfromAptOutrasVacina_appointment_id() + public java.util.ListfromAptOutrasVacina_appointment_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.AptOutrasVacinaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AptOutrasVacinaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.AptOutrasVacinaData.class , getPrimaryKey().getMap().get("id"), "appointment_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AptOutrasVacinaData.class , getPrimaryKey().getMap().get("id"), "appointment_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -151,14 +151,14 @@ public class AptAppointment extends com.evolute.entity.evo.EvoDataObjectfromAptOutrasViajante_appointment_id() + public java.util.ListfromAptOutrasViajante_appointment_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.AptOutrasViajanteData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AptOutrasViajanteData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.AptOutrasViajanteData.class , getPrimaryKey().getMap().get("id"), "appointment_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AptOutrasViajanteData.class , getPrimaryKey().getMap().get("id"), "appointment_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -168,14 +168,14 @@ public class AptAppointment extends com.evolute.entity.evo.EvoDataObjectfromAptSegurancaAlimentar_appointment_id() + public java.util.ListfromAptSegurancaAlimentar_appointment_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.AptSegurancaAlimentarData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AptSegurancaAlimentarData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.AptSegurancaAlimentarData.class , getPrimaryKey().getMap().get("id"), "appointment_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AptSegurancaAlimentarData.class , getPrimaryKey().getMap().get("id"), "appointment_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -185,14 +185,14 @@ public class AptAppointment extends com.evolute.entity.evo.EvoDataObjectfromFilFileAppointment_appointment_id() + public java.util.ListfromFilFileAppointment_appointment_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.FilFileAppointmentData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.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" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.FilFileAppointmentData.class , getPrimaryKey().getMap().get("id"), "appointment_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -347,7 +347,7 @@ public class AptAppointment extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class AptOutrasVacina extends com.evolute.entity.evo.EvoDataObject @@ -35,18 +35,18 @@ public class AptOutrasVacina extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class AptOutrasViajante extends com.evolute.entity.evo.EvoDataObject @@ -31,15 +31,15 @@ public class AptOutrasViajante extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class AptSegurancaAlimentar extends com.evolute.entity.evo.EvoDataObject @@ -33,15 +33,15 @@ public class AptSegurancaAlimentar extends com.evolute.entity.evo.EvoDataObject< public static final com.evolute.entity.ForeignKey ForeignKeyappointment_idToapt_appointment = - new com.evolute.entity.ForeignKey( AptSegurancaAlimentar.class, AptSegurancaAlimentar.APPOINTMENT_ID, db.data.siprp_local.outer.AptAppointmentData.class, db.data.siprp_local.outer.AptAppointmentData.ID ); + new com.evolute.entity.ForeignKey( AptSegurancaAlimentar.class, AptSegurancaAlimentar.APPOINTMENT_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AptAppointmentData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AptAppointmentData.ID ); public static final com.evolute.entity.ForeignKey ForeignKeyestabelecimento_idToestabelecimentos = - new com.evolute.entity.ForeignKey( AptSegurancaAlimentar.class, AptSegurancaAlimentar.ESTABELECIMENTO_ID, db.data.siprp_local.outer.EstabelecimentosData.class, db.data.siprp_local.outer.EstabelecimentosData.ID ); + new com.evolute.entity.ForeignKey( AptSegurancaAlimentar.class, AptSegurancaAlimentar.ESTABELECIMENTO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.ID ); public static final String TABLENAME = "apt_seguranca_alimentar"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.apt_seguranca_alimentar"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.apt_seguranca_alimentar"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -85,9 +85,9 @@ public class AptSegurancaAlimentar extends com.evolute.entity.evo.EvoDataObject< private Integer id; private java.sql.Timestamp deleted_stamp; private Integer appointment_id; - private db.data.siprp_local.outer.AptAppointmentData to_appointment_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AptAppointmentData to_appointment_id; private Integer estabelecimento_id; - private db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id; protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; @@ -185,7 +185,7 @@ public class AptSegurancaAlimentar extends com.evolute.entity.evo.EvoDataObject< LAZY_LOADED_OBJECTS.put( APPOINTMENT_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.AptAppointmentData toAppointment_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AptAppointmentData toAppointment_id() { try { @@ -198,7 +198,7 @@ public class AptSegurancaAlimentar extends com.evolute.entity.evo.EvoDataObject< return this.to_appointment_id; } - public void setToAppointment_id( db.data.siprp_local.outer.AptAppointmentData to_appointment_id ) + public void setToAppointment_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AptAppointmentData to_appointment_id ) { try { @@ -240,7 +240,7 @@ public class AptSegurancaAlimentar extends com.evolute.entity.evo.EvoDataObject< LAZY_LOADED_OBJECTS.put( ESTABELECIMENTO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.EstabelecimentosData toEstabelecimento_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData toEstabelecimento_id() { try { @@ -253,7 +253,7 @@ public class AptSegurancaAlimentar extends com.evolute.entity.evo.EvoDataObject< return this.to_estabelecimento_id; } - public void setToEstabelecimento_id( db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id ) + public void setToEstabelecimento_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id ) { try { @@ -337,13 +337,13 @@ public class AptSegurancaAlimentar extends com.evolute.entity.evo.EvoDataObject< setAppointment_id( ( Integer ) value ); break; case AptSegurancaAlimentar.TO_APPOINTMENT_ID_INDEX: - setToAppointment_id( ( db.data.siprp_local.outer.AptAppointmentData ) value ); + setToAppointment_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AptAppointmentData ) value ); break; case AptSegurancaAlimentar.ESTABELECIMENTO_ID_INDEX: setEstabelecimento_id( ( Integer ) value ); break; case AptSegurancaAlimentar.TO_ESTABELECIMENTO_ID_INDEX: - setToEstabelecimento_id( ( db.data.siprp_local.outer.EstabelecimentosData ) value ); + setToEstabelecimento_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData ) value ); break; } } @@ -363,13 +363,13 @@ public class AptSegurancaAlimentar extends com.evolute.entity.evo.EvoDataObject< this.appointment_id = ( Integer ) value; break; case AptSegurancaAlimentar.TO_APPOINTMENT_ID_INDEX: - this.to_appointment_id = ( db.data.siprp_local.outer.AptAppointmentData ) value; + this.to_appointment_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AptAppointmentData ) value; break; case AptSegurancaAlimentar.ESTABELECIMENTO_ID_INDEX: this.estabelecimento_id = ( Integer ) value; break; case AptSegurancaAlimentar.TO_ESTABELECIMENTO_ID_INDEX: - this.to_estabelecimento_id = ( db.data.siprp_local.outer.EstabelecimentosData ) value; + this.to_estabelecimento_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData ) value; break; } } @@ -420,13 +420,13 @@ public class AptSegurancaAlimentar extends com.evolute.entity.evo.EvoDataObject< theClass = Integer.class; break; case AptSegurancaAlimentar.TO_APPOINTMENT_ID_INDEX: - theClass = db.data.siprp_local.outer.AptAppointmentData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AptAppointmentData.class; break; case AptSegurancaAlimentar.ESTABELECIMENTO_ID_INDEX: theClass = Integer.class; break; case AptSegurancaAlimentar.TO_ESTABELECIMENTO_ID_INDEX: - theClass = db.data.siprp_local.outer.EstabelecimentosData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.class; break; } return theClass; @@ -451,12 +451,28 @@ public class AptSegurancaAlimentar extends com.evolute.entity.evo.EvoDataObject< @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, AptSegurancaAlimentar.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/AptState.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/AptState.java similarity index 89% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/AptState.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/AptState.java index d817c88f..45a94c73 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/AptState.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/AptState.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class AptState extends com.evolute.entity.evo.EvoDataObject @@ -27,7 +27,7 @@ public class AptState extends com.evolute.entity.evo.EvoDataObjectfromAptAppointment_state_id() + public java.util.ListfromAptAppointment_state_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.AptAppointmentData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AptAppointmentData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.AptAppointmentData.class , getPrimaryKey().getMap().get("id"), "state_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AptAppointmentData.class , getPrimaryKey().getMap().get("id"), "state_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -265,6 +265,7 @@ public class AptState extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class Avisos extends com.evolute.entity.evo.EvoDataObject @@ -45,18 +45,18 @@ public class Avisos extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class Contactos extends com.evolute.entity.evo.EvoDataObject @@ -39,7 +39,7 @@ public class Contactos extends com.evolute.entity.evo.EvoDataObjectfromEmpresas_contacto_1() + public java.util.ListfromEmpresas_contacto_1() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.EmpresasData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresasData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.EmpresasData.class , getPrimaryKey().getMap().get("id"), "contacto_1" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresasData.class , getPrimaryKey().getMap().get("id"), "contacto_1" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -148,14 +148,14 @@ public class Contactos extends com.evolute.entity.evo.EvoDataObjectfromEmpresas_contacto_2() + public java.util.ListfromEmpresas_contacto_2() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.EmpresasData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresasData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.EmpresasData.class , getPrimaryKey().getMap().get("id"), "contacto_2" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresasData.class , getPrimaryKey().getMap().get("id"), "contacto_2" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -165,14 +165,14 @@ public class Contactos extends com.evolute.entity.evo.EvoDataObjectfromEstabelecimentos_contacto_id() + public java.util.ListfromEstabelecimentos_contacto_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.EstabelecimentosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.EstabelecimentosData.class , getPrimaryKey().getMap().get("id"), "contacto_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.class , getPrimaryKey().getMap().get("id"), "contacto_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -182,14 +182,14 @@ public class Contactos extends com.evolute.entity.evo.EvoDataObjectfromPrestadores_contacto_id() + public java.util.ListfromPrestadores_contacto_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.PrestadoresData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.PrestadoresData.class , getPrimaryKey().getMap().get("id"), "contacto_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData.class , getPrimaryKey().getMap().get("id"), "contacto_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -617,12 +617,28 @@ public class Contactos extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class CurArs extends com.evolute.entity.evo.EvoDataObject @@ -27,7 +27,7 @@ public class CurArs extends com.evolute.entity.evo.EvoDataObjectfromCurFormandos_ars_id() + public java.util.ListfromCurFormandos_ars_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurFormandosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurFormandosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.CurFormandosData.class , getPrimaryKey().getMap().get("id"), "ars_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurFormandosData.class , getPrimaryKey().getMap().get("id"), "ars_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -265,12 +265,28 @@ public class CurArs extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class CurAulas extends com.evolute.entity.evo.EvoDataObject @@ -33,12 +33,12 @@ public class CurAulas extends com.evolute.entity.evo.EvoDataObjectfromCurAulasFormadores_aula_id() + public java.util.ListfromCurAulasFormadores_aula_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurAulasFormadoresData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurAulasFormadoresData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.CurAulasFormadoresData.class , getPrimaryKey().getMap().get("id"), "aula_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurAulasFormadoresData.class , getPrimaryKey().getMap().get("id"), "aula_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -139,14 +139,14 @@ public class CurAulas extends com.evolute.entity.evo.EvoDataObjectfromCurTopicosAulas_aula_id() + public java.util.ListfromCurTopicosAulas_aula_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurTopicosAulasData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurTopicosAulasData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.CurTopicosAulasData.class , getPrimaryKey().getMap().get("id"), "aula_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurTopicosAulasData.class , getPrimaryKey().getMap().get("id"), "aula_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -272,7 +272,7 @@ public class CurAulas extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class CurAulasFormadores extends com.evolute.entity.evo.EvoDataObject @@ -31,15 +31,15 @@ public class CurAulasFormadores extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class CurCursos extends com.evolute.entity.evo.EvoDataObject @@ -61,7 +61,7 @@ public class CurCursos extends com.evolute.entity.evo.EvoDataObjectfromCurDias_curso_id() + public java.util.ListfromCurDias_curso_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurDiasData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurDiasData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.CurDiasData.class , getPrimaryKey().getMap().get("id"), "curso_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurDiasData.class , getPrimaryKey().getMap().get("id"), "curso_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -231,14 +231,14 @@ public class CurCursos extends com.evolute.entity.evo.EvoDataObjectfromCurFormadoresCursos_curso_id() + public java.util.ListfromCurFormadoresCursos_curso_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurFormadoresCursosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurFormadoresCursosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.CurFormadoresCursosData.class , getPrimaryKey().getMap().get("id"), "curso_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurFormadoresCursosData.class , getPrimaryKey().getMap().get("id"), "curso_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -248,14 +248,14 @@ public class CurCursos extends com.evolute.entity.evo.EvoDataObjectfromCurFormandosCursos_curso_id() + public java.util.ListfromCurFormandosCursos_curso_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurFormandosCursosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurFormandosCursosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.CurFormandosCursosData.class , getPrimaryKey().getMap().get("id"), "curso_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurFormandosCursosData.class , getPrimaryKey().getMap().get("id"), "curso_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -265,14 +265,14 @@ public class CurCursos extends com.evolute.entity.evo.EvoDataObjectfromCurPagamentos_curso_id() + public java.util.ListfromCurPagamentos_curso_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurPagamentosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurPagamentosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.CurPagamentosData.class , getPrimaryKey().getMap().get("id"), "curso_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurPagamentosData.class , getPrimaryKey().getMap().get("id"), "curso_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -282,14 +282,14 @@ public class CurCursos extends com.evolute.entity.evo.EvoDataObjectfromCurPresencas_curso_id() + public java.util.ListfromCurPresencas_curso_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurPresencasData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurPresencasData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.CurPresencasData.class , getPrimaryKey().getMap().get("id"), "curso_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurPresencasData.class , getPrimaryKey().getMap().get("id"), "curso_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -299,14 +299,14 @@ public class CurCursos extends com.evolute.entity.evo.EvoDataObjectfromCurQuestionarioResposta_curso_id() + public java.util.ListfromCurQuestionarioResposta_curso_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurQuestionarioRespostaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurQuestionarioRespostaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.CurQuestionarioRespostaData.class , getPrimaryKey().getMap().get("id"), "curso_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurQuestionarioRespostaData.class , getPrimaryKey().getMap().get("id"), "curso_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -316,14 +316,14 @@ public class CurCursos extends com.evolute.entity.evo.EvoDataObjectfromCurTopicos_curso_id() + public java.util.ListfromCurTopicos_curso_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurTopicosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurTopicosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.CurTopicosData.class , getPrimaryKey().getMap().get("id"), "curso_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurTopicosData.class , getPrimaryKey().getMap().get("id"), "curso_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -1235,12 +1235,28 @@ public class CurCursos extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class CurDias extends com.evolute.entity.evo.EvoDataObject @@ -31,12 +31,12 @@ public class CurDias extends com.evolute.entity.evo.EvoDataObjectfromCurAulas_cur_dia_id() + public java.util.ListfromCurAulas_cur_dia_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurAulasData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurAulasData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.CurAulasData.class , getPrimaryKey().getMap().get("id"), "cur_dia_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurAulasData.class , getPrimaryKey().getMap().get("id"), "cur_dia_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -191,7 +191,7 @@ public class CurDias extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class CurFormadores extends com.evolute.entity.evo.EvoDataObject @@ -37,7 +37,7 @@ public class CurFormadores extends com.evolute.entity.evo.EvoDataObjectfromCurAulasFormadores_formador_id() + public java.util.ListfromCurAulasFormadores_formador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurAulasFormadoresData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurAulasFormadoresData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.CurAulasFormadoresData.class , getPrimaryKey().getMap().get("id"), "formador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurAulasFormadoresData.class , getPrimaryKey().getMap().get("id"), "formador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -142,14 +142,14 @@ public class CurFormadores extends com.evolute.entity.evo.EvoDataObjectfromCurFormadoresCursos_formador_id() + public java.util.ListfromCurFormadoresCursos_formador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurFormadoresCursosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurFormadoresCursosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.CurFormadoresCursosData.class , getPrimaryKey().getMap().get("id"), "formador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurFormadoresCursosData.class , getPrimaryKey().getMap().get("id"), "formador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -159,14 +159,14 @@ public class CurFormadores extends com.evolute.entity.evo.EvoDataObjectfromCurPresencas_formador_id() + public java.util.ListfromCurPresencas_formador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurPresencasData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurPresencasData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.CurPresencasData.class , getPrimaryKey().getMap().get("id"), "formador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurPresencasData.class , getPrimaryKey().getMap().get("id"), "formador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -176,14 +176,14 @@ public class CurFormadores extends com.evolute.entity.evo.EvoDataObjectfromCurTopicos_formador_id() + public java.util.ListfromCurTopicos_formador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurTopicosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurTopicosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.CurTopicosData.class , getPrimaryKey().getMap().get("id"), "formador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurTopicosData.class , getPrimaryKey().getMap().get("id"), "formador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -567,12 +567,28 @@ public class CurFormadores extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class CurFormadoresCursos extends com.evolute.entity.evo.EvoDataObject @@ -33,15 +33,15 @@ public class CurFormadoresCursos extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class CurFormandos extends com.evolute.entity.evo.EvoDataObject @@ -37,15 +37,15 @@ public class CurFormandos extends com.evolute.entity.evo.EvoDataObjectfromCurFormandosCursos_formando_id() + public java.util.ListfromCurFormandosCursos_formando_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurFormandosCursosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurFormandosCursosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.CurFormandosCursosData.class , getPrimaryKey().getMap().get("id"), "formando_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurFormandosCursosData.class , getPrimaryKey().getMap().get("id"), "formando_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -156,14 +156,14 @@ public class CurFormandos extends com.evolute.entity.evo.EvoDataObjectfromCurPagamentos_formando_id() + public java.util.ListfromCurPagamentos_formando_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurPagamentosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurPagamentosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.CurPagamentosData.class , getPrimaryKey().getMap().get("id"), "formando_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurPagamentosData.class , getPrimaryKey().getMap().get("id"), "formando_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -173,14 +173,14 @@ public class CurFormandos extends com.evolute.entity.evo.EvoDataObjectfromCurPresencas_formando_id() + public java.util.ListfromCurPresencas_formando_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurPresencasData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurPresencasData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.CurPresencasData.class , getPrimaryKey().getMap().get("id"), "formando_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurPresencasData.class , getPrimaryKey().getMap().get("id"), "formando_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -190,14 +190,14 @@ public class CurFormandos extends com.evolute.entity.evo.EvoDataObjectfromCurQuestionarioResposta_formando_id() + public java.util.ListfromCurQuestionarioResposta_formando_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurQuestionarioRespostaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurQuestionarioRespostaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.CurQuestionarioRespostaData.class , getPrimaryKey().getMap().get("id"), "formando_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurQuestionarioRespostaData.class , getPrimaryKey().getMap().get("id"), "formando_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -294,7 +294,7 @@ public class CurFormandos extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class CurFormandosCursos extends com.evolute.entity.evo.EvoDataObject @@ -37,15 +37,15 @@ public class CurFormandosCursos extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class CurHospitais extends com.evolute.entity.evo.EvoDataObject @@ -27,7 +27,7 @@ public class CurHospitais extends com.evolute.entity.evo.EvoDataObjectfromCurFormandos_hospital_id() + public java.util.ListfromCurFormandos_hospital_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurFormandosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurFormandosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.CurFormandosData.class , getPrimaryKey().getMap().get("id"), "hospital_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurFormandosData.class , getPrimaryKey().getMap().get("id"), "hospital_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -265,6 +265,7 @@ public class CurHospitais extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class CurNumeroCertificado extends com.evolute.entity.evo.EvoDataObject @@ -29,7 +29,7 @@ public class CurNumeroCertificado extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class CurNumeroCertificadoFormador extends com.evolute.entity.evo.EvoDataObject @@ -29,7 +29,7 @@ public class CurNumeroCertificadoFormador extends com.evolute.entity.evo.EvoData public static final String TABLENAME = "cur_numero_certificado_formador"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.cur_numero_certificado_formador"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.cur_numero_certificado_formador"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -298,12 +298,28 @@ public class CurNumeroCertificadoFormador extends com.evolute.entity.evo.EvoData @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, CurNumeroCertificadoFormador.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/CurPagamentos.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/CurPagamentos.java similarity index 84% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/CurPagamentos.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/CurPagamentos.java index 9b4b3514..5558a840 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/CurPagamentos.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/CurPagamentos.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class CurPagamentos extends com.evolute.entity.evo.EvoDataObject @@ -41,18 +41,18 @@ public class CurPagamentos extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class CurPagamentosTipos extends com.evolute.entity.evo.EvoDataObject @@ -27,7 +27,7 @@ public class CurPagamentosTipos extends com.evolute.entity.evo.EvoDataObjectfromCurPagamentos_tipo_id() + public java.util.ListfromCurPagamentos_tipo_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurPagamentosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurPagamentosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.CurPagamentosData.class , getPrimaryKey().getMap().get("id"), "tipo_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurPagamentosData.class , getPrimaryKey().getMap().get("id"), "tipo_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -265,12 +265,28 @@ public class CurPagamentosTipos extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class CurPresencas extends com.evolute.entity.evo.EvoDataObject @@ -39,18 +39,18 @@ public class CurPresencas extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class CurQuestionario extends com.evolute.entity.evo.EvoDataObject @@ -27,7 +27,7 @@ public class CurQuestionario extends com.evolute.entity.evo.EvoDataObjectfromCurQuestionarioPergunta_questionario_id() + public java.util.ListfromCurQuestionarioPergunta_questionario_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurQuestionarioPerguntaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.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" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurQuestionarioPerguntaData.class , getPrimaryKey().getMap().get("id"), "questionario_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -265,12 +265,28 @@ public class CurQuestionario extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class CurQuestionarioPergunta extends com.evolute.entity.evo.EvoDataObject @@ -29,12 +29,12 @@ public class CurQuestionarioPergunta extends com.evolute.entity.evo.EvoDataObjec 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 ); + new com.evolute.entity.ForeignKey( CurQuestionarioPergunta.class, CurQuestionarioPergunta.QUESTIONARIO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurQuestionarioData.class, com.evolute.siprp.planosactuacao.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 String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.cur_questionario_pergunta"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -69,7 +69,7 @@ public class CurQuestionarioPergunta extends com.evolute.entity.evo.EvoDataObjec private Integer id; private Integer questionario_id; - private db.data.siprp_local.outer.CurQuestionarioData to_questionario_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurQuestionarioData to_questionario_id; private String descricao; protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; @@ -110,14 +110,14 @@ public class CurQuestionarioPergunta extends com.evolute.entity.evo.EvoDataObjec LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE ); } - public java.util.ListfromCurQuestionarioResposta_pergunta_id() + public java.util.ListfromCurQuestionarioResposta_pergunta_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurQuestionarioRespostaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.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" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurQuestionarioRespostaData.class , getPrimaryKey().getMap().get("id"), "pergunta_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -156,7 +156,7 @@ public class CurQuestionarioPergunta extends com.evolute.entity.evo.EvoDataObjec LAZY_LOADED_OBJECTS.put( QUESTIONARIO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.CurQuestionarioData toQuestionario_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurQuestionarioData toQuestionario_id() { try { @@ -169,7 +169,7 @@ public class CurQuestionarioPergunta extends com.evolute.entity.evo.EvoDataObjec return this.to_questionario_id; } - public void setToQuestionario_id( db.data.siprp_local.outer.CurQuestionarioData to_questionario_id ) + public void setToQuestionario_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurQuestionarioData to_questionario_id ) { try { @@ -267,7 +267,7 @@ public class CurQuestionarioPergunta extends com.evolute.entity.evo.EvoDataObjec setQuestionario_id( ( Integer ) value ); break; case CurQuestionarioPergunta.TO_QUESTIONARIO_ID_INDEX: - setToQuestionario_id( ( db.data.siprp_local.outer.CurQuestionarioData ) value ); + setToQuestionario_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurQuestionarioData ) value ); break; case CurQuestionarioPergunta.DESCRICAO_INDEX: setDescricao( ( String ) value ); @@ -287,7 +287,7 @@ public class CurQuestionarioPergunta extends com.evolute.entity.evo.EvoDataObjec this.questionario_id = ( Integer ) value; break; case CurQuestionarioPergunta.TO_QUESTIONARIO_ID_INDEX: - this.to_questionario_id = ( db.data.siprp_local.outer.CurQuestionarioData ) value; + this.to_questionario_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurQuestionarioData ) value; break; case CurQuestionarioPergunta.DESCRICAO_INDEX: this.descricao = ( String ) value; @@ -338,7 +338,7 @@ public class CurQuestionarioPergunta extends com.evolute.entity.evo.EvoDataObjec theClass = Integer.class; break; case CurQuestionarioPergunta.TO_QUESTIONARIO_ID_INDEX: - theClass = db.data.siprp_local.outer.CurQuestionarioData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurQuestionarioData.class; break; case CurQuestionarioPergunta.DESCRICAO_INDEX: theClass = String.class; @@ -366,12 +366,28 @@ public class CurQuestionarioPergunta extends com.evolute.entity.evo.EvoDataObjec @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, CurQuestionarioPergunta.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/CurQuestionarioResposta.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/CurQuestionarioResposta.java similarity index 82% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/CurQuestionarioResposta.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/CurQuestionarioResposta.java index 8ebddefd..b33206de 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/CurQuestionarioResposta.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/CurQuestionarioResposta.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class CurQuestionarioResposta extends com.evolute.entity.evo.EvoDataObject @@ -37,18 +37,18 @@ public class CurQuestionarioResposta extends com.evolute.entity.evo.EvoDataObjec 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 ); + new com.evolute.entity.ForeignKey( CurQuestionarioResposta.class, CurQuestionarioResposta.PERGUNTA_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurQuestionarioPerguntaData.class, com.evolute.siprp.planosactuacao.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 ); + new com.evolute.entity.ForeignKey( CurQuestionarioResposta.class, CurQuestionarioResposta.FORMANDO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurFormandosData.class, com.evolute.siprp.planosactuacao.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 ); + new com.evolute.entity.ForeignKey( CurQuestionarioResposta.class, CurQuestionarioResposta.CURSO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurCursosData.class, com.evolute.siprp.planosactuacao.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 String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.cur_questionario_resposta"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -97,11 +97,11 @@ public class CurQuestionarioResposta extends com.evolute.entity.evo.EvoDataObjec private Integer id; private Integer pergunta_id; - private db.data.siprp_local.outer.CurQuestionarioPerguntaData to_pergunta_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurQuestionarioPerguntaData to_pergunta_id; private Integer formando_id; - private db.data.siprp_local.outer.CurFormandosData to_formando_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurFormandosData to_formando_id; private Integer curso_id; - private db.data.siprp_local.outer.CurCursosData to_curso_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurCursosData to_curso_id; private Integer resposta; protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; @@ -171,7 +171,7 @@ public class CurQuestionarioResposta extends com.evolute.entity.evo.EvoDataObjec LAZY_LOADED_OBJECTS.put( PERGUNTA_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.CurQuestionarioPerguntaData toPergunta_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurQuestionarioPerguntaData toPergunta_id() { try { @@ -184,7 +184,7 @@ public class CurQuestionarioResposta extends com.evolute.entity.evo.EvoDataObjec return this.to_pergunta_id; } - public void setToPergunta_id( db.data.siprp_local.outer.CurQuestionarioPerguntaData to_pergunta_id ) + public void setToPergunta_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurQuestionarioPerguntaData to_pergunta_id ) { try { @@ -226,7 +226,7 @@ public class CurQuestionarioResposta extends com.evolute.entity.evo.EvoDataObjec LAZY_LOADED_OBJECTS.put( FORMANDO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.CurFormandosData toFormando_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurFormandosData toFormando_id() { try { @@ -239,7 +239,7 @@ public class CurQuestionarioResposta extends com.evolute.entity.evo.EvoDataObjec return this.to_formando_id; } - public void setToFormando_id( db.data.siprp_local.outer.CurFormandosData to_formando_id ) + public void setToFormando_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurFormandosData to_formando_id ) { try { @@ -281,7 +281,7 @@ public class CurQuestionarioResposta extends com.evolute.entity.evo.EvoDataObjec LAZY_LOADED_OBJECTS.put( CURSO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.CurCursosData toCurso_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurCursosData toCurso_id() { try { @@ -294,7 +294,7 @@ public class CurQuestionarioResposta extends com.evolute.entity.evo.EvoDataObjec return this.to_curso_id; } - public void setToCurso_id( db.data.siprp_local.outer.CurCursosData to_curso_id ) + public void setToCurso_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurCursosData to_curso_id ) { try { @@ -416,19 +416,19 @@ public class CurQuestionarioResposta extends com.evolute.entity.evo.EvoDataObjec setPergunta_id( ( Integer ) value ); break; case CurQuestionarioResposta.TO_PERGUNTA_ID_INDEX: - setToPergunta_id( ( db.data.siprp_local.outer.CurQuestionarioPerguntaData ) value ); + setToPergunta_id( ( com.evolute.siprp.planosactuacao.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 ); + setToFormando_id( ( com.evolute.siprp.planosactuacao.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 ); + setToCurso_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurCursosData ) value ); break; case CurQuestionarioResposta.RESPOSTA_INDEX: setResposta( ( Integer ) value ); @@ -448,19 +448,19 @@ public class CurQuestionarioResposta extends com.evolute.entity.evo.EvoDataObjec this.pergunta_id = ( Integer ) value; break; case CurQuestionarioResposta.TO_PERGUNTA_ID_INDEX: - this.to_pergunta_id = ( db.data.siprp_local.outer.CurQuestionarioPerguntaData ) value; + this.to_pergunta_id = ( com.evolute.siprp.planosactuacao.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; + this.to_formando_id = ( com.evolute.siprp.planosactuacao.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; + this.to_curso_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurCursosData ) value; break; case CurQuestionarioResposta.RESPOSTA_INDEX: this.resposta = ( Integer ) value; @@ -511,19 +511,19 @@ public class CurQuestionarioResposta extends com.evolute.entity.evo.EvoDataObjec theClass = Integer.class; break; case CurQuestionarioResposta.TO_PERGUNTA_ID_INDEX: - theClass = db.data.siprp_local.outer.CurQuestionarioPerguntaData.class; + theClass = com.evolute.siprp.planosactuacao.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; + theClass = com.evolute.siprp.planosactuacao.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; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurCursosData.class; break; case CurQuestionarioResposta.RESPOSTA_INDEX: theClass = Integer.class; @@ -551,12 +551,28 @@ public class CurQuestionarioResposta extends com.evolute.entity.evo.EvoDataObjec @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, CurQuestionarioResposta.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/CurTopicos.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/CurTopicos.java similarity index 80% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/CurTopicos.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/CurTopicos.java index c9f21a2b..62680504 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/CurTopicos.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/CurTopicos.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class CurTopicos extends com.evolute.entity.evo.EvoDataObject @@ -41,18 +41,18 @@ public class CurTopicos extends com.evolute.entity.evo.EvoDataObjectfromCurTopicos_parent_id() + public java.util.ListfromCurTopicos_parent_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurTopicosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurTopicosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.CurTopicosData.class , getPrimaryKey().getMap().get("id"), "parent_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurTopicosData.class , getPrimaryKey().getMap().get("id"), "parent_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -171,14 +171,14 @@ public class CurTopicos extends com.evolute.entity.evo.EvoDataObjectfromCurTopicosAulas_topico_id() + public java.util.ListfromCurTopicosAulas_topico_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.CurTopicosAulasData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurTopicosAulasData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.CurTopicosAulasData.class , getPrimaryKey().getMap().get("id"), "topico_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.CurTopicosAulasData.class , getPrimaryKey().getMap().get("id"), "topico_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -217,7 +217,7 @@ public class CurTopicos extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class CurTopicosAulas extends com.evolute.entity.evo.EvoDataObject @@ -31,15 +31,15 @@ public class CurTopicosAulas extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class EcdOficial extends com.evolute.entity.evo.EvoDataObject @@ -33,7 +33,7 @@ public class EcdOficial extends com.evolute.entity.evo.EvoDataObjectfromTrabalhadoresEcd_ecd_oficial_id() + public java.util.ListfromTrabalhadoresEcd_ecd_oficial_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdData.class , getPrimaryKey().getMap().get("id"), "ecd_oficial_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdData.class , getPrimaryKey().getMap().get("id"), "ecd_oficial_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -416,12 +416,28 @@ public class EcdOficial extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class EmailPlanoDeActuacao extends com.evolute.entity.evo.EvoDataObject @@ -29,12 +29,12 @@ public class EmailPlanoDeActuacao extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class EmpresaPrecoPeriodicidadeTipo extends com.evolute.entity.evo.EvoDataObject @@ -27,7 +27,7 @@ public class EmpresaPrecoPeriodicidadeTipo extends com.evolute.entity.evo.EvoDat public static final String TABLENAME = "empresa_preco_periodicidade_tipo"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.empresa_preco_periodicidade_tipo"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.empresa_preco_periodicidade_tipo"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -94,14 +94,14 @@ public class EmpresaPrecoPeriodicidadeTipo extends com.evolute.entity.evo.EvoDat LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE ); } - public java.util.ListfromEmpresaPrecoServico_empresa_preco_periodicidade_tipo_id() + public java.util.ListfromEmpresaPrecoServico_empresa_preco_periodicidade_tipo_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.EmpresaPrecoServicoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresaPrecoServicoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.EmpresaPrecoServicoData.class , getPrimaryKey().getMap().get("id"), "empresa_preco_periodicidade_tipo_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresaPrecoServicoData.class , getPrimaryKey().getMap().get("id"), "empresa_preco_periodicidade_tipo_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -265,12 +265,28 @@ public class EmpresaPrecoPeriodicidadeTipo extends com.evolute.entity.evo.EvoDat @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, EmpresaPrecoPeriodicidadeTipo.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/EmpresaPrecoServico.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/EmpresaPrecoServico.java similarity index 85% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/EmpresaPrecoServico.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/EmpresaPrecoServico.java index 7fc39103..b3ed01fc 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/EmpresaPrecoServico.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/EmpresaPrecoServico.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class EmpresaPrecoServico extends com.evolute.entity.evo.EvoDataObject @@ -43,18 +43,18 @@ public class EmpresaPrecoServico extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class EmpresaPrecoServicoTipo extends com.evolute.entity.evo.EvoDataObject @@ -27,7 +27,7 @@ public class EmpresaPrecoServicoTipo extends com.evolute.entity.evo.EvoDataObjec public static final String TABLENAME = "empresa_preco_servico_tipo"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.empresa_preco_servico_tipo"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.empresa_preco_servico_tipo"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -94,14 +94,14 @@ public class EmpresaPrecoServicoTipo extends com.evolute.entity.evo.EvoDataObjec LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE ); } - public java.util.ListfromEmpresaPrecoServico_empresa_preco_servico_tipo_id() + public java.util.ListfromEmpresaPrecoServico_empresa_preco_servico_tipo_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.EmpresaPrecoServicoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresaPrecoServicoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.EmpresaPrecoServicoData.class , getPrimaryKey().getMap().get("id"), "empresa_preco_servico_tipo_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresaPrecoServicoData.class , getPrimaryKey().getMap().get("id"), "empresa_preco_servico_tipo_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -265,12 +265,28 @@ public class EmpresaPrecoServicoTipo extends com.evolute.entity.evo.EvoDataObjec @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, EmpresaPrecoServicoTipo.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/Empresas.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/Empresas.java similarity index 89% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/Empresas.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/Empresas.java index eefab0ba..28375e14 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/Empresas.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/Empresas.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class Empresas extends com.evolute.entity.evo.EvoDataObject @@ -115,18 +115,18 @@ public class Empresas extends com.evolute.entity.evo.EvoDataObjectfromAvisos_empresa_id() + public java.util.ListfromAvisos_empresa_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.AvisosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AvisosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.AvisosData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AvisosData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -432,14 +432,14 @@ public class Empresas extends com.evolute.entity.evo.EvoDataObjectfromEmpresaPrecoServico_empresa_id() + public java.util.ListfromEmpresaPrecoServico_empresa_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.EmpresaPrecoServicoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresaPrecoServicoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.EmpresaPrecoServicoData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresaPrecoServicoData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -449,14 +449,14 @@ public class Empresas extends com.evolute.entity.evo.EvoDataObjectfromEstabelecimentos_empresa_id() + public java.util.ListfromEstabelecimentos_empresa_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.EstabelecimentosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.EstabelecimentosData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -466,14 +466,14 @@ public class Empresas extends com.evolute.entity.evo.EvoDataObjectfromFilFileEmpresa_empresa_id() + public java.util.ListfromFilFileEmpresa_empresa_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.FilFileEmpresaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.FilFileEmpresaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.FilFileEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.FilFileEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -483,14 +483,14 @@ public class Empresas extends com.evolute.entity.evo.EvoDataObjectfromHsArea_empresa_id() + public java.util.ListfromHsArea_empresa_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsAreaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsAreaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsAreaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsAreaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -500,14 +500,14 @@ public class Empresas extends com.evolute.entity.evo.EvoDataObjectfromHsEmailEmpresa_empresa_id() + public java.util.ListfromHsEmailEmpresa_empresa_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsEmailEmpresaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsEmailEmpresaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsEmailEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsEmailEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -517,14 +517,14 @@ public class Empresas extends com.evolute.entity.evo.EvoDataObjectfromHsLegislacaoEmpresa_empresa_id() + public java.util.ListfromHsLegislacaoEmpresa_empresa_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsLegislacaoEmpresaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsLegislacaoEmpresaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsLegislacaoEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsLegislacaoEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -534,14 +534,14 @@ public class Empresas extends com.evolute.entity.evo.EvoDataObjectfromHsNormalizacaoEmpresa_empresa_id() + public java.util.ListfromHsNormalizacaoEmpresa_empresa_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsNormalizacaoEmpresaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsNormalizacaoEmpresaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsNormalizacaoEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsNormalizacaoEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -551,14 +551,14 @@ public class Empresas extends com.evolute.entity.evo.EvoDataObjectfromHsRiscoEmpresa_empresa_id() + public java.util.ListfromHsRiscoEmpresa_empresa_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsRiscoEmpresaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRiscoEmpresaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsRiscoEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRiscoEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -568,14 +568,14 @@ public class Empresas extends com.evolute.entity.evo.EvoDataObjectfromLembretes_empresa_id() + public java.util.ListfromLembretes_empresa_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.LembretesData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.LembretesData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -585,14 +585,14 @@ public class Empresas extends com.evolute.entity.evo.EvoDataObjectfromMarcacoesEmpresa_empresa_id() + public java.util.ListfromMarcacoesEmpresa_empresa_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.MarcacoesEmpresaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesEmpresaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.MarcacoesEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesEmpresaData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -602,14 +602,14 @@ public class Empresas extends com.evolute.entity.evo.EvoDataObjectfromPrtElementosProtocolo_empresa_id() + public java.util.ListfromPrtElementosProtocolo_empresa_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.PrtElementosProtocoloData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtElementosProtocoloData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.PrtElementosProtocoloData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtElementosProtocoloData.class , getPrimaryKey().getMap().get("id"), "empresa_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -1402,7 +1402,7 @@ public class Empresas extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class Errors extends com.evolute.entity.evo.EvoDataObject @@ -33,7 +33,7 @@ public class Errors extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class Estabelecimentos extends com.evolute.entity.evo.EvoDataObject @@ -61,24 +61,24 @@ public class Estabelecimentos extends com.evolute.entity.evo.EvoDataObjectfromAptSegurancaAlimentar_estabelecimento_id() + public java.util.ListfromAptSegurancaAlimentar_estabelecimento_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.AptSegurancaAlimentarData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AptSegurancaAlimentarData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.AptSegurancaAlimentarData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AptSegurancaAlimentarData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -247,14 +247,14 @@ public class Estabelecimentos extends com.evolute.entity.evo.EvoDataObjectfromAvisos_estabelecimento_id() + public java.util.ListfromAvisos_estabelecimento_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.AvisosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AvisosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.AvisosData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AvisosData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -264,14 +264,14 @@ public class Estabelecimentos extends com.evolute.entity.evo.EvoDataObjectfromEmailPlanoDeActuacao_estabelecimento_id() + public java.util.ListfromEmailPlanoDeActuacao_estabelecimento_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.EmailPlanoDeActuacaoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmailPlanoDeActuacaoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.EmailPlanoDeActuacaoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmailPlanoDeActuacaoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -281,14 +281,14 @@ public class Estabelecimentos extends com.evolute.entity.evo.EvoDataObjectfromHistoricoEstabelecimento_estabelecimento_id() + public java.util.ListfromHistoricoEstabelecimento_estabelecimento_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HistoricoEstabelecimentoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HistoricoEstabelecimentoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HistoricoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HistoricoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -298,14 +298,14 @@ public class Estabelecimentos extends com.evolute.entity.evo.EvoDataObjectfromHsEmailEstabelecimento_estabelecimento_id() + public java.util.ListfromHsEmailEstabelecimento_estabelecimento_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsEmailEstabelecimentoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsEmailEstabelecimentoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsEmailEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsEmailEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -315,14 +315,14 @@ public class Estabelecimentos extends com.evolute.entity.evo.EvoDataObjectfromHsLegislacaoEstabelecimento_estabelecimento_id() + public java.util.ListfromHsLegislacaoEstabelecimento_estabelecimento_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -332,14 +332,14 @@ public class Estabelecimentos extends com.evolute.entity.evo.EvoDataObjectfromHsNormalizacaoEstabelecimento_estabelecimento_id() + public java.util.ListfromHsNormalizacaoEstabelecimento_estabelecimento_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsNormalizacaoEstabelecimentoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsNormalizacaoEstabelecimentoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsNormalizacaoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsNormalizacaoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -349,14 +349,14 @@ public class Estabelecimentos extends com.evolute.entity.evo.EvoDataObjectfromHsPostoEstabelecimento_estabelecimento_id() + public java.util.ListfromHsPostoEstabelecimento_estabelecimento_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsPostoEstabelecimentoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsPostoEstabelecimentoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsPostoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsPostoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -366,14 +366,14 @@ public class Estabelecimentos extends com.evolute.entity.evo.EvoDataObjectfromLembretes_estabelecimento_id() + public java.util.ListfromLembretes_estabelecimento_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.LembretesData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.LembretesData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -383,14 +383,14 @@ public class Estabelecimentos extends com.evolute.entity.evo.EvoDataObjectfromMarcacoesEstabelecimento_estabelecimento_id() + public java.util.ListfromMarcacoesEstabelecimento_estabelecimento_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.MarcacoesEstabelecimentoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesEstabelecimentoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.MarcacoesEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -400,14 +400,14 @@ public class Estabelecimentos extends com.evolute.entity.evo.EvoDataObjectfromTrabalhadores_estabelecimento_id() + public java.util.ListfromTrabalhadores_estabelecimento_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresData.class , getPrimaryKey().getMap().get("id"), "estabelecimento_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -533,7 +533,7 @@ public class Estabelecimentos extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class Etiquetas extends com.evolute.entity.evo.EvoDataObject @@ -51,7 +51,7 @@ public class Etiquetas extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class EvoPessoa extends com.evolute.entity.evo.EvoDataObject @@ -51,7 +51,7 @@ public class EvoPessoa extends com.evolute.entity.evo.EvoDataObjectfromPesPessoaDocumento_pessoa_id() + public java.util.ListfromPesPessoaDocumento_pessoa_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.PesPessoaDocumentoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PesPessoaDocumentoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.PesPessoaDocumentoData.class , getPrimaryKey().getMap().get("id"), "pessoa_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PesPessoaDocumentoData.class , getPrimaryKey().getMap().get("id"), "pessoa_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -189,14 +189,14 @@ public class EvoPessoa extends com.evolute.entity.evo.EvoDataObjectfromTrabalhadores_pessoa_id() + public java.util.ListfromTrabalhadores_pessoa_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresData.class , getPrimaryKey().getMap().get("id"), "pessoa_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresData.class , getPrimaryKey().getMap().get("id"), "pessoa_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -888,12 +888,28 @@ public class EvoPessoa extends com.evolute.entity.evo.EvoDataObject (can't touch this) +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; + + +public class EvoTaskSyncRequest extends com.evolute.entity.evo.EvoDataObject +{ + private static final java.util.HashMap FIELD_INDEXES = new java.util.HashMap(); + + static + { + FIELD_INDEXES.put( EvoTaskSyncRequest.ID, EvoTaskSyncRequest.ID_INDEX ); + FIELD_INDEXES.put( EvoTaskSyncRequest.ID_FULL, EvoTaskSyncRequest.ID_INDEX ); + FIELD_INDEXES.put( EvoTaskSyncRequest.DELETED_STAMP, EvoTaskSyncRequest.DELETED_STAMP_INDEX ); + FIELD_INDEXES.put( EvoTaskSyncRequest.DELETED_STAMP_FULL, EvoTaskSyncRequest.DELETED_STAMP_INDEX ); + FIELD_INDEXES.put( EvoTaskSyncRequest.TASK_KEY, EvoTaskSyncRequest.TASK_KEY_INDEX ); + FIELD_INDEXES.put( EvoTaskSyncRequest.TASK_KEY_FULL, EvoTaskSyncRequest.TASK_KEY_INDEX ); + FIELD_INDEXES.put( EvoTaskSyncRequest.REQUESTED_STAMP, EvoTaskSyncRequest.REQUESTED_STAMP_INDEX ); + FIELD_INDEXES.put( EvoTaskSyncRequest.REQUESTED_STAMP_FULL, EvoTaskSyncRequest.REQUESTED_STAMP_INDEX ); + FIELD_INDEXES.put( EvoTaskSyncRequest.EXPIRES_STAMP, EvoTaskSyncRequest.EXPIRES_STAMP_INDEX ); + FIELD_INDEXES.put( EvoTaskSyncRequest.EXPIRES_STAMP_FULL, EvoTaskSyncRequest.EXPIRES_STAMP_INDEX ); + FIELD_INDEXES.put( EvoTaskSyncRequest.COMPLETED_STAMP, EvoTaskSyncRequest.COMPLETED_STAMP_INDEX ); + FIELD_INDEXES.put( EvoTaskSyncRequest.COMPLETED_STAMP_FULL, EvoTaskSyncRequest.COMPLETED_STAMP_INDEX ); + com.evolute.entity.evo.EvoDataObject.register( EvoTaskSyncRequest.CLASS_IDENTIFIER, EvoTaskSyncRequest.STATE_ID, EvoTaskSyncRequest.TO_STATE_ID ); + FIELD_INDEXES.put( EvoTaskSyncRequest.STATE_ID, EvoTaskSyncRequest.STATE_ID_INDEX ); + FIELD_INDEXES.put( EvoTaskSyncRequest.STATE_ID_FULL, EvoTaskSyncRequest.STATE_ID_INDEX ); + FIELD_INDEXES.put( EvoTaskSyncRequest.TO_STATE_ID, EvoTaskSyncRequest.TO_STATE_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 ForeignKeystate_idToevo_task_sync_request_state = + new com.evolute.entity.ForeignKey( EvoTaskSyncRequest.class, EvoTaskSyncRequest.STATE_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoTaskSyncRequestStateData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoTaskSyncRequestStateData.ID ); + + public static final String TABLENAME = "evo_task_sync_request"; + + + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.evo_task_sync_request"; + + public static final int _INVALID__INDEX = -1; + public static final String ID = "id"; + public static final String ID_FULL = "evo_task_sync_request.id"; + public static final int ID_INDEX = 0; + public static final String DELETED_STAMP = "deleted_stamp"; + public static final String DELETED_STAMP_FULL = "evo_task_sync_request.deleted_stamp"; + public static final int DELETED_STAMP_INDEX = 1; + public static final String TASK_KEY = "task_key"; + public static final String TASK_KEY_FULL = "evo_task_sync_request.task_key"; + public static final int TASK_KEY_INDEX = 2; + public static final String REQUESTED_STAMP = "requested_stamp"; + public static final String REQUESTED_STAMP_FULL = "evo_task_sync_request.requested_stamp"; + public static final int REQUESTED_STAMP_INDEX = 3; + public static final String EXPIRES_STAMP = "expires_stamp"; + public static final String EXPIRES_STAMP_FULL = "evo_task_sync_request.expires_stamp"; + public static final int EXPIRES_STAMP_INDEX = 4; + public static final String COMPLETED_STAMP = "completed_stamp"; + public static final String COMPLETED_STAMP_FULL = "evo_task_sync_request.completed_stamp"; + public static final int COMPLETED_STAMP_INDEX = 5; + public static final String STATE_ID = "state_id"; + public static final String STATE_ID_FULL = "evo_task_sync_request.state_id"; + public static final int STATE_ID_INDEX = 6; + public static final String TO_STATE_ID = "to_state_id"; + public static final String TO_STATE_ID_FULL = "evo_task_sync_request.to_state_id"; + public static final int TO_STATE_ID_INDEX = 7; + + public static final String FIELD_NAMES[] = new String[]{ + DELETED_STAMP, TASK_KEY, REQUESTED_STAMP, EXPIRES_STAMP, COMPLETED_STAMP, + STATE_ID, TO_STATE_ID, }; + + public static final String FIELD_NAMES_FULL[] = new String[]{ + TABLENAME + "." + DELETED_STAMP, TABLENAME + "." + TASK_KEY, TABLENAME + "." + REQUESTED_STAMP, TABLENAME + "." + EXPIRES_STAMP, TABLENAME + "." + COMPLETED_STAMP, + TABLENAME + "." + STATE_ID, TABLENAME + "." + TO_STATE_ID, }; + + protected static final String DB_FIELD_NAMES[] = new String[]{ + ID, DELETED_STAMP, TASK_KEY, REQUESTED_STAMP, EXPIRES_STAMP, COMPLETED_STAMP, + STATE_ID, }; + + + protected static final String PK_FIELD_NAMES[] = new String[]{ + ID, }; + + + public static final String DEFAULT_LOAD_SET[] = new String[] { + ID, DELETED_STAMP, TASK_KEY, REQUESTED_STAMP, EXPIRES_STAMP, COMPLETED_STAMP, + STATE_ID, }; + + private Integer id; + private java.sql.Timestamp deleted_stamp; + private String task_key; + private java.sql.Timestamp requested_stamp; + private java.sql.Timestamp expires_stamp; + private java.sql.Timestamp completed_stamp; + private Integer state_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoTaskSyncRequestStateData to_state_id; + + protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; + + public EvoTaskSyncRequest() + { + 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 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 String getTask_key() + { + try + { + setLastAccess( System.currentTimeMillis() ); + prepare( TASK_KEY ); + } + catch( java.lang.Exception ex ) + { + throw new RuntimeException( ex ); + } + return this.task_key; + } + + public void setTask_key( String task_key ) + { + try + { + setLockedForRefresh( true ); + preProcess( TASK_KEY, task_key ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } + this.task_key = task_key; + LAZY_LOADED_OBJECTS.put( TASK_KEY, Boolean.TRUE ); + } + + public java.sql.Timestamp getRequested_stamp() + { + try + { + setLastAccess( System.currentTimeMillis() ); + prepare( REQUESTED_STAMP ); + } + catch( java.lang.Exception ex ) + { + throw new RuntimeException( ex ); + } + return this.requested_stamp; + } + + public void setRequested_stamp( java.sql.Timestamp requested_stamp ) + { + try + { + setLockedForRefresh( true ); + preProcess( REQUESTED_STAMP, requested_stamp ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } + this.requested_stamp = requested_stamp; + LAZY_LOADED_OBJECTS.put( REQUESTED_STAMP, Boolean.TRUE ); + } + + public java.sql.Timestamp getExpires_stamp() + { + try + { + setLastAccess( System.currentTimeMillis() ); + prepare( EXPIRES_STAMP ); + } + catch( java.lang.Exception ex ) + { + throw new RuntimeException( ex ); + } + return this.expires_stamp; + } + + public void setExpires_stamp( java.sql.Timestamp expires_stamp ) + { + try + { + setLockedForRefresh( true ); + preProcess( EXPIRES_STAMP, expires_stamp ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } + this.expires_stamp = expires_stamp; + LAZY_LOADED_OBJECTS.put( EXPIRES_STAMP, Boolean.TRUE ); + } + + public java.sql.Timestamp getCompleted_stamp() + { + try + { + setLastAccess( System.currentTimeMillis() ); + prepare( COMPLETED_STAMP ); + } + catch( java.lang.Exception ex ) + { + throw new RuntimeException( ex ); + } + return this.completed_stamp; + } + + public void setCompleted_stamp( java.sql.Timestamp completed_stamp ) + { + try + { + setLockedForRefresh( true ); + preProcess( COMPLETED_STAMP, completed_stamp ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } + this.completed_stamp = completed_stamp; + LAZY_LOADED_OBJECTS.put( COMPLETED_STAMP, Boolean.TRUE ); + } + + public Integer getState_id() + { + try + { + setLastAccess( System.currentTimeMillis() ); + prepare( STATE_ID ); + } + catch( java.lang.Exception ex ) + { + throw new RuntimeException( ex ); + } + return this.state_id; + } + + public void setState_id( Integer state_id ) + { + try + { + setLockedForRefresh( true ); + preProcess( STATE_ID, state_id ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } + this.state_id = state_id; + LAZY_LOADED_OBJECTS.put( STATE_ID, Boolean.TRUE ); + } + + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoTaskSyncRequestStateData toState_id() + { + try + { + prepare( TO_STATE_ID ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } + return this.to_state_id; + } + + public void setToState_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoTaskSyncRequestStateData to_state_id ) + { + try + { + preProcess( TO_STATE_ID, to_state_id ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } + this.to_state_id = to_state_id; + } + + public Object get( String fieldName ) + { + Object value = null; + Integer index = getFieldIndex( fieldName ); + switch( index ) + { + case EvoTaskSyncRequest.ID_INDEX: + value = getId(); + break; + case EvoTaskSyncRequest.DELETED_STAMP_INDEX: + value = getDeleted_stamp(); + break; + case EvoTaskSyncRequest.TASK_KEY_INDEX: + value = getTask_key(); + break; + case EvoTaskSyncRequest.REQUESTED_STAMP_INDEX: + value = getRequested_stamp(); + break; + case EvoTaskSyncRequest.EXPIRES_STAMP_INDEX: + value = getExpires_stamp(); + break; + case EvoTaskSyncRequest.COMPLETED_STAMP_INDEX: + value = getCompleted_stamp(); + break; + case EvoTaskSyncRequest.STATE_ID_INDEX: + value = getState_id(); + break; + case EvoTaskSyncRequest.TO_STATE_ID_INDEX: + value = toState_id(); + break; + } + return value; + } + + public Object rawGet( String fieldName ) + { + Object value = null; + Integer index = getFieldIndex( fieldName ); + switch( index ) + { + case EvoTaskSyncRequest.ID_INDEX: + value = this.id; + break; + case EvoTaskSyncRequest.DELETED_STAMP_INDEX: + value = this.deleted_stamp; + break; + case EvoTaskSyncRequest.TASK_KEY_INDEX: + value = this.task_key; + break; + case EvoTaskSyncRequest.REQUESTED_STAMP_INDEX: + value = this.requested_stamp; + break; + case EvoTaskSyncRequest.EXPIRES_STAMP_INDEX: + value = this.expires_stamp; + break; + case EvoTaskSyncRequest.COMPLETED_STAMP_INDEX: + value = this.completed_stamp; + break; + case EvoTaskSyncRequest.STATE_ID_INDEX: + value = this.state_id; + break; + case EvoTaskSyncRequest.TO_STATE_ID_INDEX: + value = this.to_state_id; + break; + } + return value; + } + + public void set( String fieldName, Object value ) + { + Integer index = getFieldIndex( fieldName ); + switch( index ) + { + case EvoTaskSyncRequest.ID_INDEX: + setId( ( Integer ) value ); + break; + case EvoTaskSyncRequest.DELETED_STAMP_INDEX: + setDeleted_stamp( ( java.sql.Timestamp ) value ); + break; + case EvoTaskSyncRequest.TASK_KEY_INDEX: + setTask_key( ( String ) value ); + break; + case EvoTaskSyncRequest.REQUESTED_STAMP_INDEX: + setRequested_stamp( ( java.sql.Timestamp ) value ); + break; + case EvoTaskSyncRequest.EXPIRES_STAMP_INDEX: + setExpires_stamp( ( java.sql.Timestamp ) value ); + break; + case EvoTaskSyncRequest.COMPLETED_STAMP_INDEX: + setCompleted_stamp( ( java.sql.Timestamp ) value ); + break; + case EvoTaskSyncRequest.STATE_ID_INDEX: + setState_id( ( Integer ) value ); + break; + case EvoTaskSyncRequest.TO_STATE_ID_INDEX: + setToState_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoTaskSyncRequestStateData ) value ); + break; + } + } + + public void rawSet( String fieldName, Object value ) + { + Integer index = getFieldIndex( fieldName ); + switch( index ) + { + case EvoTaskSyncRequest.ID_INDEX: + this.id = ( Integer ) value; + break; + case EvoTaskSyncRequest.DELETED_STAMP_INDEX: + this.deleted_stamp = ( java.sql.Timestamp ) value; + break; + case EvoTaskSyncRequest.TASK_KEY_INDEX: + this.task_key = ( String ) value; + break; + case EvoTaskSyncRequest.REQUESTED_STAMP_INDEX: + this.requested_stamp = ( java.sql.Timestamp ) value; + break; + case EvoTaskSyncRequest.EXPIRES_STAMP_INDEX: + this.expires_stamp = ( java.sql.Timestamp ) value; + break; + case EvoTaskSyncRequest.COMPLETED_STAMP_INDEX: + this.completed_stamp = ( java.sql.Timestamp ) value; + break; + case EvoTaskSyncRequest.STATE_ID_INDEX: + this.state_id = ( Integer ) value; + break; + case EvoTaskSyncRequest.TO_STATE_ID_INDEX: + this.to_state_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoTaskSyncRequestStateData ) 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 EvoTaskSyncRequest.ID_INDEX: + theClass = Integer.class; + break; + case EvoTaskSyncRequest.DELETED_STAMP_INDEX: + theClass = java.sql.Timestamp.class; + break; + case EvoTaskSyncRequest.TASK_KEY_INDEX: + theClass = String.class; + break; + case EvoTaskSyncRequest.REQUESTED_STAMP_INDEX: + theClass = java.sql.Timestamp.class; + break; + case EvoTaskSyncRequest.EXPIRES_STAMP_INDEX: + theClass = java.sql.Timestamp.class; + break; + case EvoTaskSyncRequest.COMPLETED_STAMP_INDEX: + theClass = java.sql.Timestamp.class; + break; + case EvoTaskSyncRequest.STATE_ID_INDEX: + theClass = Integer.class; + break; + case EvoTaskSyncRequest.TO_STATE_ID_INDEX: + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoTaskSyncRequestStateData.class; + break; + } + return theClass; + } + + public Integer getFieldIndex( String fieldName ) + { + Integer index = FIELD_INDEXES.get( fieldName ); + return index != null ? index : EvoTaskSyncRequest._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 ) + { + Object idObject = null; + if( primaryKey == null ) + { + primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, EvoTaskSyncRequest.PK_FIELD_NAMES ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } + } + } + + @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 ); + } + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/EvoTaskSyncRequestState.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/EvoTaskSyncRequestState.java new file mode 100644 index 00000000..83371ea7 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/EvoTaskSyncRequestState.java @@ -0,0 +1,464 @@ +/* +* EvoTaskSyncRequestState.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Use but DON'T TOUCH +* -> (can't touch this) +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; + + +public class EvoTaskSyncRequestState extends com.evolute.entity.evo.EvoDataObject +{ + private static final java.util.HashMap FIELD_INDEXES = new java.util.HashMap(); + + static + { + FIELD_INDEXES.put( EvoTaskSyncRequestState.ID, EvoTaskSyncRequestState.ID_INDEX ); + FIELD_INDEXES.put( EvoTaskSyncRequestState.ID_FULL, EvoTaskSyncRequestState.ID_INDEX ); + FIELD_INDEXES.put( EvoTaskSyncRequestState.DELETED_STAMP, EvoTaskSyncRequestState.DELETED_STAMP_INDEX ); + FIELD_INDEXES.put( EvoTaskSyncRequestState.DELETED_STAMP_FULL, EvoTaskSyncRequestState.DELETED_STAMP_INDEX ); + FIELD_INDEXES.put( EvoTaskSyncRequestState.ORDEM, EvoTaskSyncRequestState.ORDEM_INDEX ); + FIELD_INDEXES.put( EvoTaskSyncRequestState.ORDEM_FULL, EvoTaskSyncRequestState.ORDEM_INDEX ); + FIELD_INDEXES.put( EvoTaskSyncRequestState.DESCRIPTION, EvoTaskSyncRequestState.DESCRIPTION_INDEX ); + FIELD_INDEXES.put( EvoTaskSyncRequestState.DESCRIPTION_FULL, EvoTaskSyncRequestState.DESCRIPTION_INDEX ); + FIELD_INDEXES.put( EvoTaskSyncRequestState.CODE, EvoTaskSyncRequestState.CODE_INDEX ); + FIELD_INDEXES.put( EvoTaskSyncRequestState.CODE_FULL, EvoTaskSyncRequestState.CODE_INDEX ); + } + + private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >(); + + + public static final String TABLENAME = "evo_task_sync_request_state"; + + + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.evo_task_sync_request_state"; + + public static final int _INVALID__INDEX = -1; + public static final String ID = "id"; + public static final String ID_FULL = "evo_task_sync_request_state.id"; + public static final int ID_INDEX = 0; + public static final String DELETED_STAMP = "deleted_stamp"; + public static final String DELETED_STAMP_FULL = "evo_task_sync_request_state.deleted_stamp"; + public static final int DELETED_STAMP_INDEX = 1; + public static final String ORDEM = "ordem"; + public static final String ORDEM_FULL = "evo_task_sync_request_state.ordem"; + public static final int ORDEM_INDEX = 2; + public static final String DESCRIPTION = "description"; + public static final String DESCRIPTION_FULL = "evo_task_sync_request_state.description"; + public static final int DESCRIPTION_INDEX = 3; + public static final String CODE = "code"; + public static final String CODE_FULL = "evo_task_sync_request_state.code"; + public static final int CODE_INDEX = 4; + + public static final String FIELD_NAMES[] = new String[]{ + DELETED_STAMP, ORDEM, DESCRIPTION, CODE, }; + + public static final String FIELD_NAMES_FULL[] = new String[]{ + TABLENAME + "." + DELETED_STAMP, TABLENAME + "." + ORDEM, TABLENAME + "." + DESCRIPTION, TABLENAME + "." + CODE, }; + + protected static final String DB_FIELD_NAMES[] = new String[]{ + ID, DELETED_STAMP, ORDEM, DESCRIPTION, CODE, }; + + + protected static final String PK_FIELD_NAMES[] = new String[]{ + ID, }; + + + public static final String DEFAULT_LOAD_SET[] = new String[] { + ID, DELETED_STAMP, ORDEM, DESCRIPTION, CODE, }; + + private Integer id; + private java.sql.Timestamp deleted_stamp; + private Integer ordem; + private String description; + private String code; + + protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; + + public EvoTaskSyncRequestState() + { + 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.ListfromEvoTaskSyncRequest_state_id() + { + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoTaskSyncRequestData >(); + if ( getPrimaryKey() != null ) + { + try + { + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoTaskSyncRequestData.class , getPrimaryKey().getMap().get("id"), "state_id" ); + } + 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 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 String getDescription() + { + try + { + setLastAccess( System.currentTimeMillis() ); + prepare( DESCRIPTION ); + } + catch( java.lang.Exception ex ) + { + throw new RuntimeException( ex ); + } + return this.description; + } + + public void setDescription( String description ) + { + try + { + setLockedForRefresh( true ); + preProcess( DESCRIPTION, description ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } + this.description = description; + LAZY_LOADED_OBJECTS.put( DESCRIPTION, Boolean.TRUE ); + } + + public String getCode() + { + try + { + setLastAccess( System.currentTimeMillis() ); + prepare( CODE ); + } + catch( java.lang.Exception ex ) + { + throw new RuntimeException( ex ); + } + return this.code; + } + + public void setCode( String code ) + { + try + { + setLockedForRefresh( true ); + preProcess( CODE, code ); + } + catch( com.evolute.entity.evo.EvoDataException edex ) + { + throw new RuntimeException( edex ); + } + this.code = code; + LAZY_LOADED_OBJECTS.put( CODE, Boolean.TRUE ); + } + + public Object get( String fieldName ) + { + Object value = null; + Integer index = getFieldIndex( fieldName ); + switch( index ) + { + case EvoTaskSyncRequestState.ID_INDEX: + value = getId(); + break; + case EvoTaskSyncRequestState.DELETED_STAMP_INDEX: + value = getDeleted_stamp(); + break; + case EvoTaskSyncRequestState.ORDEM_INDEX: + value = getOrdem(); + break; + case EvoTaskSyncRequestState.DESCRIPTION_INDEX: + value = getDescription(); + break; + case EvoTaskSyncRequestState.CODE_INDEX: + value = getCode(); + break; + } + return value; + } + + public Object rawGet( String fieldName ) + { + Object value = null; + Integer index = getFieldIndex( fieldName ); + switch( index ) + { + case EvoTaskSyncRequestState.ID_INDEX: + value = this.id; + break; + case EvoTaskSyncRequestState.DELETED_STAMP_INDEX: + value = this.deleted_stamp; + break; + case EvoTaskSyncRequestState.ORDEM_INDEX: + value = this.ordem; + break; + case EvoTaskSyncRequestState.DESCRIPTION_INDEX: + value = this.description; + break; + case EvoTaskSyncRequestState.CODE_INDEX: + value = this.code; + break; + } + return value; + } + + public void set( String fieldName, Object value ) + { + Integer index = getFieldIndex( fieldName ); + switch( index ) + { + case EvoTaskSyncRequestState.ID_INDEX: + setId( ( Integer ) value ); + break; + case EvoTaskSyncRequestState.DELETED_STAMP_INDEX: + setDeleted_stamp( ( java.sql.Timestamp ) value ); + break; + case EvoTaskSyncRequestState.ORDEM_INDEX: + setOrdem( ( Integer ) value ); + break; + case EvoTaskSyncRequestState.DESCRIPTION_INDEX: + setDescription( ( String ) value ); + break; + case EvoTaskSyncRequestState.CODE_INDEX: + setCode( ( String ) value ); + break; + } + } + + public void rawSet( String fieldName, Object value ) + { + Integer index = getFieldIndex( fieldName ); + switch( index ) + { + case EvoTaskSyncRequestState.ID_INDEX: + this.id = ( Integer ) value; + break; + case EvoTaskSyncRequestState.DELETED_STAMP_INDEX: + this.deleted_stamp = ( java.sql.Timestamp ) value; + break; + case EvoTaskSyncRequestState.ORDEM_INDEX: + this.ordem = ( Integer ) value; + break; + case EvoTaskSyncRequestState.DESCRIPTION_INDEX: + this.description = ( String ) value; + break; + case EvoTaskSyncRequestState.CODE_INDEX: + this.code = ( 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 EvoTaskSyncRequestState.ID_INDEX: + theClass = Integer.class; + break; + case EvoTaskSyncRequestState.DELETED_STAMP_INDEX: + theClass = java.sql.Timestamp.class; + break; + case EvoTaskSyncRequestState.ORDEM_INDEX: + theClass = Integer.class; + break; + case EvoTaskSyncRequestState.DESCRIPTION_INDEX: + theClass = String.class; + break; + case EvoTaskSyncRequestState.CODE_INDEX: + theClass = String.class; + break; + } + return theClass; + } + + public Integer getFieldIndex( String fieldName ) + { + Integer index = FIELD_INDEXES.get( fieldName ); + return index != null ? index : EvoTaskSyncRequestState._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 ) + { + Object idObject = null; + if( primaryKey == null ) + { + primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, EvoTaskSyncRequestState.PK_FIELD_NAMES ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } + } + } + + @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 ); + } + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/EvoUpdate.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/EvoUpdate.java similarity index 92% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/EvoUpdate.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/EvoUpdate.java index e3bab506..aeef9f3c 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/EvoUpdate.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/EvoUpdate.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class EvoUpdate extends com.evolute.entity.evo.EvoDataObject @@ -29,7 +29,7 @@ public class EvoUpdate extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class EvoUsrPermission extends com.evolute.entity.evo.EvoDataObject @@ -33,7 +33,7 @@ public class EvoUsrPermission extends com.evolute.entity.evo.EvoDataObjectfromEvoUsrRolesPermissions_permission_id() + public java.util.ListfromEvoUsrRolesPermissions_permission_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.EvoUsrRolesPermissionsData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrRolesPermissionsData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.EvoUsrRolesPermissionsData.class , getPrimaryKey().getMap().get("id"), "permission_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrRolesPermissionsData.class , getPrimaryKey().getMap().get("id"), "permission_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -416,12 +416,28 @@ public class EvoUsrPermission extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class EvoUsrPreferences extends com.evolute.entity.evo.EvoDataObject @@ -33,12 +33,12 @@ public class EvoUsrPreferences extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class EvoUsrRole extends com.evolute.entity.evo.EvoDataObject @@ -29,7 +29,7 @@ public class EvoUsrRole extends com.evolute.entity.evo.EvoDataObjectfromEvoUsrRolesPermissions_role_id() + public java.util.ListfromEvoUsrRolesPermissions_role_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.EvoUsrRolesPermissionsData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrRolesPermissionsData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.EvoUsrRolesPermissionsData.class , getPrimaryKey().getMap().get("id"), "role_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrRolesPermissionsData.class , getPrimaryKey().getMap().get("id"), "role_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -117,14 +117,14 @@ public class EvoUsrRole extends com.evolute.entity.evo.EvoDataObjectfromEvoUsrUsersRoles_role_id() + public java.util.ListfromEvoUsrUsersRoles_role_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.EvoUsrUsersRolesData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrUsersRolesData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.EvoUsrUsersRolesData.class , getPrimaryKey().getMap().get("id"), "role_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrUsersRolesData.class , getPrimaryKey().getMap().get("id"), "role_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -332,12 +332,28 @@ public class EvoUsrRole extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class EvoUsrRolesPermissions extends com.evolute.entity.evo.EvoDataObject @@ -33,15 +33,15 @@ public class EvoUsrRolesPermissions extends com.evolute.entity.evo.EvoDataObject public static final com.evolute.entity.ForeignKey ForeignKeyrole_idToevo_usr_role = - new com.evolute.entity.ForeignKey( EvoUsrRolesPermissions.class, EvoUsrRolesPermissions.ROLE_ID, db.data.siprp_local.outer.EvoUsrRoleData.class, db.data.siprp_local.outer.EvoUsrRoleData.ID ); + new com.evolute.entity.ForeignKey( EvoUsrRolesPermissions.class, EvoUsrRolesPermissions.ROLE_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrRoleData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrRoleData.ID ); public static final com.evolute.entity.ForeignKey ForeignKeypermission_idToevo_usr_permission = - new com.evolute.entity.ForeignKey( EvoUsrRolesPermissions.class, EvoUsrRolesPermissions.PERMISSION_ID, db.data.siprp_local.outer.EvoUsrPermissionData.class, db.data.siprp_local.outer.EvoUsrPermissionData.ID ); + new com.evolute.entity.ForeignKey( EvoUsrRolesPermissions.class, EvoUsrRolesPermissions.PERMISSION_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrPermissionData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrPermissionData.ID ); public static final String TABLENAME = "evo_usr_roles_permissions"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.evo_usr_roles_permissions"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.evo_usr_roles_permissions"; public static final int _INVALID__INDEX = -1; public static final String ROLE_ID = "role_id"; @@ -81,9 +81,9 @@ public class EvoUsrRolesPermissions extends com.evolute.entity.evo.EvoDataObject ROLE_ID, PERMISSION_ID, ID, REMOVE, }; private Integer role_id; - private db.data.siprp_local.outer.EvoUsrRoleData to_role_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrRoleData to_role_id; private Integer permission_id; - private db.data.siprp_local.outer.EvoUsrPermissionData to_permission_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrPermissionData to_permission_id; private Integer id; private Boolean remove; @@ -125,7 +125,7 @@ public class EvoUsrRolesPermissions extends com.evolute.entity.evo.EvoDataObject LAZY_LOADED_OBJECTS.put( ROLE_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.EvoUsrRoleData toRole_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrRoleData toRole_id() { try { @@ -138,7 +138,7 @@ public class EvoUsrRolesPermissions extends com.evolute.entity.evo.EvoDataObject return this.to_role_id; } - public void setToRole_id( db.data.siprp_local.outer.EvoUsrRoleData to_role_id ) + public void setToRole_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrRoleData to_role_id ) { try { @@ -180,7 +180,7 @@ public class EvoUsrRolesPermissions extends com.evolute.entity.evo.EvoDataObject LAZY_LOADED_OBJECTS.put( PERMISSION_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.EvoUsrPermissionData toPermission_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrPermissionData toPermission_id() { try { @@ -193,7 +193,7 @@ public class EvoUsrRolesPermissions extends com.evolute.entity.evo.EvoDataObject return this.to_permission_id; } - public void setToPermission_id( db.data.siprp_local.outer.EvoUsrPermissionData to_permission_id ) + public void setToPermission_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrPermissionData to_permission_id ) { try { @@ -329,13 +329,13 @@ public class EvoUsrRolesPermissions extends com.evolute.entity.evo.EvoDataObject setRole_id( ( Integer ) value ); break; case EvoUsrRolesPermissions.TO_ROLE_ID_INDEX: - setToRole_id( ( db.data.siprp_local.outer.EvoUsrRoleData ) value ); + setToRole_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrRoleData ) value ); break; case EvoUsrRolesPermissions.PERMISSION_ID_INDEX: setPermission_id( ( Integer ) value ); break; case EvoUsrRolesPermissions.TO_PERMISSION_ID_INDEX: - setToPermission_id( ( db.data.siprp_local.outer.EvoUsrPermissionData ) value ); + setToPermission_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrPermissionData ) value ); break; case EvoUsrRolesPermissions.ID_INDEX: setId( ( Integer ) value ); @@ -355,13 +355,13 @@ public class EvoUsrRolesPermissions extends com.evolute.entity.evo.EvoDataObject this.role_id = ( Integer ) value; break; case EvoUsrRolesPermissions.TO_ROLE_ID_INDEX: - this.to_role_id = ( db.data.siprp_local.outer.EvoUsrRoleData ) value; + this.to_role_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrRoleData ) value; break; case EvoUsrRolesPermissions.PERMISSION_ID_INDEX: this.permission_id = ( Integer ) value; break; case EvoUsrRolesPermissions.TO_PERMISSION_ID_INDEX: - this.to_permission_id = ( db.data.siprp_local.outer.EvoUsrPermissionData ) value; + this.to_permission_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrPermissionData ) value; break; case EvoUsrRolesPermissions.ID_INDEX: this.id = ( Integer ) value; @@ -412,13 +412,13 @@ public class EvoUsrRolesPermissions extends com.evolute.entity.evo.EvoDataObject theClass = Integer.class; break; case EvoUsrRolesPermissions.TO_ROLE_ID_INDEX: - theClass = db.data.siprp_local.outer.EvoUsrRoleData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrRoleData.class; break; case EvoUsrRolesPermissions.PERMISSION_ID_INDEX: theClass = Integer.class; break; case EvoUsrRolesPermissions.TO_PERMISSION_ID_INDEX: - theClass = db.data.siprp_local.outer.EvoUsrPermissionData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrPermissionData.class; break; case EvoUsrRolesPermissions.ID_INDEX: theClass = Integer.class; @@ -449,12 +449,28 @@ public class EvoUsrRolesPermissions extends com.evolute.entity.evo.EvoDataObject @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, EvoUsrRolesPermissions.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/EvoUsrUser.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/EvoUsrUser.java similarity index 90% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/EvoUsrUser.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/EvoUsrUser.java index 141cd7f9..4cc231b8 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/EvoUsrUser.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/EvoUsrUser.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class EvoUsrUser extends com.evolute.entity.evo.EvoDataObject @@ -49,7 +49,7 @@ public class EvoUsrUser extends com.evolute.entity.evo.EvoDataObjectfromEvoUsrPreferences_user_id() + public java.util.ListfromEvoUsrPreferences_user_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.EvoUsrPreferencesData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrPreferencesData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.EvoUsrPreferencesData.class , getPrimaryKey().getMap().get("id"), "user_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrPreferencesData.class , getPrimaryKey().getMap().get("id"), "user_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -183,14 +183,14 @@ public class EvoUsrUser extends com.evolute.entity.evo.EvoDataObjectfromEvoUsrUsersRoles_user_id() + public java.util.ListfromEvoUsrUsersRoles_user_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.EvoUsrUsersRolesData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrUsersRolesData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.EvoUsrUsersRolesData.class , getPrimaryKey().getMap().get("id"), "user_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EvoUsrUsersRolesData.class , getPrimaryKey().getMap().get("id"), "user_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -200,14 +200,14 @@ public class EvoUsrUser extends com.evolute.entity.evo.EvoDataObjectfromFilFile_user_id() + public java.util.ListfromFilFile_user_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.FilFileData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.FilFileData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.FilFileData.class , getPrimaryKey().getMap().get("id"), "user_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.FilFileData.class , getPrimaryKey().getMap().get("id"), "user_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -855,12 +855,28 @@ public class EvoUsrUser extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class EvoUsrUsersRoles extends com.evolute.entity.evo.EvoDataObject @@ -31,15 +31,15 @@ public class EvoUsrUsersRoles extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class Exames extends com.evolute.entity.evo.EvoDataObject @@ -61,15 +61,15 @@ public class Exames extends com.evolute.entity.evo.EvoDataObjectfromLembretes_exame_id() + public java.util.ListfromLembretes_exame_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.LembretesData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.LembretesData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "exame_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "exame_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -238,14 +238,14 @@ public class Exames extends com.evolute.entity.evo.EvoDataObjectfromTrabalhadoresFichasAptidao_exame_id() + public java.util.ListfromTrabalhadoresFichasAptidao_exame_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresFichasAptidaoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresFichasAptidaoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresFichasAptidaoData.class , getPrimaryKey().getMap().get("id"), "exame_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresFichasAptidaoData.class , getPrimaryKey().getMap().get("id"), "exame_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -632,7 +632,7 @@ public class Exames extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class ExamesPerfis extends com.evolute.entity.evo.EvoDataObject @@ -31,12 +31,12 @@ public class ExamesPerfis extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class ExamesPortaria extends com.evolute.entity.evo.EvoDataObject @@ -29,7 +29,7 @@ public class ExamesPortaria extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class FilCategorias extends com.evolute.entity.evo.EvoDataObject @@ -33,7 +33,7 @@ public class FilCategorias extends com.evolute.entity.evo.EvoDataObjectfromFilFileEmpresa_categoria_id() + public java.util.ListfromFilFileEmpresa_categoria_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.FilFileEmpresaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.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" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.FilFileEmpresaData.class , getPrimaryKey().getMap().get("id"), "categoria_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -416,12 +416,28 @@ public class FilCategorias extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class FilFile extends com.evolute.entity.evo.EvoDataObject @@ -39,12 +39,12 @@ public class FilFile extends com.evolute.entity.evo.EvoDataObjectfromFilFileAppointment_file_id() + public java.util.ListfromFilFileAppointment_file_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.FilFileAppointmentData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.FilFileAppointmentData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.FilFileAppointmentData.class , getPrimaryKey().getMap().get("id"), "file_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.FilFileAppointmentData.class , getPrimaryKey().getMap().get("id"), "file_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -159,14 +159,14 @@ public class FilFile extends com.evolute.entity.evo.EvoDataObjectfromFilFileEmpresa_file_id() + public java.util.ListfromFilFileEmpresa_file_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.FilFileEmpresaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.FilFileEmpresaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.FilFileEmpresaData.class , getPrimaryKey().getMap().get("id"), "file_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.FilFileEmpresaData.class , getPrimaryKey().getMap().get("id"), "file_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -176,14 +176,14 @@ public class FilFile extends com.evolute.entity.evo.EvoDataObjectfromFilFileMarcacoesEstabelecimento_file_id() + public java.util.ListfromFilFileMarcacoesEstabelecimento_file_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.FilFileMarcacoesEstabelecimentoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.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" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.FilFileMarcacoesEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "file_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -338,7 +338,7 @@ public class FilFile extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class FilFileAppointment extends com.evolute.entity.evo.EvoDataObject @@ -31,15 +31,15 @@ public class FilFileAppointment extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class FilFileEmpresa extends com.evolute.entity.evo.EvoDataObject @@ -35,18 +35,18 @@ public class FilFileEmpresa extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class FilFileMarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObject @@ -31,15 +31,15 @@ public class FilFileMarcacoesEstabelecimento extends com.evolute.entity.evo.EvoD 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 ); + new com.evolute.entity.ForeignKey( FilFileMarcacoesEstabelecimento.class, FilFileMarcacoesEstabelecimento.FILE_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.FilFileData.class, com.evolute.siprp.planosactuacao.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 ); + new com.evolute.entity.ForeignKey( FilFileMarcacoesEstabelecimento.class, FilFileMarcacoesEstabelecimento.MARCACAO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesEstabelecimentoData.class, com.evolute.siprp.planosactuacao.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 String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.fil_file_marcacoes_estabelecimento"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -77,9 +77,9 @@ public class FilFileMarcacoesEstabelecimento extends com.evolute.entity.evo.EvoD private Integer id; private Integer file_id; - private db.data.siprp_local.outer.FilFileData to_file_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.FilFileData to_file_id; private Integer marcacao_id; - private db.data.siprp_local.outer.MarcacoesEstabelecimentoData to_marcacao_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesEstabelecimentoData to_marcacao_id; protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; @@ -148,7 +148,7 @@ public class FilFileMarcacoesEstabelecimento extends com.evolute.entity.evo.EvoD LAZY_LOADED_OBJECTS.put( FILE_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.FilFileData toFile_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.FilFileData toFile_id() { try { @@ -161,7 +161,7 @@ public class FilFileMarcacoesEstabelecimento extends com.evolute.entity.evo.EvoD return this.to_file_id; } - public void setToFile_id( db.data.siprp_local.outer.FilFileData to_file_id ) + public void setToFile_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.FilFileData to_file_id ) { try { @@ -203,7 +203,7 @@ public class FilFileMarcacoesEstabelecimento extends com.evolute.entity.evo.EvoD LAZY_LOADED_OBJECTS.put( MARCACAO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.MarcacoesEstabelecimentoData toMarcacao_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesEstabelecimentoData toMarcacao_id() { try { @@ -216,7 +216,7 @@ public class FilFileMarcacoesEstabelecimento extends com.evolute.entity.evo.EvoD return this.to_marcacao_id; } - public void setToMarcacao_id( db.data.siprp_local.outer.MarcacoesEstabelecimentoData to_marcacao_id ) + public void setToMarcacao_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesEstabelecimentoData to_marcacao_id ) { try { @@ -291,13 +291,13 @@ public class FilFileMarcacoesEstabelecimento extends com.evolute.entity.evo.EvoD setFile_id( ( Integer ) value ); break; case FilFileMarcacoesEstabelecimento.TO_FILE_ID_INDEX: - setToFile_id( ( db.data.siprp_local.outer.FilFileData ) value ); + setToFile_id( ( com.evolute.siprp.planosactuacao.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 ); + setToMarcacao_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesEstabelecimentoData ) value ); break; } } @@ -314,13 +314,13 @@ public class FilFileMarcacoesEstabelecimento extends com.evolute.entity.evo.EvoD this.file_id = ( Integer ) value; break; case FilFileMarcacoesEstabelecimento.TO_FILE_ID_INDEX: - this.to_file_id = ( db.data.siprp_local.outer.FilFileData ) value; + this.to_file_id = ( com.evolute.siprp.planosactuacao.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; + this.to_marcacao_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesEstabelecimentoData ) value; break; } } @@ -368,13 +368,13 @@ public class FilFileMarcacoesEstabelecimento extends com.evolute.entity.evo.EvoD theClass = Integer.class; break; case FilFileMarcacoesEstabelecimento.TO_FILE_ID_INDEX: - theClass = db.data.siprp_local.outer.FilFileData.class; + theClass = com.evolute.siprp.planosactuacao.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; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesEstabelecimentoData.class; break; } return theClass; @@ -399,12 +399,28 @@ public class FilFileMarcacoesEstabelecimento extends com.evolute.entity.evo.EvoD @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, FilFileMarcacoesEstabelecimento.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HistoricoEstabelecimento.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HistoricoEstabelecimento.java similarity index 87% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HistoricoEstabelecimento.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HistoricoEstabelecimento.java index f4e8a424..20c63412 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HistoricoEstabelecimento.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HistoricoEstabelecimento.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HistoricoEstabelecimento extends com.evolute.entity.evo.EvoDataObject @@ -31,12 +31,12 @@ public class HistoricoEstabelecimento extends com.evolute.entity.evo.EvoDataObje public static final com.evolute.entity.ForeignKey ForeignKeyestabelecimento_idToestabelecimentos = - new com.evolute.entity.ForeignKey( HistoricoEstabelecimento.class, HistoricoEstabelecimento.ESTABELECIMENTO_ID, db.data.siprp_local.outer.EstabelecimentosData.class, db.data.siprp_local.outer.EstabelecimentosData.ID ); + new com.evolute.entity.ForeignKey( HistoricoEstabelecimento.class, HistoricoEstabelecimento.ESTABELECIMENTO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.ID ); public static final String TABLENAME = "historico_estabelecimento"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.historico_estabelecimento"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.historico_estabelecimento"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -74,7 +74,7 @@ public class HistoricoEstabelecimento extends com.evolute.entity.evo.EvoDataObje private Integer id; private Integer estabelecimento_id; - private db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id; private java.util.Date data; private String texto; @@ -145,7 +145,7 @@ public class HistoricoEstabelecimento extends com.evolute.entity.evo.EvoDataObje LAZY_LOADED_OBJECTS.put( ESTABELECIMENTO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.EstabelecimentosData toEstabelecimento_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData toEstabelecimento_id() { try { @@ -158,7 +158,7 @@ public class HistoricoEstabelecimento extends com.evolute.entity.evo.EvoDataObje return this.to_estabelecimento_id; } - public void setToEstabelecimento_id( db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id ) + public void setToEstabelecimento_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id ) { try { @@ -291,7 +291,7 @@ public class HistoricoEstabelecimento extends com.evolute.entity.evo.EvoDataObje setEstabelecimento_id( ( Integer ) value ); break; case HistoricoEstabelecimento.TO_ESTABELECIMENTO_ID_INDEX: - setToEstabelecimento_id( ( db.data.siprp_local.outer.EstabelecimentosData ) value ); + setToEstabelecimento_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData ) value ); break; case HistoricoEstabelecimento.DATA_INDEX: setData( ( java.util.Date ) value ); @@ -314,7 +314,7 @@ public class HistoricoEstabelecimento extends com.evolute.entity.evo.EvoDataObje this.estabelecimento_id = ( Integer ) value; break; case HistoricoEstabelecimento.TO_ESTABELECIMENTO_ID_INDEX: - this.to_estabelecimento_id = ( db.data.siprp_local.outer.EstabelecimentosData ) value; + this.to_estabelecimento_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData ) value; break; case HistoricoEstabelecimento.DATA_INDEX: this.data = ( java.util.Date ) value; @@ -368,7 +368,7 @@ public class HistoricoEstabelecimento extends com.evolute.entity.evo.EvoDataObje theClass = Integer.class; break; case HistoricoEstabelecimento.TO_ESTABELECIMENTO_ID_INDEX: - theClass = db.data.siprp_local.outer.EstabelecimentosData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.class; break; case HistoricoEstabelecimento.DATA_INDEX: theClass = java.util.Date.class; @@ -399,12 +399,28 @@ public class HistoricoEstabelecimento extends com.evolute.entity.evo.EvoDataObje @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, HistoricoEstabelecimento.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsArea.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsArea.java similarity index 85% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsArea.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsArea.java index 618d8e0a..b96e54ac 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsArea.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsArea.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsArea extends com.evolute.entity.evo.EvoDataObject @@ -33,12 +33,12 @@ public class HsArea extends com.evolute.entity.evo.EvoDataObjectfromHsPosto_area_id() + public java.util.ListfromHsPosto_area_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsPostoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsPostoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsPostoData.class , getPrimaryKey().getMap().get("id"), "area_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsPostoData.class , getPrimaryKey().getMap().get("id"), "area_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -168,7 +168,7 @@ public class HsArea extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsEmail extends com.evolute.entity.evo.EvoDataObject @@ -27,7 +27,7 @@ public class HsEmail extends com.evolute.entity.evo.EvoDataObjectfromHsEmailEmpresa_email_id() + public java.util.ListfromHsEmailEmpresa_email_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsEmailEmpresaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsEmailEmpresaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsEmailEmpresaData.class , getPrimaryKey().getMap().get("id"), "email_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsEmailEmpresaData.class , getPrimaryKey().getMap().get("id"), "email_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -111,14 +111,14 @@ public class HsEmail extends com.evolute.entity.evo.EvoDataObjectfromHsEmailEstabelecimento_email_id() + public java.util.ListfromHsEmailEstabelecimento_email_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsEmailEstabelecimentoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsEmailEstabelecimentoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsEmailEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "email_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsEmailEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "email_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -282,12 +282,28 @@ public class HsEmail extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsEmailEmpresa extends com.evolute.entity.evo.EvoDataObject @@ -29,15 +29,15 @@ public class HsEmailEmpresa extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsEmailEstabelecimento extends com.evolute.entity.evo.EvoDataObject @@ -29,15 +29,15 @@ public class HsEmailEstabelecimento extends com.evolute.entity.evo.EvoDataObject public static final com.evolute.entity.ForeignKey ForeignKeyemail_idTohs_email = - new com.evolute.entity.ForeignKey( HsEmailEstabelecimento.class, HsEmailEstabelecimento.EMAIL_ID, db.data.siprp_local.outer.HsEmailData.class, db.data.siprp_local.outer.HsEmailData.ID ); + new com.evolute.entity.ForeignKey( HsEmailEstabelecimento.class, HsEmailEstabelecimento.EMAIL_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsEmailData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsEmailData.ID ); public static final com.evolute.entity.ForeignKey ForeignKeyestabelecimento_idToestabelecimentos = - new com.evolute.entity.ForeignKey( HsEmailEstabelecimento.class, HsEmailEstabelecimento.ESTABELECIMENTO_ID, db.data.siprp_local.outer.EstabelecimentosData.class, db.data.siprp_local.outer.EstabelecimentosData.ID ); + new com.evolute.entity.ForeignKey( HsEmailEstabelecimento.class, HsEmailEstabelecimento.ESTABELECIMENTO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.ID ); public static final String TABLENAME = "hs_email_estabelecimento"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.hs_email_estabelecimento"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.hs_email_estabelecimento"; public static final int _INVALID__INDEX = -1; public static final String EMAIL_ID = "email_id"; @@ -71,9 +71,9 @@ public class HsEmailEstabelecimento extends com.evolute.entity.evo.EvoDataObject EMAIL_ID, ESTABELECIMENTO_ID, }; private Integer email_id; - private db.data.siprp_local.outer.HsEmailData to_email_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsEmailData to_email_id; private Integer estabelecimento_id; - private db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id; protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; @@ -113,7 +113,7 @@ public class HsEmailEstabelecimento extends com.evolute.entity.evo.EvoDataObject LAZY_LOADED_OBJECTS.put( EMAIL_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.HsEmailData toEmail_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsEmailData toEmail_id() { try { @@ -126,7 +126,7 @@ public class HsEmailEstabelecimento extends com.evolute.entity.evo.EvoDataObject return this.to_email_id; } - public void setToEmail_id( db.data.siprp_local.outer.HsEmailData to_email_id ) + public void setToEmail_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsEmailData to_email_id ) { try { @@ -168,7 +168,7 @@ public class HsEmailEstabelecimento extends com.evolute.entity.evo.EvoDataObject LAZY_LOADED_OBJECTS.put( ESTABELECIMENTO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.EstabelecimentosData toEstabelecimento_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData toEstabelecimento_id() { try { @@ -181,7 +181,7 @@ public class HsEmailEstabelecimento extends com.evolute.entity.evo.EvoDataObject return this.to_estabelecimento_id; } - public void setToEstabelecimento_id( db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id ) + public void setToEstabelecimento_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id ) { try { @@ -247,13 +247,13 @@ public class HsEmailEstabelecimento extends com.evolute.entity.evo.EvoDataObject setEmail_id( ( Integer ) value ); break; case HsEmailEstabelecimento.TO_EMAIL_ID_INDEX: - setToEmail_id( ( db.data.siprp_local.outer.HsEmailData ) value ); + setToEmail_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsEmailData ) value ); break; case HsEmailEstabelecimento.ESTABELECIMENTO_ID_INDEX: setEstabelecimento_id( ( Integer ) value ); break; case HsEmailEstabelecimento.TO_ESTABELECIMENTO_ID_INDEX: - setToEstabelecimento_id( ( db.data.siprp_local.outer.EstabelecimentosData ) value ); + setToEstabelecimento_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData ) value ); break; } } @@ -267,13 +267,13 @@ public class HsEmailEstabelecimento extends com.evolute.entity.evo.EvoDataObject this.email_id = ( Integer ) value; break; case HsEmailEstabelecimento.TO_EMAIL_ID_INDEX: - this.to_email_id = ( db.data.siprp_local.outer.HsEmailData ) value; + this.to_email_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsEmailData ) value; break; case HsEmailEstabelecimento.ESTABELECIMENTO_ID_INDEX: this.estabelecimento_id = ( Integer ) value; break; case HsEmailEstabelecimento.TO_ESTABELECIMENTO_ID_INDEX: - this.to_estabelecimento_id = ( db.data.siprp_local.outer.EstabelecimentosData ) value; + this.to_estabelecimento_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData ) value; break; } } @@ -318,13 +318,13 @@ public class HsEmailEstabelecimento extends com.evolute.entity.evo.EvoDataObject theClass = Integer.class; break; case HsEmailEstabelecimento.TO_EMAIL_ID_INDEX: - theClass = db.data.siprp_local.outer.HsEmailData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsEmailData.class; break; case HsEmailEstabelecimento.ESTABELECIMENTO_ID_INDEX: theClass = Integer.class; break; case HsEmailEstabelecimento.TO_ESTABELECIMENTO_ID_INDEX: - theClass = db.data.siprp_local.outer.EstabelecimentosData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.class; break; } return theClass; @@ -349,6 +349,7 @@ public class HsEmailEstabelecimento extends com.evolute.entity.evo.EvoDataObject @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, HsEmailEstabelecimento.PK_FIELD_NAMES ); diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsEquipamento.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsEquipamento.java similarity index 94% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsEquipamento.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsEquipamento.java index 0fb4aa02..3d5ea697 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsEquipamento.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsEquipamento.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsEquipamento extends com.evolute.entity.evo.EvoDataObject @@ -33,7 +33,7 @@ public class HsEquipamento extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsLegislacao extends com.evolute.entity.evo.EvoDataObject @@ -31,12 +31,12 @@ public class HsLegislacao extends com.evolute.entity.evo.EvoDataObjectfromHsLegislacaoEmpresa_legislacao_id() + public java.util.ListfromHsLegislacaoEmpresa_legislacao_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsLegislacaoEmpresaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsLegislacaoEmpresaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsLegislacaoEmpresaData.class , getPrimaryKey().getMap().get("id"), "legislacao_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsLegislacaoEmpresaData.class , getPrimaryKey().getMap().get("id"), "legislacao_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -133,14 +133,14 @@ public class HsLegislacao extends com.evolute.entity.evo.EvoDataObjectfromHsLegislacaoEstabelecimento_legislacao_id() + public java.util.ListfromHsLegislacaoEstabelecimento_legislacao_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "legislacao_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsLegislacaoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "legislacao_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -208,7 +208,7 @@ public class HsLegislacao extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsLegislacaoCategoria extends com.evolute.entity.evo.EvoDataObject @@ -29,7 +29,7 @@ public class HsLegislacaoCategoria extends com.evolute.entity.evo.EvoDataObject< public static final String TABLENAME = "hs_legislacao_categoria"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.hs_legislacao_categoria"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.hs_legislacao_categoria"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -100,14 +100,14 @@ public class HsLegislacaoCategoria extends com.evolute.entity.evo.EvoDataObject< LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE ); } - public java.util.ListfromHsLegislacao_categoria_id() + public java.util.ListfromHsLegislacao_categoria_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsLegislacaoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsLegislacaoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsLegislacaoData.class , getPrimaryKey().getMap().get("id"), "categoria_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsLegislacaoData.class , getPrimaryKey().getMap().get("id"), "categoria_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -315,12 +315,28 @@ public class HsLegislacaoCategoria extends com.evolute.entity.evo.EvoDataObject< @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, HsLegislacaoCategoria.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsLegislacaoEmpresa.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsLegislacaoEmpresa.java similarity index 82% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsLegislacaoEmpresa.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsLegislacaoEmpresa.java index 69c5d8d8..6c6e5e67 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsLegislacaoEmpresa.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsLegislacaoEmpresa.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsLegislacaoEmpresa extends com.evolute.entity.evo.EvoDataObject @@ -29,15 +29,15 @@ public class HsLegislacaoEmpresa extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsLegislacaoEstabelecimento extends com.evolute.entity.evo.EvoDataObject @@ -31,15 +31,15 @@ public class HsLegislacaoEstabelecimento extends com.evolute.entity.evo.EvoDataO public static final com.evolute.entity.ForeignKey ForeignKeylegislacao_idTohs_legislacao = - new com.evolute.entity.ForeignKey( HsLegislacaoEstabelecimento.class, HsLegislacaoEstabelecimento.LEGISLACAO_ID, db.data.siprp_local.outer.HsLegislacaoData.class, db.data.siprp_local.outer.HsLegislacaoData.ID ); + new com.evolute.entity.ForeignKey( HsLegislacaoEstabelecimento.class, HsLegislacaoEstabelecimento.LEGISLACAO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsLegislacaoData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsLegislacaoData.ID ); public static final com.evolute.entity.ForeignKey ForeignKeyestabelecimento_idToestabelecimentos = - new com.evolute.entity.ForeignKey( HsLegislacaoEstabelecimento.class, HsLegislacaoEstabelecimento.ESTABELECIMENTO_ID, db.data.siprp_local.outer.EstabelecimentosData.class, db.data.siprp_local.outer.EstabelecimentosData.ID ); + new com.evolute.entity.ForeignKey( HsLegislacaoEstabelecimento.class, HsLegislacaoEstabelecimento.ESTABELECIMENTO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.ID ); public static final String TABLENAME = "hs_legislacao_estabelecimento"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.hs_legislacao_estabelecimento"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.hs_legislacao_estabelecimento"; public static final int _INVALID__INDEX = -1; public static final String LEGISLACAO_ID = "legislacao_id"; @@ -76,9 +76,9 @@ public class HsLegislacaoEstabelecimento extends com.evolute.entity.evo.EvoDataO LEGISLACAO_ID, ESTABELECIMENTO_ID, ORDEM, }; private Integer legislacao_id; - private db.data.siprp_local.outer.HsLegislacaoData to_legislacao_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsLegislacaoData to_legislacao_id; private Integer estabelecimento_id; - private db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id; private Integer ordem; protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; @@ -119,7 +119,7 @@ public class HsLegislacaoEstabelecimento extends com.evolute.entity.evo.EvoDataO LAZY_LOADED_OBJECTS.put( LEGISLACAO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.HsLegislacaoData toLegislacao_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsLegislacaoData toLegislacao_id() { try { @@ -132,7 +132,7 @@ public class HsLegislacaoEstabelecimento extends com.evolute.entity.evo.EvoDataO return this.to_legislacao_id; } - public void setToLegislacao_id( db.data.siprp_local.outer.HsLegislacaoData to_legislacao_id ) + public void setToLegislacao_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsLegislacaoData to_legislacao_id ) { try { @@ -174,7 +174,7 @@ public class HsLegislacaoEstabelecimento extends com.evolute.entity.evo.EvoDataO LAZY_LOADED_OBJECTS.put( ESTABELECIMENTO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.EstabelecimentosData toEstabelecimento_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData toEstabelecimento_id() { try { @@ -187,7 +187,7 @@ public class HsLegislacaoEstabelecimento extends com.evolute.entity.evo.EvoDataO return this.to_estabelecimento_id; } - public void setToEstabelecimento_id( db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id ) + public void setToEstabelecimento_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id ) { try { @@ -288,13 +288,13 @@ public class HsLegislacaoEstabelecimento extends com.evolute.entity.evo.EvoDataO setLegislacao_id( ( Integer ) value ); break; case HsLegislacaoEstabelecimento.TO_LEGISLACAO_ID_INDEX: - setToLegislacao_id( ( db.data.siprp_local.outer.HsLegislacaoData ) value ); + setToLegislacao_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsLegislacaoData ) value ); break; case HsLegislacaoEstabelecimento.ESTABELECIMENTO_ID_INDEX: setEstabelecimento_id( ( Integer ) value ); break; case HsLegislacaoEstabelecimento.TO_ESTABELECIMENTO_ID_INDEX: - setToEstabelecimento_id( ( db.data.siprp_local.outer.EstabelecimentosData ) value ); + setToEstabelecimento_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData ) value ); break; case HsLegislacaoEstabelecimento.ORDEM_INDEX: setOrdem( ( Integer ) value ); @@ -311,13 +311,13 @@ public class HsLegislacaoEstabelecimento extends com.evolute.entity.evo.EvoDataO this.legislacao_id = ( Integer ) value; break; case HsLegislacaoEstabelecimento.TO_LEGISLACAO_ID_INDEX: - this.to_legislacao_id = ( db.data.siprp_local.outer.HsLegislacaoData ) value; + this.to_legislacao_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsLegislacaoData ) value; break; case HsLegislacaoEstabelecimento.ESTABELECIMENTO_ID_INDEX: this.estabelecimento_id = ( Integer ) value; break; case HsLegislacaoEstabelecimento.TO_ESTABELECIMENTO_ID_INDEX: - this.to_estabelecimento_id = ( db.data.siprp_local.outer.EstabelecimentosData ) value; + this.to_estabelecimento_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData ) value; break; case HsLegislacaoEstabelecimento.ORDEM_INDEX: this.ordem = ( Integer ) value; @@ -365,13 +365,13 @@ public class HsLegislacaoEstabelecimento extends com.evolute.entity.evo.EvoDataO theClass = Integer.class; break; case HsLegislacaoEstabelecimento.TO_LEGISLACAO_ID_INDEX: - theClass = db.data.siprp_local.outer.HsLegislacaoData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsLegislacaoData.class; break; case HsLegislacaoEstabelecimento.ESTABELECIMENTO_ID_INDEX: theClass = Integer.class; break; case HsLegislacaoEstabelecimento.TO_ESTABELECIMENTO_ID_INDEX: - theClass = db.data.siprp_local.outer.EstabelecimentosData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.class; break; case HsLegislacaoEstabelecimento.ORDEM_INDEX: theClass = Integer.class; @@ -399,6 +399,7 @@ public class HsLegislacaoEstabelecimento extends com.evolute.entity.evo.EvoDataO @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, HsLegislacaoEstabelecimento.PK_FIELD_NAMES ); diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsMedida.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsMedida.java similarity index 85% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsMedida.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsMedida.java index d46d0bae..3a7567a5 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsMedida.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsMedida.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsMedida extends com.evolute.entity.evo.EvoDataObject @@ -31,7 +31,7 @@ public class HsMedida extends com.evolute.entity.evo.EvoDataObjectfromHsPostoMedida_medida_id() + public java.util.ListfromHsPostoMedida_medida_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsPostoMedidaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsPostoMedidaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsPostoMedidaData.class , getPrimaryKey().getMap().get("id"), "medida_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsPostoMedidaData.class , getPrimaryKey().getMap().get("id"), "medida_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -124,14 +124,14 @@ public class HsMedida extends com.evolute.entity.evo.EvoDataObjectfromHsRiscoMedida_medida_id() + public java.util.ListfromHsRiscoMedida_medida_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsRiscoMedidaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRiscoMedidaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsRiscoMedidaData.class , getPrimaryKey().getMap().get("id"), "medida_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRiscoMedidaData.class , getPrimaryKey().getMap().get("id"), "medida_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -383,12 +383,28 @@ public class HsMedida extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsNormalizacao extends com.evolute.entity.evo.EvoDataObject @@ -33,7 +33,7 @@ public class HsNormalizacao extends com.evolute.entity.evo.EvoDataObjectfromHsNormalizacaoEmpresa_normalizacao_id() + public java.util.ListfromHsNormalizacaoEmpresa_normalizacao_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsNormalizacaoEmpresaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsNormalizacaoEmpresaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsNormalizacaoEmpresaData.class , getPrimaryKey().getMap().get("id"), "normalizacao_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsNormalizacaoEmpresaData.class , getPrimaryKey().getMap().get("id"), "normalizacao_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -130,14 +130,14 @@ public class HsNormalizacao extends com.evolute.entity.evo.EvoDataObjectfromHsNormalizacaoEstabelecimento_normalizacao_id() + public java.util.ListfromHsNormalizacaoEstabelecimento_normalizacao_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsNormalizacaoEstabelecimentoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsNormalizacaoEstabelecimentoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsNormalizacaoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "normalizacao_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsNormalizacaoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "normalizacao_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -433,12 +433,28 @@ public class HsNormalizacao extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsNormalizacaoEmpresa extends com.evolute.entity.evo.EvoDataObject @@ -29,15 +29,15 @@ public class HsNormalizacaoEmpresa extends com.evolute.entity.evo.EvoDataObject< public static final com.evolute.entity.ForeignKey ForeignKeynormalizacao_idTohs_normalizacao = - new com.evolute.entity.ForeignKey( HsNormalizacaoEmpresa.class, HsNormalizacaoEmpresa.NORMALIZACAO_ID, db.data.siprp_local.outer.HsNormalizacaoData.class, db.data.siprp_local.outer.HsNormalizacaoData.ID ); + new com.evolute.entity.ForeignKey( HsNormalizacaoEmpresa.class, HsNormalizacaoEmpresa.NORMALIZACAO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsNormalizacaoData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsNormalizacaoData.ID ); public static final com.evolute.entity.ForeignKey ForeignKeyempresa_idToempresas = - new com.evolute.entity.ForeignKey( HsNormalizacaoEmpresa.class, HsNormalizacaoEmpresa.EMPRESA_ID, db.data.siprp_local.outer.EmpresasData.class, db.data.siprp_local.outer.EmpresasData.ID ); + new com.evolute.entity.ForeignKey( HsNormalizacaoEmpresa.class, HsNormalizacaoEmpresa.EMPRESA_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresasData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresasData.ID ); public static final String TABLENAME = "hs_normalizacao_empresa"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.hs_normalizacao_empresa"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.hs_normalizacao_empresa"; public static final int _INVALID__INDEX = -1; public static final String NORMALIZACAO_ID = "normalizacao_id"; @@ -71,9 +71,9 @@ public class HsNormalizacaoEmpresa extends com.evolute.entity.evo.EvoDataObject< NORMALIZACAO_ID, EMPRESA_ID, }; private Integer normalizacao_id; - private db.data.siprp_local.outer.HsNormalizacaoData to_normalizacao_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsNormalizacaoData to_normalizacao_id; private Integer empresa_id; - private db.data.siprp_local.outer.EmpresasData to_empresa_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresasData to_empresa_id; protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; @@ -113,7 +113,7 @@ public class HsNormalizacaoEmpresa extends com.evolute.entity.evo.EvoDataObject< LAZY_LOADED_OBJECTS.put( NORMALIZACAO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.HsNormalizacaoData toNormalizacao_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsNormalizacaoData toNormalizacao_id() { try { @@ -126,7 +126,7 @@ public class HsNormalizacaoEmpresa extends com.evolute.entity.evo.EvoDataObject< return this.to_normalizacao_id; } - public void setToNormalizacao_id( db.data.siprp_local.outer.HsNormalizacaoData to_normalizacao_id ) + public void setToNormalizacao_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsNormalizacaoData to_normalizacao_id ) { try { @@ -168,7 +168,7 @@ public class HsNormalizacaoEmpresa extends com.evolute.entity.evo.EvoDataObject< LAZY_LOADED_OBJECTS.put( EMPRESA_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.EmpresasData toEmpresa_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresasData toEmpresa_id() { try { @@ -181,7 +181,7 @@ public class HsNormalizacaoEmpresa extends com.evolute.entity.evo.EvoDataObject< return this.to_empresa_id; } - public void setToEmpresa_id( db.data.siprp_local.outer.EmpresasData to_empresa_id ) + public void setToEmpresa_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresasData to_empresa_id ) { try { @@ -247,13 +247,13 @@ public class HsNormalizacaoEmpresa extends com.evolute.entity.evo.EvoDataObject< setNormalizacao_id( ( Integer ) value ); break; case HsNormalizacaoEmpresa.TO_NORMALIZACAO_ID_INDEX: - setToNormalizacao_id( ( db.data.siprp_local.outer.HsNormalizacaoData ) value ); + setToNormalizacao_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsNormalizacaoData ) value ); break; case HsNormalizacaoEmpresa.EMPRESA_ID_INDEX: setEmpresa_id( ( Integer ) value ); break; case HsNormalizacaoEmpresa.TO_EMPRESA_ID_INDEX: - setToEmpresa_id( ( db.data.siprp_local.outer.EmpresasData ) value ); + setToEmpresa_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresasData ) value ); break; } } @@ -267,13 +267,13 @@ public class HsNormalizacaoEmpresa extends com.evolute.entity.evo.EvoDataObject< this.normalizacao_id = ( Integer ) value; break; case HsNormalizacaoEmpresa.TO_NORMALIZACAO_ID_INDEX: - this.to_normalizacao_id = ( db.data.siprp_local.outer.HsNormalizacaoData ) value; + this.to_normalizacao_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsNormalizacaoData ) value; break; case HsNormalizacaoEmpresa.EMPRESA_ID_INDEX: this.empresa_id = ( Integer ) value; break; case HsNormalizacaoEmpresa.TO_EMPRESA_ID_INDEX: - this.to_empresa_id = ( db.data.siprp_local.outer.EmpresasData ) value; + this.to_empresa_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresasData ) value; break; } } @@ -318,13 +318,13 @@ public class HsNormalizacaoEmpresa extends com.evolute.entity.evo.EvoDataObject< theClass = Integer.class; break; case HsNormalizacaoEmpresa.TO_NORMALIZACAO_ID_INDEX: - theClass = db.data.siprp_local.outer.HsNormalizacaoData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsNormalizacaoData.class; break; case HsNormalizacaoEmpresa.EMPRESA_ID_INDEX: theClass = Integer.class; break; case HsNormalizacaoEmpresa.TO_EMPRESA_ID_INDEX: - theClass = db.data.siprp_local.outer.EmpresasData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresasData.class; break; } return theClass; @@ -349,6 +349,7 @@ public class HsNormalizacaoEmpresa extends com.evolute.entity.evo.EvoDataObject< @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, HsNormalizacaoEmpresa.PK_FIELD_NAMES ); diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsNormalizacaoEstabelecimento.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsNormalizacaoEstabelecimento.java similarity index 83% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsNormalizacaoEstabelecimento.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsNormalizacaoEstabelecimento.java index 3335fd46..bebb41d2 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsNormalizacaoEstabelecimento.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsNormalizacaoEstabelecimento.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsNormalizacaoEstabelecimento extends com.evolute.entity.evo.EvoDataObject @@ -29,15 +29,15 @@ public class HsNormalizacaoEstabelecimento extends com.evolute.entity.evo.EvoDat public static final com.evolute.entity.ForeignKey ForeignKeynormalizacao_idTohs_normalizacao = - new com.evolute.entity.ForeignKey( HsNormalizacaoEstabelecimento.class, HsNormalizacaoEstabelecimento.NORMALIZACAO_ID, db.data.siprp_local.outer.HsNormalizacaoData.class, db.data.siprp_local.outer.HsNormalizacaoData.ID ); + new com.evolute.entity.ForeignKey( HsNormalizacaoEstabelecimento.class, HsNormalizacaoEstabelecimento.NORMALIZACAO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsNormalizacaoData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsNormalizacaoData.ID ); public static final com.evolute.entity.ForeignKey ForeignKeyestabelecimento_idToestabelecimentos = - new com.evolute.entity.ForeignKey( HsNormalizacaoEstabelecimento.class, HsNormalizacaoEstabelecimento.ESTABELECIMENTO_ID, db.data.siprp_local.outer.EstabelecimentosData.class, db.data.siprp_local.outer.EstabelecimentosData.ID ); + new com.evolute.entity.ForeignKey( HsNormalizacaoEstabelecimento.class, HsNormalizacaoEstabelecimento.ESTABELECIMENTO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.ID ); public static final String TABLENAME = "hs_normalizacao_estabelecimento"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.hs_normalizacao_estabelecimento"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.hs_normalizacao_estabelecimento"; public static final int _INVALID__INDEX = -1; public static final String NORMALIZACAO_ID = "normalizacao_id"; @@ -71,9 +71,9 @@ public class HsNormalizacaoEstabelecimento extends com.evolute.entity.evo.EvoDat NORMALIZACAO_ID, ESTABELECIMENTO_ID, }; private Integer normalizacao_id; - private db.data.siprp_local.outer.HsNormalizacaoData to_normalizacao_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsNormalizacaoData to_normalizacao_id; private Integer estabelecimento_id; - private db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id; protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; @@ -113,7 +113,7 @@ public class HsNormalizacaoEstabelecimento extends com.evolute.entity.evo.EvoDat LAZY_LOADED_OBJECTS.put( NORMALIZACAO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.HsNormalizacaoData toNormalizacao_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsNormalizacaoData toNormalizacao_id() { try { @@ -126,7 +126,7 @@ public class HsNormalizacaoEstabelecimento extends com.evolute.entity.evo.EvoDat return this.to_normalizacao_id; } - public void setToNormalizacao_id( db.data.siprp_local.outer.HsNormalizacaoData to_normalizacao_id ) + public void setToNormalizacao_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsNormalizacaoData to_normalizacao_id ) { try { @@ -168,7 +168,7 @@ public class HsNormalizacaoEstabelecimento extends com.evolute.entity.evo.EvoDat LAZY_LOADED_OBJECTS.put( ESTABELECIMENTO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.EstabelecimentosData toEstabelecimento_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData toEstabelecimento_id() { try { @@ -181,7 +181,7 @@ public class HsNormalizacaoEstabelecimento extends com.evolute.entity.evo.EvoDat return this.to_estabelecimento_id; } - public void setToEstabelecimento_id( db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id ) + public void setToEstabelecimento_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id ) { try { @@ -247,13 +247,13 @@ public class HsNormalizacaoEstabelecimento extends com.evolute.entity.evo.EvoDat setNormalizacao_id( ( Integer ) value ); break; case HsNormalizacaoEstabelecimento.TO_NORMALIZACAO_ID_INDEX: - setToNormalizacao_id( ( db.data.siprp_local.outer.HsNormalizacaoData ) value ); + setToNormalizacao_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsNormalizacaoData ) value ); break; case HsNormalizacaoEstabelecimento.ESTABELECIMENTO_ID_INDEX: setEstabelecimento_id( ( Integer ) value ); break; case HsNormalizacaoEstabelecimento.TO_ESTABELECIMENTO_ID_INDEX: - setToEstabelecimento_id( ( db.data.siprp_local.outer.EstabelecimentosData ) value ); + setToEstabelecimento_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData ) value ); break; } } @@ -267,13 +267,13 @@ public class HsNormalizacaoEstabelecimento extends com.evolute.entity.evo.EvoDat this.normalizacao_id = ( Integer ) value; break; case HsNormalizacaoEstabelecimento.TO_NORMALIZACAO_ID_INDEX: - this.to_normalizacao_id = ( db.data.siprp_local.outer.HsNormalizacaoData ) value; + this.to_normalizacao_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsNormalizacaoData ) value; break; case HsNormalizacaoEstabelecimento.ESTABELECIMENTO_ID_INDEX: this.estabelecimento_id = ( Integer ) value; break; case HsNormalizacaoEstabelecimento.TO_ESTABELECIMENTO_ID_INDEX: - this.to_estabelecimento_id = ( db.data.siprp_local.outer.EstabelecimentosData ) value; + this.to_estabelecimento_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData ) value; break; } } @@ -318,13 +318,13 @@ public class HsNormalizacaoEstabelecimento extends com.evolute.entity.evo.EvoDat theClass = Integer.class; break; case HsNormalizacaoEstabelecimento.TO_NORMALIZACAO_ID_INDEX: - theClass = db.data.siprp_local.outer.HsNormalizacaoData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsNormalizacaoData.class; break; case HsNormalizacaoEstabelecimento.ESTABELECIMENTO_ID_INDEX: theClass = Integer.class; break; case HsNormalizacaoEstabelecimento.TO_ESTABELECIMENTO_ID_INDEX: - theClass = db.data.siprp_local.outer.EstabelecimentosData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.class; break; } return theClass; @@ -349,6 +349,7 @@ public class HsNormalizacaoEstabelecimento extends com.evolute.entity.evo.EvoDat @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, HsNormalizacaoEstabelecimento.PK_FIELD_NAMES ); diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsPosto.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsPosto.java similarity index 80% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsPosto.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsPosto.java index d9b0dbb8..ad686f75 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsPosto.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsPosto.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsPosto extends com.evolute.entity.evo.EvoDataObject @@ -33,12 +33,12 @@ public class HsPosto extends com.evolute.entity.evo.EvoDataObjectfromHsPostoEstabelecimento_posto_id() + public java.util.ListfromHsPostoEstabelecimento_posto_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsPostoEstabelecimentoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsPostoEstabelecimentoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsPostoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "posto_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsPostoEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "posto_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -139,14 +139,14 @@ public class HsPosto extends com.evolute.entity.evo.EvoDataObjectfromHsPostoMedida_posto_id() + public java.util.ListfromHsPostoMedida_posto_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsPostoMedidaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsPostoMedidaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsPostoMedidaData.class , getPrimaryKey().getMap().get("id"), "posto_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsPostoMedidaData.class , getPrimaryKey().getMap().get("id"), "posto_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -156,14 +156,14 @@ public class HsPosto extends com.evolute.entity.evo.EvoDataObjectfromHsPostoRisco_posto_id() + public java.util.ListfromHsPostoRisco_posto_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsPostoRiscoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsPostoRiscoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsPostoRiscoData.class , getPrimaryKey().getMap().get("id"), "posto_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsPostoRiscoData.class , getPrimaryKey().getMap().get("id"), "posto_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -202,7 +202,7 @@ public class HsPosto extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsPostoEstabelecimento extends com.evolute.entity.evo.EvoDataObject @@ -29,15 +29,15 @@ public class HsPostoEstabelecimento extends com.evolute.entity.evo.EvoDataObject public static final com.evolute.entity.ForeignKey ForeignKeyposto_idTohs_posto = - new com.evolute.entity.ForeignKey( HsPostoEstabelecimento.class, HsPostoEstabelecimento.POSTO_ID, db.data.siprp_local.outer.HsPostoData.class, db.data.siprp_local.outer.HsPostoData.ID ); + new com.evolute.entity.ForeignKey( HsPostoEstabelecimento.class, HsPostoEstabelecimento.POSTO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsPostoData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsPostoData.ID ); public static final com.evolute.entity.ForeignKey ForeignKeyestabelecimento_idToestabelecimentos = - new com.evolute.entity.ForeignKey( HsPostoEstabelecimento.class, HsPostoEstabelecimento.ESTABELECIMENTO_ID, db.data.siprp_local.outer.EstabelecimentosData.class, db.data.siprp_local.outer.EstabelecimentosData.ID ); + new com.evolute.entity.ForeignKey( HsPostoEstabelecimento.class, HsPostoEstabelecimento.ESTABELECIMENTO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.ID ); public static final String TABLENAME = "hs_posto_estabelecimento"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.hs_posto_estabelecimento"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.hs_posto_estabelecimento"; public static final int _INVALID__INDEX = -1; public static final String POSTO_ID = "posto_id"; @@ -71,9 +71,9 @@ public class HsPostoEstabelecimento extends com.evolute.entity.evo.EvoDataObject POSTO_ID, ESTABELECIMENTO_ID, }; private Integer posto_id; - private db.data.siprp_local.outer.HsPostoData to_posto_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsPostoData to_posto_id; private Integer estabelecimento_id; - private db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id; protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; @@ -113,7 +113,7 @@ public class HsPostoEstabelecimento extends com.evolute.entity.evo.EvoDataObject LAZY_LOADED_OBJECTS.put( POSTO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.HsPostoData toPosto_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsPostoData toPosto_id() { try { @@ -126,7 +126,7 @@ public class HsPostoEstabelecimento extends com.evolute.entity.evo.EvoDataObject return this.to_posto_id; } - public void setToPosto_id( db.data.siprp_local.outer.HsPostoData to_posto_id ) + public void setToPosto_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsPostoData to_posto_id ) { try { @@ -168,7 +168,7 @@ public class HsPostoEstabelecimento extends com.evolute.entity.evo.EvoDataObject LAZY_LOADED_OBJECTS.put( ESTABELECIMENTO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.EstabelecimentosData toEstabelecimento_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData toEstabelecimento_id() { try { @@ -181,7 +181,7 @@ public class HsPostoEstabelecimento extends com.evolute.entity.evo.EvoDataObject return this.to_estabelecimento_id; } - public void setToEstabelecimento_id( db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id ) + public void setToEstabelecimento_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id ) { try { @@ -247,13 +247,13 @@ public class HsPostoEstabelecimento extends com.evolute.entity.evo.EvoDataObject setPosto_id( ( Integer ) value ); break; case HsPostoEstabelecimento.TO_POSTO_ID_INDEX: - setToPosto_id( ( db.data.siprp_local.outer.HsPostoData ) value ); + setToPosto_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsPostoData ) value ); break; case HsPostoEstabelecimento.ESTABELECIMENTO_ID_INDEX: setEstabelecimento_id( ( Integer ) value ); break; case HsPostoEstabelecimento.TO_ESTABELECIMENTO_ID_INDEX: - setToEstabelecimento_id( ( db.data.siprp_local.outer.EstabelecimentosData ) value ); + setToEstabelecimento_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData ) value ); break; } } @@ -267,13 +267,13 @@ public class HsPostoEstabelecimento extends com.evolute.entity.evo.EvoDataObject this.posto_id = ( Integer ) value; break; case HsPostoEstabelecimento.TO_POSTO_ID_INDEX: - this.to_posto_id = ( db.data.siprp_local.outer.HsPostoData ) value; + this.to_posto_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsPostoData ) value; break; case HsPostoEstabelecimento.ESTABELECIMENTO_ID_INDEX: this.estabelecimento_id = ( Integer ) value; break; case HsPostoEstabelecimento.TO_ESTABELECIMENTO_ID_INDEX: - this.to_estabelecimento_id = ( db.data.siprp_local.outer.EstabelecimentosData ) value; + this.to_estabelecimento_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData ) value; break; } } @@ -318,13 +318,13 @@ public class HsPostoEstabelecimento extends com.evolute.entity.evo.EvoDataObject theClass = Integer.class; break; case HsPostoEstabelecimento.TO_POSTO_ID_INDEX: - theClass = db.data.siprp_local.outer.HsPostoData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsPostoData.class; break; case HsPostoEstabelecimento.ESTABELECIMENTO_ID_INDEX: theClass = Integer.class; break; case HsPostoEstabelecimento.TO_ESTABELECIMENTO_ID_INDEX: - theClass = db.data.siprp_local.outer.EstabelecimentosData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.class; break; } return theClass; @@ -349,6 +349,7 @@ public class HsPostoEstabelecimento extends com.evolute.entity.evo.EvoDataObject @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, HsPostoEstabelecimento.PK_FIELD_NAMES ); diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsPostoMedida.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsPostoMedida.java similarity index 82% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsPostoMedida.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsPostoMedida.java index 1a602619..14d7cea6 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsPostoMedida.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsPostoMedida.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsPostoMedida extends com.evolute.entity.evo.EvoDataObject @@ -29,15 +29,15 @@ public class HsPostoMedida extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsPostoRisco extends com.evolute.entity.evo.EvoDataObject @@ -41,18 +41,18 @@ public class HsPostoRisco extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsRelatorio extends com.evolute.entity.evo.EvoDataObject @@ -49,12 +49,12 @@ public class HsRelatorio extends com.evolute.entity.evo.EvoDataObjectfromHsRelatorioArea_relatorio_id() + public java.util.ListfromHsRelatorioArea_relatorio_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioAreaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioAreaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsRelatorioAreaData.class , getPrimaryKey().getMap().get("id"), "relatorio_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioAreaData.class , getPrimaryKey().getMap().get("id"), "relatorio_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -196,14 +196,14 @@ public class HsRelatorio extends com.evolute.entity.evo.EvoDataObjectfromHsRelatorioEquipamento_hs_relatorio_id() + public java.util.ListfromHsRelatorioEquipamento_hs_relatorio_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioEquipamentoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioEquipamentoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsRelatorioEquipamentoData.class , getPrimaryKey().getMap().get("id"), "hs_relatorio_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioEquipamentoData.class , getPrimaryKey().getMap().get("id"), "hs_relatorio_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -213,14 +213,14 @@ public class HsRelatorio extends com.evolute.entity.evo.EvoDataObjectfromHsRelatorioLegislacao_hs_relatorio_id() + public java.util.ListfromHsRelatorioLegislacao_hs_relatorio_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioLegislacaoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioLegislacaoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsRelatorioLegislacaoData.class , getPrimaryKey().getMap().get("id"), "hs_relatorio_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioLegislacaoData.class , getPrimaryKey().getMap().get("id"), "hs_relatorio_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -230,14 +230,14 @@ public class HsRelatorio extends com.evolute.entity.evo.EvoDataObjectfromHsRelatorioNormalizacao_hs_relatorio_id() + public java.util.ListfromHsRelatorioNormalizacao_hs_relatorio_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioNormalizacaoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioNormalizacaoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsRelatorioNormalizacaoData.class , getPrimaryKey().getMap().get("id"), "hs_relatorio_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioNormalizacaoData.class , getPrimaryKey().getMap().get("id"), "hs_relatorio_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -247,14 +247,14 @@ public class HsRelatorio extends com.evolute.entity.evo.EvoDataObjectfromHsRelatorioRisco_relatorio_id() + public java.util.ListfromHsRelatorioRisco_relatorio_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioRiscoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioRiscoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsRelatorioRiscoData.class , getPrimaryKey().getMap().get("id"), "relatorio_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioRiscoData.class , getPrimaryKey().getMap().get("id"), "relatorio_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -351,7 +351,7 @@ public class HsRelatorio extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsRelatorioArea extends com.evolute.entity.evo.EvoDataObject @@ -35,12 +35,12 @@ public class HsRelatorioArea extends com.evolute.entity.evo.EvoDataObjectfromHsRelatorioPosto_area_id() + public java.util.ListfromHsRelatorioPosto_area_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioPostoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsRelatorioPostoData.class , getPrimaryKey().getMap().get("id"), "area_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoData.class , getPrimaryKey().getMap().get("id"), "area_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -232,7 +232,7 @@ public class HsRelatorioArea extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsRelatorioEquipamento extends com.evolute.entity.evo.EvoDataObject @@ -37,12 +37,12 @@ public class HsRelatorioEquipamento extends com.evolute.entity.evo.EvoDataObject public static final com.evolute.entity.ForeignKey ForeignKeyhs_relatorio_idTohs_relatorio = - new com.evolute.entity.ForeignKey( HsRelatorioEquipamento.class, HsRelatorioEquipamento.HS_RELATORIO_ID, db.data.siprp_local.outer.HsRelatorioData.class, db.data.siprp_local.outer.HsRelatorioData.ID ); + new com.evolute.entity.ForeignKey( HsRelatorioEquipamento.class, HsRelatorioEquipamento.HS_RELATORIO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData.ID ); public static final String TABLENAME = "hs_relatorio_equipamento"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.hs_relatorio_equipamento"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.hs_relatorio_equipamento"; public static final int _INVALID__INDEX = -1; public static final String HS_RELATORIO_ID = "hs_relatorio_id"; @@ -90,7 +90,7 @@ public class HsRelatorioEquipamento extends com.evolute.entity.evo.EvoDataObject HS_RELATORIO_ID, HS_EQUIPAMENTO, ID, TIPO, MARCA, MODELO, HS_EQUIPAMENTO_ID, }; private Integer hs_relatorio_id; - private db.data.siprp_local.outer.HsRelatorioData to_hs_relatorio_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData to_hs_relatorio_id; private Integer hs_equipamento; private Integer id; private String tipo; @@ -136,7 +136,7 @@ public class HsRelatorioEquipamento extends com.evolute.entity.evo.EvoDataObject LAZY_LOADED_OBJECTS.put( HS_RELATORIO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.HsRelatorioData toHs_relatorio_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData toHs_relatorio_id() { try { @@ -149,7 +149,7 @@ public class HsRelatorioEquipamento extends com.evolute.entity.evo.EvoDataObject return this.to_hs_relatorio_id; } - public void setToHs_relatorio_id( db.data.siprp_local.outer.HsRelatorioData to_hs_relatorio_id ) + public void setToHs_relatorio_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData to_hs_relatorio_id ) { try { @@ -413,7 +413,7 @@ public class HsRelatorioEquipamento extends com.evolute.entity.evo.EvoDataObject setHs_relatorio_id( ( Integer ) value ); break; case HsRelatorioEquipamento.TO_HS_RELATORIO_ID_INDEX: - setToHs_relatorio_id( ( db.data.siprp_local.outer.HsRelatorioData ) value ); + setToHs_relatorio_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData ) value ); break; case HsRelatorioEquipamento.HS_EQUIPAMENTO_INDEX: setHs_equipamento( ( Integer ) value ); @@ -445,7 +445,7 @@ public class HsRelatorioEquipamento extends com.evolute.entity.evo.EvoDataObject this.hs_relatorio_id = ( Integer ) value; break; case HsRelatorioEquipamento.TO_HS_RELATORIO_ID_INDEX: - this.to_hs_relatorio_id = ( db.data.siprp_local.outer.HsRelatorioData ) value; + this.to_hs_relatorio_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData ) value; break; case HsRelatorioEquipamento.HS_EQUIPAMENTO_INDEX: this.hs_equipamento = ( Integer ) value; @@ -508,7 +508,7 @@ public class HsRelatorioEquipamento extends com.evolute.entity.evo.EvoDataObject theClass = Integer.class; break; case HsRelatorioEquipamento.TO_HS_RELATORIO_ID_INDEX: - theClass = db.data.siprp_local.outer.HsRelatorioData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData.class; break; case HsRelatorioEquipamento.HS_EQUIPAMENTO_INDEX: theClass = Integer.class; @@ -551,12 +551,28 @@ public class HsRelatorioEquipamento extends com.evolute.entity.evo.EvoDataObject @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, HsRelatorioEquipamento.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRelatorioLegislacao.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsRelatorioLegislacao.java similarity index 90% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRelatorioLegislacao.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsRelatorioLegislacao.java index 8df82bc7..a19995df 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRelatorioLegislacao.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsRelatorioLegislacao.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsRelatorioLegislacao extends com.evolute.entity.evo.EvoDataObject @@ -35,12 +35,12 @@ public class HsRelatorioLegislacao extends com.evolute.entity.evo.EvoDataObject< public static final com.evolute.entity.ForeignKey ForeignKeyhs_relatorio_idTohs_relatorio = - new com.evolute.entity.ForeignKey( HsRelatorioLegislacao.class, HsRelatorioLegislacao.HS_RELATORIO_ID, db.data.siprp_local.outer.HsRelatorioData.class, db.data.siprp_local.outer.HsRelatorioData.ID ); + new com.evolute.entity.ForeignKey( HsRelatorioLegislacao.class, HsRelatorioLegislacao.HS_RELATORIO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData.ID ); public static final String TABLENAME = "hs_relatorio_legislacao"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.hs_relatorio_legislacao"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.hs_relatorio_legislacao"; public static final int _INVALID__INDEX = -1; public static final String HS_RELATORIO_ID = "hs_relatorio_id"; @@ -85,7 +85,7 @@ public class HsRelatorioLegislacao extends com.evolute.entity.evo.EvoDataObject< HS_RELATORIO_ID, HS_LEGISLACAO_ID, ID, CATEGORIA, DESCRICAO, ORDEM, }; private Integer hs_relatorio_id; - private db.data.siprp_local.outer.HsRelatorioData to_hs_relatorio_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData to_hs_relatorio_id; private Integer hs_legislacao_id; private Integer id; private String categoria; @@ -130,7 +130,7 @@ public class HsRelatorioLegislacao extends com.evolute.entity.evo.EvoDataObject< LAZY_LOADED_OBJECTS.put( HS_RELATORIO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.HsRelatorioData toHs_relatorio_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData toHs_relatorio_id() { try { @@ -143,7 +143,7 @@ public class HsRelatorioLegislacao extends com.evolute.entity.evo.EvoDataObject< return this.to_hs_relatorio_id; } - public void setToHs_relatorio_id( db.data.siprp_local.outer.HsRelatorioData to_hs_relatorio_id ) + public void setToHs_relatorio_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData to_hs_relatorio_id ) { try { @@ -372,7 +372,7 @@ public class HsRelatorioLegislacao extends com.evolute.entity.evo.EvoDataObject< setHs_relatorio_id( ( Integer ) value ); break; case HsRelatorioLegislacao.TO_HS_RELATORIO_ID_INDEX: - setToHs_relatorio_id( ( db.data.siprp_local.outer.HsRelatorioData ) value ); + setToHs_relatorio_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData ) value ); break; case HsRelatorioLegislacao.HS_LEGISLACAO_ID_INDEX: setHs_legislacao_id( ( Integer ) value ); @@ -401,7 +401,7 @@ public class HsRelatorioLegislacao extends com.evolute.entity.evo.EvoDataObject< this.hs_relatorio_id = ( Integer ) value; break; case HsRelatorioLegislacao.TO_HS_RELATORIO_ID_INDEX: - this.to_hs_relatorio_id = ( db.data.siprp_local.outer.HsRelatorioData ) value; + this.to_hs_relatorio_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData ) value; break; case HsRelatorioLegislacao.HS_LEGISLACAO_ID_INDEX: this.hs_legislacao_id = ( Integer ) value; @@ -461,7 +461,7 @@ public class HsRelatorioLegislacao extends com.evolute.entity.evo.EvoDataObject< theClass = Integer.class; break; case HsRelatorioLegislacao.TO_HS_RELATORIO_ID_INDEX: - theClass = db.data.siprp_local.outer.HsRelatorioData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData.class; break; case HsRelatorioLegislacao.HS_LEGISLACAO_ID_INDEX: theClass = Integer.class; @@ -501,12 +501,28 @@ public class HsRelatorioLegislacao extends com.evolute.entity.evo.EvoDataObject< @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, HsRelatorioLegislacao.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRelatorioMedida.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsRelatorioMedida.java similarity index 87% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRelatorioMedida.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsRelatorioMedida.java index 2f8537fd..f8346086 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRelatorioMedida.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsRelatorioMedida.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsRelatorioMedida extends com.evolute.entity.evo.EvoDataObject @@ -35,12 +35,12 @@ public class HsRelatorioMedida extends com.evolute.entity.evo.EvoDataObjectfromHsRelatorioPostoMedida_medida_id() + public java.util.ListfromHsRelatorioPostoMedida_medida_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioPostoMedidaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoMedidaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsRelatorioPostoMedidaData.class , getPrimaryKey().getMap().get("id"), "medida_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoMedidaData.class , getPrimaryKey().getMap().get("id"), "medida_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -176,7 +176,7 @@ public class HsRelatorioMedida extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsRelatorioNormalizacao extends com.evolute.entity.evo.EvoDataObject @@ -35,12 +35,12 @@ public class HsRelatorioNormalizacao extends com.evolute.entity.evo.EvoDataObjec public static final com.evolute.entity.ForeignKey ForeignKeyhs_relatorio_idTohs_relatorio = - new com.evolute.entity.ForeignKey( HsRelatorioNormalizacao.class, HsRelatorioNormalizacao.HS_RELATORIO_ID, db.data.siprp_local.outer.HsRelatorioData.class, db.data.siprp_local.outer.HsRelatorioData.ID ); + new com.evolute.entity.ForeignKey( HsRelatorioNormalizacao.class, HsRelatorioNormalizacao.HS_RELATORIO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData.ID ); public static final String TABLENAME = "hs_relatorio_normalizacao"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.hs_relatorio_normalizacao"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.hs_relatorio_normalizacao"; public static final int _INVALID__INDEX = -1; public static final String HS_RELATORIO_ID = "hs_relatorio_id"; @@ -85,7 +85,7 @@ public class HsRelatorioNormalizacao extends com.evolute.entity.evo.EvoDataObjec HS_RELATORIO_ID, HS_NORMALIZACAO_ID, ID, CODIGO, DESCRICAO, PORTUGUESA, }; private Integer hs_relatorio_id; - private db.data.siprp_local.outer.HsRelatorioData to_hs_relatorio_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData to_hs_relatorio_id; private Integer hs_normalizacao_id; private Integer id; private String codigo; @@ -130,7 +130,7 @@ public class HsRelatorioNormalizacao extends com.evolute.entity.evo.EvoDataObjec LAZY_LOADED_OBJECTS.put( HS_RELATORIO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.HsRelatorioData toHs_relatorio_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData toHs_relatorio_id() { try { @@ -143,7 +143,7 @@ public class HsRelatorioNormalizacao extends com.evolute.entity.evo.EvoDataObjec return this.to_hs_relatorio_id; } - public void setToHs_relatorio_id( db.data.siprp_local.outer.HsRelatorioData to_hs_relatorio_id ) + public void setToHs_relatorio_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData to_hs_relatorio_id ) { try { @@ -372,7 +372,7 @@ public class HsRelatorioNormalizacao extends com.evolute.entity.evo.EvoDataObjec setHs_relatorio_id( ( Integer ) value ); break; case HsRelatorioNormalizacao.TO_HS_RELATORIO_ID_INDEX: - setToHs_relatorio_id( ( db.data.siprp_local.outer.HsRelatorioData ) value ); + setToHs_relatorio_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData ) value ); break; case HsRelatorioNormalizacao.HS_NORMALIZACAO_ID_INDEX: setHs_normalizacao_id( ( Integer ) value ); @@ -401,7 +401,7 @@ public class HsRelatorioNormalizacao extends com.evolute.entity.evo.EvoDataObjec this.hs_relatorio_id = ( Integer ) value; break; case HsRelatorioNormalizacao.TO_HS_RELATORIO_ID_INDEX: - this.to_hs_relatorio_id = ( db.data.siprp_local.outer.HsRelatorioData ) value; + this.to_hs_relatorio_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData ) value; break; case HsRelatorioNormalizacao.HS_NORMALIZACAO_ID_INDEX: this.hs_normalizacao_id = ( Integer ) value; @@ -461,7 +461,7 @@ public class HsRelatorioNormalizacao extends com.evolute.entity.evo.EvoDataObjec theClass = Integer.class; break; case HsRelatorioNormalizacao.TO_HS_RELATORIO_ID_INDEX: - theClass = db.data.siprp_local.outer.HsRelatorioData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData.class; break; case HsRelatorioNormalizacao.HS_NORMALIZACAO_ID_INDEX: theClass = Integer.class; @@ -501,12 +501,28 @@ public class HsRelatorioNormalizacao extends com.evolute.entity.evo.EvoDataObjec @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, HsRelatorioNormalizacao.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRelatorioPosto.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsRelatorioPosto.java similarity index 84% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRelatorioPosto.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsRelatorioPosto.java index 2462e104..ababbfca 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRelatorioPosto.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsRelatorioPosto.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsRelatorioPosto extends com.evolute.entity.evo.EvoDataObject @@ -35,12 +35,12 @@ public class HsRelatorioPosto extends com.evolute.entity.evo.EvoDataObjectfromHsRelatorioPostoMedida_posto_id() + public java.util.ListfromHsRelatorioPostoMedida_posto_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioPostoMedidaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoMedidaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsRelatorioPostoMedidaData.class , getPrimaryKey().getMap().get("id"), "posto_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoMedidaData.class , getPrimaryKey().getMap().get("id"), "posto_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -145,14 +145,14 @@ public class HsRelatorioPosto extends com.evolute.entity.evo.EvoDataObjectfromHsRelatorioPostoRisco_posto_id() + public java.util.ListfromHsRelatorioPostoRisco_posto_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioPostoRiscoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoRiscoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsRelatorioPostoRiscoData.class , getPrimaryKey().getMap().get("id"), "posto_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoRiscoData.class , getPrimaryKey().getMap().get("id"), "posto_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -220,7 +220,7 @@ public class HsRelatorioPosto extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsRelatorioPostoMedida extends com.evolute.entity.evo.EvoDataObject @@ -31,15 +31,15 @@ public class HsRelatorioPostoMedida extends com.evolute.entity.evo.EvoDataObject public static final com.evolute.entity.ForeignKey ForeignKeyposto_idTohs_relatorio_posto = - new com.evolute.entity.ForeignKey( HsRelatorioPostoMedida.class, HsRelatorioPostoMedida.POSTO_ID, db.data.siprp_local.outer.HsRelatorioPostoData.class, db.data.siprp_local.outer.HsRelatorioPostoData.ID ); + new com.evolute.entity.ForeignKey( HsRelatorioPostoMedida.class, HsRelatorioPostoMedida.POSTO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoData.ID ); public static final com.evolute.entity.ForeignKey ForeignKeymedida_idTohs_relatorio_medida = - new com.evolute.entity.ForeignKey( HsRelatorioPostoMedida.class, HsRelatorioPostoMedida.MEDIDA_ID, db.data.siprp_local.outer.HsRelatorioMedidaData.class, db.data.siprp_local.outer.HsRelatorioMedidaData.ID ); + new com.evolute.entity.ForeignKey( HsRelatorioPostoMedida.class, HsRelatorioPostoMedida.MEDIDA_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioMedidaData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioMedidaData.ID ); public static final String TABLENAME = "hs_relatorio_posto_medida"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.hs_relatorio_posto_medida"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.hs_relatorio_posto_medida"; public static final int _INVALID__INDEX = -1; public static final String POSTO_ID = "posto_id"; @@ -76,9 +76,9 @@ public class HsRelatorioPostoMedida extends com.evolute.entity.evo.EvoDataObject POSTO_ID, MEDIDA_ID, IS_PLANO_ACTUACAO, }; private Integer posto_id; - private db.data.siprp_local.outer.HsRelatorioPostoData to_posto_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoData to_posto_id; private Integer medida_id; - private db.data.siprp_local.outer.HsRelatorioMedidaData to_medida_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioMedidaData to_medida_id; private Boolean is_plano_actuacao; protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; @@ -119,7 +119,7 @@ public class HsRelatorioPostoMedida extends com.evolute.entity.evo.EvoDataObject LAZY_LOADED_OBJECTS.put( POSTO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.HsRelatorioPostoData toPosto_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoData toPosto_id() { try { @@ -132,7 +132,7 @@ public class HsRelatorioPostoMedida extends com.evolute.entity.evo.EvoDataObject return this.to_posto_id; } - public void setToPosto_id( db.data.siprp_local.outer.HsRelatorioPostoData to_posto_id ) + public void setToPosto_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoData to_posto_id ) { try { @@ -174,7 +174,7 @@ public class HsRelatorioPostoMedida extends com.evolute.entity.evo.EvoDataObject LAZY_LOADED_OBJECTS.put( MEDIDA_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.HsRelatorioMedidaData toMedida_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioMedidaData toMedida_id() { try { @@ -187,7 +187,7 @@ public class HsRelatorioPostoMedida extends com.evolute.entity.evo.EvoDataObject return this.to_medida_id; } - public void setToMedida_id( db.data.siprp_local.outer.HsRelatorioMedidaData to_medida_id ) + public void setToMedida_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioMedidaData to_medida_id ) { try { @@ -288,13 +288,13 @@ public class HsRelatorioPostoMedida extends com.evolute.entity.evo.EvoDataObject setPosto_id( ( Integer ) value ); break; case HsRelatorioPostoMedida.TO_POSTO_ID_INDEX: - setToPosto_id( ( db.data.siprp_local.outer.HsRelatorioPostoData ) value ); + setToPosto_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoData ) value ); break; case HsRelatorioPostoMedida.MEDIDA_ID_INDEX: setMedida_id( ( Integer ) value ); break; case HsRelatorioPostoMedida.TO_MEDIDA_ID_INDEX: - setToMedida_id( ( db.data.siprp_local.outer.HsRelatorioMedidaData ) value ); + setToMedida_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioMedidaData ) value ); break; case HsRelatorioPostoMedida.IS_PLANO_ACTUACAO_INDEX: setIs_plano_actuacao( ( Boolean ) value ); @@ -311,13 +311,13 @@ public class HsRelatorioPostoMedida extends com.evolute.entity.evo.EvoDataObject this.posto_id = ( Integer ) value; break; case HsRelatorioPostoMedida.TO_POSTO_ID_INDEX: - this.to_posto_id = ( db.data.siprp_local.outer.HsRelatorioPostoData ) value; + this.to_posto_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoData ) value; break; case HsRelatorioPostoMedida.MEDIDA_ID_INDEX: this.medida_id = ( Integer ) value; break; case HsRelatorioPostoMedida.TO_MEDIDA_ID_INDEX: - this.to_medida_id = ( db.data.siprp_local.outer.HsRelatorioMedidaData ) value; + this.to_medida_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioMedidaData ) value; break; case HsRelatorioPostoMedida.IS_PLANO_ACTUACAO_INDEX: this.is_plano_actuacao = ( Boolean ) value; @@ -365,13 +365,13 @@ public class HsRelatorioPostoMedida extends com.evolute.entity.evo.EvoDataObject theClass = Integer.class; break; case HsRelatorioPostoMedida.TO_POSTO_ID_INDEX: - theClass = db.data.siprp_local.outer.HsRelatorioPostoData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoData.class; break; case HsRelatorioPostoMedida.MEDIDA_ID_INDEX: theClass = Integer.class; break; case HsRelatorioPostoMedida.TO_MEDIDA_ID_INDEX: - theClass = db.data.siprp_local.outer.HsRelatorioMedidaData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioMedidaData.class; break; case HsRelatorioPostoMedida.IS_PLANO_ACTUACAO_INDEX: theClass = Boolean.class; @@ -399,6 +399,7 @@ public class HsRelatorioPostoMedida extends com.evolute.entity.evo.EvoDataObject @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, HsRelatorioPostoMedida.PK_FIELD_NAMES ); diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRelatorioPostoRisco.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsRelatorioPostoRisco.java similarity index 84% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRelatorioPostoRisco.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsRelatorioPostoRisco.java index 642653dc..e19419df 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRelatorioPostoRisco.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsRelatorioPostoRisco.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsRelatorioPostoRisco extends com.evolute.entity.evo.EvoDataObject @@ -39,18 +39,18 @@ public class HsRelatorioPostoRisco extends com.evolute.entity.evo.EvoDataObject< public static final com.evolute.entity.ForeignKey ForeignKeyposto_idTohs_relatorio_posto = - new com.evolute.entity.ForeignKey( HsRelatorioPostoRisco.class, HsRelatorioPostoRisco.POSTO_ID, db.data.siprp_local.outer.HsRelatorioPostoData.class, db.data.siprp_local.outer.HsRelatorioPostoData.ID ); + new com.evolute.entity.ForeignKey( HsRelatorioPostoRisco.class, HsRelatorioPostoRisco.POSTO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoData.ID ); public static final com.evolute.entity.ForeignKey ForeignKeyrisco_idTohs_relatorio_risco = - new com.evolute.entity.ForeignKey( HsRelatorioPostoRisco.class, HsRelatorioPostoRisco.RISCO_ID, db.data.siprp_local.outer.HsRelatorioRiscoData.class, db.data.siprp_local.outer.HsRelatorioRiscoData.ID ); + new com.evolute.entity.ForeignKey( HsRelatorioPostoRisco.class, HsRelatorioPostoRisco.RISCO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioRiscoData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioRiscoData.ID ); public static final com.evolute.entity.ForeignKey ForeignKeyvalor_qualitativo_idTohs_relatorio_risco_valor_qualitativo = - new com.evolute.entity.ForeignKey( HsRelatorioPostoRisco.class, HsRelatorioPostoRisco.VALOR_QUALITATIVO_ID, db.data.siprp_local.outer.HsRelatorioRiscoValorQualitativoData.class, db.data.siprp_local.outer.HsRelatorioRiscoValorQualitativoData.ID ); + new com.evolute.entity.ForeignKey( HsRelatorioPostoRisco.class, HsRelatorioPostoRisco.VALOR_QUALITATIVO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioRiscoValorQualitativoData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioRiscoValorQualitativoData.ID ); public static final String TABLENAME = "hs_relatorio_posto_risco"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.hs_relatorio_posto_risco"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.hs_relatorio_posto_risco"; public static final int _INVALID__INDEX = -1; public static final String POSTO_ID = "posto_id"; @@ -101,13 +101,13 @@ public class HsRelatorioPostoRisco extends com.evolute.entity.evo.EvoDataObject< POSTO_ID, RISCO_ID, PROBABILIDADE, SEVERIDADE, VALOR_QUALITATIVO_ID, ORDEM, }; private Integer posto_id; - private db.data.siprp_local.outer.HsRelatorioPostoData to_posto_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoData to_posto_id; private Integer risco_id; - private db.data.siprp_local.outer.HsRelatorioRiscoData to_risco_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioRiscoData to_risco_id; private Integer probabilidade; private Integer severidade; private Integer valor_qualitativo_id; - private db.data.siprp_local.outer.HsRelatorioRiscoValorQualitativoData to_valor_qualitativo_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioRiscoValorQualitativoData to_valor_qualitativo_id; private Integer ordem; protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; @@ -148,7 +148,7 @@ public class HsRelatorioPostoRisco extends com.evolute.entity.evo.EvoDataObject< LAZY_LOADED_OBJECTS.put( POSTO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.HsRelatorioPostoData toPosto_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoData toPosto_id() { try { @@ -161,7 +161,7 @@ public class HsRelatorioPostoRisco extends com.evolute.entity.evo.EvoDataObject< return this.to_posto_id; } - public void setToPosto_id( db.data.siprp_local.outer.HsRelatorioPostoData to_posto_id ) + public void setToPosto_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoData to_posto_id ) { try { @@ -203,7 +203,7 @@ public class HsRelatorioPostoRisco extends com.evolute.entity.evo.EvoDataObject< LAZY_LOADED_OBJECTS.put( RISCO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.HsRelatorioRiscoData toRisco_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioRiscoData toRisco_id() { try { @@ -216,7 +216,7 @@ public class HsRelatorioPostoRisco extends com.evolute.entity.evo.EvoDataObject< return this.to_risco_id; } - public void setToRisco_id( db.data.siprp_local.outer.HsRelatorioRiscoData to_risco_id ) + public void setToRisco_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioRiscoData to_risco_id ) { try { @@ -316,7 +316,7 @@ public class HsRelatorioPostoRisco extends com.evolute.entity.evo.EvoDataObject< LAZY_LOADED_OBJECTS.put( VALOR_QUALITATIVO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.HsRelatorioRiscoValorQualitativoData toValor_qualitativo_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioRiscoValorQualitativoData toValor_qualitativo_id() { try { @@ -329,7 +329,7 @@ public class HsRelatorioPostoRisco extends com.evolute.entity.evo.EvoDataObject< return this.to_valor_qualitativo_id; } - public void setToValor_qualitativo_id( db.data.siprp_local.outer.HsRelatorioRiscoValorQualitativoData to_valor_qualitativo_id ) + public void setToValor_qualitativo_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioRiscoValorQualitativoData to_valor_qualitativo_id ) { try { @@ -454,13 +454,13 @@ public class HsRelatorioPostoRisco extends com.evolute.entity.evo.EvoDataObject< setPosto_id( ( Integer ) value ); break; case HsRelatorioPostoRisco.TO_POSTO_ID_INDEX: - setToPosto_id( ( db.data.siprp_local.outer.HsRelatorioPostoData ) value ); + setToPosto_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoData ) value ); break; case HsRelatorioPostoRisco.RISCO_ID_INDEX: setRisco_id( ( Integer ) value ); break; case HsRelatorioPostoRisco.TO_RISCO_ID_INDEX: - setToRisco_id( ( db.data.siprp_local.outer.HsRelatorioRiscoData ) value ); + setToRisco_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioRiscoData ) value ); break; case HsRelatorioPostoRisco.PROBABILIDADE_INDEX: setProbabilidade( ( Integer ) value ); @@ -472,7 +472,7 @@ public class HsRelatorioPostoRisco extends com.evolute.entity.evo.EvoDataObject< setValor_qualitativo_id( ( Integer ) value ); break; case HsRelatorioPostoRisco.TO_VALOR_QUALITATIVO_ID_INDEX: - setToValor_qualitativo_id( ( db.data.siprp_local.outer.HsRelatorioRiscoValorQualitativoData ) value ); + setToValor_qualitativo_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioRiscoValorQualitativoData ) value ); break; case HsRelatorioPostoRisco.ORDEM_INDEX: setOrdem( ( Integer ) value ); @@ -489,13 +489,13 @@ public class HsRelatorioPostoRisco extends com.evolute.entity.evo.EvoDataObject< this.posto_id = ( Integer ) value; break; case HsRelatorioPostoRisco.TO_POSTO_ID_INDEX: - this.to_posto_id = ( db.data.siprp_local.outer.HsRelatorioPostoData ) value; + this.to_posto_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoData ) value; break; case HsRelatorioPostoRisco.RISCO_ID_INDEX: this.risco_id = ( Integer ) value; break; case HsRelatorioPostoRisco.TO_RISCO_ID_INDEX: - this.to_risco_id = ( db.data.siprp_local.outer.HsRelatorioRiscoData ) value; + this.to_risco_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioRiscoData ) value; break; case HsRelatorioPostoRisco.PROBABILIDADE_INDEX: this.probabilidade = ( Integer ) value; @@ -507,7 +507,7 @@ public class HsRelatorioPostoRisco extends com.evolute.entity.evo.EvoDataObject< this.valor_qualitativo_id = ( Integer ) value; break; case HsRelatorioPostoRisco.TO_VALOR_QUALITATIVO_ID_INDEX: - this.to_valor_qualitativo_id = ( db.data.siprp_local.outer.HsRelatorioRiscoValorQualitativoData ) value; + this.to_valor_qualitativo_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioRiscoValorQualitativoData ) value; break; case HsRelatorioPostoRisco.ORDEM_INDEX: this.ordem = ( Integer ) value; @@ -555,13 +555,13 @@ public class HsRelatorioPostoRisco extends com.evolute.entity.evo.EvoDataObject< theClass = Integer.class; break; case HsRelatorioPostoRisco.TO_POSTO_ID_INDEX: - theClass = db.data.siprp_local.outer.HsRelatorioPostoData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoData.class; break; case HsRelatorioPostoRisco.RISCO_ID_INDEX: theClass = Integer.class; break; case HsRelatorioPostoRisco.TO_RISCO_ID_INDEX: - theClass = db.data.siprp_local.outer.HsRelatorioRiscoData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioRiscoData.class; break; case HsRelatorioPostoRisco.PROBABILIDADE_INDEX: theClass = Integer.class; @@ -573,7 +573,7 @@ public class HsRelatorioPostoRisco extends com.evolute.entity.evo.EvoDataObject< theClass = Integer.class; break; case HsRelatorioPostoRisco.TO_VALOR_QUALITATIVO_ID_INDEX: - theClass = db.data.siprp_local.outer.HsRelatorioRiscoValorQualitativoData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioRiscoValorQualitativoData.class; break; case HsRelatorioPostoRisco.ORDEM_INDEX: theClass = Integer.class; @@ -601,6 +601,7 @@ public class HsRelatorioPostoRisco extends com.evolute.entity.evo.EvoDataObject< @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, HsRelatorioPostoRisco.PK_FIELD_NAMES ); diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRelatorioRisco.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsRelatorioRisco.java similarity index 84% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRelatorioRisco.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsRelatorioRisco.java index cfa5374b..caad2ff8 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRelatorioRisco.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsRelatorioRisco.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsRelatorioRisco extends com.evolute.entity.evo.EvoDataObject @@ -35,12 +35,12 @@ public class HsRelatorioRisco extends com.evolute.entity.evo.EvoDataObjectfromHsRelatorioMedida_risco_id() + public java.util.ListfromHsRelatorioMedida_risco_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioMedidaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioMedidaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsRelatorioMedidaData.class , getPrimaryKey().getMap().get("id"), "risco_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioMedidaData.class , getPrimaryKey().getMap().get("id"), "risco_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -147,14 +147,14 @@ public class HsRelatorioRisco extends com.evolute.entity.evo.EvoDataObjectfromHsRelatorioPostoRisco_risco_id() + public java.util.ListfromHsRelatorioPostoRisco_risco_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioPostoRiscoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoRiscoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsRelatorioPostoRiscoData.class , getPrimaryKey().getMap().get("id"), "risco_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoRiscoData.class , getPrimaryKey().getMap().get("id"), "risco_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -193,7 +193,7 @@ public class HsRelatorioRisco extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsRelatorioRiscoValorQualitativo extends com.evolute.entity.evo.EvoDataObject @@ -27,7 +27,7 @@ public class HsRelatorioRiscoValorQualitativo extends com.evolute.entity.evo.Evo public static final String TABLENAME = "hs_relatorio_risco_valor_qualitativo"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.hs_relatorio_risco_valor_qualitativo"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.hs_relatorio_risco_valor_qualitativo"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -94,14 +94,14 @@ public class HsRelatorioRiscoValorQualitativo extends com.evolute.entity.evo.Evo LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE ); } - public java.util.ListfromHsPostoRisco_valor_qualitativo() + public java.util.ListfromHsPostoRisco_valor_qualitativo() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsPostoRiscoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsPostoRiscoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsPostoRiscoData.class , getPrimaryKey().getMap().get("id"), "valor_qualitativo" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsPostoRiscoData.class , getPrimaryKey().getMap().get("id"), "valor_qualitativo" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -111,14 +111,14 @@ public class HsRelatorioRiscoValorQualitativo extends com.evolute.entity.evo.Evo return result; } - public java.util.ListfromHsRelatorioPostoRisco_valor_qualitativo_id() + public java.util.ListfromHsRelatorioPostoRisco_valor_qualitativo_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioPostoRiscoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoRiscoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsRelatorioPostoRiscoData.class , getPrimaryKey().getMap().get("id"), "valor_qualitativo_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioPostoRiscoData.class , getPrimaryKey().getMap().get("id"), "valor_qualitativo_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -282,12 +282,28 @@ public class HsRelatorioRiscoValorQualitativo extends com.evolute.entity.evo.Evo @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, HsRelatorioRiscoValorQualitativo.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRisco.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsRisco.java similarity index 80% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRisco.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsRisco.java index 186b1c86..1e376bcd 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/HsRisco.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/HsRisco.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsRisco extends com.evolute.entity.evo.EvoDataObject @@ -33,12 +33,12 @@ public class HsRisco extends com.evolute.entity.evo.EvoDataObjectfromHsPostoRisco_risco_id() + public java.util.ListfromHsPostoRisco_risco_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsPostoRiscoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsPostoRiscoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsPostoRiscoData.class , getPrimaryKey().getMap().get("id"), "risco_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsPostoRiscoData.class , getPrimaryKey().getMap().get("id"), "risco_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -139,14 +139,14 @@ public class HsRisco extends com.evolute.entity.evo.EvoDataObjectfromHsRiscoEmpresa_risco_id() + public java.util.ListfromHsRiscoEmpresa_risco_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsRiscoEmpresaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRiscoEmpresaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsRiscoEmpresaData.class , getPrimaryKey().getMap().get("id"), "risco_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRiscoEmpresaData.class , getPrimaryKey().getMap().get("id"), "risco_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -156,14 +156,14 @@ public class HsRisco extends com.evolute.entity.evo.EvoDataObjectfromHsRiscoMedida_risco_id() + public java.util.ListfromHsRiscoMedida_risco_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsRiscoMedidaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRiscoMedidaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsRiscoMedidaData.class , getPrimaryKey().getMap().get("id"), "risco_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRiscoMedidaData.class , getPrimaryKey().getMap().get("id"), "risco_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -202,7 +202,7 @@ public class HsRisco extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsRiscoEmpresa extends com.evolute.entity.evo.EvoDataObject @@ -29,15 +29,15 @@ public class HsRiscoEmpresa extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsRiscoMedida extends com.evolute.entity.evo.EvoDataObject @@ -29,15 +29,15 @@ public class HsRiscoMedida extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class HsRiscoTema extends com.evolute.entity.evo.EvoDataObject @@ -29,7 +29,7 @@ public class HsRiscoTema extends com.evolute.entity.evo.EvoDataObjectfromHsRisco_tema_id() + public java.util.ListfromHsRisco_tema_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsRiscoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRiscoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsRiscoData.class , getPrimaryKey().getMap().get("id"), "tema_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRiscoData.class , getPrimaryKey().getMap().get("id"), "tema_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -315,12 +315,28 @@ public class HsRiscoTema extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class Ids extends com.evolute.entity.evo.EvoDataObject @@ -25,7 +25,7 @@ public class Ids extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class Image extends com.evolute.entity.evo.EvoDataObject @@ -29,7 +29,7 @@ public class Image extends com.evolute.entity.evo.EvoDataObjectfromEmpresas_empresa_logo_id() + public java.util.ListfromEmpresas_empresa_logo_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.EmpresasData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresasData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.EmpresasData.class , getPrimaryKey().getMap().get("id"), "empresa_logo_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresasData.class , getPrimaryKey().getMap().get("id"), "empresa_logo_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -117,14 +117,14 @@ public class Image extends com.evolute.entity.evo.EvoDataObjectfromMarcacoesTecnicosHst_assinatura() + public java.util.ListfromMarcacoesTecnicosHst_assinatura() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.MarcacoesTecnicosHstData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTecnicosHstData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.MarcacoesTecnicosHstData.class , getPrimaryKey().getMap().get("id"), "assinatura" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTecnicosHstData.class , getPrimaryKey().getMap().get("id"), "assinatura" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -338,12 +338,28 @@ public class Image extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class Lembretes extends com.evolute.entity.evo.EvoDataObject @@ -81,36 +81,36 @@ public class Lembretes extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class LembretesTipos extends com.evolute.entity.evo.EvoDataObject @@ -33,7 +33,7 @@ public class LembretesTipos extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class MarcacoesEmpresa extends com.evolute.entity.evo.EvoDataObject @@ -33,12 +33,12 @@ public class MarcacoesEmpresa extends com.evolute.entity.evo.EvoDataObjectfromLembretes_marcacoes_empresa_id() + public java.util.ListfromLembretes_marcacoes_empresa_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.LembretesData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.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" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "marcacoes_empresa_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -226,7 +226,7 @@ public class MarcacoesEmpresa extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObject @@ -41,24 +41,26 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje FIELD_INDEXES.put( MarcacoesEstabelecimento.TECNICO_SUPERIOR_HST, MarcacoesEstabelecimento.TECNICO_SUPERIOR_HST_INDEX ); FIELD_INDEXES.put( MarcacoesEstabelecimento.TECNICO_SUPERIOR_HST_FULL, MarcacoesEstabelecimento.TECNICO_SUPERIOR_HST_INDEX ); FIELD_INDEXES.put( MarcacoesEstabelecimento.TO_TECNICO_SUPERIOR_HST, MarcacoesEstabelecimento.TO_TECNICO_SUPERIOR_HST_INDEX ); + FIELD_INDEXES.put( MarcacoesEstabelecimento.DELETED_STAMP, MarcacoesEstabelecimento.DELETED_STAMP_INDEX ); + FIELD_INDEXES.put( MarcacoesEstabelecimento.DELETED_STAMP_FULL, MarcacoesEstabelecimento.DELETED_STAMP_INDEX ); } private final java.util.HashMap< String, Boolean > LAZY_LOADED_OBJECTS = new java.util.HashMap< String, Boolean >(); public static final com.evolute.entity.ForeignKey ForeignKeyestabelecimento_idToestabelecimentos = - new com.evolute.entity.ForeignKey( MarcacoesEstabelecimento.class, MarcacoesEstabelecimento.ESTABELECIMENTO_ID, db.data.siprp_local.outer.EstabelecimentosData.class, db.data.siprp_local.outer.EstabelecimentosData.ID ); + new com.evolute.entity.ForeignKey( MarcacoesEstabelecimento.class, MarcacoesEstabelecimento.ESTABELECIMENTO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.ID ); public static final com.evolute.entity.ForeignKey ForeignKeytecnico_hstTomarcacoes_tecnicos_hst = - new com.evolute.entity.ForeignKey( MarcacoesEstabelecimento.class, MarcacoesEstabelecimento.TECNICO_HST, db.data.siprp_local.outer.MarcacoesTecnicosHstData.class, db.data.siprp_local.outer.MarcacoesTecnicosHstData.ID ); + new com.evolute.entity.ForeignKey( MarcacoesEstabelecimento.class, MarcacoesEstabelecimento.TECNICO_HST, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTecnicosHstData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTecnicosHstData.ID ); public static final com.evolute.entity.ForeignKey ForeignKeytecnico_superior_hstTomarcacoes_tecnicos_hst = - new com.evolute.entity.ForeignKey( MarcacoesEstabelecimento.class, MarcacoesEstabelecimento.TECNICO_SUPERIOR_HST, db.data.siprp_local.outer.MarcacoesTecnicosHstData.class, db.data.siprp_local.outer.MarcacoesTecnicosHstData.ID ); + new com.evolute.entity.ForeignKey( MarcacoesEstabelecimento.class, MarcacoesEstabelecimento.TECNICO_SUPERIOR_HST, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTecnicosHstData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTecnicosHstData.ID ); public static final String TABLENAME = "marcacoes_estabelecimento"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.marcacoes_estabelecimento"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.marcacoes_estabelecimento"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -100,20 +102,23 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje public static final String TO_TECNICO_SUPERIOR_HST = "to_tecnico_superior_hst"; public static final String TO_TECNICO_SUPERIOR_HST_FULL = "marcacoes_estabelecimento.to_tecnico_superior_hst"; public static final int TO_TECNICO_SUPERIOR_HST_INDEX = 12; + public static final String DELETED_STAMP = "deleted_stamp"; + public static final String DELETED_STAMP_FULL = "marcacoes_estabelecimento.deleted_stamp"; + public static final int DELETED_STAMP_INDEX = 13; public static final String FIELD_NAMES[] = new String[]{ DATA, REALIZADA, DATA_EMAIL, DATA_RELATORIO, ESTABELECIMENTO_ID, TO_ESTABELECIMENTO_ID, ESTADO, TECNICO_HST, TO_TECNICO_HST, OBSERVACOES, - TECNICO_SUPERIOR_HST, TO_TECNICO_SUPERIOR_HST, }; + TECNICO_SUPERIOR_HST, TO_TECNICO_SUPERIOR_HST, DELETED_STAMP, }; public static final String FIELD_NAMES_FULL[] = new String[]{ TABLENAME + "." + DATA, TABLENAME + "." + REALIZADA, TABLENAME + "." + DATA_EMAIL, TABLENAME + "." + DATA_RELATORIO, TABLENAME + "." + ESTABELECIMENTO_ID, TABLENAME + "." + TO_ESTABELECIMENTO_ID, TABLENAME + "." + ESTADO, TABLENAME + "." + TECNICO_HST, TABLENAME + "." + TO_TECNICO_HST, TABLENAME + "." + OBSERVACOES, - TABLENAME + "." + TECNICO_SUPERIOR_HST, TABLENAME + "." + TO_TECNICO_SUPERIOR_HST, }; + TABLENAME + "." + TECNICO_SUPERIOR_HST, TABLENAME + "." + TO_TECNICO_SUPERIOR_HST, TABLENAME + "." + DELETED_STAMP, }; protected static final String DB_FIELD_NAMES[] = new String[]{ ID, DATA, REALIZADA, DATA_EMAIL, DATA_RELATORIO, ESTABELECIMENTO_ID, ESTADO, - TECNICO_HST, OBSERVACOES, TECNICO_SUPERIOR_HST, }; + TECNICO_HST, OBSERVACOES, TECNICO_SUPERIOR_HST, DELETED_STAMP, }; protected static final String PK_FIELD_NAMES[] = new String[]{ @@ -122,7 +127,7 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje public static final String DEFAULT_LOAD_SET[] = new String[] { ID, DATA, REALIZADA, DATA_EMAIL, DATA_RELATORIO, ESTABELECIMENTO_ID, ESTADO, - TECNICO_HST, OBSERVACOES, TECNICO_SUPERIOR_HST, }; + TECNICO_HST, OBSERVACOES, TECNICO_SUPERIOR_HST, DELETED_STAMP, }; private Integer id; private java.util.Date data; @@ -130,13 +135,14 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje private java.util.Date data_email; private java.util.Date data_relatorio; private Integer estabelecimento_id; - private db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id; private Integer estado; private Integer tecnico_hst; - private db.data.siprp_local.outer.MarcacoesTecnicosHstData to_tecnico_hst; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTecnicosHstData to_tecnico_hst; private String observacoes; private Integer tecnico_superior_hst; - private db.data.siprp_local.outer.MarcacoesTecnicosHstData to_tecnico_superior_hst; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTecnicosHstData to_tecnico_superior_hst; + private java.sql.Timestamp deleted_stamp; protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; @@ -145,7 +151,7 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje super(); dirtyProperties = new boolean[]{ false, false, false, false, false, false, false, false, false, false, false, - false, false }; + false, false, false }; } public Integer getId() @@ -177,14 +183,14 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE ); } - public java.util.ListfromFilFileMarcacoesEstabelecimento_marcacao_id() + public java.util.ListfromFilFileMarcacoesEstabelecimento_marcacao_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.FilFileMarcacoesEstabelecimentoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.FilFileMarcacoesEstabelecimentoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.FilFileMarcacoesEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "marcacao_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.FilFileMarcacoesEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "marcacao_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -194,14 +200,14 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje return result; } - public java.util.ListfromHsRelatorio_marcacao_id() + public java.util.ListfromHsRelatorio_marcacao_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.HsRelatorioData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.HsRelatorioData.class , getPrimaryKey().getMap().get("id"), "marcacao_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.HsRelatorioData.class , getPrimaryKey().getMap().get("id"), "marcacao_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -211,14 +217,14 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje return result; } - public java.util.ListfromLembretes_marcacao_estabelecimento_id() + public java.util.ListfromLembretes_marcacao_estabelecimento_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.LembretesData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.LembretesData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "marcacao_estabelecimento_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "marcacao_estabelecimento_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -373,7 +379,7 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje LAZY_LOADED_OBJECTS.put( ESTABELECIMENTO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.EstabelecimentosData toEstabelecimento_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData toEstabelecimento_id() { try { @@ -386,7 +392,7 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje return this.to_estabelecimento_id; } - public void setToEstabelecimento_id( db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id ) + public void setToEstabelecimento_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData to_estabelecimento_id ) { try { @@ -457,7 +463,7 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje LAZY_LOADED_OBJECTS.put( TECNICO_HST, Boolean.TRUE ); } - public db.data.siprp_local.outer.MarcacoesTecnicosHstData toTecnico_hst() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTecnicosHstData toTecnico_hst() { try { @@ -470,7 +476,7 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje return this.to_tecnico_hst; } - public void setToTecnico_hst( db.data.siprp_local.outer.MarcacoesTecnicosHstData to_tecnico_hst ) + public void setToTecnico_hst( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTecnicosHstData to_tecnico_hst ) { try { @@ -541,7 +547,7 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje LAZY_LOADED_OBJECTS.put( TECNICO_SUPERIOR_HST, Boolean.TRUE ); } - public db.data.siprp_local.outer.MarcacoesTecnicosHstData toTecnico_superior_hst() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTecnicosHstData toTecnico_superior_hst() { try { @@ -554,7 +560,7 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje return this.to_tecnico_superior_hst; } - public void setToTecnico_superior_hst( db.data.siprp_local.outer.MarcacoesTecnicosHstData to_tecnico_superior_hst ) + public void setToTecnico_superior_hst( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTecnicosHstData to_tecnico_superior_hst ) { try { @@ -567,6 +573,35 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje this.to_tecnico_superior_hst = to_tecnico_superior_hst; } + 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; @@ -612,6 +647,9 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje case MarcacoesEstabelecimento.TO_TECNICO_SUPERIOR_HST_INDEX: value = toTecnico_superior_hst(); break; + case MarcacoesEstabelecimento.DELETED_STAMP_INDEX: + value = getDeleted_stamp(); + break; } return value; } @@ -661,6 +699,9 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje case MarcacoesEstabelecimento.TO_TECNICO_SUPERIOR_HST_INDEX: value = this.to_tecnico_superior_hst; break; + case MarcacoesEstabelecimento.DELETED_STAMP_INDEX: + value = this.deleted_stamp; + break; } return value; } @@ -689,7 +730,7 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje setEstabelecimento_id( ( Integer ) value ); break; case MarcacoesEstabelecimento.TO_ESTABELECIMENTO_ID_INDEX: - setToEstabelecimento_id( ( db.data.siprp_local.outer.EstabelecimentosData ) value ); + setToEstabelecimento_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData ) value ); break; case MarcacoesEstabelecimento.ESTADO_INDEX: setEstado( ( Integer ) value ); @@ -698,7 +739,7 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje setTecnico_hst( ( Integer ) value ); break; case MarcacoesEstabelecimento.TO_TECNICO_HST_INDEX: - setToTecnico_hst( ( db.data.siprp_local.outer.MarcacoesTecnicosHstData ) value ); + setToTecnico_hst( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTecnicosHstData ) value ); break; case MarcacoesEstabelecimento.OBSERVACOES_INDEX: setObservacoes( ( String ) value ); @@ -707,7 +748,10 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje setTecnico_superior_hst( ( Integer ) value ); break; case MarcacoesEstabelecimento.TO_TECNICO_SUPERIOR_HST_INDEX: - setToTecnico_superior_hst( ( db.data.siprp_local.outer.MarcacoesTecnicosHstData ) value ); + setToTecnico_superior_hst( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTecnicosHstData ) value ); + break; + case MarcacoesEstabelecimento.DELETED_STAMP_INDEX: + setDeleted_stamp( ( java.sql.Timestamp ) value ); break; } } @@ -736,7 +780,7 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje this.estabelecimento_id = ( Integer ) value; break; case MarcacoesEstabelecimento.TO_ESTABELECIMENTO_ID_INDEX: - this.to_estabelecimento_id = ( db.data.siprp_local.outer.EstabelecimentosData ) value; + this.to_estabelecimento_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData ) value; break; case MarcacoesEstabelecimento.ESTADO_INDEX: this.estado = ( Integer ) value; @@ -745,7 +789,7 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje this.tecnico_hst = ( Integer ) value; break; case MarcacoesEstabelecimento.TO_TECNICO_HST_INDEX: - this.to_tecnico_hst = ( db.data.siprp_local.outer.MarcacoesTecnicosHstData ) value; + this.to_tecnico_hst = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTecnicosHstData ) value; break; case MarcacoesEstabelecimento.OBSERVACOES_INDEX: this.observacoes = ( String ) value; @@ -754,7 +798,10 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje this.tecnico_superior_hst = ( Integer ) value; break; case MarcacoesEstabelecimento.TO_TECNICO_SUPERIOR_HST_INDEX: - this.to_tecnico_superior_hst = ( db.data.siprp_local.outer.MarcacoesTecnicosHstData ) value; + this.to_tecnico_superior_hst = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTecnicosHstData ) value; + break; + case MarcacoesEstabelecimento.DELETED_STAMP_INDEX: + this.deleted_stamp = ( java.sql.Timestamp ) value; break; } } @@ -814,7 +861,7 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje theClass = Integer.class; break; case MarcacoesEstabelecimento.TO_ESTABELECIMENTO_ID_INDEX: - theClass = db.data.siprp_local.outer.EstabelecimentosData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.class; break; case MarcacoesEstabelecimento.ESTADO_INDEX: theClass = Integer.class; @@ -823,7 +870,7 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje theClass = Integer.class; break; case MarcacoesEstabelecimento.TO_TECNICO_HST_INDEX: - theClass = db.data.siprp_local.outer.MarcacoesTecnicosHstData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTecnicosHstData.class; break; case MarcacoesEstabelecimento.OBSERVACOES_INDEX: theClass = String.class; @@ -832,7 +879,10 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje theClass = Integer.class; break; case MarcacoesEstabelecimento.TO_TECNICO_SUPERIOR_HST_INDEX: - theClass = db.data.siprp_local.outer.MarcacoesTecnicosHstData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTecnicosHstData.class; + break; + case MarcacoesEstabelecimento.DELETED_STAMP_INDEX: + theClass = java.sql.Timestamp.class; break; } return theClass; @@ -857,12 +907,28 @@ public class MarcacoesEstabelecimento extends com.evolute.entity.evo.EvoDataObje @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, MarcacoesEstabelecimento.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/MarcacoesGruposRealizados.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/MarcacoesGruposRealizados.java similarity index 81% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/MarcacoesGruposRealizados.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/MarcacoesGruposRealizados.java index 1f95dc3c..61201362 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/MarcacoesGruposRealizados.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/MarcacoesGruposRealizados.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class MarcacoesGruposRealizados extends com.evolute.entity.evo.EvoDataObject @@ -35,18 +35,18 @@ public class MarcacoesGruposRealizados extends com.evolute.entity.evo.EvoDataObj public static final com.evolute.entity.ForeignKey ForeignKeymarcacao_trabalhador_idTomarcacoes_trabalhador = - new com.evolute.entity.ForeignKey( MarcacoesGruposRealizados.class, MarcacoesGruposRealizados.MARCACAO_TRABALHADOR_ID, db.data.siprp_local.outer.MarcacoesTrabalhadorData.class, db.data.siprp_local.outer.MarcacoesTrabalhadorData.ID ); + new com.evolute.entity.ForeignKey( MarcacoesGruposRealizados.class, MarcacoesGruposRealizados.MARCACAO_TRABALHADOR_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorData.ID ); public static final com.evolute.entity.ForeignKey ForeignKeygrupo_protocolo_idToprt_grupos_protocolo = - new com.evolute.entity.ForeignKey( MarcacoesGruposRealizados.class, MarcacoesGruposRealizados.GRUPO_PROTOCOLO_ID, db.data.siprp_local.outer.PrtGruposProtocoloData.class, db.data.siprp_local.outer.PrtGruposProtocoloData.ID ); + new com.evolute.entity.ForeignKey( MarcacoesGruposRealizados.class, MarcacoesGruposRealizados.GRUPO_PROTOCOLO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData.ID ); public static final com.evolute.entity.ForeignKey ForeignKeymarcacoes_trabalhador_estado_idTomarcacoes_trabalhador_estados = - new com.evolute.entity.ForeignKey( MarcacoesGruposRealizados.class, MarcacoesGruposRealizados.MARCACOES_TRABALHADOR_ESTADO_ID, db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData.class, db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData.ID ); + new com.evolute.entity.ForeignKey( MarcacoesGruposRealizados.class, MarcacoesGruposRealizados.MARCACOES_TRABALHADOR_ESTADO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData.ID ); public static final String TABLENAME = "marcacoes_grupos_realizados"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.marcacoes_grupos_realizados"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.marcacoes_grupos_realizados"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -96,11 +96,11 @@ public class MarcacoesGruposRealizados extends com.evolute.entity.evo.EvoDataObj private Integer id; private Integer marcacao_trabalhador_id; - private db.data.siprp_local.outer.MarcacoesTrabalhadorData to_marcacao_trabalhador_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorData to_marcacao_trabalhador_id; private Integer grupo_protocolo_id; - private db.data.siprp_local.outer.PrtGruposProtocoloData to_grupo_protocolo_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData to_grupo_protocolo_id; private Integer marcacoes_trabalhador_estado_id; - private db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData to_marcacoes_trabalhador_estado_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData to_marcacoes_trabalhador_estado_id; protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; @@ -169,7 +169,7 @@ public class MarcacoesGruposRealizados extends com.evolute.entity.evo.EvoDataObj LAZY_LOADED_OBJECTS.put( MARCACAO_TRABALHADOR_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.MarcacoesTrabalhadorData toMarcacao_trabalhador_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorData toMarcacao_trabalhador_id() { try { @@ -182,7 +182,7 @@ public class MarcacoesGruposRealizados extends com.evolute.entity.evo.EvoDataObj return this.to_marcacao_trabalhador_id; } - public void setToMarcacao_trabalhador_id( db.data.siprp_local.outer.MarcacoesTrabalhadorData to_marcacao_trabalhador_id ) + public void setToMarcacao_trabalhador_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorData to_marcacao_trabalhador_id ) { try { @@ -224,7 +224,7 @@ public class MarcacoesGruposRealizados extends com.evolute.entity.evo.EvoDataObj LAZY_LOADED_OBJECTS.put( GRUPO_PROTOCOLO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.PrtGruposProtocoloData toGrupo_protocolo_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData toGrupo_protocolo_id() { try { @@ -237,7 +237,7 @@ public class MarcacoesGruposRealizados extends com.evolute.entity.evo.EvoDataObj return this.to_grupo_protocolo_id; } - public void setToGrupo_protocolo_id( db.data.siprp_local.outer.PrtGruposProtocoloData to_grupo_protocolo_id ) + public void setToGrupo_protocolo_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData to_grupo_protocolo_id ) { try { @@ -279,7 +279,7 @@ public class MarcacoesGruposRealizados extends com.evolute.entity.evo.EvoDataObj LAZY_LOADED_OBJECTS.put( MARCACOES_TRABALHADOR_ESTADO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData toMarcacoes_trabalhador_estado_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData toMarcacoes_trabalhador_estado_id() { try { @@ -292,7 +292,7 @@ public class MarcacoesGruposRealizados extends com.evolute.entity.evo.EvoDataObj return this.to_marcacoes_trabalhador_estado_id; } - public void setToMarcacoes_trabalhador_estado_id( db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData to_marcacoes_trabalhador_estado_id ) + public void setToMarcacoes_trabalhador_estado_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData to_marcacoes_trabalhador_estado_id ) { try { @@ -379,19 +379,19 @@ public class MarcacoesGruposRealizados extends com.evolute.entity.evo.EvoDataObj setMarcacao_trabalhador_id( ( Integer ) value ); break; case MarcacoesGruposRealizados.TO_MARCACAO_TRABALHADOR_ID_INDEX: - setToMarcacao_trabalhador_id( ( db.data.siprp_local.outer.MarcacoesTrabalhadorData ) value ); + setToMarcacao_trabalhador_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorData ) value ); break; case MarcacoesGruposRealizados.GRUPO_PROTOCOLO_ID_INDEX: setGrupo_protocolo_id( ( Integer ) value ); break; case MarcacoesGruposRealizados.TO_GRUPO_PROTOCOLO_ID_INDEX: - setToGrupo_protocolo_id( ( db.data.siprp_local.outer.PrtGruposProtocoloData ) value ); + setToGrupo_protocolo_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData ) value ); break; case MarcacoesGruposRealizados.MARCACOES_TRABALHADOR_ESTADO_ID_INDEX: setMarcacoes_trabalhador_estado_id( ( Integer ) value ); break; case MarcacoesGruposRealizados.TO_MARCACOES_TRABALHADOR_ESTADO_ID_INDEX: - setToMarcacoes_trabalhador_estado_id( ( db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData ) value ); + setToMarcacoes_trabalhador_estado_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData ) value ); break; } } @@ -408,19 +408,19 @@ public class MarcacoesGruposRealizados extends com.evolute.entity.evo.EvoDataObj this.marcacao_trabalhador_id = ( Integer ) value; break; case MarcacoesGruposRealizados.TO_MARCACAO_TRABALHADOR_ID_INDEX: - this.to_marcacao_trabalhador_id = ( db.data.siprp_local.outer.MarcacoesTrabalhadorData ) value; + this.to_marcacao_trabalhador_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorData ) value; break; case MarcacoesGruposRealizados.GRUPO_PROTOCOLO_ID_INDEX: this.grupo_protocolo_id = ( Integer ) value; break; case MarcacoesGruposRealizados.TO_GRUPO_PROTOCOLO_ID_INDEX: - this.to_grupo_protocolo_id = ( db.data.siprp_local.outer.PrtGruposProtocoloData ) value; + this.to_grupo_protocolo_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData ) value; break; case MarcacoesGruposRealizados.MARCACOES_TRABALHADOR_ESTADO_ID_INDEX: this.marcacoes_trabalhador_estado_id = ( Integer ) value; break; case MarcacoesGruposRealizados.TO_MARCACOES_TRABALHADOR_ESTADO_ID_INDEX: - this.to_marcacoes_trabalhador_estado_id = ( db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData ) value; + this.to_marcacoes_trabalhador_estado_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData ) value; break; } } @@ -468,19 +468,19 @@ public class MarcacoesGruposRealizados extends com.evolute.entity.evo.EvoDataObj theClass = Integer.class; break; case MarcacoesGruposRealizados.TO_MARCACAO_TRABALHADOR_ID_INDEX: - theClass = db.data.siprp_local.outer.MarcacoesTrabalhadorData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorData.class; break; case MarcacoesGruposRealizados.GRUPO_PROTOCOLO_ID_INDEX: theClass = Integer.class; break; case MarcacoesGruposRealizados.TO_GRUPO_PROTOCOLO_ID_INDEX: - theClass = db.data.siprp_local.outer.PrtGruposProtocoloData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData.class; break; case MarcacoesGruposRealizados.MARCACOES_TRABALHADOR_ESTADO_ID_INDEX: theClass = Integer.class; break; case MarcacoesGruposRealizados.TO_MARCACOES_TRABALHADOR_ESTADO_ID_INDEX: - theClass = db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData.class; break; } return theClass; @@ -505,12 +505,28 @@ public class MarcacoesGruposRealizados extends com.evolute.entity.evo.EvoDataObj @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, MarcacoesGruposRealizados.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/MarcacoesTecnicosHst.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/MarcacoesTecnicosHst.java similarity index 88% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/MarcacoesTecnicosHst.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/MarcacoesTecnicosHst.java index d7628ac5..33534afd 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/MarcacoesTecnicosHst.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/MarcacoesTecnicosHst.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class MarcacoesTecnicosHst extends com.evolute.entity.evo.EvoDataObject @@ -43,12 +43,12 @@ public class MarcacoesTecnicosHst extends com.evolute.entity.evo.EvoDataObjectfromMarcacoesEstabelecimento_tecnico_hst() + public java.util.ListfromMarcacoesEstabelecimento_tecnico_hst() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.MarcacoesEstabelecimentoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesEstabelecimentoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.MarcacoesEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "tecnico_hst" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "tecnico_hst" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -173,14 +173,14 @@ public class MarcacoesTecnicosHst extends com.evolute.entity.evo.EvoDataObjectfromMarcacoesEstabelecimento_tecnico_superior_hst() + public java.util.ListfromMarcacoesEstabelecimento_tecnico_superior_hst() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.MarcacoesEstabelecimentoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesEstabelecimentoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.MarcacoesEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "tecnico_superior_hst" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesEstabelecimentoData.class , getPrimaryKey().getMap().get("id"), "tecnico_superior_hst" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -422,7 +422,7 @@ public class MarcacoesTecnicosHst extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class MarcacoesTrabalhador extends com.evolute.entity.evo.EvoDataObject @@ -53,15 +53,15 @@ public class MarcacoesTrabalhador extends com.evolute.entity.evo.EvoDataObjectfromLembretes_marcacao_trabalhador_id() + public java.util.ListfromLembretes_marcacao_trabalhador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.LembretesData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.LembretesData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "marcacao_trabalhador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "marcacao_trabalhador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -209,14 +209,14 @@ public class MarcacoesTrabalhador extends com.evolute.entity.evo.EvoDataObjectfromMarcacoesGruposRealizados_marcacao_trabalhador_id() + public java.util.ListfromMarcacoesGruposRealizados_marcacao_trabalhador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.MarcacoesGruposRealizadosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesGruposRealizadosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.MarcacoesGruposRealizadosData.class , getPrimaryKey().getMap().get("id"), "marcacao_trabalhador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesGruposRealizadosData.class , getPrimaryKey().getMap().get("id"), "marcacao_trabalhador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -226,14 +226,14 @@ public class MarcacoesTrabalhador extends com.evolute.entity.evo.EvoDataObjectfromMarcacoesTrabalhadorEstados_marcacao_id() + public java.util.ListfromMarcacoesTrabalhadorEstados_marcacao_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData.class , getPrimaryKey().getMap().get("id"), "marcacao_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData.class , getPrimaryKey().getMap().get("id"), "marcacao_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -417,7 +417,7 @@ public class MarcacoesTrabalhador extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class MarcacoesTrabalhadorEstados extends com.evolute.entity.evo.EvoDataObject @@ -35,15 +35,15 @@ public class MarcacoesTrabalhadorEstados extends com.evolute.entity.evo.EvoDataO public static final com.evolute.entity.ForeignKey ForeignKeymarcacao_idTomarcacoes_trabalhador = - new com.evolute.entity.ForeignKey( MarcacoesTrabalhadorEstados.class, MarcacoesTrabalhadorEstados.MARCACAO_ID, db.data.siprp_local.outer.MarcacoesTrabalhadorData.class, db.data.siprp_local.outer.MarcacoesTrabalhadorData.ID ); + new com.evolute.entity.ForeignKey( MarcacoesTrabalhadorEstados.class, MarcacoesTrabalhadorEstados.MARCACAO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorData.ID ); public static final com.evolute.entity.ForeignKey ForeignKeyprestador_idToprestadores = - new com.evolute.entity.ForeignKey( MarcacoesTrabalhadorEstados.class, MarcacoesTrabalhadorEstados.PRESTADOR_ID, db.data.siprp_local.outer.PrestadoresData.class, db.data.siprp_local.outer.PrestadoresData.ID ); + new com.evolute.entity.ForeignKey( MarcacoesTrabalhadorEstados.class, MarcacoesTrabalhadorEstados.PRESTADOR_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData.ID ); public static final String TABLENAME = "marcacoes_trabalhador_estados"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.marcacoes_trabalhador_estados"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.marcacoes_trabalhador_estados"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -89,9 +89,9 @@ public class MarcacoesTrabalhadorEstados extends com.evolute.entity.evo.EvoDataO private java.util.Date data; private Integer estado; private Integer marcacao_id; - private db.data.siprp_local.outer.MarcacoesTrabalhadorData to_marcacao_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorData to_marcacao_id; private Integer prestador_id; - private db.data.siprp_local.outer.PrestadoresData to_prestador_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData to_prestador_id; protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; @@ -131,14 +131,14 @@ public class MarcacoesTrabalhadorEstados extends com.evolute.entity.evo.EvoDataO LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE ); } - public java.util.ListfromMarcacoesGruposRealizados_marcacoes_trabalhador_estado_id() + public java.util.ListfromMarcacoesGruposRealizados_marcacoes_trabalhador_estado_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.MarcacoesGruposRealizadosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesGruposRealizadosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.MarcacoesGruposRealizadosData.class , getPrimaryKey().getMap().get("id"), "marcacoes_trabalhador_estado_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesGruposRealizadosData.class , getPrimaryKey().getMap().get("id"), "marcacoes_trabalhador_estado_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -235,7 +235,7 @@ public class MarcacoesTrabalhadorEstados extends com.evolute.entity.evo.EvoDataO LAZY_LOADED_OBJECTS.put( MARCACAO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.MarcacoesTrabalhadorData toMarcacao_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorData toMarcacao_id() { try { @@ -248,7 +248,7 @@ public class MarcacoesTrabalhadorEstados extends com.evolute.entity.evo.EvoDataO return this.to_marcacao_id; } - public void setToMarcacao_id( db.data.siprp_local.outer.MarcacoesTrabalhadorData to_marcacao_id ) + public void setToMarcacao_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorData to_marcacao_id ) { try { @@ -290,7 +290,7 @@ public class MarcacoesTrabalhadorEstados extends com.evolute.entity.evo.EvoDataO LAZY_LOADED_OBJECTS.put( PRESTADOR_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.PrestadoresData toPrestador_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData toPrestador_id() { try { @@ -303,7 +303,7 @@ public class MarcacoesTrabalhadorEstados extends com.evolute.entity.evo.EvoDataO return this.to_prestador_id; } - public void setToPrestador_id( db.data.siprp_local.outer.PrestadoresData to_prestador_id ) + public void setToPrestador_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData to_prestador_id ) { try { @@ -396,13 +396,13 @@ public class MarcacoesTrabalhadorEstados extends com.evolute.entity.evo.EvoDataO setMarcacao_id( ( Integer ) value ); break; case MarcacoesTrabalhadorEstados.TO_MARCACAO_ID_INDEX: - setToMarcacao_id( ( db.data.siprp_local.outer.MarcacoesTrabalhadorData ) value ); + setToMarcacao_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorData ) value ); break; case MarcacoesTrabalhadorEstados.PRESTADOR_ID_INDEX: setPrestador_id( ( Integer ) value ); break; case MarcacoesTrabalhadorEstados.TO_PRESTADOR_ID_INDEX: - setToPrestador_id( ( db.data.siprp_local.outer.PrestadoresData ) value ); + setToPrestador_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData ) value ); break; } } @@ -425,13 +425,13 @@ public class MarcacoesTrabalhadorEstados extends com.evolute.entity.evo.EvoDataO this.marcacao_id = ( Integer ) value; break; case MarcacoesTrabalhadorEstados.TO_MARCACAO_ID_INDEX: - this.to_marcacao_id = ( db.data.siprp_local.outer.MarcacoesTrabalhadorData ) value; + this.to_marcacao_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorData ) value; break; case MarcacoesTrabalhadorEstados.PRESTADOR_ID_INDEX: this.prestador_id = ( Integer ) value; break; case MarcacoesTrabalhadorEstados.TO_PRESTADOR_ID_INDEX: - this.to_prestador_id = ( db.data.siprp_local.outer.PrestadoresData ) value; + this.to_prestador_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData ) value; break; } } @@ -485,13 +485,13 @@ public class MarcacoesTrabalhadorEstados extends com.evolute.entity.evo.EvoDataO theClass = Integer.class; break; case MarcacoesTrabalhadorEstados.TO_MARCACAO_ID_INDEX: - theClass = db.data.siprp_local.outer.MarcacoesTrabalhadorData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorData.class; break; case MarcacoesTrabalhadorEstados.PRESTADOR_ID_INDEX: theClass = Integer.class; break; case MarcacoesTrabalhadorEstados.TO_PRESTADOR_ID_INDEX: - theClass = db.data.siprp_local.outer.PrestadoresData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData.class; break; } return theClass; @@ -516,12 +516,28 @@ public class MarcacoesTrabalhadorEstados extends com.evolute.entity.evo.EvoDataO @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, MarcacoesTrabalhadorEstados.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/MedVacinaTipo.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/MedVacinaTipo.java similarity index 90% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/MedVacinaTipo.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/MedVacinaTipo.java index 94f2f542..2ccc5810 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/MedVacinaTipo.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/MedVacinaTipo.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class MedVacinaTipo extends com.evolute.entity.evo.EvoDataObject @@ -33,7 +33,7 @@ public class MedVacinaTipo extends com.evolute.entity.evo.EvoDataObjectfromAptOutrasVacina_vacina_tipo() + public java.util.ListfromAptOutrasVacina_vacina_tipo() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.AptOutrasVacinaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.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" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AptOutrasVacinaData.class , getPrimaryKey().getMap().get("ordem"), "vacina_tipo" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -416,12 +416,28 @@ public class MedVacinaTipo extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class Medicos extends com.evolute.entity.evo.EvoDataObject @@ -31,7 +31,7 @@ public class Medicos extends com.evolute.entity.evo.EvoDataObjectfromEstabelecimentos_medico_id() + public java.util.ListfromEstabelecimentos_medico_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.EstabelecimentosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.EstabelecimentosData.class , getPrimaryKey().getMap().get("id"), "medico_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.class , getPrimaryKey().getMap().get("id"), "medico_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -124,14 +124,14 @@ public class Medicos extends com.evolute.entity.evo.EvoDataObjectfromExames_medico_id() + public java.util.ListfromExames_medico_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.ExamesData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.ExamesData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.ExamesData.class , getPrimaryKey().getMap().get("id"), "medico_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.ExamesData.class , getPrimaryKey().getMap().get("id"), "medico_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -383,12 +383,28 @@ public class Medicos extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class Paises extends com.evolute.entity.evo.EvoDataObject @@ -37,12 +37,12 @@ public class Paises extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class PaisesContinentes extends com.evolute.entity.evo.EvoDataObject @@ -33,7 +33,7 @@ public class PaisesContinentes extends com.evolute.entity.evo.EvoDataObjectfromPaises_continente_id() + public java.util.ListfromPaises_continente_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.PaisesData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PaisesData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.PaisesData.class , getPrimaryKey().getMap().get("id"), "continente_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PaisesData.class , getPrimaryKey().getMap().get("id"), "continente_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -416,12 +416,28 @@ public class PaisesContinentes extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class PesDocumento extends com.evolute.entity.evo.EvoDataObject @@ -35,12 +35,12 @@ public class PesDocumento extends com.evolute.entity.evo.EvoDataObjectfromPesPessoaDocumento_documento_id() + public java.util.ListfromPesPessoaDocumento_documento_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.PesPessoaDocumentoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PesPessoaDocumentoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.PesPessoaDocumentoData.class , getPrimaryKey().getMap().get("id"), "documento_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PesPessoaDocumentoData.class , getPrimaryKey().getMap().get("id"), "documento_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -174,7 +174,7 @@ public class PesDocumento extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class PesDocumentoTipo extends com.evolute.entity.evo.EvoDataObject @@ -33,7 +33,7 @@ public class PesDocumentoTipo extends com.evolute.entity.evo.EvoDataObjectfromPesDocumento_tipo_id() + public java.util.ListfromPesDocumento_tipo_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.PesDocumentoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PesDocumentoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.PesDocumentoData.class , getPrimaryKey().getMap().get("id"), "tipo_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PesDocumentoData.class , getPrimaryKey().getMap().get("id"), "tipo_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -416,12 +416,28 @@ public class PesDocumentoTipo extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class PesPessoaDocumento extends com.evolute.entity.evo.EvoDataObject @@ -31,15 +31,15 @@ public class PesPessoaDocumento extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class Prestadores extends com.evolute.entity.evo.EvoDataObject @@ -51,12 +51,12 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObjectfromEstabelecimentos_prestador_consulta_id() + public java.util.ListfromEstabelecimentos_prestador_consulta_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.EstabelecimentosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.EstabelecimentosData.class , getPrimaryKey().getMap().get("id"), "prestador_consulta_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.class , getPrimaryKey().getMap().get("id"), "prestador_consulta_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -200,14 +200,14 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObjectfromEstabelecimentos_prestador_ecds_id() + public java.util.ListfromEstabelecimentos_prestador_ecds_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.EstabelecimentosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.EstabelecimentosData.class , getPrimaryKey().getMap().get("id"), "prestador_ecds_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EstabelecimentosData.class , getPrimaryKey().getMap().get("id"), "prestador_ecds_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -217,14 +217,14 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObjectfromMarcacoesTrabalhador_prestador_id() + public java.util.ListfromMarcacoesTrabalhador_prestador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.MarcacoesTrabalhadorData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.MarcacoesTrabalhadorData.class , getPrimaryKey().getMap().get("id"), "prestador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorData.class , getPrimaryKey().getMap().get("id"), "prestador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -234,14 +234,14 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObjectfromMarcacoesTrabalhadorEstados_prestador_id() + public java.util.ListfromMarcacoesTrabalhadorEstados_prestador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData.class , getPrimaryKey().getMap().get("id"), "prestador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorEstadosData.class , getPrimaryKey().getMap().get("id"), "prestador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -251,14 +251,14 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObjectfromPrestadoresGruposProtocolo_prestador_id() + public java.util.ListfromPrestadoresGruposProtocolo_prestador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.PrestadoresGruposProtocoloData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresGruposProtocoloData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.PrestadoresGruposProtocoloData.class , getPrimaryKey().getMap().get("id"), "prestador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresGruposProtocoloData.class , getPrimaryKey().getMap().get("id"), "prestador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -268,14 +268,14 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObjectfromPrtGruposProtocolo_analisador_id() + public java.util.ListfromPrtGruposProtocolo_analisador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.PrtGruposProtocoloData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.PrtGruposProtocoloData.class , getPrimaryKey().getMap().get("id"), "analisador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData.class , getPrimaryKey().getMap().get("id"), "analisador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -285,14 +285,14 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObjectfromTrabalhadoresConsultas_prestador_id() + public java.util.ListfromTrabalhadoresConsultas_prestador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresConsultasData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresConsultasData.class , getPrimaryKey().getMap().get("id"), "prestador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasData.class , getPrimaryKey().getMap().get("id"), "prestador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -302,14 +302,14 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObjectfromTrabalhadoresConsultasDatas_prestador_id() + public java.util.ListfromTrabalhadoresConsultasDatas_prestador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresConsultasDatasData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasDatasData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresConsultasDatasData.class , getPrimaryKey().getMap().get("id"), "prestador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasDatasData.class , getPrimaryKey().getMap().get("id"), "prestador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -319,14 +319,14 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObjectfromTrabalhadoresEcd_analisador_id() + public java.util.ListfromTrabalhadoresEcd_analisador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdData.class , getPrimaryKey().getMap().get("id"), "analisador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdData.class , getPrimaryKey().getMap().get("id"), "analisador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -336,14 +336,14 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObjectfromTrabalhadoresEcdsAnalise_prestador_id() + public java.util.ListfromTrabalhadoresEcdsAnalise_prestador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdsAnaliseData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsAnaliseData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsAnaliseData.class , getPrimaryKey().getMap().get("id"), "prestador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsAnaliseData.class , getPrimaryKey().getMap().get("id"), "prestador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -353,14 +353,14 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObjectfromTrabalhadoresEcdsDatas_prestador_id() + public java.util.ListfromTrabalhadoresEcdsDatas_prestador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdsDatasData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.class , getPrimaryKey().getMap().get("id"), "prestador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.class , getPrimaryKey().getMap().get("id"), "prestador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -370,14 +370,14 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObjectfromTrabalhadoresEcdsDatas_analisador_id() + public java.util.ListfromTrabalhadoresEcdsDatas_analisador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdsDatasData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.class , getPrimaryKey().getMap().get("id"), "analisador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.class , getPrimaryKey().getMap().get("id"), "analisador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -590,7 +590,7 @@ public class Prestadores extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class PrestadoresGruposProtocolo extends com.evolute.entity.evo.EvoDataObject @@ -31,15 +31,15 @@ public class PrestadoresGruposProtocolo extends com.evolute.entity.evo.EvoDataOb public static final com.evolute.entity.ForeignKey ForeignKeyprestador_idToprestadores = - new com.evolute.entity.ForeignKey( PrestadoresGruposProtocolo.class, PrestadoresGruposProtocolo.PRESTADOR_ID, db.data.siprp_local.outer.PrestadoresData.class, db.data.siprp_local.outer.PrestadoresData.ID ); + new com.evolute.entity.ForeignKey( PrestadoresGruposProtocolo.class, PrestadoresGruposProtocolo.PRESTADOR_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData.ID ); public static final com.evolute.entity.ForeignKey ForeignKeygrupo_protocolo_idToprt_grupos_protocolo = - new com.evolute.entity.ForeignKey( PrestadoresGruposProtocolo.class, PrestadoresGruposProtocolo.GRUPO_PROTOCOLO_ID, db.data.siprp_local.outer.PrtGruposProtocoloData.class, db.data.siprp_local.outer.PrtGruposProtocoloData.ID ); + new com.evolute.entity.ForeignKey( PrestadoresGruposProtocolo.class, PrestadoresGruposProtocolo.GRUPO_PROTOCOLO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData.ID ); public static final String TABLENAME = "prestadores_grupos_protocolo"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.prestadores_grupos_protocolo"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.prestadores_grupos_protocolo"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -77,9 +77,9 @@ public class PrestadoresGruposProtocolo extends com.evolute.entity.evo.EvoDataOb private Integer id; private Integer prestador_id; - private db.data.siprp_local.outer.PrestadoresData to_prestador_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData to_prestador_id; private Integer grupo_protocolo_id; - private db.data.siprp_local.outer.PrtGruposProtocoloData to_grupo_protocolo_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData to_grupo_protocolo_id; protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; @@ -148,7 +148,7 @@ public class PrestadoresGruposProtocolo extends com.evolute.entity.evo.EvoDataOb LAZY_LOADED_OBJECTS.put( PRESTADOR_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.PrestadoresData toPrestador_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData toPrestador_id() { try { @@ -161,7 +161,7 @@ public class PrestadoresGruposProtocolo extends com.evolute.entity.evo.EvoDataOb return this.to_prestador_id; } - public void setToPrestador_id( db.data.siprp_local.outer.PrestadoresData to_prestador_id ) + public void setToPrestador_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData to_prestador_id ) { try { @@ -203,7 +203,7 @@ public class PrestadoresGruposProtocolo extends com.evolute.entity.evo.EvoDataOb LAZY_LOADED_OBJECTS.put( GRUPO_PROTOCOLO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.PrtGruposProtocoloData toGrupo_protocolo_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData toGrupo_protocolo_id() { try { @@ -216,7 +216,7 @@ public class PrestadoresGruposProtocolo extends com.evolute.entity.evo.EvoDataOb return this.to_grupo_protocolo_id; } - public void setToGrupo_protocolo_id( db.data.siprp_local.outer.PrtGruposProtocoloData to_grupo_protocolo_id ) + public void setToGrupo_protocolo_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData to_grupo_protocolo_id ) { try { @@ -291,13 +291,13 @@ public class PrestadoresGruposProtocolo extends com.evolute.entity.evo.EvoDataOb setPrestador_id( ( Integer ) value ); break; case PrestadoresGruposProtocolo.TO_PRESTADOR_ID_INDEX: - setToPrestador_id( ( db.data.siprp_local.outer.PrestadoresData ) value ); + setToPrestador_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData ) value ); break; case PrestadoresGruposProtocolo.GRUPO_PROTOCOLO_ID_INDEX: setGrupo_protocolo_id( ( Integer ) value ); break; case PrestadoresGruposProtocolo.TO_GRUPO_PROTOCOLO_ID_INDEX: - setToGrupo_protocolo_id( ( db.data.siprp_local.outer.PrtGruposProtocoloData ) value ); + setToGrupo_protocolo_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData ) value ); break; } } @@ -314,13 +314,13 @@ public class PrestadoresGruposProtocolo extends com.evolute.entity.evo.EvoDataOb this.prestador_id = ( Integer ) value; break; case PrestadoresGruposProtocolo.TO_PRESTADOR_ID_INDEX: - this.to_prestador_id = ( db.data.siprp_local.outer.PrestadoresData ) value; + this.to_prestador_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData ) value; break; case PrestadoresGruposProtocolo.GRUPO_PROTOCOLO_ID_INDEX: this.grupo_protocolo_id = ( Integer ) value; break; case PrestadoresGruposProtocolo.TO_GRUPO_PROTOCOLO_ID_INDEX: - this.to_grupo_protocolo_id = ( db.data.siprp_local.outer.PrtGruposProtocoloData ) value; + this.to_grupo_protocolo_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData ) value; break; } } @@ -368,13 +368,13 @@ public class PrestadoresGruposProtocolo extends com.evolute.entity.evo.EvoDataOb theClass = Integer.class; break; case PrestadoresGruposProtocolo.TO_PRESTADOR_ID_INDEX: - theClass = db.data.siprp_local.outer.PrestadoresData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData.class; break; case PrestadoresGruposProtocolo.GRUPO_PROTOCOLO_ID_INDEX: theClass = Integer.class; break; case PrestadoresGruposProtocolo.TO_GRUPO_PROTOCOLO_ID_INDEX: - theClass = db.data.siprp_local.outer.PrtGruposProtocoloData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData.class; break; } return theClass; @@ -399,12 +399,28 @@ public class PrestadoresGruposProtocolo extends com.evolute.entity.evo.EvoDataOb @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, PrestadoresGruposProtocolo.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/PrtElementosProtocolo.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/PrtElementosProtocolo.java similarity index 83% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/PrtElementosProtocolo.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/PrtElementosProtocolo.java index 7f0afc71..223c54fb 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/PrtElementosProtocolo.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/PrtElementosProtocolo.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class PrtElementosProtocolo extends com.evolute.entity.evo.EvoDataObject @@ -33,15 +33,15 @@ public class PrtElementosProtocolo extends com.evolute.entity.evo.EvoDataObject< public static final com.evolute.entity.ForeignKey ForeignKeytipo_elemento_protocolo_idToprt_tipos_elementos_protocolo = - new com.evolute.entity.ForeignKey( PrtElementosProtocolo.class, PrtElementosProtocolo.TIPO_ELEMENTO_PROTOCOLO_ID, db.data.siprp_local.outer.PrtTiposElementosProtocoloData.class, db.data.siprp_local.outer.PrtTiposElementosProtocoloData.ID ); + new com.evolute.entity.ForeignKey( PrtElementosProtocolo.class, PrtElementosProtocolo.TIPO_ELEMENTO_PROTOCOLO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtTiposElementosProtocoloData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtTiposElementosProtocoloData.ID ); public static final com.evolute.entity.ForeignKey ForeignKeyempresa_idToempresas = - new com.evolute.entity.ForeignKey( PrtElementosProtocolo.class, PrtElementosProtocolo.EMPRESA_ID, db.data.siprp_local.outer.EmpresasData.class, db.data.siprp_local.outer.EmpresasData.ID ); + new com.evolute.entity.ForeignKey( PrtElementosProtocolo.class, PrtElementosProtocolo.EMPRESA_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresasData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresasData.ID ); public static final String TABLENAME = "prt_elementos_protocolo"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.prt_elementos_protocolo"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.prt_elementos_protocolo"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -84,9 +84,9 @@ public class PrtElementosProtocolo extends com.evolute.entity.evo.EvoDataObject< private Integer id; private Integer tipo_elemento_protocolo_id; - private db.data.siprp_local.outer.PrtTiposElementosProtocoloData to_tipo_elemento_protocolo_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtTiposElementosProtocoloData to_tipo_elemento_protocolo_id; private Integer empresa_id; - private db.data.siprp_local.outer.EmpresasData to_empresa_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresasData to_empresa_id; private Integer numero_perfil; protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; @@ -156,7 +156,7 @@ public class PrtElementosProtocolo extends com.evolute.entity.evo.EvoDataObject< LAZY_LOADED_OBJECTS.put( TIPO_ELEMENTO_PROTOCOLO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.PrtTiposElementosProtocoloData toTipo_elemento_protocolo_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtTiposElementosProtocoloData toTipo_elemento_protocolo_id() { try { @@ -169,7 +169,7 @@ public class PrtElementosProtocolo extends com.evolute.entity.evo.EvoDataObject< return this.to_tipo_elemento_protocolo_id; } - public void setToTipo_elemento_protocolo_id( db.data.siprp_local.outer.PrtTiposElementosProtocoloData to_tipo_elemento_protocolo_id ) + public void setToTipo_elemento_protocolo_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtTiposElementosProtocoloData to_tipo_elemento_protocolo_id ) { try { @@ -211,7 +211,7 @@ public class PrtElementosProtocolo extends com.evolute.entity.evo.EvoDataObject< LAZY_LOADED_OBJECTS.put( EMPRESA_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.EmpresasData toEmpresa_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresasData toEmpresa_id() { try { @@ -224,7 +224,7 @@ public class PrtElementosProtocolo extends com.evolute.entity.evo.EvoDataObject< return this.to_empresa_id; } - public void setToEmpresa_id( db.data.siprp_local.outer.EmpresasData to_empresa_id ) + public void setToEmpresa_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresasData to_empresa_id ) { try { @@ -334,13 +334,13 @@ public class PrtElementosProtocolo extends com.evolute.entity.evo.EvoDataObject< setTipo_elemento_protocolo_id( ( Integer ) value ); break; case PrtElementosProtocolo.TO_TIPO_ELEMENTO_PROTOCOLO_ID_INDEX: - setToTipo_elemento_protocolo_id( ( db.data.siprp_local.outer.PrtTiposElementosProtocoloData ) value ); + setToTipo_elemento_protocolo_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtTiposElementosProtocoloData ) value ); break; case PrtElementosProtocolo.EMPRESA_ID_INDEX: setEmpresa_id( ( Integer ) value ); break; case PrtElementosProtocolo.TO_EMPRESA_ID_INDEX: - setToEmpresa_id( ( db.data.siprp_local.outer.EmpresasData ) value ); + setToEmpresa_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresasData ) value ); break; case PrtElementosProtocolo.NUMERO_PERFIL_INDEX: setNumero_perfil( ( Integer ) value ); @@ -360,13 +360,13 @@ public class PrtElementosProtocolo extends com.evolute.entity.evo.EvoDataObject< this.tipo_elemento_protocolo_id = ( Integer ) value; break; case PrtElementosProtocolo.TO_TIPO_ELEMENTO_PROTOCOLO_ID_INDEX: - this.to_tipo_elemento_protocolo_id = ( db.data.siprp_local.outer.PrtTiposElementosProtocoloData ) value; + this.to_tipo_elemento_protocolo_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtTiposElementosProtocoloData ) value; break; case PrtElementosProtocolo.EMPRESA_ID_INDEX: this.empresa_id = ( Integer ) value; break; case PrtElementosProtocolo.TO_EMPRESA_ID_INDEX: - this.to_empresa_id = ( db.data.siprp_local.outer.EmpresasData ) value; + this.to_empresa_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresasData ) value; break; case PrtElementosProtocolo.NUMERO_PERFIL_INDEX: this.numero_perfil = ( Integer ) value; @@ -417,13 +417,13 @@ public class PrtElementosProtocolo extends com.evolute.entity.evo.EvoDataObject< theClass = Integer.class; break; case PrtElementosProtocolo.TO_TIPO_ELEMENTO_PROTOCOLO_ID_INDEX: - theClass = db.data.siprp_local.outer.PrtTiposElementosProtocoloData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtTiposElementosProtocoloData.class; break; case PrtElementosProtocolo.EMPRESA_ID_INDEX: theClass = Integer.class; break; case PrtElementosProtocolo.TO_EMPRESA_ID_INDEX: - theClass = db.data.siprp_local.outer.EmpresasData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresasData.class; break; case PrtElementosProtocolo.NUMERO_PERFIL_INDEX: theClass = Integer.class; @@ -451,12 +451,28 @@ public class PrtElementosProtocolo extends com.evolute.entity.evo.EvoDataObject< @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, PrtElementosProtocolo.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/PrtGruposProtocolo.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/PrtGruposProtocolo.java similarity index 78% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/PrtGruposProtocolo.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/PrtGruposProtocolo.java index 4f3e2e45..8d525493 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/PrtGruposProtocolo.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/PrtGruposProtocolo.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class PrtGruposProtocolo extends com.evolute.entity.evo.EvoDataObject @@ -35,12 +35,12 @@ public class PrtGruposProtocolo extends com.evolute.entity.evo.EvoDataObjectfromMarcacoesGruposRealizados_grupo_protocolo_id() + public java.util.ListfromMarcacoesGruposRealizados_grupo_protocolo_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.MarcacoesGruposRealizadosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesGruposRealizadosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.MarcacoesGruposRealizadosData.class , getPrimaryKey().getMap().get("id"), "grupo_protocolo_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesGruposRealizadosData.class , getPrimaryKey().getMap().get("id"), "grupo_protocolo_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -145,14 +145,14 @@ public class PrtGruposProtocolo extends com.evolute.entity.evo.EvoDataObjectfromPrestadoresGruposProtocolo_grupo_protocolo_id() + public java.util.ListfromPrestadoresGruposProtocolo_grupo_protocolo_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.PrestadoresGruposProtocoloData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresGruposProtocoloData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.PrestadoresGruposProtocoloData.class , getPrimaryKey().getMap().get("id"), "grupo_protocolo_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresGruposProtocoloData.class , getPrimaryKey().getMap().get("id"), "grupo_protocolo_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -162,14 +162,14 @@ public class PrtGruposProtocolo extends com.evolute.entity.evo.EvoDataObjectfromPrtTiposElementosProtocolo_grupo_protocolo_id() + public java.util.ListfromPrtTiposElementosProtocolo_grupo_protocolo_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.PrtTiposElementosProtocoloData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtTiposElementosProtocoloData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.PrtTiposElementosProtocoloData.class , getPrimaryKey().getMap().get("id"), "grupo_protocolo_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtTiposElementosProtocoloData.class , getPrimaryKey().getMap().get("id"), "grupo_protocolo_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -179,14 +179,14 @@ public class PrtGruposProtocolo extends com.evolute.entity.evo.EvoDataObjectfromTrabalhadoresEcdsAnalise_grupo_ecds_id() + public java.util.ListfromTrabalhadoresEcdsAnalise_grupo_ecds_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdsAnaliseData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsAnaliseData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsAnaliseData.class , getPrimaryKey().getMap().get("id"), "grupo_ecds_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsAnaliseData.class , getPrimaryKey().getMap().get("id"), "grupo_ecds_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -341,7 +341,7 @@ public class PrtGruposProtocolo extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class PrtTiposElementosProtocolo extends com.evolute.entity.evo.EvoDataObject @@ -33,12 +33,12 @@ public class PrtTiposElementosProtocolo extends com.evolute.entity.evo.EvoDataOb public static final com.evolute.entity.ForeignKey ForeignKeygrupo_protocolo_idToprt_grupos_protocolo = - new com.evolute.entity.ForeignKey( PrtTiposElementosProtocolo.class, PrtTiposElementosProtocolo.GRUPO_PROTOCOLO_ID, db.data.siprp_local.outer.PrtGruposProtocoloData.class, db.data.siprp_local.outer.PrtGruposProtocoloData.ID ); + new com.evolute.entity.ForeignKey( PrtTiposElementosProtocolo.class, PrtTiposElementosProtocolo.GRUPO_PROTOCOLO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData.ID ); public static final String TABLENAME = "prt_tipos_elementos_protocolo"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.prt_tipos_elementos_protocolo"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.prt_tipos_elementos_protocolo"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -81,7 +81,7 @@ public class PrtTiposElementosProtocolo extends com.evolute.entity.evo.EvoDataOb private String descricao_plain; private String descricao; private Integer grupo_protocolo_id; - private db.data.siprp_local.outer.PrtGruposProtocoloData to_grupo_protocolo_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData to_grupo_protocolo_id; private Integer ordem; protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; @@ -122,14 +122,14 @@ public class PrtTiposElementosProtocolo extends com.evolute.entity.evo.EvoDataOb LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE ); } - public java.util.ListfromPrtElementosProtocolo_tipo_elemento_protocolo_id() + public java.util.ListfromPrtElementosProtocolo_tipo_elemento_protocolo_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.PrtElementosProtocoloData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtElementosProtocoloData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.PrtElementosProtocoloData.class , getPrimaryKey().getMap().get("id"), "tipo_elemento_protocolo_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtElementosProtocoloData.class , getPrimaryKey().getMap().get("id"), "tipo_elemento_protocolo_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -139,14 +139,14 @@ public class PrtTiposElementosProtocolo extends com.evolute.entity.evo.EvoDataOb return result; } - public java.util.ListfromTrabalhadoresEcd_ecd_id() + public java.util.ListfromTrabalhadoresEcd_ecd_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdData.class , getPrimaryKey().getMap().get("id"), "ecd_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdData.class , getPrimaryKey().getMap().get("id"), "ecd_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -243,7 +243,7 @@ public class PrtTiposElementosProtocolo extends com.evolute.entity.evo.EvoDataOb LAZY_LOADED_OBJECTS.put( GRUPO_PROTOCOLO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.PrtGruposProtocoloData toGrupo_protocolo_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData toGrupo_protocolo_id() { try { @@ -256,7 +256,7 @@ public class PrtTiposElementosProtocolo extends com.evolute.entity.evo.EvoDataOb return this.to_grupo_protocolo_id; } - public void setToGrupo_protocolo_id( db.data.siprp_local.outer.PrtGruposProtocoloData to_grupo_protocolo_id ) + public void setToGrupo_protocolo_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData to_grupo_protocolo_id ) { try { @@ -372,7 +372,7 @@ public class PrtTiposElementosProtocolo extends com.evolute.entity.evo.EvoDataOb setGrupo_protocolo_id( ( Integer ) value ); break; case PrtTiposElementosProtocolo.TO_GRUPO_PROTOCOLO_ID_INDEX: - setToGrupo_protocolo_id( ( db.data.siprp_local.outer.PrtGruposProtocoloData ) value ); + setToGrupo_protocolo_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData ) value ); break; case PrtTiposElementosProtocolo.ORDEM_INDEX: setOrdem( ( Integer ) value ); @@ -398,7 +398,7 @@ public class PrtTiposElementosProtocolo extends com.evolute.entity.evo.EvoDataOb this.grupo_protocolo_id = ( Integer ) value; break; case PrtTiposElementosProtocolo.TO_GRUPO_PROTOCOLO_ID_INDEX: - this.to_grupo_protocolo_id = ( db.data.siprp_local.outer.PrtGruposProtocoloData ) value; + this.to_grupo_protocolo_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData ) value; break; case PrtTiposElementosProtocolo.ORDEM_INDEX: this.ordem = ( Integer ) value; @@ -455,7 +455,7 @@ public class PrtTiposElementosProtocolo extends com.evolute.entity.evo.EvoDataOb theClass = Integer.class; break; case PrtTiposElementosProtocolo.TO_GRUPO_PROTOCOLO_ID_INDEX: - theClass = db.data.siprp_local.outer.PrtGruposProtocoloData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData.class; break; case PrtTiposElementosProtocolo.ORDEM_INDEX: theClass = Integer.class; @@ -483,12 +483,28 @@ public class PrtTiposElementosProtocolo extends com.evolute.entity.evo.EvoDataOb @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, PrtTiposElementosProtocolo.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TiposExamesComp.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TiposExamesComp.java similarity index 87% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TiposExamesComp.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TiposExamesComp.java index 4e6f0927..1b4e071f 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TiposExamesComp.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TiposExamesComp.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class TiposExamesComp extends com.evolute.entity.evo.EvoDataObject @@ -29,7 +29,7 @@ public class TiposExamesComp extends com.evolute.entity.evo.EvoDataObjectfromExamesPerfis_tipo() + public java.util.ListfromExamesPerfis_tipo() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.ExamesPerfisData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.ExamesPerfisData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.ExamesPerfisData.class , getPrimaryKey().getMap().get("id"), "tipo" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.ExamesPerfisData.class , getPrimaryKey().getMap().get("id"), "tipo" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -315,12 +315,28 @@ public class TiposExamesComp extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class Trabalhadores extends com.evolute.entity.evo.EvoDataObject @@ -73,15 +73,15 @@ public class Trabalhadores extends com.evolute.entity.evo.EvoDataObjectfromAptOutrasVacina_trabalhador_id() + public java.util.ListfromAptOutrasVacina_trabalhador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.AptOutrasVacinaData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AptOutrasVacinaData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.AptOutrasVacinaData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AptOutrasVacinaData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -280,14 +280,14 @@ public class Trabalhadores extends com.evolute.entity.evo.EvoDataObjectfromAptOutrasViajante_trabalhador_id() + public java.util.ListfromAptOutrasViajante_trabalhador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.AptOutrasViajanteData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AptOutrasViajanteData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.AptOutrasViajanteData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AptOutrasViajanteData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -297,14 +297,14 @@ public class Trabalhadores extends com.evolute.entity.evo.EvoDataObjectfromAvisos_trabalhador_id() + public java.util.ListfromAvisos_trabalhador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.AvisosData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AvisosData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.AvisosData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.AvisosData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -314,14 +314,14 @@ public class Trabalhadores extends com.evolute.entity.evo.EvoDataObjectfromExames_trabalhador_id() + public java.util.ListfromExames_trabalhador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.ExamesData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.ExamesData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.ExamesData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.ExamesData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -331,14 +331,14 @@ public class Trabalhadores extends com.evolute.entity.evo.EvoDataObjectfromLembretes_trabalhador_id() + public java.util.ListfromLembretes_trabalhador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.LembretesData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.LembretesData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -348,14 +348,14 @@ public class Trabalhadores extends com.evolute.entity.evo.EvoDataObjectfromMarcacoesTrabalhador_trabalhador_id() + public java.util.ListfromMarcacoesTrabalhador_trabalhador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.MarcacoesTrabalhadorData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.MarcacoesTrabalhadorData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.MarcacoesTrabalhadorData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -365,14 +365,14 @@ public class Trabalhadores extends com.evolute.entity.evo.EvoDataObjectfromTrabalhadoresConsultas_trabalhador_id() + public java.util.ListfromTrabalhadoresConsultas_trabalhador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresConsultasData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresConsultasData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -382,14 +382,14 @@ public class Trabalhadores extends com.evolute.entity.evo.EvoDataObjectfromTrabalhadoresEcds_trabalhador_id() + public java.util.ListfromTrabalhadoresEcds_trabalhador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdsData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -399,14 +399,14 @@ public class Trabalhadores extends com.evolute.entity.evo.EvoDataObjectfromTrabalhadoresProcesso_trabalhador_id() + public java.util.ListfromTrabalhadoresProcesso_trabalhador_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresProcessoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresProcessoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresProcessoData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresProcessoData.class , getPrimaryKey().getMap().get("id"), "trabalhador_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -793,7 +793,7 @@ public class Trabalhadores extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class TrabalhadoresConsultas extends com.evolute.entity.evo.EvoDataObject @@ -39,18 +39,18 @@ public class TrabalhadoresConsultas extends com.evolute.entity.evo.EvoDataObject public static final com.evolute.entity.ForeignKey ForeignKeytrabalhador_idTotrabalhadores = - new com.evolute.entity.ForeignKey( TrabalhadoresConsultas.class, TrabalhadoresConsultas.TRABALHADOR_ID, db.data.siprp_local.outer.TrabalhadoresData.class, db.data.siprp_local.outer.TrabalhadoresData.ID ); + new com.evolute.entity.ForeignKey( TrabalhadoresConsultas.class, TrabalhadoresConsultas.TRABALHADOR_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresData.ID ); public static final com.evolute.entity.ForeignKey ForeignKeyprestador_idToprestadores = - new com.evolute.entity.ForeignKey( TrabalhadoresConsultas.class, TrabalhadoresConsultas.PRESTADOR_ID, db.data.siprp_local.outer.PrestadoresData.class, db.data.siprp_local.outer.PrestadoresData.ID ); + new com.evolute.entity.ForeignKey( TrabalhadoresConsultas.class, TrabalhadoresConsultas.PRESTADOR_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData.ID ); public static final com.evolute.entity.ForeignKey ForeignKeyprocesso_idTotrabalhadores_processo = - new com.evolute.entity.ForeignKey( TrabalhadoresConsultas.class, TrabalhadoresConsultas.PROCESSO_ID, db.data.siprp_local.outer.TrabalhadoresProcessoData.class, db.data.siprp_local.outer.TrabalhadoresProcessoData.ID ); + new com.evolute.entity.ForeignKey( TrabalhadoresConsultas.class, TrabalhadoresConsultas.PROCESSO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresProcessoData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresProcessoData.ID ); public static final String TABLENAME = "trabalhadores_consultas"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.trabalhadores_consultas"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.trabalhadores_consultas"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -102,13 +102,13 @@ public class TrabalhadoresConsultas extends com.evolute.entity.evo.EvoDataObject private Integer id; private Integer trabalhador_id; - private db.data.siprp_local.outer.TrabalhadoresData to_trabalhador_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresData to_trabalhador_id; private java.util.Date data; private Integer estado; private Integer prestador_id; - private db.data.siprp_local.outer.PrestadoresData to_prestador_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData to_prestador_id; private Integer processo_id; - private db.data.siprp_local.outer.TrabalhadoresProcessoData to_processo_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresProcessoData to_processo_id; protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; @@ -148,14 +148,14 @@ public class TrabalhadoresConsultas extends com.evolute.entity.evo.EvoDataObject LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE ); } - public java.util.ListfromTrabalhadoresConsultasDatas_trabalhadores_consultas_id() + public java.util.ListfromTrabalhadoresConsultasDatas_trabalhadores_consultas_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresConsultasDatasData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasDatasData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresConsultasDatasData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_consultas_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasDatasData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_consultas_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -194,7 +194,7 @@ public class TrabalhadoresConsultas extends com.evolute.entity.evo.EvoDataObject LAZY_LOADED_OBJECTS.put( TRABALHADOR_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.TrabalhadoresData toTrabalhador_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresData toTrabalhador_id() { try { @@ -207,7 +207,7 @@ public class TrabalhadoresConsultas extends com.evolute.entity.evo.EvoDataObject return this.to_trabalhador_id; } - public void setToTrabalhador_id( db.data.siprp_local.outer.TrabalhadoresData to_trabalhador_id ) + public void setToTrabalhador_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresData to_trabalhador_id ) { try { @@ -307,7 +307,7 @@ public class TrabalhadoresConsultas extends com.evolute.entity.evo.EvoDataObject LAZY_LOADED_OBJECTS.put( PRESTADOR_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.PrestadoresData toPrestador_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData toPrestador_id() { try { @@ -320,7 +320,7 @@ public class TrabalhadoresConsultas extends com.evolute.entity.evo.EvoDataObject return this.to_prestador_id; } - public void setToPrestador_id( db.data.siprp_local.outer.PrestadoresData to_prestador_id ) + public void setToPrestador_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData to_prestador_id ) { try { @@ -362,7 +362,7 @@ public class TrabalhadoresConsultas extends com.evolute.entity.evo.EvoDataObject LAZY_LOADED_OBJECTS.put( PROCESSO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.TrabalhadoresProcessoData toProcesso_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresProcessoData toProcesso_id() { try { @@ -375,7 +375,7 @@ public class TrabalhadoresConsultas extends com.evolute.entity.evo.EvoDataObject return this.to_processo_id; } - public void setToProcesso_id( db.data.siprp_local.outer.TrabalhadoresProcessoData to_processo_id ) + public void setToProcesso_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresProcessoData to_processo_id ) { try { @@ -474,7 +474,7 @@ public class TrabalhadoresConsultas extends com.evolute.entity.evo.EvoDataObject setTrabalhador_id( ( Integer ) value ); break; case TrabalhadoresConsultas.TO_TRABALHADOR_ID_INDEX: - setToTrabalhador_id( ( db.data.siprp_local.outer.TrabalhadoresData ) value ); + setToTrabalhador_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresData ) value ); break; case TrabalhadoresConsultas.DATA_INDEX: setData( ( java.util.Date ) value ); @@ -486,13 +486,13 @@ public class TrabalhadoresConsultas extends com.evolute.entity.evo.EvoDataObject setPrestador_id( ( Integer ) value ); break; case TrabalhadoresConsultas.TO_PRESTADOR_ID_INDEX: - setToPrestador_id( ( db.data.siprp_local.outer.PrestadoresData ) value ); + setToPrestador_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData ) value ); break; case TrabalhadoresConsultas.PROCESSO_ID_INDEX: setProcesso_id( ( Integer ) value ); break; case TrabalhadoresConsultas.TO_PROCESSO_ID_INDEX: - setToProcesso_id( ( db.data.siprp_local.outer.TrabalhadoresProcessoData ) value ); + setToProcesso_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresProcessoData ) value ); break; } } @@ -509,7 +509,7 @@ public class TrabalhadoresConsultas extends com.evolute.entity.evo.EvoDataObject this.trabalhador_id = ( Integer ) value; break; case TrabalhadoresConsultas.TO_TRABALHADOR_ID_INDEX: - this.to_trabalhador_id = ( db.data.siprp_local.outer.TrabalhadoresData ) value; + this.to_trabalhador_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresData ) value; break; case TrabalhadoresConsultas.DATA_INDEX: this.data = ( java.util.Date ) value; @@ -521,13 +521,13 @@ public class TrabalhadoresConsultas extends com.evolute.entity.evo.EvoDataObject this.prestador_id = ( Integer ) value; break; case TrabalhadoresConsultas.TO_PRESTADOR_ID_INDEX: - this.to_prestador_id = ( db.data.siprp_local.outer.PrestadoresData ) value; + this.to_prestador_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData ) value; break; case TrabalhadoresConsultas.PROCESSO_ID_INDEX: this.processo_id = ( Integer ) value; break; case TrabalhadoresConsultas.TO_PROCESSO_ID_INDEX: - this.to_processo_id = ( db.data.siprp_local.outer.TrabalhadoresProcessoData ) value; + this.to_processo_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresProcessoData ) value; break; } } @@ -575,7 +575,7 @@ public class TrabalhadoresConsultas extends com.evolute.entity.evo.EvoDataObject theClass = Integer.class; break; case TrabalhadoresConsultas.TO_TRABALHADOR_ID_INDEX: - theClass = db.data.siprp_local.outer.TrabalhadoresData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresData.class; break; case TrabalhadoresConsultas.DATA_INDEX: theClass = java.util.Date.class; @@ -587,13 +587,13 @@ public class TrabalhadoresConsultas extends com.evolute.entity.evo.EvoDataObject theClass = Integer.class; break; case TrabalhadoresConsultas.TO_PRESTADOR_ID_INDEX: - theClass = db.data.siprp_local.outer.PrestadoresData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData.class; break; case TrabalhadoresConsultas.PROCESSO_ID_INDEX: theClass = Integer.class; break; case TrabalhadoresConsultas.TO_PROCESSO_ID_INDEX: - theClass = db.data.siprp_local.outer.TrabalhadoresProcessoData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresProcessoData.class; break; } return theClass; @@ -618,12 +618,28 @@ public class TrabalhadoresConsultas extends com.evolute.entity.evo.EvoDataObject @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, TrabalhadoresConsultas.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresConsultasDatas.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresConsultasDatas.java similarity index 78% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresConsultasDatas.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresConsultasDatas.java index 266e1570..11ad8947 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresConsultasDatas.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresConsultasDatas.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class TrabalhadoresConsultasDatas extends com.evolute.entity.evo.EvoDataObject @@ -35,15 +35,15 @@ public class TrabalhadoresConsultasDatas extends com.evolute.entity.evo.EvoDataO public static final com.evolute.entity.ForeignKey ForeignKeytrabalhadores_consultas_idTotrabalhadores_consultas = - new com.evolute.entity.ForeignKey( TrabalhadoresConsultasDatas.class, TrabalhadoresConsultasDatas.TRABALHADORES_CONSULTAS_ID, db.data.siprp_local.outer.TrabalhadoresConsultasData.class, db.data.siprp_local.outer.TrabalhadoresConsultasData.ID ); + new com.evolute.entity.ForeignKey( TrabalhadoresConsultasDatas.class, TrabalhadoresConsultasDatas.TRABALHADORES_CONSULTAS_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasData.ID ); public static final com.evolute.entity.ForeignKey ForeignKeyprestador_idToprestadores = - new com.evolute.entity.ForeignKey( TrabalhadoresConsultasDatas.class, TrabalhadoresConsultasDatas.PRESTADOR_ID, db.data.siprp_local.outer.PrestadoresData.class, db.data.siprp_local.outer.PrestadoresData.ID ); + new com.evolute.entity.ForeignKey( TrabalhadoresConsultasDatas.class, TrabalhadoresConsultasDatas.PRESTADOR_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData.ID ); public static final String TABLENAME = "trabalhadores_consultas_datas"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.trabalhadores_consultas_datas"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.trabalhadores_consultas_datas"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -90,10 +90,10 @@ public class TrabalhadoresConsultasDatas extends com.evolute.entity.evo.EvoDataO private Integer id; private java.util.Date data; private Integer trabalhadores_consultas_id; - private db.data.siprp_local.outer.TrabalhadoresConsultasData to_trabalhadores_consultas_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasData to_trabalhadores_consultas_id; private Integer estado; private Integer prestador_id; - private db.data.siprp_local.outer.PrestadoresData to_prestador_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData to_prestador_id; protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; @@ -133,14 +133,14 @@ public class TrabalhadoresConsultasDatas extends com.evolute.entity.evo.EvoDataO LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE ); } - public java.util.ListfromLembretes_trabalhadores_consultas_datas_id() + public java.util.ListfromLembretes_trabalhadores_consultas_datas_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.LembretesData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.LembretesData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_consultas_datas_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_consultas_datas_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -150,14 +150,14 @@ public class TrabalhadoresConsultasDatas extends com.evolute.entity.evo.EvoDataO return result; } - public java.util.ListfromTrabalhadoresConsultasDatasEmails_trabalhadores_consultas_datas_id() + public java.util.ListfromTrabalhadoresConsultasDatasEmails_trabalhadores_consultas_datas_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresConsultasDatasEmailsData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasDatasEmailsData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresConsultasDatasEmailsData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_consultas_datas_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasDatasEmailsData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_consultas_datas_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -167,14 +167,14 @@ public class TrabalhadoresConsultasDatas extends com.evolute.entity.evo.EvoDataO return result; } - public java.util.ListfromTrabalhadoresConsultasDatasObservacoes_trabalhadores_consultas_datas_id() + public java.util.ListfromTrabalhadoresConsultasDatasObservacoes_trabalhadores_consultas_datas_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresConsultasDatasObservacoesData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasDatasObservacoesData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresConsultasDatasObservacoesData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_consultas_datas_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasDatasObservacoesData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_consultas_datas_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -242,7 +242,7 @@ public class TrabalhadoresConsultasDatas extends com.evolute.entity.evo.EvoDataO LAZY_LOADED_OBJECTS.put( TRABALHADORES_CONSULTAS_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.TrabalhadoresConsultasData toTrabalhadores_consultas_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasData toTrabalhadores_consultas_id() { try { @@ -255,7 +255,7 @@ public class TrabalhadoresConsultasDatas extends com.evolute.entity.evo.EvoDataO return this.to_trabalhadores_consultas_id; } - public void setToTrabalhadores_consultas_id( db.data.siprp_local.outer.TrabalhadoresConsultasData to_trabalhadores_consultas_id ) + public void setToTrabalhadores_consultas_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasData to_trabalhadores_consultas_id ) { try { @@ -326,7 +326,7 @@ public class TrabalhadoresConsultasDatas extends com.evolute.entity.evo.EvoDataO LAZY_LOADED_OBJECTS.put( PRESTADOR_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.PrestadoresData toPrestador_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData toPrestador_id() { try { @@ -339,7 +339,7 @@ public class TrabalhadoresConsultasDatas extends com.evolute.entity.evo.EvoDataO return this.to_prestador_id; } - public void setToPrestador_id( db.data.siprp_local.outer.PrestadoresData to_prestador_id ) + public void setToPrestador_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData to_prestador_id ) { try { @@ -429,7 +429,7 @@ public class TrabalhadoresConsultasDatas extends com.evolute.entity.evo.EvoDataO setTrabalhadores_consultas_id( ( Integer ) value ); break; case TrabalhadoresConsultasDatas.TO_TRABALHADORES_CONSULTAS_ID_INDEX: - setToTrabalhadores_consultas_id( ( db.data.siprp_local.outer.TrabalhadoresConsultasData ) value ); + setToTrabalhadores_consultas_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasData ) value ); break; case TrabalhadoresConsultasDatas.ESTADO_INDEX: setEstado( ( Integer ) value ); @@ -438,7 +438,7 @@ public class TrabalhadoresConsultasDatas extends com.evolute.entity.evo.EvoDataO setPrestador_id( ( Integer ) value ); break; case TrabalhadoresConsultasDatas.TO_PRESTADOR_ID_INDEX: - setToPrestador_id( ( db.data.siprp_local.outer.PrestadoresData ) value ); + setToPrestador_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData ) value ); break; } } @@ -458,7 +458,7 @@ public class TrabalhadoresConsultasDatas extends com.evolute.entity.evo.EvoDataO this.trabalhadores_consultas_id = ( Integer ) value; break; case TrabalhadoresConsultasDatas.TO_TRABALHADORES_CONSULTAS_ID_INDEX: - this.to_trabalhadores_consultas_id = ( db.data.siprp_local.outer.TrabalhadoresConsultasData ) value; + this.to_trabalhadores_consultas_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasData ) value; break; case TrabalhadoresConsultasDatas.ESTADO_INDEX: this.estado = ( Integer ) value; @@ -467,7 +467,7 @@ public class TrabalhadoresConsultasDatas extends com.evolute.entity.evo.EvoDataO this.prestador_id = ( Integer ) value; break; case TrabalhadoresConsultasDatas.TO_PRESTADOR_ID_INDEX: - this.to_prestador_id = ( db.data.siprp_local.outer.PrestadoresData ) value; + this.to_prestador_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData ) value; break; } } @@ -518,7 +518,7 @@ public class TrabalhadoresConsultasDatas extends com.evolute.entity.evo.EvoDataO theClass = Integer.class; break; case TrabalhadoresConsultasDatas.TO_TRABALHADORES_CONSULTAS_ID_INDEX: - theClass = db.data.siprp_local.outer.TrabalhadoresConsultasData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasData.class; break; case TrabalhadoresConsultasDatas.ESTADO_INDEX: theClass = Integer.class; @@ -527,7 +527,7 @@ public class TrabalhadoresConsultasDatas extends com.evolute.entity.evo.EvoDataO theClass = Integer.class; break; case TrabalhadoresConsultasDatas.TO_PRESTADOR_ID_INDEX: - theClass = db.data.siprp_local.outer.PrestadoresData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData.class; break; } return theClass; @@ -552,12 +552,28 @@ public class TrabalhadoresConsultasDatas extends com.evolute.entity.evo.EvoDataO @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, TrabalhadoresConsultasDatas.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresConsultasDatasEmails.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresConsultasDatasEmails.java similarity index 90% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresConsultasDatasEmails.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresConsultasDatasEmails.java index 1460608b..17a110b1 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresConsultasDatasEmails.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresConsultasDatasEmails.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class TrabalhadoresConsultasDatasEmails extends com.evolute.entity.evo.EvoDataObject @@ -35,12 +35,12 @@ public class TrabalhadoresConsultasDatasEmails extends com.evolute.entity.evo.Ev public static final com.evolute.entity.ForeignKey ForeignKeytrabalhadores_consultas_datas_idTotrabalhadores_consultas_datas = - new com.evolute.entity.ForeignKey( TrabalhadoresConsultasDatasEmails.class, TrabalhadoresConsultasDatasEmails.TRABALHADORES_CONSULTAS_DATAS_ID, db.data.siprp_local.outer.TrabalhadoresConsultasDatasData.class, db.data.siprp_local.outer.TrabalhadoresConsultasDatasData.ID ); + new com.evolute.entity.ForeignKey( TrabalhadoresConsultasDatasEmails.class, TrabalhadoresConsultasDatasEmails.TRABALHADORES_CONSULTAS_DATAS_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasDatasData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasDatasData.ID ); public static final String TABLENAME = "trabalhadores_consultas_datas_emails"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.trabalhadores_consultas_datas_emails"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.trabalhadores_consultas_datas_emails"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -86,7 +86,7 @@ public class TrabalhadoresConsultasDatasEmails extends com.evolute.entity.evo.Ev private Integer id; private Integer trabalhadores_consultas_datas_id; - private db.data.siprp_local.outer.TrabalhadoresConsultasDatasData to_trabalhadores_consultas_datas_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasDatasData to_trabalhadores_consultas_datas_id; private String destination; private java.util.Date data; private String subject; @@ -159,7 +159,7 @@ public class TrabalhadoresConsultasDatasEmails extends com.evolute.entity.evo.Ev LAZY_LOADED_OBJECTS.put( TRABALHADORES_CONSULTAS_DATAS_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.TrabalhadoresConsultasDatasData toTrabalhadores_consultas_datas_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasDatasData toTrabalhadores_consultas_datas_id() { try { @@ -172,7 +172,7 @@ public class TrabalhadoresConsultasDatasEmails extends com.evolute.entity.evo.Ev return this.to_trabalhadores_consultas_datas_id; } - public void setToTrabalhadores_consultas_datas_id( db.data.siprp_local.outer.TrabalhadoresConsultasDatasData to_trabalhadores_consultas_datas_id ) + public void setToTrabalhadores_consultas_datas_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasDatasData to_trabalhadores_consultas_datas_id ) { try { @@ -375,7 +375,7 @@ public class TrabalhadoresConsultasDatasEmails extends com.evolute.entity.evo.Ev setTrabalhadores_consultas_datas_id( ( Integer ) value ); break; case TrabalhadoresConsultasDatasEmails.TO_TRABALHADORES_CONSULTAS_DATAS_ID_INDEX: - setToTrabalhadores_consultas_datas_id( ( db.data.siprp_local.outer.TrabalhadoresConsultasDatasData ) value ); + setToTrabalhadores_consultas_datas_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasDatasData ) value ); break; case TrabalhadoresConsultasDatasEmails.DESTINATION_INDEX: setDestination( ( String ) value ); @@ -404,7 +404,7 @@ public class TrabalhadoresConsultasDatasEmails extends com.evolute.entity.evo.Ev this.trabalhadores_consultas_datas_id = ( Integer ) value; break; case TrabalhadoresConsultasDatasEmails.TO_TRABALHADORES_CONSULTAS_DATAS_ID_INDEX: - this.to_trabalhadores_consultas_datas_id = ( db.data.siprp_local.outer.TrabalhadoresConsultasDatasData ) value; + this.to_trabalhadores_consultas_datas_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasDatasData ) value; break; case TrabalhadoresConsultasDatasEmails.DESTINATION_INDEX: this.destination = ( String ) value; @@ -464,7 +464,7 @@ public class TrabalhadoresConsultasDatasEmails extends com.evolute.entity.evo.Ev theClass = Integer.class; break; case TrabalhadoresConsultasDatasEmails.TO_TRABALHADORES_CONSULTAS_DATAS_ID_INDEX: - theClass = db.data.siprp_local.outer.TrabalhadoresConsultasDatasData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasDatasData.class; break; case TrabalhadoresConsultasDatasEmails.DESTINATION_INDEX: theClass = String.class; @@ -501,12 +501,28 @@ public class TrabalhadoresConsultasDatasEmails extends com.evolute.entity.evo.Ev @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, TrabalhadoresConsultasDatasEmails.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresConsultasDatasObservacoes.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresConsultasDatasObservacoes.java similarity index 86% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresConsultasDatasObservacoes.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresConsultasDatasObservacoes.java index ad09fb94..d22fc650 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresConsultasDatasObservacoes.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresConsultasDatasObservacoes.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class TrabalhadoresConsultasDatasObservacoes extends com.evolute.entity.evo.EvoDataObject @@ -29,12 +29,12 @@ public class TrabalhadoresConsultasDatasObservacoes extends com.evolute.entity.e public static final com.evolute.entity.ForeignKey ForeignKeytrabalhadores_consultas_datas_idTotrabalhadores_consultas_datas = - new com.evolute.entity.ForeignKey( TrabalhadoresConsultasDatasObservacoes.class, TrabalhadoresConsultasDatasObservacoes.TRABALHADORES_CONSULTAS_DATAS_ID, db.data.siprp_local.outer.TrabalhadoresConsultasDatasData.class, db.data.siprp_local.outer.TrabalhadoresConsultasDatasData.ID ); + new com.evolute.entity.ForeignKey( TrabalhadoresConsultasDatasObservacoes.class, TrabalhadoresConsultasDatasObservacoes.TRABALHADORES_CONSULTAS_DATAS_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasDatasData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasDatasData.ID ); public static final String TABLENAME = "trabalhadores_consultas_datas_observacoes"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.trabalhadores_consultas_datas_observacoes"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.trabalhadores_consultas_datas_observacoes"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -71,7 +71,7 @@ public class TrabalhadoresConsultasDatasObservacoes extends com.evolute.entity.e private Integer id; private Integer trabalhadores_consultas_datas_id; - private db.data.siprp_local.outer.TrabalhadoresConsultasDatasData to_trabalhadores_consultas_datas_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasDatasData to_trabalhadores_consultas_datas_id; private String observacao; protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; @@ -141,7 +141,7 @@ public class TrabalhadoresConsultasDatasObservacoes extends com.evolute.entity.e LAZY_LOADED_OBJECTS.put( TRABALHADORES_CONSULTAS_DATAS_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.TrabalhadoresConsultasDatasData toTrabalhadores_consultas_datas_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasDatasData toTrabalhadores_consultas_datas_id() { try { @@ -154,7 +154,7 @@ public class TrabalhadoresConsultasDatasObservacoes extends com.evolute.entity.e return this.to_trabalhadores_consultas_datas_id; } - public void setToTrabalhadores_consultas_datas_id( db.data.siprp_local.outer.TrabalhadoresConsultasDatasData to_trabalhadores_consultas_datas_id ) + public void setToTrabalhadores_consultas_datas_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasDatasData to_trabalhadores_consultas_datas_id ) { try { @@ -252,7 +252,7 @@ public class TrabalhadoresConsultasDatasObservacoes extends com.evolute.entity.e setTrabalhadores_consultas_datas_id( ( Integer ) value ); break; case TrabalhadoresConsultasDatasObservacoes.TO_TRABALHADORES_CONSULTAS_DATAS_ID_INDEX: - setToTrabalhadores_consultas_datas_id( ( db.data.siprp_local.outer.TrabalhadoresConsultasDatasData ) value ); + setToTrabalhadores_consultas_datas_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasDatasData ) value ); break; case TrabalhadoresConsultasDatasObservacoes.OBSERVACAO_INDEX: setObservacao( ( String ) value ); @@ -272,7 +272,7 @@ public class TrabalhadoresConsultasDatasObservacoes extends com.evolute.entity.e this.trabalhadores_consultas_datas_id = ( Integer ) value; break; case TrabalhadoresConsultasDatasObservacoes.TO_TRABALHADORES_CONSULTAS_DATAS_ID_INDEX: - this.to_trabalhadores_consultas_datas_id = ( db.data.siprp_local.outer.TrabalhadoresConsultasDatasData ) value; + this.to_trabalhadores_consultas_datas_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasDatasData ) value; break; case TrabalhadoresConsultasDatasObservacoes.OBSERVACAO_INDEX: this.observacao = ( String ) value; @@ -323,7 +323,7 @@ public class TrabalhadoresConsultasDatasObservacoes extends com.evolute.entity.e theClass = Integer.class; break; case TrabalhadoresConsultasDatasObservacoes.TO_TRABALHADORES_CONSULTAS_DATAS_ID_INDEX: - theClass = db.data.siprp_local.outer.TrabalhadoresConsultasDatasData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasDatasData.class; break; case TrabalhadoresConsultasDatasObservacoes.OBSERVACAO_INDEX: theClass = String.class; @@ -351,12 +351,28 @@ public class TrabalhadoresConsultasDatasObservacoes extends com.evolute.entity.e @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, TrabalhadoresConsultasDatasObservacoes.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresEcd.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresEcd.java similarity index 84% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresEcd.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresEcd.java index 3db97f83..cd1e8f8a 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresEcd.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresEcd.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class TrabalhadoresEcd extends com.evolute.entity.evo.EvoDataObject @@ -47,21 +47,21 @@ public class TrabalhadoresEcd extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class TrabalhadoresEcds extends com.evolute.entity.evo.EvoDataObject @@ -35,15 +35,15 @@ public class TrabalhadoresEcds extends com.evolute.entity.evo.EvoDataObjectfromTrabalhadoresEcdsDatas_trabalhadores_ecds_id() + public java.util.ListfromTrabalhadoresEcdsDatas_trabalhadores_ecds_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdsDatasData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_ecds_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_ecds_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -177,7 +177,7 @@ public class TrabalhadoresEcds extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class TrabalhadoresEcdsAnalise extends com.evolute.entity.evo.EvoDataObject @@ -33,15 +33,15 @@ public class TrabalhadoresEcdsAnalise extends com.evolute.entity.evo.EvoDataObje public static final com.evolute.entity.ForeignKey ForeignKeyprestador_idToprestadores = - new com.evolute.entity.ForeignKey( TrabalhadoresEcdsAnalise.class, TrabalhadoresEcdsAnalise.PRESTADOR_ID, db.data.siprp_local.outer.PrestadoresData.class, db.data.siprp_local.outer.PrestadoresData.ID ); + new com.evolute.entity.ForeignKey( TrabalhadoresEcdsAnalise.class, TrabalhadoresEcdsAnalise.PRESTADOR_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData.ID ); public static final com.evolute.entity.ForeignKey ForeignKeygrupo_ecds_idToprt_grupos_protocolo = - new com.evolute.entity.ForeignKey( TrabalhadoresEcdsAnalise.class, TrabalhadoresEcdsAnalise.GRUPO_ECDS_ID, db.data.siprp_local.outer.PrtGruposProtocoloData.class, db.data.siprp_local.outer.PrtGruposProtocoloData.ID ); + new com.evolute.entity.ForeignKey( TrabalhadoresEcdsAnalise.class, TrabalhadoresEcdsAnalise.GRUPO_ECDS_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData.ID ); public static final String TABLENAME = "trabalhadores_ecds_analise"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.trabalhadores_ecds_analise"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.trabalhadores_ecds_analise"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -83,9 +83,9 @@ public class TrabalhadoresEcdsAnalise extends com.evolute.entity.evo.EvoDataObje private Integer id; private java.util.Date data; private Integer prestador_id; - private db.data.siprp_local.outer.PrestadoresData to_prestador_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData to_prestador_id; private Integer grupo_ecds_id; - private db.data.siprp_local.outer.PrtGruposProtocoloData to_grupo_ecds_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData to_grupo_ecds_id; protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; @@ -183,7 +183,7 @@ public class TrabalhadoresEcdsAnalise extends com.evolute.entity.evo.EvoDataObje LAZY_LOADED_OBJECTS.put( PRESTADOR_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.PrestadoresData toPrestador_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData toPrestador_id() { try { @@ -196,7 +196,7 @@ public class TrabalhadoresEcdsAnalise extends com.evolute.entity.evo.EvoDataObje return this.to_prestador_id; } - public void setToPrestador_id( db.data.siprp_local.outer.PrestadoresData to_prestador_id ) + public void setToPrestador_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData to_prestador_id ) { try { @@ -238,7 +238,7 @@ public class TrabalhadoresEcdsAnalise extends com.evolute.entity.evo.EvoDataObje LAZY_LOADED_OBJECTS.put( GRUPO_ECDS_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.PrtGruposProtocoloData toGrupo_ecds_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData toGrupo_ecds_id() { try { @@ -251,7 +251,7 @@ public class TrabalhadoresEcdsAnalise extends com.evolute.entity.evo.EvoDataObje return this.to_grupo_ecds_id; } - public void setToGrupo_ecds_id( db.data.siprp_local.outer.PrtGruposProtocoloData to_grupo_ecds_id ) + public void setToGrupo_ecds_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData to_grupo_ecds_id ) { try { @@ -335,13 +335,13 @@ public class TrabalhadoresEcdsAnalise extends com.evolute.entity.evo.EvoDataObje setPrestador_id( ( Integer ) value ); break; case TrabalhadoresEcdsAnalise.TO_PRESTADOR_ID_INDEX: - setToPrestador_id( ( db.data.siprp_local.outer.PrestadoresData ) value ); + setToPrestador_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData ) value ); break; case TrabalhadoresEcdsAnalise.GRUPO_ECDS_ID_INDEX: setGrupo_ecds_id( ( Integer ) value ); break; case TrabalhadoresEcdsAnalise.TO_GRUPO_ECDS_ID_INDEX: - setToGrupo_ecds_id( ( db.data.siprp_local.outer.PrtGruposProtocoloData ) value ); + setToGrupo_ecds_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData ) value ); break; } } @@ -361,13 +361,13 @@ public class TrabalhadoresEcdsAnalise extends com.evolute.entity.evo.EvoDataObje this.prestador_id = ( Integer ) value; break; case TrabalhadoresEcdsAnalise.TO_PRESTADOR_ID_INDEX: - this.to_prestador_id = ( db.data.siprp_local.outer.PrestadoresData ) value; + this.to_prestador_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData ) value; break; case TrabalhadoresEcdsAnalise.GRUPO_ECDS_ID_INDEX: this.grupo_ecds_id = ( Integer ) value; break; case TrabalhadoresEcdsAnalise.TO_GRUPO_ECDS_ID_INDEX: - this.to_grupo_ecds_id = ( db.data.siprp_local.outer.PrtGruposProtocoloData ) value; + this.to_grupo_ecds_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData ) value; break; } } @@ -418,13 +418,13 @@ public class TrabalhadoresEcdsAnalise extends com.evolute.entity.evo.EvoDataObje theClass = Integer.class; break; case TrabalhadoresEcdsAnalise.TO_PRESTADOR_ID_INDEX: - theClass = db.data.siprp_local.outer.PrestadoresData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData.class; break; case TrabalhadoresEcdsAnalise.GRUPO_ECDS_ID_INDEX: theClass = Integer.class; break; case TrabalhadoresEcdsAnalise.TO_GRUPO_ECDS_ID_INDEX: - theClass = db.data.siprp_local.outer.PrtGruposProtocoloData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrtGruposProtocoloData.class; break; } return theClass; @@ -449,12 +449,28 @@ public class TrabalhadoresEcdsAnalise extends com.evolute.entity.evo.EvoDataObje @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, TrabalhadoresEcdsAnalise.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresEcdsDatas.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresEcdsDatas.java similarity index 79% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresEcdsDatas.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresEcdsDatas.java index 203d0609..bff452b1 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresEcdsDatas.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresEcdsDatas.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class TrabalhadoresEcdsDatas extends com.evolute.entity.evo.EvoDataObject @@ -43,18 +43,18 @@ public class TrabalhadoresEcdsDatas extends com.evolute.entity.evo.EvoDataObject public static final com.evolute.entity.ForeignKey ForeignKeytrabalhadores_ecds_idTotrabalhadores_ecds = - new com.evolute.entity.ForeignKey( TrabalhadoresEcdsDatas.class, TrabalhadoresEcdsDatas.TRABALHADORES_ECDS_ID, db.data.siprp_local.outer.TrabalhadoresEcdsData.class, db.data.siprp_local.outer.TrabalhadoresEcdsData.ID ); + new com.evolute.entity.ForeignKey( TrabalhadoresEcdsDatas.class, TrabalhadoresEcdsDatas.TRABALHADORES_ECDS_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsData.ID ); public static final com.evolute.entity.ForeignKey ForeignKeyprestador_idToprestadores = - new com.evolute.entity.ForeignKey( TrabalhadoresEcdsDatas.class, TrabalhadoresEcdsDatas.PRESTADOR_ID, db.data.siprp_local.outer.PrestadoresData.class, db.data.siprp_local.outer.PrestadoresData.ID ); + new com.evolute.entity.ForeignKey( TrabalhadoresEcdsDatas.class, TrabalhadoresEcdsDatas.PRESTADOR_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData.ID ); public static final com.evolute.entity.ForeignKey ForeignKeyanalisador_idToprestadores = - new com.evolute.entity.ForeignKey( TrabalhadoresEcdsDatas.class, TrabalhadoresEcdsDatas.ANALISADOR_ID, db.data.siprp_local.outer.PrestadoresData.class, db.data.siprp_local.outer.PrestadoresData.ID ); + new com.evolute.entity.ForeignKey( TrabalhadoresEcdsDatas.class, TrabalhadoresEcdsDatas.ANALISADOR_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData.ID ); public static final String TABLENAME = "trabalhadores_ecds_datas"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.trabalhadores_ecds_datas"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.trabalhadores_ecds_datas"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -114,13 +114,13 @@ public class TrabalhadoresEcdsDatas extends com.evolute.entity.evo.EvoDataObject private Integer id; private Integer trabalhadores_ecds_id; - private db.data.siprp_local.outer.TrabalhadoresEcdsData to_trabalhadores_ecds_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsData to_trabalhadores_ecds_id; private java.util.Date data; private Integer estado; private Integer prestador_id; - private db.data.siprp_local.outer.PrestadoresData to_prestador_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData to_prestador_id; private Integer analisador_id; - private db.data.siprp_local.outer.PrestadoresData to_analisador_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData to_analisador_id; private java.util.Date data_envio; private java.util.Date data_recepcao; @@ -162,14 +162,14 @@ public class TrabalhadoresEcdsDatas extends com.evolute.entity.evo.EvoDataObject LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE ); } - public java.util.ListfromLembretes_trabalhadores_ecds_datas_id() + public java.util.ListfromLembretes_trabalhadores_ecds_datas_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.LembretesData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.LembretesData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_ecds_datas_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.LembretesData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_ecds_datas_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -179,14 +179,14 @@ public class TrabalhadoresEcdsDatas extends com.evolute.entity.evo.EvoDataObject return result; } - public java.util.ListfromTrabalhadoresEcd_trabalhadores_ecds_datas_id() + public java.util.ListfromTrabalhadoresEcd_trabalhadores_ecds_datas_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_ecds_datas_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_ecds_datas_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -196,14 +196,14 @@ public class TrabalhadoresEcdsDatas extends com.evolute.entity.evo.EvoDataObject return result; } - public java.util.ListfromTrabalhadoresEcdsDatasEmails_trabalhadores_ecds_datas_id() + public java.util.ListfromTrabalhadoresEcdsDatasEmails_trabalhadores_ecds_datas_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdsDatasEmailsData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasEmailsData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsDatasEmailsData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_ecds_datas_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasEmailsData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_ecds_datas_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -213,14 +213,14 @@ public class TrabalhadoresEcdsDatas extends com.evolute.entity.evo.EvoDataObject return result; } - public java.util.ListfromTrabalhadoresEcdsDatasObservacoes_trabalhadores_ecds_datas_id() + public java.util.ListfromTrabalhadoresEcdsDatasObservacoes_trabalhadores_ecds_datas_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdsDatasObservacoesData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasObservacoesData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsDatasObservacoesData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_ecds_datas_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasObservacoesData.class , getPrimaryKey().getMap().get("id"), "trabalhadores_ecds_datas_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -259,7 +259,7 @@ public class TrabalhadoresEcdsDatas extends com.evolute.entity.evo.EvoDataObject LAZY_LOADED_OBJECTS.put( TRABALHADORES_ECDS_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.TrabalhadoresEcdsData toTrabalhadores_ecds_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsData toTrabalhadores_ecds_id() { try { @@ -272,7 +272,7 @@ public class TrabalhadoresEcdsDatas extends com.evolute.entity.evo.EvoDataObject return this.to_trabalhadores_ecds_id; } - public void setToTrabalhadores_ecds_id( db.data.siprp_local.outer.TrabalhadoresEcdsData to_trabalhadores_ecds_id ) + public void setToTrabalhadores_ecds_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsData to_trabalhadores_ecds_id ) { try { @@ -372,7 +372,7 @@ public class TrabalhadoresEcdsDatas extends com.evolute.entity.evo.EvoDataObject LAZY_LOADED_OBJECTS.put( PRESTADOR_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.PrestadoresData toPrestador_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData toPrestador_id() { try { @@ -385,7 +385,7 @@ public class TrabalhadoresEcdsDatas extends com.evolute.entity.evo.EvoDataObject return this.to_prestador_id; } - public void setToPrestador_id( db.data.siprp_local.outer.PrestadoresData to_prestador_id ) + public void setToPrestador_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData to_prestador_id ) { try { @@ -427,7 +427,7 @@ public class TrabalhadoresEcdsDatas extends com.evolute.entity.evo.EvoDataObject LAZY_LOADED_OBJECTS.put( ANALISADOR_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.PrestadoresData toAnalisador_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData toAnalisador_id() { try { @@ -440,7 +440,7 @@ public class TrabalhadoresEcdsDatas extends com.evolute.entity.evo.EvoDataObject return this.to_analisador_id; } - public void setToAnalisador_id( db.data.siprp_local.outer.PrestadoresData to_analisador_id ) + public void setToAnalisador_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData to_analisador_id ) { try { @@ -609,7 +609,7 @@ public class TrabalhadoresEcdsDatas extends com.evolute.entity.evo.EvoDataObject setTrabalhadores_ecds_id( ( Integer ) value ); break; case TrabalhadoresEcdsDatas.TO_TRABALHADORES_ECDS_ID_INDEX: - setToTrabalhadores_ecds_id( ( db.data.siprp_local.outer.TrabalhadoresEcdsData ) value ); + setToTrabalhadores_ecds_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsData ) value ); break; case TrabalhadoresEcdsDatas.DATA_INDEX: setData( ( java.util.Date ) value ); @@ -621,13 +621,13 @@ public class TrabalhadoresEcdsDatas extends com.evolute.entity.evo.EvoDataObject setPrestador_id( ( Integer ) value ); break; case TrabalhadoresEcdsDatas.TO_PRESTADOR_ID_INDEX: - setToPrestador_id( ( db.data.siprp_local.outer.PrestadoresData ) value ); + setToPrestador_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData ) value ); break; case TrabalhadoresEcdsDatas.ANALISADOR_ID_INDEX: setAnalisador_id( ( Integer ) value ); break; case TrabalhadoresEcdsDatas.TO_ANALISADOR_ID_INDEX: - setToAnalisador_id( ( db.data.siprp_local.outer.PrestadoresData ) value ); + setToAnalisador_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData ) value ); break; case TrabalhadoresEcdsDatas.DATA_ENVIO_INDEX: setData_envio( ( java.util.Date ) value ); @@ -650,7 +650,7 @@ public class TrabalhadoresEcdsDatas extends com.evolute.entity.evo.EvoDataObject this.trabalhadores_ecds_id = ( Integer ) value; break; case TrabalhadoresEcdsDatas.TO_TRABALHADORES_ECDS_ID_INDEX: - this.to_trabalhadores_ecds_id = ( db.data.siprp_local.outer.TrabalhadoresEcdsData ) value; + this.to_trabalhadores_ecds_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsData ) value; break; case TrabalhadoresEcdsDatas.DATA_INDEX: this.data = ( java.util.Date ) value; @@ -662,13 +662,13 @@ public class TrabalhadoresEcdsDatas extends com.evolute.entity.evo.EvoDataObject this.prestador_id = ( Integer ) value; break; case TrabalhadoresEcdsDatas.TO_PRESTADOR_ID_INDEX: - this.to_prestador_id = ( db.data.siprp_local.outer.PrestadoresData ) value; + this.to_prestador_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData ) value; break; case TrabalhadoresEcdsDatas.ANALISADOR_ID_INDEX: this.analisador_id = ( Integer ) value; break; case TrabalhadoresEcdsDatas.TO_ANALISADOR_ID_INDEX: - this.to_analisador_id = ( db.data.siprp_local.outer.PrestadoresData ) value; + this.to_analisador_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData ) value; break; case TrabalhadoresEcdsDatas.DATA_ENVIO_INDEX: this.data_envio = ( java.util.Date ) value; @@ -722,7 +722,7 @@ public class TrabalhadoresEcdsDatas extends com.evolute.entity.evo.EvoDataObject theClass = Integer.class; break; case TrabalhadoresEcdsDatas.TO_TRABALHADORES_ECDS_ID_INDEX: - theClass = db.data.siprp_local.outer.TrabalhadoresEcdsData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsData.class; break; case TrabalhadoresEcdsDatas.DATA_INDEX: theClass = java.util.Date.class; @@ -734,13 +734,13 @@ public class TrabalhadoresEcdsDatas extends com.evolute.entity.evo.EvoDataObject theClass = Integer.class; break; case TrabalhadoresEcdsDatas.TO_PRESTADOR_ID_INDEX: - theClass = db.data.siprp_local.outer.PrestadoresData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData.class; break; case TrabalhadoresEcdsDatas.ANALISADOR_ID_INDEX: theClass = Integer.class; break; case TrabalhadoresEcdsDatas.TO_ANALISADOR_ID_INDEX: - theClass = db.data.siprp_local.outer.PrestadoresData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.PrestadoresData.class; break; case TrabalhadoresEcdsDatas.DATA_ENVIO_INDEX: theClass = java.util.Date.class; @@ -771,12 +771,28 @@ public class TrabalhadoresEcdsDatas extends com.evolute.entity.evo.EvoDataObject @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, TrabalhadoresEcdsDatas.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresEcdsDatasEmails.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresEcdsDatasEmails.java similarity index 90% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresEcdsDatasEmails.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresEcdsDatasEmails.java index 94d63e48..4e105e19 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresEcdsDatasEmails.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresEcdsDatasEmails.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class TrabalhadoresEcdsDatasEmails extends com.evolute.entity.evo.EvoDataObject @@ -35,12 +35,12 @@ public class TrabalhadoresEcdsDatasEmails extends com.evolute.entity.evo.EvoData public static final com.evolute.entity.ForeignKey ForeignKeytrabalhadores_ecds_datas_idTotrabalhadores_ecds_datas = - new com.evolute.entity.ForeignKey( TrabalhadoresEcdsDatasEmails.class, TrabalhadoresEcdsDatasEmails.TRABALHADORES_ECDS_DATAS_ID, db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.class, db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.ID ); + new com.evolute.entity.ForeignKey( TrabalhadoresEcdsDatasEmails.class, TrabalhadoresEcdsDatasEmails.TRABALHADORES_ECDS_DATAS_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.ID ); public static final String TABLENAME = "trabalhadores_ecds_datas_emails"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.trabalhadores_ecds_datas_emails"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.trabalhadores_ecds_datas_emails"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -86,7 +86,7 @@ public class TrabalhadoresEcdsDatasEmails extends com.evolute.entity.evo.EvoData private Integer id; private Integer trabalhadores_ecds_datas_id; - private db.data.siprp_local.outer.TrabalhadoresEcdsDatasData to_trabalhadores_ecds_datas_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasData to_trabalhadores_ecds_datas_id; private String destination; private java.util.Date data; private String subject; @@ -159,7 +159,7 @@ public class TrabalhadoresEcdsDatasEmails extends com.evolute.entity.evo.EvoData LAZY_LOADED_OBJECTS.put( TRABALHADORES_ECDS_DATAS_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.TrabalhadoresEcdsDatasData toTrabalhadores_ecds_datas_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasData toTrabalhadores_ecds_datas_id() { try { @@ -172,7 +172,7 @@ public class TrabalhadoresEcdsDatasEmails extends com.evolute.entity.evo.EvoData return this.to_trabalhadores_ecds_datas_id; } - public void setToTrabalhadores_ecds_datas_id( db.data.siprp_local.outer.TrabalhadoresEcdsDatasData to_trabalhadores_ecds_datas_id ) + public void setToTrabalhadores_ecds_datas_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasData to_trabalhadores_ecds_datas_id ) { try { @@ -375,7 +375,7 @@ public class TrabalhadoresEcdsDatasEmails extends com.evolute.entity.evo.EvoData setTrabalhadores_ecds_datas_id( ( Integer ) value ); break; case TrabalhadoresEcdsDatasEmails.TO_TRABALHADORES_ECDS_DATAS_ID_INDEX: - setToTrabalhadores_ecds_datas_id( ( db.data.siprp_local.outer.TrabalhadoresEcdsDatasData ) value ); + setToTrabalhadores_ecds_datas_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasData ) value ); break; case TrabalhadoresEcdsDatasEmails.DESTINATION_INDEX: setDestination( ( String ) value ); @@ -404,7 +404,7 @@ public class TrabalhadoresEcdsDatasEmails extends com.evolute.entity.evo.EvoData this.trabalhadores_ecds_datas_id = ( Integer ) value; break; case TrabalhadoresEcdsDatasEmails.TO_TRABALHADORES_ECDS_DATAS_ID_INDEX: - this.to_trabalhadores_ecds_datas_id = ( db.data.siprp_local.outer.TrabalhadoresEcdsDatasData ) value; + this.to_trabalhadores_ecds_datas_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasData ) value; break; case TrabalhadoresEcdsDatasEmails.DESTINATION_INDEX: this.destination = ( String ) value; @@ -464,7 +464,7 @@ public class TrabalhadoresEcdsDatasEmails extends com.evolute.entity.evo.EvoData theClass = Integer.class; break; case TrabalhadoresEcdsDatasEmails.TO_TRABALHADORES_ECDS_DATAS_ID_INDEX: - theClass = db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.class; break; case TrabalhadoresEcdsDatasEmails.DESTINATION_INDEX: theClass = String.class; @@ -501,12 +501,28 @@ public class TrabalhadoresEcdsDatasEmails extends com.evolute.entity.evo.EvoData @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, TrabalhadoresEcdsDatasEmails.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresEcdsDatasObservacoes.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresEcdsDatasObservacoes.java similarity index 86% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresEcdsDatasObservacoes.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresEcdsDatasObservacoes.java index aac5d0cb..2fc9c597 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresEcdsDatasObservacoes.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresEcdsDatasObservacoes.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class TrabalhadoresEcdsDatasObservacoes extends com.evolute.entity.evo.EvoDataObject @@ -29,12 +29,12 @@ public class TrabalhadoresEcdsDatasObservacoes extends com.evolute.entity.evo.Ev public static final com.evolute.entity.ForeignKey ForeignKeytrabalhadores_ecds_datas_idTotrabalhadores_ecds_datas = - new com.evolute.entity.ForeignKey( TrabalhadoresEcdsDatasObservacoes.class, TrabalhadoresEcdsDatasObservacoes.TRABALHADORES_ECDS_DATAS_ID, db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.class, db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.ID ); + new com.evolute.entity.ForeignKey( TrabalhadoresEcdsDatasObservacoes.class, TrabalhadoresEcdsDatasObservacoes.TRABALHADORES_ECDS_DATAS_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.ID ); public static final String TABLENAME = "trabalhadores_ecds_datas_observacoes"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.trabalhadores_ecds_datas_observacoes"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.trabalhadores_ecds_datas_observacoes"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -69,7 +69,7 @@ public class TrabalhadoresEcdsDatasObservacoes extends com.evolute.entity.evo.Ev private Integer id; private Integer trabalhadores_ecds_datas_id; - private db.data.siprp_local.outer.TrabalhadoresEcdsDatasData to_trabalhadores_ecds_datas_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasData to_trabalhadores_ecds_datas_id; private String observacao; protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; @@ -139,7 +139,7 @@ public class TrabalhadoresEcdsDatasObservacoes extends com.evolute.entity.evo.Ev LAZY_LOADED_OBJECTS.put( TRABALHADORES_ECDS_DATAS_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.TrabalhadoresEcdsDatasData toTrabalhadores_ecds_datas_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasData toTrabalhadores_ecds_datas_id() { try { @@ -152,7 +152,7 @@ public class TrabalhadoresEcdsDatasObservacoes extends com.evolute.entity.evo.Ev return this.to_trabalhadores_ecds_datas_id; } - public void setToTrabalhadores_ecds_datas_id( db.data.siprp_local.outer.TrabalhadoresEcdsDatasData to_trabalhadores_ecds_datas_id ) + public void setToTrabalhadores_ecds_datas_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasData to_trabalhadores_ecds_datas_id ) { try { @@ -250,7 +250,7 @@ public class TrabalhadoresEcdsDatasObservacoes extends com.evolute.entity.evo.Ev setTrabalhadores_ecds_datas_id( ( Integer ) value ); break; case TrabalhadoresEcdsDatasObservacoes.TO_TRABALHADORES_ECDS_DATAS_ID_INDEX: - setToTrabalhadores_ecds_datas_id( ( db.data.siprp_local.outer.TrabalhadoresEcdsDatasData ) value ); + setToTrabalhadores_ecds_datas_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasData ) value ); break; case TrabalhadoresEcdsDatasObservacoes.OBSERVACAO_INDEX: setObservacao( ( String ) value ); @@ -270,7 +270,7 @@ public class TrabalhadoresEcdsDatasObservacoes extends com.evolute.entity.evo.Ev this.trabalhadores_ecds_datas_id = ( Integer ) value; break; case TrabalhadoresEcdsDatasObservacoes.TO_TRABALHADORES_ECDS_DATAS_ID_INDEX: - this.to_trabalhadores_ecds_datas_id = ( db.data.siprp_local.outer.TrabalhadoresEcdsDatasData ) value; + this.to_trabalhadores_ecds_datas_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasData ) value; break; case TrabalhadoresEcdsDatasObservacoes.OBSERVACAO_INDEX: this.observacao = ( String ) value; @@ -321,7 +321,7 @@ public class TrabalhadoresEcdsDatasObservacoes extends com.evolute.entity.evo.Ev theClass = Integer.class; break; case TrabalhadoresEcdsDatasObservacoes.TO_TRABALHADORES_ECDS_DATAS_ID_INDEX: - theClass = db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsDatasData.class; break; case TrabalhadoresEcdsDatasObservacoes.OBSERVACAO_INDEX: theClass = String.class; @@ -349,12 +349,28 @@ public class TrabalhadoresEcdsDatasObservacoes extends com.evolute.entity.evo.Ev @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, TrabalhadoresEcdsDatasObservacoes.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresFichasAptidao.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresFichasAptidao.java similarity index 82% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresFichasAptidao.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresFichasAptidao.java index c9080499..541137a5 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresFichasAptidao.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresFichasAptidao.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class TrabalhadoresFichasAptidao extends com.evolute.entity.evo.EvoDataObject @@ -31,15 +31,15 @@ public class TrabalhadoresFichasAptidao extends com.evolute.entity.evo.EvoDataOb public static final com.evolute.entity.ForeignKey ForeignKeyprocesso_idTotrabalhadores_processo = - new com.evolute.entity.ForeignKey( TrabalhadoresFichasAptidao.class, TrabalhadoresFichasAptidao.PROCESSO_ID, db.data.siprp_local.outer.TrabalhadoresProcessoData.class, db.data.siprp_local.outer.TrabalhadoresProcessoData.ID ); + new com.evolute.entity.ForeignKey( TrabalhadoresFichasAptidao.class, TrabalhadoresFichasAptidao.PROCESSO_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresProcessoData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresProcessoData.ID ); public static final com.evolute.entity.ForeignKey ForeignKeyexame_idToexames = - new com.evolute.entity.ForeignKey( TrabalhadoresFichasAptidao.class, TrabalhadoresFichasAptidao.EXAME_ID, db.data.siprp_local.outer.ExamesData.class, db.data.siprp_local.outer.ExamesData.ID ); + new com.evolute.entity.ForeignKey( TrabalhadoresFichasAptidao.class, TrabalhadoresFichasAptidao.EXAME_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.ExamesData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.ExamesData.ID ); public static final String TABLENAME = "trabalhadores_fichas_aptidao"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.trabalhadores_fichas_aptidao"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.trabalhadores_fichas_aptidao"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -77,9 +77,9 @@ public class TrabalhadoresFichasAptidao extends com.evolute.entity.evo.EvoDataOb private Integer id; private Integer processo_id; - private db.data.siprp_local.outer.TrabalhadoresProcessoData to_processo_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresProcessoData to_processo_id; private Integer exame_id; - private db.data.siprp_local.outer.ExamesData to_exame_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.ExamesData to_exame_id; protected com.evolute.entity.utils.IntegerPrimaryKey primaryKey; @@ -148,7 +148,7 @@ public class TrabalhadoresFichasAptidao extends com.evolute.entity.evo.EvoDataOb LAZY_LOADED_OBJECTS.put( PROCESSO_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.TrabalhadoresProcessoData toProcesso_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresProcessoData toProcesso_id() { try { @@ -161,7 +161,7 @@ public class TrabalhadoresFichasAptidao extends com.evolute.entity.evo.EvoDataOb return this.to_processo_id; } - public void setToProcesso_id( db.data.siprp_local.outer.TrabalhadoresProcessoData to_processo_id ) + public void setToProcesso_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresProcessoData to_processo_id ) { try { @@ -203,7 +203,7 @@ public class TrabalhadoresFichasAptidao extends com.evolute.entity.evo.EvoDataOb LAZY_LOADED_OBJECTS.put( EXAME_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.ExamesData toExame_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.ExamesData toExame_id() { try { @@ -216,7 +216,7 @@ public class TrabalhadoresFichasAptidao extends com.evolute.entity.evo.EvoDataOb return this.to_exame_id; } - public void setToExame_id( db.data.siprp_local.outer.ExamesData to_exame_id ) + public void setToExame_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.ExamesData to_exame_id ) { try { @@ -291,13 +291,13 @@ public class TrabalhadoresFichasAptidao extends com.evolute.entity.evo.EvoDataOb setProcesso_id( ( Integer ) value ); break; case TrabalhadoresFichasAptidao.TO_PROCESSO_ID_INDEX: - setToProcesso_id( ( db.data.siprp_local.outer.TrabalhadoresProcessoData ) value ); + setToProcesso_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresProcessoData ) value ); break; case TrabalhadoresFichasAptidao.EXAME_ID_INDEX: setExame_id( ( Integer ) value ); break; case TrabalhadoresFichasAptidao.TO_EXAME_ID_INDEX: - setToExame_id( ( db.data.siprp_local.outer.ExamesData ) value ); + setToExame_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.ExamesData ) value ); break; } } @@ -314,13 +314,13 @@ public class TrabalhadoresFichasAptidao extends com.evolute.entity.evo.EvoDataOb this.processo_id = ( Integer ) value; break; case TrabalhadoresFichasAptidao.TO_PROCESSO_ID_INDEX: - this.to_processo_id = ( db.data.siprp_local.outer.TrabalhadoresProcessoData ) value; + this.to_processo_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresProcessoData ) value; break; case TrabalhadoresFichasAptidao.EXAME_ID_INDEX: this.exame_id = ( Integer ) value; break; case TrabalhadoresFichasAptidao.TO_EXAME_ID_INDEX: - this.to_exame_id = ( db.data.siprp_local.outer.ExamesData ) value; + this.to_exame_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.ExamesData ) value; break; } } @@ -368,13 +368,13 @@ public class TrabalhadoresFichasAptidao extends com.evolute.entity.evo.EvoDataOb theClass = Integer.class; break; case TrabalhadoresFichasAptidao.TO_PROCESSO_ID_INDEX: - theClass = db.data.siprp_local.outer.TrabalhadoresProcessoData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresProcessoData.class; break; case TrabalhadoresFichasAptidao.EXAME_ID_INDEX: theClass = Integer.class; break; case TrabalhadoresFichasAptidao.TO_EXAME_ID_INDEX: - theClass = db.data.siprp_local.outer.ExamesData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.ExamesData.class; break; } return theClass; @@ -399,12 +399,28 @@ public class TrabalhadoresFichasAptidao extends com.evolute.entity.evo.EvoDataOb @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, TrabalhadoresFichasAptidao.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresProcesso.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresProcesso.java similarity index 84% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresProcesso.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresProcesso.java index b6e3bc68..31d40e68 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/TrabalhadoresProcesso.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/TrabalhadoresProcesso.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class TrabalhadoresProcesso extends com.evolute.entity.evo.EvoDataObject @@ -39,12 +39,12 @@ public class TrabalhadoresProcesso extends com.evolute.entity.evo.EvoDataObject< public static final com.evolute.entity.ForeignKey ForeignKeytrabalhador_idTotrabalhadores = - new com.evolute.entity.ForeignKey( TrabalhadoresProcesso.class, TrabalhadoresProcesso.TRABALHADOR_ID, db.data.siprp_local.outer.TrabalhadoresData.class, db.data.siprp_local.outer.TrabalhadoresData.ID ); + new com.evolute.entity.ForeignKey( TrabalhadoresProcesso.class, TrabalhadoresProcesso.TRABALHADOR_ID, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresData.class, com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresData.ID ); public static final String TABLENAME = "trabalhadores_processo"; - public static final String CLASS_IDENTIFIER = "db.data.siprp_local.inner.trabalhadores_processo"; + public static final String CLASS_IDENTIFIER = "com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.trabalhadores_processo"; public static final int _INVALID__INDEX = -1; public static final String ID = "id"; @@ -96,7 +96,7 @@ public class TrabalhadoresProcesso extends com.evolute.entity.evo.EvoDataObject< private Integer id; private Integer trabalhador_id; - private db.data.siprp_local.outer.TrabalhadoresData to_trabalhador_id; + private com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresData to_trabalhador_id; private String estado; private java.util.Date data_inicio; private java.util.Date data_fim; @@ -142,14 +142,14 @@ public class TrabalhadoresProcesso extends com.evolute.entity.evo.EvoDataObject< LAZY_LOADED_OBJECTS.put( ID, Boolean.TRUE ); } - public java.util.ListfromTrabalhadoresConsultas_processo_id() + public java.util.ListfromTrabalhadoresConsultas_processo_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresConsultasData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresConsultasData.class , getPrimaryKey().getMap().get("id"), "processo_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresConsultasData.class , getPrimaryKey().getMap().get("id"), "processo_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -159,14 +159,14 @@ public class TrabalhadoresProcesso extends com.evolute.entity.evo.EvoDataObject< return result; } - public java.util.ListfromTrabalhadoresEcds_processo_id() + public java.util.ListfromTrabalhadoresEcds_processo_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresEcdsData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresEcdsData.class , getPrimaryKey().getMap().get("id"), "processo_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresEcdsData.class , getPrimaryKey().getMap().get("id"), "processo_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -176,14 +176,14 @@ public class TrabalhadoresProcesso extends com.evolute.entity.evo.EvoDataObject< return result; } - public java.util.ListfromTrabalhadoresFichasAptidao_processo_id() + public java.util.ListfromTrabalhadoresFichasAptidao_processo_id() { - java.util.List result = new java.util.LinkedList< db.data.siprp_local.outer.TrabalhadoresFichasAptidaoData >(); + java.util.List result = new java.util.LinkedList< com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresFichasAptidaoData >(); if ( getPrimaryKey() != null ) { try { - result = fromReference( db.data.siprp_local.outer.TrabalhadoresFichasAptidaoData.class , getPrimaryKey().getMap().get("id"), "processo_id" ); + result = fromReference( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresFichasAptidaoData.class , getPrimaryKey().getMap().get("id"), "processo_id" ); } catch( com.evolute.entity.evo.EvoDataException edex ) { @@ -222,7 +222,7 @@ public class TrabalhadoresProcesso extends com.evolute.entity.evo.EvoDataObject< LAZY_LOADED_OBJECTS.put( TRABALHADOR_ID, Boolean.TRUE ); } - public db.data.siprp_local.outer.TrabalhadoresData toTrabalhador_id() + public com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresData toTrabalhador_id() { try { @@ -235,7 +235,7 @@ public class TrabalhadoresProcesso extends com.evolute.entity.evo.EvoDataObject< return this.to_trabalhador_id; } - public void setToTrabalhador_id( db.data.siprp_local.outer.TrabalhadoresData to_trabalhador_id ) + public void setToTrabalhador_id( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresData to_trabalhador_id ) { try { @@ -508,7 +508,7 @@ public class TrabalhadoresProcesso extends com.evolute.entity.evo.EvoDataObject< setTrabalhador_id( ( Integer ) value ); break; case TrabalhadoresProcesso.TO_TRABALHADOR_ID_INDEX: - setToTrabalhador_id( ( db.data.siprp_local.outer.TrabalhadoresData ) value ); + setToTrabalhador_id( ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresData ) value ); break; case TrabalhadoresProcesso.ESTADO_INDEX: setEstado( ( String ) value ); @@ -543,7 +543,7 @@ public class TrabalhadoresProcesso extends com.evolute.entity.evo.EvoDataObject< this.trabalhador_id = ( Integer ) value; break; case TrabalhadoresProcesso.TO_TRABALHADOR_ID_INDEX: - this.to_trabalhador_id = ( db.data.siprp_local.outer.TrabalhadoresData ) value; + this.to_trabalhador_id = ( com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresData ) value; break; case TrabalhadoresProcesso.ESTADO_INDEX: this.estado = ( String ) value; @@ -609,7 +609,7 @@ public class TrabalhadoresProcesso extends com.evolute.entity.evo.EvoDataObject< theClass = Integer.class; break; case TrabalhadoresProcesso.TO_TRABALHADOR_ID_INDEX: - theClass = db.data.siprp_local.outer.TrabalhadoresData.class; + theClass = com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.TrabalhadoresData.class; break; case TrabalhadoresProcesso.ESTADO_INDEX: theClass = String.class; @@ -652,12 +652,28 @@ public class TrabalhadoresProcesso extends com.evolute.entity.evo.EvoDataObject< @Override protected void setPrimaryKeyFromVirtual2DArray( com.evolute.utils.arrays.Virtual2DArray array, int row, int col ) { + Object idObject = null; if( primaryKey == null ) { primaryKey = new com.evolute.entity.utils.IntegerPrimaryKey( TABLENAME, TrabalhadoresProcesso.PK_FIELD_NAMES ); - primaryKey.set( 0, ( Integer ) array.get( row, col + 0 ) ); + idObject = array.get( row, col + 0 ); + try + { + primaryKey.set( 0, ( Integer ) idObject ); + setId( ( Integer ) idObject ); + } + catch( ClassCastException ex ) + { + if( idObject instanceof Number ) + { + primaryKey.set( 0, ((Number)idObject).intValue() ); + setId( ((Number)idObject).intValue() ); + } + else { + throw ex; + } + } } - setId( ( Integer ) array.get( row, col + 0 ) ); } @Override diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/Versao.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/Versao.java similarity index 93% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/Versao.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/Versao.java index 37bb6d94..b7d29039 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/inner/Versao.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/inner/Versao.java @@ -6,7 +6,7 @@ * Use but DON'T TOUCH * -> (can't touch this) */ -package db.data.siprp_local.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class Versao extends com.evolute.entity.evo.EvoDataObject @@ -23,7 +23,7 @@ public class Versao extends com.evolute.entity.evo.EvoDataObject (can't touch this) */ -package db.data.siprp.inner; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.inner; public class Version extends com.evolute.entity.evo.EvoDataObject @@ -29,7 +29,7 @@ public class Version extends com.evolute.entity.evo.EvoDataObject - + @@ -241,7 +241,7 @@ - + @@ -392,7 +392,7 @@ - + @@ -447,7 +447,7 @@ - + @@ -695,7 +695,7 @@ - + @@ -1218,6 +1218,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1692,7 +1748,7 @@ - + @@ -1708,7 +1764,7 @@ - + @@ -1783,7 +1839,7 @@ - + @@ -1799,7 +1855,7 @@ - + @@ -1861,7 +1917,7 @@ - + @@ -1877,7 +1933,7 @@ - + @@ -1918,7 +1974,7 @@ - + @@ -1934,7 +1990,7 @@ - + @@ -1950,7 +2006,7 @@ - + @@ -2223,7 +2279,7 @@ - + @@ -2243,7 +2299,7 @@ - + @@ -2342,7 +2398,7 @@ - + @@ -2358,7 +2414,7 @@ - + @@ -2612,6 +2668,10 @@ + + + + diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ActualizacaoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ActualizacaoData.java new file mode 100644 index 00000000..bc059223 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ActualizacaoData.java @@ -0,0 +1,18 @@ +/* +* ActualizacaoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class ActualizacaoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.Actualizacao +{ + + public ActualizacaoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/AptAppointmentData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/AptAppointmentData.java new file mode 100644 index 00000000..5558d391 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/AptAppointmentData.java @@ -0,0 +1,18 @@ +/* +* AptAppointmentData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class AptAppointmentData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.AptAppointment +{ + + public AptAppointmentData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/AptOutrasVacinaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/AptOutrasVacinaData.java new file mode 100644 index 00000000..7105db5b --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/AptOutrasVacinaData.java @@ -0,0 +1,18 @@ +/* +* AptOutrasVacinaData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class AptOutrasVacinaData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.AptOutrasVacina +{ + + public AptOutrasVacinaData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/AptOutrasViajanteData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/AptOutrasViajanteData.java new file mode 100644 index 00000000..3195f06e --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/AptOutrasViajanteData.java @@ -0,0 +1,18 @@ +/* +* AptOutrasViajanteData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class AptOutrasViajanteData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.AptOutrasViajante +{ + + public AptOutrasViajanteData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/AptSegurancaAlimentarData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/AptSegurancaAlimentarData.java new file mode 100644 index 00000000..c9b80869 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/AptSegurancaAlimentarData.java @@ -0,0 +1,18 @@ +/* +* AptSegurancaAlimentarData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class AptSegurancaAlimentarData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.AptSegurancaAlimentar +{ + + public AptSegurancaAlimentarData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/AptStateData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/AptStateData.java new file mode 100644 index 00000000..4edc34c7 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/AptStateData.java @@ -0,0 +1,18 @@ +/* +* AptStateData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class AptStateData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.AptState +{ + + public AptStateData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/AvisosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/AvisosData.java new file mode 100644 index 00000000..f50c6fd5 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/AvisosData.java @@ -0,0 +1,18 @@ +/* +* AvisosData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class AvisosData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.Avisos +{ + + public AvisosData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ContactosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ContactosData.java new file mode 100644 index 00000000..cb2831a0 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ContactosData.java @@ -0,0 +1,18 @@ +/* +* ContactosData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class ContactosData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.Contactos +{ + + public ContactosData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurArsData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurArsData.java new file mode 100644 index 00000000..1bbbec00 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurArsData.java @@ -0,0 +1,18 @@ +/* +* CurArsData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class CurArsData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.CurArs +{ + + public CurArsData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurAulasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurAulasData.java new file mode 100644 index 00000000..a04c2aaa --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurAulasData.java @@ -0,0 +1,18 @@ +/* +* CurAulasData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class CurAulasData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.CurAulas +{ + + public CurAulasData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurAulasFormadoresData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurAulasFormadoresData.java new file mode 100644 index 00000000..b121fa0d --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurAulasFormadoresData.java @@ -0,0 +1,18 @@ +/* +* CurAulasFormadoresData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class CurAulasFormadoresData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.CurAulasFormadores +{ + + public CurAulasFormadoresData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurCursosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurCursosData.java new file mode 100644 index 00000000..2d1374f9 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurCursosData.java @@ -0,0 +1,18 @@ +/* +* CurCursosData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class CurCursosData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.CurCursos +{ + + public CurCursosData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurDiasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurDiasData.java new file mode 100644 index 00000000..02220734 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurDiasData.java @@ -0,0 +1,18 @@ +/* +* CurDiasData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class CurDiasData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.CurDias +{ + + public CurDiasData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurFormadoresCursosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurFormadoresCursosData.java new file mode 100644 index 00000000..ec8e2cff --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurFormadoresCursosData.java @@ -0,0 +1,18 @@ +/* +* CurFormadoresCursosData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class CurFormadoresCursosData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.CurFormadoresCursos +{ + + public CurFormadoresCursosData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurFormadoresData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurFormadoresData.java new file mode 100644 index 00000000..1f5a52af --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurFormadoresData.java @@ -0,0 +1,18 @@ +/* +* CurFormadoresData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class CurFormadoresData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.CurFormadores +{ + + public CurFormadoresData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurFormandosCursosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurFormandosCursosData.java new file mode 100644 index 00000000..577576b5 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurFormandosCursosData.java @@ -0,0 +1,18 @@ +/* +* CurFormandosCursosData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class CurFormandosCursosData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.CurFormandosCursos +{ + + public CurFormandosCursosData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurFormandosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurFormandosData.java new file mode 100644 index 00000000..18bc2355 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurFormandosData.java @@ -0,0 +1,18 @@ +/* +* CurFormandosData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class CurFormandosData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.CurFormandos +{ + + public CurFormandosData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurHospitaisData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurHospitaisData.java new file mode 100644 index 00000000..9047e172 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurHospitaisData.java @@ -0,0 +1,18 @@ +/* +* CurHospitaisData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class CurHospitaisData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.CurHospitais +{ + + public CurHospitaisData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurNumeroCertificadoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurNumeroCertificadoData.java new file mode 100644 index 00000000..ffb8b8c3 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurNumeroCertificadoData.java @@ -0,0 +1,18 @@ +/* +* CurNumeroCertificadoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class CurNumeroCertificadoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.CurNumeroCertificado +{ + + public CurNumeroCertificadoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurNumeroCertificadoFormadorData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurNumeroCertificadoFormadorData.java new file mode 100644 index 00000000..d6006e6f --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurNumeroCertificadoFormadorData.java @@ -0,0 +1,18 @@ +/* +* CurNumeroCertificadoFormadorData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class CurNumeroCertificadoFormadorData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.CurNumeroCertificadoFormador +{ + + public CurNumeroCertificadoFormadorData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurPagamentosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurPagamentosData.java new file mode 100644 index 00000000..46955c36 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurPagamentosData.java @@ -0,0 +1,18 @@ +/* +* CurPagamentosData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class CurPagamentosData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.CurPagamentos +{ + + public CurPagamentosData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurPagamentosTiposData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurPagamentosTiposData.java new file mode 100644 index 00000000..17914dbc --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurPagamentosTiposData.java @@ -0,0 +1,18 @@ +/* +* CurPagamentosTiposData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class CurPagamentosTiposData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.CurPagamentosTipos +{ + + public CurPagamentosTiposData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurPresencasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurPresencasData.java new file mode 100644 index 00000000..74178ee2 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurPresencasData.java @@ -0,0 +1,18 @@ +/* +* CurPresencasData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class CurPresencasData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.CurPresencas +{ + + public CurPresencasData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurQuestionarioData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurQuestionarioData.java new file mode 100644 index 00000000..1d268412 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurQuestionarioData.java @@ -0,0 +1,18 @@ +/* +* CurQuestionarioData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class CurQuestionarioData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.CurQuestionario +{ + + public CurQuestionarioData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurQuestionarioPerguntaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurQuestionarioPerguntaData.java new file mode 100644 index 00000000..7672b228 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurQuestionarioPerguntaData.java @@ -0,0 +1,18 @@ +/* +* CurQuestionarioPerguntaData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class CurQuestionarioPerguntaData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.CurQuestionarioPergunta +{ + + public CurQuestionarioPerguntaData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurQuestionarioRespostaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurQuestionarioRespostaData.java new file mode 100644 index 00000000..f3ebfc07 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurQuestionarioRespostaData.java @@ -0,0 +1,18 @@ +/* +* CurQuestionarioRespostaData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class CurQuestionarioRespostaData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.CurQuestionarioResposta +{ + + public CurQuestionarioRespostaData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurTopicosAulasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurTopicosAulasData.java new file mode 100644 index 00000000..36e9ae31 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurTopicosAulasData.java @@ -0,0 +1,18 @@ +/* +* CurTopicosAulasData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class CurTopicosAulasData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.CurTopicosAulas +{ + + public CurTopicosAulasData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurTopicosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurTopicosData.java new file mode 100644 index 00000000..68747534 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/CurTopicosData.java @@ -0,0 +1,18 @@ +/* +* CurTopicosData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class CurTopicosData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.CurTopicos +{ + + public CurTopicosData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EcdOficialData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EcdOficialData.java new file mode 100644 index 00000000..2230c06c --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EcdOficialData.java @@ -0,0 +1,18 @@ +/* +* EcdOficialData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class EcdOficialData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.EcdOficial +{ + + public EcdOficialData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EmailPlanoDeActuacaoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EmailPlanoDeActuacaoData.java new file mode 100644 index 00000000..b445ec97 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EmailPlanoDeActuacaoData.java @@ -0,0 +1,18 @@ +/* +* EmailPlanoDeActuacaoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class EmailPlanoDeActuacaoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.EmailPlanoDeActuacao +{ + + public EmailPlanoDeActuacaoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EmpresaPrecoPeriodicidadeTipoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EmpresaPrecoPeriodicidadeTipoData.java new file mode 100644 index 00000000..ee0eaff2 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EmpresaPrecoPeriodicidadeTipoData.java @@ -0,0 +1,18 @@ +/* +* EmpresaPrecoPeriodicidadeTipoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class EmpresaPrecoPeriodicidadeTipoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.EmpresaPrecoPeriodicidadeTipo +{ + + public EmpresaPrecoPeriodicidadeTipoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EmpresaPrecoServicoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EmpresaPrecoServicoData.java new file mode 100644 index 00000000..aec1c7e3 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EmpresaPrecoServicoData.java @@ -0,0 +1,18 @@ +/* +* EmpresaPrecoServicoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class EmpresaPrecoServicoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.EmpresaPrecoServico +{ + + public EmpresaPrecoServicoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EmpresaPrecoServicoTipoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EmpresaPrecoServicoTipoData.java new file mode 100644 index 00000000..8c5d92ac --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EmpresaPrecoServicoTipoData.java @@ -0,0 +1,18 @@ +/* +* EmpresaPrecoServicoTipoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class EmpresaPrecoServicoTipoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.EmpresaPrecoServicoTipo +{ + + public EmpresaPrecoServicoTipoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EmpresasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EmpresasData.java new file mode 100644 index 00000000..58eb9e8a --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EmpresasData.java @@ -0,0 +1,18 @@ +/* +* EmpresasData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class EmpresasData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.Empresas +{ + + public EmpresasData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ErrorsData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ErrorsData.java new file mode 100644 index 00000000..02fe2f3d --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ErrorsData.java @@ -0,0 +1,18 @@ +/* +* ErrorsData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class ErrorsData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.Errors +{ + + public ErrorsData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EstabelecimentosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EstabelecimentosData.java new file mode 100644 index 00000000..ddff0fd1 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EstabelecimentosData.java @@ -0,0 +1,18 @@ +/* +* EstabelecimentosData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class EstabelecimentosData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.Estabelecimentos +{ + + public EstabelecimentosData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EtiquetasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EtiquetasData.java new file mode 100644 index 00000000..a7e0de89 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EtiquetasData.java @@ -0,0 +1,18 @@ +/* +* EtiquetasData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class EtiquetasData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.Etiquetas +{ + + public EtiquetasData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoPessoaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoPessoaData.java new file mode 100644 index 00000000..c30951aa --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoPessoaData.java @@ -0,0 +1,18 @@ +/* +* EvoPessoaData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class EvoPessoaData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.EvoPessoa +{ + + public EvoPessoaData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoTaskSyncRequestData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoTaskSyncRequestData.java new file mode 100644 index 00000000..11824072 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoTaskSyncRequestData.java @@ -0,0 +1,18 @@ +/* +* EvoTaskSyncRequestData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class EvoTaskSyncRequestData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.EvoTaskSyncRequest +{ + + public EvoTaskSyncRequestData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoTaskSyncRequestStateData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoTaskSyncRequestStateData.java new file mode 100644 index 00000000..6b7c682e --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoTaskSyncRequestStateData.java @@ -0,0 +1,18 @@ +/* +* EvoTaskSyncRequestStateData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class EvoTaskSyncRequestStateData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.EvoTaskSyncRequestState +{ + + public EvoTaskSyncRequestStateData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUpdateData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUpdateData.java new file mode 100644 index 00000000..2d72c392 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUpdateData.java @@ -0,0 +1,18 @@ +/* +* EvoUpdateData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class EvoUpdateData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.EvoUpdate +{ + + public EvoUpdateData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUsrPermissionData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUsrPermissionData.java new file mode 100644 index 00000000..afd2131e --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUsrPermissionData.java @@ -0,0 +1,18 @@ +/* +* EvoUsrPermissionData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class EvoUsrPermissionData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.EvoUsrPermission +{ + + public EvoUsrPermissionData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUsrPreferencesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUsrPreferencesData.java new file mode 100644 index 00000000..2963584d --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUsrPreferencesData.java @@ -0,0 +1,18 @@ +/* +* EvoUsrPreferencesData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class EvoUsrPreferencesData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.EvoUsrPreferences +{ + + public EvoUsrPreferencesData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUsrRoleData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUsrRoleData.java new file mode 100644 index 00000000..3bcda406 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUsrRoleData.java @@ -0,0 +1,18 @@ +/* +* EvoUsrRoleData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class EvoUsrRoleData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.EvoUsrRole +{ + + public EvoUsrRoleData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUsrRolesPermissionsData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUsrRolesPermissionsData.java new file mode 100644 index 00000000..9b582d54 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUsrRolesPermissionsData.java @@ -0,0 +1,18 @@ +/* +* EvoUsrRolesPermissionsData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class EvoUsrRolesPermissionsData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.EvoUsrRolesPermissions +{ + + public EvoUsrRolesPermissionsData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUsrUserData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUsrUserData.java new file mode 100644 index 00000000..a699078a --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUsrUserData.java @@ -0,0 +1,18 @@ +/* +* EvoUsrUserData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class EvoUsrUserData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.EvoUsrUser +{ + + public EvoUsrUserData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUsrUsersRolesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUsrUsersRolesData.java new file mode 100644 index 00000000..21d4ee9c --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/EvoUsrUsersRolesData.java @@ -0,0 +1,18 @@ +/* +* EvoUsrUsersRolesData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class EvoUsrUsersRolesData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.EvoUsrUsersRoles +{ + + public EvoUsrUsersRolesData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ExamesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ExamesData.java new file mode 100644 index 00000000..3ccbdf12 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ExamesData.java @@ -0,0 +1,18 @@ +/* +* ExamesData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class ExamesData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.Exames +{ + + public ExamesData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ExamesPerfisData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ExamesPerfisData.java new file mode 100644 index 00000000..0a68c098 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ExamesPerfisData.java @@ -0,0 +1,18 @@ +/* +* ExamesPerfisData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class ExamesPerfisData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.ExamesPerfis +{ + + public ExamesPerfisData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ExamesPortariaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ExamesPortariaData.java new file mode 100644 index 00000000..5c993968 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ExamesPortariaData.java @@ -0,0 +1,18 @@ +/* +* ExamesPortariaData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class ExamesPortariaData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.ExamesPortaria +{ + + public ExamesPortariaData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/FilCategoriasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/FilCategoriasData.java new file mode 100644 index 00000000..5ae55d14 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/FilCategoriasData.java @@ -0,0 +1,18 @@ +/* +* FilCategoriasData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class FilCategoriasData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.FilCategorias +{ + + public FilCategoriasData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/FilFileAppointmentData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/FilFileAppointmentData.java new file mode 100644 index 00000000..4d7b0b69 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/FilFileAppointmentData.java @@ -0,0 +1,18 @@ +/* +* FilFileAppointmentData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class FilFileAppointmentData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.FilFileAppointment +{ + + public FilFileAppointmentData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/FilFileData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/FilFileData.java new file mode 100644 index 00000000..a2bba1fd --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/FilFileData.java @@ -0,0 +1,18 @@ +/* +* FilFileData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class FilFileData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.FilFile +{ + + public FilFileData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/FilFileEmpresaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/FilFileEmpresaData.java new file mode 100644 index 00000000..79abee33 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/FilFileEmpresaData.java @@ -0,0 +1,18 @@ +/* +* FilFileEmpresaData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class FilFileEmpresaData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.FilFileEmpresa +{ + + public FilFileEmpresaData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/FilFileMarcacoesEstabelecimentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/FilFileMarcacoesEstabelecimentoData.java new file mode 100644 index 00000000..c6f23c81 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/FilFileMarcacoesEstabelecimentoData.java @@ -0,0 +1,18 @@ +/* +* FilFileMarcacoesEstabelecimentoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class FilFileMarcacoesEstabelecimentoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.FilFileMarcacoesEstabelecimento +{ + + public FilFileMarcacoesEstabelecimentoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HistoricoEstabelecimentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HistoricoEstabelecimentoData.java new file mode 100644 index 00000000..0fdefcbc --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HistoricoEstabelecimentoData.java @@ -0,0 +1,18 @@ +/* +* HistoricoEstabelecimentoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HistoricoEstabelecimentoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HistoricoEstabelecimento +{ + + public HistoricoEstabelecimentoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsAreaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsAreaData.java new file mode 100644 index 00000000..2d72ab1a --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsAreaData.java @@ -0,0 +1,18 @@ +/* +* HsAreaData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsAreaData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsArea +{ + + public HsAreaData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsEmailData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsEmailData.java new file mode 100644 index 00000000..a775e668 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsEmailData.java @@ -0,0 +1,18 @@ +/* +* HsEmailData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsEmailData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsEmail +{ + + public HsEmailData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsEmailEmpresaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsEmailEmpresaData.java new file mode 100644 index 00000000..b444eca4 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsEmailEmpresaData.java @@ -0,0 +1,18 @@ +/* +* HsEmailEmpresaData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsEmailEmpresaData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsEmailEmpresa +{ + + public HsEmailEmpresaData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsEmailEstabelecimentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsEmailEstabelecimentoData.java new file mode 100644 index 00000000..5a84b8c2 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsEmailEstabelecimentoData.java @@ -0,0 +1,18 @@ +/* +* HsEmailEstabelecimentoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsEmailEstabelecimentoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsEmailEstabelecimento +{ + + public HsEmailEstabelecimentoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsEquipamentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsEquipamentoData.java new file mode 100644 index 00000000..710c466b --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsEquipamentoData.java @@ -0,0 +1,18 @@ +/* +* HsEquipamentoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsEquipamentoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsEquipamento +{ + + public HsEquipamentoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsLegislacaoCategoriaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsLegislacaoCategoriaData.java new file mode 100644 index 00000000..2de3a13f --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsLegislacaoCategoriaData.java @@ -0,0 +1,18 @@ +/* +* HsLegislacaoCategoriaData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsLegislacaoCategoriaData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsLegislacaoCategoria +{ + + public HsLegislacaoCategoriaData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsLegislacaoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsLegislacaoData.java new file mode 100644 index 00000000..46777220 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsLegislacaoData.java @@ -0,0 +1,18 @@ +/* +* HsLegislacaoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsLegislacaoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsLegislacao +{ + + public HsLegislacaoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsLegislacaoEmpresaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsLegislacaoEmpresaData.java new file mode 100644 index 00000000..8dd07562 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsLegislacaoEmpresaData.java @@ -0,0 +1,18 @@ +/* +* HsLegislacaoEmpresaData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsLegislacaoEmpresaData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsLegislacaoEmpresa +{ + + public HsLegislacaoEmpresaData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsLegislacaoEstabelecimentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsLegislacaoEstabelecimentoData.java new file mode 100644 index 00000000..86e201d5 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsLegislacaoEstabelecimentoData.java @@ -0,0 +1,18 @@ +/* +* HsLegislacaoEstabelecimentoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsLegislacaoEstabelecimentoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsLegislacaoEstabelecimento +{ + + public HsLegislacaoEstabelecimentoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsMedidaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsMedidaData.java new file mode 100644 index 00000000..ae277373 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsMedidaData.java @@ -0,0 +1,18 @@ +/* +* HsMedidaData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsMedidaData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsMedida +{ + + public HsMedidaData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsNormalizacaoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsNormalizacaoData.java new file mode 100644 index 00000000..95f98b90 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsNormalizacaoData.java @@ -0,0 +1,18 @@ +/* +* HsNormalizacaoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsNormalizacaoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsNormalizacao +{ + + public HsNormalizacaoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsNormalizacaoEmpresaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsNormalizacaoEmpresaData.java new file mode 100644 index 00000000..de629251 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsNormalizacaoEmpresaData.java @@ -0,0 +1,18 @@ +/* +* HsNormalizacaoEmpresaData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsNormalizacaoEmpresaData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsNormalizacaoEmpresa +{ + + public HsNormalizacaoEmpresaData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsNormalizacaoEstabelecimentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsNormalizacaoEstabelecimentoData.java new file mode 100644 index 00000000..7765b324 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsNormalizacaoEstabelecimentoData.java @@ -0,0 +1,18 @@ +/* +* HsNormalizacaoEstabelecimentoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsNormalizacaoEstabelecimentoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsNormalizacaoEstabelecimento +{ + + public HsNormalizacaoEstabelecimentoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsPostoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsPostoData.java new file mode 100644 index 00000000..ed00caeb --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsPostoData.java @@ -0,0 +1,18 @@ +/* +* HsPostoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsPostoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsPosto +{ + + public HsPostoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsPostoEstabelecimentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsPostoEstabelecimentoData.java new file mode 100644 index 00000000..59e65d6c --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsPostoEstabelecimentoData.java @@ -0,0 +1,18 @@ +/* +* HsPostoEstabelecimentoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsPostoEstabelecimentoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsPostoEstabelecimento +{ + + public HsPostoEstabelecimentoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsPostoMedidaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsPostoMedidaData.java new file mode 100644 index 00000000..b13d4541 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsPostoMedidaData.java @@ -0,0 +1,18 @@ +/* +* HsPostoMedidaData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsPostoMedidaData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsPostoMedida +{ + + public HsPostoMedidaData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsPostoRiscoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsPostoRiscoData.java new file mode 100644 index 00000000..f0cdee5c --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsPostoRiscoData.java @@ -0,0 +1,18 @@ +/* +* HsPostoRiscoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsPostoRiscoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsPostoRisco +{ + + public HsPostoRiscoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioAreaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioAreaData.java new file mode 100644 index 00000000..e27b2e40 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioAreaData.java @@ -0,0 +1,18 @@ +/* +* HsRelatorioAreaData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsRelatorioAreaData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsRelatorioArea +{ + + public HsRelatorioAreaData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioData.java new file mode 100644 index 00000000..ffc85023 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioData.java @@ -0,0 +1,18 @@ +/* +* HsRelatorioData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsRelatorioData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsRelatorio +{ + + public HsRelatorioData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioEquipamentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioEquipamentoData.java new file mode 100644 index 00000000..93b67b81 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioEquipamentoData.java @@ -0,0 +1,18 @@ +/* +* HsRelatorioEquipamentoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsRelatorioEquipamentoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsRelatorioEquipamento +{ + + public HsRelatorioEquipamentoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioLegislacaoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioLegislacaoData.java new file mode 100644 index 00000000..9c25becb --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioLegislacaoData.java @@ -0,0 +1,18 @@ +/* +* HsRelatorioLegislacaoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsRelatorioLegislacaoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsRelatorioLegislacao +{ + + public HsRelatorioLegislacaoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioMedidaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioMedidaData.java new file mode 100644 index 00000000..ab4b7d0f --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioMedidaData.java @@ -0,0 +1,18 @@ +/* +* HsRelatorioMedidaData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsRelatorioMedidaData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsRelatorioMedida +{ + + public HsRelatorioMedidaData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioNormalizacaoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioNormalizacaoData.java new file mode 100644 index 00000000..ebce4006 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioNormalizacaoData.java @@ -0,0 +1,18 @@ +/* +* HsRelatorioNormalizacaoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsRelatorioNormalizacaoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsRelatorioNormalizacao +{ + + public HsRelatorioNormalizacaoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioPostoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioPostoData.java new file mode 100644 index 00000000..470d5622 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioPostoData.java @@ -0,0 +1,18 @@ +/* +* HsRelatorioPostoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsRelatorioPostoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsRelatorioPosto +{ + + public HsRelatorioPostoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioPostoMedidaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioPostoMedidaData.java new file mode 100644 index 00000000..1a24c19c --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioPostoMedidaData.java @@ -0,0 +1,18 @@ +/* +* HsRelatorioPostoMedidaData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsRelatorioPostoMedidaData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsRelatorioPostoMedida +{ + + public HsRelatorioPostoMedidaData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioPostoRiscoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioPostoRiscoData.java new file mode 100644 index 00000000..85481e14 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioPostoRiscoData.java @@ -0,0 +1,18 @@ +/* +* HsRelatorioPostoRiscoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsRelatorioPostoRiscoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsRelatorioPostoRisco +{ + + public HsRelatorioPostoRiscoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioRiscoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioRiscoData.java new file mode 100644 index 00000000..7d31489e --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioRiscoData.java @@ -0,0 +1,18 @@ +/* +* HsRelatorioRiscoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsRelatorioRiscoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsRelatorioRisco +{ + + public HsRelatorioRiscoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioRiscoValorQualitativoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioRiscoValorQualitativoData.java similarity index 61% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioRiscoValorQualitativoData.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioRiscoValorQualitativoData.java index 43866573..49399900 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioRiscoValorQualitativoData.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRelatorioRiscoValorQualitativoData.java @@ -5,10 +5,10 @@ * * Edit at will */ -package db.data.siprp_local.outer; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; -public final class HsRelatorioRiscoValorQualitativoData extends db.data.siprp_local.inner.HsRelatorioRiscoValorQualitativo +public final class HsRelatorioRiscoValorQualitativoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsRelatorioRiscoValorQualitativo { public HsRelatorioRiscoValorQualitativoData() diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRiscoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRiscoData.java new file mode 100644 index 00000000..eda6c885 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRiscoData.java @@ -0,0 +1,18 @@ +/* +* HsRiscoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsRiscoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsRisco +{ + + public HsRiscoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRiscoEmpresaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRiscoEmpresaData.java new file mode 100644 index 00000000..7b467eba --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRiscoEmpresaData.java @@ -0,0 +1,18 @@ +/* +* HsRiscoEmpresaData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsRiscoEmpresaData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsRiscoEmpresa +{ + + public HsRiscoEmpresaData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRiscoMedidaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRiscoMedidaData.java new file mode 100644 index 00000000..bf8bd3d5 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRiscoMedidaData.java @@ -0,0 +1,18 @@ +/* +* HsRiscoMedidaData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsRiscoMedidaData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsRiscoMedida +{ + + public HsRiscoMedidaData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRiscoTemaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRiscoTemaData.java new file mode 100644 index 00000000..83fee45e --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/HsRiscoTemaData.java @@ -0,0 +1,18 @@ +/* +* HsRiscoTemaData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class HsRiscoTemaData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.HsRiscoTema +{ + + public HsRiscoTemaData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/IdsData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/IdsData.java new file mode 100644 index 00000000..db2abaa6 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/IdsData.java @@ -0,0 +1,18 @@ +/* +* IdsData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class IdsData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.Ids +{ + + public IdsData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ImageData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ImageData.java new file mode 100644 index 00000000..54a48a7d --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/ImageData.java @@ -0,0 +1,18 @@ +/* +* ImageData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class ImageData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.Image +{ + + public ImageData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/LembretesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/LembretesData.java new file mode 100644 index 00000000..e05cb4d6 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/LembretesData.java @@ -0,0 +1,18 @@ +/* +* LembretesData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class LembretesData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.Lembretes +{ + + public LembretesData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/LembretesTiposData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/LembretesTiposData.java new file mode 100644 index 00000000..5cba23a7 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/LembretesTiposData.java @@ -0,0 +1,18 @@ +/* +* LembretesTiposData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class LembretesTiposData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.LembretesTipos +{ + + public LembretesTiposData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MarcacoesEmpresaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MarcacoesEmpresaData.java new file mode 100644 index 00000000..e052f295 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MarcacoesEmpresaData.java @@ -0,0 +1,18 @@ +/* +* MarcacoesEmpresaData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class MarcacoesEmpresaData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.MarcacoesEmpresa +{ + + public MarcacoesEmpresaData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MarcacoesEstabelecimentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MarcacoesEstabelecimentoData.java new file mode 100644 index 00000000..a6c05c60 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MarcacoesEstabelecimentoData.java @@ -0,0 +1,18 @@ +/* +* MarcacoesEstabelecimentoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class MarcacoesEstabelecimentoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.MarcacoesEstabelecimento +{ + + public MarcacoesEstabelecimentoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MarcacoesGruposRealizadosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MarcacoesGruposRealizadosData.java new file mode 100644 index 00000000..b68c3864 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MarcacoesGruposRealizadosData.java @@ -0,0 +1,18 @@ +/* +* MarcacoesGruposRealizadosData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class MarcacoesGruposRealizadosData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.MarcacoesGruposRealizados +{ + + public MarcacoesGruposRealizadosData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MarcacoesTecnicosHstData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MarcacoesTecnicosHstData.java new file mode 100644 index 00000000..ce78bbab --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MarcacoesTecnicosHstData.java @@ -0,0 +1,18 @@ +/* +* MarcacoesTecnicosHstData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class MarcacoesTecnicosHstData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.MarcacoesTecnicosHst +{ + + public MarcacoesTecnicosHstData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MarcacoesTrabalhadorData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MarcacoesTrabalhadorData.java new file mode 100644 index 00000000..6f04727f --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MarcacoesTrabalhadorData.java @@ -0,0 +1,18 @@ +/* +* MarcacoesTrabalhadorData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class MarcacoesTrabalhadorData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.MarcacoesTrabalhador +{ + + public MarcacoesTrabalhadorData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MarcacoesTrabalhadorEstadosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MarcacoesTrabalhadorEstadosData.java new file mode 100644 index 00000000..cf049970 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MarcacoesTrabalhadorEstadosData.java @@ -0,0 +1,18 @@ +/* +* MarcacoesTrabalhadorEstadosData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class MarcacoesTrabalhadorEstadosData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.MarcacoesTrabalhadorEstados +{ + + public MarcacoesTrabalhadorEstadosData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MedVacinaTipoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MedVacinaTipoData.java new file mode 100644 index 00000000..3a0f6000 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MedVacinaTipoData.java @@ -0,0 +1,18 @@ +/* +* MedVacinaTipoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class MedVacinaTipoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.MedVacinaTipo +{ + + public MedVacinaTipoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MedicosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MedicosData.java new file mode 100644 index 00000000..6c630aee --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/MedicosData.java @@ -0,0 +1,18 @@ +/* +* MedicosData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class MedicosData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.Medicos +{ + + public MedicosData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PaisesContinentesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PaisesContinentesData.java new file mode 100644 index 00000000..f80ab086 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PaisesContinentesData.java @@ -0,0 +1,18 @@ +/* +* PaisesContinentesData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class PaisesContinentesData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.PaisesContinentes +{ + + public PaisesContinentesData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PaisesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PaisesData.java new file mode 100644 index 00000000..20be6305 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PaisesData.java @@ -0,0 +1,18 @@ +/* +* PaisesData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class PaisesData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.Paises +{ + + public PaisesData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PesDocumentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PesDocumentoData.java new file mode 100644 index 00000000..28107a50 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PesDocumentoData.java @@ -0,0 +1,18 @@ +/* +* PesDocumentoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class PesDocumentoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.PesDocumento +{ + + public PesDocumentoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PesDocumentoTipoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PesDocumentoTipoData.java new file mode 100644 index 00000000..11e0f5c6 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PesDocumentoTipoData.java @@ -0,0 +1,18 @@ +/* +* PesDocumentoTipoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class PesDocumentoTipoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.PesDocumentoTipo +{ + + public PesDocumentoTipoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PesPessoaDocumentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PesPessoaDocumentoData.java new file mode 100644 index 00000000..5d7db381 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PesPessoaDocumentoData.java @@ -0,0 +1,18 @@ +/* +* PesPessoaDocumentoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class PesPessoaDocumentoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.PesPessoaDocumento +{ + + public PesPessoaDocumentoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PrestadoresData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PrestadoresData.java new file mode 100644 index 00000000..6c83c880 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PrestadoresData.java @@ -0,0 +1,18 @@ +/* +* PrestadoresData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class PrestadoresData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.Prestadores +{ + + public PrestadoresData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PrestadoresGruposProtocoloData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PrestadoresGruposProtocoloData.java new file mode 100644 index 00000000..b6b9a269 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PrestadoresGruposProtocoloData.java @@ -0,0 +1,18 @@ +/* +* PrestadoresGruposProtocoloData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class PrestadoresGruposProtocoloData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.PrestadoresGruposProtocolo +{ + + public PrestadoresGruposProtocoloData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PrtElementosProtocoloData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PrtElementosProtocoloData.java new file mode 100644 index 00000000..bbaaa8c4 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PrtElementosProtocoloData.java @@ -0,0 +1,18 @@ +/* +* PrtElementosProtocoloData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class PrtElementosProtocoloData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.PrtElementosProtocolo +{ + + public PrtElementosProtocoloData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PrtGruposProtocoloData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PrtGruposProtocoloData.java new file mode 100644 index 00000000..891b8d29 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PrtGruposProtocoloData.java @@ -0,0 +1,18 @@ +/* +* PrtGruposProtocoloData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class PrtGruposProtocoloData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.PrtGruposProtocolo +{ + + public PrtGruposProtocoloData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PrtTiposElementosProtocoloData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PrtTiposElementosProtocoloData.java new file mode 100644 index 00000000..b754ac6a --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/PrtTiposElementosProtocoloData.java @@ -0,0 +1,18 @@ +/* +* PrtTiposElementosProtocoloData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class PrtTiposElementosProtocoloData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.PrtTiposElementosProtocolo +{ + + public PrtTiposElementosProtocoloData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TiposExamesCompData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TiposExamesCompData.java new file mode 100644 index 00000000..e691f565 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TiposExamesCompData.java @@ -0,0 +1,18 @@ +/* +* TiposExamesCompData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class TiposExamesCompData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.TiposExamesComp +{ + + public TiposExamesCompData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresConsultasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresConsultasData.java new file mode 100644 index 00000000..879224b4 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresConsultasData.java @@ -0,0 +1,18 @@ +/* +* TrabalhadoresConsultasData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class TrabalhadoresConsultasData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.TrabalhadoresConsultas +{ + + public TrabalhadoresConsultasData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresConsultasDatasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresConsultasDatasData.java new file mode 100644 index 00000000..b51de825 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresConsultasDatasData.java @@ -0,0 +1,18 @@ +/* +* TrabalhadoresConsultasDatasData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class TrabalhadoresConsultasDatasData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.TrabalhadoresConsultasDatas +{ + + public TrabalhadoresConsultasDatasData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresConsultasDatasEmailsData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresConsultasDatasEmailsData.java similarity index 61% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresConsultasDatasEmailsData.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresConsultasDatasEmailsData.java index 1dd76cfb..c06b372f 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresConsultasDatasEmailsData.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresConsultasDatasEmailsData.java @@ -5,10 +5,10 @@ * * Edit at will */ -package db.data.siprp_local.outer; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; -public final class TrabalhadoresConsultasDatasEmailsData extends db.data.siprp_local.inner.TrabalhadoresConsultasDatasEmails +public final class TrabalhadoresConsultasDatasEmailsData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.TrabalhadoresConsultasDatasEmails { public TrabalhadoresConsultasDatasEmailsData() diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresConsultasDatasObservacoesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresConsultasDatasObservacoesData.java similarity index 61% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresConsultasDatasObservacoesData.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresConsultasDatasObservacoesData.java index 56272c70..85fd2a20 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresConsultasDatasObservacoesData.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresConsultasDatasObservacoesData.java @@ -5,10 +5,10 @@ * * Edit at will */ -package db.data.siprp_local.outer; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; -public final class TrabalhadoresConsultasDatasObservacoesData extends db.data.siprp_local.inner.TrabalhadoresConsultasDatasObservacoes +public final class TrabalhadoresConsultasDatasObservacoesData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.TrabalhadoresConsultasDatasObservacoes { public TrabalhadoresConsultasDatasObservacoesData() diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresData.java new file mode 100644 index 00000000..7508a06c --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresData.java @@ -0,0 +1,18 @@ +/* +* TrabalhadoresData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class TrabalhadoresData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.Trabalhadores +{ + + public TrabalhadoresData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresEcdData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresEcdData.java new file mode 100644 index 00000000..fc4f21e1 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresEcdData.java @@ -0,0 +1,18 @@ +/* +* TrabalhadoresEcdData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class TrabalhadoresEcdData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.TrabalhadoresEcd +{ + + public TrabalhadoresEcdData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresEcdsAnaliseData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresEcdsAnaliseData.java new file mode 100644 index 00000000..c23b50b4 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresEcdsAnaliseData.java @@ -0,0 +1,18 @@ +/* +* TrabalhadoresEcdsAnaliseData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class TrabalhadoresEcdsAnaliseData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.TrabalhadoresEcdsAnalise +{ + + public TrabalhadoresEcdsAnaliseData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresEcdsData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresEcdsData.java new file mode 100644 index 00000000..dae5fde6 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresEcdsData.java @@ -0,0 +1,18 @@ +/* +* TrabalhadoresEcdsData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class TrabalhadoresEcdsData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.TrabalhadoresEcds +{ + + public TrabalhadoresEcdsData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresEcdsDatasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresEcdsDatasData.java new file mode 100644 index 00000000..38379493 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresEcdsDatasData.java @@ -0,0 +1,18 @@ +/* +* TrabalhadoresEcdsDatasData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class TrabalhadoresEcdsDatasData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.TrabalhadoresEcdsDatas +{ + + public TrabalhadoresEcdsDatasData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresEcdsDatasEmailsData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresEcdsDatasEmailsData.java new file mode 100644 index 00000000..7d6831b5 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresEcdsDatasEmailsData.java @@ -0,0 +1,18 @@ +/* +* TrabalhadoresEcdsDatasEmailsData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class TrabalhadoresEcdsDatasEmailsData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.TrabalhadoresEcdsDatasEmails +{ + + public TrabalhadoresEcdsDatasEmailsData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresEcdsDatasObservacoesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresEcdsDatasObservacoesData.java similarity index 61% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresEcdsDatasObservacoesData.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresEcdsDatasObservacoesData.java index d7262b35..8bde44c0 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresEcdsDatasObservacoesData.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresEcdsDatasObservacoesData.java @@ -5,10 +5,10 @@ * * Edit at will */ -package db.data.siprp_local.outer; +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; -public final class TrabalhadoresEcdsDatasObservacoesData extends db.data.siprp_local.inner.TrabalhadoresEcdsDatasObservacoes +public final class TrabalhadoresEcdsDatasObservacoesData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.TrabalhadoresEcdsDatasObservacoes { public TrabalhadoresEcdsDatasObservacoesData() diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresFichasAptidaoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresFichasAptidaoData.java new file mode 100644 index 00000000..5dc023c0 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresFichasAptidaoData.java @@ -0,0 +1,18 @@ +/* +* TrabalhadoresFichasAptidaoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class TrabalhadoresFichasAptidaoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.TrabalhadoresFichasAptidao +{ + + public TrabalhadoresFichasAptidaoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresProcessoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresProcessoData.java new file mode 100644 index 00000000..7a9a4f4e --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/TrabalhadoresProcessoData.java @@ -0,0 +1,18 @@ +/* +* TrabalhadoresProcessoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class TrabalhadoresProcessoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.TrabalhadoresProcesso +{ + + public TrabalhadoresProcessoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/VersaoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/VersaoData.java new file mode 100644 index 00000000..bd1faf9d --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/VersaoData.java @@ -0,0 +1,18 @@ +/* +* VersaoData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class VersaoData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.Versao +{ + + public VersaoData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/VersionData.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/VersionData.java new file mode 100644 index 00000000..bdc185e7 --- /dev/null +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/data/siprp_local/outer/VersionData.java @@ -0,0 +1,18 @@ +/* +* VersionData.java +* +* Generated by com.evutils.codegen.EntityObjectGenerator +* +* Edit at will +*/ +package com.evolute.siprp.planosactuacao.db.data.siprp_local.outer; + + +public final class VersionData extends com.evolute.siprp.planosactuacao.db.data.siprp_local.inner.Version +{ + + public VersionData() + { + super(); + } +} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/entidades/Area.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/entidades/Area.java similarity index 95% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/entidades/Area.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/entidades/Area.java index ca089483..174548cd 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/entidades/Area.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/entidades/Area.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package db.entidades; +package com.evolute.siprp.planosactuacao.db.entidades; import java.io.Serializable; import java.util.List; diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/entidades/EstadoMedida.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/entidades/EstadoMedida.java similarity index 90% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/entidades/EstadoMedida.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/entidades/EstadoMedida.java index 0d3e74ed..4248d37e 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/entidades/EstadoMedida.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/entidades/EstadoMedida.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package db.entidades; +package com.evolute.siprp.planosactuacao.db.entidades; import java.io.Serializable; diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/entidades/Medida.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/entidades/Medida.java similarity index 96% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/entidades/Medida.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/entidades/Medida.java index b6ef19bb..09505ec4 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/entidades/Medida.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/entidades/Medida.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package db.entidades; +package com.evolute.siprp.planosactuacao.db.entidades; import java.io.Serializable; import java.util.List; diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/entidades/PlanoActuacao.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/entidades/PlanoActuacao.java similarity index 99% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/entidades/PlanoActuacao.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/entidades/PlanoActuacao.java index 285d80ba..7172e600 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/entidades/PlanoActuacao.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/entidades/PlanoActuacao.java @@ -3,14 +3,15 @@ * and open the template in the editor. */ -package db.entidades; +package com.evolute.siprp.planosactuacao.db.entidades; -import global.Global; import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; +import com.evolute.siprp.planosactuacao.global.Global; + /** * * @author lluis diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/entidades/PostoTrabalho.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/entidades/PostoTrabalho.java similarity index 95% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/entidades/PostoTrabalho.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/entidades/PostoTrabalho.java index c6fc8097..d4d144a7 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/entidades/PostoTrabalho.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/entidades/PostoTrabalho.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package db.entidades; +package com.evolute.siprp.planosactuacao.db.entidades; import java.io.Serializable; diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/entidades/Risco.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/entidades/Risco.java similarity index 98% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/entidades/Risco.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/entidades/Risco.java index 06becb0c..ef754248 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/entidades/Risco.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/entidades/Risco.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package db.entidades; +package com.evolute.siprp.planosactuacao.db.entidades; import java.io.Serializable; diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/entidades/Utilizador.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/entidades/Utilizador.java similarity index 99% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/entidades/Utilizador.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/entidades/Utilizador.java index e1087bce..ec1ec2c4 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/entidades/Utilizador.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/entidades/Utilizador.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package db.entidades; +package com.evolute.siprp.planosactuacao.db.entidades; import java.io.Serializable; import java.util.Date; diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/entidades/Valor.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/entidades/Valor.java similarity index 97% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/entidades/Valor.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/entidades/Valor.java index 49d97665..4f2c3656 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/entidades/Valor.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/entidades/Valor.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package db.entidades; +package com.evolute.siprp.planosactuacao.db.entidades; import java.io.Serializable; import java.util.Date; diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/providers/CreatePlanosDataProvider.java similarity index 97% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/providers/CreatePlanosDataProvider.java index 9b9604ef..73e1491d 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/providers/CreatePlanosDataProvider.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/providers/CreatePlanosDataProvider.java @@ -3,33 +3,34 @@ * and open the template in the editor. */ -package db.providers; +package com.evolute.siprp.planosactuacao.db.providers; -import com.evolute.utils.arrays.Virtual2DArray; -import com.evolute.utils.error.ErrorLogger; -import com.evolute.utils.sql.Expression; -import com.evolute.utils.sql.Field; -import com.evolute.utils.sql.Select2; -import db.DBConstants.DB; -import db.data.siprp.outer.PlanoAreasData; -import db.data.siprp.outer.PlanoMedidasData; -import db.data.siprp.outer.PlanoPostosTrabalhoData; -import db.data.siprp.outer.PlanoRiscosData; -import db.data.siprp.outer.PlanosActuacaoData; -import db.data.siprp_local.outer.EmpresasData; -import db.entidades.Area; -import db.entidades.Medida; -import db.entidades.PlanoActuacao; -import db.entidades.PostoTrabalho; -import db.entidades.Risco; -import db.entidades.Valor; import java.sql.ResultSet; import java.sql.Statement; import java.util.ArrayList; import java.util.Date; import java.util.LinkedList; import java.util.List; -import utils.Utils; + +import com.evolute.siprp.planosactuacao.db.DBConstants.DB; +import com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanoAreasData; +import com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanoMedidasData; +import com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanoPostosTrabalhoData; +import com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanoRiscosData; +import com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanosActuacaoData; +import com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresasData; +import com.evolute.siprp.planosactuacao.db.entidades.Area; +import com.evolute.siprp.planosactuacao.db.entidades.Medida; +import com.evolute.siprp.planosactuacao.db.entidades.PlanoActuacao; +import com.evolute.siprp.planosactuacao.db.entidades.PostoTrabalho; +import com.evolute.siprp.planosactuacao.db.entidades.Risco; +import com.evolute.siprp.planosactuacao.db.entidades.Valor; +import com.evolute.siprp.planosactuacao.utils.Utils; +import com.evolute.utils.arrays.Virtual2DArray; +import com.evolute.utils.error.ErrorLogger; +import com.evolute.utils.sql.Expression; +import com.evolute.utils.sql.Field; +import com.evolute.utils.sql.Select2; /** * diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/providers/EvoBaseProvider.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/providers/EvoBaseProvider.java similarity index 98% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/providers/EvoBaseProvider.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/providers/EvoBaseProvider.java index 0e5a3382..b233a9af 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/providers/EvoBaseProvider.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/providers/EvoBaseProvider.java @@ -3,7 +3,16 @@ * and open the template in the editor. */ -package db.providers; +package com.evolute.siprp.planosactuacao.db.providers; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.ResultSet; +import java.sql.Statement; + +import javax.faces.context.ExternalContext; +import javax.faces.context.FacesContext; +import javax.servlet.http.HttpSession; import com.evolute.entity.ProviderInterface; import com.evolute.entity.ProviderRegistry; @@ -12,6 +21,8 @@ import com.evolute.entity.evo.EvoDataObject; import com.evolute.entity.evo.EvoDataProvider; import com.evolute.entity.evo.EvoDataProviderFactory; import com.evolute.entity.utils.ConnectionIdentity; +import com.evolute.siprp.planosactuacao.db.DBConstants; +import com.evolute.siprp.planosactuacao.db.DBPropertiesLoader; import com.evolute.utils.Singleton; import com.evolute.utils.db.DBException; import com.evolute.utils.db.DBManager; @@ -24,15 +35,6 @@ import com.evolute.utils.jdbc.StatementExecuterFactory; import com.evolute.utils.sql.Insert; import com.evolute.utils.sql.SQLQuery; import com.evolute.utils.strings.UnicodeChecker; -import db.DBConstants; -import db.DBPropertiesLoader; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.ResultSet; -import java.sql.Statement; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; -import javax.servlet.http.HttpSession; /** * diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/providers/GenericDataProvider.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/providers/GenericDataProvider.java similarity index 96% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/providers/GenericDataProvider.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/providers/GenericDataProvider.java index 0da93335..f7d0aead 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/providers/GenericDataProvider.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/providers/GenericDataProvider.java @@ -3,17 +3,18 @@ * and open the template in the editor. */ -package db.providers; +package com.evolute.siprp.planosactuacao.db.providers; + +import java.sql.ResultSet; +import java.sql.Statement; import com.evolute.entity.ProviderInterface; import com.evolute.entity.evo.EvoDataException; import com.evolute.entity.evo.EvoDataObject; +import com.evolute.siprp.planosactuacao.db.DBConstants; import com.evolute.utils.db.DBException; import com.evolute.utils.db.Executer; import com.evolute.utils.error.ErrorLogger; -import db.DBConstants; -import java.sql.ResultSet; -import java.sql.Statement; public abstract class GenericDataProvider diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/providers/PlanosDataProvider.java similarity index 95% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/providers/PlanosDataProvider.java index fcce160e..ac3d4add 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/providers/PlanosDataProvider.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/providers/PlanosDataProvider.java @@ -3,8 +3,30 @@ * and open the template in the editor. */ -package db.providers; +package com.evolute.siprp.planosactuacao.db.providers; +import java.sql.ResultSet; +import java.sql.Statement; +import java.util.ArrayList; +import java.util.Date; +import java.util.LinkedList; +import java.util.List; + +import com.evolute.siprp.planosactuacao.db.data.siprp.outer.EstadoMedidasData; +import com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanoAreasData; +import com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanoMedidasData; +import com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanoPostosTrabalhoData; +import com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanoRiscosData; +import com.evolute.siprp.planosactuacao.db.data.siprp.outer.PlanosActuacaoData; +import com.evolute.siprp.planosactuacao.db.entidades.Area; +import com.evolute.siprp.planosactuacao.db.entidades.EstadoMedida; +import com.evolute.siprp.planosactuacao.db.entidades.Medida; +import com.evolute.siprp.planosactuacao.db.entidades.PlanoActuacao; +import com.evolute.siprp.planosactuacao.db.entidades.PostoTrabalho; +import com.evolute.siprp.planosactuacao.db.entidades.Risco; +import com.evolute.siprp.planosactuacao.db.entidades.Utilizador; +import com.evolute.siprp.planosactuacao.global.Global; +import com.evolute.siprp.planosactuacao.utils.Utils; import com.evolute.utils.arrays.Virtual2DArray; import com.evolute.utils.error.ErrorLogger; import com.evolute.utils.sql.Assignment; @@ -13,27 +35,6 @@ import com.evolute.utils.sql.Field; import com.evolute.utils.sql.Select2; import com.evolute.utils.sql.Update; import com.evolute.utils.strings.StringPlainer; -import db.data.siprp.outer.EstadoMedidasData; -import db.data.siprp.outer.PlanoAreasData; -import db.data.siprp.outer.PlanoMedidasData; -import db.data.siprp.outer.PlanoPostosTrabalhoData; -import db.data.siprp.outer.PlanoRiscosData; -import db.data.siprp.outer.PlanosActuacaoData; -import db.entidades.Area; -import db.entidades.EstadoMedida; -import db.entidades.Medida; -import db.entidades.PlanoActuacao; -import db.entidades.PostoTrabalho; -import db.entidades.Risco; -import db.entidades.Utilizador; -import global.Global; -import java.sql.ResultSet; -import java.sql.Statement; -import java.util.ArrayList; -import java.util.Date; -import java.util.LinkedList; -import java.util.List; -import utils.Utils; public class PlanosDataProvider extends GenericDataProvider diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/providers/RelatoriosDataProvider.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/providers/RelatoriosDataProvider.java similarity index 97% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/providers/RelatoriosDataProvider.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/providers/RelatoriosDataProvider.java index 99fdd652..c12c325e 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/providers/RelatoriosDataProvider.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/providers/RelatoriosDataProvider.java @@ -3,22 +3,23 @@ * and open the template in the editor. */ -package db.providers; +package com.evolute.siprp.planosactuacao.db.providers; -import com.evolute.utils.error.ErrorLogger; -import db.data.siprp_local.outer.EmpresasData; -import db.data.siprp_local.outer.ImageData; -import db.entidades.Area; -import db.entidades.Medida; -import db.entidades.PlanoActuacao; -import db.entidades.PostoTrabalho; -import db.entidades.Risco; -import db.entidades.Valor; import java.sql.ResultSet; import java.sql.Statement; import java.util.ArrayList; import java.util.List; -import utils.Utils; + +import com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.EmpresasData; +import com.evolute.siprp.planosactuacao.db.data.siprp_local.outer.ImageData; +import com.evolute.siprp.planosactuacao.db.entidades.Area; +import com.evolute.siprp.planosactuacao.db.entidades.Medida; +import com.evolute.siprp.planosactuacao.db.entidades.PlanoActuacao; +import com.evolute.siprp.planosactuacao.db.entidades.PostoTrabalho; +import com.evolute.siprp.planosactuacao.db.entidades.Risco; +import com.evolute.siprp.planosactuacao.db.entidades.Valor; +import com.evolute.siprp.planosactuacao.utils.Utils; +import com.evolute.utils.error.ErrorLogger; /** * diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/providers/RiscoLogic.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/providers/RiscoLogic.java similarity index 89% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/providers/RiscoLogic.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/providers/RiscoLogic.java index 1b6236e8..a85f2559 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/providers/RiscoLogic.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/providers/RiscoLogic.java @@ -3,15 +3,16 @@ * and open the template in the editor. */ -package db.providers; +package com.evolute.siprp.planosactuacao.db.providers; -import db.entidades.Medida; -import db.entidades.Risco; -import db.entidades.Utilizador; -import global.Global; import java.util.Date; import java.util.List; +import com.evolute.siprp.planosactuacao.db.entidades.Medida; +import com.evolute.siprp.planosactuacao.db.entidades.Risco; +import com.evolute.siprp.planosactuacao.db.entidades.Utilizador; +import com.evolute.siprp.planosactuacao.global.Global; + /** * * @author dneves diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/providers/UtilizadoresDataProvider.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/providers/UtilizadoresDataProvider.java similarity index 97% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/providers/UtilizadoresDataProvider.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/providers/UtilizadoresDataProvider.java index c5a43068..fe027d17 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/providers/UtilizadoresDataProvider.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/providers/UtilizadoresDataProvider.java @@ -3,19 +3,18 @@ * and open the template in the editor. */ -package db.providers; +package com.evolute.siprp.planosactuacao.db.providers; +import java.util.LinkedList; +import java.util.List; + +import com.evolute.siprp.planosactuacao.db.data.siprp.outer.UtilizadoresData; +import com.evolute.siprp.planosactuacao.db.entidades.Utilizador; +import com.evolute.siprp.planosactuacao.global.Global; import com.evolute.utils.arrays.Virtual2DArray; import com.evolute.utils.sql.Expression; import com.evolute.utils.sql.Field; import com.evolute.utils.sql.Select2; -import db.data.siprp.outer.UtilizadoresData; -import db.entidades.Utilizador; -import global.Global; -import java.sql.ResultSet; -import java.sql.Statement; -import java.util.LinkedList; -import java.util.List; /** * diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/providers/UtilizadoresLogic.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/providers/UtilizadoresLogic.java similarity index 86% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/db/providers/UtilizadoresLogic.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/providers/UtilizadoresLogic.java index 97bd2fc3..c4f04a37 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/providers/UtilizadoresLogic.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/db/providers/UtilizadoresLogic.java @@ -3,10 +3,10 @@ * and open the template in the editor. */ -package db.providers; +package com.evolute.siprp.planosactuacao.db.providers; +import com.evolute.siprp.planosactuacao.db.entidades.Utilizador; import com.evolute.utils.error.ErrorLogger; -import db.entidades.Utilizador; /** * diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/global/Global.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/global/Global.java similarity index 87% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/global/Global.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/global/Global.java index ddc83805..02d4eb27 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/global/Global.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/global/Global.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package global; +package com.evolute.siprp.planosactuacao.global; import com.sun.webui.jsf.component.TextArea; @@ -33,19 +33,19 @@ public class Global public static final int FASE_CONCLUIDO = 6; //Fases do plano - texto - public static final String FASE_SIPRP_EMISSAO_TXT = "SIPRP(Emissão)"; - public static final String FASE_SEGURANCA_PREENCHIMENTO_TXT = "Segurança Auchan(Preenchimento)"; - public static final String FASE_DIR_LOJA_VALIDACAO_TXT = "Director de loja(Validação)"; + public static final String FASE_SIPRP_EMISSAO_TXT = "SIPRP(Emiss�o)"; + public static final String FASE_SEGURANCA_PREENCHIMENTO_TXT = "Seguran�a Auchan(Preenchimento)"; + public static final String FASE_DIR_LOJA_VALIDACAO_TXT = "Director de loja(Valida��o)"; public static final String FASE_DNS_PARECER_TXT = "DNS(Parecer)"; - public static final String FASE_SIPRP_CONCLUSAO_TXT = "SIPRP(Verificação/Conclusão)"; + public static final String FASE_SIPRP_CONCLUSAO_TXT = "SIPRP(Verifica��o/Conclus�o)"; public static final String[] FASES_TEXTO = new String[] { - "SIPRP(Emissão)", - "Segurança Auchan(Preenchimento)", - "Director de loja(Validação)", + "SIPRP(Emiss�o)", + "Seguran�a Auchan(Preenchimento)", + "Director de loja(Valida��o)", "DNS(Parecer)", - "SIPRP(Verificação/Conclusão)", - "Concluído" + "SIPRP(Verifica��o/Conclus�o)", + "Conclu�do" }; //public static final String ANALISE_ACIDENTES_URL = "http://localhost:8084/AnaliseAcidentesTrabalho/faces/"; //testes diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/mail/Mail.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/mail/Mail.java similarity index 98% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/mail/Mail.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/mail/Mail.java index 9e7703b3..4d724001 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/mail/Mail.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/mail/Mail.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package mail; +package com.evolute.siprp.planosactuacao.mail; import java.util.Date; import java.util.Properties; diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/pagination/Pagina.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/pagination/Pagina.java similarity index 94% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/pagination/Pagina.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/pagination/Pagina.java index 2a319c55..93ea354f 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/pagination/Pagina.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/pagination/Pagina.java @@ -3,12 +3,14 @@ * and open the template in the editor. */ -package pagination; +package com.evolute.siprp.planosactuacao.pagination; -import com.sun.webui.jsf.component.Hyperlink; import java.io.Serializable; + import javax.faces.context.FacesContext; -import planosactuacao.SessionBean1.PAGINATION_ENUM; + +import com.evolute.siprp.planosactuacao.planosactuacao.SessionBean1.PAGINATION_ENUM; +import com.sun.webui.jsf.component.Hyperlink; /** * diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/pagination/Pagination.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/pagination/Pagination.java similarity index 91% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/pagination/Pagination.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/pagination/Pagination.java index 66ad4e04..5b6d5b9c 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/pagination/Pagination.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/pagination/Pagination.java @@ -3,20 +3,21 @@ * and open the template in the editor. */ -package pagination; +package com.evolute.siprp.planosactuacao.pagination; -import db.entidades.PlanoActuacao; -import db.entidades.Risco; -import db.entidades.Utilizador; -import db.providers.RiscoLogic; -import global.Global; import java.io.Serializable; import java.util.HashMap; import java.util.Iterator; import java.util.LinkedList; import java.util.List; import java.util.Map; -import planosactuacao.SessionBean1.PAGINATION_ENUM; + +import com.evolute.siprp.planosactuacao.db.entidades.PlanoActuacao; +import com.evolute.siprp.planosactuacao.db.entidades.Risco; +import com.evolute.siprp.planosactuacao.db.entidades.Utilizador; +import com.evolute.siprp.planosactuacao.db.providers.RiscoLogic; +import com.evolute.siprp.planosactuacao.global.Global; +import com.evolute.siprp.planosactuacao.planosactuacao.SessionBean1.PAGINATION_ENUM; public abstract class Pagination implements Serializable diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/pagination/PaginationNormais.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/pagination/PaginationNormais.java similarity index 59% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/pagination/PaginationNormais.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/pagination/PaginationNormais.java index 2e6c5daf..35b22dc3 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/pagination/PaginationNormais.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/pagination/PaginationNormais.java @@ -3,13 +3,13 @@ * and open the template in the editor. */ -package pagination; +package com.evolute.siprp.planosactuacao.pagination; -import db.entidades.Area; -import db.entidades.PlanoActuacao; -import db.entidades.Risco; -import db.entidades.Utilizador; -import planosactuacao.SessionBean1.PAGINATION_ENUM; +import com.evolute.siprp.planosactuacao.db.entidades.Area; +import com.evolute.siprp.planosactuacao.db.entidades.PlanoActuacao; +import com.evolute.siprp.planosactuacao.db.entidades.Risco; +import com.evolute.siprp.planosactuacao.db.entidades.Utilizador; +import com.evolute.siprp.planosactuacao.planosactuacao.SessionBean1.PAGINATION_ENUM; /** * diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/pagination/PaginationPatrimoniais.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/pagination/PaginationPatrimoniais.java similarity index 59% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/pagination/PaginationPatrimoniais.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/pagination/PaginationPatrimoniais.java index 33884d1b..631a7b2a 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/pagination/PaginationPatrimoniais.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/pagination/PaginationPatrimoniais.java @@ -3,13 +3,13 @@ * and open the template in the editor. */ -package pagination; +package com.evolute.siprp.planosactuacao.pagination; -import db.entidades.Area; -import db.entidades.PlanoActuacao; -import db.entidades.Risco; -import db.entidades.Utilizador; -import planosactuacao.SessionBean1.PAGINATION_ENUM; +import com.evolute.siprp.planosactuacao.db.entidades.Area; +import com.evolute.siprp.planosactuacao.db.entidades.PlanoActuacao; +import com.evolute.siprp.planosactuacao.db.entidades.Risco; +import com.evolute.siprp.planosactuacao.db.entidades.Utilizador; +import com.evolute.siprp.planosactuacao.planosactuacao.SessionBean1.PAGINATION_ENUM; /** * diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/phaselistener/ContextListener.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/phaselistener/ContextListener.java similarity index 90% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/phaselistener/ContextListener.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/phaselistener/ContextListener.java index 23d0173b..6ba265a3 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/phaselistener/ContextListener.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/phaselistener/ContextListener.java @@ -3,21 +3,24 @@ * and open the template in the editor. */ -package phaselistener; +package com.evolute.siprp.planosactuacao.phaselistener; -import com.evolute.utils.date.DateUtils; -import com.evolute.utils.error.ErrorLogger; -import com.evolute.utils.timer.TimedEvent; -import com.evolute.utils.timer.Timer; -import db.DBConstants.DB; -import db.providers.EvoBaseProvider; import java.text.SimpleDateFormat; import java.util.Date; + import javax.servlet.ServletContextEvent; import javax.servlet.ServletContextListener; -import planosactuacao.PlanosActuacao; + import shst.companydataloaders.SIPRPPropertiesLoader; -import utils.PlanosActuacaoLogger; + +import com.evolute.siprp.planosactuacao.db.DBConstants.DB; +import com.evolute.siprp.planosactuacao.db.providers.EvoBaseProvider; +import com.evolute.siprp.planosactuacao.planosactuacao.PlanosActuacao; +import com.evolute.siprp.planosactuacao.utils.PlanosActuacaoLogger; +import com.evolute.utils.date.DateUtils; +import com.evolute.utils.error.ErrorLogger; +import com.evolute.utils.timer.TimedEvent; +import com.evolute.utils.timer.Timer; /** * diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/phaselistener/MainPhaseListener.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/phaselistener/MainPhaseListener.java similarity index 93% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/phaselistener/MainPhaseListener.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/phaselistener/MainPhaseListener.java index 6c757518..764ff01b 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/phaselistener/MainPhaseListener.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/phaselistener/MainPhaseListener.java @@ -3,14 +3,11 @@ * and open the template in the editor. */ -package phaselistener; +package com.evolute.siprp.planosactuacao.phaselistener; -import com.evolute.utils.error.ErrorLogger; -import db.entidades.Utilizador; -import db.providers.UtilizadoresDataProvider; -import global.Global; import java.util.HashMap; import java.util.Map; + import javax.faces.component.UIViewRoot; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; @@ -20,10 +17,15 @@ import javax.faces.event.PhaseListener; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpSession; -import planosactuacao.SessionBean1; -import utils.JSFHTTPUtils; -import utils.JSFUtils; -import utils.Logos; + +import com.evolute.siprp.planosactuacao.db.entidades.Utilizador; +import com.evolute.siprp.planosactuacao.db.providers.UtilizadoresDataProvider; +import com.evolute.siprp.planosactuacao.global.Global; +import com.evolute.siprp.planosactuacao.planosactuacao.SessionBean1; +import com.evolute.siprp.planosactuacao.utils.JSFHTTPUtils; +import com.evolute.siprp.planosactuacao.utils.JSFUtils; +import com.evolute.siprp.planosactuacao.utils.Logos; +import com.evolute.utils.error.ErrorLogger; /** * diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/phaselistener/SessionListener.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/phaselistener/SessionListener.java similarity index 92% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/phaselistener/SessionListener.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/phaselistener/SessionListener.java index 0eff2121..ad889302 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/phaselistener/SessionListener.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/phaselistener/SessionListener.java @@ -3,12 +3,13 @@ * and open the template in the editor. */ -package phaselistener; +package com.evolute.siprp.planosactuacao.phaselistener; import javax.servlet.http.HttpSession; import javax.servlet.http.HttpSessionEvent; import javax.servlet.http.HttpSessionListener; + /** * * @author dneves diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/ApplicationBean1.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/ApplicationBean1.java similarity index 98% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/ApplicationBean1.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/ApplicationBean1.java index c1b27cb7..0264bb71 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/ApplicationBean1.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/ApplicationBean1.java @@ -4,7 +4,7 @@ * Created on Aug 25, 2008, 11:20:16 AM */ -package planosactuacao; +package com.evolute.siprp.planosactuacao.planosactuacao; import com.evolute.utils.error.ErrorLogger; import com.sun.rave.web.ui.appbase.AbstractApplicationBean; diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/Bundle.properties b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/Bundle.properties similarity index 100% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/Bundle.properties rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/Bundle.properties diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/Dummy.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/Dummy.java similarity index 97% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/Dummy.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/Dummy.java index 65b41af8..b4d80ea2 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/Dummy.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/Dummy.java @@ -4,19 +4,20 @@ * Created on Oct 6, 2008, 10:43:13 AM */ -package planosactuacao; +package com.evolute.siprp.planosactuacao.planosactuacao; -import com.evolute.utils.error.ErrorLogger; -import com.sun.rave.web.ui.appbase.AbstractPageBean; - -import com.sun.webui.jsf.component.Hyperlink; -import db.entidades.Utilizador; -import db.providers.UtilizadoresDataProvider; import java.util.List; import java.util.ListIterator; + import javax.faces.FacesException; import javax.faces.event.ActionEvent; +import com.evolute.siprp.planosactuacao.db.entidades.Utilizador; +import com.evolute.siprp.planosactuacao.db.providers.UtilizadoresDataProvider; +import com.evolute.utils.error.ErrorLogger; +import com.sun.rave.web.ui.appbase.AbstractPageBean; +import com.sun.webui.jsf.component.Hyperlink; + /** *

Page bean that corresponds to a similarly named JSP page. This * class contains component definitions (and initialization code) for diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/EditarPlano.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/EditarPlano.java similarity index 96% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/EditarPlano.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/EditarPlano.java index 8acc84fd..9610f1ed 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/EditarPlano.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/EditarPlano.java @@ -3,40 +3,15 @@ * * Created on Aug 26, 2008, 3:10:59 PM */ -package planosactuacao; +package com.evolute.siprp.planosactuacao.planosactuacao; -import com.evolute.utils.error.ErrorLogger; -import com.sun.rave.web.ui.appbase.AbstractPageBean; - -import com.sun.webui.jsf.component.Button; - -import com.sun.webui.jsf.component.Checkbox; -import com.sun.webui.jsf.component.DropDown; -import com.sun.webui.jsf.component.PanelGroup; -import com.sun.webui.jsf.component.StaticText; -import com.sun.webui.jsf.component.TextArea; -import com.sun.webui.jsf.component.TextField; - -import com.sun.webui.jsf.model.Option; -import db.entidades.Area; -import db.entidades.EstadoMedida; -import db.entidades.Medida; -import db.entidades.PlanoActuacao; -import db.entidades.PostoTrabalho; -import db.entidades.Risco; -import db.entidades.Utilizador; -import db.entidades.Valor; -import db.providers.PlanosDataProvider; -import db.providers.RiscoLogic; -import db.providers.UtilizadoresDataProvider; -import db.providers.UtilizadoresLogic; -import global.Global; import java.text.SimpleDateFormat; import java.util.Date; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.ListIterator; + import javax.el.MethodExpression; import javax.faces.FacesException; import javax.faces.component.html.HtmlInputHidden; @@ -45,15 +20,40 @@ import javax.faces.context.FacesContext; import javax.faces.event.ActionEvent; import javax.faces.event.MethodExpressionActionListener; import javax.faces.event.ValueChangeEvent; -import mail.Mail; + import org.richfaces.component.html.HtmlCalendar; -import pagination.Pagina; -import pagination.Pagination; -import pagination.PaginationNormais; -import pagination.PaginationPatrimoniais; -import planosactuacao.SessionBean1.PAGINATION_ENUM; -import utils.JSFUtils; -import utils.Utils; + +import com.evolute.siprp.planosactuacao.db.entidades.Area; +import com.evolute.siprp.planosactuacao.db.entidades.EstadoMedida; +import com.evolute.siprp.planosactuacao.db.entidades.Medida; +import com.evolute.siprp.planosactuacao.db.entidades.PlanoActuacao; +import com.evolute.siprp.planosactuacao.db.entidades.PostoTrabalho; +import com.evolute.siprp.planosactuacao.db.entidades.Risco; +import com.evolute.siprp.planosactuacao.db.entidades.Utilizador; +import com.evolute.siprp.planosactuacao.db.entidades.Valor; +import com.evolute.siprp.planosactuacao.db.providers.PlanosDataProvider; +import com.evolute.siprp.planosactuacao.db.providers.RiscoLogic; +import com.evolute.siprp.planosactuacao.db.providers.UtilizadoresDataProvider; +import com.evolute.siprp.planosactuacao.db.providers.UtilizadoresLogic; +import com.evolute.siprp.planosactuacao.global.Global; +import com.evolute.siprp.planosactuacao.mail.Mail; +import com.evolute.siprp.planosactuacao.pagination.Pagina; +import com.evolute.siprp.planosactuacao.pagination.Pagination; +import com.evolute.siprp.planosactuacao.pagination.PaginationNormais; +import com.evolute.siprp.planosactuacao.pagination.PaginationPatrimoniais; +import com.evolute.siprp.planosactuacao.planosactuacao.SessionBean1.PAGINATION_ENUM; +import com.evolute.siprp.planosactuacao.utils.JSFUtils; +import com.evolute.siprp.planosactuacao.utils.Utils; +import com.evolute.utils.error.ErrorLogger; +import com.sun.rave.web.ui.appbase.AbstractPageBean; +import com.sun.webui.jsf.component.Button; +import com.sun.webui.jsf.component.Checkbox; +import com.sun.webui.jsf.component.DropDown; +import com.sun.webui.jsf.component.PanelGroup; +import com.sun.webui.jsf.component.StaticText; +import com.sun.webui.jsf.component.TextArea; +import com.sun.webui.jsf.component.TextField; +import com.sun.webui.jsf.model.Option; /** *

Page bean that corresponds to a similarly named JSP page. This @@ -597,7 +597,7 @@ public class EditarPlano extends AbstractPageBean } else if ( p.getFase_antes_correcao().intValue() == Global.FASE_DNS_PARECER ) { - butEnviar.setText( "Enviar a Director Nacional Segurança>>" ); + butEnviar.setText( "Enviar a Director Nacional Seguran�a>>" ); } } @@ -648,11 +648,11 @@ public class EditarPlano extends AbstractPageBean butEnviarCorrecao.setDisabled( false ); butEnviar.setDisabled( true ); } - butEnviar.setText( "Enviar a Director Nacional Segurança>>" ); + butEnviar.setText( "Enviar a Director Nacional Seguran�a>>" ); if ( p.getCorrecao().matches( "y" ) ) { - butEnviar.setText( "Enviar a Director Nacional Segurança>>" ); + butEnviar.setText( "Enviar a Director Nacional Seguran�a>>" ); } break; @@ -702,7 +702,7 @@ public class EditarPlano extends AbstractPageBean butEnviar.setDisabled( true ); } - butEnviar.setText( "Enviar para Técnico de HS>>" ); + butEnviar.setText( "Enviar para T�cnico de HS>>" ); break; case Global.FASE_SIPRP_CONCLUSAO: @@ -1932,7 +1932,7 @@ public class EditarPlano extends AbstractPageBean } else { - getSessionBean1().setMsg( "É necessário validar o processo antes de dar seguimento para a fase seguinte!" ); + getSessionBean1().setMsg( "É necess�rio validar o processo antes de dar seguimento para a fase seguinte!" ); ok = false; } break; @@ -2019,7 +2019,7 @@ public class EditarPlano extends AbstractPageBean } else { - getSessionBean1().setMsg( "É necessário validar o processo antes de dar seguimento para a fase seguinte!" ); + getSessionBean1().setMsg( "É necess�rio validar o processo antes de dar seguimento para a fase seguinte!" ); ok = false; } break; @@ -2079,8 +2079,8 @@ public class EditarPlano extends AbstractPageBean case Global.FASE_SEGURANCA_PREENCHIMENTO: if ( p.getFase_anterior() == null ) { - assunto = "PLANOS - SEGURANÇA (PREENCHIMENTO)"; - mail_text = "Notifica-se que o Plano passou para a fase Segurança(Preenchimento)"; + assunto = "PLANOS - SEGURAN�A (PREENCHIMENTO)"; + mail_text = "Notifica-se que o Plano passou para a fase Seguran�a(Preenchimento)"; } else { @@ -2088,7 +2088,7 @@ public class EditarPlano extends AbstractPageBean { case Global.FASE_DIR_LOJA_VALIDACAO: tipo_utilizador = Global.DIRECTOR_LOJA; - assunto = "Plano de Actuação da Avaliação de Riscos de " + p.getData_visita_str() + " - Pedido de Correcção"; + assunto = "Plano de Actua��o da Avalia��o de Riscos de " + p.getData_visita_str() + " - Pedido de Correc��o"; mail_text = "

Exmo. (a) Senhor (a),

"; mail_text += "

O Plano de Actuação referente à auditoria de Avaliação de Riscos Laborais realizada no passado dia " + p.getData_visita_str() + " foi devolvido para correcção.

"; mail_text += "

Proceda, por favor, em www.siprp.com à(s) respectiva(s) correcção(ões) de acordo com as indicações e volte a reenviar o processo para a fase seguinte.

"; @@ -2103,7 +2103,7 @@ public class EditarPlano extends AbstractPageBean case Global.FASE_DIR_LOJA_VALIDACAO: tipo_utilizador = Global.DIRECTOR_LOJA; - assunto = "Plano de Actuação da Avaliação de Riscos de " + p.getData_visita_str(); + assunto = "Plano de Actua��o da Avalia��o de Riscos de " + p.getData_visita_str(); mail_text = "

Exmo. (a) Senhor (a),

"; mail_text += "

Exmo. Senhor Silvestre Machado,

"; mail_text += "

Encontra-se disponível em www.siprp.com o Plano de Actuação referente à auditoria de Avaliação de Riscos Laborais realizada no passado dia " + p.getData_visita_str() + " para que o possa validar.

"; mail_text += "

Cumprimentos.

"; @@ -2124,14 +2124,14 @@ public class EditarPlano extends AbstractPageBean case Global.FASE_SIPRP_CONCLUSAO: tipo_utilizador = Global.TECNICO_HS; - assunto = "Plano de Actuação da Avaliação de Riscos de " + p.getData_visita_str() + " - " + p.getNome_estabelecimento(); + assunto = "Plano de Actua��o da Avalia��o de Riscos de " + p.getData_visita_str() + " - " + p.getNome_estabelecimento(); mail_text = "

Exmo. (a) Senhor (a),

"; mail_text += "

Encontra-se disponível em www.siprp.com o Plano de Actuação referente à auditoria de Avaliação de Riscos Laborais realizada no passado dia " + p.getData_visita_str() + " para que possa efectuar a sua verificação.

"; mail_text += "

Por favor não responda a esta mensagem, dado tratar-se de um e-mail automático

"; break; case Global.FASE_CONCLUIDO: - assunto = "Plano de Actuação da Avaliação de Riscos de " + p.getData_visita_str() + " - " + p.getNome_estabelecimento() + " - Processo finalizado"; + assunto = "Plano de Actua��o da Avalia��o de Riscos de " + p.getData_visita_str() + " - " + p.getNome_estabelecimento() + " - Processo finalizado"; mail_text = "

Exmo. (a) Senhor (a),

"; mail_text += "

Encontra-se disponível em www.siprp.com o Plano de Actuação referente à auditoria de Avaliação de Riscos Laborais realizada no passado dia " + p.getData_visita_str() + " finalizado após verificação pelos Técnicos Superiores de Higiene e Segurança da SIPRP.

"; mail_text += "

Aproveitamos para agradecer toda a disponibilidade e ficamos ao vosso dispor, caso tenha alguma dúvida ou necessite de qualquer esclarecimento, através do telefone 213 504 540.

"; diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/EnviarCorrecao.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/EnviarCorrecao.java similarity index 93% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/EnviarCorrecao.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/EnviarCorrecao.java index 12c1fb88..9aefa98d 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/EnviarCorrecao.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/EnviarCorrecao.java @@ -4,8 +4,20 @@ * Created on Nov 13, 2008, 11:26:00 AM */ -package planosactuacao; +package com.evolute.siprp.planosactuacao.planosactuacao; +import java.util.List; +import java.util.ListIterator; + +import javax.faces.FacesException; +import javax.faces.event.ValueChangeEvent; + +import com.evolute.siprp.planosactuacao.db.entidades.PlanoActuacao; +import com.evolute.siprp.planosactuacao.db.entidades.Utilizador; +import com.evolute.siprp.planosactuacao.db.providers.PlanosDataProvider; +import com.evolute.siprp.planosactuacao.db.providers.UtilizadoresDataProvider; +import com.evolute.siprp.planosactuacao.global.Global; +import com.evolute.siprp.planosactuacao.mail.Mail; import com.evolute.utils.error.ErrorLogger; import com.sun.rave.web.ui.appbase.AbstractPageBean; import com.sun.webui.jsf.component.Button; @@ -13,16 +25,6 @@ import com.sun.webui.jsf.component.DropDown; import com.sun.webui.jsf.component.StaticText; import com.sun.webui.jsf.component.TextArea; import com.sun.webui.jsf.model.Option; -import db.entidades.PlanoActuacao; -import db.entidades.Utilizador; -import db.providers.PlanosDataProvider; -import db.providers.UtilizadoresDataProvider; -import global.Global; -import java.util.List; -import java.util.ListIterator; -import javax.faces.FacesException; -import javax.faces.event.ValueChangeEvent; -import mail.Mail; /** *

Page bean that corresponds to a similarly named JSP page. This @@ -210,12 +212,12 @@ public class EnviarCorrecao extends AbstractPageBean { if(u.getTipo().intValue() == Global.DIRECTOR_LOJA) { listOptions = new com.sun.webui.jsf.model.Option[1]; - listOptions[0] = new Option(new Integer(Global.FASE_SEGURANCA_PREENCHIMENTO), "Responsável de segurança"); + listOptions[0] = new Option(new Integer(Global.FASE_SEGURANCA_PREENCHIMENTO), "Respons�vel de seguran�a"); } else if(u.getTipo().intValue() == Global.DIRECTOR_NACIONAL_SEGURANCA) { listOptions = new com.sun.webui.jsf.model.Option[2]; - listOptions[0] = new Option(new Integer(Global.FASE_SEGURANCA_PREENCHIMENTO), "Responsável de segurança"); + listOptions[0] = new Option(new Integer(Global.FASE_SEGURANCA_PREENCHIMENTO), "Respons�vel de seguran�a"); listOptions[1] = new Option(new Integer(Global.FASE_DIR_LOJA_VALIDACAO), "Director de loja"); } @@ -291,7 +293,7 @@ public class EnviarCorrecao extends AbstractPageBean { { case Global.FASE_SEGURANCA_PREENCHIMENTO: tipo_utilizador = Global.RESPONSAVEL_SEGURANCA; - assunto = "Plano de Actuação da Avaliação de Riscos de " + p.getData_visita_str() + " - Pedido de Correcção"; + assunto = "Plano de Actua��o da Avalia��o de Riscos de " + p.getData_visita_str() + " - Pedido de Correc��o"; mail_text = "

Exmo. (a) Senhor (a),

"; mail_text += "

O Plano de Actuação referente à auditoria de Avaliação de Riscos Laborais realizada no passado dia " + p.getData_visita_str() + " foi devolvido para correcção.

"; mail_text += "

Proceda, por favor, em www.siprp.com à(s) respectiva(s) correcção(ões) de acordo com as indicações e volte a reenviar o processo para a fase seguinte.

"; @@ -303,7 +305,7 @@ public class EnviarCorrecao extends AbstractPageBean { case Global.FASE_DIR_LOJA_VALIDACAO: tipo_utilizador = Global.DIRECTOR_LOJA; - assunto = "Plano de Actuação da Avaliação de Riscos de " + p.getData_visita_str() + " - Pedido de Correcção"; + assunto = "Plano de Actua��o da Avalia��o de Riscos de " + p.getData_visita_str() + " - Pedido de Correc��o"; mail_text = "

Exmo. (a) Senhor (a),

"; mail_text += "

O Plano de Actuação referente à auditoria de Avaliação de Riscos Laborais realizada no passado dia " + p.getData_visita_str() + " foi devolvido para correcção.

"; mail_text += "

Proceda, por favor, em www.siprp.com à(s) respectiva(s) correcção(ões) de acordo com as indicações do Director Nacional de Segurança e volte a reenviar o processo para a fase seguinte.

"; diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/Erro.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/Erro.java similarity index 98% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/Erro.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/Erro.java index 895eaa51..204b72e3 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/Erro.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/Erro.java @@ -4,7 +4,7 @@ * Created on Aug 26, 2008, 10:54:11 AM */ -package planosactuacao; +package com.evolute.siprp.planosactuacao.planosactuacao; import com.evolute.utils.error.ErrorLogger; import com.sun.rave.web.ui.appbase.AbstractPageBean; diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/Footer.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/Footer.java similarity index 98% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/Footer.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/Footer.java index 1f529e12..5ab65775 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/Footer.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/Footer.java @@ -4,7 +4,7 @@ * Created on Oct 6, 2008, 3:01:32 PM */ -package planosactuacao; +package com.evolute.siprp.planosactuacao.planosactuacao; import com.evolute.utils.error.ErrorLogger; import com.sun.rave.web.ui.appbase.AbstractPageBean; diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/Header.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/Header.java similarity index 96% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/Header.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/Header.java index 12bba90c..31db1b06 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/Header.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/Header.java @@ -4,18 +4,19 @@ * Created on Oct 6, 2008, 10:35:36 AM */ -package planosactuacao; +package com.evolute.siprp.planosactuacao.planosactuacao; +import javax.faces.FacesException; +import javax.faces.context.FacesContext; + +import com.evolute.siprp.planosactuacao.db.entidades.Utilizador; +import com.evolute.siprp.planosactuacao.global.Global; +import com.evolute.siprp.planosactuacao.utils.JSFHTTPUtils; +import com.evolute.siprp.planosactuacao.utils.JSFUtils; import com.evolute.utils.error.ErrorLogger; import com.sun.rave.web.ui.appbase.AbstractFragmentBean; import com.sun.webui.jsf.component.ImageComponent; import com.sun.webui.jsf.component.StaticText; -import db.entidades.Utilizador; -import global.Global; -import javax.faces.FacesException; -import javax.faces.context.FacesContext; -import utils.JSFHTTPUtils; -import utils.JSFUtils; /** *

Fragment bean that corresponds to a similarly named JSP page diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/ListaPlanos.java similarity index 97% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/ListaPlanos.java index 6d8a3bb6..b62472dc 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/ListaPlanos.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/ListaPlanos.java @@ -3,36 +3,39 @@ * * Created on Aug 29, 2008, 2:57:16 PM */ -package planosactuacao; +package com.evolute.siprp.planosactuacao.planosactuacao; -import com.evolute.utils.date.DateUtils; -import com.evolute.utils.error.ErrorLogger; -import com.sun.data.provider.RowKey; -import com.sun.rave.web.ui.appbase.AbstractPageBean; -import com.sun.webui.jsf.component.Button; -import com.sun.webui.jsf.component.PanelGroup; -import com.sun.webui.jsf.component.Table; -import com.sun.webui.jsf.component.TableColumn; -import com.sun.webui.jsf.component.TableRowGroup; -import com.sun.webui.jsf.component.TextField; -import db.entidades.PlanoActuacao; -import db.entidades.Utilizador; -import db.providers.PlanosDataProvider; -import global.Global; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; + import javax.faces.FacesException; import javax.faces.component.html.HtmlPanelGrid; import javax.faces.context.FacesContext; import javax.servlet.http.HttpServletResponse; + import shst.higiene.planoactuacao.print.PlanoActuacaoPDFCreator; -import tabledataproviders.PlanosActualDataProvider; -import tabledataproviders.PlanosConcluidosDataProvider; -import tabledataproviders.PlanosSeguimentoDataProvider; -import utils.JSFUtils; + +import com.evolute.siprp.planosactuacao.db.entidades.PlanoActuacao; +import com.evolute.siprp.planosactuacao.db.entidades.Utilizador; +import com.evolute.siprp.planosactuacao.db.providers.PlanosDataProvider; +import com.evolute.siprp.planosactuacao.global.Global; +import com.evolute.siprp.planosactuacao.tabledataproviders.PlanosActualDataProvider; +import com.evolute.siprp.planosactuacao.tabledataproviders.PlanosConcluidosDataProvider; +import com.evolute.siprp.planosactuacao.tabledataproviders.PlanosSeguimentoDataProvider; +import com.evolute.siprp.planosactuacao.utils.JSFUtils; +import com.evolute.utils.date.DateUtils; +import com.evolute.utils.error.ErrorLogger; +import com.sun.data.provider.RowKey; +import com.sun.rave.web.ui.appbase.AbstractPageBean; +import com.sun.webui.jsf.component.Button; +import com.sun.webui.jsf.component.PanelGroup; +import com.sun.webui.jsf.component.Table; +import com.sun.webui.jsf.component.TableColumn; +import com.sun.webui.jsf.component.TableRowGroup; +import com.sun.webui.jsf.component.TextField; /** *

Page bean that corresponds to a similarly named JSP page. This diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/Login.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/Login.java similarity index 97% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/Login.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/Login.java index d483ac1d..f2568838 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/Login.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/Login.java @@ -4,17 +4,18 @@ * Created on Aug 26, 2008, 11:21:02 AM */ -package planosactuacao; +package com.evolute.siprp.planosactuacao.planosactuacao; +import javax.faces.FacesException; + +import com.evolute.siprp.planosactuacao.db.entidades.Utilizador; +import com.evolute.siprp.planosactuacao.db.providers.UtilizadoresDataProvider; +import com.evolute.siprp.planosactuacao.utils.Utils; import com.evolute.utils.error.ErrorLogger; import com.sun.rave.web.ui.appbase.AbstractPageBean; import com.sun.webui.jsf.component.Button; import com.sun.webui.jsf.component.PasswordField; import com.sun.webui.jsf.component.TextField; -import db.entidades.Utilizador; -import db.providers.UtilizadoresDataProvider; -import javax.faces.FacesException; -import utils.Utils; /** *

Page bean that corresponds to a similarly named JSP page. This diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/PlanosActuacao.java similarity index 94% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/PlanosActuacao.java index a7541bf9..3a37f2d5 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/PlanosActuacao.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/PlanosActuacao.java @@ -3,28 +3,33 @@ * and open the template in the editor. */ -package planosactuacao; +package com.evolute.siprp.planosactuacao.planosactuacao; + +import static com.evolute.utils.strings.UnicodeLatin1Map.atilde; +import static com.evolute.utils.strings.UnicodeLatin1Map.ccedil; -import com.evolute.utils.error.ErrorLogger; -import db.entidades.Area; -import db.entidades.Medida; -import db.entidades.PlanoActuacao; -import db.entidades.PostoTrabalho; -import db.entidades.Risco; -import db.entidades.Utilizador; -import db.entidades.Valor; -import db.providers.CreatePlanosDataProvider; -import db.providers.UtilizadoresDataProvider; -import global.Global; import java.util.ArrayList; import java.util.Date; import java.util.Iterator; import java.util.List; import java.util.ListIterator; -import mail.Mail; + import shst.data.outer.HsRelatorioData; import shst.data.provider.PlanoActuacaoDataProvider; -import static com.evolute.utils.strings.UnicodeLatin1Map.*; + +import com.evolute.siprp.planosactuacao.db.entidades.Area; +import com.evolute.siprp.planosactuacao.db.entidades.Medida; +import com.evolute.siprp.planosactuacao.db.entidades.PlanoActuacao; +import com.evolute.siprp.planosactuacao.db.entidades.PostoTrabalho; +import com.evolute.siprp.planosactuacao.db.entidades.Risco; +import com.evolute.siprp.planosactuacao.db.entidades.Utilizador; +import com.evolute.siprp.planosactuacao.db.entidades.Valor; +import com.evolute.siprp.planosactuacao.db.providers.CreatePlanosDataProvider; +import com.evolute.siprp.planosactuacao.db.providers.UtilizadoresDataProvider; +import com.evolute.siprp.planosactuacao.global.Global; +import com.evolute.siprp.planosactuacao.mail.Mail; +import com.evolute.siprp.planosactuacao.utils.Utils; +import com.evolute.utils.error.ErrorLogger; /** * @@ -224,7 +229,7 @@ public class PlanosActuacao try { //p.setNome_empresa(utils.Utils.unicodeToHTML(rdp.getEmpresaNome(p.getEmpresa_id()))); - p.setNome_empresa(utils.Utils.unicodeToHTML(cpdp.getEmpresaNome(p.getEmpresa_id()))); + p.setNome_empresa( Utils.unicodeToHTML(cpdp.getEmpresaNome(p.getEmpresa_id()))); } catch(Exception ex) { diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/RequestBean1.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/RequestBean1.java similarity index 98% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/RequestBean1.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/RequestBean1.java index dd5b6d32..72dc187b 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/RequestBean1.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/RequestBean1.java @@ -4,7 +4,7 @@ * Created on Aug 25, 2008, 11:20:16 AM */ -package planosactuacao; +package com.evolute.siprp.planosactuacao.planosactuacao; import com.evolute.utils.error.ErrorLogger; import com.sun.rave.web.ui.appbase.AbstractRequestBean; diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/SessionBean1.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/SessionBean1.java similarity index 85% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/SessionBean1.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/SessionBean1.java index 21ebd6e2..9ddfca42 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/SessionBean1.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/SessionBean1.java @@ -4,19 +4,24 @@ * Created on Aug 25, 2008, 11:20:16 AM */ -package planosactuacao; +package com.evolute.siprp.planosactuacao.planosactuacao; -import com.evolute.utils.error.ErrorLogger; -import com.sun.rave.web.ui.appbase.AbstractSessionBean; -import db.entidades.Area; -import db.entidades.PlanoActuacao; -import db.entidades.Risco; -import db.entidades.Utilizador; -import db.entidades.Valor; import java.util.HashMap; import java.util.Map; + import javax.faces.FacesException; -import pagination.Pagination; + +import com.evolute.siprp.planosactuacao.db.entidades.Area; +import com.evolute.siprp.planosactuacao.db.entidades.PlanoActuacao; +import com.evolute.siprp.planosactuacao.db.entidades.Risco; +import com.evolute.siprp.planosactuacao.db.entidades.Utilizador; +import com.evolute.siprp.planosactuacao.db.entidades.Valor; +import com.evolute.siprp.planosactuacao.pagination.Pagination; +import com.evolute.siprp.planosactuacao.tabledataproviders.PlanosActualDataProvider; +import com.evolute.siprp.planosactuacao.tabledataproviders.PlanosConcluidosDataProvider; +import com.evolute.siprp.planosactuacao.tabledataproviders.PlanosSeguimentoDataProvider; +import com.evolute.utils.error.ErrorLogger; +import com.sun.rave.web.ui.appbase.AbstractSessionBean; /** *

Session scope data bean for your application. Create properties @@ -43,9 +48,9 @@ public class SessionBean1 extends AbstractSessionBean { private Valor currentValor = null; - private tabledataproviders.PlanosActualDataProvider planosActualDataProvider; - private tabledataproviders.PlanosSeguimentoDataProvider planosSeguimentoDataProvider; - private tabledataproviders.PlanosConcluidosDataProvider planosConcluidosDataProvider; + private com.evolute.siprp.planosactuacao.tabledataproviders.PlanosActualDataProvider planosActualDataProvider; + private com.evolute.siprp.planosactuacao.tabledataproviders.PlanosSeguimentoDataProvider planosSeguimentoDataProvider; + private com.evolute.siprp.planosactuacao.tabledataproviders.PlanosConcluidosDataProvider planosConcluidosDataProvider; // /** @@ -116,9 +121,9 @@ public class SessionBean1 extends AbstractSessionBean { public SessionBean1() { msg = ""; - planosActualDataProvider = new tabledataproviders.PlanosActualDataProvider(); - planosSeguimentoDataProvider = new tabledataproviders.PlanosSeguimentoDataProvider(); - planosConcluidosDataProvider = new tabledataproviders.PlanosConcluidosDataProvider(); + planosActualDataProvider = new PlanosActualDataProvider(); + planosSeguimentoDataProvider = new PlanosSeguimentoDataProvider(); + planosConcluidosDataProvider = new PlanosConcluidosDataProvider(); planoId = null; } @@ -223,27 +228,27 @@ public class SessionBean1 extends AbstractSessionBean { this.loggedIn = loggedIn; } - public tabledataproviders.PlanosActualDataProvider getPlanosActualDataProvider() { + public com.evolute.siprp.planosactuacao.tabledataproviders.PlanosActualDataProvider getPlanosActualDataProvider() { return planosActualDataProvider; } - public void setPlanosActualDataProvider(tabledataproviders.PlanosActualDataProvider planosActualDataProvider) { + public void setPlanosActualDataProvider(PlanosActualDataProvider planosActualDataProvider) { this.planosActualDataProvider = planosActualDataProvider; } - public tabledataproviders.PlanosSeguimentoDataProvider getPlanosSeguimentoDataProvider() { + public com.evolute.siprp.planosactuacao.tabledataproviders.PlanosSeguimentoDataProvider getPlanosSeguimentoDataProvider() { return planosSeguimentoDataProvider; } - public void setPlanosSeguimentoDataProvider(tabledataproviders.PlanosSeguimentoDataProvider planosSeguimentoDataProvider) { + public void setPlanosSeguimentoDataProvider(PlanosSeguimentoDataProvider planosSeguimentoDataProvider) { this.planosSeguimentoDataProvider = planosSeguimentoDataProvider; } - public tabledataproviders.PlanosConcluidosDataProvider getPlanosConcluidosDataProvider() { + public com.evolute.siprp.planosactuacao.tabledataproviders.PlanosConcluidosDataProvider getPlanosConcluidosDataProvider() { return planosConcluidosDataProvider; } - public void setPlanosConcluidosDataProvider(tabledataproviders.PlanosConcluidosDataProvider planosConcluidosDataProvider) { + public void setPlanosConcluidosDataProvider(PlanosConcluidosDataProvider planosConcluidosDataProvider) { this.planosConcluidosDataProvider = planosConcluidosDataProvider; } diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/Test.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/Test.java similarity index 79% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/Test.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/Test.java index 42b52ec1..c64679bd 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/Test.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/Test.java @@ -3,16 +3,17 @@ * and open the template in the editor. */ -package planosactuacao; +package com.evolute.siprp.planosactuacao.planosactuacao; -import db.entidades.Area; -import db.entidades.Medida; -import db.entidades.PlanoActuacao; -import db.entidades.PostoTrabalho; -import db.entidades.Risco; -import db.entidades.Valor; import java.util.List; +import com.evolute.siprp.planosactuacao.db.entidades.Area; +import com.evolute.siprp.planosactuacao.db.entidades.Medida; +import com.evolute.siprp.planosactuacao.db.entidades.PlanoActuacao; +import com.evolute.siprp.planosactuacao.db.entidades.PostoTrabalho; +import com.evolute.siprp.planosactuacao.db.entidades.Risco; +import com.evolute.siprp.planosactuacao.db.entidades.Valor; + /** * * @author lluis diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/ViewPlano.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/ViewPlano.java similarity index 98% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/ViewPlano.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/ViewPlano.java index 87d642c3..5767113c 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/planosactuacao/ViewPlano.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/planosactuacao/ViewPlano.java @@ -4,27 +4,29 @@ * Created on Oct 20, 2008, 10:39:31 AM */ -package planosactuacao; +package com.evolute.siprp.planosactuacao.planosactuacao; -import com.evolute.utils.error.ErrorLogger; -import com.sun.rave.web.ui.appbase.AbstractPageBean; -import com.sun.webui.jsf.component.Button; -import com.sun.webui.jsf.component.PageSeparator; -import com.sun.webui.jsf.component.PanelGroup; -import com.sun.webui.jsf.component.StaticText; -import db.entidades.Area; -import db.entidades.Medida; -import db.entidades.PlanoActuacao; -import db.entidades.PostoTrabalho; -import db.entidades.Risco; -import db.providers.UtilizadoresLogic; import java.text.SimpleDateFormat; import java.util.Collections; import java.util.Comparator; import java.util.List; + import javax.faces.FacesException; import javax.faces.component.html.HtmlPanelGrid; +import com.evolute.siprp.planosactuacao.db.entidades.Area; +import com.evolute.siprp.planosactuacao.db.entidades.Medida; +import com.evolute.siprp.planosactuacao.db.entidades.PlanoActuacao; +import com.evolute.siprp.planosactuacao.db.entidades.PostoTrabalho; +import com.evolute.siprp.planosactuacao.db.entidades.Risco; +import com.evolute.siprp.planosactuacao.db.providers.UtilizadoresLogic; +import com.evolute.utils.error.ErrorLogger; +import com.sun.rave.web.ui.appbase.AbstractPageBean; +import com.sun.webui.jsf.component.Button; +import com.sun.webui.jsf.component.PageSeparator; +import com.sun.webui.jsf.component.PanelGroup; +import com.sun.webui.jsf.component.StaticText; + /** *

Page bean that corresponds to a similarly named JSP page. This * class contains component definitions (and initialization code) for diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/tabledataproviders/PlanosActualDataProvider.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/tabledataproviders/PlanosActualDataProvider.java similarity index 83% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/tabledataproviders/PlanosActualDataProvider.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/tabledataproviders/PlanosActualDataProvider.java index da83da58..d753afbb 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/tabledataproviders/PlanosActualDataProvider.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/tabledataproviders/PlanosActualDataProvider.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package tabledataproviders; +package com.evolute.siprp.planosactuacao.tabledataproviders; import com.sun.data.provider.impl.ObjectListDataProvider; diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/tabledataproviders/PlanosConcluidosDataProvider.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/tabledataproviders/PlanosConcluidosDataProvider.java similarity index 84% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/tabledataproviders/PlanosConcluidosDataProvider.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/tabledataproviders/PlanosConcluidosDataProvider.java index 2b6e511e..11a746c5 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/tabledataproviders/PlanosConcluidosDataProvider.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/tabledataproviders/PlanosConcluidosDataProvider.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package tabledataproviders; +package com.evolute.siprp.planosactuacao.tabledataproviders; import com.sun.data.provider.impl.ObjectListDataProvider; diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/tabledataproviders/PlanosSeguimentoDataProvider.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/tabledataproviders/PlanosSeguimentoDataProvider.java similarity index 84% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/tabledataproviders/PlanosSeguimentoDataProvider.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/tabledataproviders/PlanosSeguimentoDataProvider.java index 2615d17d..cbd009ea 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/tabledataproviders/PlanosSeguimentoDataProvider.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/tabledataproviders/PlanosSeguimentoDataProvider.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package tabledataproviders; +package com.evolute.siprp.planosactuacao.tabledataproviders; import com.sun.data.provider.impl.ObjectListDataProvider; diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/utils/JSFHTTPUtils.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/utils/JSFHTTPUtils.java similarity index 90% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/utils/JSFHTTPUtils.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/utils/JSFHTTPUtils.java index 51d05a2b..50e1dfd7 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/utils/JSFHTTPUtils.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/utils/JSFHTTPUtils.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package utils; +package com.evolute.siprp.planosactuacao.utils; import java.util.Map; import javax.faces.context.FacesContext; diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/utils/JSFUtils.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/utils/JSFUtils.java similarity index 95% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/utils/JSFUtils.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/utils/JSFUtils.java index 11b54276..f2ddc576 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/utils/JSFUtils.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/utils/JSFUtils.java @@ -3,18 +3,20 @@ * and open the template in the editor. */ -package utils; +package com.evolute.siprp.planosactuacao.utils; import java.util.Iterator; import java.util.Map; + import javax.faces.application.Application; import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; import javax.faces.render.ResponseStateManager; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import planosactuacao.ApplicationBean1; -import planosactuacao.SessionBean1; + +import com.evolute.siprp.planosactuacao.planosactuacao.ApplicationBean1; +import com.evolute.siprp.planosactuacao.planosactuacao.SessionBean1; /** * diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/utils/Logos.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/utils/Logos.java similarity index 88% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/utils/Logos.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/utils/Logos.java index 699877c4..e0f5cc81 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/utils/Logos.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/utils/Logos.java @@ -3,17 +3,19 @@ * and open the template in the editor. */ -package utils; +package com.evolute.siprp.planosactuacao.utils; -import com.evolute.utils.error.ErrorLogger; -import db.providers.RelatoriosDataProvider; -import global.Global; import java.io.File; import java.io.FileOutputStream; import java.io.OutputStream; + import javax.faces.context.FacesContext; import javax.servlet.ServletContext; +import com.evolute.siprp.planosactuacao.db.providers.RelatoriosDataProvider; +import com.evolute.siprp.planosactuacao.global.Global; +import com.evolute.utils.error.ErrorLogger; + /** * * @author lluis diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/utils/PlanosActuacaoLogger.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/utils/PlanosActuacaoLogger.java similarity index 96% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/utils/PlanosActuacaoLogger.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/utils/PlanosActuacaoLogger.java index a6abe8d5..2e2ad1bd 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/utils/PlanosActuacaoLogger.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/utils/PlanosActuacaoLogger.java @@ -3,7 +3,7 @@ * and open the template in the editor. */ -package utils; +package com.evolute.siprp.planosactuacao.utils; import com.evolute.utils.error.ErrorLogger; import com.evolute.utils.error.LoggerProperties; diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/utils/PlanosUpdater.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/utils/PlanosUpdater.java similarity index 96% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/utils/PlanosUpdater.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/utils/PlanosUpdater.java index 9e4f7cae..f2986d4e 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/utils/PlanosUpdater.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/utils/PlanosUpdater.java @@ -3,8 +3,13 @@ * and open the template in the editor. */ -package utils; +package com.evolute.siprp.planosactuacao.utils; +import java.util.Date; + +import shst.companydataloaders.SIPRPPropertiesLoader; + +import com.evolute.siprp.planosactuacao.db.providers.EvoBaseProvider; import com.evolute.utils.arrays.Virtual2DArray; import com.evolute.utils.db.Executer; import com.evolute.utils.sql.Assignment; @@ -12,9 +17,6 @@ import com.evolute.utils.sql.Expression; import com.evolute.utils.sql.Field; import com.evolute.utils.sql.Select2; import com.evolute.utils.sql.Update; -import db.providers.EvoBaseProvider; -import java.util.Date; -import shst.companydataloaders.SIPRPPropertiesLoader; /** * diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/utils/Utils.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/utils/Utils.java similarity index 52% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/utils/Utils.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/utils/Utils.java index 5772973d..002f021d 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/utils/Utils.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/utils/Utils.java @@ -3,17 +3,19 @@ * and open the template in the editor. */ -package utils; +package com.evolute.siprp.planosactuacao.utils; -import com.evolute.utils.Singleton; -import com.evolute.utils.error.ErrorLogger; -import db.entidades.Utilizador; import java.util.Map; + import javax.faces.context.ExternalContext; import javax.faces.context.FacesContext; import javax.servlet.ServletContext; import javax.servlet.http.HttpSession; -import planosactuacao.SessionBean1; + +import com.evolute.siprp.planosactuacao.db.entidades.Utilizador; +import com.evolute.siprp.planosactuacao.planosactuacao.SessionBean1; +import com.evolute.utils.Singleton; +import com.evolute.utils.error.ErrorLogger; /** * @@ -36,46 +38,46 @@ public class Utils { output = output.replaceAll( "\\\\u00aa", "ª" ); output = output.replaceAll( "\\\\u00ba", "º" ); - output = output.replaceAll( "\\\\u00c0", "À" ); - output = output.replaceAll( "\\\\u00c1", "Á" ); - output = output.replaceAll( "\\\\u00c2", "Â" ); - output = output.replaceAll( "\\\\u00c3", "Ã" ); - output = output.replaceAll( "\\\\u00c7", "Ç" ); - output = output.replaceAll( "\\\\u00c8", "È" ); - output = output.replaceAll( "\\\\u00c9", "É" ); - output = output.replaceAll( "\\\\u00d3", "Ó" ); - output = output.replaceAll( "\\\\u00d2", "Ò" ); + output = output.replaceAll( "\\\\u00c0", "�" ); + output = output.replaceAll( "\\\\u00c1", "�" ); + output = output.replaceAll( "\\\\u00c2", "�" ); + output = output.replaceAll( "\\\\u00c3", "�" ); + output = output.replaceAll( "\\\\u00c7", "�" ); + output = output.replaceAll( "\\\\u00c8", "�" ); + output = output.replaceAll( "\\\\u00c9", "�" ); + output = output.replaceAll( "\\\\u00d3", "�" ); + output = output.replaceAll( "\\\\u00d2", "�" ); - output = output.replaceAll( "\\\\u00ca", "Ê" ); - output = output.replaceAll( "\\\\u00cc", "Ì" ); - output = output.replaceAll( "\\\\u00cd", "Í" ); - output = output.replaceAll( "\\\\u00ce", "Î" ); - output = output.replaceAll( "\\\\u00d2", "ò" ); - output = output.replaceAll( "\\\\u00d3", "ó" ); - output = output.replaceAll( "\\\\u00d4", "ô" ); - output = output.replaceAll( "\\\\u00d5", "õ" ); - output = output.replaceAll( "\\\\u00d9", "Ù" ); - output = output.replaceAll( "\\\\u00da", "Ú" ); - output = output.replaceAll( "\\\\u00db", "Û" ); - - output = output.replaceAll( "\\\\u00e0", "à" ); - output = output.replaceAll( "\\\\u00e1", "á" ); - output = output.replaceAll( "\\\\u00e2", "â" ); - output = output.replaceAll( "\\\\u00e3", "ã" ); - output = output.replaceAll( "\\\\u00e7", "ç" ); - output = output.replaceAll( "\\\\u00e8", "è" ); - output = output.replaceAll( "\\\\u00e9", "é" ); - output = output.replaceAll( "\\\\u00ea", "ê" ); - output = output.replaceAll( "\\\\u00ec", "ì" ); - output = output.replaceAll( "\\\\u00ed", "í" ); - output = output.replaceAll( "\\\\u00ee", "î" ); - output = output.replaceAll( "\\\\u00f2", "ò" ); - output = output.replaceAll( "\\\\u00f3", "ó" ); - output = output.replaceAll( "\\\\u00f4", "ô" ); - output = output.replaceAll( "\\\\u00f5", "õ" ); - output = output.replaceAll( "\\\\u00f9", "ù" ); - output = output.replaceAll( "\\\\u00fa", "ú" ); - output = output.replaceAll( "\\\\u00fb", "û" ); + output = output.replaceAll( "\\\\u00ca", "�" ); + output = output.replaceAll( "\\\\u00cc", "�" ); + output = output.replaceAll( "\\\\u00cd", "�" ); + output = output.replaceAll( "\\\\u00ce", "�" ); + output = output.replaceAll( "\\\\u00d2", "�" ); + output = output.replaceAll( "\\\\u00d3", "�" ); + output = output.replaceAll( "\\\\u00d4", "�" ); + output = output.replaceAll( "\\\\u00d5", "�" ); + output = output.replaceAll( "\\\\u00d9", "�" ); + output = output.replaceAll( "\\\\u00da", "�" ); + output = output.replaceAll( "\\\\u00db", "�" ); + + output = output.replaceAll( "\\\\u00e0", "�" ); + output = output.replaceAll( "\\\\u00e1", "�" ); + output = output.replaceAll( "\\\\u00e2", "�" ); + output = output.replaceAll( "\\\\u00e3", "�" ); + output = output.replaceAll( "\\\\u00e7", "�" ); + output = output.replaceAll( "\\\\u00e8", "�" ); + output = output.replaceAll( "\\\\u00e9", "�" ); + output = output.replaceAll( "\\\\u00ea", "�" ); + output = output.replaceAll( "\\\\u00ec", "�" ); + output = output.replaceAll( "\\\\u00ed", "�" ); + output = output.replaceAll( "\\\\u00ee", "�" ); + output = output.replaceAll( "\\\\u00f2", "�" ); + output = output.replaceAll( "\\\\u00f3", "�" ); + output = output.replaceAll( "\\\\u00f4", "�" ); + output = output.replaceAll( "\\\\u00f5", "�" ); + output = output.replaceAll( "\\\\u00f9", "�" ); + output = output.replaceAll( "\\\\u00fa", "�" ); + output = output.replaceAll( "\\\\u00fb", "�" ); output = output.replaceAll( "\\\\u0153", "œ" ); diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/viewhandler/CustomViewHandler.java b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/viewhandler/CustomViewHandler.java similarity index 97% rename from branches/NetbeansIndependency/PlanosActuacao/src/java/viewhandler/CustomViewHandler.java rename to branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/viewhandler/CustomViewHandler.java index 83199b57..741eb363 100644 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/viewhandler/CustomViewHandler.java +++ b/branches/NetbeansIndependency/PlanosActuacao/src/com/evolute/siprp/planosactuacao/viewhandler/CustomViewHandler.java @@ -3,12 +3,12 @@ * and open the template in the editor. */ -package viewhandler; +package com.evolute.siprp.planosactuacao.viewhandler; import java.io.IOException; import java.util.Locale; import java.util.Map; -import javax.el.ValueExpression; + import javax.faces.FacesException; import javax.faces.application.ViewHandler; import javax.faces.component.UIViewRoot; diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/app.properties b/branches/NetbeansIndependency/PlanosActuacao/src/java/app.properties deleted file mode 100644 index bc8f2e0f..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/app.properties +++ /dev/null @@ -1,40 +0,0 @@ - -# production -server.siprp = localhost -port.siprp = 5436 -database.siprp = siprp -username.siprp = postgres -#password.siprp = - -server.siprp_local = localhost -port.siprp_local = 5436 -database.siprp_local = siprp_local_3 -username.siprp_local = postgres -#password.siprp_local = - - - -# tests -#server.siprp = localhost -#port.siprp = 5432 -#database.siprp = siprp -#username.siprp = postgres -#password.siprp = Typein -# -#server.siprp_local = localhost -#port.siprp_local = 5432 -#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 diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/AcidentadosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/AcidentadosData.java deleted file mode 100644 index 2713cd49..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/AcidentadosData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* AcidentadosData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class AcidentadosData extends db.data.siprp.inner.Acidentados -{ - - public AcidentadosData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/ActualizacaoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/ActualizacaoData.java deleted file mode 100644 index 316c102d..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/ActualizacaoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* ActualizacaoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class ActualizacaoData extends db.data.siprp.inner.Actualizacao -{ - - public ActualizacaoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/AnalisesAcidentesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/AnalisesAcidentesData.java deleted file mode 100644 index 5177c7f2..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/AnalisesAcidentesData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* AnalisesAcidentesData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class AnalisesAcidentesData extends db.data.siprp.inner.AnalisesAcidentes -{ - - public AnalisesAcidentesData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/AvisosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/AvisosData.java deleted file mode 100644 index 580bbe07..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/AvisosData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* AvisosData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class AvisosData extends db.data.siprp.inner.Avisos -{ - - public AvisosData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/CausasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/CausasData.java deleted file mode 100644 index 0d0ff4a4..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/CausasData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* CausasData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class CausasData extends db.data.siprp.inner.Causas -{ - - public CausasData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/ContactosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/ContactosData.java deleted file mode 100644 index d841d28a..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/ContactosData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* ContactosData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class ContactosData extends db.data.siprp.inner.Contactos -{ - - public ContactosData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/ControleData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/ControleData.java deleted file mode 100644 index 8f919bb0..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/ControleData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* ControleData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class ControleData extends db.data.siprp.inner.Controle -{ - - public ControleData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/DepartamentosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/DepartamentosData.java deleted file mode 100644 index 197c5982..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/DepartamentosData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* DepartamentosData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class DepartamentosData extends db.data.siprp.inner.Departamentos -{ - - public DepartamentosData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/EmpresasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/EmpresasData.java deleted file mode 100644 index 7b7b34ca..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/EmpresasData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* EmpresasData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class EmpresasData extends db.data.siprp.inner.Empresas -{ - - public EmpresasData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/ErrorsData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/ErrorsData.java deleted file mode 100644 index 2752eb49..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/ErrorsData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* ErrorsData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class ErrorsData extends db.data.siprp.inner.Errors -{ - - public ErrorsData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/EstabelecimentosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/EstabelecimentosData.java deleted file mode 100644 index 61ee1210..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/EstabelecimentosData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* EstabelecimentosData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class EstabelecimentosData extends db.data.siprp.inner.Estabelecimentos -{ - - public EstabelecimentosData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/EstadoMedidasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/EstadoMedidasData.java deleted file mode 100644 index 12d62136..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/EstadoMedidasData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* EstadoMedidasData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class EstadoMedidasData extends db.data.siprp.inner.EstadoMedidas -{ - - public EstadoMedidasData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/ExamesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/ExamesData.java deleted file mode 100644 index 5710efe5..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/ExamesData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* ExamesData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class ExamesData extends db.data.siprp.inner.Exames -{ - - public ExamesData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/ExamesPerfisData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/ExamesPerfisData.java deleted file mode 100644 index 3e709b6b..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/ExamesPerfisData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* ExamesPerfisData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class ExamesPerfisData extends db.data.siprp.inner.ExamesPerfis -{ - - public ExamesPerfisData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/HistoricoEstabelecimentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/HistoricoEstabelecimentoData.java deleted file mode 100644 index caaafddc..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/HistoricoEstabelecimentoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HistoricoEstabelecimentoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class HistoricoEstabelecimentoData extends db.data.siprp.inner.HistoricoEstabelecimento -{ - - public HistoricoEstabelecimentoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/MarcacoesEmpresaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/MarcacoesEmpresaData.java deleted file mode 100644 index 79679543..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/MarcacoesEmpresaData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* MarcacoesEmpresaData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class MarcacoesEmpresaData extends db.data.siprp.inner.MarcacoesEmpresa -{ - - public MarcacoesEmpresaData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/MarcacoesEstabelecimentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/MarcacoesEstabelecimentoData.java deleted file mode 100644 index a901db91..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/MarcacoesEstabelecimentoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* MarcacoesEstabelecimentoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class MarcacoesEstabelecimentoData extends db.data.siprp.inner.MarcacoesEstabelecimento -{ - - public MarcacoesEstabelecimentoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/MarcacoesTrabalhadorData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/MarcacoesTrabalhadorData.java deleted file mode 100644 index e630fc2e..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/MarcacoesTrabalhadorData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* MarcacoesTrabalhadorData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class MarcacoesTrabalhadorData extends db.data.siprp.inner.MarcacoesTrabalhador -{ - - public MarcacoesTrabalhadorData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/MedicosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/MedicosData.java deleted file mode 100644 index 3e2ee281..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/MedicosData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* MedicosData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class MedicosData extends db.data.siprp.inner.Medicos -{ - - public MedicosData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/MedidasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/MedidasData.java deleted file mode 100644 index 30a6c6f3..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/MedidasData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* MedidasData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class MedidasData extends db.data.siprp.inner.Medidas -{ - - public MedidasData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/NotNoticiasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/NotNoticiasData.java deleted file mode 100644 index b9598074..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/NotNoticiasData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* NotNoticiasData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class NotNoticiasData extends db.data.siprp.inner.NotNoticias -{ - - public NotNoticiasData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PermissoesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PermissoesData.java deleted file mode 100644 index 4b7d3356..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PermissoesData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* PermissoesData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class PermissoesData extends db.data.siprp.inner.Permissoes -{ - - public PermissoesData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PlanoAreasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PlanoAreasData.java deleted file mode 100644 index 960a9807..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PlanoAreasData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* PlanoAreasData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class PlanoAreasData extends db.data.siprp.inner.PlanoAreas -{ - - public PlanoAreasData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PlanoMedidasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PlanoMedidasData.java deleted file mode 100644 index 8d105648..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PlanoMedidasData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* PlanoMedidasData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class PlanoMedidasData extends db.data.siprp.inner.PlanoMedidas -{ - - public PlanoMedidasData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PlanoPostosTrabalhoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PlanoPostosTrabalhoData.java deleted file mode 100644 index a594b298..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PlanoPostosTrabalhoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* PlanoPostosTrabalhoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class PlanoPostosTrabalhoData extends db.data.siprp.inner.PlanoPostosTrabalho -{ - - public PlanoPostosTrabalhoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PlanoRiscosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PlanoRiscosData.java deleted file mode 100644 index 90b3891f..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PlanoRiscosData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* PlanoRiscosData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class PlanoRiscosData extends db.data.siprp.inner.PlanoRiscos -{ - - public PlanoRiscosData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PlanosActuacaoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PlanosActuacaoData.java deleted file mode 100644 index 23804955..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PlanosActuacaoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* PlanosActuacaoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class PlanosActuacaoData extends db.data.siprp.inner.PlanosActuacao -{ - - public PlanosActuacaoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PropertiesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PropertiesData.java deleted file mode 100644 index 7f93b5b5..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/PropertiesData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* PropertiesData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class PropertiesData extends db.data.siprp.inner.Properties -{ - - public PropertiesData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/RecomendacoesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/RecomendacoesData.java deleted file mode 100644 index 8a951078..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/RecomendacoesData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* RecomendacoesData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class RecomendacoesData extends db.data.siprp.inner.Recomendacoes -{ - - public RecomendacoesData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/RiscoValoresTempData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/RiscoValoresTempData.java deleted file mode 100644 index 1756a8b0..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/RiscoValoresTempData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* RiscoValoresTempData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class RiscoValoresTempData extends db.data.siprp.inner.RiscoValoresTemp -{ - - public RiscoValoresTempData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/RolesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/RolesData.java deleted file mode 100644 index 2ac92c55..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/RolesData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* RolesData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class RolesData extends db.data.siprp.inner.Roles -{ - - public RolesData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/SeccoesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/SeccoesData.java deleted file mode 100644 index 5b6b39bc..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/SeccoesData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* SeccoesData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class SeccoesData extends db.data.siprp.inner.Seccoes -{ - - public SeccoesData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/TiposExamesCompData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/TiposExamesCompData.java deleted file mode 100644 index f7c0a8f4..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/TiposExamesCompData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* TiposExamesCompData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class TiposExamesCompData extends db.data.siprp.inner.TiposExamesComp -{ - - public TiposExamesCompData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/TiposUtilizadoresData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/TiposUtilizadoresData.java deleted file mode 100644 index 56f478b7..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/TiposUtilizadoresData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* TiposUtilizadoresData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class TiposUtilizadoresData extends db.data.siprp.inner.TiposUtilizadores -{ - - public TiposUtilizadoresData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/TrabalhadoresData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/TrabalhadoresData.java deleted file mode 100644 index 81950266..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/TrabalhadoresData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* TrabalhadoresData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class TrabalhadoresData extends db.data.siprp.inner.Trabalhadores -{ - - public TrabalhadoresData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/UsersData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/UsersData.java deleted file mode 100644 index 5a661b86..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/UsersData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* UsersData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class UsersData extends db.data.siprp.inner.Users -{ - - public UsersData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/UtilizadoresData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/UtilizadoresData.java deleted file mode 100644 index 3e5a0425..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/UtilizadoresData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* UtilizadoresData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class UtilizadoresData extends db.data.siprp.inner.Utilizadores -{ - - public UtilizadoresData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/VersionData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/VersionData.java deleted file mode 100644 index 128a7c4b..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp/outer/VersionData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* VersionData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp.outer; - - -public final class VersionData extends db.data.siprp.inner.Version -{ - - public VersionData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ActualizacaoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ActualizacaoData.java deleted file mode 100644 index 0c20f558..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ActualizacaoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* ActualizacaoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class ActualizacaoData extends db.data.siprp_local.inner.Actualizacao -{ - - public ActualizacaoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/AptAppointmentData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/AptAppointmentData.java deleted file mode 100644 index 29449f4a..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/AptAppointmentData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* AptAppointmentData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class AptAppointmentData extends db.data.siprp_local.inner.AptAppointment -{ - - public AptAppointmentData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/AptOutrasVacinaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/AptOutrasVacinaData.java deleted file mode 100644 index 8fc0b1d5..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/AptOutrasVacinaData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* 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(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/AptOutrasViajanteData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/AptOutrasViajanteData.java deleted file mode 100644 index b7b806ff..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/AptOutrasViajanteData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* 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(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/AptSegurancaAlimentarData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/AptSegurancaAlimentarData.java deleted file mode 100644 index 56f9d6f3..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/AptSegurancaAlimentarData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* AptSegurancaAlimentarData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class AptSegurancaAlimentarData extends db.data.siprp_local.inner.AptSegurancaAlimentar -{ - - public AptSegurancaAlimentarData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/AptStateData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/AptStateData.java deleted file mode 100644 index 5a80373c..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/AptStateData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* AptStateData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class AptStateData extends db.data.siprp_local.inner.AptState -{ - - public AptStateData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/AvisosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/AvisosData.java deleted file mode 100644 index be35e00d..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/AvisosData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* AvisosData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class AvisosData extends db.data.siprp_local.inner.Avisos -{ - - public AvisosData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ContactosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ContactosData.java deleted file mode 100644 index dcf0758f..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ContactosData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* ContactosData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class ContactosData extends db.data.siprp_local.inner.Contactos -{ - - public ContactosData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurArsData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurArsData.java deleted file mode 100644 index 7c4caa4e..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurArsData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* CurArsData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class CurArsData extends db.data.siprp_local.inner.CurArs -{ - - public CurArsData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurAulasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurAulasData.java deleted file mode 100644 index 27442b59..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurAulasData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* CurAulasData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class CurAulasData extends db.data.siprp_local.inner.CurAulas -{ - - public CurAulasData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurAulasFormadoresData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurAulasFormadoresData.java deleted file mode 100644 index e5a75b70..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurAulasFormadoresData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* CurAulasFormadoresData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class CurAulasFormadoresData extends db.data.siprp_local.inner.CurAulasFormadores -{ - - public CurAulasFormadoresData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurCursosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurCursosData.java deleted file mode 100644 index 0c8a4328..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurCursosData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* CurCursosData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class CurCursosData extends db.data.siprp_local.inner.CurCursos -{ - - public CurCursosData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurDiasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurDiasData.java deleted file mode 100644 index cffa22c6..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurDiasData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* CurDiasData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class CurDiasData extends db.data.siprp_local.inner.CurDias -{ - - public CurDiasData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurFormadoresCursosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurFormadoresCursosData.java deleted file mode 100644 index 68fa9681..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurFormadoresCursosData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* CurFormadoresCursosData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class CurFormadoresCursosData extends db.data.siprp_local.inner.CurFormadoresCursos -{ - - public CurFormadoresCursosData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurFormadoresData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurFormadoresData.java deleted file mode 100644 index f4179b43..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurFormadoresData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* CurFormadoresData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class CurFormadoresData extends db.data.siprp_local.inner.CurFormadores -{ - - public CurFormadoresData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurFormandosCursosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurFormandosCursosData.java deleted file mode 100644 index 404428ba..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurFormandosCursosData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* CurFormandosCursosData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class CurFormandosCursosData extends db.data.siprp_local.inner.CurFormandosCursos -{ - - public CurFormandosCursosData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurFormandosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurFormandosData.java deleted file mode 100644 index 513befc5..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurFormandosData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* CurFormandosData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class CurFormandosData extends db.data.siprp_local.inner.CurFormandos -{ - - public CurFormandosData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurHospitaisData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurHospitaisData.java deleted file mode 100644 index d241c7f3..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurHospitaisData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* CurHospitaisData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class CurHospitaisData extends db.data.siprp_local.inner.CurHospitais -{ - - public CurHospitaisData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurNumeroCertificadoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurNumeroCertificadoData.java deleted file mode 100644 index 5562388b..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurNumeroCertificadoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* CurNumeroCertificadoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class CurNumeroCertificadoData extends db.data.siprp_local.inner.CurNumeroCertificado -{ - - public CurNumeroCertificadoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurNumeroCertificadoFormadorData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurNumeroCertificadoFormadorData.java deleted file mode 100644 index 2449c28f..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurNumeroCertificadoFormadorData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* CurNumeroCertificadoFormadorData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class CurNumeroCertificadoFormadorData extends db.data.siprp_local.inner.CurNumeroCertificadoFormador -{ - - public CurNumeroCertificadoFormadorData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurPagamentosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurPagamentosData.java deleted file mode 100644 index ce2a1f96..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurPagamentosData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* CurPagamentosData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class CurPagamentosData extends db.data.siprp_local.inner.CurPagamentos -{ - - public CurPagamentosData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurPagamentosTiposData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurPagamentosTiposData.java deleted file mode 100644 index c29b5d0d..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurPagamentosTiposData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* CurPagamentosTiposData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class CurPagamentosTiposData extends db.data.siprp_local.inner.CurPagamentosTipos -{ - - public CurPagamentosTiposData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurPresencasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurPresencasData.java deleted file mode 100644 index 40b63317..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurPresencasData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* CurPresencasData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class CurPresencasData extends db.data.siprp_local.inner.CurPresencas -{ - - public CurPresencasData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurQuestionarioData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurQuestionarioData.java deleted file mode 100644 index e869736c..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurQuestionarioData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* 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(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurQuestionarioPerguntaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurQuestionarioPerguntaData.java deleted file mode 100644 index 9b0b992d..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurQuestionarioPerguntaData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* 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(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurQuestionarioRespostaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurQuestionarioRespostaData.java deleted file mode 100644 index b64bb269..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurQuestionarioRespostaData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* 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(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurTopicosAulasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurTopicosAulasData.java deleted file mode 100644 index 966ad307..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurTopicosAulasData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* CurTopicosAulasData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class CurTopicosAulasData extends db.data.siprp_local.inner.CurTopicosAulas -{ - - public CurTopicosAulasData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurTopicosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurTopicosData.java deleted file mode 100644 index 7f565b61..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/CurTopicosData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* CurTopicosData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class CurTopicosData extends db.data.siprp_local.inner.CurTopicos -{ - - public CurTopicosData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EcdOficialData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EcdOficialData.java deleted file mode 100644 index 69291a55..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EcdOficialData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* EcdOficialData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class EcdOficialData extends db.data.siprp_local.inner.EcdOficial -{ - - public EcdOficialData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EmailPlanoDeActuacaoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EmailPlanoDeActuacaoData.java deleted file mode 100644 index e251a8bd..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EmailPlanoDeActuacaoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* EmailPlanoDeActuacaoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class EmailPlanoDeActuacaoData extends db.data.siprp_local.inner.EmailPlanoDeActuacao -{ - - public EmailPlanoDeActuacaoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EmpresaPrecoPeriodicidadeTipoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EmpresaPrecoPeriodicidadeTipoData.java deleted file mode 100644 index 57479c87..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EmpresaPrecoPeriodicidadeTipoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* EmpresaPrecoPeriodicidadeTipoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class EmpresaPrecoPeriodicidadeTipoData extends db.data.siprp_local.inner.EmpresaPrecoPeriodicidadeTipo -{ - - public EmpresaPrecoPeriodicidadeTipoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EmpresaPrecoServicoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EmpresaPrecoServicoData.java deleted file mode 100644 index 1392ad33..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EmpresaPrecoServicoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* EmpresaPrecoServicoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class EmpresaPrecoServicoData extends db.data.siprp_local.inner.EmpresaPrecoServico -{ - - public EmpresaPrecoServicoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EmpresaPrecoServicoTipoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EmpresaPrecoServicoTipoData.java deleted file mode 100644 index dc8d6935..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EmpresaPrecoServicoTipoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* EmpresaPrecoServicoTipoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class EmpresaPrecoServicoTipoData extends db.data.siprp_local.inner.EmpresaPrecoServicoTipo -{ - - public EmpresaPrecoServicoTipoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EmpresasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EmpresasData.java deleted file mode 100644 index 4ca2924a..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EmpresasData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* EmpresasData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class EmpresasData extends db.data.siprp_local.inner.Empresas -{ - - public EmpresasData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ErrorsData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ErrorsData.java deleted file mode 100644 index 001f926d..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ErrorsData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* ErrorsData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class ErrorsData extends db.data.siprp_local.inner.Errors -{ - - public ErrorsData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EstabelecimentosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EstabelecimentosData.java deleted file mode 100644 index 0c2ef031..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EstabelecimentosData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* EstabelecimentosData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class EstabelecimentosData extends db.data.siprp_local.inner.Estabelecimentos -{ - - public EstabelecimentosData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EtiquetasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EtiquetasData.java deleted file mode 100644 index f5cc4335..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EtiquetasData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* EtiquetasData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class EtiquetasData extends db.data.siprp_local.inner.Etiquetas -{ - - public EtiquetasData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoPessoaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoPessoaData.java deleted file mode 100644 index c8ace64c..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoPessoaData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* EvoPessoaData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class EvoPessoaData extends db.data.siprp_local.inner.EvoPessoa -{ - - public EvoPessoaData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUpdateData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUpdateData.java deleted file mode 100644 index 2549cd82..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUpdateData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* EvoUpdateData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class EvoUpdateData extends db.data.siprp_local.inner.EvoUpdate -{ - - public EvoUpdateData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrPermissionData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrPermissionData.java deleted file mode 100644 index 0a773f45..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrPermissionData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* EvoUsrPermissionData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class EvoUsrPermissionData extends db.data.siprp_local.inner.EvoUsrPermission -{ - - public EvoUsrPermissionData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrPreferencesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrPreferencesData.java deleted file mode 100644 index 4a646e0f..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrPreferencesData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* 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(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrRoleData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrRoleData.java deleted file mode 100644 index afa56c6d..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrRoleData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* EvoUsrRoleData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class EvoUsrRoleData extends db.data.siprp_local.inner.EvoUsrRole -{ - - public EvoUsrRoleData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrRolesPermissionsData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrRolesPermissionsData.java deleted file mode 100644 index a2d78b95..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrRolesPermissionsData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* EvoUsrRolesPermissionsData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class EvoUsrRolesPermissionsData extends db.data.siprp_local.inner.EvoUsrRolesPermissions -{ - - public EvoUsrRolesPermissionsData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrUserData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrUserData.java deleted file mode 100644 index 262fde8a..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrUserData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* EvoUsrUserData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class EvoUsrUserData extends db.data.siprp_local.inner.EvoUsrUser -{ - - public EvoUsrUserData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrUsersRolesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrUsersRolesData.java deleted file mode 100644 index d0842712..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/EvoUsrUsersRolesData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* EvoUsrUsersRolesData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class EvoUsrUsersRolesData extends db.data.siprp_local.inner.EvoUsrUsersRoles -{ - - public EvoUsrUsersRolesData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ExamesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ExamesData.java deleted file mode 100644 index fb4cf9b9..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ExamesData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* ExamesData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class ExamesData extends db.data.siprp_local.inner.Exames -{ - - public ExamesData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ExamesPerfisData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ExamesPerfisData.java deleted file mode 100644 index cf9aabc9..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ExamesPerfisData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* ExamesPerfisData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class ExamesPerfisData extends db.data.siprp_local.inner.ExamesPerfis -{ - - public ExamesPerfisData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ExamesPortariaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ExamesPortariaData.java deleted file mode 100644 index ade72d19..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ExamesPortariaData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* ExamesPortariaData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class ExamesPortariaData extends db.data.siprp_local.inner.ExamesPortaria -{ - - public ExamesPortariaData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/FilCategoriasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/FilCategoriasData.java deleted file mode 100644 index e56c57f4..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/FilCategoriasData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* 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(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/FilFileAppointmentData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/FilFileAppointmentData.java deleted file mode 100644 index 4ec472cf..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/FilFileAppointmentData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* FilFileAppointmentData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class FilFileAppointmentData extends db.data.siprp_local.inner.FilFileAppointment -{ - - public FilFileAppointmentData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/FilFileData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/FilFileData.java deleted file mode 100644 index 40fefdcf..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/FilFileData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* FilFileData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class FilFileData extends db.data.siprp_local.inner.FilFile -{ - - public FilFileData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/FilFileEmpresaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/FilFileEmpresaData.java deleted file mode 100644 index c30b6c2c..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/FilFileEmpresaData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* 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(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/FilFileMarcacoesEstabelecimentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/FilFileMarcacoesEstabelecimentoData.java deleted file mode 100644 index 12e55883..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/FilFileMarcacoesEstabelecimentoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* 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(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HistoricoEstabelecimentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HistoricoEstabelecimentoData.java deleted file mode 100644 index 34a8e0b7..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HistoricoEstabelecimentoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HistoricoEstabelecimentoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HistoricoEstabelecimentoData extends db.data.siprp_local.inner.HistoricoEstabelecimento -{ - - public HistoricoEstabelecimentoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsAreaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsAreaData.java deleted file mode 100644 index d096fdfd..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsAreaData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsAreaData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsAreaData extends db.data.siprp_local.inner.HsArea -{ - - public HsAreaData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsEmailData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsEmailData.java deleted file mode 100644 index 8ca79d85..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsEmailData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsEmailData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsEmailData extends db.data.siprp_local.inner.HsEmail -{ - - public HsEmailData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsEmailEmpresaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsEmailEmpresaData.java deleted file mode 100644 index 8e1489ee..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsEmailEmpresaData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsEmailEmpresaData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsEmailEmpresaData extends db.data.siprp_local.inner.HsEmailEmpresa -{ - - public HsEmailEmpresaData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsEmailEstabelecimentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsEmailEstabelecimentoData.java deleted file mode 100644 index 67b053a9..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsEmailEstabelecimentoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsEmailEstabelecimentoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsEmailEstabelecimentoData extends db.data.siprp_local.inner.HsEmailEstabelecimento -{ - - public HsEmailEstabelecimentoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsEquipamentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsEquipamentoData.java deleted file mode 100644 index fc253f7f..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsEquipamentoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsEquipamentoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsEquipamentoData extends db.data.siprp_local.inner.HsEquipamento -{ - - public HsEquipamentoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsLegislacaoCategoriaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsLegislacaoCategoriaData.java deleted file mode 100644 index 50fc7216..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsLegislacaoCategoriaData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsLegislacaoCategoriaData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsLegislacaoCategoriaData extends db.data.siprp_local.inner.HsLegislacaoCategoria -{ - - public HsLegislacaoCategoriaData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsLegislacaoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsLegislacaoData.java deleted file mode 100644 index d67e3767..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsLegislacaoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsLegislacaoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsLegislacaoData extends db.data.siprp_local.inner.HsLegislacao -{ - - public HsLegislacaoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsLegislacaoEmpresaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsLegislacaoEmpresaData.java deleted file mode 100644 index f4318e06..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsLegislacaoEmpresaData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsLegislacaoEmpresaData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsLegislacaoEmpresaData extends db.data.siprp_local.inner.HsLegislacaoEmpresa -{ - - public HsLegislacaoEmpresaData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsLegislacaoEstabelecimentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsLegislacaoEstabelecimentoData.java deleted file mode 100644 index d9564909..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsLegislacaoEstabelecimentoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsLegislacaoEstabelecimentoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsLegislacaoEstabelecimentoData extends db.data.siprp_local.inner.HsLegislacaoEstabelecimento -{ - - public HsLegislacaoEstabelecimentoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsMedidaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsMedidaData.java deleted file mode 100644 index 4b15e2bd..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsMedidaData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsMedidaData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsMedidaData extends db.data.siprp_local.inner.HsMedida -{ - - public HsMedidaData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsNormalizacaoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsNormalizacaoData.java deleted file mode 100644 index 32beaebd..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsNormalizacaoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsNormalizacaoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsNormalizacaoData extends db.data.siprp_local.inner.HsNormalizacao -{ - - public HsNormalizacaoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsNormalizacaoEmpresaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsNormalizacaoEmpresaData.java deleted file mode 100644 index b67fc3c1..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsNormalizacaoEmpresaData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsNormalizacaoEmpresaData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsNormalizacaoEmpresaData extends db.data.siprp_local.inner.HsNormalizacaoEmpresa -{ - - public HsNormalizacaoEmpresaData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsNormalizacaoEstabelecimentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsNormalizacaoEstabelecimentoData.java deleted file mode 100644 index 7b7ab0d6..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsNormalizacaoEstabelecimentoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsNormalizacaoEstabelecimentoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsNormalizacaoEstabelecimentoData extends db.data.siprp_local.inner.HsNormalizacaoEstabelecimento -{ - - public HsNormalizacaoEstabelecimentoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsPostoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsPostoData.java deleted file mode 100644 index 492a2a3b..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsPostoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsPostoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsPostoData extends db.data.siprp_local.inner.HsPosto -{ - - public HsPostoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsPostoEstabelecimentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsPostoEstabelecimentoData.java deleted file mode 100644 index 153c1971..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsPostoEstabelecimentoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsPostoEstabelecimentoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsPostoEstabelecimentoData extends db.data.siprp_local.inner.HsPostoEstabelecimento -{ - - public HsPostoEstabelecimentoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsPostoMedidaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsPostoMedidaData.java deleted file mode 100644 index 82c7505e..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsPostoMedidaData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsPostoMedidaData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsPostoMedidaData extends db.data.siprp_local.inner.HsPostoMedida -{ - - public HsPostoMedidaData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsPostoRiscoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsPostoRiscoData.java deleted file mode 100644 index 20a3ed92..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsPostoRiscoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsPostoRiscoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsPostoRiscoData extends db.data.siprp_local.inner.HsPostoRisco -{ - - public HsPostoRiscoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioAreaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioAreaData.java deleted file mode 100644 index c0be2955..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioAreaData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsRelatorioAreaData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsRelatorioAreaData extends db.data.siprp_local.inner.HsRelatorioArea -{ - - public HsRelatorioAreaData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioData.java deleted file mode 100644 index 16aba4b9..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsRelatorioData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsRelatorioData extends db.data.siprp_local.inner.HsRelatorio -{ - - public HsRelatorioData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioEquipamentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioEquipamentoData.java deleted file mode 100644 index 8e1a7fdd..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioEquipamentoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsRelatorioEquipamentoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsRelatorioEquipamentoData extends db.data.siprp_local.inner.HsRelatorioEquipamento -{ - - public HsRelatorioEquipamentoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioLegislacaoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioLegislacaoData.java deleted file mode 100644 index 34580b9d..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioLegislacaoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsRelatorioLegislacaoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsRelatorioLegislacaoData extends db.data.siprp_local.inner.HsRelatorioLegislacao -{ - - public HsRelatorioLegislacaoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioMedidaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioMedidaData.java deleted file mode 100644 index fb3ebf35..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioMedidaData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsRelatorioMedidaData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsRelatorioMedidaData extends db.data.siprp_local.inner.HsRelatorioMedida -{ - - public HsRelatorioMedidaData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioNormalizacaoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioNormalizacaoData.java deleted file mode 100644 index b8a07e57..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioNormalizacaoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsRelatorioNormalizacaoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsRelatorioNormalizacaoData extends db.data.siprp_local.inner.HsRelatorioNormalizacao -{ - - public HsRelatorioNormalizacaoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioPostoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioPostoData.java deleted file mode 100644 index 00e1d30d..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioPostoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsRelatorioPostoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsRelatorioPostoData extends db.data.siprp_local.inner.HsRelatorioPosto -{ - - public HsRelatorioPostoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioPostoMedidaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioPostoMedidaData.java deleted file mode 100644 index 23a9c63c..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioPostoMedidaData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsRelatorioPostoMedidaData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsRelatorioPostoMedidaData extends db.data.siprp_local.inner.HsRelatorioPostoMedida -{ - - public HsRelatorioPostoMedidaData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioPostoRiscoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioPostoRiscoData.java deleted file mode 100644 index 7fe89842..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioPostoRiscoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsRelatorioPostoRiscoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsRelatorioPostoRiscoData extends db.data.siprp_local.inner.HsRelatorioPostoRisco -{ - - public HsRelatorioPostoRiscoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioRiscoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioRiscoData.java deleted file mode 100644 index 5742674d..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRelatorioRiscoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsRelatorioRiscoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsRelatorioRiscoData extends db.data.siprp_local.inner.HsRelatorioRisco -{ - - public HsRelatorioRiscoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRiscoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRiscoData.java deleted file mode 100644 index 77292c22..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRiscoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsRiscoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsRiscoData extends db.data.siprp_local.inner.HsRisco -{ - - public HsRiscoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRiscoEmpresaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRiscoEmpresaData.java deleted file mode 100644 index c379a4d7..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRiscoEmpresaData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsRiscoEmpresaData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsRiscoEmpresaData extends db.data.siprp_local.inner.HsRiscoEmpresa -{ - - public HsRiscoEmpresaData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRiscoMedidaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRiscoMedidaData.java deleted file mode 100644 index 8c2f14f8..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRiscoMedidaData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsRiscoMedidaData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsRiscoMedidaData extends db.data.siprp_local.inner.HsRiscoMedida -{ - - public HsRiscoMedidaData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRiscoTemaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRiscoTemaData.java deleted file mode 100644 index 7c0c1468..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/HsRiscoTemaData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* HsRiscoTemaData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class HsRiscoTemaData extends db.data.siprp_local.inner.HsRiscoTema -{ - - public HsRiscoTemaData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/IdsData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/IdsData.java deleted file mode 100644 index 41b23b07..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/IdsData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* IdsData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class IdsData extends db.data.siprp_local.inner.Ids -{ - - public IdsData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ImageData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ImageData.java deleted file mode 100644 index 55daf68b..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/ImageData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* ImageData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class ImageData extends db.data.siprp_local.inner.Image -{ - - public ImageData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/LembretesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/LembretesData.java deleted file mode 100644 index 35b41584..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/LembretesData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* LembretesData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class LembretesData extends db.data.siprp_local.inner.Lembretes -{ - - public LembretesData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/LembretesTiposData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/LembretesTiposData.java deleted file mode 100644 index a88f1f75..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/LembretesTiposData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* LembretesTiposData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class LembretesTiposData extends db.data.siprp_local.inner.LembretesTipos -{ - - public LembretesTiposData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MarcacoesEmpresaData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MarcacoesEmpresaData.java deleted file mode 100644 index b4833a64..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MarcacoesEmpresaData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* MarcacoesEmpresaData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class MarcacoesEmpresaData extends db.data.siprp_local.inner.MarcacoesEmpresa -{ - - public MarcacoesEmpresaData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MarcacoesEstabelecimentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MarcacoesEstabelecimentoData.java deleted file mode 100644 index 7082c58f..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MarcacoesEstabelecimentoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* MarcacoesEstabelecimentoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class MarcacoesEstabelecimentoData extends db.data.siprp_local.inner.MarcacoesEstabelecimento -{ - - public MarcacoesEstabelecimentoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MarcacoesGruposRealizadosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MarcacoesGruposRealizadosData.java deleted file mode 100644 index d4f509be..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MarcacoesGruposRealizadosData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* MarcacoesGruposRealizadosData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class MarcacoesGruposRealizadosData extends db.data.siprp_local.inner.MarcacoesGruposRealizados -{ - - public MarcacoesGruposRealizadosData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MarcacoesTecnicosHstData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MarcacoesTecnicosHstData.java deleted file mode 100644 index 52776b28..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MarcacoesTecnicosHstData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* MarcacoesTecnicosHstData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class MarcacoesTecnicosHstData extends db.data.siprp_local.inner.MarcacoesTecnicosHst -{ - - public MarcacoesTecnicosHstData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MarcacoesTrabalhadorData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MarcacoesTrabalhadorData.java deleted file mode 100644 index 347d6683..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MarcacoesTrabalhadorData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* MarcacoesTrabalhadorData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class MarcacoesTrabalhadorData extends db.data.siprp_local.inner.MarcacoesTrabalhador -{ - - public MarcacoesTrabalhadorData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MarcacoesTrabalhadorEstadosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MarcacoesTrabalhadorEstadosData.java deleted file mode 100644 index 4ec3e0d1..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MarcacoesTrabalhadorEstadosData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* MarcacoesTrabalhadorEstadosData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class MarcacoesTrabalhadorEstadosData extends db.data.siprp_local.inner.MarcacoesTrabalhadorEstados -{ - - public MarcacoesTrabalhadorEstadosData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MedVacinaTipoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MedVacinaTipoData.java deleted file mode 100644 index 47d90f50..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MedVacinaTipoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* 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(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MedicosData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MedicosData.java deleted file mode 100644 index 01e45d62..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/MedicosData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* MedicosData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class MedicosData extends db.data.siprp_local.inner.Medicos -{ - - public MedicosData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PaisesContinentesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PaisesContinentesData.java deleted file mode 100644 index b08e4856..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PaisesContinentesData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* PaisesContinentesData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class PaisesContinentesData extends db.data.siprp_local.inner.PaisesContinentes -{ - - public PaisesContinentesData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PaisesData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PaisesData.java deleted file mode 100644 index 9c381def..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PaisesData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* PaisesData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class PaisesData extends db.data.siprp_local.inner.Paises -{ - - public PaisesData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PesDocumentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PesDocumentoData.java deleted file mode 100644 index 5ff276bf..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PesDocumentoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* PesDocumentoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class PesDocumentoData extends db.data.siprp_local.inner.PesDocumento -{ - - public PesDocumentoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PesDocumentoTipoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PesDocumentoTipoData.java deleted file mode 100644 index 6a60e193..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PesDocumentoTipoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* PesDocumentoTipoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class PesDocumentoTipoData extends db.data.siprp_local.inner.PesDocumentoTipo -{ - - public PesDocumentoTipoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PesPessoaDocumentoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PesPessoaDocumentoData.java deleted file mode 100644 index c693287e..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PesPessoaDocumentoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* PesPessoaDocumentoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class PesPessoaDocumentoData extends db.data.siprp_local.inner.PesPessoaDocumento -{ - - public PesPessoaDocumentoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PrestadoresData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PrestadoresData.java deleted file mode 100644 index 7d855c68..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PrestadoresData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* PrestadoresData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class PrestadoresData extends db.data.siprp_local.inner.Prestadores -{ - - public PrestadoresData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PrestadoresGruposProtocoloData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PrestadoresGruposProtocoloData.java deleted file mode 100644 index 46ad4cd2..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PrestadoresGruposProtocoloData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* PrestadoresGruposProtocoloData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class PrestadoresGruposProtocoloData extends db.data.siprp_local.inner.PrestadoresGruposProtocolo -{ - - public PrestadoresGruposProtocoloData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PrtElementosProtocoloData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PrtElementosProtocoloData.java deleted file mode 100644 index a90aba18..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PrtElementosProtocoloData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* PrtElementosProtocoloData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class PrtElementosProtocoloData extends db.data.siprp_local.inner.PrtElementosProtocolo -{ - - public PrtElementosProtocoloData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PrtGruposProtocoloData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PrtGruposProtocoloData.java deleted file mode 100644 index 0789d2c4..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PrtGruposProtocoloData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* PrtGruposProtocoloData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class PrtGruposProtocoloData extends db.data.siprp_local.inner.PrtGruposProtocolo -{ - - public PrtGruposProtocoloData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PrtTiposElementosProtocoloData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PrtTiposElementosProtocoloData.java deleted file mode 100644 index b44b7da1..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/PrtTiposElementosProtocoloData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* PrtTiposElementosProtocoloData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class PrtTiposElementosProtocoloData extends db.data.siprp_local.inner.PrtTiposElementosProtocolo -{ - - public PrtTiposElementosProtocoloData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TiposExamesCompData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TiposExamesCompData.java deleted file mode 100644 index bcfd5279..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TiposExamesCompData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* TiposExamesCompData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class TiposExamesCompData extends db.data.siprp_local.inner.TiposExamesComp -{ - - public TiposExamesCompData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresConsultasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresConsultasData.java deleted file mode 100644 index 698423e0..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresConsultasData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* TrabalhadoresConsultasData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class TrabalhadoresConsultasData extends db.data.siprp_local.inner.TrabalhadoresConsultas -{ - - public TrabalhadoresConsultasData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresConsultasDatasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresConsultasDatasData.java deleted file mode 100644 index 126abd92..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresConsultasDatasData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* TrabalhadoresConsultasDatasData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class TrabalhadoresConsultasDatasData extends db.data.siprp_local.inner.TrabalhadoresConsultasDatas -{ - - public TrabalhadoresConsultasDatasData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresData.java deleted file mode 100644 index 5abfcdb3..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* TrabalhadoresData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class TrabalhadoresData extends db.data.siprp_local.inner.Trabalhadores -{ - - public TrabalhadoresData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresEcdData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresEcdData.java deleted file mode 100644 index 3096b8ed..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresEcdData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* TrabalhadoresEcdData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class TrabalhadoresEcdData extends db.data.siprp_local.inner.TrabalhadoresEcd -{ - - public TrabalhadoresEcdData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresEcdsAnaliseData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresEcdsAnaliseData.java deleted file mode 100644 index ebe19019..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresEcdsAnaliseData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* TrabalhadoresEcdsAnaliseData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class TrabalhadoresEcdsAnaliseData extends db.data.siprp_local.inner.TrabalhadoresEcdsAnalise -{ - - public TrabalhadoresEcdsAnaliseData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresEcdsData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresEcdsData.java deleted file mode 100644 index 1e37f77b..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresEcdsData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* TrabalhadoresEcdsData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class TrabalhadoresEcdsData extends db.data.siprp_local.inner.TrabalhadoresEcds -{ - - public TrabalhadoresEcdsData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresEcdsDatasData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresEcdsDatasData.java deleted file mode 100644 index dca02f91..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresEcdsDatasData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* TrabalhadoresEcdsDatasData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class TrabalhadoresEcdsDatasData extends db.data.siprp_local.inner.TrabalhadoresEcdsDatas -{ - - public TrabalhadoresEcdsDatasData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresEcdsDatasEmailsData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresEcdsDatasEmailsData.java deleted file mode 100644 index b5e99d45..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresEcdsDatasEmailsData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* TrabalhadoresEcdsDatasEmailsData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class TrabalhadoresEcdsDatasEmailsData extends db.data.siprp_local.inner.TrabalhadoresEcdsDatasEmails -{ - - public TrabalhadoresEcdsDatasEmailsData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresFichasAptidaoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresFichasAptidaoData.java deleted file mode 100644 index 54b190dd..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresFichasAptidaoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* TrabalhadoresFichasAptidaoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class TrabalhadoresFichasAptidaoData extends db.data.siprp_local.inner.TrabalhadoresFichasAptidao -{ - - public TrabalhadoresFichasAptidaoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresProcessoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresProcessoData.java deleted file mode 100644 index 3defc1fe..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/TrabalhadoresProcessoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* TrabalhadoresProcessoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class TrabalhadoresProcessoData extends db.data.siprp_local.inner.TrabalhadoresProcesso -{ - - public TrabalhadoresProcessoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/VersaoData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/VersaoData.java deleted file mode 100644 index 5966e58b..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/VersaoData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* VersaoData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class VersaoData extends db.data.siprp_local.inner.Versao -{ - - public VersaoData() - { - super(); - } -} diff --git a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/VersionData.java b/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/VersionData.java deleted file mode 100644 index 80068f97..00000000 --- a/branches/NetbeansIndependency/PlanosActuacao/src/java/db/data/siprp_local/outer/VersionData.java +++ /dev/null @@ -1,18 +0,0 @@ -/* -* VersionData.java -* -* Generated by com.evutils.codegen.EntityObjectGenerator -* -* Edit at will -*/ -package db.data.siprp_local.outer; - - -public final class VersionData extends db.data.siprp_local.inner.Version -{ - - public VersionData() - { - super(); - } -}

Encontra-se disponível em www.siprp.com o Plano de Actuação referente à auditoria de "; mail_text += "Avaliação de Riscos Laborais realizada no passado dia " + p.getData_visita_str() + " para que possa "; @@ -2115,7 +2115,7 @@ public class EditarPlano extends AbstractPageBean case Global.FASE_DNS_PARECER: tipo_utilizador = Global.DIRECTOR_NACIONAL_SEGURANCA; - assunto = "Plano de Actuação da Avaliação de Riscos de " + p.getData_visita_str() + " - " + p.getNome_estabelecimento(); + assunto = "Plano de Actua��o da Avalia��o de Riscos de " + p.getData_visita_str() + " - " + p.getNome_estabelecimento(); mail_text = "