From d8e61b1809fea64d7efec723df2767c598087366 Mon Sep 17 00:00:00 2001 From: Marc Pedron Pladevall Date: Sat, 22 Mar 2025 15:19:45 +0100 Subject: [PATCH 1/2] test2 git clear --- .DS_Store | Bin 0 -> 6148 bytes .idea/.gitignore | 3 +++ .idea/lab-java-basics-es.iml | 11 +++++++++++ .idea/misc.xml | 6 ++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ src/Main.java | 5 +++++ src/classes/Employee.java | 4 ++++ 8 files changed, 43 insertions(+) create mode 100644 .DS_Store create mode 100644 .idea/.gitignore create mode 100644 .idea/lab-java-basics-es.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 src/Main.java create mode 100644 src/classes/Employee.java diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..feca8613504bcd7430524202412f605a970dd548 GIT binary patch literal 6148 zcmeH~JqiLr422VS3&Cbf%V|7-HyA`u-~~i21wpZ&qx41vI)z6#m+=T zbn`f`MFtU>!%bynVPcAXCwIBY>3lz3j@RpDteEA>YT$!Ro{xoGkN^pg011!)3H%HJ zJGWu;MJOW)kN^pc1nmD%;HEXTh5D}p!AAgSkF*=sK1)E0C7?C6g(3sfXoW_r`WRw) zZ-`o{NKSp&Hs}YZb^Uy{)~Y3 z+x>QfkIJ+4?ei>u$gHg!9O~r=FP8vp>?mHs-SE8F0$NjBC^9f!1RMhc34E2n6Mwc5 Aa{vGU literal 0 HcmV?d00001 diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/lab-java-basics-es.iml b/.idea/lab-java-basics-es.iml new file mode 100644 index 0000000..c90834f --- /dev/null +++ b/.idea/lab-java-basics-es.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..c4f0636 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..b936c40 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/src/Main.java b/src/Main.java new file mode 100644 index 0000000..8aacbb6 --- /dev/null +++ b/src/Main.java @@ -0,0 +1,5 @@ +public class Main { + public static void main (String[] arg){ + + } +} diff --git a/src/classes/Employee.java b/src/classes/Employee.java new file mode 100644 index 0000000..c95ae4e --- /dev/null +++ b/src/classes/Employee.java @@ -0,0 +1,4 @@ +package classes; + +public class Employee { +} From 4a83564b4a547656be3265ce1ad90ee368acce44 Mon Sep 17 00:00:00 2001 From: Marc Pedron Pladevall Date: Thu, 27 Mar 2025 09:04:00 +0100 Subject: [PATCH 2/2] Exercices Lab1 --- .DS_Store | Bin 6148 -> 6148 bytes lab-java-basics-es.iml | 11 ++ out/production/lab-java-basics-es/Main.class | Bin 0 -> 4217 bytes .../lab-java-basics-es/classes/Employee.class | Bin 0 -> 1323 bytes .../lab-java-basics-es/classes/Intern.class | Bin 0 -> 1642 bytes src/.DS_Store | Bin 0 -> 6148 bytes src/Main.java | 100 +++++++++++++++++- src/classes/Employee.java | 36 +++++++ src/classes/Intern.java | 31 ++++++ 9 files changed, 177 insertions(+), 1 deletion(-) create mode 100644 lab-java-basics-es.iml create mode 100644 out/production/lab-java-basics-es/Main.class create mode 100644 out/production/lab-java-basics-es/classes/Employee.class create mode 100644 out/production/lab-java-basics-es/classes/Intern.class create mode 100644 src/.DS_Store create mode 100644 src/classes/Intern.java diff --git a/.DS_Store b/.DS_Store index feca8613504bcd7430524202412f605a970dd548..7beb93250d04369bdfd3671fbf98befa523e83e1 100644 GIT binary patch literal 6148 zcmeHKKTE?v6n|$cR4v*?sGyj^$)V5>AfzQ790akmQkzIEB&67OaSE<}1HsKn1iyud zv!fqEaC6c3?jG%3Tiq0q_u%fA-249v$>jh*)rV0PpacK~9EABroMs5=X-vr+udE^} zim@A~VLMLScuxUEgaKjTZ!O3UA_bGC(3DYP&FNMF{NThx3$XcSYx+Vd^_B^e$o$~{p{AJ zwQg(sluzWx8NfZ8q_AXAW??`W5C%pJ(D%W^LFhAP2KA={Cw&A!%;T~ayw<<|h#oB< z`iz-DTtQLB716jVK4K_7IVj_fdY|nxgT@_{&Wv$5v*Htq;)93sv^gl>pv=O6FyJzf zGq)w${~KSQ|6M1!69$BVf5m{x2hE_4E%Dwu)g0}$9*!0c60*w-Y8RY%JJuJp6_;^n aL7hhzh(2Rx5LZy-M?ljclQ8hB415C0Xs#gu delta 89 zcmZoMXfc=|#>AjHu~3+iak3nnm<$65Fo8)121Xza!~zV-IZ65XIhzGJ#8@^fa7U<`|I`%m9}D5Pkpv diff --git a/lab-java-basics-es.iml b/lab-java-basics-es.iml new file mode 100644 index 0000000..c90834f --- /dev/null +++ b/lab-java-basics-es.iml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/out/production/lab-java-basics-es/Main.class b/out/production/lab-java-basics-es/Main.class new file mode 100644 index 0000000000000000000000000000000000000000..c0694d3a128914f79190fa4bcb5ecd07c4339821 GIT binary patch literal 4217 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 JZ}2t}{{tW-`fmUL literal 0 HcmV?d00001 diff --git a/out/production/lab-java-basics-es/classes/Employee.class b/out/production/lab-java-basics-es/classes/Employee.class new file mode 100644 index 0000000000000000000000000000000000000000..90def5adaf961b8da526d3241ebb92c0b92f5b80 GIT binary patch literal 1323 zcmZ{jO>YuW6o%gm!ypve0&VRFSZ%EiQ!Oss)ig1U8j_|iT3K}EfD@bs1~UUq*!hE8 zXd*Fj;Scaf8Q*gm3K{6;-aGfc=bYz!%-?^%{{T3}i!2gIreWlef~l~2?c6xEj^np$ z@0-_dtFK_b@_esH4_k7T8y1}K>>}Z}|%jqEgAN!K73l467~=89q#+W%xEZ7rgL8 zydG={D^jFt?#ZxpNwOEcLC|vFdQyh`q)|uG9z0^L6C4DCD;vsFLi)oU(i8p7MsUwU zaY8n^Zt?3Ybt&%K_Ae;=aD=p79wBd6Mkv_p#t3UawC%QNU~E(EDA1}Vfr_6V|n2Z)TD ufY>UXOyjsU7D1|afXKWH$Pp0|sQm|=FtB|9 literal 0 HcmV?d00001 diff --git a/out/production/lab-java-basics-es/classes/Intern.class b/out/production/lab-java-basics-es/classes/Intern.class new file mode 100644 index 0000000000000000000000000000000000000000..2b898de351ff0043ec6304fa0dbc791487121fd0 GIT binary patch literal 1642 zcmaJ?T~pge6g}%N8OLA(v56sok|rrOEl$&KoRT&!B%X0-XUw?M^l33$P>>~$v}W)> z=?~~kU;5I|%;cdzpg*eZS;;hZ@I)G~uCDIhbMCpj>%aeb`4@l&nmHtpw2;apjf}v2 z*Og(Y!rE@H@A^Zf1TqgC&(S*q*Ed?v<(aIx(mSrTb>Mi%^=9)~r89#pW-R3LxPrXE z+(nM2r&Zty6oyI$;qG}~1&;E%%qf~Pm_xzBd>&V^K-{s+!%(Z9K++#*fntp5__ePI zs0piNuf9O?*YYT$B(T(zr>fz5U8%ou^a-s{OHYRacc&1pT&^L9>nK}T&SM2P1QsJI zlYjzN-@v=9rZ_EY$LP40$2x3*nNaDrbY(CUNNqGLoh)t%Y{xEJop+Tw3T=I&?4CTg zU8m=0`+GmI2|&HVExWC>rnyORWx#I9V}8nn zqq1`Y&pA^;=xAyno(ashwd|fgmHi0C!UvN*kJ6CPvC`kZzF3kQl_oz?)JvaoZGRAS z)t+Ojxe~9pEyIr4ANjrxbs+msl|J#0!Ym#LR1T5)y!iHHSNo>rKa96x6c}@OBE2J5g|}P2e>&*bFE7P0&&0%o zVP8!N|86Y)tHbB2tLx+Idz7LfUAOIM#SZ41o~MFFyvHr<3f#F=(=@6U9t*6!Ih5Ux z>%vW*2MO-b1aF=Qw3hJ}pHwjN-a(3X8h1IqP0w%U?BTOo-Mq0{Ouc}p7Sn&gTD`h& z|A^ABnB9DdMc_{?Rq1+x)n6E$#0JOZXeQ4e-UZ}PBH}G#RWQpRuoGuS6`On`2HwHD z#5L9y;|$L#YP7hKXx+nmWM?eHJdOLb7a{&-vW$hSh4%$7It4z&N23C2d>UW6`a7(j zX(S?UnaDX8@i5ghfO!oMfsbKxG}UiMIsuvL3Trl%jnAHsW|tzKnbB;ikau+aT~I_V5Jd{{WsUbj<(& literal 0 HcmV?d00001 diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..0c7b28abcf5013544c12dc6a9056606f2c64157f GIT binary patch literal 6148 zcmeHKJ5B>J5S@V_R?wuRw75a)G$vY3kPE=>A}BW6NGp2hAUO;T1*hVTXNXwh0tpEr zG!xm+o}cX}#oi$zUOjgUqB#*&Xo4(*f{40kIx*)nAmOhxE0N@PjEEr2IAu+)) z8YV?pAgrN44P`4aSi_+Y<`)ft7(oj59b?+iEtQwC0TI+yqV z7Jr#ykv|RbnKR%F{4)l4RU YMZ=^hSwx@1f&L+o3GvPu_yq>u0r{^qQvd(} literal 0 HcmV?d00001 diff --git a/src/Main.java b/src/Main.java index 8aacbb6..711ba78 100644 --- a/src/Main.java +++ b/src/Main.java @@ -1,5 +1,103 @@ +import classes.Employee; +import classes.Intern; + +import javax.naming.ldap.ManageReferralControl; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + public class Main { public static void main (String[] arg){ + //EXERCICE 1 + System.out.println("EXERCICE 1 ----"); + Integer[] numbers = {1, 2, 3, 4, 5}; + + int max = numbers[0]; + for (int number : numbers) + if (number > max) { + max = number; + } + int min =numbers[0]; + for (int number : numbers) + if (number < min){ + min = number; + } + int difference = max - min; + System.out.println("The difference between the higher (" + max + ") and the lowest (" + min + ") number is " + difference); + + //EXERCICE 2 + System.out.println("EXERCICE 2 ------"); + Integer[] numbers2 = {-2, 5, 18, 20, -20}; + int smallest = numbers2[0]; + for (int number2 : numbers2) + if (number2 < smallest){ + smallest = number2; + } + int position = 0; + + for (int i = 0; i < numbers2.length; i++){ + if(numbers2[i] == smallest){ position = i;} + } + System.out.println("The lowest element is " + numbers2[position]); + + Integer[] result = new Integer[numbers2.length - 1]; + for (int j = 0, k = 0; j < numbers2.length; j++) { + if (j != position) { + result[k++] = numbers2[j]; + } + } + + int smallest2 = result[0]; + for (int result1 : result) + if (result1 < smallest2) + {smallest2 = result1;} + System.out.println("The second lowest element is " + smallest2); + // EXERCICE 3 + System.out.println("EXERCICE 3 ---------"); + Intern intern1 = new Intern("Marc",28,23000,true,2); + Intern intern2 = new Intern("Montserrat", 22, 18000, false,1); + Intern intern3 = new Intern ("Paula", 25, 20000, true, 2); + Intern intern4 = new Intern ("Buggy", 27, 19000, false, 7); + Intern intern5 = new Intern ("Kate", 31, 21000, false, 10); + Employee employee1 = new Employee("Rafa", 26, 25000, true); + Employee employee2 = new Employee("Judit", 24, 35000, true); + Employee employee3 = new Employee("Moha", 23, 26000, true); + Employee employee4 = new Employee("Laura", 34, 32000, true); + Employee employee5 = new Employee("April", 22, 21000,false); + + + + List people = new ArrayList<>(); + people.add(intern1); + people.add(intern2); + people.add(intern3); + people.add(intern4); + people.add(intern5); + people.add(employee1); + people.add(employee2); + people.add(employee3); + people.add(employee4); + people.add(employee5); + + // loop to every employee + for (Employee person : people) { + System.out.print(person.getName() + " is " + person.getAge() + " years old, " ); + if (person.isUniversityGrade()){ + System.out.print("has an university degree,");} + else {System.out.print("doesn't have an universtiy degree,");} + if(person instanceof Intern){ + System.out.print("has " + ((Intern) person).getYearsExperience() + " years of experience "); + } + System.out.println("and has set a salary of: " + person.getSalary() + "€ per year"); + + } + //try to increase the salary over the limit of intern + intern2.setSalary(20000); + intern4.setSalary(23000); + + } + + } -} + diff --git a/src/classes/Employee.java b/src/classes/Employee.java index c95ae4e..d4499f3 100644 --- a/src/classes/Employee.java +++ b/src/classes/Employee.java @@ -1,4 +1,40 @@ package classes; public class Employee { +private String name; +private int age; +int salary; +private boolean universityGrade; + +public Employee (String name, int age, int salary, boolean university) { + this.name = name; + this.age = age; + this.salary = salary; + universityGrade = university; +} +//getters and setters + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public int getAge() { + return age; + } + public void setAge(int age) { + this.age = age; + } + public int getSalary() { + return salary; + } + public void setSalary(int salary) { + this.salary = salary; + } + public boolean isUniversityGrade() { + return universityGrade; + } + public void setUniversityGrade(boolean universityGrade) { + this.universityGrade = universityGrade; + } } diff --git a/src/classes/Intern.java b/src/classes/Intern.java new file mode 100644 index 0000000..463e19a --- /dev/null +++ b/src/classes/Intern.java @@ -0,0 +1,31 @@ +package classes; + +public class Intern extends Employee{ + private int yearsExperience; + private static final int maxSalary = 20000; + + public Intern(String name, int age, int salary, boolean university, int yearsExperience) { + super(name, age, salary, university); + this.yearsExperience = yearsExperience; + if (salary > maxSalary){ + System.out.println("The salary exceed the limit for intern: " + name); + System.out.println("Salary adjusted to: 20.000€"); + super.setSalary(maxSalary);} + } +// if an intern wants to update his salary after being created, we enforce the rule of maxSalary + @Override + public void setSalary(int salary) { + if (salary > maxSalary) { + System.out.println(getName() + " salary exceeds the max limit for interns. Setting to " + maxSalary +"€ allowed"); + super.setSalary(maxSalary); + } else { + super.setSalary(salary); + System.out.println(getName() + " salary have been updated to: " + salary +"€"); + } + } + //getter and setter new variable + public int getYearsExperience(){return yearsExperience;} + public void setYearsExperience(int yearsExperience) { + this.yearsExperience = yearsExperience;} + } +