From 61a49f6a6c12d62e95130e5024f245040db4cf39 Mon Sep 17 00:00:00 2001 From: "luis.garcia104" Date: Fri, 9 Oct 2026 16:42:36 +0200 Subject: [PATCH] Primer commit --- .gitignore | 16 ++ 1.8.pdf | Bin 0 -> 30004 bytes Fichero_08/config/application.properties | 5 + Fichero_08/src/module-info.java | 8 + .../org/palomafp/aadd/lmga/dao/IPaisDAO.java | 15 ++ .../aadd/lmga/dao/impl/PaisDaoFichero.java | 237 ++++++++++++++++++ .../palomafp/aadd/lmga/model/Continente.java | 35 +++ .../org/palomafp/aadd/lmga/model/Pais.java | 63 +++++ .../dam2/aadd/lmga/GestorMapaMundi.java | 81 ++++++ informacion_continentes.csv | 6 + informacion_paises.txt | 23 ++ 11 files changed, 489 insertions(+) create mode 100644 .gitignore create mode 100644 1.8.pdf create mode 100644 Fichero_08/config/application.properties create mode 100644 Fichero_08/src/module-info.java create mode 100644 Fichero_08/src/org/palomafp/aadd/lmga/dao/IPaisDAO.java create mode 100644 Fichero_08/src/org/palomafp/aadd/lmga/dao/impl/PaisDaoFichero.java create mode 100644 Fichero_08/src/org/palomafp/aadd/lmga/model/Continente.java create mode 100644 Fichero_08/src/org/palomafp/aadd/lmga/model/Pais.java create mode 100644 Fichero_08/src/org/palomafp/dam2/aadd/lmga/GestorMapaMundi.java create mode 100644 informacion_continentes.csv create mode 100644 informacion_paises.txt diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..cbaae6f --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +# Eclipse +.classpath +.project +.settings/ + +# Compilación Java +bin/ +target/ +*.class + +# Logs +*.log + +# Sistema operativo +.DS_Store +Thumbs.db \ No newline at end of file diff --git a/1.8.pdf b/1.8.pdf new file mode 100644 index 0000000000000000000000000000000000000000..f33874b0c8020894b8202d49846b5cad23848ad9 GIT binary patch literal 30004 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 t1;olgpfcbWymF-;G!#h;LK2rND)C+ obtenerPaisesPorContinente(String codContinente); + List obtenerTodosLosContinentes(); + Continente obtenerContinentePorCodigo(String codContinente); + boolean insertarContinente(String codContinente, String nombreContinente); + boolean eliminarContinente(String codContinente); + boolean actualizarNombreContinente(String cod, String nuevoNombre); +} \ No newline at end of file diff --git a/Fichero_08/src/org/palomafp/aadd/lmga/dao/impl/PaisDaoFichero.java b/Fichero_08/src/org/palomafp/aadd/lmga/dao/impl/PaisDaoFichero.java new file mode 100644 index 0000000..f974bc9 --- /dev/null +++ b/Fichero_08/src/org/palomafp/aadd/lmga/dao/impl/PaisDaoFichero.java @@ -0,0 +1,237 @@ +package org.palomafp.aadd.lmga.dao.impl; + +import org.palomafp.aadd.lmga.dao.IPaisDAO; +import org.palomafp.aadd.lmga.model.Continente; +import org.palomafp.aadd.lmga.model.Pais; + +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.nio.file.StandardOpenOption; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.regex.Pattern; + +public class PaisDaoFichero implements IPaisDAO { + + private String ficheroPaises; + private String ficheroContinentes; + private String separadorContinentes; + private String separadorPaises; + + private Map mapContinentes; + + public PaisDaoFichero() { + this.mapContinentes = new HashMap<>(); + cargarConfiguracion(); + cargarContinentes(); + } + + private void cargarConfiguracion() { + Properties prop = new Properties(); + try (InputStream input = getClass().getClassLoader().getResourceAsStream("config/application.properties")) { + if (input == null) { + System.err.println("Error: No se pudo encontrar el fichero 'config/application.properties'"); + return; + } + prop.load(input); + + this.ficheroContinentes = prop.getProperty("fichero.continentes"); + this.ficheroPaises = prop.getProperty("fichero.paises"); + + this.separadorContinentes = prop.getProperty("separador.continentes", "#"); + this.separadorPaises = prop.getProperty("separador.paises", ","); + + } catch (IOException e) { + System.err.println("Error al cargar el fichero de propiedades: " + e.getMessage()); + } + } + + private void cargarContinentes() { + if (ficheroContinentes == null) return; + + try { + Path path = Paths.get(ficheroContinentes); + if (!Files.exists(path)) return; + + List lineas = Files.readAllLines(path, StandardCharsets.UTF_8); + for (String linea : lineas) { + linea = linea.trim(); + if (linea.isEmpty() || linea.startsWith("anyo") || linea.startsWith(separadorContinentes)) { + continue; + } + + String[] partes = linea.split(Pattern.quote(separadorContinentes)); + if (partes.length >= 3) { + String cod = partes[1].replace("\"", "").trim(); + String nombre = partes[2].replace("\"", "").trim(); + mapContinentes.put(cod, new Continente(cod, nombre)); + } + } + } catch (IOException e) { + System.err.println("Error al leer el fichero de continentes: " + e.getMessage()); + } + } + + @Override + public List obtenerTodosLosContinentes() { + return new ArrayList<>(mapContinentes.values()); + } + + @Override + public Continente obtenerContinentePorCodigo(String codContinente) { + return mapContinentes.get(codContinente); + } + + @Override + public boolean insertarContinente(String cod, String nombre) { + if (mapContinentes.containsKey(cod)) { + return false; + } + try { + Path path = Paths.get(ficheroContinentes); + String nuevaLinea = "\n2026" + separadorContinentes + cod + separadorContinentes + nombre; + + Files.writeString( + path, + nuevaLinea, + StandardCharsets.UTF_8, + StandardOpenOption.CREATE, + StandardOpenOption.APPEND + ); + + mapContinentes.put(cod, new Continente(cod, nombre)); + return true; + } catch (IOException e) { + return false; + } + } + + @Override + public boolean eliminarContinente(String codContinente) { + if (!mapContinentes.containsKey(codContinente)) { + return false; + } + + try { + Path path = Paths.get(ficheroContinentes); + List lineas = Files.readAllLines(path, StandardCharsets.UTF_8); + List lineasFiltradas = new ArrayList<>(); + + for (String linea : lineas) { + String[] partes = linea.split(Pattern.quote(separadorContinentes)); + if (partes.length >= 2 && partes[1].replace("\"", "").trim().equals(codContinente)) { + continue; + } + lineasFiltradas.add(linea); + } + + Files.write(path, lineasFiltradas, StandardCharsets.UTF_8); + mapContinentes.remove(codContinente); + return true; + } catch (IOException e) { + return false; + } + } + + @Override + public boolean actualizarNombreContinente(String cod, String nuevoNombre) { + Continente c = mapContinentes.get(cod); + if (c == null) { + return false; + } + try { + Path path = Paths.get(ficheroContinentes); + List lineas = Files.readAllLines(path, StandardCharsets.UTF_8); + + for (int i = 0; i < lineas.size(); i++) { + String[] partes = lineas.get(i).split(Pattern.quote(separadorContinentes)); + if (partes.length >= 3 && partes[1].replace("\"", "").trim().equals(cod)) { + lineas.set(i, partes[0] + separadorContinentes + partes[1] + separadorContinentes + nuevoNombre); + } + } + + Files.write(path, lineas, StandardCharsets.UTF_8); + c.setNombre(nuevoNombre); + return true; + } catch (IOException e) { + return false; + } + } + + @Override + public Pais obtenerPaisPorID(int idPais) { + if (ficheroPaises == null) return null; + + try { + Path path = Paths.get(ficheroPaises); + if (!Files.exists(path)) return null; + + List lineas = Files.readAllLines(path, StandardCharsets.UTF_8); + for (String linea : lineas) { + linea = linea.trim(); + if (linea.isEmpty() || linea.startsWith("#")) { + continue; + } + + Pais pais = lineaAPais(linea); + if (pais != null && pais.getIdentificador() == idPais) { + return pais; + } + } + } catch (IOException e) { + System.err.println("Error al leer el fichero de países: " + e.getMessage()); + } + return null; + } + + @Override + public List obtenerPaisesPorContinente(String codContinente) { + List resultados = new ArrayList<>(); + if (ficheroPaises == null) return resultados; + + try { + Path path = Paths.get(ficheroPaises); + if (!Files.exists(path)) return resultados; + + List lineas = Files.readAllLines(path, StandardCharsets.UTF_8); + for (String linea : lineas) { + linea = linea.trim(); + if (linea.isEmpty() || linea.startsWith("#")) { + continue; + } + + Pais pais = lineaAPais(linea); + if (pais != null && pais.getContinente() != null && + codContinente.equals(pais.getContinente().getCodigo())) { + resultados.add(pais); + } + } + } catch (IOException e) { + System.err.println("Error al leer el fichero de países: " + e.getMessage()); + } + return resultados; + } + + private Pais lineaAPais(String linea) { + String[] partes = linea.split(Pattern.quote(separadorPaises)); + if (partes.length < 4) { + return null; + } + + String codContinente = partes[0].replace("\"", "").trim(); + int id = Integer.parseInt(partes[1].trim()); + String nombrePais = partes[2].replace("\"", "").trim(); + String capital = partes[3].replace("\"", "").trim(); + + Continente continente = mapContinentes.getOrDefault(codContinente, new Continente(codContinente, "Desconocido")); + + return new Pais(id, nombrePais, capital, continente); + } +} \ No newline at end of file diff --git a/Fichero_08/src/org/palomafp/aadd/lmga/model/Continente.java b/Fichero_08/src/org/palomafp/aadd/lmga/model/Continente.java new file mode 100644 index 0000000..56e4da2 --- /dev/null +++ b/Fichero_08/src/org/palomafp/aadd/lmga/model/Continente.java @@ -0,0 +1,35 @@ +package org.palomafp.aadd.lmga.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 this.nombre; + } +} diff --git a/Fichero_08/src/org/palomafp/aadd/lmga/model/Pais.java b/Fichero_08/src/org/palomafp/aadd/lmga/model/Pais.java new file mode 100644 index 0000000..1c9670f --- /dev/null +++ b/Fichero_08/src/org/palomafp/aadd/lmga/model/Pais.java @@ -0,0 +1,63 @@ + package org.palomafp.aadd.lmga.model; + + public class Pais { + private int identificador; + private String nombre; + private String capital; + private Continente continente; + + public Pais() { + } + + public Pais(int identificador, String nombre, String capital, Continente continente) { + this.identificador = identificador; + this.nombre = nombre; + this.capital = capital; + 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 getCapital() { + return capital; + } + + public void setCapital(String capital) { + this.capital = capital; + } + + public Continente getContinente() { + return continente; + } + + public void setContinente(Continente continente) { + this.continente = continente; + } + + @Override + public String toString() { + + String nombreContinente = (this.continente != null && this.continente.getNombre() != null) + ? this.continente.getNombre() : "Desconocido"; + String codigoContinente = (this.continente != null && this.continente.getCodigo() != null) + ? this.continente.getCodigo() : "Desconocido"; + + + return this.nombre + " (" + this.identificador + ") con capital en " + this.capital + + " pertenece al continente " + nombreContinente + " (" + codigoContinente + ")"; + } + } diff --git a/Fichero_08/src/org/palomafp/dam2/aadd/lmga/GestorMapaMundi.java b/Fichero_08/src/org/palomafp/dam2/aadd/lmga/GestorMapaMundi.java new file mode 100644 index 0000000..11e9bd3 --- /dev/null +++ b/Fichero_08/src/org/palomafp/dam2/aadd/lmga/GestorMapaMundi.java @@ -0,0 +1,81 @@ +package org.palomafp.dam2.aadd.lmga; + +import org.palomafp.aadd.lmga.dao.IPaisDAO; +import org.palomafp.aadd.lmga.dao.impl.PaisDaoFichero; +import org.palomafp.aadd.lmga.model.Pais; +import org.palomafp.aadd.lmga.model.Continente; + +import java.util.List; + +public class GestorMapaMundi { + + private static final IPaisDAO paisDAO = new PaisDaoFichero(); + + public static void main(String[] args) { + + + + + switch(args[0]) { + case "1": + System.out.println("\nC: Obtener todos los continentes \n"); + List listaContinentes = paisDAO.obtenerTodosLosContinentes(); + + if (!listaContinentes.isEmpty()) { + for (Continente c : listaContinentes) { + System.out.println(c); + } + } else { + System.out.println("No hay continentes"); + } + break; + case "2": + + Continente continenteObtenido = obtenerContinentePorCodigo(args[1]); + if (continenteObtenido != null) { + System.out.println(continenteObtenido); + } else { + System.out.println("No se encontró ningún continente con el código: " + args[1]); + } + break; + case "3": + + if (paisDAO.insertarContinente(args[1], args[2])) { + System.out.println("Insertado correctamente."); + } else { + System.out.println("El continente ya existe o ha ocurrido un error."); + } + break; + case "4": + if (paisDAO.eliminarContinente(args[1])) { + System.out.println("Continente eliminado correctamente."); + } else { + System.out.println("El continente no existe o ha ocurrido un error."); + } + break; + case "5": + if (paisDAO.actualizarNombreContinente(args[1], args[2])) { + System.out.println("Nombre actualizado correctamente"); + } else { + System.out.println("El continente no existe o ha ocurrido un error."); + } + break; + default: + break; + } + + + } + + public static Pais obtenerPaisesPorIdentificador(int identificador) { + return paisDAO.obtenerPaisPorID(identificador); + } + + public static List obtenerListaPaisesPorContinente(String codContinente) { + return paisDAO.obtenerPaisesPorContinente(codContinente); + } + + public static Continente obtenerContinentePorCodigo(String codContinente) { + return paisDAO.obtenerContinentePorCodigo(codContinente); + } +} \ No newline at end of file diff --git a/informacion_continentes.csv b/informacion_continentes.csv new file mode 100644 index 0000000..0f5a746 --- /dev/null +++ b/informacion_continentes.csv @@ -0,0 +1,6 @@ +anyo#codigo_continente#nombre_continente +2026#01# África +2026#02 #América +2026#03#Asia +2026#04#Europa +2026#05#Oceanía \ No newline at end of file diff --git a/informacion_paises.txt b/informacion_paises.txt new file mode 100644 index 0000000..7b87853 --- /dev/null +++ b/informacion_paises.txt @@ -0,0 +1,23 @@ +# Información de países +# Se muestra información del código de continente, identificador de país, nombre del país junto con su capital +"01",1, "Angola", "Luanda" +"02",62, "Brasil", "Brasilia" +"02",63, "Canadá", "Ottawa" +"02",64, "Chile", "Santiago De Chile" +"02",65, "Colombia", "Bogotá" +# Otra lista de países +"03",92, "Afganistán", "Kabul" +"03",93, "Arabia Saudita", "Riad" +"03",105, "Filipinas", "Manila" +"03",106, "India", "Nueva Delhi" +"03",136, "Vietnam", "Hanoi" +"04",147, "Bulgaria", "Sofía" +"04",152, "España", "Madrid" +"04",181, "Suecia", "Estocolmo" +# La parte final de países +"04",182, "Suiza", "Berna" +"05",185, "Australia", "Canberra" +"05",186, "Fiyi", "Suva" +"05",187, "Islas Marshall", "Majuro" +"05",196, "Tonga", "Nuku'alofa" +"05",197, "Tuvalu", "Funafuti" \ No newline at end of file