diff --git a/org/palomafp/dam2/aadd/anp/dao/IContinenteDAO.java b/org/palomafp/dam2/aadd/anp/dao/IContinenteDAO.java new file mode 100644 index 0000000..c3f10cd --- /dev/null +++ b/org/palomafp/dam2/aadd/anp/dao/IContinenteDAO.java @@ -0,0 +1,11 @@ +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 new file mode 100644 index 0000000..8fab8a6 --- /dev/null +++ b/org/palomafp/dam2/aadd/anp/dao/impl/ContinenteDaoCsv.java @@ -0,0 +1,41 @@ +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 14d9cc8..2c994b1 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\\fic03\\informacion_paises.txt"; - - + private static final String ruta = + "C:\\Users\\PC GAMING\\aadd\\fic05\\informacion_paises.txt"; + @Override public Pais obtenerPais(int identificadorPais) { @@ -45,8 +45,6 @@ public class PaisDaoText implements IPaisDAO { return null; } - - @Override public List obtenerPaisesPorContinente( String codigoContinente) { @@ -87,8 +85,6 @@ public class PaisDaoText implements IPaisDAO { return paises; } - - private Pais convertirLineaAPais(String linea) { linea = linea.replace("\"", ""); @@ -103,8 +99,11 @@ public class PaisDaoText implements IPaisDAO { String capital = datos[3].trim(); + // DAO encargado de obtener los datos del continente + IContinenteDAO continenteDAO = new ContinenteDaoCsv(); + Continente continente = - new Continente(codigoContinente, nombre); + continenteDAO.obtenerContinente(codigoContinente); return new Pais( id, @@ -113,4 +112,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 c02d416..78e8fbd 100644 --- a/org/palomafp/dam2/aadd/anp/model/Continente.java +++ b/org/palomafp/dam2/aadd/anp/model/Continente.java @@ -9,6 +9,10 @@ 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 7dd4d46..ab22b6e 100644 --- a/org/palomafp/dam2/aadd/anp/model/Pais.java +++ b/org/palomafp/dam2/aadd/anp/model/Pais.java @@ -51,12 +51,9 @@ public class Pais { @Override public String toString() { - return "Pais{" + - "id=" + id + - ", nombre = '" + nombre + '\'' + - ", capital = '" + capital + '\'' + "," + - continente + - '}'; + return nombre + " (" + id + "), con capital en " + capital + + " pertenece a " + continente.getNombre() + + " (" + continente.getCodigoContinente() + ")"; } } \ No newline at end of file