bop!ar24p3RM@2(^<8c4U`na4HN*y4Jc4CQX@PoHTo3
zZv%&CPMsl6KUA6&!n+QUAW31xsQi>ilJ3`Fv0PcIQZ?toZHRqSrZav$kDIa+GzzNLGE5T!-xYnEmC-)|i++Z5Sw&`iELhUYZjWzpuYPg&Z&BQ4lu0xwcH
z#7hmYWUIbrSm_PAX}@vKMIo5?V0`v@!*}FR|JdKCu3)MIlpKZhg;XD
zx#4(p*%l+rzwfgTwz$~epe{s-TUO2V1+`MI*tT#>7WX{iX*gn79m;7GRSi`4rT;gj
zwg!3OE-h<>b}T_(dOb*r$hSb9wEya)g;ytSIGt&^*>t98G2-};z8}%;CqxMeSTp_v
zGd4QVj5{5S8~F~VjZD0QjIogDVBW}R9W1^j%LqQE@3QimLJZSL67~eWIx_A8GW2fD
zVU?bnPsr{7nncH^_>4{|Nw!Q$lCR8RO?gI@Bss^GBv~hvBzbG(^En=MSr_P(7;)ow
zXupyWkV+`!Z522O67L3Pc#JPbIFJ84;Jh@_xrnXMITA*m{$;>2s-XeM+R0=cgH$*uO>pi_O{
z>U!;wfN|&t{^&?RwJOatZXumQ#>8!y0(q~0(HmTOVf7?B2xx)Z_XG;{YpBL3^n=a;
zH!ql2M2^7R4iyQ9a|IJiSSF^S+jGM!O4m5OV&V>$DvrFanke%%<9)vHLf;G89#^fK
zxXYuc-9byBWX;n$HK)>~x!w-WiE^>-2j1CbzvYD=+*VIcI%vDSrW^WvkCNKxqdyc_
zs?RAr5J+{r(V0}aY*pq7NeLAkvp{+?M<7ktMx>20HGwQ;PG&kL4ewZhP9L0eq8Lso
ziV2cfk3kiZL$jp5G~K5pnpNYHOk;2vw!KrIWoD-q?Xod=KyRne4jA-HUeZZnXJjNd
zWTf|&ksg?0f$gA}0gZ`!^n0IfU!W2OP_}Js
z=Aa>uG~q3f@65G|BFzKr5iVCf#3PD);>mtUblZD
z^_>nAVnZfNl4Js?MC6&&gG?Wwn}xIy
z4<*8J?p37RXq}iwb3g=9a4gZ8#vHa0LyqVnG5QM|*rY1d7WJ5~bf~mRusjUfCzMG{
z+@_;Ib75ZX>wm@@05)~OKN}55Ou*j?ViL}4G
UnxBpN?t_qGL0Ys+a}xG`0EvA;zW@LL
delta 433
zcmZ8dJx{_=6g{t{6tPvPP^#h=AJP_t#Yv|oE+n|fB9rN0h{j-Ih^xPWba2wae_&!l
zqKWSO8UKNJ-V1SXdH3A=&b{Z{J2U6$?Cj_L6F`LaB-?U5zjqzq$DNyaH0<=pcUPm~
zarb0$@s`n0vfyDoITA0)wjau6FLM8
zr1_Rvc_KNjFC>qJFR(aTB?vev6V+kg5u&KL(3i8-y^-%p)v4dS^?8P4cghEwV
zRFSnB>eP~GpEUywVh3VQs$n8y!WX*i5eU&-xM?$r#Mf=*L3#uVO4Cv}wa^su4vU@`
zDW&5z3a}raVSiwC;N+)R`wAOVxUZa{L+<2|30@$>%^glE(YM^kRgS&CeLU1kG%u88
Mo{O&0B2UA?FXJyWH2?qr
diff --git a/src/Main.java b/src/Main.java
index 686c2f5..f1d9014 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -14,18 +14,18 @@ public static void main( String[] args){
//Creación de employers para tareas 3, 4, 5.
Employer [] employers = new Employer[10];
- employers[0] = new Employer("María", 24, 32700, 0);
- employers[1] = new Employer("Juan", 35, 36000, 1);
- employers[2] = new Employer("Pedro", 22, 35500, 2 );
- employers[3] = new Employer("Sandra", 43, 34300, 3 );
- employers[4] = new Employer("Jenifer", 33, 34000, 4 );
- employers[5] = new Employer("Manel", 45, 38000, 5 );
+ employers[0] = new Employer("María", 24, 32700, 6 , "Front end" , 0);
+ employers[1] = new Employer("Juan", 35, 36000, 17, "Senior Data base" , 1);
+ employers[2] = new Employer("Pedro", 22, 35500,4 , "RRHH" ,2 );
+ employers[3] = new Employer("Sandra", 43, 34300, 25 , "General Manager" ,3 );
+ employers[4] = new Employer("Jenifer", 33, 34000, 12 , "Lead Back end" ,4 );
+ employers[5] = new Employer("Manel", 45, 38000, 2 , "Junior Security" ,5 );
//creación de Intern
- employers[6] = new Intern("Marcos", 18, 15000 , 6);
- employers[7] = new Intern("Alejandra", 20, 20000 , 7);
- employers[8] = new Intern("José", 31, 18000 , 8);
- employers[9] = new Intern("Isabel", 22, 19000 , 9);
+ employers[6] = new Intern("Marcos", 18, 15000, 2 , "Junior Data Base" ,6);
+ employers[7] = new Intern("Alejandra", 20, 20000 , 2 , "Support Java",7 );
+ employers[8] = new Intern("José", 31, 18000 , 5 , "Development JavaScript" ,8);
+ employers[9] = new Intern("Isabel", 22, 19000 , 3, "Junior Back end", 9);
Main main = new Main();
@@ -94,10 +94,11 @@ public void createTenEmployer(Employer[] employers){
System.out.println("Tare 5. Escribir un programa que cree 10 empleados y muestre todas sus propiedades.");
int idBuscado = 9;
- double subidaSalario = 100;
+ double subidaSalario = 50100;
//Mostrar por consola empleados y sus datos
System.out.println("Trabajadores de la empresa IT S.l.\n");
+
for(Employer employer : employers){
System.out.println("ID: " + employer.getId() + " - " + employer.getName() + " de " + employer.getAge() + " años, salario -> " + employer.getSalary() + "€.");
@@ -108,7 +109,7 @@ public void createTenEmployer(Employer[] employers){
double nuevoSalario = intern.getSalary() + subidaSalario;
if (nuevoSalario > intern.getMAXSALARY()){
- System.out.println("\nEl salario actual de " + employer.getName() + " es de " + employer.getSalary() + "€," + " es el máximo permitido para un Intern." );
+ System.out.println("\nEl salario actual de " + employer.getName() + " es de " + ((Intern) employer).getMAXSALARY() + "€," + " es el máximo permitido para un Intern." );
}else{
//Si el salario no supera los 20000€ anuel, dejara sumar la cantidad sin superar
diff --git a/src/employer/Employer.java b/src/employer/Employer.java
index 842ab13..16e373e 100644
--- a/src/employer/Employer.java
+++ b/src/employer/Employer.java
@@ -13,10 +13,12 @@ public class Employer {
private final int ID;
//Constructor
- public Employer(String name, int age, double salary, int ID){
+ public Employer(String name, int age, double salary, int experience, String job, int ID){
this.name = name;
this.age = age;
this.salary =salary;
+ this.experience = experience;
+ this.job = job;
this.ID = ID;
}
//getter
@@ -33,10 +35,12 @@ public double getSalary(){
}
public int getExperience(){
+ System.out.println("Con " + experience + " años de experiencia.");
return experience;
}
public String getJob(){
+ System.out.println("Departamento de " + job);
return job;
}
diff --git a/src/employer/Intern.java b/src/employer/Intern.java
index 9ea6584..a992f5b 100644
--- a/src/employer/Intern.java
+++ b/src/employer/Intern.java
@@ -7,13 +7,12 @@ public class Intern extends Employer {
private final int MAXSALARY = 20000;
//constructor
- public Intern(String name, int age, double salary, int ID){
- super(name, age, salary, ID);
+ public Intern(String name, int age, double salary, int experience, String job, int ID){
+ super(name, age, salary, experience, job, ID);
if(salary > MAXSALARY){
throw new IllegalArgumentException("El salario no puede ser mayor que " + MAXSALARY);
}
-
}
public int getMAXSALARY() {
@@ -25,7 +24,8 @@ public int getMAXSALARY() {
@Override
public void setSalary(double salary){
if(salary > MAXSALARY){
- throw new IllegalArgumentException("El salario no puede ser mayor que " + MAXSALARY);
+ getMAXSALARY();
+ //throw new IllegalArgumentException("El salario no puede ser mayor que " + MAXSALARY);
}else {
//Si el valor de salario de un intern no supera el maximo, se puede actualizar, simepre que no supere el MAXSalary
super.setSalary(salary);