From ac6513a41e02ec09fe8d9c8e4c2f2ee18fc7b2fd Mon Sep 17 00:00:00 2001 From: "avelino.navarro" Date: Fri, 2 Oct 2026 13:36:08 +0200 Subject: [PATCH] revert 6d857d7250d79c63c3f3c6ec3d2c5e4d1eb13c45 revert Primero --- .../dam2/aadd/anp/dao/IContinenteDAO.java | 11 ----- .../aadd/anp/dao/impl/ContinenteDaoCsv.java | 41 ------------------- .../dam2/aadd/anp/dao/impl/PaisDaoText.java | 17 ++++---- .../dam2/aadd/anp/model/Continente.java | 4 -- org/palomafp/dam2/aadd/anp/model/Pais.java | 9 ++-- 5 files changed, 15 insertions(+), 67 deletions(-) delete mode 100644 org/palomafp/dam2/aadd/anp/dao/IContinenteDAO.java delete mode 100644 org/palomafp/dam2/aadd/anp/dao/impl/ContinenteDaoCsv.java diff --git a/org/palomafp/dam2/aadd/anp/dao/IContinenteDAO.java b/org/palomafp/dam2/aadd/anp/dao/IContinenteDAO.java deleted file mode 100644 index c3f10cd..0000000 --- a/org/palomafp/dam2/aadd/anp/dao/IContinenteDAO.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.palomafp.dam2.aadd.anp.dao; - -import java.util.List; - -import org.palomafp.dam2.aadd.anp.model.Continente; - -public interface IContinenteDAO { - - Continente obtenerContinente(String codigoContinente); - -} diff --git a/org/palomafp/dam2/aadd/anp/dao/impl/ContinenteDaoCsv.java b/org/palomafp/dam2/aadd/anp/dao/impl/ContinenteDaoCsv.java deleted file mode 100644 index 8fab8a6..0000000 --- a/org/palomafp/dam2/aadd/anp/dao/impl/ContinenteDaoCsv.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.palomafp.dam2.aadd.anp.dao.impl; - -import java.io.BufferedReader; -import java.io.FileReader; -import java.io.IOException; - -import org.palomafp.dam2.aadd.anp.dao.IContinenteDAO; -import org.palomafp.dam2.aadd.anp.model.Continente; - -public class ContinenteDaoCsv implements IContinenteDAO { - - private static final String FICHERO = "C:\\Users\\PC GAMING\\aadd\\fic05\\informacion_continentes.csv"; - - @Override - public Continente obtenerContinente(String codigoContinente) { - - try (BufferedReader br = new BufferedReader(new FileReader(FICHERO))) { - - br.readLine(); - - String linea; - - while ((linea = br.readLine()) != null) { - - String[] datos = linea.split("#"); - - String codigo = datos[1].trim(); - String nombre = datos[2].trim(); - - if (codigo.equals(codigoContinente)) { - return new Continente(codigo, nombre); - } - } - - } catch (IOException e) { - e.printStackTrace(); - } - - return null; - } -} \ No newline at end of file diff --git a/org/palomafp/dam2/aadd/anp/dao/impl/PaisDaoText.java b/org/palomafp/dam2/aadd/anp/dao/impl/PaisDaoText.java index 2c994b1..14d9cc8 100644 --- a/org/palomafp/dam2/aadd/anp/dao/impl/PaisDaoText.java +++ b/org/palomafp/dam2/aadd/anp/dao/impl/PaisDaoText.java @@ -8,9 +8,9 @@ import org.palomafp.dam2.aadd.anp.model.*; public class PaisDaoText implements IPaisDAO { - private static final String ruta = - "C:\\Users\\PC GAMING\\aadd\\fic05\\informacion_paises.txt"; - + private static final String ruta = "C:\\Users\\PC GAMING\\aadd\\fic03\\informacion_paises.txt"; + + @Override public Pais obtenerPais(int identificadorPais) { @@ -45,6 +45,8 @@ public class PaisDaoText implements IPaisDAO { return null; } + + @Override public List obtenerPaisesPorContinente( String codigoContinente) { @@ -85,6 +87,8 @@ public class PaisDaoText implements IPaisDAO { return paises; } + + private Pais convertirLineaAPais(String linea) { linea = linea.replace("\"", ""); @@ -99,11 +103,8 @@ public class PaisDaoText implements IPaisDAO { String capital = datos[3].trim(); - // DAO encargado de obtener los datos del continente - IContinenteDAO continenteDAO = new ContinenteDaoCsv(); - Continente continente = - continenteDAO.obtenerContinente(codigoContinente); + new Continente(codigoContinente, nombre); return new Pais( id, @@ -112,4 +113,4 @@ public class PaisDaoText implements IPaisDAO { continente ); } -} \ No newline at end of file +} diff --git a/org/palomafp/dam2/aadd/anp/model/Continente.java b/org/palomafp/dam2/aadd/anp/model/Continente.java index 78e8fbd..c02d416 100644 --- a/org/palomafp/dam2/aadd/anp/model/Continente.java +++ b/org/palomafp/dam2/aadd/anp/model/Continente.java @@ -9,10 +9,6 @@ public class Continente { this.codigoContinente = codigoContinente; this.nombre = nombre; } - - public Continente() { - - } public String getCodigoContinente() { return codigoContinente; diff --git a/org/palomafp/dam2/aadd/anp/model/Pais.java b/org/palomafp/dam2/aadd/anp/model/Pais.java index ab22b6e..7dd4d46 100644 --- a/org/palomafp/dam2/aadd/anp/model/Pais.java +++ b/org/palomafp/dam2/aadd/anp/model/Pais.java @@ -51,9 +51,12 @@ public class Pais { @Override public String toString() { - return nombre + " (" + id + "), con capital en " + capital - + " pertenece a " + continente.getNombre() - + " (" + continente.getCodigoContinente() + ")"; + return "Pais{" + + "id=" + id + + ", nombre = '" + nombre + '\'' + + ", capital = '" + capital + '\'' + "," + + continente + + '}'; } } \ No newline at end of file