diff --git a/.gitignore b/.gitignore index 5f85d51..671d103 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .settings/ *.7z bin/ +old/ diff --git a/README.md b/README.md index fa3a916..674ce4f 100644 --- a/README.md +++ b/README.md @@ -11,42 +11,42 @@ Se solicita crear un conversor de divisas utilizando el lenguaje Java Requerimientos de la aplicación - [x] El convertidor de moneda debe: - - [x] Convertir de la moneda de tu país a Dolar - - [x] Convertir de la moneda de tu país a Euros - - [x] Convertir de la moneda de tu país a Libras Esterlinas - - [x] Convertir de la moneda de tu país a Yen Japonés - - [x] Convertir de la moneda de tu país a Won sul-coreano - - [x] Convertir de Dolar a la moneda de tu país - - [x] Convertir de Euros a la moneda de tu país - - [x] Convertir de Libras Esterlinas a la moneda de tu país - - [x] Convertir de Yen Japonés a la moneda de tu país - - [x] Convertir de Won sul-coreano a la moneda de tu país + - [x] Convertir de la moneda de tu país a **Dolar** + - [x] Convertir de la moneda de tu país a **Euros** + - [x] Convertir de la moneda de tu país a **Libras Esterlinas** + - [x] Convertir de la moneda de tu país a **Yen Japonés** + - [x] Convertir de la moneda de tu país a **Won sul-coreano** + - [x] Convertir de **Dolar** a la moneda de tu país + - [x] Convertir de **Euros** a la moneda de tu país + - [x] Convertir de **Libras Esterlinas** a la moneda de tu país + - [x] Convertir de **Yen Japonés** a la moneda de tu país + - [x] Convertir de **Won sul-coreano** a la moneda de tu país - [ ] **Extra:** Añadir otros tipos de conversiones, ejm. temperatura -- [ ] **Menu princiapl**. Cuadro de dialogo debe permitir al usuario escoger entre +- [x] **Menu principal**. Cuadro de dialogo debe permitir al usuario escoger entre las opciones de conversión, según los requisitos solo es necesario hacer un -conversor de moneda pero en caso que desees implementar otras funciones en la -foto anexada podemos ver una opción de menú con otras funciones. - - [ ] Utilice la clase **JOptionPane** de la biblioteca Javax - - [ ] Utilice el método **showInputDialog** como un objeto para presentar más de +conversor de moneda, en caso que desees implementar otras funciones añadir una +opción de menú con otras funciones. + - [x] Utilice la clase **JOptionPane** de la biblioteca Javax + - [x] Utilice el método **showInputDialog** como un objeto para presentar más de una opción - [x] **Opciones de monedas**. Cuadro de dialogo debe permitir al usuario escoger entre las diferentes monedas a la que desea convertir su dinero. - [x] Utilice la clase **JOptionPane** de la biblioteca Javax - [x] Utilice el método **showInputDialog** como un objeto para presentar más de una opción para la conversión -- [ ] El **cuadro de dialogo para entrada de usuario** debe permitir al usuario +- [x] El **cuadro de dialogo para entrada de usuario** debe permitir al usuario ingresar el valor o la cantidad de dinero que desea convertir a la moneda escogida anteriormente, por ejemplo: el usuario ingresará la cantidad de Pesos Colombianos que quiere convertir a Dólares. Este input debe estar validado y no debe aceptar otro tipo de caracteres que no sean del tipo numéricos. Utilice el método **showInputDialog** para que el usuario inserte un valor. -- [ ] Si el usuario introduce letras o caracteres especiales y presiona ok **debe +- [x] Si el usuario introduce letras o caracteres especiales y presiona ok **debe ser mostrado un mensaje apuntando que el valor no es válido**. Utilice el método **showMessageDialog** para validar la entrada para que no se acepten caracteres no numéricos. -- [ ] Mostrar al usuario el valor de la conversión realizada. - - [ ] Utilice el método **showMessageDialog** para mostrar el valor de la conversión. +- [x] Mostrar al usuario el valor de la conversión realizada. + - [x] Utilice el método **showMessageDialog** para mostrar el valor de la conversión. - [ ] Utilice el método **showConfirmDialog** para preguntar al usuario si desea continuar usando el programa presentando las siguientes opciones: - [ ] **Yes**: Debe llevar nuevamente a nuestro usuario a menu principal para @@ -64,8 +64,6 @@ temperatura, distancia, velocidad, entre otros. -
-
Recursos @@ -103,8 +101,8 @@ Doc ## Conversor de monedas GUI ---- diff --git a/docs/allclasses-index.html b/docs/allclasses-index.html index 100a03b..9c4c8b8 100644 --- a/docs/allclasses-index.html +++ b/docs/allclasses-index.html @@ -1,11 +1,11 @@ - + All Classes and Interfaces - + @@ -75,21 +75,25 @@ loadScripts(document, 'script');
Main class for GUI converter application
-
ConversorTui
+
ConversorMoneda
+
Currency converter class
+
+
ConversorTui
+
Main class for TUI converter application
-
LimpiarConsola
-
+
LimpiarConsola
+
Interface to clear OS terminal screen, on case of IDE Console it just prints 80 new lines.
-
MenuPrincipal
-
+
MenuPrincipal
+
Class to create formatted Strings
-
Moneda
-
+
Moneda
+
Moneda currency representation `NAME (symbol, rate)`
diff --git a/docs/allpackages-index.html b/docs/allpackages-index.html index bfae17c..0d553bb 100644 --- a/docs/allpackages-index.html +++ b/docs/allpackages-index.html @@ -1,11 +1,11 @@ - + All Packages - + diff --git a/docs/conversor_alura_one/cl/conversor/app/Conversor.html b/docs/conversor_alura_one/cl/conversor/app/Conversor.html index f901509..2b9e99d 100644 --- a/docs/conversor_alura_one/cl/conversor/app/Conversor.html +++ b/docs/conversor_alura_one/cl/conversor/app/Conversor.html @@ -1,11 +1,11 @@ - + Conversor - + diff --git a/docs/conversor_alura_one/cl/conversor/app/class-use/Conversor.html b/docs/conversor_alura_one/cl/conversor/app/class-use/Conversor.html index d844f2e..67f8c1f 100644 --- a/docs/conversor_alura_one/cl/conversor/app/class-use/Conversor.html +++ b/docs/conversor_alura_one/cl/conversor/app/class-use/Conversor.html @@ -1,11 +1,11 @@ - + Uses of Class cl.conversor.app.Conversor - + diff --git a/docs/conversor_alura_one/cl/conversor/app/package-summary.html b/docs/conversor_alura_one/cl/conversor/app/package-summary.html index a1c683c..44bdcff 100644 --- a/docs/conversor_alura_one/cl/conversor/app/package-summary.html +++ b/docs/conversor_alura_one/cl/conversor/app/package-summary.html @@ -1,11 +1,11 @@ - + cl.conversor.app - + diff --git a/docs/conversor_alura_one/cl/conversor/app/package-tree.html b/docs/conversor_alura_one/cl/conversor/app/package-tree.html index 986db30..4979b40 100644 --- a/docs/conversor_alura_one/cl/conversor/app/package-tree.html +++ b/docs/conversor_alura_one/cl/conversor/app/package-tree.html @@ -1,11 +1,11 @@ - + cl.conversor.app Class Hierarchy - + diff --git a/docs/conversor_alura_one/cl/conversor/app/package-use.html b/docs/conversor_alura_one/cl/conversor/app/package-use.html index fc55330..c276d96 100644 --- a/docs/conversor_alura_one/cl/conversor/app/package-use.html +++ b/docs/conversor_alura_one/cl/conversor/app/package-use.html @@ -1,11 +1,11 @@ - + Uses of Package cl.conversor.app - + diff --git a/docs/conversor_alura_one/cl/conversor/moneda/Moneda.html b/docs/conversor_alura_one/cl/conversor/moneda/Moneda.html index 9635526..d2452bd 100644 --- a/docs/conversor_alura_one/cl/conversor/moneda/Moneda.html +++ b/docs/conversor_alura_one/cl/conversor/moneda/Moneda.html @@ -1,11 +1,11 @@ - + Moneda - + diff --git a/docs/conversor_alura_one/cl/conversor/moneda/class-use/Moneda.html b/docs/conversor_alura_one/cl/conversor/moneda/class-use/Moneda.html index 1a96c3b..2faef78 100644 --- a/docs/conversor_alura_one/cl/conversor/moneda/class-use/Moneda.html +++ b/docs/conversor_alura_one/cl/conversor/moneda/class-use/Moneda.html @@ -1,11 +1,11 @@ - + Uses of Enum Class cl.conversor.moneda.Moneda - + @@ -59,8 +59,10 @@ loadScripts(document, 'script');
 
cl.conversor.vista.cli
 
-
cl.conversor.vista.tui
+
cl.conversor.vista.gui
 
+
cl.conversor.vista.tui
+
 
    @@ -115,6 +117,23 @@ the order they are declared.
  • +
    +

    Uses of Moneda in cl.conversor.vista.gui

    +
    Methods in cl.conversor.vista.gui with parameters of type Moneda
    +
    +
    Modifier and Type
    +
    Method
    +
    Description
    +
    static void
    +
    ConversorMoneda.resultadoConversion(Moneda orig, + Moneda dest)
    +
    +
    Shows result of currency conversion
    +
    +
    +
    +
    • +

  • Uses of Moneda in cl.conversor.vista.tui

    Methods in cl.conversor.vista.tui with parameters of type Moneda
    diff --git a/docs/conversor_alura_one/cl/conversor/moneda/package-summary.html b/docs/conversor_alura_one/cl/conversor/moneda/package-summary.html index ca941f5..cdd2c81 100644 --- a/docs/conversor_alura_one/cl/conversor/moneda/package-summary.html +++ b/docs/conversor_alura_one/cl/conversor/moneda/package-summary.html @@ -1,11 +1,11 @@ - + cl.conversor.moneda - + diff --git a/docs/conversor_alura_one/cl/conversor/moneda/package-tree.html b/docs/conversor_alura_one/cl/conversor/moneda/package-tree.html index 397eacc..eed0d80 100644 --- a/docs/conversor_alura_one/cl/conversor/moneda/package-tree.html +++ b/docs/conversor_alura_one/cl/conversor/moneda/package-tree.html @@ -1,11 +1,11 @@ - + cl.conversor.moneda Class Hierarchy - + diff --git a/docs/conversor_alura_one/cl/conversor/moneda/package-use.html b/docs/conversor_alura_one/cl/conversor/moneda/package-use.html index fdbd0ad..7563625 100644 --- a/docs/conversor_alura_one/cl/conversor/moneda/package-use.html +++ b/docs/conversor_alura_one/cl/conversor/moneda/package-use.html @@ -1,11 +1,11 @@ - + Uses of Package cl.conversor.moneda - + @@ -59,8 +59,10 @@ loadScripts(document, 'script');
     
    cl.conversor.vista.cli
     
    -
    cl.conversor.vista.tui
    +
    cl.conversor.vista.gui
     
    +
    cl.conversor.vista.tui
    +
     
      @@ -91,6 +93,19 @@ loadScripts(document, 'script');
  • +
    +
    Classes in cl.conversor.moneda used by cl.conversor.vista.gui
    +
    +
    Class
    +
    Description
    +
    Moneda
    +
    +
    Moneda currency representation `NAME (symbol, rate)`
    +
    +
    +
    +
    • +
  • Classes in cl.conversor.moneda used by cl.conversor.vista.tui
    diff --git a/docs/conversor_alura_one/cl/conversor/vista/cli/ConversorCli.html b/docs/conversor_alura_one/cl/conversor/vista/cli/ConversorCli.html index 6efb2fd..7bfd5b8 100644 --- a/docs/conversor_alura_one/cl/conversor/vista/cli/ConversorCli.html +++ b/docs/conversor_alura_one/cl/conversor/vista/cli/ConversorCli.html @@ -1,11 +1,11 @@ - + ConversorCli - + diff --git a/docs/conversor_alura_one/cl/conversor/vista/cli/class-use/ConversorCli.html b/docs/conversor_alura_one/cl/conversor/vista/cli/class-use/ConversorCli.html index 4c664dd..173e7e9 100644 --- a/docs/conversor_alura_one/cl/conversor/vista/cli/class-use/ConversorCli.html +++ b/docs/conversor_alura_one/cl/conversor/vista/cli/class-use/ConversorCli.html @@ -1,11 +1,11 @@ - + Uses of Class cl.conversor.vista.cli.ConversorCli - + diff --git a/docs/conversor_alura_one/cl/conversor/vista/cli/package-summary.html b/docs/conversor_alura_one/cl/conversor/vista/cli/package-summary.html index 060c3ab..28ca1d2 100644 --- a/docs/conversor_alura_one/cl/conversor/vista/cli/package-summary.html +++ b/docs/conversor_alura_one/cl/conversor/vista/cli/package-summary.html @@ -1,11 +1,11 @@ - + cl.conversor.vista.cli - + diff --git a/docs/conversor_alura_one/cl/conversor/vista/cli/package-tree.html b/docs/conversor_alura_one/cl/conversor/vista/cli/package-tree.html index 5b88744..ff55b66 100644 --- a/docs/conversor_alura_one/cl/conversor/vista/cli/package-tree.html +++ b/docs/conversor_alura_one/cl/conversor/vista/cli/package-tree.html @@ -1,11 +1,11 @@ - + cl.conversor.vista.cli Class Hierarchy - + diff --git a/docs/conversor_alura_one/cl/conversor/vista/cli/package-use.html b/docs/conversor_alura_one/cl/conversor/vista/cli/package-use.html index 40d7f4f..093ca9f 100644 --- a/docs/conversor_alura_one/cl/conversor/vista/cli/package-use.html +++ b/docs/conversor_alura_one/cl/conversor/vista/cli/package-use.html @@ -1,11 +1,11 @@ - + Uses of Package cl.conversor.vista.cli - + diff --git a/docs/conversor_alura_one/cl/conversor/vista/gui/ConversorGui.html b/docs/conversor_alura_one/cl/conversor/vista/gui/ConversorGui.html index bd45549..ece26c0 100644 --- a/docs/conversor_alura_one/cl/conversor/vista/gui/ConversorGui.html +++ b/docs/conversor_alura_one/cl/conversor/vista/gui/ConversorGui.html @@ -1,11 +1,11 @@ - + ConversorGui - + @@ -154,7 +154,7 @@ loadScripts(document, 'script');

    Method Summary

    -
    +
    Modifier and Type
    @@ -163,9 +163,6 @@ loadScripts(document, 'script');
    static void
    main(String[] args)
     
    -
    void
    -
    menuConversion()
    -
     
    @@ -216,12 +213,6 @@ loadScripts(document, 'script');

    Method Details

    • diff --git a/docs/conversor_alura_one/cl/conversor/vista/gui/package-tree.html b/docs/conversor_alura_one/cl/conversor/vista/gui/package-tree.html index fc85975..91caceb 100644 --- a/docs/conversor_alura_one/cl/conversor/vista/gui/package-tree.html +++ b/docs/conversor_alura_one/cl/conversor/vista/gui/package-tree.html @@ -1,11 +1,11 @@ - + cl.conversor.vista.gui Class Hierarchy - + @@ -71,6 +71,7 @@ loadScripts(document, 'script');
  • javax.swing.JFrame (implements javax.accessibility.Accessible, javax.swing.RootPaneContainer, javax.swing.WindowConstants)
    • diff --git a/docs/conversor_alura_one/cl/conversor/vista/gui/package-use.html b/docs/conversor_alura_one/cl/conversor/vista/gui/package-use.html index ed8a269..9f9957c 100644 --- a/docs/conversor_alura_one/cl/conversor/vista/gui/package-use.html +++ b/docs/conversor_alura_one/cl/conversor/vista/gui/package-use.html @@ -1,11 +1,11 @@ - + Uses of Package cl.conversor.vista.gui - + diff --git a/docs/conversor_alura_one/cl/conversor/vista/tui/Color.html b/docs/conversor_alura_one/cl/conversor/vista/tui/Color.html index 7e70a0b..b860e19 100644 --- a/docs/conversor_alura_one/cl/conversor/vista/tui/Color.html +++ b/docs/conversor_alura_one/cl/conversor/vista/tui/Color.html @@ -1,11 +1,11 @@ - + Color - + diff --git a/docs/conversor_alura_one/cl/conversor/vista/tui/ConversorTui.html b/docs/conversor_alura_one/cl/conversor/vista/tui/ConversorTui.html index 846fa23..79006ad 100644 --- a/docs/conversor_alura_one/cl/conversor/vista/tui/ConversorTui.html +++ b/docs/conversor_alura_one/cl/conversor/vista/tui/ConversorTui.html @@ -1,11 +1,11 @@ - + ConversorTui - + diff --git a/docs/conversor_alura_one/cl/conversor/vista/tui/LimpiarConsola.html b/docs/conversor_alura_one/cl/conversor/vista/tui/LimpiarConsola.html index 0755993..2b8a32d 100644 --- a/docs/conversor_alura_one/cl/conversor/vista/tui/LimpiarConsola.html +++ b/docs/conversor_alura_one/cl/conversor/vista/tui/LimpiarConsola.html @@ -1,11 +1,11 @@ - + LimpiarConsola - + diff --git a/docs/conversor_alura_one/cl/conversor/vista/tui/MenuPrincipal.html b/docs/conversor_alura_one/cl/conversor/vista/tui/MenuPrincipal.html index 570b887..a1e7ebc 100644 --- a/docs/conversor_alura_one/cl/conversor/vista/tui/MenuPrincipal.html +++ b/docs/conversor_alura_one/cl/conversor/vista/tui/MenuPrincipal.html @@ -1,11 +1,11 @@ - + MenuPrincipal - + diff --git a/docs/conversor_alura_one/cl/conversor/vista/tui/class-use/Color.html b/docs/conversor_alura_one/cl/conversor/vista/tui/class-use/Color.html index 3cf0247..48478dc 100644 --- a/docs/conversor_alura_one/cl/conversor/vista/tui/class-use/Color.html +++ b/docs/conversor_alura_one/cl/conversor/vista/tui/class-use/Color.html @@ -1,11 +1,11 @@ - + Uses of Enum Class cl.conversor.vista.tui.Color - + diff --git a/docs/conversor_alura_one/cl/conversor/vista/tui/class-use/ConversorTui.html b/docs/conversor_alura_one/cl/conversor/vista/tui/class-use/ConversorTui.html index 76948cd..6e407d8 100644 --- a/docs/conversor_alura_one/cl/conversor/vista/tui/class-use/ConversorTui.html +++ b/docs/conversor_alura_one/cl/conversor/vista/tui/class-use/ConversorTui.html @@ -1,11 +1,11 @@ - + Uses of Class cl.conversor.vista.tui.ConversorTui - + diff --git a/docs/conversor_alura_one/cl/conversor/vista/tui/class-use/LimpiarConsola.html b/docs/conversor_alura_one/cl/conversor/vista/tui/class-use/LimpiarConsola.html index 0a47d7b..f736737 100644 --- a/docs/conversor_alura_one/cl/conversor/vista/tui/class-use/LimpiarConsola.html +++ b/docs/conversor_alura_one/cl/conversor/vista/tui/class-use/LimpiarConsola.html @@ -1,11 +1,11 @@ - + Uses of Interface cl.conversor.vista.tui.LimpiarConsola - + diff --git a/docs/conversor_alura_one/cl/conversor/vista/tui/class-use/MenuPrincipal.html b/docs/conversor_alura_one/cl/conversor/vista/tui/class-use/MenuPrincipal.html index 62ba99a..2b3db66 100644 --- a/docs/conversor_alura_one/cl/conversor/vista/tui/class-use/MenuPrincipal.html +++ b/docs/conversor_alura_one/cl/conversor/vista/tui/class-use/MenuPrincipal.html @@ -1,11 +1,11 @@ - + Uses of Class cl.conversor.vista.tui.MenuPrincipal - + diff --git a/docs/conversor_alura_one/cl/conversor/vista/tui/package-summary.html b/docs/conversor_alura_one/cl/conversor/vista/tui/package-summary.html index f413677..c1a16ff 100644 --- a/docs/conversor_alura_one/cl/conversor/vista/tui/package-summary.html +++ b/docs/conversor_alura_one/cl/conversor/vista/tui/package-summary.html @@ -1,11 +1,11 @@ - + cl.conversor.vista.tui - + diff --git a/docs/conversor_alura_one/cl/conversor/vista/tui/package-tree.html b/docs/conversor_alura_one/cl/conversor/vista/tui/package-tree.html index e511403..c616867 100644 --- a/docs/conversor_alura_one/cl/conversor/vista/tui/package-tree.html +++ b/docs/conversor_alura_one/cl/conversor/vista/tui/package-tree.html @@ -1,11 +1,11 @@ - + cl.conversor.vista.tui Class Hierarchy - + diff --git a/docs/conversor_alura_one/cl/conversor/vista/tui/package-use.html b/docs/conversor_alura_one/cl/conversor/vista/tui/package-use.html index c33a019..43dbe6a 100644 --- a/docs/conversor_alura_one/cl/conversor/vista/tui/package-use.html +++ b/docs/conversor_alura_one/cl/conversor/vista/tui/package-use.html @@ -1,11 +1,11 @@ - + Uses of Package cl.conversor.vista.tui - + diff --git a/docs/conversor_alura_one/module-summary.html b/docs/conversor_alura_one/module-summary.html index 16e6169..6adc69d 100644 --- a/docs/conversor_alura_one/module-summary.html +++ b/docs/conversor_alura_one/module-summary.html @@ -1,11 +1,11 @@ - + conversor_alura_one - + diff --git a/docs/help-doc.html b/docs/help-doc.html index 76fb634..2444480 100644 --- a/docs/help-doc.html +++ b/docs/help-doc.html @@ -1,11 +1,11 @@ - + API Help - + diff --git a/docs/index-files/index-1.html b/docs/index-files/index-1.html index cbf752c..efbd841 100644 --- a/docs/index-files/index-1.html +++ b/docs/index-files/index-1.html @@ -1,11 +1,11 @@ - + A-Index - + diff --git a/docs/index-files/index-10.html b/docs/index-files/index-10.html index e0d9935..5b8d8f1 100644 --- a/docs/index-files/index-10.html +++ b/docs/index-files/index-10.html @@ -1,11 +1,11 @@ - + P-Index - + diff --git a/docs/index-files/index-11.html b/docs/index-files/index-11.html index c08ca99..b218a7e 100644 --- a/docs/index-files/index-11.html +++ b/docs/index-files/index-11.html @@ -1,11 +1,11 @@ - + R-Index - + @@ -64,6 +64,10 @@ loadScripts(document, 'script');
     
    resultado(String...) - Method in class cl.conversor.vista.tui.MenuPrincipal
     
    +
    resultadoConversion(Moneda, Moneda) - Static method in class cl.conversor.vista.gui.ConversorMoneda
    +
    +
    Shows result of currency conversion
    +
    A B C E G J K L M P R S T U V W Y 
    All Classes and Interfaces|All Packages|Serialized Form diff --git a/docs/index-files/index-12.html b/docs/index-files/index-12.html index b587de0..d9f2b05 100644 --- a/docs/index-files/index-12.html +++ b/docs/index-files/index-12.html @@ -1,11 +1,11 @@ - + S-Index - + diff --git a/docs/index-files/index-13.html b/docs/index-files/index-13.html index 979ca64..9a18613 100644 --- a/docs/index-files/index-13.html +++ b/docs/index-files/index-13.html @@ -1,11 +1,11 @@ - + T-Index - + diff --git a/docs/index-files/index-14.html b/docs/index-files/index-14.html index 9532c0d..3764e8a 100644 --- a/docs/index-files/index-14.html +++ b/docs/index-files/index-14.html @@ -1,11 +1,11 @@ - + U-Index - + diff --git a/docs/index-files/index-15.html b/docs/index-files/index-15.html index 42808a9..acea606 100644 --- a/docs/index-files/index-15.html +++ b/docs/index-files/index-15.html @@ -1,11 +1,11 @@ - + V-Index - + diff --git a/docs/index-files/index-16.html b/docs/index-files/index-16.html index 68f4d27..9c32927 100644 --- a/docs/index-files/index-16.html +++ b/docs/index-files/index-16.html @@ -1,11 +1,11 @@ - + W-Index - + diff --git a/docs/index-files/index-17.html b/docs/index-files/index-17.html index f29c848..42b8f28 100644 --- a/docs/index-files/index-17.html +++ b/docs/index-files/index-17.html @@ -1,11 +1,11 @@ - + Y-Index - + diff --git a/docs/index-files/index-2.html b/docs/index-files/index-2.html index b357421..903f217 100644 --- a/docs/index-files/index-2.html +++ b/docs/index-files/index-2.html @@ -1,11 +1,11 @@ - + B-Index - + diff --git a/docs/index-files/index-3.html b/docs/index-files/index-3.html index 7e71399..ff50b1d 100644 --- a/docs/index-files/index-3.html +++ b/docs/index-files/index-3.html @@ -1,11 +1,11 @@ - + C-Index - + @@ -98,6 +98,12 @@ loadScripts(document, 'script');
    ConversorGui() - Constructor for class cl.conversor.vista.gui.ConversorGui
     
    +
    ConversorMoneda - Class in cl.conversor.vista.gui
    +
    +
    Currency converter class
    +
    +
    ConversorMoneda() - Constructor for class cl.conversor.vista.gui.ConversorMoneda
    +
     
    ConversorTui - Class in cl.conversor.vista.tui
    Main class for TUI converter application
    diff --git a/docs/index-files/index-4.html b/docs/index-files/index-4.html index 5bb15aa..c929504 100644 --- a/docs/index-files/index-4.html +++ b/docs/index-files/index-4.html @@ -1,11 +1,11 @@ - + E-Index - + diff --git a/docs/index-files/index-5.html b/docs/index-files/index-5.html index 2fb7cd7..eda0263 100644 --- a/docs/index-files/index-5.html +++ b/docs/index-files/index-5.html @@ -1,11 +1,11 @@ - + G-Index - + diff --git a/docs/index-files/index-6.html b/docs/index-files/index-6.html index dec46fd..c4b3e27 100644 --- a/docs/index-files/index-6.html +++ b/docs/index-files/index-6.html @@ -1,11 +1,11 @@ - + J-Index - + diff --git a/docs/index-files/index-7.html b/docs/index-files/index-7.html index 0a57ba0..3c222fd 100644 --- a/docs/index-files/index-7.html +++ b/docs/index-files/index-7.html @@ -1,11 +1,11 @@ - + K-Index - + diff --git a/docs/index-files/index-8.html b/docs/index-files/index-8.html index f53218d..7bc1353 100644 --- a/docs/index-files/index-8.html +++ b/docs/index-files/index-8.html @@ -1,11 +1,11 @@ - + L-Index - + diff --git a/docs/index-files/index-9.html b/docs/index-files/index-9.html index 881b3bb..4256a09 100644 --- a/docs/index-files/index-9.html +++ b/docs/index-files/index-9.html @@ -1,11 +1,11 @@ - + M-Index - + @@ -70,8 +70,10 @@ loadScripts(document, 'script');
     
    menu_opcs() - Method in class cl.conversor.vista.tui.MenuPrincipal
     
    -
    menuConversion() - Method in class cl.conversor.vista.gui.ConversorGui
    -
     
    +
    menuConversion() - Static method in class cl.conversor.vista.gui.ConversorMoneda
    +
    +
    Creates a JMenuBar with currency converter options
    +
    MenuPrincipal - Class in cl.conversor.vista.tui
    Class to create formatted Strings
    @@ -86,6 +88,10 @@ loadScripts(document, 'script');
    Returns String representation of Double `monto`
    +
    montoConversion(String, String) - Static method in class cl.conversor.vista.gui.ConversorMoneda
    +
    +
    Handles user input for amount to convert.
    +
    A B C E G J K L M P R S T U V W Y 
    All Classes and Interfaces|All Packages|Serialized Form diff --git a/docs/index.html b/docs/index.html index 50c4512..7ed2f19 100644 --- a/docs/index.html +++ b/docs/index.html @@ -1,11 +1,11 @@ - + Generated Documentation (Untitled) - + diff --git a/docs/member-search-index.js b/docs/member-search-index.js index 514e269..045f1a6 100644 --- a/docs/member-search-index.js +++ b/docs/member-search-index.js @@ -1 +1 @@ -memberSearchIndex = [{"p":"cl.conversor.vista.cli","c":"ConversorCli","l":"ayuda()"},{"p":"cl.conversor.vista.tui","c":"MenuPrincipal","l":"baner()"},{"p":"cl.conversor.vista.tui","c":"MenuPrincipal","l":"baner(String)","u":"baner(java.lang.String)"},{"p":"cl.conversor.vista.tui","c":"Color","l":"BLACK"},{"p":"cl.conversor.vista.tui","c":"Color","l":"BLACK_BKG"},{"p":"cl.conversor.vista.tui","c":"Color","l":"BLUE"},{"p":"cl.conversor.vista.tui","c":"Color","l":"BLUE_BKG"},{"p":"cl.conversor.vista.tui","c":"LimpiarConsola","l":"clear()"},{"p":"cl.conversor.moneda","c":"Moneda","l":"CLP"},{"p":"cl.conversor.vista.tui","c":"Color","l":"code()"},{"p":"cl.conversor.vista.cli","c":"ConversorCli","l":"conversion(Moneda, Moneda, Double)","u":"conversion(cl.conversor.moneda.Moneda,cl.conversor.moneda.Moneda,java.lang.Double)"},{"p":"cl.conversor.vista.tui","c":"ConversorTui","l":"conversion(Moneda, Moneda, Double)","u":"conversion(cl.conversor.moneda.Moneda,cl.conversor.moneda.Moneda,java.lang.Double)"},{"p":"cl.conversor.vista.tui","c":"ConversorTui","l":"conversion(Moneda, Moneda, String)","u":"conversion(cl.conversor.moneda.Moneda,cl.conversor.moneda.Moneda,java.lang.String)"},{"p":"cl.conversor.app","c":"Conversor","l":"Conversor()","u":"%3Cinit%3E()"},{"p":"cl.conversor.vista.cli","c":"ConversorCli","l":"ConversorCli()","u":"%3Cinit%3E()"},{"p":"cl.conversor.vista.gui","c":"ConversorGui","l":"ConversorGui()","u":"%3Cinit%3E()"},{"p":"cl.conversor.vista.tui","c":"ConversorTui","l":"ConversorTui()","u":"%3Cinit%3E()"},{"p":"cl.conversor.moneda","c":"Moneda","l":"convert(Moneda, Double)","u":"convert(cl.conversor.moneda.Moneda,java.lang.Double)"},{"p":"cl.conversor.vista.tui","c":"Color","l":"CYAN"},{"p":"cl.conversor.vista.tui","c":"Color","l":"CYAN_BKG"},{"p":"cl.conversor.vista.tui","c":"MenuPrincipal","l":"error_in()"},{"p":"cl.conversor.moneda","c":"Moneda","l":"esMoneda(String)","u":"esMoneda(java.lang.String)"},{"p":"cl.conversor.moneda","c":"Moneda","l":"EUR"},{"p":"cl.conversor.moneda","c":"Moneda","l":"GBP"},{"p":"cl.conversor.moneda","c":"Moneda","l":"getBase(BigDecimal)","u":"getBase(java.math.BigDecimal)"},{"p":"cl.conversor.vista.tui","c":"Color","l":"GREEN"},{"p":"cl.conversor.vista.tui","c":"Color","l":"GREEN_BKG"},{"p":"cl.conversor.moneda","c":"Moneda","l":"JPY"},{"p":"cl.conversor.moneda","c":"Moneda","l":"KRW"},{"p":"cl.conversor.app","c":"Conversor","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"cl.conversor.vista.cli","c":"ConversorCli","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"cl.conversor.vista.gui","c":"ConversorGui","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"cl.conversor.vista.tui","c":"ConversorTui","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"cl.conversor.vista.tui","c":"MenuPrincipal","l":"menu"},{"p":"cl.conversor.vista.tui","c":"MenuPrincipal","l":"menu_opcs()"},{"p":"cl.conversor.vista.gui","c":"ConversorGui","l":"menuConversion()"},{"p":"cl.conversor.vista.tui","c":"MenuPrincipal","l":"MenuPrincipal(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"cl.conversor.moneda","c":"Moneda","l":"monedaString(Double)","u":"monedaString(java.lang.Double)"},{"p":"cl.conversor.vista.tui","c":"Color","l":"PURPLE"},{"p":"cl.conversor.vista.tui","c":"Color","l":"PURPLE_BCG"},{"p":"cl.conversor.moneda","c":"Moneda","l":"rate()"},{"p":"cl.conversor.vista.tui","c":"Color","l":"RED"},{"p":"cl.conversor.vista.tui","c":"Color","l":"RED_BKG"},{"p":"cl.conversor.vista.tui","c":"Color","l":"RESET"},{"p":"cl.conversor.vista.tui","c":"MenuPrincipal","l":"resultado(String...)","u":"resultado(java.lang.String...)"},{"p":"cl.conversor.moneda","c":"Moneda","l":"symbol()"},{"p":"cl.conversor.vista.tui","c":"MenuPrincipal","l":"titulo"},{"p":"cl.conversor.moneda","c":"Moneda","l":"USD"},{"p":"cl.conversor.moneda","c":"Moneda","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"cl.conversor.vista.tui","c":"Color","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"cl.conversor.moneda","c":"Moneda","l":"values()"},{"p":"cl.conversor.vista.tui","c":"Color","l":"values()"},{"p":"cl.conversor.vista.tui","c":"Color","l":"WHITE"},{"p":"cl.conversor.vista.tui","c":"Color","l":"WHITE_BKG"},{"p":"cl.conversor.vista.tui","c":"Color","l":"YELLOW"},{"p":"cl.conversor.vista.tui","c":"Color","l":"YELLOW_BKG"}];updateSearchResults(); \ No newline at end of file +memberSearchIndex = [{"p":"cl.conversor.vista.cli","c":"ConversorCli","l":"ayuda()"},{"p":"cl.conversor.vista.tui","c":"MenuPrincipal","l":"baner()"},{"p":"cl.conversor.vista.tui","c":"MenuPrincipal","l":"baner(String)","u":"baner(java.lang.String)"},{"p":"cl.conversor.vista.tui","c":"Color","l":"BLACK"},{"p":"cl.conversor.vista.tui","c":"Color","l":"BLACK_BKG"},{"p":"cl.conversor.vista.tui","c":"Color","l":"BLUE"},{"p":"cl.conversor.vista.tui","c":"Color","l":"BLUE_BKG"},{"p":"cl.conversor.vista.tui","c":"LimpiarConsola","l":"clear()"},{"p":"cl.conversor.moneda","c":"Moneda","l":"CLP"},{"p":"cl.conversor.vista.tui","c":"Color","l":"code()"},{"p":"cl.conversor.vista.cli","c":"ConversorCli","l":"conversion(Moneda, Moneda, Double)","u":"conversion(cl.conversor.moneda.Moneda,cl.conversor.moneda.Moneda,java.lang.Double)"},{"p":"cl.conversor.vista.tui","c":"ConversorTui","l":"conversion(Moneda, Moneda, Double)","u":"conversion(cl.conversor.moneda.Moneda,cl.conversor.moneda.Moneda,java.lang.Double)"},{"p":"cl.conversor.vista.tui","c":"ConversorTui","l":"conversion(Moneda, Moneda, String)","u":"conversion(cl.conversor.moneda.Moneda,cl.conversor.moneda.Moneda,java.lang.String)"},{"p":"cl.conversor.app","c":"Conversor","l":"Conversor()","u":"%3Cinit%3E()"},{"p":"cl.conversor.vista.cli","c":"ConversorCli","l":"ConversorCli()","u":"%3Cinit%3E()"},{"p":"cl.conversor.vista.gui","c":"ConversorGui","l":"ConversorGui()","u":"%3Cinit%3E()"},{"p":"cl.conversor.vista.gui","c":"ConversorMoneda","l":"ConversorMoneda()","u":"%3Cinit%3E()"},{"p":"cl.conversor.vista.tui","c":"ConversorTui","l":"ConversorTui()","u":"%3Cinit%3E()"},{"p":"cl.conversor.moneda","c":"Moneda","l":"convert(Moneda, Double)","u":"convert(cl.conversor.moneda.Moneda,java.lang.Double)"},{"p":"cl.conversor.vista.tui","c":"Color","l":"CYAN"},{"p":"cl.conversor.vista.tui","c":"Color","l":"CYAN_BKG"},{"p":"cl.conversor.vista.tui","c":"MenuPrincipal","l":"error_in()"},{"p":"cl.conversor.moneda","c":"Moneda","l":"esMoneda(String)","u":"esMoneda(java.lang.String)"},{"p":"cl.conversor.moneda","c":"Moneda","l":"EUR"},{"p":"cl.conversor.moneda","c":"Moneda","l":"GBP"},{"p":"cl.conversor.moneda","c":"Moneda","l":"getBase(BigDecimal)","u":"getBase(java.math.BigDecimal)"},{"p":"cl.conversor.vista.tui","c":"Color","l":"GREEN"},{"p":"cl.conversor.vista.tui","c":"Color","l":"GREEN_BKG"},{"p":"cl.conversor.moneda","c":"Moneda","l":"JPY"},{"p":"cl.conversor.moneda","c":"Moneda","l":"KRW"},{"p":"cl.conversor.app","c":"Conversor","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"cl.conversor.vista.cli","c":"ConversorCli","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"cl.conversor.vista.gui","c":"ConversorGui","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"cl.conversor.vista.tui","c":"ConversorTui","l":"main(String[])","u":"main(java.lang.String[])"},{"p":"cl.conversor.vista.tui","c":"MenuPrincipal","l":"menu"},{"p":"cl.conversor.vista.tui","c":"MenuPrincipal","l":"menu_opcs()"},{"p":"cl.conversor.vista.gui","c":"ConversorMoneda","l":"menuConversion()"},{"p":"cl.conversor.vista.tui","c":"MenuPrincipal","l":"MenuPrincipal(String)","u":"%3Cinit%3E(java.lang.String)"},{"p":"cl.conversor.moneda","c":"Moneda","l":"monedaString(Double)","u":"monedaString(java.lang.Double)"},{"p":"cl.conversor.vista.gui","c":"ConversorMoneda","l":"montoConversion(String, String)","u":"montoConversion(java.lang.String,java.lang.String)"},{"p":"cl.conversor.vista.tui","c":"Color","l":"PURPLE"},{"p":"cl.conversor.vista.tui","c":"Color","l":"PURPLE_BCG"},{"p":"cl.conversor.moneda","c":"Moneda","l":"rate()"},{"p":"cl.conversor.vista.tui","c":"Color","l":"RED"},{"p":"cl.conversor.vista.tui","c":"Color","l":"RED_BKG"},{"p":"cl.conversor.vista.tui","c":"Color","l":"RESET"},{"p":"cl.conversor.vista.tui","c":"MenuPrincipal","l":"resultado(String...)","u":"resultado(java.lang.String...)"},{"p":"cl.conversor.vista.gui","c":"ConversorMoneda","l":"resultadoConversion(Moneda, Moneda)","u":"resultadoConversion(cl.conversor.moneda.Moneda,cl.conversor.moneda.Moneda)"},{"p":"cl.conversor.moneda","c":"Moneda","l":"symbol()"},{"p":"cl.conversor.vista.tui","c":"MenuPrincipal","l":"titulo"},{"p":"cl.conversor.moneda","c":"Moneda","l":"USD"},{"p":"cl.conversor.moneda","c":"Moneda","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"cl.conversor.vista.tui","c":"Color","l":"valueOf(String)","u":"valueOf(java.lang.String)"},{"p":"cl.conversor.moneda","c":"Moneda","l":"values()"},{"p":"cl.conversor.vista.tui","c":"Color","l":"values()"},{"p":"cl.conversor.vista.tui","c":"Color","l":"WHITE"},{"p":"cl.conversor.vista.tui","c":"Color","l":"WHITE_BKG"},{"p":"cl.conversor.vista.tui","c":"Color","l":"YELLOW"},{"p":"cl.conversor.vista.tui","c":"Color","l":"YELLOW_BKG"}];updateSearchResults(); \ No newline at end of file diff --git a/docs/overview-tree.html b/docs/overview-tree.html index ebf3dd5..fee45c9 100644 --- a/docs/overview-tree.html +++ b/docs/overview-tree.html @@ -1,11 +1,11 @@ - + Class Hierarchy - + @@ -75,6 +75,7 @@ loadScripts(document, 'script');
  • javax.swing.JFrame (implements javax.accessibility.Accessible, javax.swing.RootPaneContainer, javax.swing.WindowConstants)
    • diff --git a/docs/serialized-form.html b/docs/serialized-form.html index 6eb8e94..2c30469 100644 --- a/docs/serialized-form.html +++ b/docs/serialized-form.html @@ -1,11 +1,11 @@ - + Serialized Form - + @@ -86,47 +86,25 @@ loadScripts(document, 'script'); 
    JMenuItem opcion1
  • -
    opcion10
    -
    JMenuItem opcion10
    -
    • -
  • opcion2
    JMenuItem opcion2
    • -
  • -
    opcion3
    -
    JMenuItem opcion3
    -
    • -
  • -
    opcion4
    -
    JMenuItem opcion4
    -
    • -
  • -
    opcion5
    -
    JMenuItem opcion5
    -
    • -
  • -
    opcion6
    -
    JMenuItem opcion6
    -
    • -
  • -
    opcion7
    -
    JMenuItem opcion7
    -
    • -
  • -
    opcion8
    -
    JMenuItem opcion8
    -
    • -
  • -
    opcion9
    -
    JMenuItem opcion9
    -
    • +
  • +
    +

    Class cl.conversor.vista.gui.ConversorMoneda

    +
    class ConversorMoneda extends JFrame implements Serializable
    +
    +
    serialVersionUID:
    +
    1L
    +
    +
    +
    • diff --git a/docs/type-search-index.js b/docs/type-search-index.js index 96cd093..c5d7c85 100644 --- a/docs/type-search-index.js +++ b/docs/type-search-index.js @@ -1 +1 @@ -typeSearchIndex = [{"l":"All Classes and Interfaces","u":"allclasses-index.html"},{"p":"cl.conversor.vista.tui","l":"Color"},{"p":"cl.conversor.app","l":"Conversor"},{"p":"cl.conversor.vista.cli","l":"ConversorCli"},{"p":"cl.conversor.vista.gui","l":"ConversorGui"},{"p":"cl.conversor.vista.tui","l":"ConversorTui"},{"p":"cl.conversor.vista.tui","l":"LimpiarConsola"},{"p":"cl.conversor.vista.tui","l":"MenuPrincipal"},{"p":"cl.conversor.moneda","l":"Moneda"}];updateSearchResults(); \ No newline at end of file +typeSearchIndex = [{"l":"All Classes and Interfaces","u":"allclasses-index.html"},{"p":"cl.conversor.vista.tui","l":"Color"},{"p":"cl.conversor.app","l":"Conversor"},{"p":"cl.conversor.vista.cli","l":"ConversorCli"},{"p":"cl.conversor.vista.gui","l":"ConversorGui"},{"p":"cl.conversor.vista.gui","l":"ConversorMoneda"},{"p":"cl.conversor.vista.tui","l":"ConversorTui"},{"p":"cl.conversor.vista.tui","l":"LimpiarConsola"},{"p":"cl.conversor.vista.tui","l":"MenuPrincipal"},{"p":"cl.conversor.moneda","l":"Moneda"}];updateSearchResults(); \ No newline at end of file diff --git a/media/converter_icon.png b/media/converter_icon.png new file mode 100644 index 0000000..7dc19ef Binary files /dev/null and b/media/converter_icon.png differ diff --git a/src/cl/conversor/app/Conversor.java b/src/cl/conversor/app/Conversor.java index b446407..b4b0778 100644 --- a/src/cl/conversor/app/Conversor.java +++ b/src/cl/conversor/app/Conversor.java @@ -1,6 +1,8 @@ /** - * Currency converter for Alura Challenge - G5 ONE + * Converter application for Alura Challenge #2 - G5 ONE + * @version 0.1 * @author DevFzn + * @email devfzn@proton.me */ package cl.conversor.app; diff --git a/src/cl/conversor/moneda/Moneda.java b/src/cl/conversor/moneda/Moneda.java index 9d2f29a..0af704d 100644 --- a/src/cl/conversor/moneda/Moneda.java +++ b/src/cl/conversor/moneda/Moneda.java @@ -12,7 +12,7 @@ public enum Moneda { CLP ("\uf155", new BigDecimal("827.786512")), EUR ("\uf153", new BigDecimal("0.904528")), GBP ("\uf154", new BigDecimal("0.775054")), - JPY ("\uffe5", new BigDecimal("140.92065996")), + JPY ("\uf157", new BigDecimal("140.92065996")), KRW ("\uf159", new BigDecimal("1276.580533")); private final String symbol; diff --git a/src/cl/conversor/vista/gui/ConversorGui.java b/src/cl/conversor/vista/gui/ConversorGui.java index 874f96d..24ff79f 100644 --- a/src/cl/conversor/vista/gui/ConversorGui.java +++ b/src/cl/conversor/vista/gui/ConversorGui.java @@ -1,13 +1,19 @@ /** - * + * Converter application for Alura Challenge #2 - G5 ONE */ package cl.conversor.vista.gui; -import javax.swing.*; -import java.awt.*; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.io.IOException; + +import javax.swing.ImageIcon; +import javax.swing.JFrame; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JOptionPane; +import javax.swing.JPanel; +import javax.swing.SwingUtilities; /** * Main class for GUI converter application @@ -15,96 +21,75 @@ import java.io.IOException; public class ConversorGui extends JFrame { private static final long serialVersionUID = 1L; - private JMenuBar menuBar; - private JMenu menu; - private JMenuItem opcion0; - private JMenuItem opcion1; - private JMenuItem opcion2; - private JMenuItem opcion3; - private JMenuItem opcion4; - private JMenuItem opcion5; - private JMenuItem opcion6; - private JMenuItem opcion7; - private JMenuItem opcion8; - private JMenuItem opcion9; - private JMenuItem opcion10; + private JMenuBar menuBar; + private JMenu menu; + private JMenuItem opcion0; + private JMenuItem opcion1; + private JMenuItem opcion2; public ConversorGui() { + try { - Image icono; - icono = javax.imageio.ImageIO.read(new java.io.File("media/logo_green.png")); - setIconImage(icono); - } catch (IOException e) { + ImageIcon icono = new ImageIcon(getClass().getResource("/imagenes/logo_green.png")); + setIconImage(icono.getImage()); + } catch (Exception e) { System.out.println("Icono no encontrado"); - e.printStackTrace(); } - setSize(600,400); + setSize(330,100); setTitle("Conversor Alura G5 ONE"); setLocationRelativeTo(null); setDefaultCloseOperation(EXIT_ON_CLOSE); JPanel panel = new JPanel(); - menuConversion(); + menuPrincipal(); panel.add(menuBar); add(panel); opcion0.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - JOptionPane.showMessageDialog(panel, "Finalizando conversor"); + JOptionPane.showMessageDialog( + menuBar.getParent(), "Finalizando conversor", + "Cerrando aplicación", JOptionPane.INFORMATION_MESSAGE); System.exit(0); } - }); + + opcion1.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + panel.remove(menuBar); + panel.add(ConversorMoneda.menuConversion()); + add(panel); + panel.revalidate(); + } + }); + } - public void menuConversion() { + private void menuPrincipal() { menuBar = new JMenuBar(); menu = new JMenu("Elige una opción"); menu.setMnemonic('e'); - opcion0 = new JMenuItem("Salir"); - opcion1 = new JMenuItem("Convertir CLP a USD"); - opcion2 = new JMenuItem("Convertir CLP a EUR"); - opcion3 = new JMenuItem("Convertir CLP a GBP"); - opcion4 = new JMenuItem("Convertir CLP a JPY"); - opcion5 = new JMenuItem("Convertir CLP a KRW"); - opcion6 = new JMenuItem("Convertir USD a CLP"); - opcion7 = new JMenuItem("Convertir EUR a CLP"); - opcion8 = new JMenuItem("Convertir GBP a CLP"); - opcion9 = new JMenuItem("Convertir JPY a CLP"); - opcion10 = new JMenuItem("Convertir KRW a CLP"); - + opcion1 = new JMenuItem("Conversor de Monedas"); + opcion2 = new JMenuItem("Otros (pendiente)"); opcion0.setMnemonic('s'); - opcion1.setMnemonic('1'); - opcion2.setMnemonic('2'); - opcion3.setMnemonic('3'); - opcion4.setMnemonic('4'); - opcion5.setMnemonic('5'); - opcion6.setMnemonic('6'); - opcion7.setMnemonic('7'); - opcion8.setMnemonic('8'); - opcion9.setMnemonic('9'); - opcion10.setMnemonic('0'); - + opcion1.setMnemonic('c'); + opcion2.setMnemonic('o'); + opcion2.setEnabled(false); + menu.add(opcion1); menu.add(opcion2); - menu.add(opcion3); - menu.add(opcion4); - menu.add(opcion5); - menu.add(opcion6); - menu.add(opcion7); - menu.add(opcion8); - menu.add(opcion9); - menu.add(opcion10); menu.add(opcion0); menuBar.add(menu); } + /** * @param args Not used */ public static void main(String[] args) { - System.out.println("Conversor GUI version \u2665"); + //System.out.println("Conversor GUI version \u2665"); SwingUtilities.invokeLater(() -> { ConversorGui aplicacion = new ConversorGui(); aplicacion.setVisible(true); diff --git a/src/cl/conversor/vista/gui/ConversorMoneda.java b/src/cl/conversor/vista/gui/ConversorMoneda.java new file mode 100644 index 0000000..9ffbe19 --- /dev/null +++ b/src/cl/conversor/vista/gui/ConversorMoneda.java @@ -0,0 +1,210 @@ +package cl.conversor.vista.gui; + +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +import javax.swing.JFrame; +import javax.swing.JMenu; +import javax.swing.JMenuBar; +import javax.swing.JMenuItem; +import javax.swing.JOptionPane; + +import cl.conversor.moneda.Moneda; + +/** + * Currency converter class + */ +public class ConversorMoneda extends JFrame { + + private static final long serialVersionUID = 1L; + private static final String titulo = "Conversión de Moneda"; + private static JMenuBar menuBarOpcs; + private static JMenu menuOpcs; + private static JMenuItem opcion0; + private static JMenuItem opcion1; + private static JMenuItem opcion2; + private static JMenuItem opcion3; + private static JMenuItem opcion4; + private static JMenuItem opcion5; + private static JMenuItem opcion6; + private static JMenuItem opcion7; + private static JMenuItem opcion8; + private static JMenuItem opcion9; + private static JMenuItem opcion10; + + + /** Creates a JMenuBar with currency converter options + * @return JMenuBar + */ + public static Component menuConversion() { + menuBarOpcs = new JMenuBar(); + menuOpcs = new JMenu("Opciones de conversión"); + menuOpcs.setMnemonic('o'); + + opcion0 = new JMenuItem("Salir"); + opcion1 = new JMenuItem("Convertir CLP a USD"); + opcion2 = new JMenuItem("Convertir CLP a EUR"); + opcion3 = new JMenuItem("Convertir CLP a GBP"); + opcion4 = new JMenuItem("Convertir CLP a JPY"); + opcion5 = new JMenuItem("Convertir CLP a KRW"); + opcion6 = new JMenuItem("Convertir USD a CLP"); + opcion7 = new JMenuItem("Convertir EUR a CLP"); + opcion8 = new JMenuItem("Convertir GBP a CLP"); + opcion9 = new JMenuItem("Convertir JPY a CLP"); + opcion10 = new JMenuItem("Convertir KRW a CLP"); + + opcion0.setMnemonic('s'); + opcion1.setMnemonic('1'); + opcion2.setMnemonic('2'); + opcion3.setMnemonic('3'); + opcion4.setMnemonic('4'); + opcion5.setMnemonic('5'); + opcion6.setMnemonic('6'); + opcion7.setMnemonic('7'); + opcion8.setMnemonic('8'); + opcion9.setMnemonic('9'); + opcion10.setMnemonic('0'); + + menuOpcs.add(opcion1); + menuOpcs.add(opcion2); + menuOpcs.add(opcion3); + menuOpcs.add(opcion4); + menuOpcs.add(opcion5); + menuOpcs.add(opcion6); + menuOpcs.add(opcion7); + menuOpcs.add(opcion8); + menuOpcs.add(opcion9); + menuOpcs.add(opcion10); + menuOpcs.add(opcion0); + menuBarOpcs.add(menuOpcs); + + opcion0.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + JOptionPane.showMessageDialog( + menuOpcs, "Finalizando conversor", + "Cerrando aplicación", JOptionPane.INFORMATION_MESSAGE); + System.exit(0); + } + }); + + opcion1.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + resultadoConversion(Moneda.CLP, Moneda.USD); + } + }); + + opcion2.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + resultadoConversion(Moneda.CLP, Moneda.EUR); + } + }); + + opcion3.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + resultadoConversion(Moneda.CLP, Moneda.GBP); + } + }); + + opcion4.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + resultadoConversion(Moneda.CLP, Moneda.JPY); + } + }); + + opcion5.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + resultadoConversion(Moneda.CLP, Moneda.KRW); + } + }); + + opcion6.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + resultadoConversion(Moneda.USD, Moneda.CLP); + } + }); + + opcion7.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + resultadoConversion(Moneda.EUR, Moneda.CLP); + } + }); + + opcion8.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + resultadoConversion(Moneda.GBP, Moneda.CLP); + } + }); + + opcion9.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + resultadoConversion(Moneda.JPY, Moneda.CLP); + } + }); + + opcion10.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + resultadoConversion(Moneda.KRW, Moneda.CLP); + } + }); + + return menuBarOpcs; + } + + /** + * Handles user input for amount to convert. Validates, converts and return value. + * @param orig String origin currency + * @param dest String target currency + * @return Double amount to convert + */ + public static Double montoConversion(String orig, String dest) { + Double montoIn = 0D; + String resp; + while (montoIn == 0D) { + try { + resp = JOptionPane.showInputDialog( + menuBarOpcs, "Ingresa el monto a convertir", + "Conversion "+orig+" a "+dest, + JOptionPane.QUESTION_MESSAGE); + if (resp == null) { + return null; + } else { + return montoIn = Double.valueOf(resp); + } + } catch (NumberFormatException e) { + JOptionPane.showMessageDialog( + menuBarOpcs, "Debes ingresar un número válido", + titulo, JOptionPane.INFORMATION_MESSAGE); + } + } + return null; + } + + /** + * Shows result of currency conversion + * @param orig Moneda origin currency + * @param dest Moneda target currency + */ + public static void resultadoConversion(Moneda orig, Moneda dest) { + Double monto = montoConversion(orig.name(), dest.name()); + if (monto != null) { + StringBuilder resultado = new StringBuilder(); + resultado.append(orig.symbol()+" "+Moneda.monedaString(monto)+" "+orig.name()+" equivalen a "); + resultado.append(dest.symbol()+" "+Moneda.monedaString(orig.convert(dest, monto))); + resultado.append(" "+dest.name()); + JOptionPane.showMessageDialog(menuBarOpcs, resultado.toString(), titulo, JOptionPane.INFORMATION_MESSAGE); + } + } + +} diff --git a/media/logo_green.png b/src/imagenes/logo_green.png similarity index 100% rename from media/logo_green.png rename to src/imagenes/logo_green.png diff --git a/target/Conversor.jar b/target/Conversor.jar index d43a83b..8c1cba0 100644 Binary files a/target/Conversor.jar and b/target/Conversor.jar differ