From 8c67f9445090cf1fc5dfbd1c41af25e89c4e4ee1 Mon Sep 17 00:00:00 2001
From: Alexandre
<alexandre.maintier.etu@meleze07.iut-infobio.priv.univ-lille1.fr>
Date: Fri, 4 Apr 2025 13:56:29 +0200
Subject: [PATCH] reorganisation du repo
---
src/{ => tpOO}/tp01/Book.java | 1 +
src/{ => tpOO}/tp01/HighScore.java | 1 +
src/{ => tpOO}/tp01/Score.java | 1 +
src/{ => tpOO}/tp01/UseBook.java | 1 +
src/{ => tpOO}/tp01/UseBook2.java | 1 +
src/{ => tpOO}/tp01/UseHighScore.java | 1 +
src/{ => tpOO}/tp01/UseHighScore2.java | 1 +
src/{ => tpOO}/tp01/UseHighScore3.java | 1 +
src/{ => tpOO}/tp01/UseHighScore4.java | 1 +
src/{ => tpOO}/tp02/Competitor.java | 1 +
src/{ => tpOO}/tp02/Dice.java | 1 +
src/{ => tpOO}/tp02/DicePlayer.java | 1 +
src/{ => tpOO}/tp02/OneDicePlayerGame.java | 1 +
src/{ => tpOO}/tp02/UseCompetitor.java | 1 +
src/{ => tpOO}/tp02/UseCompetitor2.java | 1 +
src/{ => tpOO}/tp02/UseDice.java | 1 +
src/{ => tpOO}/tp03/Card.java | 2 +-
src/{ => tpOO}/tp03/Color.java | 2 +-
src/{ => tpOO}/tp03/Rank.java | 2 +-
src/{ => tpOO}/tp03/Task.java | 2 +-
src/{ => tpOO}/tp03/TaskStatus.java | 2 +-
src/{ => tpOO}/tp03/UseCard.java | 2 +-
src/{ => tpOO}/tp03/UseLocalDate.java | 2 +-
src/{ => tpOO}/tp03/UseTask.java | 2 +-
src/{ => tpOO}/tp04/GetTotalAmount.java | 2 +-
src/{ => tpOO}/tp04/PendingCaseQueue.java | 2 +-
src/{ => tpOO}/tp04/Person.java | 2 +-
src/{ => tpOO}/tp04/Student.java | 2 +-
src/{ => tpOO}/tp04/StudentAbs.java | 2 +-
src/{ => tpOO}/tp04/UsePendingCaseQueue.java | 2 +-
src/{ => tpOO}/tp04/UsePerson.java | 2 +-
src/{ => tpOO}/tp04/UseStudent.java | 2 +-
src/{ => tpOO}/tp04/UseYearGroup.java | 2 +-
src/{ => tpOO}/tp04/YearGroup.java | 2 +-
src/{ => tpOO}/tp04/tp04-doc.zip | Bin
src/{ => tpOO}/tp04/tp04-res.jar | Bin
src/{ => tpOO}/tp05/Article.java | 2 +-
src/{ => tpOO}/tp05/Book.java | 2 +-
src/{ => tpOO}/tp05/ComicBook.java | 2 +-
src/{ => tpOO}/tp05/Library.java | 2 +-
src/{ => tpOO}/tp05/PerishableArticle.java | 2 +-
src/{ => tpOO}/tp05/UseArticle.java | 2 +-
src/{ => tpOO}/tp05/UseLibrary.java | 2 +-
src/{ => tpOO}/tp06/Car.java | 2 +-
src/{ => tpOO}/tp06/Company.java | 2 +-
src/{ => tpOO}/tp06/Dealership.java | 2 +-
src/{ => tpOO}/tp06/Employee.java | 2 +-
src/{ => tpOO}/tp06/Salesperson.java | 2 +-
src/{ => tpOO}/tp06/TravellingSalesperson.java | 2 +-
src/{ => tpOO}/tp06/UseCar.java | 2 +-
src/{ => tpOO}/tp06/Vendor.java | 2 +-
src/{ => tpOO}/tp06/VintageCar.java | 2 +-
src/{ => tpOO}/tp06/Worker.java | 2 +-
test/{ => tpOO}/tp05/LibraryTest.java | 5 +++++
test/{ => tpOO}/tp05/ShopTest.java | 3 +++
test/{ => tpOO}/tp06/CompanyTest.java | 8 +++++++-
56 files changed, 66 insertions(+), 36 deletions(-)
rename src/{ => tpOO}/tp01/Book.java (95%)
rename src/{ => tpOO}/tp01/HighScore.java (97%)
rename src/{ => tpOO}/tp01/Score.java (94%)
rename src/{ => tpOO}/tp01/UseBook.java (89%)
rename src/{ => tpOO}/tp01/UseBook2.java (97%)
rename src/{ => tpOO}/tp01/UseHighScore.java (65%)
rename src/{ => tpOO}/tp01/UseHighScore2.java (66%)
rename src/{ => tpOO}/tp01/UseHighScore3.java (66%)
rename src/{ => tpOO}/tp01/UseHighScore4.java (66%)
rename src/{ => tpOO}/tp02/Competitor.java (98%)
rename src/{ => tpOO}/tp02/Dice.java (59%)
rename src/{ => tpOO}/tp02/DicePlayer.java (64%)
rename src/{ => tpOO}/tp02/OneDicePlayerGame.java (68%)
rename src/{ => tpOO}/tp02/UseCompetitor.java (66%)
rename src/{ => tpOO}/tp02/UseCompetitor2.java (98%)
rename src/{ => tpOO}/tp02/UseDice.java (62%)
rename src/{ => tpOO}/tp03/Card.java (97%)
rename src/{ => tpOO}/tp03/Color.java (74%)
rename src/{ => tpOO}/tp03/Rank.java (79%)
rename src/{ => tpOO}/tp03/Task.java (60%)
rename src/{ => tpOO}/tp03/TaskStatus.java (64%)
rename src/{ => tpOO}/tp03/UseCard.java (97%)
rename src/{ => tpOO}/tp03/UseLocalDate.java (66%)
rename src/{ => tpOO}/tp03/UseTask.java (62%)
rename src/{ => tpOO}/tp04/GetTotalAmount.java (66%)
rename src/{ => tpOO}/tp04/PendingCaseQueue.java (67%)
rename src/{ => tpOO}/tp04/Person.java (98%)
rename src/{ => tpOO}/tp04/Student.java (96%)
rename src/{ => tpOO}/tp04/StudentAbs.java (64%)
rename src/{ => tpOO}/tp04/UsePendingCaseQueue.java (98%)
rename src/{ => tpOO}/tp04/UsePerson.java (98%)
rename src/{ => tpOO}/tp04/UseStudent.java (64%)
rename src/{ => tpOO}/tp04/UseYearGroup.java (65%)
rename src/{ => tpOO}/tp04/YearGroup.java (63%)
rename src/{ => tpOO}/tp04/tp04-doc.zip (100%)
rename src/{ => tpOO}/tp04/tp04-res.jar (100%)
rename src/{ => tpOO}/tp05/Article.java (62%)
rename src/{ => tpOO}/tp05/Book.java (59%)
rename src/{ => tpOO}/tp05/ComicBook.java (63%)
rename src/{ => tpOO}/tp05/Library.java (62%)
rename src/{ => tpOO}/tp05/PerishableArticle.java (68%)
rename src/{ => tpOO}/tp05/UseArticle.java (64%)
rename src/{ => tpOO}/tp05/UseLibrary.java (64%)
rename src/{ => tpOO}/tp06/Car.java (58%)
rename src/{ => tpOO}/tp06/Company.java (98%)
rename src/{ => tpOO}/tp06/Dealership.java (64%)
rename src/{ => tpOO}/tp06/Employee.java (96%)
rename src/{ => tpOO}/tp06/Salesperson.java (96%)
rename src/{ => tpOO}/tp06/TravellingSalesperson.java (96%)
rename src/{ => tpOO}/tp06/UseCar.java (61%)
rename src/{ => tpOO}/tp06/Vendor.java (95%)
rename src/{ => tpOO}/tp06/VintageCar.java (64%)
rename src/{ => tpOO}/tp06/Worker.java (97%)
rename test/{ => tpOO}/tp05/LibraryTest.java (98%)
rename test/{ => tpOO}/tp05/ShopTest.java (98%)
rename test/{ => tpOO}/tp06/CompanyTest.java (96%)
diff --git a/src/tp01/Book.java b/src/tpOO/tp01/Book.java
similarity index 95%
rename from src/tp01/Book.java
rename to src/tpOO/tp01/Book.java
index 91e1fff..2ecfabe 100644
--- a/src/tp01/Book.java
+++ b/src/tpOO/tp01/Book.java
@@ -1,3 +1,4 @@
+package tpOO.tp01;
class Book{
String author;
String title;
diff --git a/src/tp01/HighScore.java b/src/tpOO/tp01/HighScore.java
similarity index 97%
rename from src/tp01/HighScore.java
rename to src/tpOO/tp01/HighScore.java
index 493ac7c..812ef0b 100644
--- a/src/tp01/HighScore.java
+++ b/src/tpOO/tp01/HighScore.java
@@ -1,3 +1,4 @@
+package tpOO.tp01;
class HighScore{
Score[] top;
diff --git a/src/tp01/Score.java b/src/tpOO/tp01/Score.java
similarity index 94%
rename from src/tp01/Score.java
rename to src/tpOO/tp01/Score.java
index c669ab5..2d3c4cd 100644
--- a/src/tp01/Score.java
+++ b/src/tpOO/tp01/Score.java
@@ -1,3 +1,4 @@
+package tpOO.tp01;
class Score{
String name;
int score;
diff --git a/src/tp01/UseBook.java b/src/tpOO/tp01/UseBook.java
similarity index 89%
rename from src/tp01/UseBook.java
rename to src/tpOO/tp01/UseBook.java
index 58ff475..d1bfd8f 100644
--- a/src/tp01/UseBook.java
+++ b/src/tpOO/tp01/UseBook.java
@@ -1,3 +1,4 @@
+package tpOO.tp01;
class UseBook{
public static void main(String args[]){
diff --git a/src/tp01/UseBook2.java b/src/tpOO/tp01/UseBook2.java
similarity index 97%
rename from src/tp01/UseBook2.java
rename to src/tpOO/tp01/UseBook2.java
index 2851581..c64944a 100644
--- a/src/tp01/UseBook2.java
+++ b/src/tpOO/tp01/UseBook2.java
@@ -1,3 +1,4 @@
+package tpOO.tp01;
class UseBook2{
public static void main(String[] args){
Book book1 = new Book("chapeau", "pointu", 1992);
diff --git a/src/tp01/UseHighScore.java b/src/tpOO/tp01/UseHighScore.java
similarity index 65%
rename from src/tp01/UseHighScore.java
rename to src/tpOO/tp01/UseHighScore.java
index 5434a03..aa9b2aa 100644
--- a/src/tp01/UseHighScore.java
+++ b/src/tpOO/tp01/UseHighScore.java
@@ -1,3 +1,4 @@
+package tpOO.tp01;
public class UseHighScore {
}
diff --git a/src/tp01/UseHighScore2.java b/src/tpOO/tp01/UseHighScore2.java
similarity index 66%
rename from src/tp01/UseHighScore2.java
rename to src/tpOO/tp01/UseHighScore2.java
index 1c67f2f..14716a6 100644
--- a/src/tp01/UseHighScore2.java
+++ b/src/tpOO/tp01/UseHighScore2.java
@@ -1,3 +1,4 @@
+package tpOO.tp01;
public class UseHighScore2 {
}
diff --git a/src/tp01/UseHighScore3.java b/src/tpOO/tp01/UseHighScore3.java
similarity index 66%
rename from src/tp01/UseHighScore3.java
rename to src/tpOO/tp01/UseHighScore3.java
index 64ce98e..d1f3439 100644
--- a/src/tp01/UseHighScore3.java
+++ b/src/tpOO/tp01/UseHighScore3.java
@@ -1,3 +1,4 @@
+package tpOO.tp01;
public class UseHighScore3 {
}
diff --git a/src/tp01/UseHighScore4.java b/src/tpOO/tp01/UseHighScore4.java
similarity index 66%
rename from src/tp01/UseHighScore4.java
rename to src/tpOO/tp01/UseHighScore4.java
index 0c88155..4abc245 100644
--- a/src/tp01/UseHighScore4.java
+++ b/src/tpOO/tp01/UseHighScore4.java
@@ -1,3 +1,4 @@
+package tpOO.tp01;
public class UseHighScore4 {
}
diff --git a/src/tp02/Competitor.java b/src/tpOO/tp02/Competitor.java
similarity index 98%
rename from src/tp02/Competitor.java
rename to src/tpOO/tp02/Competitor.java
index 795c110..b003cd8 100644
--- a/src/tp02/Competitor.java
+++ b/src/tpOO/tp02/Competitor.java
@@ -1,3 +1,4 @@
+package tpOO.tp02;
class Competitor{
String numberSign;
int time;
diff --git a/src/tp02/Dice.java b/src/tpOO/tp02/Dice.java
similarity index 59%
rename from src/tp02/Dice.java
rename to src/tpOO/tp02/Dice.java
index 09f37bc..12293a6 100644
--- a/src/tp02/Dice.java
+++ b/src/tpOO/tp02/Dice.java
@@ -1,3 +1,4 @@
+package tpOO.tp02;
public class Dice {
}
diff --git a/src/tp02/DicePlayer.java b/src/tpOO/tp02/DicePlayer.java
similarity index 64%
rename from src/tp02/DicePlayer.java
rename to src/tpOO/tp02/DicePlayer.java
index f113b91..1a21456 100644
--- a/src/tp02/DicePlayer.java
+++ b/src/tpOO/tp02/DicePlayer.java
@@ -1,3 +1,4 @@
+package tpOO.tp02;
public class DicePlayer {
}
diff --git a/src/tp02/OneDicePlayerGame.java b/src/tpOO/tp02/OneDicePlayerGame.java
similarity index 68%
rename from src/tp02/OneDicePlayerGame.java
rename to src/tpOO/tp02/OneDicePlayerGame.java
index 381f591..a06d420 100644
--- a/src/tp02/OneDicePlayerGame.java
+++ b/src/tpOO/tp02/OneDicePlayerGame.java
@@ -1,3 +1,4 @@
+package tpOO.tp02;
public class OneDicePlayerGame {
}
diff --git a/src/tp02/UseCompetitor.java b/src/tpOO/tp02/UseCompetitor.java
similarity index 66%
rename from src/tp02/UseCompetitor.java
rename to src/tpOO/tp02/UseCompetitor.java
index f6dbef2..99ca919 100644
--- a/src/tp02/UseCompetitor.java
+++ b/src/tpOO/tp02/UseCompetitor.java
@@ -1,3 +1,4 @@
+package tpOO.tp02;
public class UseCompetitor {
}
diff --git a/src/tp02/UseCompetitor2.java b/src/tpOO/tp02/UseCompetitor2.java
similarity index 98%
rename from src/tp02/UseCompetitor2.java
rename to src/tpOO/tp02/UseCompetitor2.java
index c3fade4..84eca7f 100644
--- a/src/tp02/UseCompetitor2.java
+++ b/src/tpOO/tp02/UseCompetitor2.java
@@ -1,3 +1,4 @@
+package tpOO.tp02;
public class UseCompetitor2 {
public static void main(String[] args) {
Competitor alice = new Competitor(1, 45, 15, 20);
diff --git a/src/tp02/UseDice.java b/src/tpOO/tp02/UseDice.java
similarity index 62%
rename from src/tp02/UseDice.java
rename to src/tpOO/tp02/UseDice.java
index 6a58ed0..5ca1b5a 100644
--- a/src/tp02/UseDice.java
+++ b/src/tpOO/tp02/UseDice.java
@@ -1,3 +1,4 @@
+package tpOO.tp02;
public class UseDice {
}
diff --git a/src/tp03/Card.java b/src/tpOO/tp03/Card.java
similarity index 97%
rename from src/tp03/Card.java
rename to src/tpOO/tp03/Card.java
index 69a32f5..4a8b3f8 100644
--- a/src/tp03/Card.java
+++ b/src/tpOO/tp03/Card.java
@@ -1,4 +1,4 @@
-package tp03;
+package tpOO.tp03;
public class Card{
Color color;
diff --git a/src/tp03/Color.java b/src/tpOO/tp03/Color.java
similarity index 74%
rename from src/tp03/Color.java
rename to src/tpOO/tp03/Color.java
index d14b4a1..7ad1348 100644
--- a/src/tp03/Color.java
+++ b/src/tpOO/tp03/Color.java
@@ -1,4 +1,4 @@
-package tp03;
+package tpOO.tp03;
public enum Color {
CLUB, DIAMOND, HEART, SPADE;
diff --git a/src/tp03/Rank.java b/src/tpOO/tp03/Rank.java
similarity index 79%
rename from src/tp03/Rank.java
rename to src/tpOO/tp03/Rank.java
index 6bf34be..f9bd68d 100644
--- a/src/tp03/Rank.java
+++ b/src/tpOO/tp03/Rank.java
@@ -1,4 +1,4 @@
-package tp03;
+package tpOO.tp03;
public enum Rank {
SEVEN, EIGHT, NINE, TEN, JACK, QUEEN, KING, ACE;
diff --git a/src/tp03/Task.java b/src/tpOO/tp03/Task.java
similarity index 60%
rename from src/tp03/Task.java
rename to src/tpOO/tp03/Task.java
index f7618f3..4789ece 100644
--- a/src/tp03/Task.java
+++ b/src/tpOO/tp03/Task.java
@@ -1,4 +1,4 @@
-package tp03;
+package tpOO.tp03;
public class Task {
diff --git a/src/tp03/TaskStatus.java b/src/tpOO/tp03/TaskStatus.java
similarity index 64%
rename from src/tp03/TaskStatus.java
rename to src/tpOO/tp03/TaskStatus.java
index caf425d..265f761 100644
--- a/src/tp03/TaskStatus.java
+++ b/src/tpOO/tp03/TaskStatus.java
@@ -1,4 +1,4 @@
-package tp03;
+package tpOO.tp03;
public class TaskStatus {
diff --git a/src/tp03/UseCard.java b/src/tpOO/tp03/UseCard.java
similarity index 97%
rename from src/tp03/UseCard.java
rename to src/tpOO/tp03/UseCard.java
index c483c3e..a9c2ad1 100755
--- a/src/tp03/UseCard.java
+++ b/src/tpOO/tp03/UseCard.java
@@ -1,4 +1,4 @@
-package tp03;
+package tpOO.tp03;
public class UseCard {
public static void main(String[] args) {
diff --git a/src/tp03/UseLocalDate.java b/src/tpOO/tp03/UseLocalDate.java
similarity index 66%
rename from src/tp03/UseLocalDate.java
rename to src/tpOO/tp03/UseLocalDate.java
index b4860a6..06213d9 100644
--- a/src/tp03/UseLocalDate.java
+++ b/src/tpOO/tp03/UseLocalDate.java
@@ -1,4 +1,4 @@
-package tp03;
+package tpOO.tp03;
public class UseLocalDate {
diff --git a/src/tp03/UseTask.java b/src/tpOO/tp03/UseTask.java
similarity index 62%
rename from src/tp03/UseTask.java
rename to src/tpOO/tp03/UseTask.java
index 2451d9f..ecadf1d 100644
--- a/src/tp03/UseTask.java
+++ b/src/tpOO/tp03/UseTask.java
@@ -1,4 +1,4 @@
-package tp03;
+package tpOO.tp03;
public class UseTask {
diff --git a/src/tp04/GetTotalAmount.java b/src/tpOO/tp04/GetTotalAmount.java
similarity index 66%
rename from src/tp04/GetTotalAmount.java
rename to src/tpOO/tp04/GetTotalAmount.java
index 154606c..9f07340 100644
--- a/src/tp04/GetTotalAmount.java
+++ b/src/tpOO/tp04/GetTotalAmount.java
@@ -1,4 +1,4 @@
-package tp04;
+package tpOO.tp04;
public class GetTotalAmount {
diff --git a/src/tp04/PendingCaseQueue.java b/src/tpOO/tp04/PendingCaseQueue.java
similarity index 67%
rename from src/tp04/PendingCaseQueue.java
rename to src/tpOO/tp04/PendingCaseQueue.java
index 49ba067..5995714 100644
--- a/src/tp04/PendingCaseQueue.java
+++ b/src/tpOO/tp04/PendingCaseQueue.java
@@ -1,4 +1,4 @@
-package tp04;
+package tpOO.tp04;
public class PendingCaseQueue {
diff --git a/src/tp04/Person.java b/src/tpOO/tp04/Person.java
similarity index 98%
rename from src/tp04/Person.java
rename to src/tpOO/tp04/Person.java
index 56a03eb..9ed754d 100644
--- a/src/tp04/Person.java
+++ b/src/tpOO/tp04/Person.java
@@ -1,4 +1,4 @@
-package tp04;
+package tpOO.tp04;
public class Person{
private int id;
diff --git a/src/tp04/Student.java b/src/tpOO/tp04/Student.java
similarity index 96%
rename from src/tp04/Student.java
rename to src/tpOO/tp04/Student.java
index e48d047..8e4d7a6 100644
--- a/src/tp04/Student.java
+++ b/src/tpOO/tp04/Student.java
@@ -1,4 +1,4 @@
-package tp04;
+package tpOO.tp04;
class Student{
Person pers;
diff --git a/src/tp04/StudentAbs.java b/src/tpOO/tp04/StudentAbs.java
similarity index 64%
rename from src/tp04/StudentAbs.java
rename to src/tpOO/tp04/StudentAbs.java
index 391a1ae..78e50a1 100644
--- a/src/tp04/StudentAbs.java
+++ b/src/tpOO/tp04/StudentAbs.java
@@ -1,4 +1,4 @@
-package tp04;
+package tpOO.tp04;
public class StudentAbs {
diff --git a/src/tp04/UsePendingCaseQueue.java b/src/tpOO/tp04/UsePendingCaseQueue.java
similarity index 98%
rename from src/tp04/UsePendingCaseQueue.java
rename to src/tpOO/tp04/UsePendingCaseQueue.java
index 05bc892..75921d3 100755
--- a/src/tp04/UsePendingCaseQueue.java
+++ b/src/tpOO/tp04/UsePendingCaseQueue.java
@@ -1,4 +1,4 @@
-package tp04;
+package tpOO.tp04;
public class UsePendingCaseQueue {
public static void main(String[] args) {
diff --git a/src/tp04/UsePerson.java b/src/tpOO/tp04/UsePerson.java
similarity index 98%
rename from src/tp04/UsePerson.java
rename to src/tpOO/tp04/UsePerson.java
index 7010edd..096f5ce 100644
--- a/src/tp04/UsePerson.java
+++ b/src/tpOO/tp04/UsePerson.java
@@ -1,4 +1,4 @@
-package tp04;
+package tpOO.tp04;
public class UsePerson {
public static void main(String[] args) {
diff --git a/src/tp04/UseStudent.java b/src/tpOO/tp04/UseStudent.java
similarity index 64%
rename from src/tp04/UseStudent.java
rename to src/tpOO/tp04/UseStudent.java
index 3875e34..6243e4a 100644
--- a/src/tp04/UseStudent.java
+++ b/src/tpOO/tp04/UseStudent.java
@@ -1,4 +1,4 @@
-package tp04;
+package tpOO.tp04;
public class UseStudent {
diff --git a/src/tp04/UseYearGroup.java b/src/tpOO/tp04/UseYearGroup.java
similarity index 65%
rename from src/tp04/UseYearGroup.java
rename to src/tpOO/tp04/UseYearGroup.java
index a95fff2..7b6c178 100644
--- a/src/tp04/UseYearGroup.java
+++ b/src/tpOO/tp04/UseYearGroup.java
@@ -1,4 +1,4 @@
-package tp04;
+package tpOO.tp04;
public class UseYearGroup {
diff --git a/src/tp04/YearGroup.java b/src/tpOO/tp04/YearGroup.java
similarity index 63%
rename from src/tp04/YearGroup.java
rename to src/tpOO/tp04/YearGroup.java
index f553331..4696869 100644
--- a/src/tp04/YearGroup.java
+++ b/src/tpOO/tp04/YearGroup.java
@@ -1,4 +1,4 @@
-package tp04;
+package tpOO.tp04;
public class YearGroup {
diff --git a/src/tp04/tp04-doc.zip b/src/tpOO/tp04/tp04-doc.zip
similarity index 100%
rename from src/tp04/tp04-doc.zip
rename to src/tpOO/tp04/tp04-doc.zip
diff --git a/src/tp04/tp04-res.jar b/src/tpOO/tp04/tp04-res.jar
similarity index 100%
rename from src/tp04/tp04-res.jar
rename to src/tpOO/tp04/tp04-res.jar
diff --git a/src/tp05/Article.java b/src/tpOO/tp05/Article.java
similarity index 62%
rename from src/tp05/Article.java
rename to src/tpOO/tp05/Article.java
index 549d424..63bfa8c 100644
--- a/src/tp05/Article.java
+++ b/src/tpOO/tp05/Article.java
@@ -1,4 +1,4 @@
-package tp05;
+package tpOO.tp05;
public class Article {
diff --git a/src/tp05/Book.java b/src/tpOO/tp05/Book.java
similarity index 59%
rename from src/tp05/Book.java
rename to src/tpOO/tp05/Book.java
index 3897a32..969cb2c 100644
--- a/src/tp05/Book.java
+++ b/src/tpOO/tp05/Book.java
@@ -1,4 +1,4 @@
-package tp05;
+package tpOO.tp05;
public class Book {
diff --git a/src/tp05/ComicBook.java b/src/tpOO/tp05/ComicBook.java
similarity index 63%
rename from src/tp05/ComicBook.java
rename to src/tpOO/tp05/ComicBook.java
index b63c4c0..3559f18 100644
--- a/src/tp05/ComicBook.java
+++ b/src/tpOO/tp05/ComicBook.java
@@ -1,4 +1,4 @@
-package tp05;
+package tpOO.tp05;
public class ComicBook {
diff --git a/src/tp05/Library.java b/src/tpOO/tp05/Library.java
similarity index 62%
rename from src/tp05/Library.java
rename to src/tpOO/tp05/Library.java
index 1110c1c..1fe22d3 100644
--- a/src/tp05/Library.java
+++ b/src/tpOO/tp05/Library.java
@@ -1,4 +1,4 @@
-package tp05;
+package tpOO.tp05;
public class Library {
diff --git a/src/tp05/PerishableArticle.java b/src/tpOO/tp05/PerishableArticle.java
similarity index 68%
rename from src/tp05/PerishableArticle.java
rename to src/tpOO/tp05/PerishableArticle.java
index 25e8ecf..66683f3 100644
--- a/src/tp05/PerishableArticle.java
+++ b/src/tpOO/tp05/PerishableArticle.java
@@ -1,4 +1,4 @@
-package tp05;
+package tpOO.tp05;
public class PerishableArticle {
diff --git a/src/tp05/UseArticle.java b/src/tpOO/tp05/UseArticle.java
similarity index 64%
rename from src/tp05/UseArticle.java
rename to src/tpOO/tp05/UseArticle.java
index ec0825b..5bf8bbc 100644
--- a/src/tp05/UseArticle.java
+++ b/src/tpOO/tp05/UseArticle.java
@@ -1,4 +1,4 @@
-package tp05;
+package tpOO.tp05;
public class UseArticle {
diff --git a/src/tp05/UseLibrary.java b/src/tpOO/tp05/UseLibrary.java
similarity index 64%
rename from src/tp05/UseLibrary.java
rename to src/tpOO/tp05/UseLibrary.java
index e2550c2..dd092aa 100644
--- a/src/tp05/UseLibrary.java
+++ b/src/tpOO/tp05/UseLibrary.java
@@ -1,4 +1,4 @@
-package tp05;
+package tpOO.tp05;
public class UseLibrary {
diff --git a/src/tp06/Car.java b/src/tpOO/tp06/Car.java
similarity index 58%
rename from src/tp06/Car.java
rename to src/tpOO/tp06/Car.java
index 4063da9..0dc0819 100644
--- a/src/tp06/Car.java
+++ b/src/tpOO/tp06/Car.java
@@ -1,4 +1,4 @@
-package tp06;
+package tpOO.tp06;
public class Car {
diff --git a/src/tp06/Company.java b/src/tpOO/tp06/Company.java
similarity index 98%
rename from src/tp06/Company.java
rename to src/tpOO/tp06/Company.java
index 338dc57..4f26a5d 100644
--- a/src/tp06/Company.java
+++ b/src/tpOO/tp06/Company.java
@@ -1,4 +1,4 @@
-package tp06;
+package tpOO.tp06;
import java.util.ArrayList;
import java.time.LocalDate;
diff --git a/src/tp06/Dealership.java b/src/tpOO/tp06/Dealership.java
similarity index 64%
rename from src/tp06/Dealership.java
rename to src/tpOO/tp06/Dealership.java
index 673e09c..a97a26f 100644
--- a/src/tp06/Dealership.java
+++ b/src/tpOO/tp06/Dealership.java
@@ -1,4 +1,4 @@
-package tp06;
+package tpOO.tp06;
public class Dealership {
diff --git a/src/tp06/Employee.java b/src/tpOO/tp06/Employee.java
similarity index 96%
rename from src/tp06/Employee.java
rename to src/tpOO/tp06/Employee.java
index 9d0ec83..1e727a8 100644
--- a/src/tp06/Employee.java
+++ b/src/tpOO/tp06/Employee.java
@@ -1,4 +1,4 @@
-package tp06;
+package tpOO.tp06;
import java.time.LocalDate;
public abstract class Employee{
diff --git a/src/tp06/Salesperson.java b/src/tpOO/tp06/Salesperson.java
similarity index 96%
rename from src/tp06/Salesperson.java
rename to src/tpOO/tp06/Salesperson.java
index 73c5a53..34363b7 100644
--- a/src/tp06/Salesperson.java
+++ b/src/tpOO/tp06/Salesperson.java
@@ -1,4 +1,4 @@
-package tp06;
+package tpOO.tp06;
import java.time.LocalDate;
abstract class Salesperson extends Employee{
diff --git a/src/tp06/TravellingSalesperson.java b/src/tpOO/tp06/TravellingSalesperson.java
similarity index 96%
rename from src/tp06/TravellingSalesperson.java
rename to src/tpOO/tp06/TravellingSalesperson.java
index 58adfd9..bf07a87 100644
--- a/src/tp06/TravellingSalesperson.java
+++ b/src/tpOO/tp06/TravellingSalesperson.java
@@ -1,4 +1,4 @@
-package tp06;
+package tpOO.tp06;
import java.time.LocalDate;
public class TravellingSalesperson extends Salesperson{
diff --git a/src/tp06/UseCar.java b/src/tpOO/tp06/UseCar.java
similarity index 61%
rename from src/tp06/UseCar.java
rename to src/tpOO/tp06/UseCar.java
index 2e46476..4503abc 100644
--- a/src/tp06/UseCar.java
+++ b/src/tpOO/tp06/UseCar.java
@@ -1,4 +1,4 @@
-package tp06;
+package tpOO.tp06;
public class UseCar {
diff --git a/src/tp06/Vendor.java b/src/tpOO/tp06/Vendor.java
similarity index 95%
rename from src/tp06/Vendor.java
rename to src/tpOO/tp06/Vendor.java
index 001ece4..c29dc03 100644
--- a/src/tp06/Vendor.java
+++ b/src/tpOO/tp06/Vendor.java
@@ -1,4 +1,4 @@
-package tp06;
+package tpOO.tp06;
import java.time.LocalDate;
public class Vendor extends Salesperson{
diff --git a/src/tp06/VintageCar.java b/src/tpOO/tp06/VintageCar.java
similarity index 64%
rename from src/tp06/VintageCar.java
rename to src/tpOO/tp06/VintageCar.java
index b61ad43..97cde6c 100644
--- a/src/tp06/VintageCar.java
+++ b/src/tpOO/tp06/VintageCar.java
@@ -1,4 +1,4 @@
-package tp06;
+package tpOO.tp06;
public class VintageCar {
diff --git a/src/tp06/Worker.java b/src/tpOO/tp06/Worker.java
similarity index 97%
rename from src/tp06/Worker.java
rename to src/tpOO/tp06/Worker.java
index 4b6dc46..f2010fb 100644
--- a/src/tp06/Worker.java
+++ b/src/tpOO/tp06/Worker.java
@@ -1,4 +1,4 @@
-package tp06;
+package tpOO.tp06;
import java.time.LocalDate;
public class Worker extends Employee{
diff --git a/test/tp05/LibraryTest.java b/test/tpOO/tp05/LibraryTest.java
similarity index 98%
rename from test/tp05/LibraryTest.java
rename to test/tpOO/tp05/LibraryTest.java
index a754214..5dcb7ad 100644
--- a/test/tp05/LibraryTest.java
+++ b/test/tpOO/tp05/LibraryTest.java
@@ -8,6 +8,11 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import java.time.LocalDate;
import org.junit.jupiter.api.Test;
+
+import tpOO.tp05.Book;
+import tpOO.tp05.ComicBook;
+import tpOO.tp05.Library;
+
import org.junit.jupiter.api.BeforeEach;
public class LibraryTest {
diff --git a/test/tp05/ShopTest.java b/test/tpOO/tp05/ShopTest.java
similarity index 98%
rename from test/tp05/ShopTest.java
rename to test/tpOO/tp05/ShopTest.java
index 642e283..42a1fbf 100644
--- a/test/tp05/ShopTest.java
+++ b/test/tpOO/tp05/ShopTest.java
@@ -8,6 +8,9 @@ import java.util.ArrayList;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import tpOO.tp05.Article;
+import tpOO.tp05.PerishableArticle;
+
public class ShopTest {
private String ref1, ref2, ref3, ref4;
private String label1, label2, label3, label4;
diff --git a/test/tp06/CompanyTest.java b/test/tpOO/tp06/CompanyTest.java
similarity index 96%
rename from test/tp06/CompanyTest.java
rename to test/tpOO/tp06/CompanyTest.java
index f10ebb3..23dda1c 100644
--- a/test/tp06/CompanyTest.java
+++ b/test/tpOO/tp06/CompanyTest.java
@@ -1,4 +1,4 @@
-package tp06;
+package tpOO.tp06;
import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -7,6 +7,12 @@ import java.time.LocalDate;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
+import tpOO.tp06.Company;
+import tpOO.tp06.Employee;
+import tpOO.tp06.TravellingSalesperson;
+import tpOO.tp06.Vendor;
+import tpOO.tp06.Worker;
+
public class CompanyTest {
private Employee ts1, ts2, v1, w1, w2;
private Company society;
--
GitLab