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 91e1fff9e010a40ab8baa63799484b693e762cf2..2ecfabe922d5ef819c71d4e1e66cc1ec6c8a234d 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 493ac7c97bb80c7d3db52910d20ecef34b0080c2..812ef0b71cfb962d2dd6c1a949dbd6acdbbcf94e 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 c669ab5d462973a1e1a42938ccb13d555510b3d5..2d3c4cdd8816d4d37926a13a74d7a10795f0d544 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 58ff475df6005d16e5bb3dd717018bfd20812d14..d1bfd8f5b3535474f34c1012e46912a489afa174 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 28515814625d9b64ce5c30f4a37d665f66e870f5..c64944a7cea4ed141ef07956027b41d1a5b24e2a 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 5434a03f2f9906373133e93f597902746f612ca5..aa9b2aaf579312e09e694a842bfcc3dbeb6df681 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 1c67f2f5f7c7da159b4693ccbfbdb97563cfc213..14716a69ea300a2296662b57031e116940d8f46f 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 64ce98e4eac17ad1fa25a58b5ac1ffb70e036aab..d1f34392c99c498d1a3bbdcbefc900665615183a 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 0c881550dd100041440edcd94cc9b8ab195b50ec..4abc245635dc9428b09d38ecac924e04b1ad6cbd 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 795c1105f89db26d539b7bea41eb07aff849fa2a..b003cd8eabfceb7efe13cfd691e339c725dae719 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 09f37bcf04f4e3ff88175242c1c9c5d23d5d0864..12293a657a3c9fbfcbdcd3e165be932f2e7cfe82 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 f113b913b0f46315eba7bb511fb9d67a4bcf63a7..1a2145615a7611544e015d135ef0461393f7f2f0 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 381f591e7233815fc31674ff12276ea13443c9d5..a06d4201822d71cdcbe90b4df2897730f33251dd 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 f6dbef248790c1a64d56f86dc95c7a6f0f2fa3c3..99ca919f35fd683f581b109204ff10948d8e2825 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 c3fade4bab52867669330030a5021d636de541b9..84eca7f6116bc607600a93a239dca0ee215aa93d 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 6a58ed06cc441edda2f444b39d01067ed64489b6..5ca1b5a22781c3644a261005fba6a970a3cedd6a 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 69a32f5706d55db4660a71c73375b86b9e363ca5..4a8b3f80e3cf8f1c534503b09d37ec2608be0873 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 d14b4a149b4663814672b23eaea95f6fabe93422..7ad1348b51275c3ebc5fbe4a94fb1034192e093f 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 6bf34be1b77bc8231e7a5e4a3c55239b5e2a88c2..f9bd68d77cfbc471cdb11a30a29885e72485387f 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 f7618f3f709a8a53d5afd3b591e62dd30dad1b7c..4789ece3d4e60e8e7cb5905e54c11f1a9af02ebb 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 caf425d9267e0504ea673345ca7234cc533bbe79..265f761db376586b8b477622ac579c128a70d56e 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 c483c3e47093bb9580ffd3ad251a21b37e82b7eb..a9c2ad11ed063cc53b3e1ca3e6e58409c912044f 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 b4860a6be2904f363d855e8cf0cd2be0d16c8525..06213d9a4847247417cb59b6442c4677b8ab791f 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 2451d9f26d4e35a14ad1476fb8772ef4893c1ee5..ecadf1db0964cd686daa09e21d6de756cd5a76c1 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 154606c3444273697e22a305be4c45c9687dafe4..9f0734008454384dbc3360aa2ad8c09ae212ebfa 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 49ba067da6ee302ad3c332b6993e4b5574a5872a..5995714642f85f28964b8196b3eace03c391dc2d 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 56a03eb8933fe84c90abeac26b72c53b961c2c3b..9ed754d4bcd4db1785f5606b2d843eade44c7e1e 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 e48d0477bc67f964e9c6fc41e4884f7a7a928f5d..8e4d7a6999e7ca128503ceaef5441602629cd609 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 391a1ae1bb737038ac8b367b5e0114abe6388529..78e50a1a56851294d575c5136400a2993001ebd6 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 05bc89220d280594566c8b7f42f5a2b62b89c2b5..75921d3a37d892ed1d04cbcf3f37cb6b4c557ef3 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 7010edd8eb400514f7f4d1212400d08a62d8f23a..096f5ce204d74d450fdadb7849fbdebfef8d5004 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 3875e34f3e0185235e051d4cdf389ca0ee62cf57..6243e4aefa523a1957043434680f8c4a14c7167e 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 a95fff22c92ec0a33c628b42ccd7ab925f01130b..7b6c178e66608248de52935e20fb44698593082c 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 f553331fa30c126f33bb8a1abe86b7a82024ebd1..4696869d39abd1eb87c59fc86356f4c08fdb45b5 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 549d424f8ce6a927fa7002c4e2e664b13ffa4503..63bfa8c476c0e7d66ef5175b7724597480003812 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 3897a3263165510abeee1c6a0eacb7d29bfd2c6f..969cb2cf824709c763789abd0d920ac504552bda 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 b63c4c0e85b935af9b168b1f43e05aa5d2ea4876..3559f18b168d568bcfe67adb254c156d33db81a4 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 1110c1c824655aaa881c9651540194a57d08573e..1fe22d32a217346cc8ad45a9973d47d77fe51220 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 25e8ecf1e597d52be524401703a11d8d46aa704d..66683f314c3b64ba1685492803e12e51f1db6996 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 ec0825b9958c29d23793e57bbbf99efe0538737d..5bf8bbcc7110a8540a02ff7a0d189e01a9044bf6 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 e2550c25cabf28f48ea798ee18ae106fcfda4762..dd092aa29c640ac175ad0832e70c86e33eeba20b 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 4063da985391d3cb5834ae55698345369278b271..0dc081992af2fc0f898e317d1a535442d2ba26f7 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 338dc5759b9e63f1f19f209712bd95f93b8135b7..4f26a5d0f1d49d465745acb41ef36478b983dce5 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 673e09c5cfa8dafd8de3df13c5253d42fb4ad3cf..a97a26f0bfeee871645f3ef9fe8cc13b59a18665 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 9d0ec8318679c46e7fea3ee6dc10c4808b380b84..1e727a8900f11f8c2ece98d30ee003ec6d5dc763 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 73c5a530676b988bde562856076c1fa7269b9a9f..34363b748b32ad034972454986afa821fb68857a 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 58adfd9c00aff6811242afa37d4ebd1f218cf4b5..bf07a87ee8cacfecf19057e2de5f7af680291880 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 2e4647651d0f48883eb865ff02c4f9e8024ae491..4503abc6ec5b43cb19682f34d1cb7304a6034941 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 001ece429f9dadae4335c22cab87c858dee42ba4..c29dc0351153c6e168631a7d315939cb97dde1ec 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 b61ad43186a9e784bab321a877b442995e22f773..97cde6c3d974a16cc04cee9c1eed4309b2f31838 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 4b6dc469f4677821a9f1e49681bf2466fcc362f3..f2010fb45a7f53e223b2b99342bec39f6c7531f9 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 a7542142a25c1048959dc45155202adbc5f1ebde..5dcb7ad8df3f87e481f6d7379154b8d4169b9393 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 642e283c341bc7db23e72a3a56f94ff16c3f2581..42a1fbfad0b6c50a5dbb258ac415173c1ee3b3aa 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 f10ebb3d164be625f64576a41cb86b52aed5ec3b..23dda1ccb24bc766dff520ac9a3bf508ab5d19f4 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;