commit b119c0d0c6532c1bdf7e5aa8cb342781577431de Author: juanperoh11-lgtm. Date: Fri Oct 2 11:46:55 2026 +0200 Actividad 5 diff --git a/.classpath b/.classpath new file mode 100644 index 0000000..efedf92 --- /dev/null +++ b/.classpath @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/.project b/.project new file mode 100644 index 0000000..9b5b367 --- /dev/null +++ b/.project @@ -0,0 +1,28 @@ + + + Ficheros_05 + + + + + + org.eclipse.jdt.core.javabuilder + + + + + + org.eclipse.jdt.core.javanature + + + + 1790934355813 + + 30 + + org.eclipse.core.resources.regexFilterMatcher + node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__ + + + + diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..99f26c0 --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,2 @@ +eclipse.preferences.version=1 +encoding/=UTF-8 diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs new file mode 100644 index 0000000..3124684 --- /dev/null +++ b/.settings/org.eclipse.jdt.core.prefs @@ -0,0 +1,11 @@ +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=25 +org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve +org.eclipse.jdt.core.compiler.compliance=25 +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.enablePreviewFeatures=disabled +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=25 diff --git a/bin/org/palomafp/aadd/aez/dao/ContinenteDAO.class b/bin/org/palomafp/aadd/aez/dao/ContinenteDAO.class new file mode 100644 index 0000000..7bd7b7e Binary files /dev/null and b/bin/org/palomafp/aadd/aez/dao/ContinenteDAO.class differ diff --git a/bin/org/palomafp/aadd/aez/dao/PaisDAO.class b/bin/org/palomafp/aadd/aez/dao/PaisDAO.class new file mode 100644 index 0000000..c8ee07c Binary files /dev/null and b/bin/org/palomafp/aadd/aez/dao/PaisDAO.class differ diff --git a/bin/org/palomafp/aadd/aez/dao/impl/ContinenteDAOImpl.class b/bin/org/palomafp/aadd/aez/dao/impl/ContinenteDAOImpl.class new file mode 100644 index 0000000..ef0d4f8 Binary files /dev/null and b/bin/org/palomafp/aadd/aez/dao/impl/ContinenteDAOImpl.class differ diff --git a/bin/org/palomafp/aadd/aez/dao/impl/PaisDAOImpl.class b/bin/org/palomafp/aadd/aez/dao/impl/PaisDAOImpl.class new file mode 100644 index 0000000..705a181 Binary files /dev/null and b/bin/org/palomafp/aadd/aez/dao/impl/PaisDAOImpl.class differ diff --git a/bin/org/palomafp/aadd/aez/model/Continente.class b/bin/org/palomafp/aadd/aez/model/Continente.class new file mode 100644 index 0000000..9445596 Binary files /dev/null and b/bin/org/palomafp/aadd/aez/model/Continente.class differ diff --git a/bin/org/palomafp/aadd/aez/model/Pais.class b/bin/org/palomafp/aadd/aez/model/Pais.class new file mode 100644 index 0000000..c4d2dbd Binary files /dev/null and b/bin/org/palomafp/aadd/aez/model/Pais.class differ diff --git a/bin/org/palomafp/aadd/dao/Main.class b/bin/org/palomafp/aadd/dao/Main.class new file mode 100644 index 0000000..94bbb39 Binary files /dev/null and b/bin/org/palomafp/aadd/dao/Main.class differ diff --git a/src/org/palomafp/aadd/aez/dao/ContinenteDAO.java b/src/org/palomafp/aadd/aez/dao/ContinenteDAO.java new file mode 100644 index 0000000..d9d5c57 --- /dev/null +++ b/src/org/palomafp/aadd/aez/dao/ContinenteDAO.java @@ -0,0 +1,13 @@ +package org.palomafp.aadd.aez.dao; + +import org.palomafp.aadd.aez.model.Continente; +import java.util.List; +import java.util.Map; + +public interface ContinenteDAO { + List obtenerTodos(); + + Map obtenerTodosComoMapa(); + + Continente obtenerPorCodigo(String codigo); +} \ No newline at end of file diff --git a/src/org/palomafp/aadd/aez/dao/PaisDAO.java b/src/org/palomafp/aadd/aez/dao/PaisDAO.java new file mode 100644 index 0000000..4f39a03 --- /dev/null +++ b/src/org/palomafp/aadd/aez/dao/PaisDAO.java @@ -0,0 +1,10 @@ +package org.palomafp.aadd.aez.dao; + +import org.palomafp.aadd.aez.model.Continente; +import org.palomafp.aadd.aez.model.Pais; +import java.util.List; +import java.util.Map; + +public interface PaisDAO { + List obtenerTodos(Map mapaContinentes); +} diff --git a/src/org/palomafp/aadd/aez/dao/impl/ContinenteDAOImpl.java b/src/org/palomafp/aadd/aez/dao/impl/ContinenteDAOImpl.java new file mode 100644 index 0000000..a37853e --- /dev/null +++ b/src/org/palomafp/aadd/aez/dao/impl/ContinenteDAOImpl.java @@ -0,0 +1,64 @@ +package org.palomafp.aadd.aez.dao.impl; + +import org.palomafp.aadd.aez.dao.ContinenteDAO; +import org.palomafp.aadd.aez.model.Continente; + +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +public class ContinenteDAOImpl implements ContinenteDAO { + + private static final String RUTA_DEFECTO = "C:\\Users\\aleja\\aadd\\fic05\\informacion_continentes.csv"; + private final String rutaFichero; + + public ContinenteDAOImpl() { + this.rutaFichero = RUTA_DEFECTO; + } + + public ContinenteDAOImpl(String rutaFichero) { + this.rutaFichero = rutaFichero; + } + + @Override + public List obtenerTodos() { + List continentes = new ArrayList<>(); + try (BufferedReader br = new BufferedReader(new FileReader(rutaFichero, StandardCharsets.UTF_8))) { + String linea; + while ((linea = br.readLine()) != null) { + if (linea.trim().isEmpty() || linea.startsWith("#")) { + continue; + } + String[] datos = linea.split("[,;]"); + if (datos.length >= 2) { + String codigo = datos[0].trim(); + String nombre = datos[1].trim(); + continentes.add(new Continente(codigo, nombre)); + } + } + } catch (IOException e) { + System.err + .println("Error al leer el fichero CSV de continentes en (" + rutaFichero + "): " + e.getMessage()); + } + return continentes; + } + + @Override + public Map obtenerTodosComoMapa() { + Map mapa = new HashMap<>(); + for (Continente c : obtenerTodos()) { + mapa.put(c.getCodigo(), c); + } + return mapa; + } + + @Override + public Continente obtenerPorCodigo(String codigo) { + return obtenerTodosComoMapa().get(codigo); + } +} \ No newline at end of file diff --git a/src/org/palomafp/aadd/aez/dao/impl/PaisDAOImpl.java b/src/org/palomafp/aadd/aez/dao/impl/PaisDAOImpl.java new file mode 100644 index 0000000..d30842e --- /dev/null +++ b/src/org/palomafp/aadd/aez/dao/impl/PaisDAOImpl.java @@ -0,0 +1,55 @@ +package org.palomafp.aadd.aez.dao.impl; + +import org.palomafp.aadd.aez.dao.PaisDAO; +import org.palomafp.aadd.aez.model.Continente; +import org.palomafp.aadd.aez.model.Pais; + +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +public class PaisDAOImpl implements PaisDAO { + + private static final String RUTA_DEFECTO = "C:\\Users\\aleja\\aadd\\fic05\\informacion_paises.txt"; + private final String rutaFichero; + + public PaisDAOImpl() { + this.rutaFichero = RUTA_DEFECTO; + } + + public PaisDAOImpl(String rutaFichero) { + this.rutaFichero = rutaFichero; + } + + @Override + public List obtenerTodos(Map mapaContinentes) { + List paises = new ArrayList<>(); + try (BufferedReader br = new BufferedReader(new FileReader(rutaFichero, StandardCharsets.UTF_8))) { + String linea; + while ((linea = br.readLine()) != null) { + if (linea.trim().isEmpty() || linea.startsWith("#")) { + continue; + } + String[] datos = linea.split("[,;\t]"); + if (datos.length >= 4) { + // Eliminar comillas dobles y espacios sobrantes de cada campo + String idStr = datos[0].trim().replace("\"", ""); + String nombre = datos[1].trim().replace("\"", ""); + String capital = datos[2].trim().replace("\"", ""); + String codContinente = datos[3].trim().replace("\"", ""); + + int id = Integer.parseInt(idStr); + Continente continente = mapaContinentes.get(codContinente); + paises.add(new Pais(id, nombre, capital, continente)); + } + } + } catch (IOException | NumberFormatException e) { + System.err.println("Error al leer el fichero TXT de países en (" + rutaFichero + "): " + e.getMessage()); + } + return paises; + } +} \ No newline at end of file diff --git a/src/org/palomafp/aadd/aez/model/Continente.java b/src/org/palomafp/aadd/aez/model/Continente.java new file mode 100644 index 0000000..bcb96d3 --- /dev/null +++ b/src/org/palomafp/aadd/aez/model/Continente.java @@ -0,0 +1,35 @@ +package org.palomafp.aadd.aez.model; + +public class Continente { + private String codigo; + private String nombre; + + public Continente() { + } + + public Continente(String codigo, String nombre) { + this.codigo = codigo; + this.nombre = nombre; + } + + public String getCodigo() { + return codigo; + } + + public void setCodigo(String codigo) { + this.codigo = codigo; + } + + public String getNombre() { + return nombre; + } + + public void setNombre(String nombre) { + this.nombre = nombre; + } + + @Override + public String toString() { + return nombre + " (" + codigo + ")"; + } +} \ No newline at end of file diff --git a/src/org/palomafp/aadd/aez/model/Pais.java b/src/org/palomafp/aadd/aez/model/Pais.java new file mode 100644 index 0000000..10f11d0 --- /dev/null +++ b/src/org/palomafp/aadd/aez/model/Pais.java @@ -0,0 +1,65 @@ +package org.palomafp.aadd.aez.model; + +public class Pais { + private int identificador; + private String nombre; + private String nombreCapital; + private Continente continente; + + public Pais() { + } + + public Pais(int identificador, String nombre, String nombreCapital, Continente continente) { + super(); + this.identificador = identificador; + this.nombre = nombre; + this.nombreCapital = nombreCapital; + this.continente = continente; + } + + public int getIdentificador() { + return identificador; + } + + public void setIdentificador(int identificador) { + this.identificador = identificador; + } + + public String getNombre() { + return nombre; + } + + public void setNombre(String nombre) { + this.nombre = nombre; + } + + public String getNombreCapital() { + return nombreCapital; + } + + public void setNombreCapital(String nombreCapital) { + this.nombreCapital = nombreCapital; + } + + public Continente getContinente() { + return continente; + } + + public void setContinente(Continente continente) { + this.continente = continente; + } + + @Override + public String toString() { + String nombreContinente = "Desconocido"; + String codigoContinente = "XX"; + + if (this.continente != null) { + nombreContinente = this.continente.getNombre(); + codigoContinente = this.continente.getCodigo(); + } + + return String.format("%s (%d) con capital en %s pertenece al continente %s (%s)", nombre, identificador, + nombreCapital, nombreContinente, codigoContinente); + } +} \ No newline at end of file diff --git a/src/org/palomafp/aadd/dao/Main.java b/src/org/palomafp/aadd/dao/Main.java new file mode 100644 index 0000000..6c2fe1f --- /dev/null +++ b/src/org/palomafp/aadd/dao/Main.java @@ -0,0 +1,31 @@ +package org.palomafp.aadd.dao; + +import org.palomafp.aadd.aez.dao.ContinenteDAO; +import org.palomafp.aadd.aez.dao.PaisDAO; +import org.palomafp.aadd.aez.dao.impl.ContinenteDAOImpl; +import org.palomafp.aadd.aez.dao.impl.PaisDAOImpl; +import org.palomafp.aadd.aez.model.Continente; +import org.palomafp.aadd.aez.model.Pais; + +import java.util.List; +import java.util.Map; + +public class Main { + public static void main(String[] args) { + // Instanciación limpia sin parámetros, utilizando las rutas por defecto en + // C:\Users\aleja\aadd\fic05 + ContinenteDAO continenteDAO = new ContinenteDAOImpl(); + PaisDAO paisDAO = new PaisDAOImpl(); + + // Cargar mapa de continentes + Map mapContinentes = continenteDAO.obtenerTodosComoMapa(); + + // Cargar lista de países asociados a sus continentes + List listaPaises = paisDAO.obtenerTodos(mapContinentes); + + // Imprimir formateado por consola + for (Pais pais : listaPaises) { + System.out.println(pais.toString()); + } + } +} \ No newline at end of file