From c135dd13546c1817cbaf1df728ec4dd89d65f198 Mon Sep 17 00:00:00 2001 From: Alexandre MAINTIER <alexandre.maintier.etu@bouleau08.iut-infobio.priv.univ-lille1.fr> Date: Tue, 1 Apr 2025 15:13:53 +0200 Subject: [PATCH] =?UTF-8?q?tpOO-06::exo-salaires,=20mise=20=C3=A0=20jour?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/tp06/Company.java | 1 + src/tp06/Employee.java | 2 +- src/tp06/Salesperson.java | 2 +- src/tp06/TravellingSalesperson.java | 2 +- src/tp06/Vendor.java | 1 + src/tp06/Worker.java | 1 + 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/tp06/Company.java b/src/tp06/Company.java index 0d7a3b0..338dc57 100644 --- a/src/tp06/Company.java +++ b/src/tp06/Company.java @@ -66,3 +66,4 @@ public class Company{ staff.removeAll(vire); } } + diff --git a/src/tp06/Employee.java b/src/tp06/Employee.java index 970a493..9d0ec83 100644 --- a/src/tp06/Employee.java +++ b/src/tp06/Employee.java @@ -23,4 +23,4 @@ public abstract class Employee{ public abstract double getWages(); public abstract boolean objectiveFulfilled(); -} \ No newline at end of file +} diff --git a/src/tp06/Salesperson.java b/src/tp06/Salesperson.java index 4fc1c47..73c5a53 100644 --- a/src/tp06/Salesperson.java +++ b/src/tp06/Salesperson.java @@ -22,4 +22,4 @@ abstract class Salesperson extends Employee{ return turnover>=objective; } -} \ No newline at end of file +} diff --git a/src/tp06/TravellingSalesperson.java b/src/tp06/TravellingSalesperson.java index 9e828bf..58adfd9 100644 --- a/src/tp06/TravellingSalesperson.java +++ b/src/tp06/TravellingSalesperson.java @@ -16,4 +16,4 @@ public class TravellingSalesperson extends Salesperson{ public double getWages(){ return BONUS + PERCENTAGE*this.getTurnover(); } -} \ No newline at end of file +} diff --git a/src/tp06/Vendor.java b/src/tp06/Vendor.java index 3c07e5e..001ece4 100644 --- a/src/tp06/Vendor.java +++ b/src/tp06/Vendor.java @@ -18,3 +18,4 @@ public class Vendor extends Salesperson{ return BONUS + PERCENTAGE*this.getTurnover(); } } + diff --git a/src/tp06/Worker.java b/src/tp06/Worker.java index 6a0c1a5..4b6dc46 100644 --- a/src/tp06/Worker.java +++ b/src/tp06/Worker.java @@ -27,3 +27,4 @@ public class Worker extends Employee{ return units>=objective; } } + -- GitLab