diff --git a/src/qdev4/Ex1.java b/src/qdev4/Ex1.java index c55daa3fbaad80533d0b36fe95034afc8ce15a20..1411e887121bd6a67b3bc67a03bd57f935cd910e 100644 --- a/src/qdev4/Ex1.java +++ b/src/qdev4/Ex1.java @@ -45,9 +45,9 @@ public class Ex1 } public static void main(String[] args) { - int k; try { - k = 1/Integer.parseInt(args[0]); + int k = 1/Integer.parseInt(args[0]); + System.out.println(k); } catch(ArrayIndexOutOfBoundsException e) {System.err.println("Index " + e);} catch(ArithmeticException e) {System.err.println("Arithmetic " + "");} diff --git a/src/tp04/PendingCaseQueue.java b/src/tp04/PendingCaseQueue.java index 66045e88e560eb93f4b0d3f6521bc059c5a6c4c8..52dab47dc28d424bd399ee32a202f8d1f22a86f6 100644 --- a/src/tp04/PendingCaseQueue.java +++ b/src/tp04/PendingCaseQueue.java @@ -5,7 +5,6 @@ import tpOO.tp04.PendingCase; public class PendingCaseQueue { public static int CAPACITY = 10; - private int idx; private PendingCase[] tableur; public PendingCaseQueue() @@ -58,11 +57,11 @@ public class PendingCaseQueue public double getTotalAmount() { double db = 0.0; - for(int i = 0; i < this.tableur.length; i++) + for(PendingCase c : this.tableur) { - if(this.tableur[i] != null) + if(c != null) { - db = db + this.tableur[i].getAmount(); + db = db + c.getAmount(); } } return db; @@ -87,9 +86,9 @@ public class PendingCaseQueue public boolean isEmpty() { int compteur = 0; - for(int i = 0; i < this.tableur.length; i++) + for(PendingCase c : this.tableur) { - if(this.tableur[i] == null) + if(c == null) { compteur = compteur + 1; } @@ -105,9 +104,9 @@ public class PendingCaseQueue public boolean isFull() { int compteur = 0; - for(int i = 0; i < this.tableur.length; i++) + for(PendingCase c : this.tableur) { - if(this.tableur[i] != null) + if(c != null) { compteur = compteur + 1; } diff --git a/src/tp06/Car.java b/src/tp06/Car.java index ba2e51609035be6ff54a84f7d3698d6cbe36d943..1eae86819fe4345d45d0a601b5f1b3537721284e 100644 --- a/src/tp06/Car.java +++ b/src/tp06/Car.java @@ -58,6 +58,10 @@ public class Car return purchasePrice; } + public double getSalePrice() { + return salePrice; + } + public void setSalePrice(double salePrice) { this.salePrice = salePrice; diff --git a/src/tp06/Company.java b/src/tp06/Company.java index 3a402018a9b51aee5ed4794284341fbef3f2b576..0723c1901902ce93377a6be73fa9934bb7c74e05 100644 --- a/src/tp06/Company.java +++ b/src/tp06/Company.java @@ -2,10 +2,11 @@ package tp06; import java.time.LocalDate; import java.util.ArrayList; +import java.util.List; public class Company { - public static final ArrayList<Employee> EMPLOYEES = new ArrayList<>(); + public static final List<Employee> EMPLOYEES = new ArrayList<>(); public void addEmployee(Employee e) { @@ -27,7 +28,7 @@ public class Company return EMPLOYEES.size(); } - private int getNumbClass(Class c) + private int getNumbClass(Object c) { int nb = 0; diff --git a/src/tp06/TravellingSalesperson.java b/src/tp06/TravellingSalesperson.java index e3dc0fe6829bdc55295d747c46767a3e5dc780a3..333c9a783344a014eb45cdf54a53cdd4ba077f76 100644 --- a/src/tp06/TravellingSalesperson.java +++ b/src/tp06/TravellingSalesperson.java @@ -12,6 +12,14 @@ public class TravellingSalesperson extends Salesperson super(n, ld, t); } + public static double getPourcentage() { + return POURCENTAGE; + } + + public static int getBonus() { + return BONUS; + } + @Override public String getTitle() { diff --git a/src/tp06/Vendor.java b/src/tp06/Vendor.java index 2652c2e28fd43411ddaf11d31506bcbf1dcbdff5..a3239946c6c1d175aa9a3ff503d7250a1ff51bcb 100644 --- a/src/tp06/Vendor.java +++ b/src/tp06/Vendor.java @@ -12,6 +12,14 @@ public class Vendor extends Salesperson super(n, ld, t); } + public static double getPourcentage() { + return POURCENTAGE; + } + + public static int getBonus() { + return BONUS; + } + @Override public String getTitle() { diff --git a/src/tp09/LogInManagement.java b/src/tp09/LogInManagement.java index e247a4fb303d537be551e6fb3fbb4a85023534af..77aec2d992ab93c6c2fa4c950f2a69b9dddffae2 100644 --- a/src/tp09/LogInManagement.java +++ b/src/tp09/LogInManagement.java @@ -14,4 +14,4 @@ public class LogInManagement { return true; } -} +} \ No newline at end of file diff --git a/src/tp09/Main.java b/src/tp09/Main.java deleted file mode 100644 index 19ecb9e5b0eec88e8e69a0f7fec07c9eac514933..0000000000000000000000000000000000000000 --- a/src/tp09/Main.java +++ /dev/null @@ -1,14 +0,0 @@ -package tp09; - -import java.util.Scanner; - -public class Main -{ - public static void main(String[] args) - { - Scanner scan = new Scanner(System.in); - - - - } -} \ No newline at end of file diff --git a/src/tp09/WrongLoginException.java b/src/tp09/WrongLoginException.java index 7d85efc8c0f25d42da2be4d560d7ea0bcb687484..49fd0c3cd1d1b8e5b482f2b60c87572e2427edd1 100644 --- a/src/tp09/WrongLoginException.java +++ b/src/tp09/WrongLoginException.java @@ -5,7 +5,6 @@ public class WrongLoginException extends Exception @Override public synchronized Throwable initCause(Throwable cause) { - return super.initCause(cause); } } \ No newline at end of file