diff --git a/trunk/SIPRPSoft/.classpath b/trunk/SIPRPSoft/.classpath
index b8a6e6cf..84ce8fd2 100644
--- a/trunk/SIPRPSoft/.classpath
+++ b/trunk/SIPRPSoft/.classpath
@@ -11,7 +11,7 @@
-
+
@@ -26,12 +26,13 @@
-
+
+
diff --git a/trunk/SIPRPSoft/ant/common/evo-app-build-common.xml b/trunk/SIPRPSoft/ant/common/evo-app-build-common.xml
new file mode 100644
index 00000000..8b7488ea
--- /dev/null
+++ b/trunk/SIPRPSoft/ant/common/evo-app-build-common.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/SIPRPSoft/ant/common/evo-app-build-obfuscate-common.xml b/trunk/SIPRPSoft/ant/common/evo-app-build-obfuscate-common.xml
new file mode 100644
index 00000000..6bae8003
--- /dev/null
+++ b/trunk/SIPRPSoft/ant/common/evo-app-build-obfuscate-common.xml
@@ -0,0 +1,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ -printseeds
+ -verbose
+ -dontskipnonpubliclibraryclasses
+
+ -keepclasseswithmembers public class * {
+ public static void main(java.lang.String[]);
+ }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/SIPRPSoft/ant/common/evo-app-compile-common.xml b/trunk/SIPRPSoft/ant/common/evo-app-compile-common.xml
new file mode 100644
index 00000000..a7b6edd2
--- /dev/null
+++ b/trunk/SIPRPSoft/ant/common/evo-app-compile-common.xml
@@ -0,0 +1,89 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/SIPRPSoft/ant/common/evo-app-deploy-common.xml b/trunk/SIPRPSoft/ant/common/evo-app-deploy-common.xml
new file mode 100644
index 00000000..81e43486
--- /dev/null
+++ b/trunk/SIPRPSoft/ant/common/evo-app-deploy-common.xml
@@ -0,0 +1,130 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Deploy cancelled
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/SIPRPSoft/ant/common/evo-app-load-properties.xml b/trunk/SIPRPSoft/ant/common/evo-app-load-properties.xml
new file mode 100644
index 00000000..219e80f0
--- /dev/null
+++ b/trunk/SIPRPSoft/ant/common/evo-app-load-properties.xml
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/SIPRPSoft/ant/common/evo-app-multiple-client-common.xml b/trunk/SIPRPSoft/ant/common/evo-app-multiple-client-common.xml
new file mode 100644
index 00000000..c8db9ba9
--- /dev/null
+++ b/trunk/SIPRPSoft/ant/common/evo-app-multiple-client-common.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/SIPRPSoft/ant/evo-app-build-java5.xml b/trunk/SIPRPSoft/ant/evo-app-build-java5.xml
new file mode 100644
index 00000000..24157b47
--- /dev/null
+++ b/trunk/SIPRPSoft/ant/evo-app-build-java5.xml
@@ -0,0 +1,113 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/SIPRPSoft/ant/evo-app-build-jdo.xml b/trunk/SIPRPSoft/ant/evo-app-build-jdo.xml
new file mode 100644
index 00000000..2c947be9
--- /dev/null
+++ b/trunk/SIPRPSoft/ant/evo-app-build-jdo.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/SIPRPSoft/ant/evo-app-build-obfuscate-jdo.xml b/trunk/SIPRPSoft/ant/evo-app-build-obfuscate-jdo.xml
new file mode 100644
index 00000000..65193875
--- /dev/null
+++ b/trunk/SIPRPSoft/ant/evo-app-build-obfuscate-jdo.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/SIPRPSoft/ant/evo-app-build-obfuscate.xml b/trunk/SIPRPSoft/ant/evo-app-build-obfuscate.xml
new file mode 100644
index 00000000..46a29690
--- /dev/null
+++ b/trunk/SIPRPSoft/ant/evo-app-build-obfuscate.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/SIPRPSoft/ant/evo-app-build.xml b/trunk/SIPRPSoft/ant/evo-app-build.xml
new file mode 100644
index 00000000..2fd3da43
--- /dev/null
+++ b/trunk/SIPRPSoft/ant/evo-app-build.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/SIPRPSoft/ant/evo-app-multiple-client-build.xml b/trunk/SIPRPSoft/ant/evo-app-multiple-client-build.xml
new file mode 100644
index 00000000..9d6f0cc3
--- /dev/null
+++ b/trunk/SIPRPSoft/ant/evo-app-multiple-client-build.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/SIPRPSoft/ant/evo-app-multiple-client-obfuscated-build.xml b/trunk/SIPRPSoft/ant/evo-app-multiple-client-obfuscated-build.xml
new file mode 100644
index 00000000..06a1ac8e
--- /dev/null
+++ b/trunk/SIPRPSoft/ant/evo-app-multiple-client-obfuscated-build.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/SIPRPSoft/ant/evo-app-ws-client-build.xml b/trunk/SIPRPSoft/ant/evo-app-ws-client-build.xml
new file mode 100644
index 00000000..a499a031
--- /dev/null
+++ b/trunk/SIPRPSoft/ant/evo-app-ws-client-build.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/SIPRPSoft/ant/evo-library-build.xml b/trunk/SIPRPSoft/ant/evo-library-build.xml
new file mode 100644
index 00000000..39a2bc19
--- /dev/null
+++ b/trunk/SIPRPSoft/ant/evo-library-build.xml
@@ -0,0 +1,21 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/SIPRPSoft/build.xml b/trunk/SIPRPSoft/build.xml
new file mode 100644
index 00000000..5a5e6254
--- /dev/null
+++ b/trunk/SIPRPSoft/build.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/trunk/SIPRPSoft/lib.tools/ant-classloadertask.jar b/trunk/SIPRPSoft/lib.tools/ant-classloadertask.jar
new file mode 100644
index 00000000..d2f58d9f
Binary files /dev/null and b/trunk/SIPRPSoft/lib.tools/ant-classloadertask.jar differ
diff --git a/trunk/SIPRPSoft/lib.tools/asm-all-3.1.jar b/trunk/SIPRPSoft/lib.tools/asm-all-3.1.jar
new file mode 100644
index 00000000..5f37af52
Binary files /dev/null and b/trunk/SIPRPSoft/lib.tools/asm-all-3.1.jar differ
diff --git a/trunk/SIPRPSoft/lib.tools/datanucleus-enhancer-1.1.4.jar b/trunk/SIPRPSoft/lib.tools/datanucleus-enhancer-1.1.4.jar
new file mode 100644
index 00000000..6f7dd6c3
Binary files /dev/null and b/trunk/SIPRPSoft/lib.tools/datanucleus-enhancer-1.1.4.jar differ
diff --git a/trunk/SIPRPSoft/lib.tools/evo-ant.jar b/trunk/SIPRPSoft/lib.tools/evo-ant.jar
new file mode 100644
index 00000000..4d3c8dc3
Binary files /dev/null and b/trunk/SIPRPSoft/lib.tools/evo-ant.jar differ
diff --git a/trunk/SIPRPSoft/lib.tools/jaxen-1.1.1.jar b/trunk/SIPRPSoft/lib.tools/jaxen-1.1.1.jar
new file mode 100644
index 00000000..b6336311
Binary files /dev/null and b/trunk/SIPRPSoft/lib.tools/jaxen-1.1.1.jar differ
diff --git a/trunk/SIPRPSoft/lib.tools/jdom.jar b/trunk/SIPRPSoft/lib.tools/jdom.jar
new file mode 100644
index 00000000..288e64cb
Binary files /dev/null and b/trunk/SIPRPSoft/lib.tools/jdom.jar differ
diff --git a/trunk/SIPRPSoft/lib.tools/jsch-0.1.41.jar b/trunk/SIPRPSoft/lib.tools/jsch-0.1.41.jar
new file mode 100644
index 00000000..eb1e7647
Binary files /dev/null and b/trunk/SIPRPSoft/lib.tools/jsch-0.1.41.jar differ
diff --git a/trunk/SIPRPSoft/lib.tools/proguard.jar b/trunk/SIPRPSoft/lib.tools/proguard.jar
new file mode 100644
index 00000000..3a9aebcf
Binary files /dev/null and b/trunk/SIPRPSoft/lib.tools/proguard.jar differ
diff --git a/trunk/SIPRPSoft/lib.tools/svnClientAdapter.jar b/trunk/SIPRPSoft/lib.tools/svnClientAdapter.jar
new file mode 100644
index 00000000..ed37ba46
Binary files /dev/null and b/trunk/SIPRPSoft/lib.tools/svnClientAdapter.jar differ
diff --git a/trunk/SIPRPSoft/lib.tools/svnant.jar b/trunk/SIPRPSoft/lib.tools/svnant.jar
new file mode 100644
index 00000000..af52be0d
Binary files /dev/null and b/trunk/SIPRPSoft/lib.tools/svnant.jar differ
diff --git a/trunk/SIPRPSoft/lib.tools/svnjavahl.jar b/trunk/SIPRPSoft/lib.tools/svnjavahl.jar
new file mode 100644
index 00000000..71873057
Binary files /dev/null and b/trunk/SIPRPSoft/lib.tools/svnjavahl.jar differ
diff --git a/trunk/SIPRPSoft/lib/evolute.jar b/trunk/SIPRPSoft/lib/evolute.jar
index 122596d7..e58c1ce5 100644
Binary files a/trunk/SIPRPSoft/lib/evolute.jar and b/trunk/SIPRPSoft/lib/evolute.jar differ
diff --git a/trunk/SIPRPSoft/lib/postgresql-8.0-317.jdbc3.jar b/trunk/SIPRPSoft/lib/postgresql-8.0-317.jdbc3.jar
deleted file mode 100755
index 7ed63133..00000000
Binary files a/trunk/SIPRPSoft/lib/postgresql-8.0-317.jdbc3.jar and /dev/null differ
diff --git a/trunk/SIPRPSoft/lib/postgresql-8.4-701.jdbc4.jar b/trunk/SIPRPSoft/lib/postgresql-8.4-701.jdbc4.jar
new file mode 100644
index 00000000..e21beec5
Binary files /dev/null and b/trunk/SIPRPSoft/lib/postgresql-8.4-701.jdbc4.jar differ
diff --git a/trunk/SIPRPSoft/lib/swingx.jar b/trunk/SIPRPSoft/lib/swingx.jar
new file mode 100644
index 00000000..dec67850
Binary files /dev/null and b/trunk/SIPRPSoft/lib/swingx.jar differ
diff --git a/trunk/SIPRPSoft/properties/app.properties b/trunk/SIPRPSoft/properties/app.properties
new file mode 100644
index 00000000..5cf730b6
--- /dev/null
+++ b/trunk/SIPRPSoft/properties/app.properties
@@ -0,0 +1,63 @@
+#APP level
+app.appName = SIPRPSoft
+app.main-class = siprp.Main
+app.main = siprp.Main
+#app.max.mem=512M
+#app.run.args=test 1 2 3
+
+#app.resources.j2se.version = 1.0+
+#app.resources.j2se.initial-heap-size = 4m
+#app.resources.j2se.max-heap-size = 8m
+
+#app.ws.dest.package=com.evolute.test-project.stubs
+#app.ws.wsdl.url=https://www.evolute.pt/test-project/test-endpoint?wsdl
+#app.ws.wsdl.url.protocol=https
+#app.ws.wsdl.url.host=www.evolute.pt
+#app.ws.wsdl.url.port=443
+#app.ws.wsdl.url.path=/test-project/test-endpoint?wsdl
+
+#app.ssl.truststore.file=jssecacerts
+#app.ssl.truststore.pass=changeit
+
+#JNLP level
+#jnlp.app.appName = test-project
+#jnlp.information.title = jnlp-Test Project
+#jnlp.resources.j2se.version = 1.1+
+#jnlp.test.url=http://www.evolute.pt/~software/test-project
+
+
+#JNLP + PRODUCTION level
+#jnlp.production.app.main-class = !com.evolute.test-project.TestProject2
+#jnlp.production.app.appName = test-project
+#jnlp.production.url=http://www.evolute.pt/~software/test-project
+
+#jnlp.production.information.title = prod-Test Project
+#jnlp.production.information.vendor = prod-Evolute Lda
+#jnlp.production.information.description = prod-Tester Project for JNLP Generator
+#jnlp.production.information.description.short = prod-JNLP Tester
+#jnlp.production.information.icon = prod-logo.png
+
+#jnlp.production.resources.j2se.version = 1.6.0+
+#jnlp.production.resources.j2se.initial-heap-size = 64m
+#jnlp.production.resources.j2se.max-heap-size = 512m
+
+#jnlp.production.resources.property.jnlp.packEnabled = true
+#jnlp.production.resources.property.apple.laf.useScreenMenuBar = true
+#jnlp.production.resources.property.swing.defaultlaf = org.jvnet.substance.skin.SubstanceRavenGraphiteGlassLookAndFeel
+#jnlp.production.resources.property.evolute.ui.overridePaint = false
+
+
+#JNLP + TEST level
+#jnlp.test.app.main-class = com.evolute.test-project.TestProject3
+#jnlp.test.app.appName = project-test
+#jnlp.test.url=http://www.evolute.pt/~software/versoes_teste/test-project
+
+#jnlp.test.information.title = test-Test Project
+#jnlp.test.information.vendor = test-Evolute Lda
+#jnlp.test.information.description = test-Tester Project for JNLP Generator
+#jnlp.test.information.description.short = test-JNLP Tester
+#jnlp.test.information.icon = test-logo.png
+
+#jnlp.test.resources.j2se.version = 1.6.0+
+#jnlp.test.resources.j2se.initial-heap-size = 64m
+#jnlp.test.resources.j2se.max-heap-size = 512m
diff --git a/trunk/SIPRPSoft/properties/codegen.xml b/trunk/SIPRPSoft/properties/codegen.xml
new file mode 100644
index 00000000..6d6006d3
--- /dev/null
+++ b/trunk/SIPRPSoft/properties/codegen.xml
@@ -0,0 +1,399 @@
+
+
+
+ jdbc:postgresql://www.evolute.pt:5436/siprp_local_3
+ postgres
+ Typein
+
+ /home/tsimao/workspace/SIPRPSoft/src
+ siprp.data.inner
+ siprp.data.outer
+ siprp.data.BaseObject
+ package.xml
+
+ actualizacao
+ Actualizacao
+
+
+
+
+ contactos
+ Contactos
+
+
+
+ ecd_oficial
+ EcdOficial
+
+
+
+ email_plano_de_actuacao
+ EmailPlanoDeActuacao
+
+
+
+ empresas
+ Empresas
+
+
+
+
+ estabelecimentos
+ Estabelecimentos
+
+
+
+ etiquetas
+ Etiquetas
+
+
+
+
+ exames_perfis
+ ExamesPerfis
+
+
+
+ exames_portaria
+ ExamesPortaria
+
+
+
+ historico_estabelecimento
+ HistoricoEstabelecimento
+ siprp.data.Historico
+
+
+
+
+ hs_email_empresa
+ HsEmailEmpresa
+
+
+
+ hs_email_estabelecimento
+ HsEmailEstabelecimento
+
+
+
+ hs_equipamento
+ HsEquipamento
+
+
+
+ hs_legislacao
+ HsLegislacao
+
+
+
+ hs_legislacao_categoria
+ HsLegislacaoCategoria
+
+
+
+ hs_legislacao_empresa
+ HsLegislacaoEmpresa
+
+
+
+ hs_legislacao_estabelecimento
+ HsLegislacaoEstabelecimento
+
+
+
+ hs_medida
+ HsMedida
+
+
+
+ hs_normalizacao
+ HsNormalizacao
+
+
+
+ hs_normalizacao_empresa
+ HsNormalizacaoEmpresa
+
+
+
+ hs_normalizacao_estabelecimento
+ HsNormalizacaoEstabelecimento
+
+
+
+
+ hs_posto_estabelecimento
+ HsPostoEstabelecimento
+
+
+
+ hs_posto_medida
+ HsPostoMedida
+
+
+
+ hs_posto_risco
+ HsPostoRisco
+
+
+
+ hs_relatorio
+ HsRelatorio
+
+
+
+ hs_relatorio_area
+ HsRelatorioArea
+
+
+
+ hs_relatorio_equipamento
+ HsRelatorioEquipamento
+
+
+
+ hs_relatorio_legislacao
+ HsRelatorioLegislacao
+
+
+
+ hs_relatorio_medida
+ HsRelatorioMedida
+
+
+
+ hs_relatorio_normalizacao
+ HsRelatorioNormalizacao
+
+
+
+ hs_relatorio_posto
+ HsRelatorioPosto
+
+
+
+ hs_relatorio_posto_medida
+ HsRelatorioPostoMedida
+
+
+
+ hs_relatorio_posto_risco
+ HsRelatorioPostoRisco
+
+
+
+ hs_relatorio_risco
+ HsRelatorioRisco
+
+
+
+ hs_relatorio_risco_valor_qualitativo
+ HsRelatorioRiscoValorQualitativo
+
+
+
+
+ hs_risco_empresa
+ HsRiscoEmpresa
+
+
+
+ hs_risco_medida
+ HsRiscoMedida
+
+
+
+ hs_risco_tema
+ HsRiscoTema
+
+
+
+
+
+ lembretes
+ Lembretes
+
+
+
+ lembretes_tipos
+ LembretesTipos
+
+
+
+ marcacoes_empresa
+ MarcacoesEmpresa
+ siprp.data.Marcacao
+
+
+ marcacoes_estabelecimento
+ MarcacoesEstabelecimento
+ siprp.data.Marcacao
+
+
+ marcacoes_grupos_realizados
+ MarcacoesGruposRealizados
+
+
+
+ marcacoes_tecnicos_hst
+ MarcacoesTecnicosHst
+
+
+
+ marcacoes_trabalhador
+ MarcacoesTrabalhador
+ siprp.data.Marcacao
+
+
+ marcacoes_trabalhador_estados
+ MarcacoesTrabalhadorEstados
+
+
+
+
+ prestadores
+ Prestadores
+
+
+
+ prestadores_grupos_protocolo
+ PrestadoresGruposProtocolo
+
+
+
+ prt_elementos_protocolo
+ PrtElementosProtocolo
+
+
+
+ prt_grupos_protocolo
+ PrtGruposProtocolo
+
+
+
+ prt_tipos_elementos_protocolo
+ PrtTiposElementosProtocolo
+
+
+
+ tipos_exames_comp
+ TiposExamesComp
+
+
+
+ trabalhadores
+ Trabalhadores
+
+
+
+ trabalhadores_consultas
+ TrabalhadoresConsultas
+
+
+
+ trabalhadores_consultas_datas
+ TrabalhadoresConsultasDatas
+
+
+
+ trabalhadores_consultas_datas_emails
+ TrabalhadoresConsultasDatasEmails
+
+
+
+ trabalhadores_consultas_datas_observacoes
+ TrabalhadoresConsultasDatasObservacoes
+
+
+
+ trabalhadores_ecd
+ TrabalhadoresEcd
+
+
+
+ trabalhadores_ecds
+ TrabalhadoresEcds
+
+
+
+ trabalhadores_ecds_analise
+ TrabalhadoresEcdsAnalise
+
+
+
+ trabalhadores_ecds_datas
+ TrabalhadoresEcdsDatas
+
+
+
+ trabalhadores_ecds_datas_emails
+ TrabalhadoresEcdsDatasEmails
+
+
+
+ trabalhadores_ecds_datas_observacoes
+ TrabalhadoresEcdsDatasObservacoes
+
+
+
+ trabalhadores_fichas_aptidao
+ TrabalhadoresFichasAptidao
+
+
+
+ trabalhadores_processo
+ TrabalhadoresProcesso
+
+
+
+
+
+
diff --git a/trunk/SIPRPSoft/properties/project.properties b/trunk/SIPRPSoft/properties/project.properties
new file mode 100644
index 00000000..5d747fdc
--- /dev/null
+++ b/trunk/SIPRPSoft/properties/project.properties
@@ -0,0 +1,12 @@
+#app.jar.name=
+#jnlp.dir=
+#jnlp.extensions.dir=
+#app.deploy.path=
+#app.deploy.jnlp.path=
+#app.version.file=
+#app.version.comment=
+#app.java.version=1.6
+#app.deploy.server=www.evolute.pt
+#app.deploy.production.script=/home/software/auto_deploy.sh
+#app.deploy.test.script=/home/software/auto_test_deploy.sh
+#deploy.prepare.script=/home/software/auto_prepare_deploy.sh
diff --git a/trunk/SIPRPSoft/src/com/evolute/adt/OrderedMap.java b/trunk/SIPRPSoft/src/com/evolute/adt/OrderedMap.java
deleted file mode 100644
index b33585a4..00000000
--- a/trunk/SIPRPSoft/src/com/evolute/adt/OrderedMap.java
+++ /dev/null
@@ -1,342 +0,0 @@
-package com.evolute.adt;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Vector;
-
-public class OrderedMap implements Iterable
-{
- private static final long serialVersionUID = 1L;
-
- private Vector order = new Vector();
-
- private HashMap> map = new HashMap>();
-
- public OrderedMap()
- {
- }
-
- public OrderedMap(Collection allPrestadores)
- {
- Iterator iterator = allPrestadores.iterator();
- while( iterator.hasNext() )
- {
- KeyClass value = iterator.next();
- this.putLast( value, value );
- }
- }
-
- public List