Merge pull request #4 from Vinceto/developer

fix proyecto + D5
G7-Full-Stack-Java-Trainee-0057 · May 10, 2024 · bc35566 · bc35566
2 parents 6ef728e + cfba098
commit bc35566
Show file tree

Hide file tree

Showing 42 changed files with 135 additions and 305 deletions.
diff --git a/Vinceto/D2/.gitignore b/Vinceto/D2/.gitignore
diff --git a/Vinceto/D2/src/Main.java b/Vinceto/D2/src/Main.java
diff --git a/Vinceto/D3/Ejercicios/D3.iml b/Vinceto/D3/Ejercicios/D3.iml
diff --git a/Vinceto/D3/Ejercicios/out/production/D3/Main.class b/Vinceto/D3/Ejercicios/out/production/D3/Main.class
diff --git a/Vinceto/D3/Ejercicios/out/production/D3/cl/desafiolatam/AreaRectangulo.class b/Vinceto/D3/Ejercicios/out/production/D3/cl/desafiolatam/AreaRectangulo.class
diff --git a/Vinceto/D3/Resistencia/DO_resistencia.drawio b/Vinceto/D3/Resistencia/DO_resistencia.drawio
diff --git a/Vinceto/D3/Resistencia/Resistencia.iml b/Vinceto/D3/Resistencia/Resistencia.iml
diff --git a/Vinceto/D3/Resistencia/src/Main.java b/Vinceto/D3/Resistencia/src/Main.java
diff --git a/Vinceto/D4/.gitignore b/Vinceto/D4/.gitignore
diff --git a/Vinceto/D4/D4.iml b/Vinceto/D4/D4.iml
diff --git a/Vinceto/D4/src/Main.java b/Vinceto/D4/src/Main.java
diff --git a/Vinceto/D4/src/ep/Calificaciones.java b/Vinceto/D4/src/ep/Calificaciones.java
diff --git a/Vinceto/D4/src/ep/CompararCadenasEP.java b/Vinceto/D4/src/ep/CompararCadenasEP.java
diff --git a/Vinceto/D2/D2.iml → Vinceto/FundamentosJava.iml b/Vinceto/D2/D2.iml → Vinceto/FundamentosJava.iml
diff --git a/Vinceto/out/production/FundamentosJava/D2/CalcularVelocidad.class b/Vinceto/out/production/FundamentosJava/D2/CalcularVelocidad.class
diff --git a/Vinceto/out/production/FundamentosJava/D2/Promedio_Final.class b/Vinceto/out/production/FundamentosJava/D2/Promedio_Final.class
diff --git a/Vinceto/out/production/FundamentosJava/D2/String_Y_Formato.class b/Vinceto/out/production/FundamentosJava/D2/String_Y_Formato.class
diff --git a/Vinceto/out/production/FundamentosJava/D3/AreaRectangulo.class b/Vinceto/out/production/FundamentosJava/D3/AreaRectangulo.class
diff --git a/...latam/HipotenusaTrianguloRectangulo.class → ...va/D3/HipotenusaTrianguloRectangulo.class b/...latam/HipotenusaTrianguloRectangulo.class → ...va/D3/HipotenusaTrianguloRectangulo.class
diff --git a/...cl/desafiolatam/PerimetroRectangulo.class → ...damentosJava/D3/PerimetroRectangulo.class b/...cl/desafiolatam/PerimetroRectangulo.class → ...damentosJava/D3/PerimetroRectangulo.class
diff --git a/...ion/Resistencia/desafio/Resistencia.class → ...tion/FundamentosJava/D3/Resistencia.class b/...ion/Resistencia/desafio/Resistencia.class → ...tion/FundamentosJava/D3/Resistencia.class
diff --git a/Vinceto/D4/src/ep/CalculadoraSimple.class → ...undamentosJava/D4/CalculadoraSimple.class b/Vinceto/D4/src/ep/CalculadoraSimple.class → ...undamentosJava/D4/CalculadoraSimple.class
diff --git a/Vinceto/out/production/FundamentosJava/D4/Calificaciones.class b/Vinceto/out/production/FundamentosJava/D4/Calificaciones.class
diff --git a/Vinceto/out/production/FundamentosJava/D4/CompararCadenas.class b/Vinceto/out/production/FundamentosJava/D4/CompararCadenas.class
diff --git a/Vinceto/out/production/FundamentosJava/D4/CompararCadenasEP.class b/Vinceto/out/production/FundamentosJava/D4/CompararCadenasEP.class
diff --git a/Vinceto/out/production/FundamentosJava/D4/EstadoProyecto.class b/Vinceto/out/production/FundamentosJava/D4/EstadoProyecto.class
diff --git a/Vinceto/out/production/FundamentosJava/D5/CalcularIMC.class b/Vinceto/out/production/FundamentosJava/D5/CalcularIMC.class
diff --git a/Vinceto/out/production/FundamentosJava/D5/EvaluarExamen.class b/Vinceto/out/production/FundamentosJava/D5/EvaluarExamen.class
diff --git a/...cia/out/production/Resistencia/Main.class → ...out/production/FundamentosJava/Main.class b/...cia/out/production/Resistencia/Main.class → ...out/production/FundamentosJava/Main.class
diff --git a/.../D2/src/Ejercicios/CalcularVelocidad.java → Vinceto/src/D2/CalcularVelocidad.java b/.../D2/src/Ejercicios/CalcularVelocidad.java → Vinceto/src/D2/CalcularVelocidad.java
@@ -1,4 +1,4 @@
-package Ejercicios;
+package D2;
 import java.util.Scanner;
 public class CalcularVelocidad {
     public static void main(String[] args) {

diff --git a/...eto/D2/src/Ejercicios/Promedio_Final.java → Vinceto/src/D2/Promedio_Final.java b/...eto/D2/src/Ejercicios/Promedio_Final.java → Vinceto/src/D2/Promedio_Final.java
@@ -1,4 +1,4 @@
-package Ejercicios;
+package D2;
 import java.util.Scanner;
 public class Promedio_Final {
     public static void main(String[] args) {

diff --git a/...o/D2/src/Ejercicios/String_Y_Formato.java → Vinceto/src/D2/String_Y_Formato.java b/...o/D2/src/Ejercicios/String_Y_Formato.java → Vinceto/src/D2/String_Y_Formato.java
@@ -1,4 +1,4 @@
-package Ejercicios;
+package D2;
 import java.util.Scanner;
 public class String_Y_Formato {
     /*

diff --git a/...s/src/cl/desafiolatam/AreaRectangulo.java → Vinceto/src/D3/AreaRectangulo.java b/...s/src/cl/desafiolatam/AreaRectangulo.java → Vinceto/src/D3/AreaRectangulo.java
@@ -1,4 +1,4 @@
-package cl.desafiolatam;
+package D3;
 
 import java.util.Scanner;
 

diff --git a/...olatam/HipotenusaTrianguloRectangulo.java → ...src/D3/HipotenusaTrianguloRectangulo.java b/...olatam/HipotenusaTrianguloRectangulo.java → ...src/D3/HipotenusaTrianguloRectangulo.java
@@ -1,4 +1,4 @@
-package cl.desafiolatam;
+package D3;
 
 import java.util.Scanner;
 

diff --git a/.../cl/desafiolatam/PerimetroRectangulo.java → Vinceto/src/D3/PerimetroRectangulo.java b/.../cl/desafiolatam/PerimetroRectangulo.java → Vinceto/src/D3/PerimetroRectangulo.java
@@ -1,4 +1,4 @@
-package cl.desafiolatam;
+package D3;
 
 import java.util.Scanner;
 

diff --git a/.../Resistencia/src/desafio/Resistencia.java → Vinceto/src/D3/Resistencia.java b/.../Resistencia/src/desafio/Resistencia.java → Vinceto/src/D3/Resistencia.java
@@ -1,4 +1,4 @@
-package desafio;
+package D3;
 
 import java.util.Scanner;