Skip to content

Commit 130a628

Browse files
firedevelopfiredevelop
committed
.
.
1 parent e8f24db commit 130a628

25 files changed

+256
-117
lines changed

‎intelliJ/src/j005_ClaseDerivada/Bussiness.java renamed to ‎eclipse/src/j005_ClaseDerivada/Business.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,27 @@
33
import java.text.SimpleDateFormat;
44
import java.util.Date;
55

6-
public class Bussiness {
6+
public class Business {
77
protected Employee employee; // Cambiado a protected para el acceso en ClaseDerivada
88
protected int phone; // Cambiado a protected para el acceso en ClaseDerivada
99
protected String address; // Cambiado a protected para el acceso en ClaseDerivada
1010

1111
// Constructores
12-
public Bussiness() {
12+
public Business() {
1313
employee = new Employee();
1414
phone = 900730222;
1515
address = "Gran Via 33";
1616
}
1717

18-
public Bussiness(Employee employee) {
18+
public Business(Employee employee) {
1919
this(employee, 900730222, "Sol 1");
2020
}
2121

22-
public Bussiness(int phone, String address) {
22+
public Business(int phone, String address) {
2323
this(new Employee(), phone, address);
2424
}
2525

26-
public Bussiness(Employee employee, int phone, String address) {
26+
public Business(Employee employee, int phone, String address) {
2727
this.employee = employee;
2828
this.phone = phone;
2929
this.address = address;

‎eclipse/src/j005_ClaseDerivada/ClaseDerivada.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
package j005_ClaseDerivada;
2-
public class ClaseDerivada extends Empresa {
2+
public class ClaseDerivada extends Business {
33
// Constructor
44
public ClaseDerivada() {
55
super(); // Llama al constructor de Empresa
66
}
77

8-
public ClaseDerivada(Empleado e, int tel, String dir) {
9-
super(e, tel, dir); // Llama al constructor de Empresa con parámetros
8+
public ClaseDerivada(Employee employee, int phone, String address) {
9+
super(employee, phone, address); // Llama al constructor de Empresa con parámetros
1010
}
1111

1212
// Métodos adicionales específicos de ClaseDerivada
1313
public void mostrarInformacion() {
14-
System.out.println("Empleado: " + emp.getNombre());
15-
System.out.println("Teléfono: " + telefono);
16-
System.out.println("Dirección: " + direccion);
14+
System.out.println("Employee: " + employee.getName());
15+
System.out.println("Phone: " + phone);
16+
System.out.println("Address: " + address);
1717
}
1818
}

‎eclipse/src/j005_ClaseDerivada/Empleado.java

-42
This file was deleted.

‎eclipse/src/j005_ClaseDerivada/Employee.java

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
package j005_ClaseDerivada;
2+
import java.util.Date;
3+
4+
public class Employee {
5+
// Atributos
6+
private String passport;
7+
private String name;
8+
private double salary;
9+
private Date birthDay;
10+
11+
// Constructor por Defecto
12+
public Employee() {
13+
this.passport = "100200300";
14+
this.name = "John";
15+
this.salary = 1000;
16+
this.birthDay = new Date();
17+
}
18+
// Constructor Parametrizado
19+
public Employee(String passport, String name, double salary, Date fn) {
20+
this.passport = passport;
21+
this.name = name;
22+
this.salary = salary;
23+
this.birthDay = fn;
24+
}
25+
26+
// Métodos GET y SET
27+
public String getPassport() { return passport; }
28+
public void setPassport(String passport) { this.passport = passport; }
29+
public String getName() { return name; }
30+
public void setName(String name) { this.name = name; }
31+
public Date getBirthDay() { return birthDay; }
32+
public void setBirthDay(Date birthDay) { this.birthDay = birthDay; }
33+
public double getSalary() { return salary; }
34+
public void setSalary(double salary) { this.salary = salary; }
35+
36+
// Métodos
37+
public double horasExtras(double horas) {
38+
double PrecioHora = 11;
39+
double extras = horas * PrecioHora;
40+
return extras;
41+
}
42+
}

‎eclipse/src/j005_ClaseDerivada/Empresa.java

-42
This file was deleted.

‎eclipse/src/j005_ClaseDerivada/MainApp.java

+17-15
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,35 @@
44

55
public class MainApp {
66
public static void main(String[] args) {
7-
// Crear una instancia de Empleado con el constructor por defecto
8-
Empleado empleado1 = new Empleado();
9-
System.out.println("Empleado1: " + empleado1.getNombre() + ", " + empleado1.getDni() + ", " + empleado1.getSueldo() + ", " + empleado1.getFechaNac());
7+
Employee employee1 = new Employee();
8+
System.out.println("Empleado1: " + employee1.getName() + ", " + employee1.getPassport() + ", " + employee1.getSalary() + ", " + employee1.getBirthDay());
109

11-
// Crear una instancia de Empleado con el constructor con parámetros
12-
Date fechaNac = new Date();
13-
Empleado empleado2 = new Empleado("12345678A", "Juan Pérez", 2000, fechaNac);
14-
System.out.println("Empleado2: " + empleado2.getNombre() + ", " + empleado2.getDni() + ", " + empleado2.getSueldo() + ", " + empleado2.getFechaNac());
1510

16-
// Crear una instancia de Empresa
17-
Empresa empresa = new Empresa(empleado2, 123456789, "Calle Falsa 123");
18-
System.out.println("Empresa: " + empresa.emp.getNombre() + ", " + empresa.telefono + ", " + empresa.direccion);
11+
Date birthDay = new Date();
12+
Employee employee2 = new Employee("12345678A", "Mery", 2000, birthDay);
13+
System.out.println("Empleado2: " + employee2.getName() + ", " + employee2.getPassport() + ", " + employee2.getSalary() + ", " + employee2.getBirthDay());
1914

20-
// Calcular horas extras para el empleado
21-
double horasExtras = empresa.horasExtras(10);
15+
Business business = new Business(employee2, 123456789, "Wall Street 100");
16+
System.out.println("Empresa: " + business.employee.getName() + ", " + business.phone + ", " + business.address);
17+
18+
double horasExtras = business.horasExtras(10);
2219
System.out.println("Horas extras: " + horasExtras);
20+
double horasExtras2 = employee1.horasExtras(10);
21+
System.out.println("Horas extras2: " + horasExtras2);
2322

24-
// Dar formato a una fecha
2523
try {
26-
Date fechaFormateada = empresa.fechaNac("15/06/1985");
24+
Date fechaFormateada = business.fechaNac("15/06/1985");
2725
System.out.println("Fecha formateada: " + fechaFormateada);
2826
} catch (ParseException e) {
2927
e.printStackTrace();
3028
}
3129

3230
// Crear una instancia de ClaseDerivada y mostrar la información
33-
ClaseDerivada claseDerivada = new ClaseDerivada(empleado2, 987654321, "Avenida Siempre Viva 742");
31+
ClaseDerivada claseDerivada = new ClaseDerivada(
32+
employee2, 987654321,
33+
"Quinta Avenida 10");
3434
claseDerivada.mostrarInformacion();
35+
ClaseDerivada claseDerivadaDefault = new ClaseDerivada();
36+
3537
}
3638
}

‎eclipse/src/j005_ClaseDerivada/test

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
https://d138wa8fwgcz2d.cloudfront.net
2+
/downloadable_products/
3+
es_ES
4+
/ebooks/
5+
books/
6+
nuevo-corazon-de-la-sabiduria-67289shye4323/
7+
nuevocorazondelasabiduria_v_2.epub

‎eclipse/src/j006_Constructors/Employee.java

Whitespace-only changes.

‎eclipse/src/j006_Constructors/HumanResources.java

Whitespace-only changes.

‎eclipse/src/j006_Constructors/Main.java

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
package j006_Constructors;

‎eclipse/src/sync.ffs_db

58 Bytes
Binary file not shown.

‎intelliJ/src/j005_ClaseDerivada/Business.java

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
package j005_ClaseDerivada;
2+
import java.text.ParseException;
3+
import java.text.SimpleDateFormat;
4+
import java.util.Date;
5+
6+
public class Business {
7+
protected Employee employee; // Cambiado a protected para el acceso en ClaseDerivada
8+
protected int phone; // Cambiado a protected para el acceso en ClaseDerivada
9+
protected String address; // Cambiado a protected para el acceso en ClaseDerivada
10+
11+
// Constructores
12+
public Business() {
13+
employee = new Employee();
14+
phone = 900730222;
15+
address = "Gran Via 33";
16+
}
17+
18+
public Business(Employee employee) {
19+
this(employee, 900730222, "Sol 1");
20+
}
21+
22+
public Business(int phone, String address) {
23+
this(new Employee(), phone, address);
24+
}
25+
26+
public Business(Employee employee, int phone, String address) {
27+
this.employee = employee;
28+
this.phone = phone;
29+
this.address = address;
30+
}
31+
32+
// Método cálculo horas extras Empleado
33+
public double horasExtras(double horas) {
34+
return employee.horasExtras(horas);
35+
}
36+
37+
// Método que da formato a la fecha
38+
public Date fechaNac(String fecha) throws ParseException {
39+
SimpleDateFormat formato = new SimpleDateFormat("dd/MM/yyyy");
40+
return formato.parse(fecha);
41+
}
42+
}

‎intelliJ/src/j005_ClaseDerivada/ClaseDerivada.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package j005_ClaseDerivada;
2-
public class ClaseDerivada extends Bussiness {
2+
public class ClaseDerivada extends Business {
33
// Constructor
44
public ClaseDerivada() {
55
super(); // Llama al constructor de Empresa

‎intelliJ/src/j005_ClaseDerivada/Employee.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ public class Employee {
66
private String passport;
77
private String name;
88
private double salary;
9-
private Date birthDay;
9+
private Date birthDay;
1010

1111
// Constructor por Defecto
1212
public Employee() {

‎intelliJ/src/j005_ClaseDerivada/MainApp.java

+12-5
Original file line numberDiff line numberDiff line change
@@ -7,25 +7,32 @@ public static void main(String[] args) {
77
Employee employee1 = new Employee();
88
System.out.println("Empleado1: " + employee1.getName() + ", " + employee1.getPassport() + ", " + employee1.getSalary() + ", " + employee1.getBirthDay());
99

10+
1011
Date birthDay = new Date();
1112
Employee employee2 = new Employee("12345678A", "Mery", 2000, birthDay);
1213
System.out.println("Empleado2: " + employee2.getName() + ", " + employee2.getPassport() + ", " + employee2.getSalary() + ", " + employee2.getBirthDay());
1314

14-
Bussiness bussiness = new Bussiness(employee2, 123456789, "Wall Street 100");
15-
System.out.println("Empresa: " + bussiness.employee.getName() + ", " + bussiness.phone + ", " + bussiness.address);
15+
Business business = new Business(employee2, 123456789, "Wall Street 100");
16+
System.out.println("Empresa: " + business.employee.getName() + ", " + business.phone + ", " + business.address);
1617

17-
double horasExtras = bussiness.horasExtras(10);
18+
double horasExtras = business.horasExtras(10);
1819
System.out.println("Horas extras: " + horasExtras);
20+
double horasExtras2 = employee1.horasExtras(10);
21+
System.out.println("Horas extras2: " + horasExtras2);
1922

2023
try {
21-
Date fechaFormateada = bussiness.fechaNac("15/06/1985");
24+
Date fechaFormateada = business.fechaNac("15/06/1985");
2225
System.out.println("Fecha formateada: " + fechaFormateada);
2326
} catch (ParseException e) {
2427
e.printStackTrace();
2528
}
2629

2730
// Crear una instancia de ClaseDerivada y mostrar la información
28-
ClaseDerivada claseDerivada = new ClaseDerivada(employee2, 987654321, "Quinta Avenida 10");
31+
ClaseDerivada claseDerivada = new ClaseDerivada(
32+
employee2, 987654321,
33+
"Quinta Avenida 10");
2934
claseDerivada.mostrarInformacion();
35+
ClaseDerivada claseDerivadaDefault = new ClaseDerivada();
36+
3037
}
3138
}

‎intelliJ/src/j005_ClaseDerivada/test

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
https://d138wa8fwgcz2d.cloudfront.net
2+
/downloadable_products/
3+
es_ES
4+
/ebooks/
5+
books/
6+
nuevo-corazon-de-la-sabiduria-67289shye4323/
7+
nuevocorazondelasabiduria_v_2.epub

‎intelliJ/src/j006_Constructors/Employee.java

Whitespace-only changes.

‎intelliJ/src/j006_Constructors/HumanResources.java

Whitespace-only changes.

‎intelliJ/src/j006_Constructors/Main.java

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
package j006_Constructors;
2+

‎intelliJ/src/j007_Modifiers/ClassA.java

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package j007_Modifiers;
2+
3+
public class ClassA {
4+
public int publicVar;
5+
protected int protectedVar;
6+
int defaultVar; // package-private por defecto
7+
private int privateVar;
8+
9+
public void publicMethod() {
10+
System.out.println("Public method in ClassA");
11+
}
12+
13+
protected void protectedMethod() {
14+
System.out.println("Protected method in ClassA");
15+
}
16+
17+
void defaultMethod() {
18+
System.out.println("Default method in ClassA");
19+
}
20+
21+
private void privateMethod() {
22+
System.out.println("Private method in ClassA");
23+
}
24+
}

0 commit comments

Comments
 (0)