Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions Java/Clase2/ArgumentosVariables/ArgumentosVariables.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
11 changes: 11 additions & 0 deletions Java/Clase2/BloquesInicializacion/BloquesInicializacion.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
11 changes: 11 additions & 0 deletions Java/Clase2/Enumeraciones/Enumeraciones.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
102 changes: 61 additions & 41 deletions Java/LECCION09/CalculadoraUTN/src/CalculadoraUTN.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,36 @@ public class CalculadoraUTN {
public static void main(String[] args){
Scanner entrada = new Scanner(System.in);
System.out.println("***** Aplicación Calculadora *****");
mostrarMenu();

while(true) {//Ciclo infinite


try {
var operacion = Integer.parseInt(entrada.nextLine());

if (operacion >= 1 && operacion <= 4) {

ejecutarOperacion(operacion, entrada);


} // FIN DEL IF
else if (operacion == 5) {
System.out.println("Has seleccionado salir. Hasta pronto..");
break;
} else {
System.out.println("Operacion error: " + operacion);
}
//Imprimimos un salto de linea antes de reptir menu
System.out.println();
} catch (Exception e){//Fin del try comiwnzo catch
System.out.println();
System.out.println("Ocurrió un error: "+e.getMessage());
}
}// Fin whilw
} // FIN MAIN

private static void mostrarMenu(){
// MENÚ:
System.out.println("""
1) Suma
Expand All @@ -14,46 +44,36 @@ public static void main(String[] args){
""");

System.out.print("Que desea realizar? ");
var operacion = Integer.parseInt(entrada.nextLine());

if(operacion >= 1 && operacion <= 4){
System.out.print("Digite el valor para el operando 1: ");
var operando1 = Integer.parseInt(entrada.nextLine());
System.out.print("Digite el valor para el operando 2: ");
var operando2 = Integer.parseInt(entrada.nextLine());

int resultado;
switch (operacion){
//SUMA
case 1 -> {
resultado = operando1 + operando2;
System.out.println("Resultado de la suma: "+resultado);
}
//RESTA
case 2 -> {
resultado = operando1 - operando2;
System.out.println("Resultado de la resta: "+resultado);
}
//MULTIPLICACION
case 3 ->{
resultado = operando1 * operando2;
System.out.println("Resultado de la multiplicación: "+resultado);
}
//DIVISION
case 4 -> {
resultado = operando1 / operando2;
System.out.println("Resultado de la división: "+resultado);
}
default -> System.out.println("Opción invalida: "+operacion);
} // FIN SWITCH

} // FIN DEL IF
else if (operacion == 5) {
System.out.println("Has seleccionado salir. Hasta pronto..");
}
else {
System.out.println("Operacion error: "+operacion);
}

} // FIN MAIN
}//Fin metodo mostrar menu
private static void ejecutarOperacion(int operacion, Scanner entrada){
System.out.print("Digite el valor para el operando 1: ");
var operando1 = Double.parseDouble(entrada.nextLine());
System.out.print("Digite el valor para el operando 2: ");
var operando2 = Double.parseDouble(entrada.nextLine());
Double resultado;
switch (operacion) {
//SUMA
case 1 -> {
resultado = operando1 + operando2;
System.out.println("Resultado de la suma: " + resultado);
}
//RESTA
case 2 -> {
resultado = operando1 - operando2;
System.out.println("Resultado de la resta: " + resultado);
}
//MULTIPLICACION
case 3 -> {
resultado = operando1 * operando2;
System.out.println("Resultado de la multiplicación: " + resultado);
}
//DIVISION
case 4 -> {
resultado = operando1 / operando2;
System.out.println("Resultado de la división: " + resultado);
}
default -> System.out.println("Opción invalida: " + operacion);
} // FIN SWITCH
}//Fin metodo ejecutar operacion
} // FIN CLASE
11 changes: 11 additions & 0 deletions Java/LECCION09/LECCION09.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/CalculadoraUTN/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
11 changes: 11 additions & 0 deletions Java/Leccion03/AutoboxingUnboxing/AutoboxingUnboxing.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
11 changes: 11 additions & 0 deletions Java/Leccion03/ForEach/ForEach.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
11 changes: 11 additions & 0 deletions Java/Leccion03/ModificadoresAcceso/ModificadoresAcceso.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
11 changes: 11 additions & 0 deletions Java/Leccion06/Leccion06.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/interfaces/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
11 changes: 11 additions & 0 deletions Java/Leccion08/ManejoExepciones1/ManejoExepciones11.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
11 changes: 11 additions & 0 deletions Java/Leccion08/ManejoExepciones1/src/ManejoExepciones1.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
11 changes: 11 additions & 0 deletions Java/Leccion4/Leccion4.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/Sobreescritura/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
11 changes: 11 additions & 0 deletions Java/Leccion5/ClaseObject/ClaseObject1.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
11 changes: 11 additions & 0 deletions Java/Leccion5/ClasesAbstractas/ClasesAbstractas.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
11 changes: 11 additions & 0 deletions Java/Leccion5/ConversionObjetos/ConversionObjetos.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
11 changes: 11 additions & 0 deletions Java/Leccion5/Leccion5/ClaseObject/ClaseObject.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
11 changes: 11 additions & 0 deletions Java/Leccion5/Leccion5/ConversionObjetos/ConversionObjetos1.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
11 changes: 11 additions & 0 deletions Java/Lección01/Lección01.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/MundoPc/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
11 changes: 11 additions & 0 deletions Java/leccion07/leccion07.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/JavaBeans/src" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
</component>
</module>
Binary file added out/production/LECCION09/CalculadoraUTN.class
Binary file not shown.