From fe2d0c2962805409214677e801c1b3f31cc5f101 Mon Sep 17 00:00:00 2001
From: Oscar Bauer <oscar.bauer@etu.univ-amu.fr>
Date: Mon, 18 Nov 2024 22:38:15 +0100
Subject: [PATCH] deleted TPs out of Minesweeper branch
---
CCI_Java/CCI_Java/.classpath | 1 -
.../src/projet/tp1/version2/MainGui.java | 11 --
.../src/projet/tp1/version2/Minesweeper.java | 3 -
.../projet/tp1/version2/MinesweeperFrame.java | 19 --
.../projet/tp1/version2/MinesweeperPanel.java | 36 ----
.../src/projet/tp2/version1/MainGui.java | 7 -
.../src/projet/tp2/version1/Minesweeper.java | 3 -
.../projet/tp2/version1/MinesweeperFrame.java | 19 --
.../projet/tp2/version1/MinesweeperPanel.java | 41 ----
.../src/projet/tp2/version2/MainGui.java | 7 -
.../src/projet/tp2/version2/Minesweeper.java | 3 -
.../projet/tp2/version2/MinesweeperFrame.java | 19 --
.../projet/tp2/version2/MinesweeperPanel.java | 43 ----
.../src/projet/tp2/version3/MainGui.java | 7 -
.../src/projet/tp2/version3/Minesweeper.java | 3 -
.../projet/tp2/version3/MinesweeperFrame.java | 19 --
.../projet/tp2/version3/MinesweeperPanel.java | 46 -----
CCI_Java/CCI_Java/src/td1/EX01.java | 58 ------
CCI_Java/CCI_Java/src/td5/ex01/Date.java | 82 --------
CCI_Java/CCI_Java/src/td5/ex01/Employee.java | 18 --
CCI_Java/CCI_Java/src/td5/ex01/Holiday.java | 17 --
.../src/td5/ex01/HolidaysExample1.java | 14 --
.../src/td5/ex01/HolidaysExample2.java | 35 ----
CCI_Java/CCI_Java/src/td6/Promotion.java | 30 ---
CCI_Java/CCI_Java/src/td6/Student.java | 45 -----
CCI_Java/CCI_Java/src/td6/SubjectResult.java | 26 ---
CCI_Java/CCI_Java/src/td6/TestPromotion.java | 30 ---
CCI_Java/CCI_Java/src/td7/Point.java | 44 -----
CCI_Java/CCI_Java/src/td7/Polygon.java | 51 -----
CCI_Java/CCI_Java/src/td7/TestPoint.java | 15 --
CCI_Java/CCI_Java/src/td7/TestPolygon.java | 21 --
.../CCI_Java/src/tp1/EX01/HalloWorld.java | 10 -
.../src/tp1/EX02/AverageCalculator.java | 28 ---
.../CCI_Java/src/tp1/EX03/TimeConverter.java | 20 --
.../src/tp1/EX04/SphereCalculator.java | 21 --
.../tp1/version1/MainGui.java | 0
.../tp1/version1/Minesweeper.java | 0
.../tp1/version1/MinesweeperFrame.java | 0
.../tp1/version1/MinesweeperPanel.java | 0
.../tp1/version2/MainGui.java | 0
.../tp1/version2/Minesweeper.java | 0
.../tp1/version2/MinesweeperFrame.java | 0
.../tp1/version2/MinesweeperPanel.java | 0
.../CCI_Java/src/tp2/ex01/ExamResults.java | 34 ----
.../src/tp2/ex02/ArithmeticOperations.java | 27 ---
.../CCI_Java/src/tp2/ex03/RandomNumbers.java | 22 ---
.../src/tp2/ex04/MoneyDecomposition.java | 30 ---
.../src/tp2/ex04/MoneyDecompositionV2.java | 63 ------
.../src/tp2/minesweeperVersion1/MainGui.java | 7 -
.../tp2/minesweeperVersion1/Minesweeper.java | 9 -
.../minesweeperVersion1/MinesweeperFrame.java | 25 ---
.../minesweeperVersion1/MinesweeperPanel.java | 53 -----
.../MinesweeperPanelDamier.java | 64 ------
.../src/tp2/minesweeperVersion2/MainGui.java | 7 -
.../tp2/minesweeperVersion2/Minesweeper.java | 9 -
.../minesweeperVersion2/MinesweeperFrame.java | 25 ---
.../minesweeperVersion2/MinesweeperPanel.java | 60 ------
.../MinesweeperPanelDamier.java | 64 ------
.../src/tp2/minesweeperVersion2/fiddling.java | 12 --
.../{minesweeper => src}/tp2/v1/MainGui.java | 0
.../tp2/v1/Minesweeper.java | 0
.../tp2/v1/MinesweeperFrame.java | 0
.../tp2/v1/MinesweeperPanel.java | 0
.../tp2/v1/MinesweeperPanelDamier.java | 0
.../{minesweeper => src}/tp2/v1/fiddling.java | 0
CCI_Java/CCI_Java/src/tp3/ex01/Product.java | 6 -
.../CCI_Java/src/tp3/ex01/ProductExample.java | 26 ---
CCI_Java/CCI_Java/src/tp3/ex02/Product.java | 6 -
.../CCI_Java/src/tp3/ex02/ProductExample.java | 18 --
.../CCI_Java/src/tp3/ex03/NumberPrinter.java | 17 --
.../CCI_Java/src/tp3/ex04/NumberPrinter.java | 17 --
.../CCI_Java/src/tp3/ex05/SumCalculator.java | 21 --
.../src/tp3/ex06/PowerCalculator.java | 23 ---
.../src/tp3/minesweeperVersion1/MainGui.java | 7 -
.../tp3/minesweeperVersion1/Minesweeper.java | 9 -
.../minesweeperVersion1/MinesweeperFrame.java | 25 ---
.../minesweeperVersion1/MinesweeperPanel.java | 74 -------
.../MinesweeperPanelDamier.java | 64 ------
.../src/tp3/minesweeperVersion2/MainGui.java | 7 -
.../tp3/minesweeperVersion2/Minesweeper.java | 9 -
.../minesweeperVersion2/MinesweeperFrame.java | 25 ---
.../minesweeperVersion2/MinesweeperPanel.java | 63 ------
.../MinesweeperPanelDamier.java | 60 ------
.../src/tp3/minesweeperVersion3/MainGui.java | 7 -
.../tp3/minesweeperVersion3/Minesweeper.java | 27 ---
.../minesweeperVersion3/MinesweeperFrame.java | 27 ---
.../minesweeperVersion3/MinesweeperPanel.java | 109 -----------
.../PanelMouseListener.java | 29 ---
.../src/tp3/minesweeperVersion4/MainGui.java | 7 -
.../tp3/minesweeperVersion4/Minesweeper.java | 32 ---
.../minesweeperVersion4/MinesweeperFrame.java | 29 ---
.../minesweeperVersion4/MinesweeperPanel.java | 134 -------------
.../PanelMouseListener.java | 32 ---
CCI_Java/CCI_Java/src/tp4/ex01/Date.java | 76 --------
CCI_Java/CCI_Java/src/tp4/ex01/Date2.java | 81 --------
.../src/tp4/ex01/TestConstructor.java | 12 --
.../CCI_Java/src/tp4/ex01/TestIsBefore.java | 21 --
.../CCI_Java/src/tp4/ex01/TestIsLeap.java | 16 --
.../src/tp4/ex01/TestNbDaysInMonth.java | 34 ----
.../CCI_Java/src/tp4/ex01/TestNextDay.java | 26 ---
CCI_Java/CCI_Java/src/tp4/ex01/TestPrint.java | 11 --
.../CCI_Java/src/tp4/ex02/QuizAddition.java | 43 ----
.../src/tp4/minesweeperVersion2/Cell.java | 12 --
.../src/tp4/minesweeperVersion2/MainGui.java | 7 -
.../tp4/minesweeperVersion2/Minesweeper.java | 52 -----
.../minesweeperVersion2/MinesweeperFrame.java | 21 --
.../minesweeperVersion2/MinesweeperPanel.java | 183 ------------------
.../PanelMouseListener.java | 33 ----
.../minesweeperVersion3oneByeOne/Cell.java | 12 --
.../minesweeperVersion3oneByeOne/MainGui.java | 7 -
.../Minesweeper.java | 49 -----
.../MinesweeperFrame.java | 21 --
.../MinesweeperPanel.java | 125 ------------
.../MinesweeperPanelable.java | 19 --
.../PanelMouseListener.java | 33 ----
.../tp4/minesweeperVersionFreestyle/Cell.java | 12 --
.../minesweeperVersionFreestyle/MainGui.java | 7 -
.../Minesweeper.java | 52 -----
.../MinesweeperFrame.java | 37 ----
.../MinesweeperPanel.java | 182 -----------------
.../PanelMouseListener.java | 32 ---
.../{minesweeper => src}/tp4/v1/Cell.java | 0
.../{minesweeper => src}/tp4/v1/MainGui.java | 0
.../tp4/v1/Minesweeper.java | 0
.../tp4/v1/MinesweeperFrame.java | 0
.../tp4/v1/MinesweeperPanel.java | 0
.../tp4/v1/MinesweeperPanelable.java | 0
.../tp4/v1/PanelMouseListener.java | 0
CCI_Java/CCI_Java/src/tp5/ex01/Date.java | 97 ----------
CCI_Java/CCI_Java/src/tp5/ex01/Employee.java | 96 ---------
CCI_Java/CCI_Java/src/tp5/ex01/Holiday.java | 33 ----
.../CCI_Java/src/tp5/ex01/HolidayManager.java | 33 ----
.../src/tp5/ex01/TestCheckIfOnHoliday.java | 18 --
.../CCI_Java/src/tp5/ex01/TestDateV1.java | 20 --
.../CCI_Java/src/tp5/ex01/TestDateV2.java | 18 --
.../CCI_Java/src/tp5/ex01/TestEmployeeV1.java | 15 --
.../CCI_Java/src/tp5/ex01/TestEmployeeV2.java | 14 --
.../CCI_Java/src/tp5/ex01/TestHolidayV1.java | 22 ---
.../CCI_Java/src/tp5/ex01/TestHolidayV2.java | 17 --
.../src/tp5/ex01/TestPrintEmployee.java | 17 --
.../CCI_Java/src/tp5/ex02/CasinoGame.java | 61 ------
CCI_Java/CCI_Java/src/tp5/ex02/test.java | 14 --
.../src/tp5/minesweeper/freestyle/Cell.java | 76 --------
.../tp5/minesweeper/freestyle/MainGui.java | 7 -
.../minesweeper/freestyle/Minesweeper.java | 57 ------
.../freestyle/MinesweeperFrame.java | 71 -------
.../freestyle/MinesweeperPanel.java | 181 -----------------
.../freestyle/MinesweeperPanelable.java | 20 --
.../freestyle/PanelMouseListener.java | 44 -----
.../src/tp5/minesweeper/version1/Cell.java | 24 ---
.../src/tp5/minesweeper/version1/MainGui.java | 7 -
.../tp5/minesweeper/version1/Minesweeper.java | 73 -------
.../version1/MinesweeperFrame.java | 83 --------
.../version1/MinesweeperPanel.java | 143 --------------
.../version1/MinesweeperPanelable.java | 20 --
.../version1/PanelMouseListener.java | 34 ----
.../{minesweeper => src}/tp5/v1/Cell.java | 0
.../{minesweeper => src}/tp5/v1/MainGui.java | 0
.../tp5/v1/Minesweeper.java | 0
.../tp5/v1/MinesweeperFrame.java | 0
.../tp5/v1/MinesweeperPanel.java | 0
.../tp5/v1/MinesweeperPanelable.java | 0
.../tp5/v1/PanelMouseListener.java | 0
.../tp5/v1/TestArrayListOfCell.java | 0
.../tp5/v1/TestArrayListOfCell2.java | 0
.../{minesweeper => src}/tp5/v1/TestCell.java | 0
.../{minesweeper => src}/tp5/v2/Cell.java | 0
.../{minesweeper => src}/tp5/v2/MainGui.java | 0
.../tp5/v2/Minesweeper.java | 0
.../tp5/v2/MinesweeperFrame.java | 0
.../tp5/v2/MinesweeperPanel.java | 0
.../tp5/v2/MinesweeperPanelable.java | 0
.../tp5/v2/PanelMouseListener.java | 0
.../tp5/v2/TestArrayListOfCell.java | 0
.../tp5/v2/TestArrayListOfCell2.java | 0
.../{minesweeper => src}/tp5/v2/TestCell.java | 0
.../CCI_Java/src/tp6/ex01/Contribution.java | 28 ---
CCI_Java/CCI_Java/src/tp6/ex01/Team.java | 27 ---
.../CCI_Java/src/tp6/ex01/TeamMember.java | 54 ------
.../src/tp6/ex01/TestContribution.java | 13 --
CCI_Java/CCI_Java/src/tp6/ex01/TestTeam.java | 30 ---
.../CCI_Java/src/tp6/ex01/TestTeamMember.java | 17 --
.../{minesweeper => src}/tp6/v1/Cell.java | 0
.../{minesweeper => src}/tp6/v1/MainGui.java | 0
.../tp6/v1/Minesweeper.java | 0
.../tp6/v1/MinesweeperFrame.java | 0
.../tp6/v1/MinesweeperPanel.java | 0
.../tp6/v1/MinesweeperPanelable.java | 0
.../tp6/v1/PanelMouseListener.java | 0
.../{minesweeper => src}/tp6/v2/Cell.java | 0
.../{minesweeper => src}/tp6/v2/MainGui.java | 0
.../tp6/v2/Minesweeper.java | 0
.../tp6/v2/MinesweeperFrame.java | 0
.../tp6/v2/MinesweeperPanel.java | 0
.../tp6/v2/MinesweeperPanelable.java | 0
.../tp6/v2/PanelMouseListener.java | 0
.../{minesweeper => src}/tp6/v3/Cell.java | 0
.../{minesweeper => src}/tp6/v3/MainGui.java | 0
.../tp6/v3/Minesweeper.java | 0
.../tp6/v3/MinesweeperFrame.java | 0
.../tp6/v3/MinesweeperPanel.java | 0
.../tp6/v3/MinesweeperPanelable.java | 0
.../tp6/v3/PanelMouseListener.java | 0
.../{minesweeper => src}/tp6/v3/Position.java | 0
.../CCI_Java/src/tp7/exo1/TestString1.java | 28 ---
.../CCI_Java/src/tp7/exo1/TestString10.java | 21 --
.../CCI_Java/src/tp7/exo1/TestString11.java | 20 --
.../CCI_Java/src/tp7/exo1/TestString2.java | 32 ---
.../CCI_Java/src/tp7/exo1/TestString3.java | 17 --
.../CCI_Java/src/tp7/exo1/TestString4.java | 17 --
.../CCI_Java/src/tp7/exo1/TestString5.java | 17 --
.../CCI_Java/src/tp7/exo1/TestString6.java | 17 --
.../CCI_Java/src/tp7/exo1/TestString7.java | 19 --
.../CCI_Java/src/tp7/exo1/TestString8.java | 20 --
.../CCI_Java/src/tp7/exo1/TestString9.java | 25 ---
.../CCI_Java/src/tp7/exo2/Calculator.java | 22 ---
.../CCI_Java/src/tp7/exo2/TestPowOf10V1.java | 13 --
.../CCI_Java/src/tp7/exo2/TestPowOf10V2.java | 19 --
.../CCI_Java/src/tp7/exo2/TestPowOf10V3.java | 17 --
.../CCI_Java/src/tp7/exo2/TestPowOf10V4.java | 16 --
CCI_Java/minesweeper/.project | 11 --
CCI_Java/tp/.project | 11 --
222 files changed, 5315 deletions(-)
delete mode 100644 CCI_Java/CCI_Java/src/projet/tp1/version2/MainGui.java
delete mode 100644 CCI_Java/CCI_Java/src/projet/tp1/version2/Minesweeper.java
delete mode 100644 CCI_Java/CCI_Java/src/projet/tp1/version2/MinesweeperFrame.java
delete mode 100644 CCI_Java/CCI_Java/src/projet/tp1/version2/MinesweeperPanel.java
delete mode 100644 CCI_Java/CCI_Java/src/projet/tp2/version1/MainGui.java
delete mode 100644 CCI_Java/CCI_Java/src/projet/tp2/version1/Minesweeper.java
delete mode 100644 CCI_Java/CCI_Java/src/projet/tp2/version1/MinesweeperFrame.java
delete mode 100644 CCI_Java/CCI_Java/src/projet/tp2/version1/MinesweeperPanel.java
delete mode 100644 CCI_Java/CCI_Java/src/projet/tp2/version2/MainGui.java
delete mode 100644 CCI_Java/CCI_Java/src/projet/tp2/version2/Minesweeper.java
delete mode 100644 CCI_Java/CCI_Java/src/projet/tp2/version2/MinesweeperFrame.java
delete mode 100644 CCI_Java/CCI_Java/src/projet/tp2/version2/MinesweeperPanel.java
delete mode 100644 CCI_Java/CCI_Java/src/projet/tp2/version3/MainGui.java
delete mode 100644 CCI_Java/CCI_Java/src/projet/tp2/version3/Minesweeper.java
delete mode 100644 CCI_Java/CCI_Java/src/projet/tp2/version3/MinesweeperFrame.java
delete mode 100644 CCI_Java/CCI_Java/src/projet/tp2/version3/MinesweeperPanel.java
delete mode 100644 CCI_Java/CCI_Java/src/td1/EX01.java
delete mode 100644 CCI_Java/CCI_Java/src/td5/ex01/Date.java
delete mode 100644 CCI_Java/CCI_Java/src/td5/ex01/Employee.java
delete mode 100644 CCI_Java/CCI_Java/src/td5/ex01/Holiday.java
delete mode 100644 CCI_Java/CCI_Java/src/td5/ex01/HolidaysExample1.java
delete mode 100644 CCI_Java/CCI_Java/src/td5/ex01/HolidaysExample2.java
delete mode 100644 CCI_Java/CCI_Java/src/td6/Promotion.java
delete mode 100644 CCI_Java/CCI_Java/src/td6/Student.java
delete mode 100644 CCI_Java/CCI_Java/src/td6/SubjectResult.java
delete mode 100644 CCI_Java/CCI_Java/src/td6/TestPromotion.java
delete mode 100644 CCI_Java/CCI_Java/src/td7/Point.java
delete mode 100644 CCI_Java/CCI_Java/src/td7/Polygon.java
delete mode 100644 CCI_Java/CCI_Java/src/td7/TestPoint.java
delete mode 100644 CCI_Java/CCI_Java/src/td7/TestPolygon.java
delete mode 100644 CCI_Java/CCI_Java/src/tp1/EX01/HalloWorld.java
delete mode 100644 CCI_Java/CCI_Java/src/tp1/EX02/AverageCalculator.java
delete mode 100644 CCI_Java/CCI_Java/src/tp1/EX03/TimeConverter.java
delete mode 100644 CCI_Java/CCI_Java/src/tp1/EX04/SphereCalculator.java
rename CCI_Java/CCI_Java/{minesweeper => src}/tp1/version1/MainGui.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp1/version1/Minesweeper.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp1/version1/MinesweeperFrame.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp1/version1/MinesweeperPanel.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp1/version2/MainGui.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp1/version2/Minesweeper.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp1/version2/MinesweeperFrame.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp1/version2/MinesweeperPanel.java (100%)
delete mode 100644 CCI_Java/CCI_Java/src/tp2/ex01/ExamResults.java
delete mode 100644 CCI_Java/CCI_Java/src/tp2/ex02/ArithmeticOperations.java
delete mode 100644 CCI_Java/CCI_Java/src/tp2/ex03/RandomNumbers.java
delete mode 100644 CCI_Java/CCI_Java/src/tp2/ex04/MoneyDecomposition.java
delete mode 100644 CCI_Java/CCI_Java/src/tp2/ex04/MoneyDecompositionV2.java
delete mode 100644 CCI_Java/CCI_Java/src/tp2/minesweeperVersion1/MainGui.java
delete mode 100644 CCI_Java/CCI_Java/src/tp2/minesweeperVersion1/Minesweeper.java
delete mode 100644 CCI_Java/CCI_Java/src/tp2/minesweeperVersion1/MinesweeperFrame.java
delete mode 100644 CCI_Java/CCI_Java/src/tp2/minesweeperVersion1/MinesweeperPanel.java
delete mode 100644 CCI_Java/CCI_Java/src/tp2/minesweeperVersion1/MinesweeperPanelDamier.java
delete mode 100644 CCI_Java/CCI_Java/src/tp2/minesweeperVersion2/MainGui.java
delete mode 100644 CCI_Java/CCI_Java/src/tp2/minesweeperVersion2/Minesweeper.java
delete mode 100644 CCI_Java/CCI_Java/src/tp2/minesweeperVersion2/MinesweeperFrame.java
delete mode 100644 CCI_Java/CCI_Java/src/tp2/minesweeperVersion2/MinesweeperPanel.java
delete mode 100644 CCI_Java/CCI_Java/src/tp2/minesweeperVersion2/MinesweeperPanelDamier.java
delete mode 100644 CCI_Java/CCI_Java/src/tp2/minesweeperVersion2/fiddling.java
rename CCI_Java/CCI_Java/{minesweeper => src}/tp2/v1/MainGui.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp2/v1/Minesweeper.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp2/v1/MinesweeperFrame.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp2/v1/MinesweeperPanel.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp2/v1/MinesweeperPanelDamier.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp2/v1/fiddling.java (100%)
delete mode 100644 CCI_Java/CCI_Java/src/tp3/ex01/Product.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/ex01/ProductExample.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/ex02/Product.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/ex02/ProductExample.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/ex03/NumberPrinter.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/ex04/NumberPrinter.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/ex05/SumCalculator.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/ex06/PowerCalculator.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/minesweeperVersion1/MainGui.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/minesweeperVersion1/Minesweeper.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/minesweeperVersion1/MinesweeperFrame.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/minesweeperVersion1/MinesweeperPanel.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/minesweeperVersion1/MinesweeperPanelDamier.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/minesweeperVersion2/MainGui.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/minesweeperVersion2/Minesweeper.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/minesweeperVersion2/MinesweeperFrame.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/minesweeperVersion2/MinesweeperPanel.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/minesweeperVersion2/MinesweeperPanelDamier.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/minesweeperVersion3/MainGui.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/minesweeperVersion3/Minesweeper.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/minesweeperVersion3/MinesweeperFrame.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/minesweeperVersion3/MinesweeperPanel.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/minesweeperVersion3/PanelMouseListener.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/minesweeperVersion4/MainGui.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/minesweeperVersion4/Minesweeper.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/minesweeperVersion4/MinesweeperFrame.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/minesweeperVersion4/MinesweeperPanel.java
delete mode 100644 CCI_Java/CCI_Java/src/tp3/minesweeperVersion4/PanelMouseListener.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/ex01/Date.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/ex01/Date2.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/ex01/TestConstructor.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/ex01/TestIsBefore.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/ex01/TestIsLeap.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/ex01/TestNbDaysInMonth.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/ex01/TestNextDay.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/ex01/TestPrint.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/ex02/QuizAddition.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/minesweeperVersion2/Cell.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/minesweeperVersion2/MainGui.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/minesweeperVersion2/Minesweeper.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/minesweeperVersion2/MinesweeperFrame.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/minesweeperVersion2/MinesweeperPanel.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/minesweeperVersion2/PanelMouseListener.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/Cell.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/MainGui.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/Minesweeper.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/MinesweeperFrame.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/MinesweeperPanel.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/MinesweeperPanelable.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/PanelMouseListener.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/minesweeperVersionFreestyle/Cell.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/minesweeperVersionFreestyle/MainGui.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/minesweeperVersionFreestyle/Minesweeper.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/minesweeperVersionFreestyle/MinesweeperFrame.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/minesweeperVersionFreestyle/MinesweeperPanel.java
delete mode 100644 CCI_Java/CCI_Java/src/tp4/minesweeperVersionFreestyle/PanelMouseListener.java
rename CCI_Java/CCI_Java/{minesweeper => src}/tp4/v1/Cell.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp4/v1/MainGui.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp4/v1/Minesweeper.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp4/v1/MinesweeperFrame.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp4/v1/MinesweeperPanel.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp4/v1/MinesweeperPanelable.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp4/v1/PanelMouseListener.java (100%)
delete mode 100644 CCI_Java/CCI_Java/src/tp5/ex01/Date.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/ex01/Employee.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/ex01/Holiday.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/ex01/HolidayManager.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/ex01/TestCheckIfOnHoliday.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/ex01/TestDateV1.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/ex01/TestDateV2.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/ex01/TestEmployeeV1.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/ex01/TestEmployeeV2.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/ex01/TestHolidayV1.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/ex01/TestHolidayV2.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/ex01/TestPrintEmployee.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/ex02/CasinoGame.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/ex02/test.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/Cell.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/MainGui.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/Minesweeper.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/MinesweeperFrame.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/MinesweeperPanel.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/MinesweeperPanelable.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/PanelMouseListener.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/minesweeper/version1/Cell.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/minesweeper/version1/MainGui.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/minesweeper/version1/Minesweeper.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/minesweeper/version1/MinesweeperFrame.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/minesweeper/version1/MinesweeperPanel.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/minesweeper/version1/MinesweeperPanelable.java
delete mode 100644 CCI_Java/CCI_Java/src/tp5/minesweeper/version1/PanelMouseListener.java
rename CCI_Java/CCI_Java/{minesweeper => src}/tp5/v1/Cell.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp5/v1/MainGui.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp5/v1/Minesweeper.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp5/v1/MinesweeperFrame.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp5/v1/MinesweeperPanel.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp5/v1/MinesweeperPanelable.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp5/v1/PanelMouseListener.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp5/v1/TestArrayListOfCell.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp5/v1/TestArrayListOfCell2.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp5/v1/TestCell.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp5/v2/Cell.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp5/v2/MainGui.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp5/v2/Minesweeper.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp5/v2/MinesweeperFrame.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp5/v2/MinesweeperPanel.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp5/v2/MinesweeperPanelable.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp5/v2/PanelMouseListener.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp5/v2/TestArrayListOfCell.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp5/v2/TestArrayListOfCell2.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp5/v2/TestCell.java (100%)
delete mode 100644 CCI_Java/CCI_Java/src/tp6/ex01/Contribution.java
delete mode 100644 CCI_Java/CCI_Java/src/tp6/ex01/Team.java
delete mode 100644 CCI_Java/CCI_Java/src/tp6/ex01/TeamMember.java
delete mode 100644 CCI_Java/CCI_Java/src/tp6/ex01/TestContribution.java
delete mode 100644 CCI_Java/CCI_Java/src/tp6/ex01/TestTeam.java
delete mode 100644 CCI_Java/CCI_Java/src/tp6/ex01/TestTeamMember.java
rename CCI_Java/CCI_Java/{minesweeper => src}/tp6/v1/Cell.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp6/v1/MainGui.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp6/v1/Minesweeper.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp6/v1/MinesweeperFrame.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp6/v1/MinesweeperPanel.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp6/v1/MinesweeperPanelable.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp6/v1/PanelMouseListener.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp6/v2/Cell.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp6/v2/MainGui.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp6/v2/Minesweeper.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp6/v2/MinesweeperFrame.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp6/v2/MinesweeperPanel.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp6/v2/MinesweeperPanelable.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp6/v2/PanelMouseListener.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp6/v3/Cell.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp6/v3/MainGui.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp6/v3/Minesweeper.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp6/v3/MinesweeperFrame.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp6/v3/MinesweeperPanel.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp6/v3/MinesweeperPanelable.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp6/v3/PanelMouseListener.java (100%)
rename CCI_Java/CCI_Java/{minesweeper => src}/tp6/v3/Position.java (100%)
delete mode 100644 CCI_Java/CCI_Java/src/tp7/exo1/TestString1.java
delete mode 100644 CCI_Java/CCI_Java/src/tp7/exo1/TestString10.java
delete mode 100644 CCI_Java/CCI_Java/src/tp7/exo1/TestString11.java
delete mode 100644 CCI_Java/CCI_Java/src/tp7/exo1/TestString2.java
delete mode 100644 CCI_Java/CCI_Java/src/tp7/exo1/TestString3.java
delete mode 100644 CCI_Java/CCI_Java/src/tp7/exo1/TestString4.java
delete mode 100644 CCI_Java/CCI_Java/src/tp7/exo1/TestString5.java
delete mode 100644 CCI_Java/CCI_Java/src/tp7/exo1/TestString6.java
delete mode 100644 CCI_Java/CCI_Java/src/tp7/exo1/TestString7.java
delete mode 100644 CCI_Java/CCI_Java/src/tp7/exo1/TestString8.java
delete mode 100644 CCI_Java/CCI_Java/src/tp7/exo1/TestString9.java
delete mode 100644 CCI_Java/CCI_Java/src/tp7/exo2/Calculator.java
delete mode 100644 CCI_Java/CCI_Java/src/tp7/exo2/TestPowOf10V1.java
delete mode 100644 CCI_Java/CCI_Java/src/tp7/exo2/TestPowOf10V2.java
delete mode 100644 CCI_Java/CCI_Java/src/tp7/exo2/TestPowOf10V3.java
delete mode 100644 CCI_Java/CCI_Java/src/tp7/exo2/TestPowOf10V4.java
delete mode 100644 CCI_Java/minesweeper/.project
delete mode 100644 CCI_Java/tp/.project
diff --git a/CCI_Java/CCI_Java/.classpath b/CCI_Java/CCI_Java/.classpath
index b405493..ac9ce57 100644
--- a/CCI_Java/CCI_Java/.classpath
+++ b/CCI_Java/CCI_Java/.classpath
@@ -6,6 +6,5 @@
</attributes>
</classpathentry>
<classpathentry kind="src" path="src"/>
- <classpathentry kind="src" path="minesweeper"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/CCI_Java/CCI_Java/src/projet/tp1/version2/MainGui.java b/CCI_Java/CCI_Java/src/projet/tp1/version2/MainGui.java
deleted file mode 100644
index 4ce8e48..0000000
--- a/CCI_Java/CCI_Java/src/projet/tp1/version2/MainGui.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package projet.tp1.version2;
-
-public class MainGui {
- public static void main(String[] args) {
- new MinesweeperFrame();
-
-
-
-
- }
-}
diff --git a/CCI_Java/CCI_Java/src/projet/tp1/version2/Minesweeper.java b/CCI_Java/CCI_Java/src/projet/tp1/version2/Minesweeper.java
deleted file mode 100644
index 61fd6b0..0000000
--- a/CCI_Java/CCI_Java/src/projet/tp1/version2/Minesweeper.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package projet.tp1.version2;
-public class Minesweeper {
-}
diff --git a/CCI_Java/CCI_Java/src/projet/tp1/version2/MinesweeperFrame.java b/CCI_Java/CCI_Java/src/projet/tp1/version2/MinesweeperFrame.java
deleted file mode 100644
index 734d212..0000000
--- a/CCI_Java/CCI_Java/src/projet/tp1/version2/MinesweeperFrame.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package projet.tp1.version2;
-
-import javax.swing.JFrame;
-import javax.swing.WindowConstants;
-
-@SuppressWarnings("serial")
-public class MinesweeperFrame extends JFrame {
- Minesweeper minesweeper;
- MinesweeperPanel minesweeperPanel;
-
- public MinesweeperFrame() {
- this.minesweeper = new Minesweeper();
- this.minesweeperPanel = new MinesweeperPanel(minesweeper);
- add(minesweeperPanel);
- pack();
- setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
- setVisible(true);
- }
-}
diff --git a/CCI_Java/CCI_Java/src/projet/tp1/version2/MinesweeperPanel.java b/CCI_Java/CCI_Java/src/projet/tp1/version2/MinesweeperPanel.java
deleted file mode 100644
index fe719db..0000000
--- a/CCI_Java/CCI_Java/src/projet/tp1/version2/MinesweeperPanel.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package projet.tp1.version2;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-
-import javax.swing.JPanel;
-
-@SuppressWarnings("serial")
-public class MinesweeperPanel extends JPanel {
- Minesweeper minesweeper;
-
- public MinesweeperPanel(Minesweeper minesweeper) {
- this.minesweeper = minesweeper;
- setPreferredSize(new Dimension(500, 500));
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- super.paintComponent(g);
-
- g.setColor(Color.RED);
- g.drawLine(0, 0, getWidth(), getHeight());
-
- g.setColor(Color.BLUE);
- g.drawLine(500, 0, getWidth() / 2, getHeight() / 2);
-
- g.setColor(Color.BLACK);
- g.drawRect(100, 200, 30, 50);
-
- g.setColor(Color.LIGHT_GRAY);
- g.fillRect(200, 200, 30, 30);
-
- g.setColor(Color.GRAY);
- g.drawRect(200, 200, 30, 30);
- }
-}
diff --git a/CCI_Java/CCI_Java/src/projet/tp2/version1/MainGui.java b/CCI_Java/CCI_Java/src/projet/tp2/version1/MainGui.java
deleted file mode 100644
index 94ec5e4..0000000
--- a/CCI_Java/CCI_Java/src/projet/tp2/version1/MainGui.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package projet.tp2.version1;
-
-public class MainGui {
- public static void main(String[] args) {
- new MinesweeperFrame();
- }
-}
diff --git a/CCI_Java/CCI_Java/src/projet/tp2/version1/Minesweeper.java b/CCI_Java/CCI_Java/src/projet/tp2/version1/Minesweeper.java
deleted file mode 100644
index 18271b9..0000000
--- a/CCI_Java/CCI_Java/src/projet/tp2/version1/Minesweeper.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package projet.tp2.version1;
-public class Minesweeper {
-}
diff --git a/CCI_Java/CCI_Java/src/projet/tp2/version1/MinesweeperFrame.java b/CCI_Java/CCI_Java/src/projet/tp2/version1/MinesweeperFrame.java
deleted file mode 100644
index 6f1b511..0000000
--- a/CCI_Java/CCI_Java/src/projet/tp2/version1/MinesweeperFrame.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package projet.tp2.version1;
-
-import javax.swing.JFrame;
-import javax.swing.WindowConstants;
-
-@SuppressWarnings("serial")
-public class MinesweeperFrame extends JFrame {
- Minesweeper minesweeper;
- MinesweeperPanel minesweeperPanel;
-
- public MinesweeperFrame() {
- this.minesweeper = new Minesweeper();
- this.minesweeperPanel = new MinesweeperPanel(minesweeper);
- add(minesweeperPanel);
- pack();
- setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
- setVisible(true);
- }
-}
diff --git a/CCI_Java/CCI_Java/src/projet/tp2/version1/MinesweeperPanel.java b/CCI_Java/CCI_Java/src/projet/tp2/version1/MinesweeperPanel.java
deleted file mode 100644
index a4445ad..0000000
--- a/CCI_Java/CCI_Java/src/projet/tp2/version1/MinesweeperPanel.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package projet.tp2.version1;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-
-import javax.swing.JPanel;
-
-@SuppressWarnings("serial")
-public class MinesweeperPanel extends JPanel {
- Minesweeper minesweeper;
-
- public MinesweeperPanel(Minesweeper minesweeper) {
- this.minesweeper = minesweeper;
- setPreferredSize(new Dimension(500, 500));
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- int cellX = 10;
- int cellY = 30;
- int cellWidth = 200;
- int cellHeight = 400;
-
- super.paintComponent(g);
-
- g.setColor(Color.RED);
- g.drawLine(0, 0, getWidth(), getHeight());
-
- g.setColor(Color.BLUE);
- g.drawLine(500, 0, getWidth() / 2, getHeight() / 2);
-
- g.setColor(Color.BLACK);
- g.drawRect(100, 200, 30, 50);
-
- g.setColor(Color.LIGHT_GRAY);
- g.fillRect(200, 200, 30, 30);
-
- g.setColor(Color.GRAY);
- g.drawRect(cellX, cellY, cellWidth, cellHeight);
- }
-}
diff --git a/CCI_Java/CCI_Java/src/projet/tp2/version2/MainGui.java b/CCI_Java/CCI_Java/src/projet/tp2/version2/MainGui.java
deleted file mode 100644
index 5f6193a..0000000
--- a/CCI_Java/CCI_Java/src/projet/tp2/version2/MainGui.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package projet.tp2.version2;
-
-public class MainGui {
- public static void main(String[] args) {
- new MinesweeperFrame();
- }
-}
diff --git a/CCI_Java/CCI_Java/src/projet/tp2/version2/Minesweeper.java b/CCI_Java/CCI_Java/src/projet/tp2/version2/Minesweeper.java
deleted file mode 100644
index 1f2af6d..0000000
--- a/CCI_Java/CCI_Java/src/projet/tp2/version2/Minesweeper.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package projet.tp2.version2;
-public class Minesweeper {
-}
diff --git a/CCI_Java/CCI_Java/src/projet/tp2/version2/MinesweeperFrame.java b/CCI_Java/CCI_Java/src/projet/tp2/version2/MinesweeperFrame.java
deleted file mode 100644
index 51bcbb8..0000000
--- a/CCI_Java/CCI_Java/src/projet/tp2/version2/MinesweeperFrame.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package projet.tp2.version2;
-
-import javax.swing.JFrame;
-import javax.swing.WindowConstants;
-
-@SuppressWarnings("serial")
-public class MinesweeperFrame extends JFrame {
- Minesweeper minesweeper;
- MinesweeperPanel minesweeperPanel;
-
- public MinesweeperFrame() {
- this.minesweeper = new Minesweeper();
- this.minesweeperPanel = new MinesweeperPanel(minesweeper);
- add(minesweeperPanel);
- pack();
- setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
- setVisible(true);
- }
-}
diff --git a/CCI_Java/CCI_Java/src/projet/tp2/version2/MinesweeperPanel.java b/CCI_Java/CCI_Java/src/projet/tp2/version2/MinesweeperPanel.java
deleted file mode 100644
index 45bb64c..0000000
--- a/CCI_Java/CCI_Java/src/projet/tp2/version2/MinesweeperPanel.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package projet.tp2.version2;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-
-import javax.swing.JPanel;
-
-@SuppressWarnings("serial")
-public class MinesweeperPanel extends JPanel {
- Minesweeper minesweeper;
-
- public MinesweeperPanel(Minesweeper minesweeper) {
- this.minesweeper = minesweeper;
- setPreferredSize(new Dimension(500, 500));
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- int cellX = 10;
- int cellY = 30;
- int cellWidth = getWidth();
- int cellHeight = getHeight();
- int nbLines = 2;
- int nbColumns = 3;
-
- super.paintComponent(g);
-
- g.setColor(Color.RED);
- g.drawLine(0, 0, getWidth(), getHeight());
-
- g.setColor(Color.BLUE);
- g.drawLine(500, 0, getWidth() / 2, getHeight() / 2);
-
- g.setColor(Color.BLACK);
- g.drawRect(100, 200, 30, 50);
-
- g.setColor(Color.LIGHT_GRAY);
- g.fillRect(200, 200, 30, 30);
-
- g.setColor(Color.GRAY);
- g.drawRect(cellX, cellY, cellWidth, cellHeight);
- }
-}
diff --git a/CCI_Java/CCI_Java/src/projet/tp2/version3/MainGui.java b/CCI_Java/CCI_Java/src/projet/tp2/version3/MainGui.java
deleted file mode 100644
index f5435f0..0000000
--- a/CCI_Java/CCI_Java/src/projet/tp2/version3/MainGui.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package projet.tp2.version3;
-
-public class MainGui {
- public static void main(String[] args) {
- new MinesweeperFrame();
- }
-}
diff --git a/CCI_Java/CCI_Java/src/projet/tp2/version3/Minesweeper.java b/CCI_Java/CCI_Java/src/projet/tp2/version3/Minesweeper.java
deleted file mode 100644
index e756cc8..0000000
--- a/CCI_Java/CCI_Java/src/projet/tp2/version3/Minesweeper.java
+++ /dev/null
@@ -1,3 +0,0 @@
-package projet.tp2.version3;
-public class Minesweeper {
-}
diff --git a/CCI_Java/CCI_Java/src/projet/tp2/version3/MinesweeperFrame.java b/CCI_Java/CCI_Java/src/projet/tp2/version3/MinesweeperFrame.java
deleted file mode 100644
index 4da8c6f..0000000
--- a/CCI_Java/CCI_Java/src/projet/tp2/version3/MinesweeperFrame.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package projet.tp2.version3;
-
-import javax.swing.JFrame;
-import javax.swing.WindowConstants;
-
-@SuppressWarnings("serial")
-public class MinesweeperFrame extends JFrame {
- Minesweeper minesweeper;
- MinesweeperPanel minesweeperPanel;
-
- public MinesweeperFrame() {
- this.minesweeper = new Minesweeper();
- this.minesweeperPanel = new MinesweeperPanel(minesweeper);
- add(minesweeperPanel);
- pack();
- setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
- setVisible(true);
- }
-}
diff --git a/CCI_Java/CCI_Java/src/projet/tp2/version3/MinesweeperPanel.java b/CCI_Java/CCI_Java/src/projet/tp2/version3/MinesweeperPanel.java
deleted file mode 100644
index 0da0813..0000000
--- a/CCI_Java/CCI_Java/src/projet/tp2/version3/MinesweeperPanel.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package projet.tp2.version3;
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-
-import javax.swing.JPanel;
-
-@SuppressWarnings("serial")
-public class MinesweeperPanel extends JPanel {
- Minesweeper minesweeper;
-
- public MinesweeperPanel(Minesweeper minesweeper) {
- this.minesweeper = minesweeper;
- setPreferredSize(new Dimension(500, 500));
- }
-
- @Override
- protected void paintComponent(Graphics g) {
-
- int cellWidth = getWidth();
- int cellHeight = getHeight();
- int nbLines = 2;
- int nbColumns = 3;
- int line = 1;
- int column = 2;
- int cellX = line * cellWidth;
- int cellY = column * cellHeight;
-
- super.paintComponent(g);
-
- g.setColor(Color.RED);
- g.drawLine(0, 0, getWidth(), getHeight());
-
- g.setColor(Color.BLUE);
- g.drawLine(500, 0, getWidth() / 2, getHeight() / 2);
-
- g.setColor(Color.BLACK);
- g.drawRect(100, 200, 30, 50);
-
- g.setColor(Color.LIGHT_GRAY);
- g.fillRect(200, 200, 30, 30);
-
- g.setColor(Color.GRAY);
- g.drawRect(cellX, cellY, cellWidth, cellHeight);
- }
-}
diff --git a/CCI_Java/CCI_Java/src/td1/EX01.java b/CCI_Java/CCI_Java/src/td1/EX01.java
deleted file mode 100644
index a96b609..0000000
--- a/CCI_Java/CCI_Java/src/td1/EX01.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package td1;
-
-import java.util.Scanner;
-
-public class EX01 {
-
- public static void main(String[] args) {
-
- // Ex01
- double x = 10;
- boolean isXInInterval = ((-5) < x && x <= 2) || ((5 <= x) && (x <= 10));
-
- // Ex02
- Scanner scanner = new Scanner(System.in);
- System.out.println("Donnez moi l'annee svp :");
- int year = scanner.nextInt();
- boolean cond1 = year % 4 == 0;
- boolean cond2 = year % 100 != 0;
- boolean cond3 = year % 400 == 0;
- boolean isLeap = (cond1 && cond2) || cond3;
- if (isLeap) {
- System.out.println("C'est bissextile !");
- }
-// else if (year % 400 == 0) {
-// System.out.println("C'est bissextile !");
-// }
- else {
- System.out.println("Ce n'est pas bissextile !");
- }
- scanner.close();
- // Ex02
- int a = 2;
- int b = 13;
- int c = 3;
-
- boolean frage1 = (a +b) != c;
- // (15) != 3 --> T
- boolean frage2 = !(a == c);
- boolean frage3 = ((b - a) >= c) && (a <= (c - b));
- // (11 >= 3) && (2 <= -10) --> t && f --> f
- boolean frage4 = (((6 * a) + 1) >= b) && (c == (b % 5));
- // (13 >= 13) && 3 == (3) --> T && T --> f
- boolean frage5 = (b / c) < (b / 3.0);
- // 13 / 3 < (13 / 3.0) --> 4 < 4.33 --> true
- boolean frage6 = (((b + c + 3) / 9) == (a + 1)) || (((b - 5) % a) > 0);
- // (19 / 9) == 3 || (8 % 2) > 0 --> f || f --> f
- System.out.println("1: " + frage1 + " 2: " + frage2 + " 3: " + frage3 + " 4: "
- + frage4 + " 5: " + frage5 + " 6: " + frage6);
-
- // Ex03
- /* 4. (x >= y) && (y > z) && (z >= x)
- * --> ERRor
- *
- *
- * */
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/td5/ex01/Date.java b/CCI_Java/CCI_Java/src/td5/ex01/Date.java
deleted file mode 100644
index 5064823..0000000
--- a/CCI_Java/CCI_Java/src/td5/ex01/Date.java
+++ /dev/null
@@ -1,82 +0,0 @@
-package td5.ex01;
-
-public class Date {
- int day;
- int month;
- int year;
-
- public Date() {
- this.day = 0;
- this.month = 0;
- this.year = 0;
- }
-
- public Date(int day, int month, int year) {
- this.day = day;
- this.month = month;
- this.year = year;
- }
-
- void print() {
- System.out.println("Date : " + day + "/" + month + "/" + year);
- }
-
- boolean isLeapYear() {
- boolean isLeap = (this.year % 4 == 0 && this.year % 100 != 0) || this.year % 400 == 0;
- if (isLeap)
- return true;
- else
- return false;
- }
-
- boolean isBefore(Date d) {
- if (d.year > this.year)
- return true;
- else if (d.year == this.year)
- if (d.month > this.month)
- return true;
- else if (d.month == this.month)
- if (d.day > this.day)
- return true;
- else
- return false;
- else
- return false;
- else
- return false;
- }
-
- int nbDaysInMonth() {
- int nbDays = 31;
-
- if(this.month == 2)
- if(isLeapYear())
- nbDays = 29;
- else
- nbDays = 28;
- else if (this.month < 7 && this.month % 2 == 0)
- nbDays = 30;
- else if (this.month == 9 || this.month == 11)
- nbDays = 30;
-
- return nbDays;
- }
-
- Date nextDay() {
- int newDay = this.day;
- int newMonth = this.month;
- int newYear = this.year;
-
- if(this.day < nbDaysInMonth())
- newDay ++;
- else if (this.month != 12) {
- newMonth ++;
- newDay = 1;
- }else {
- newDay = 1;
- newMonth = 1;
- newYear++;
- }
- return new Date(newDay, newMonth, newYear);
- }
-}
diff --git a/CCI_Java/CCI_Java/src/td5/ex01/Employee.java b/CCI_Java/CCI_Java/src/td5/ex01/Employee.java
deleted file mode 100644
index 590ac28..0000000
--- a/CCI_Java/CCI_Java/src/td5/ex01/Employee.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package td5.ex01;
-
-import java.util.ArrayList;
-
-public class Employee {
-
- int id;
- ArrayList<Holiday> holidays;
-
- public Employee(int id) {
- this.id = id;
- }
-
- public void addHoliday(Holiday holiday) {
- holidays.add(holiday);
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/td5/ex01/Holiday.java b/CCI_Java/CCI_Java/src/td5/ex01/Holiday.java
deleted file mode 100644
index ce10221..0000000
--- a/CCI_Java/CCI_Java/src/td5/ex01/Holiday.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package td5.ex01;
-
-public class Holiday {
- Date start;
- Date end;
-
- public Holiday(Date start, Date end) {
- this.start = start;
- this.end = end;
- }
-
- public Holiday() {
- this.start = new Date();
- this.end = new Date();
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/td5/ex01/HolidaysExample1.java b/CCI_Java/CCI_Java/src/td5/ex01/HolidaysExample1.java
deleted file mode 100644
index 33a50df..0000000
--- a/CCI_Java/CCI_Java/src/td5/ex01/HolidaysExample1.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package td5.ex01;
-
-public class HolidaysExample1 {
-
- public static void main(String[] args) {
- // TODO Auto-generated method stub
-
- Date date1 = new Date(12, 6, 2030);
- Date date2 = new Date(20, 6, 2030);
- Holiday holiday1 = new Holiday(date1, date2);
-
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/td5/ex01/HolidaysExample2.java b/CCI_Java/CCI_Java/src/td5/ex01/HolidaysExample2.java
deleted file mode 100644
index 50aca13..0000000
--- a/CCI_Java/CCI_Java/src/td5/ex01/HolidaysExample2.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package td5.ex01;
-
-public class HolidaysExample2 {
-
- public static void main(String[] args) {
- // TODO Auto-generated method stub
-
- Date date1 = new Date(15, 7, 2024);
- Date date2 = new Date(22, 7, 2024);
- Date date3 = new Date(20, 12, 2024);
- Date date4 = new Date(5, 1, 2025);
- Date date5 = new Date(10, 8, 2024);
- Date date6 = new Date(17, 8, 2024);
- Date date7 = new Date(24, 8, 2024);
- Date date8 = new Date(31, 8, 2024);
- Date date9 = new Date(1, 9, 2024);
- Date date10 = new Date(7, 9, 2024);
-
- Holiday holiday1 = new Holiday(date1, date2);
- Holiday holiday2 = new Holiday(date3, date4);
- Holiday holiday3 = new Holiday(date5, date6);
- Holiday holiday4 = new Holiday(date7, date8);
- Holiday holiday5 = new Holiday(date9, date10);
-
- Employee employee1 = new Employee(5845);
- Employee employee2 = new Employee(10312);
-
- employee1.addHoliday(holiday1);
- employee1.addHoliday(holiday2);
- employee2.addHoliday(holiday3);
- employee2.addHoliday(holiday4);
- employee2.addHoliday(holiday5);
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/td6/Promotion.java b/CCI_Java/CCI_Java/src/td6/Promotion.java
deleted file mode 100644
index db4800c..0000000
--- a/CCI_Java/CCI_Java/src/td6/Promotion.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package td6;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-
-public class Promotion {
-
- private String name;
- private ArrayList<Student> students;
-
- public Promotion(String name) {
- this.name = name;
- students = new ArrayList<Student>();
- }
-
- public void addStudent(Student student) {
- students.add(student);
- }
-
- @Override
- public String toString() {
-
- String result = name+ " [ ";
-
- for (Student stud : students) {
- result += (" " + stud.toString());
- }
- return result + "]";
- }
-}
diff --git a/CCI_Java/CCI_Java/src/td6/Student.java b/CCI_Java/CCI_Java/src/td6/Student.java
deleted file mode 100644
index 42a6bec..0000000
--- a/CCI_Java/CCI_Java/src/td6/Student.java
+++ /dev/null
@@ -1,45 +0,0 @@
-package td6;
-
-import java.util.ArrayList;
-
-public class Student {
- private String firstName;
- private String lastName;
- private ArrayList<SubjectResult> results;
-
- public Student(String firstName, String lastName) {
- this.firstName = firstName;
- this.lastName = lastName;
- results = new ArrayList<SubjectResult>();
- }
-
- public void addResult(SubjectResult subjectResult) {
- results.add(subjectResult);
- }
-
- public int getResultCount() {
- return results.size();
- }
-
- public SubjectResult getResult(int idx) {
- return results.get(idx);
- }
-
- public double getAverageMark() {
- double sum = 0;
- for (SubjectResult res : results) {
- sum += res.getMark();
- }
- return sum / results.size();
- }
-
- @Override
- public String toString() {
- String result = "Name: " + firstName + " " + lastName;
- for (SubjectResult res : results) {
- result += " [" + res.toString() + "]";
- }
-
- return result + " [avg: " + getAverageMark() + "]";
- }
-}
diff --git a/CCI_Java/CCI_Java/src/td6/SubjectResult.java b/CCI_Java/CCI_Java/src/td6/SubjectResult.java
deleted file mode 100644
index a975366..0000000
--- a/CCI_Java/CCI_Java/src/td6/SubjectResult.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package td6;
-
-public class SubjectResult {
-
- private String name;
- private double mark;
-
- public SubjectResult(String name, double mark) {
- this.name = name;
- this.mark = mark;
- }
-
- public String getName() {
- return name;
- }
-
- public double getMark() {
- return mark;
- }
-
- @Override
- public String toString() {
- // TODO Auto-generated method stub
- return name + "/" + mark ;
- }
-}
diff --git a/CCI_Java/CCI_Java/src/td6/TestPromotion.java b/CCI_Java/CCI_Java/src/td6/TestPromotion.java
deleted file mode 100644
index 0f0bf08..0000000
--- a/CCI_Java/CCI_Java/src/td6/TestPromotion.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package td6;
-
-public class TestPromotion {
-
- public static void main(String[] args) {
- // TODO Auto-generated method stub
- Promotion prom = new Promotion("Promotion des Talents");
-
- Student alice = new Student("Alice", "Dupont");
- SubjectResult res1 = new SubjectResult("Math", 15.5);
- SubjectResult res2 = new SubjectResult("Info", 18.0);
-
- Student bob = new Student("Bob", "Martin");
- SubjectResult res3 = new SubjectResult("Math", 12.0);
- SubjectResult res4 = new SubjectResult("Info", 16.5);
- SubjectResult res5 = new SubjectResult("Phys", 14.0);
-
- alice.addResult(res1);
- alice.addResult(res2);
- bob.addResult(res3);
- bob.addResult(res4);
- bob.addResult(res5);
-
- prom.addStudent(alice);
- prom.addStudent(bob);
-
- System.out.println(prom.toString());
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/td7/Point.java b/CCI_Java/CCI_Java/src/td7/Point.java
deleted file mode 100644
index 0eac460..0000000
--- a/CCI_Java/CCI_Java/src/td7/Point.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package td7;
-
-public class Point {
- String name;
- private double x;
- private double y;
-
- public Point() {
- this(null, 0, 0);
- }
-
- public Point(String name, double x, double y) {
- this.name = name;
- this.x = x;
- this.y = y;
- }
-
- public Point scale(double k) {
- return new Point(name + "'", k * x, k * y);
- }
-
- @Override
- public String toString() {
- return name + "(" + x + ";" + y + ")";
- }
-
- public String getName() {
- return name;
- }
-
- public double getX() {
- return x;
- }
-
- public double getY() {
- return y;
- }
-
- public Point translate(double dx, double dy) {
- return new Point(name+"'", x + dx, y+dy);
- }
-
-
-}
diff --git a/CCI_Java/CCI_Java/src/td7/Polygon.java b/CCI_Java/CCI_Java/src/td7/Polygon.java
deleted file mode 100644
index 0856701..0000000
--- a/CCI_Java/CCI_Java/src/td7/Polygon.java
+++ /dev/null
@@ -1,51 +0,0 @@
-package td7;
-
-import java.util.ArrayList;
-
-public class Polygon {
- private String name;
- private ArrayList<Point> points;
-
- public Polygon() {
- this(null);
- }
-
- public Polygon(String name) {
- this.name = name;
- this.points = new ArrayList<Point>();
- }
-
- public void addPoint(Point p) {
- points.add(p);
- }
-
- public int getPointsSize() {
- return points.size();
- }
-
- public Point getPoint(int idx) {
- return points.get(idx);
- }
-
- public String getName() {
- return name;
- }
-
- public String toString() {
- String res = name + ": ";
- for(Point p : points) {
- res += p.toString() + ", ";
- }
- return res;
- }
-
- public Polygon scale(double k) {
-
- Polygon polyScaled = new Polygon(name+"'");
- for(Point p : points) {
- polyScaled.addPoint(p.scale(k));
- }
-
- return polyScaled;
- }
-}
diff --git a/CCI_Java/CCI_Java/src/td7/TestPoint.java b/CCI_Java/CCI_Java/src/td7/TestPoint.java
deleted file mode 100644
index e43d921..0000000
--- a/CCI_Java/CCI_Java/src/td7/TestPoint.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package td7;
-
-public class TestPoint {
-
- public static void main(String[] args) {
-
- Point pointA = new Point("A", 3, 5);
- Point pointB = new Point("B", -6, 8);
- System.out.println(pointA + " " + pointB);
- System.out.println(pointA.scale(5) + " " + pointB.scale(5));
-
-
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/td7/TestPolygon.java b/CCI_Java/CCI_Java/src/td7/TestPolygon.java
deleted file mode 100644
index 90502eb..0000000
--- a/CCI_Java/CCI_Java/src/td7/TestPolygon.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package td7;
-
-public class TestPolygon {
-
- public static void main(String[] args) {
- Point pointA = new Point("A", 1, 2);
- Point pointB = new Point("B", 3, 4);
- Point pointC = new Point("C", 5, 6);
-
- Polygon poli = new Polygon("Triangle");
- poli.addPoint(pointA);
- poli.addPoint(pointB);
- poli.addPoint(pointC);
-
- System.out.println(poli);
-
- System.out.println(poli.scale(5));
-
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp1/EX01/HalloWorld.java b/CCI_Java/CCI_Java/src/tp1/EX01/HalloWorld.java
deleted file mode 100644
index 3fbbfbd..0000000
--- a/CCI_Java/CCI_Java/src/tp1/EX01/HalloWorld.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package tp1.EX01;
-
-public class HalloWorld {
-
- public static void main(String[] args) {
- System.out.println("Hello World!");
-
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp1/EX02/AverageCalculator.java b/CCI_Java/CCI_Java/src/tp1/EX02/AverageCalculator.java
deleted file mode 100644
index 3442f51..0000000
--- a/CCI_Java/CCI_Java/src/tp1/EX02/AverageCalculator.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package tp1.EX02;
-
-import java.util.Scanner;
-
-public class AverageCalculator {
-
- public static void main(String[] args) {
- // TODO Auto-generated method stub
- Scanner scanner = new Scanner(System.in);
-
- System.out.println("Donnez moi deux nombre ! premiere : ");
- int a = scanner.nextInt();
- System.out.println("Deuxieme : ");
- int b = scanner.nextInt();
- System.out.println("Vous avez mis : " + a + " et " + b);
- int somme = a + b;
- int produit = a * b;
- System.out.println("Somme : " + somme + " produit : " + produit);
- if (b != 0) {
- int div = a / b;
- int rest = a % b;
- System.out.println("div : " + div + " rest : " + rest);
- } else {
- System.out.println("Division pas possible, car b = 0");
- }
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp1/EX03/TimeConverter.java b/CCI_Java/CCI_Java/src/tp1/EX03/TimeConverter.java
deleted file mode 100644
index 320116b..0000000
--- a/CCI_Java/CCI_Java/src/tp1/EX03/TimeConverter.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package tp1.EX03;
-
-public class TimeConverter {
-
- public static void main(String[] args) {
- double x = Math.random() * 20;
- double y = Math.random() * 20;
-
- System.out.println("x : " + x + " y : " + y);
-
- if (x > y){
- System.out.println("x est plus grand : " + x);
- } else if (x == y){
- System.out.println("ils sont egal ");
- } else {
- System.out.println("y est plus grand : " + y);
- }
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp1/EX04/SphereCalculator.java b/CCI_Java/CCI_Java/src/tp1/EX04/SphereCalculator.java
deleted file mode 100644
index f23aada..0000000
--- a/CCI_Java/CCI_Java/src/tp1/EX04/SphereCalculator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package tp1.EX04;
-
-import java.util.Scanner;
-
-public class SphereCalculator {
-
- public static void main(String[] args){
- Scanner scan = new Scanner(System.in);
- System.out.println("Donnez moi une radius svp :");
-
- double radius = scan.nextDouble();
-
- double aire = 4 * Math.PI * Math.pow(radius, 2);
- double volume = (4 * Math.PI * Math.pow(radius, 3) ) / 3;
-// System.out.printf("test");
-// System.out.printf("volume: %.4f%n", volume);
-
-
- }
-
-}
diff --git a/CCI_Java/CCI_Java/minesweeper/tp1/version1/MainGui.java b/CCI_Java/CCI_Java/src/tp1/version1/MainGui.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp1/version1/MainGui.java
rename to CCI_Java/CCI_Java/src/tp1/version1/MainGui.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp1/version1/Minesweeper.java b/CCI_Java/CCI_Java/src/tp1/version1/Minesweeper.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp1/version1/Minesweeper.java
rename to CCI_Java/CCI_Java/src/tp1/version1/Minesweeper.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp1/version1/MinesweeperFrame.java b/CCI_Java/CCI_Java/src/tp1/version1/MinesweeperFrame.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp1/version1/MinesweeperFrame.java
rename to CCI_Java/CCI_Java/src/tp1/version1/MinesweeperFrame.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp1/version1/MinesweeperPanel.java b/CCI_Java/CCI_Java/src/tp1/version1/MinesweeperPanel.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp1/version1/MinesweeperPanel.java
rename to CCI_Java/CCI_Java/src/tp1/version1/MinesweeperPanel.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp1/version2/MainGui.java b/CCI_Java/CCI_Java/src/tp1/version2/MainGui.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp1/version2/MainGui.java
rename to CCI_Java/CCI_Java/src/tp1/version2/MainGui.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp1/version2/Minesweeper.java b/CCI_Java/CCI_Java/src/tp1/version2/Minesweeper.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp1/version2/Minesweeper.java
rename to CCI_Java/CCI_Java/src/tp1/version2/Minesweeper.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp1/version2/MinesweeperFrame.java b/CCI_Java/CCI_Java/src/tp1/version2/MinesweeperFrame.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp1/version2/MinesweeperFrame.java
rename to CCI_Java/CCI_Java/src/tp1/version2/MinesweeperFrame.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp1/version2/MinesweeperPanel.java b/CCI_Java/CCI_Java/src/tp1/version2/MinesweeperPanel.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp1/version2/MinesweeperPanel.java
rename to CCI_Java/CCI_Java/src/tp1/version2/MinesweeperPanel.java
diff --git a/CCI_Java/CCI_Java/src/tp2/ex01/ExamResults.java b/CCI_Java/CCI_Java/src/tp2/ex01/ExamResults.java
deleted file mode 100644
index eeb2b3a..0000000
--- a/CCI_Java/CCI_Java/src/tp2/ex01/ExamResults.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package tp2.ex01;
-
-import java.util.Scanner;
-
-public class ExamResults {
-
- public static void main(String[] args) {
- Scanner scan = new Scanner(System.in);
-
- System.out.println("Donnez moi le premiere note svp :");
- int note1 = scan.nextInt();
- System.out.println("Donnez moi le deuxieme note svp :");
- int note2 = scan.nextInt();
- System.out.println("Donnez moi le troisieme note svp :");
- int note3 = scan.nextInt();
-
- double moyenne = (note1 + note2 + note3) / 3;
- System.out.println("La moyenne : " + moyenne);
-
- if(moyenne >= 16){
- System.out.println("Tres Bien (TB)");
- } else if (moyenne >= 14) {
- System.out.println("Bien (B)");
- } else if (moyenne >= 12) {
- System.out.println("Assez Bien (AB)");
- } else if (moyenne >= 10) {
- System.out.println("Passable (P)");
- } else {
- System.out.println("gg, try again");
- }
-
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp2/ex02/ArithmeticOperations.java b/CCI_Java/CCI_Java/src/tp2/ex02/ArithmeticOperations.java
deleted file mode 100644
index 05fa730..0000000
--- a/CCI_Java/CCI_Java/src/tp2/ex02/ArithmeticOperations.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package tp2.ex02;
-
-import java.util.Scanner;
-
-public class ArithmeticOperations {
-
- public static void main(String[] args) {
- Scanner scanner = new Scanner(System.in);
-
- System.out.println("Donnez moi deux nombre ! premiere : ");
- int a = scanner.nextInt();
- System.out.println("Deuxieme : ");
- int b = scanner.nextInt();
- System.out.println("Vous avez mis : " + a + " et " + b);
- int somme = a + b;
- int produit = a * b;
- System.out.println("Somme : " + somme + " produit : " + produit);
- if (b != 0) {
- int div = a / b;
- int rest = a % b;
- System.out.println("div : " + div + " rest : " + rest);
- } else {
- System.out.println("Division pas possible, car b = 0");
- }
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp2/ex03/RandomNumbers.java b/CCI_Java/CCI_Java/src/tp2/ex03/RandomNumbers.java
deleted file mode 100644
index 52939d6..0000000
--- a/CCI_Java/CCI_Java/src/tp2/ex03/RandomNumbers.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package tp2.ex03;
-
-public class RandomNumbers {
-
- public static void main(String[] args) {
- double x = Math.random() * 20;
- double y = Math.random() * 20;
-
- System.out.println("x : " + x + " y : " + y);
-
- if (x > y){
- System.out.println("x est plus grand : " + x);
- } else if (x == y){
- System.out.println("ils sont egal ");
- } else {
- System.out.println("y est plus grand : " + y);
- }
-
-
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp2/ex04/MoneyDecomposition.java b/CCI_Java/CCI_Java/src/tp2/ex04/MoneyDecomposition.java
deleted file mode 100644
index 6af762b..0000000
--- a/CCI_Java/CCI_Java/src/tp2/ex04/MoneyDecomposition.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package tp2.ex04;
-
-import java.util.Scanner;
-
-public class MoneyDecomposition {
-
- public static void main(String[] args) {
- Scanner scanner = new Scanner(System.in);
- int[] bills = {500, 200, 100, 50, 20, 10, 5, 2, 1};
- System.out.println("Entrez un montant en euros :");
- int montant = scanner.nextInt();
- System.out.println("Vous avez entré : " + montant);
- System.out.println("Décomposition :");
-// while (montant / bills[idx] == 0) {
-// idx ++;
-// }
-
- for (int i : bills) {
- int div = montant / i;
- if(div > 0) {
- System.out.println(div + " billet(s) de " + i + " euros");
- montant = montant % i;
- }
-
- }
-
- }
-
-}
-
diff --git a/CCI_Java/CCI_Java/src/tp2/ex04/MoneyDecompositionV2.java b/CCI_Java/CCI_Java/src/tp2/ex04/MoneyDecompositionV2.java
deleted file mode 100644
index 7fbf3de..0000000
--- a/CCI_Java/CCI_Java/src/tp2/ex04/MoneyDecompositionV2.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package tp2.ex04;
-
-import java.util.Scanner;
-
-public class MoneyDecompositionV2 {
-
- public static void main(String[] args) {
- Scanner scanner = new Scanner(System.in);
- int[] bills = {500, 200, 100, 50, 20, 10, 5, 2, 1};
- System.out.println("Entrez un montant en euros :");
- int montant = scanner.nextInt();
- System.out.println("Vous avez entré : " + montant);
- System.out.println("Décomposition :");
-
- int div = montant / 500;
- if(div > 0) {
- System.out.println(div + " billet(s) de " + 500 + " euros");
- montant = montant % 500;
- }
- div = montant / 200;
- if(div > 0) {
- System.out.println(div + " billet(s) de " + 200 + " euros");
- montant = montant % 200;
- }
- div = montant / 100;
- if(div > 0) {
- System.out.println(div + " billet(s) de " + 100 + " euros");
- montant = montant % 100;
- }
- div = montant / 50;
- if(div > 0) {
- System.out.println(div + " billet(s) de " + 50 + " euros");
- montant = montant % 50;
- }
- div = montant / 20;
- if(div > 0) {
- System.out.println(div + " billet(s) de " + 20 + " euros");
- montant = montant % 20;
- }
- div = montant / 10;
- if(div > 0) {
- System.out.println(div + " billet(s) de " + 10 + " euros");
- montant = montant % 10;
- }
- div = montant / 5;
- if(div > 0) {
- System.out.println(div + " billet(s) de " + 5 + " euros");
- montant = montant % 5;
- }
- div = montant / 2;
- if(div > 0) {
- System.out.println(div + " billet(s) de " + 2 + " euros");
- montant = montant % 2;
- }
- div = montant / 1;
- if(div > 0) {
- System.out.println(div + " billet(s) de " + 1 + " euros");
- montant = montant % 1;
- }
-
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp2/minesweeperVersion1/MainGui.java b/CCI_Java/CCI_Java/src/tp2/minesweeperVersion1/MainGui.java
deleted file mode 100644
index d256a4a..0000000
--- a/CCI_Java/CCI_Java/src/tp2/minesweeperVersion1/MainGui.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package tp2.minesweeperVersion1;
-
-public class MainGui {
- public static void main(String[] args) {
- new MinesweeperFrame();
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp2/minesweeperVersion1/Minesweeper.java b/CCI_Java/CCI_Java/src/tp2/minesweeperVersion1/Minesweeper.java
deleted file mode 100644
index 827fae3..0000000
--- a/CCI_Java/CCI_Java/src/tp2/minesweeperVersion1/Minesweeper.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package tp2.minesweeperVersion1;
-
-public class Minesweeper {
- int nbColumns;
- int nbLines;
- int score;
- int selectedLine;
- int selectedColumn;
-}
diff --git a/CCI_Java/CCI_Java/src/tp2/minesweeperVersion1/MinesweeperFrame.java b/CCI_Java/CCI_Java/src/tp2/minesweeperVersion1/MinesweeperFrame.java
deleted file mode 100644
index 80f6942..0000000
--- a/CCI_Java/CCI_Java/src/tp2/minesweeperVersion1/MinesweeperFrame.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package tp2.minesweeperVersion1;
-
-import javax.swing.JFrame;
-import javax.swing.WindowConstants;
-@SuppressWarnings("serial")
-public class MinesweeperFrame extends JFrame {
-Minesweeper minesweeper;
-MinesweeperPanel minesweeperPanel;
-public MinesweeperFrame() {
-this.minesweeper = new Minesweeper();
-
-this.minesweeper.nbColumns = 15;
-this.minesweeper.nbLines = 20;
-this.minesweeper.score = 30;
-this.minesweeper.selectedLine = 3;
-this.minesweeper.selectedColumn = 8;
-
-this.minesweeperPanel = new MinesweeperPanel(minesweeper);
-add(minesweeperPanel);
-pack();
-setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
-setVisible(true);
-
-
-}}
\ No newline at end of file
diff --git a/CCI_Java/CCI_Java/src/tp2/minesweeperVersion1/MinesweeperPanel.java b/CCI_Java/CCI_Java/src/tp2/minesweeperVersion1/MinesweeperPanel.java
deleted file mode 100644
index 536a384..0000000
--- a/CCI_Java/CCI_Java/src/tp2/minesweeperVersion1/MinesweeperPanel.java
+++ /dev/null
@@ -1,53 +0,0 @@
-package tp2.minesweeperVersion1;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import javax.swing.JPanel;
-
-@SuppressWarnings("serial")
-public class MinesweeperPanel extends JPanel {
- Minesweeper minesweeper;
-
- public MinesweeperPanel(Minesweeper minesweeper) {
- this.minesweeper = minesweeper;
- setPreferredSize(new Dimension(500, 500));
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- super.paintComponent(g);
-// g.setColor(Color.RED);
-// g.drawLine(0, 0, getWidth(), getHeight());
-// g.setColor(Color.BLUE);
-// g.drawLine(getWidth(), getHeight(), getWidth() / 2, getHeight() / 2);
-
-// grand rect
-
- int spaceBorder = 20;
- int nbColumns = 5;
- int nbRows = 5;
-
- int maxWidth = (getWidth() - spaceBorder) - ((getWidth() - spaceBorder) % nbColumns);
- int maxHeight = (getHeight() - spaceBorder) - ((getHeight() - spaceBorder) % nbRows);
-
- int spaceHor = (getWidth() - (spaceBorder*2)) / nbColumns;
- int spaceVert = (getHeight() - (spaceBorder*2)) / nbRows;
- //
- int posV = 0;
- for(int idx = 1; idx <= nbRows; idx++) {
- posV = (idx * spaceVert);
- g.setColor(Color.BLACK);
- g.drawLine(20, posV, getWidth() - 20, posV);
- }
-
-
- int posH = 0;
- for(int idx = 1; idx <= nbColumns; idx++) {
- posH = (idx * spaceHor);
- g.setColor(Color.BLACK);
- g.drawLine(posH, 20, posH, getHeight() - 20);
- }
-
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp2/minesweeperVersion1/MinesweeperPanelDamier.java b/CCI_Java/CCI_Java/src/tp2/minesweeperVersion1/MinesweeperPanelDamier.java
deleted file mode 100644
index 399bde3..0000000
--- a/CCI_Java/CCI_Java/src/tp2/minesweeperVersion1/MinesweeperPanelDamier.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package tp2.minesweeperVersion1;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import javax.swing.JPanel;
-
-@SuppressWarnings("serial")
-public class MinesweeperPanelDamier extends JPanel {
- Minesweeper minesweeper;
-
- public MinesweeperPanelDamier(Minesweeper minesweeper) {
- this.minesweeper = minesweeper;
- setPreferredSize(new Dimension(500, 500));
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- super.paintComponent(g);
- g.setColor(Color.RED);
- g.drawLine(0, 0, getWidth(), getHeight());
- g.setColor(Color.BLUE);
- g.drawLine(getWidth(), getHeight(), getWidth() / 2, getHeight() / 2);
-
-// grand rect
- int widthHouse = getWidth() / 3;
- int heightHouse = getHeight() / 3;
- int xMid = getWidth() / 2;
- int yMid = getHeight() / 2;
- int unten = yMid + (heightHouse / 2) ;
- int oben = yMid - heightHouse / 2;
- int links = xMid - widthHouse / 2;
- int rechts = xMid + (widthHouse / 2);
- // house
- g.setColor(Color.YELLOW);
- g.fillRect(links,
- oben,
- widthHouse,
- heightHouse);
- g.setColor(Color.BLACK);
- g.drawRect(links,
- oben,
- widthHouse,
- heightHouse);
-
- g.setColor(Color.BLACK);
- g.drawLine(links, oben, rechts - widthHouse / 2, oben - heightHouse / 2);
- g.setColor(Color.BLACK);
- g.drawLine(rechts, oben, links + widthHouse / 2, oben - heightHouse / 2);
-////port
-// g.setColor(Color.LIGHT_GRAY);
-// g.fillRect(200, 200, 30, 30);
-// g.setColor(Color.GRAY);
-// g.drawRect(200, 200, 30, 30);
-
-// g.setColor(Color.BLUE);
- g.setColor(Color.RED);
- g.drawLine(links, oben, rechts, oben);
-
- // Oval getWidth() getHeight()
- g.setColor(Color.RED);
- g.drawOval(0, 100, 10, 10);
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp2/minesweeperVersion2/MainGui.java b/CCI_Java/CCI_Java/src/tp2/minesweeperVersion2/MainGui.java
deleted file mode 100644
index fd4a8dc..0000000
--- a/CCI_Java/CCI_Java/src/tp2/minesweeperVersion2/MainGui.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package tp2.minesweeperVersion2;
-
-public class MainGui {
- public static void main(String[] args) {
- new MinesweeperFrame();
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp2/minesweeperVersion2/Minesweeper.java b/CCI_Java/CCI_Java/src/tp2/minesweeperVersion2/Minesweeper.java
deleted file mode 100644
index af3a8a7..0000000
--- a/CCI_Java/CCI_Java/src/tp2/minesweeperVersion2/Minesweeper.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package tp2.minesweeperVersion2;
-
-public class Minesweeper {
- int nbColumns;
- int nbLines;
- int score;
- int selectedLine;
- int selectedColumn;
-}
diff --git a/CCI_Java/CCI_Java/src/tp2/minesweeperVersion2/MinesweeperFrame.java b/CCI_Java/CCI_Java/src/tp2/minesweeperVersion2/MinesweeperFrame.java
deleted file mode 100644
index 635772d..0000000
--- a/CCI_Java/CCI_Java/src/tp2/minesweeperVersion2/MinesweeperFrame.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package tp2.minesweeperVersion2;
-
-import javax.swing.JFrame;
-import javax.swing.WindowConstants;
-@SuppressWarnings("serial")
-public class MinesweeperFrame extends JFrame {
-Minesweeper minesweeper;
-MinesweeperPanel minesweeperPanel;
-public MinesweeperFrame() {
-this.minesweeper = new Minesweeper();
-
-this.minesweeper.nbColumns = 15;
-this.minesweeper.nbLines = 20;
-this.minesweeper.score = 30;
-this.minesweeper.selectedLine = 3;
-this.minesweeper.selectedColumn = 8;
-
-this.minesweeperPanel = new MinesweeperPanel(minesweeper);
-add(minesweeperPanel);
-pack();
-setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
-setVisible(true);
-
-
-}}
\ No newline at end of file
diff --git a/CCI_Java/CCI_Java/src/tp2/minesweeperVersion2/MinesweeperPanel.java b/CCI_Java/CCI_Java/src/tp2/minesweeperVersion2/MinesweeperPanel.java
deleted file mode 100644
index 4433d38..0000000
--- a/CCI_Java/CCI_Java/src/tp2/minesweeperVersion2/MinesweeperPanel.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package tp2.minesweeperVersion2;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import javax.swing.JPanel;
-
-@SuppressWarnings("serial")
-public class MinesweeperPanel extends JPanel {
- Minesweeper minesweeper;
- int spaceHor;
- int spaceVert;
- public MinesweeperPanel(Minesweeper minesweeper) {
- this.minesweeper = minesweeper;
- setPreferredSize(new Dimension(500, 500));
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- super.paintComponent(g);
-
- // grand rect
-
- int spaceBorder = 20;
- int nbColumns = 10;
- int nbRows = 10;
-
- int carreWidth = (getWidth() - (spaceBorder * 2)) - ((getWidth() - (spaceBorder * 2)) % nbColumns);
- int carreHeight = (getHeight() - (spaceBorder * 2)) - ((getHeight() - (spaceBorder * 2)) % nbRows);
-
- this.spaceHor = carreWidth / nbColumns;
- this.spaceVert = carreHeight / nbRows;
-
- int lineEndH = carreHeight + spaceBorder;
- int lineEndV = carreWidth + spaceBorder;
-
- // creating collumns
- int posH = spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(spaceBorder, spaceBorder, spaceBorder, lineEndH);
-
- for (int idx = 1; idx <= nbColumns; idx++) {
- posH = (idx * spaceHor) + spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(posH, spaceBorder, posH, lineEndH);
- }
-
- // creating rows
- int posV = spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(spaceBorder, spaceBorder, lineEndV, spaceBorder);
-
- for (int idx = 1; idx <= nbRows; idx++) {
- posV = (idx * spaceVert) + spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(spaceBorder, posV, lineEndV, posV);
- }
-
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp2/minesweeperVersion2/MinesweeperPanelDamier.java b/CCI_Java/CCI_Java/src/tp2/minesweeperVersion2/MinesweeperPanelDamier.java
deleted file mode 100644
index ccdc0b5..0000000
--- a/CCI_Java/CCI_Java/src/tp2/minesweeperVersion2/MinesweeperPanelDamier.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package tp2.minesweeperVersion2;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import javax.swing.JPanel;
-
-@SuppressWarnings("serial")
-public class MinesweeperPanelDamier extends JPanel {
- Minesweeper minesweeper;
-
- public MinesweeperPanelDamier(Minesweeper minesweeper) {
- this.minesweeper = minesweeper;
- setPreferredSize(new Dimension(500, 500));
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- super.paintComponent(g);
- g.setColor(Color.RED);
- g.drawLine(0, 0, getWidth(), getHeight());
- g.setColor(Color.BLUE);
- g.drawLine(getWidth(), getHeight(), getWidth() / 2, getHeight() / 2);
-
-// grand rect
- int widthHouse = getWidth() / 3;
- int heightHouse = getHeight() / 3;
- int xMid = getWidth() / 2;
- int yMid = getHeight() / 2;
- int unten = yMid + (heightHouse / 2) ;
- int oben = yMid - heightHouse / 2;
- int links = xMid - widthHouse / 2;
- int rechts = xMid + (widthHouse / 2);
- // house
- g.setColor(Color.YELLOW);
- g.fillRect(links,
- oben,
- widthHouse,
- heightHouse);
- g.setColor(Color.BLACK);
- g.drawRect(links,
- oben,
- widthHouse,
- heightHouse);
-
- g.setColor(Color.BLACK);
- g.drawLine(links, oben, rechts - widthHouse / 2, oben - heightHouse / 2);
- g.setColor(Color.BLACK);
- g.drawLine(rechts, oben, links + widthHouse / 2, oben - heightHouse / 2);
-////port
-// g.setColor(Color.LIGHT_GRAY);
-// g.fillRect(200, 200, 30, 30);
-// g.setColor(Color.GRAY);
-// g.drawRect(200, 200, 30, 30);
-
-// g.setColor(Color.BLUE);
- g.setColor(Color.RED);
- g.drawLine(links, oben, rechts, oben);
-
- // Oval getWidth() getHeight()
- g.setColor(Color.RED);
- g.drawOval(0, 100, 10, 10);
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp2/minesweeperVersion2/fiddling.java b/CCI_Java/CCI_Java/src/tp2/minesweeperVersion2/fiddling.java
deleted file mode 100644
index 5547aed..0000000
--- a/CCI_Java/CCI_Java/src/tp2/minesweeperVersion2/fiddling.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package tp2.minesweeperVersion2;
-
-public class fiddling {
-
- public static void main(String[] args) {
- // TODO Auto-generated method stub
- int x = 20%9;
- System.out.println(x);
-
- }
-
-}
diff --git a/CCI_Java/CCI_Java/minesweeper/tp2/v1/MainGui.java b/CCI_Java/CCI_Java/src/tp2/v1/MainGui.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp2/v1/MainGui.java
rename to CCI_Java/CCI_Java/src/tp2/v1/MainGui.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp2/v1/Minesweeper.java b/CCI_Java/CCI_Java/src/tp2/v1/Minesweeper.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp2/v1/Minesweeper.java
rename to CCI_Java/CCI_Java/src/tp2/v1/Minesweeper.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp2/v1/MinesweeperFrame.java b/CCI_Java/CCI_Java/src/tp2/v1/MinesweeperFrame.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp2/v1/MinesweeperFrame.java
rename to CCI_Java/CCI_Java/src/tp2/v1/MinesweeperFrame.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp2/v1/MinesweeperPanel.java b/CCI_Java/CCI_Java/src/tp2/v1/MinesweeperPanel.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp2/v1/MinesweeperPanel.java
rename to CCI_Java/CCI_Java/src/tp2/v1/MinesweeperPanel.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp2/v1/MinesweeperPanelDamier.java b/CCI_Java/CCI_Java/src/tp2/v1/MinesweeperPanelDamier.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp2/v1/MinesweeperPanelDamier.java
rename to CCI_Java/CCI_Java/src/tp2/v1/MinesweeperPanelDamier.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp2/v1/fiddling.java b/CCI_Java/CCI_Java/src/tp2/v1/fiddling.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp2/v1/fiddling.java
rename to CCI_Java/CCI_Java/src/tp2/v1/fiddling.java
diff --git a/CCI_Java/CCI_Java/src/tp3/ex01/Product.java b/CCI_Java/CCI_Java/src/tp3/ex01/Product.java
deleted file mode 100644
index 387a124..0000000
--- a/CCI_Java/CCI_Java/src/tp3/ex01/Product.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package tp3.ex01;
-
-public class Product {
- int quantity;
- double price;
-}
diff --git a/CCI_Java/CCI_Java/src/tp3/ex01/ProductExample.java b/CCI_Java/CCI_Java/src/tp3/ex01/ProductExample.java
deleted file mode 100644
index 31e9352..0000000
--- a/CCI_Java/CCI_Java/src/tp3/ex01/ProductExample.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package tp3.ex01;
-
-import java.util.Scanner;
-
-public class ProductExample {
-
- public static void main(String[] args) {
- Scanner scanner = new Scanner(System.in);
- Product productA = new Product();
- System.out.println("Quantité du produit A : ");
- productA.quantity = scanner.nextInt();
- System.out.println("Prix du produit A : ");
- productA.price = scanner.nextDouble();
-
- Product productB = new Product();
- System.out.println("Quantité du produit B : ");
- productB.quantity = scanner.nextInt();
- System.out.println("Prix du produit B : ");
- productB.price = scanner.nextDouble();
-
- System.out.println("productA.quantity: "+ productA.quantity +" productB.quantity: " + productB.quantity);
- System.out.println("productA.price: "+ productA.price +" productB.price: " + productB.price);
- double prixTotal = productB.price * productB.quantity + productA.price * productA.quantity;
- System.out.println(" Le prix total des deux produits est : " + prixTotal);
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp3/ex02/Product.java b/CCI_Java/CCI_Java/src/tp3/ex02/Product.java
deleted file mode 100644
index 4b31ed6..0000000
--- a/CCI_Java/CCI_Java/src/tp3/ex02/Product.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package tp3.ex02;
-
-public class Product {
- int quantity;
- double price;
-}
diff --git a/CCI_Java/CCI_Java/src/tp3/ex02/ProductExample.java b/CCI_Java/CCI_Java/src/tp3/ex02/ProductExample.java
deleted file mode 100644
index b5f2431..0000000
--- a/CCI_Java/CCI_Java/src/tp3/ex02/ProductExample.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package tp3.ex02;
-
-public class ProductExample {
-
- public static void main(String[] args) {
- Product productA = new Product();
- productA.quantity = 15;
- productA.price = 30.5;
-
- Product productB = new Product();
- productB.quantity = 120;
- productB.price = 10.2;
-
- System.out.println("productA.quantity: "+ productA.quantity +" productB.quantity:" + productB.quantity);
- System.out.println("productA.price: "+ productA.price +" productB.price:" + productB.price);
-
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp3/ex03/NumberPrinter.java b/CCI_Java/CCI_Java/src/tp3/ex03/NumberPrinter.java
deleted file mode 100644
index 0f8903f..0000000
--- a/CCI_Java/CCI_Java/src/tp3/ex03/NumberPrinter.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package tp3.ex03;
-
-import java.util.Scanner;
-
-public class NumberPrinter {
-
- public static void main(String[] args) {
- Scanner scanner = new Scanner(System.in);
-
- System.out.println(" Entrez un nombre entier positif : ");
- int n = scanner.nextInt();
-
- for(int idx = 1; idx <= n; idx++)
- System.out.println(idx);
-
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp3/ex04/NumberPrinter.java b/CCI_Java/CCI_Java/src/tp3/ex04/NumberPrinter.java
deleted file mode 100644
index fa4792e..0000000
--- a/CCI_Java/CCI_Java/src/tp3/ex04/NumberPrinter.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package tp3.ex04;
-
-import java.util.Scanner;
-
-public class NumberPrinter {
-
- public static void main(String[] args) {
- Scanner scanner = new Scanner(System.in);
-
- System.out.println(" Entrez un nombre entier positif : ");
- int n = scanner.nextInt();
-
- for(int idx = 1; idx <= n; idx++)
- System.out.print(idx + " ");
-
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp3/ex05/SumCalculator.java b/CCI_Java/CCI_Java/src/tp3/ex05/SumCalculator.java
deleted file mode 100644
index 9998d1b..0000000
--- a/CCI_Java/CCI_Java/src/tp3/ex05/SumCalculator.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package tp3.ex05;
-
-import java.util.Scanner;
-
-public class SumCalculator {
-
- public static void main(String[] args) {
- Scanner scanner = new Scanner(System.in);
-
- System.out.println("Combien de nombres souhaitez-vous entrer ? ");
- int n = scanner.nextInt();
- int sum = 0;
- for(int idx = 1; idx <= n; idx++) {
- System.out.println("Entrez le nombre " + idx);
- sum += scanner.nextInt();
- }
- System.out.println("La somme des nombres saisis est : " + sum);
-
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp3/ex06/PowerCalculator.java b/CCI_Java/CCI_Java/src/tp3/ex06/PowerCalculator.java
deleted file mode 100644
index 43c43e1..0000000
--- a/CCI_Java/CCI_Java/src/tp3/ex06/PowerCalculator.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package tp3.ex06;
-
-import java.util.Scanner;
-
-public class PowerCalculator {
-
- public static void main(String[] args) {
- Scanner scanner = new Scanner(System.in);
-
- System.out.println(" Entrez un nombre reel: ");
- int x = scanner.nextInt();
-
- System.out.println(" Entrez un nombre entier positif : ");
- int n = scanner.nextInt();
-
- double product = 1;
- for(int idx = 1; idx <= n; idx++)
- product *= x;
- System.out.println(x + "^" + n + " = " + product);
-
-
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion1/MainGui.java b/CCI_Java/CCI_Java/src/tp3/minesweeperVersion1/MainGui.java
deleted file mode 100644
index a2b3dcf..0000000
--- a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion1/MainGui.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package tp3.minesweeperVersion1;
-
-public class MainGui {
- public static void main(String[] args) {
- new MinesweeperFrame();
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion1/Minesweeper.java b/CCI_Java/CCI_Java/src/tp3/minesweeperVersion1/Minesweeper.java
deleted file mode 100644
index 6afe742..0000000
--- a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion1/Minesweeper.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package tp3.minesweeperVersion1;
-
-public class Minesweeper {
- int nbColumns;
- int nbLines;
- int score;
- int selectedLine;
- int selectedColumn;
-}
diff --git a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion1/MinesweeperFrame.java b/CCI_Java/CCI_Java/src/tp3/minesweeperVersion1/MinesweeperFrame.java
deleted file mode 100644
index e83bc7c..0000000
--- a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion1/MinesweeperFrame.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package tp3.minesweeperVersion1;
-
-import javax.swing.JFrame;
-import javax.swing.WindowConstants;
-@SuppressWarnings("serial")
-public class MinesweeperFrame extends JFrame {
-Minesweeper minesweeper;
-MinesweeperPanel minesweeperPanel;
-public MinesweeperFrame() {
-this.minesweeper = new Minesweeper();
-
-this.minesweeper.nbColumns = 15;
-this.minesweeper.nbLines = 20;
-this.minesweeper.score = 30;
-this.minesweeper.selectedLine = 3;
-this.minesweeper.selectedColumn = 8;
-
-this.minesweeperPanel = new MinesweeperPanel(minesweeper);
-add(minesweeperPanel);
-pack();
-setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
-setVisible(true);
-
-
-}}
\ No newline at end of file
diff --git a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion1/MinesweeperPanel.java b/CCI_Java/CCI_Java/src/tp3/minesweeperVersion1/MinesweeperPanel.java
deleted file mode 100644
index def3461..0000000
--- a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion1/MinesweeperPanel.java
+++ /dev/null
@@ -1,74 +0,0 @@
-package tp3.minesweeperVersion1;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import javax.swing.JPanel;
-
-@SuppressWarnings("serial")
-public class MinesweeperPanel extends JPanel {
- Minesweeper minesweeper;
- int spaceHor;
- int spaceVert;
-
- public MinesweeperPanel(Minesweeper minesweeper) {
- this.minesweeper = minesweeper;
- setPreferredSize(new Dimension(500, 500));
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- super.paintComponent(g);
-
-// grand rect
- int spaceBorder = 20;
-
- int nbColumns = this.minesweeper.nbColumns;
- int nbRows = this.minesweeper.nbLines;
-
- int carreWidth = (getWidth() - (spaceBorder * 2)) - ((getWidth() - (spaceBorder * 2)) % nbColumns);
- int carreHeight = (getHeight() - (spaceBorder * 2)) - ((getHeight() - (spaceBorder * 2)) % nbRows);
-
- this.spaceHor = carreWidth / nbColumns;
- this.spaceVert = carreHeight / nbRows;
-
- int lineEndH = carreHeight + spaceBorder;
- int lineEndV = carreWidth + spaceBorder;
-
- // creating collumns
- int posH = spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(spaceBorder, spaceBorder, spaceBorder, lineEndH);
-
- for (int idx = 1; idx <= nbColumns; idx++) {
- posH = (idx * spaceHor) + spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(posH, spaceBorder, posH, lineEndH);
- }
-
- // creating rows
- int posV = spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(spaceBorder, spaceBorder, lineEndV, spaceBorder);
-
- for (int idx = 1; idx <= nbRows; idx++) {
- posV = (idx * spaceVert) + spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(spaceBorder, posV, lineEndV, posV);
- }
-
-
- // select and color
- int selCol = this.minesweeper.selectedColumn;
- int selLine = this.minesweeper.selectedLine;
-
- int startSelCol = spaceBorder + (selCol * spaceHor);
- int startSelRow = spaceBorder + (selLine * spaceVert);
-
- g.setColor(Color.RED);
- g.fillRect(startSelCol,
- startSelRow,
- spaceHor,
- spaceVert);
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion1/MinesweeperPanelDamier.java b/CCI_Java/CCI_Java/src/tp3/minesweeperVersion1/MinesweeperPanelDamier.java
deleted file mode 100644
index 1dd7b4c..0000000
--- a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion1/MinesweeperPanelDamier.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package tp3.minesweeperVersion1;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import javax.swing.JPanel;
-
-@SuppressWarnings("serial")
-public class MinesweeperPanelDamier extends JPanel {
- Minesweeper minesweeper;
-
- public MinesweeperPanelDamier(Minesweeper minesweeper) {
- this.minesweeper = minesweeper;
- setPreferredSize(new Dimension(500, 500));
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- super.paintComponent(g);
- g.setColor(Color.RED);
- g.drawLine(0, 0, getWidth(), getHeight());
- g.setColor(Color.BLUE);
- g.drawLine(getWidth(), getHeight(), getWidth() / 2, getHeight() / 2);
-
-// grand rect
- int widthHouse = getWidth() / 3;
- int heightHouse = getHeight() / 3;
- int xMid = getWidth() / 2;
- int yMid = getHeight() / 2;
- int unten = yMid + (heightHouse / 2) ;
- int oben = yMid - heightHouse / 2;
- int links = xMid - widthHouse / 2;
- int rechts = xMid + (widthHouse / 2);
- // house
- g.setColor(Color.YELLOW);
- g.fillRect(links,
- oben,
- widthHouse,
- heightHouse);
- g.setColor(Color.BLACK);
- g.drawRect(links,
- oben,
- widthHouse,
- heightHouse);
-
- g.setColor(Color.BLACK);
- g.drawLine(links, oben, rechts - widthHouse / 2, oben - heightHouse / 2);
- g.setColor(Color.BLACK);
- g.drawLine(rechts, oben, links + widthHouse / 2, oben - heightHouse / 2);
-////port
-// g.setColor(Color.LIGHT_GRAY);
-// g.fillRect(200, 200, 30, 30);
-// g.setColor(Color.GRAY);
-// g.drawRect(200, 200, 30, 30);
-
-// g.setColor(Color.BLUE);
- g.setColor(Color.RED);
- g.drawLine(links, oben, rechts, oben);
-
- // Oval getWidth() getHeight()
- g.setColor(Color.RED);
- g.drawOval(0, 100, 10, 10);
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion2/MainGui.java b/CCI_Java/CCI_Java/src/tp3/minesweeperVersion2/MainGui.java
deleted file mode 100644
index 6ddd317..0000000
--- a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion2/MainGui.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package tp3.minesweeperVersion2;
-
-public class MainGui {
- public static void main(String[] args) {
- new MinesweeperFrame();
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion2/Minesweeper.java b/CCI_Java/CCI_Java/src/tp3/minesweeperVersion2/Minesweeper.java
deleted file mode 100644
index 53d1223..0000000
--- a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion2/Minesweeper.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package tp3.minesweeperVersion2;
-
-public class Minesweeper {
- int nbColumns;
- int nbLines;
- int score;
- int selectedLine;
- int selectedColumn;
-}
diff --git a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion2/MinesweeperFrame.java b/CCI_Java/CCI_Java/src/tp3/minesweeperVersion2/MinesweeperFrame.java
deleted file mode 100644
index 18f0f59..0000000
--- a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion2/MinesweeperFrame.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package tp3.minesweeperVersion2;
-
-import javax.swing.JFrame;
-import javax.swing.WindowConstants;
-@SuppressWarnings("serial")
-public class MinesweeperFrame extends JFrame {
-Minesweeper minesweeper;
-MinesweeperPanel minesweeperPanel;
-public MinesweeperFrame() {
-this.minesweeper = new Minesweeper();
-
-this.minesweeper.nbColumns = 15;
-this.minesweeper.nbLines = 20;
-this.minesweeper.score = 30;
-this.minesweeper.selectedLine = 3;
-this.minesweeper.selectedColumn = 8;
-
-this.minesweeperPanel = new MinesweeperPanel(minesweeper);
-add(minesweeperPanel);
-pack();
-setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
-setVisible(true);
-
-
-}}
\ No newline at end of file
diff --git a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion2/MinesweeperPanel.java b/CCI_Java/CCI_Java/src/tp3/minesweeperVersion2/MinesweeperPanel.java
deleted file mode 100644
index e0ff563..0000000
--- a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion2/MinesweeperPanel.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package tp3.minesweeperVersion2;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import javax.swing.JPanel;
-
-@SuppressWarnings("serial")
-public class MinesweeperPanel extends JPanel {
- Minesweeper minesweeper;
-
- public MinesweeperPanel(Minesweeper minesweeper) {
- this.minesweeper = minesweeper;
- setPreferredSize(new Dimension(500, 500));
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- super.paintComponent(g);
-// g.setColor(Color.RED);
-// g.drawLine(0, 0, getWidth(), getHeight());
-// g.setColor(Color.BLUE);
-// g.drawLine(getWidth(), getHeight(), getWidth() / 2, getHeight() / 2);
-
-// grand rect
-
- int nbColumns = this.minesweeper.nbColumns;
- int nbLines = this.minesweeper.nbLines;
- int selCol = this.minesweeper.selectedColumn;
- int selLine = this.minesweeper.selectedLine;
-
-
- int spaceBorder = 20;
- int spaceHor = (getWidth() - (spaceBorder*2)) / nbColumns;
- int spaceVert = (getHeight() - (spaceBorder*2)) / nbLines;
-
- // creating rows
- int posV = 0;
- for(int idx = 1; idx <= nbLines; idx++) {
- posV = (idx * spaceVert);
- g.setColor(Color.BLACK);
- g.drawLine(spaceBorder, posV + spaceBorder, getWidth() - spaceBorder, posV + spaceBorder);
- }
-
- // creating collumns
- int posH = 0;
- for(int idx = 1; idx <= nbColumns; idx++) {
- posH = (idx * spaceHor);
- g.setColor(Color.BLACK);
- g.drawLine(posH + spaceBorder, spaceBorder, posH + spaceBorder, getHeight() - spaceBorder);
-
- }
-
- int startSelCol = spaceBorder + (selCol * spaceHor);
- int startSelRow = spaceBorder + (selLine * spaceVert);
-
- g.setColor(Color.RED);
- g.fillRect(startSelCol,
- startSelRow,
- spaceHor,
- spaceVert);
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion2/MinesweeperPanelDamier.java b/CCI_Java/CCI_Java/src/tp3/minesweeperVersion2/MinesweeperPanelDamier.java
deleted file mode 100644
index 40dbf87..0000000
--- a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion2/MinesweeperPanelDamier.java
+++ /dev/null
@@ -1,60 +0,0 @@
-package tp3.minesweeperVersion2;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import javax.swing.JPanel;
-
-@SuppressWarnings("serial")
-public class MinesweeperPanelDamier extends JPanel {
- Minesweeper minesweeper;
- int spaceHor;
- int spaceVert;
- public MinesweeperPanelDamier(Minesweeper minesweeper) {
- this.minesweeper = minesweeper;
- setPreferredSize(new Dimension(500, 500));
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- super.paintComponent(g);
-
- // grand rect
-
- int spaceBorder = 20;
- int nbColumns = 10;
- int nbRows = 10;
-
- int carreWidth = (getWidth() - (spaceBorder * 2)) - ((getWidth() - (spaceBorder * 2)) % nbColumns);
- int carreHeight = (getHeight() - (spaceBorder * 2)) - ((getHeight() - (spaceBorder * 2)) % nbRows);
-
- this.spaceHor = carreWidth / nbColumns;
- this.spaceVert = carreHeight / nbRows;
-
- int lineEndH = carreHeight + spaceBorder;
- int lineEndV = carreWidth + spaceBorder;
-
- // creating collumns
- int posH = spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(spaceBorder, spaceBorder, spaceBorder, lineEndH);
-
- for (int idx = 1; idx <= nbColumns; idx++) {
- posH = (idx * spaceHor) + spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(posH, spaceBorder, posH, lineEndH);
- }
-
- // creating rows
- int posV = spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(spaceBorder, spaceBorder, lineEndV, spaceBorder);
-
- for (int idx = 1; idx <= nbRows; idx++) {
- posV = (idx * spaceVert) + spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(spaceBorder, posV, lineEndV, posV);
- }
-
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion3/MainGui.java b/CCI_Java/CCI_Java/src/tp3/minesweeperVersion3/MainGui.java
deleted file mode 100644
index 9588d01..0000000
--- a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion3/MainGui.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package tp3.minesweeperVersion3;
-
-public class MainGui {
- public static void main(String[] args) {
- new MinesweeperFrame();
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion3/Minesweeper.java b/CCI_Java/CCI_Java/src/tp3/minesweeperVersion3/Minesweeper.java
deleted file mode 100644
index 0faca78..0000000
--- a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion3/Minesweeper.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package tp3.minesweeperVersion3;
-
-import java.util.Scanner;
-
-public class Minesweeper {
- int nbColumns;
- int nbLines;
- int score;
- int selectedLine;
- int selectedColumn;
-
- private void checkSelect() {
- Scanner scanner = new Scanner(System.in);
- while (this.selectedColumn == -1 || this.selectedLine == -1) {
-
- if (this.selectedColumn == -1 && this.selectedLine == -1) {
- System.out.println("Selectionnez une cellule svp. (en utilisant d'une entier) !");
- System.out.println("Column : ");
- this.selectedColumn = scanner.nextInt();
- System.out.println("Line : ");
- this.selectedLine = scanner.nextInt();
- }
-
-
- }
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion3/MinesweeperFrame.java b/CCI_Java/CCI_Java/src/tp3/minesweeperVersion3/MinesweeperFrame.java
deleted file mode 100644
index 30e1a32..0000000
--- a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion3/MinesweeperFrame.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package tp3.minesweeperVersion3;
-
-import javax.swing.JFrame;
-import javax.swing.WindowConstants;
-
-@SuppressWarnings("serial")
-public class MinesweeperFrame extends JFrame {
- Minesweeper minesweeper;
- MinesweeperPanel minesweeperPanel;
-
- public MinesweeperFrame() {
- this.minesweeper = new Minesweeper();
-
- this.minesweeper.nbColumns = 25;
- this.minesweeper.nbLines = 25;
- this.minesweeper.score = 30;
- this.minesweeper.selectedLine = 3;
- this.minesweeper.selectedColumn = 8;
-
- this.minesweeperPanel = new MinesweeperPanel(minesweeper);
- add(minesweeperPanel);
- pack();
- setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
- setVisible(true);
-
- }
-}
\ No newline at end of file
diff --git a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion3/MinesweeperPanel.java b/CCI_Java/CCI_Java/src/tp3/minesweeperVersion3/MinesweeperPanel.java
deleted file mode 100644
index 1331961..0000000
--- a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion3/MinesweeperPanel.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package tp3.minesweeperVersion3;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.event.MouseEvent;
-import java.util.Scanner;
-
-import javax.swing.JPanel;
-
-@SuppressWarnings("serial")
-public class MinesweeperPanel extends JPanel {
- Minesweeper minesweeper;
- int spaceHor;
- int spaceVert;
- int nbColumns;
- int nbRows;
- int selCol;
- int selLine;
- int carreWidth;
- int carreHeight;
- int spaceBorder;
-
- public MinesweeperPanel(Minesweeper minesweeper) {
- this.minesweeper = minesweeper;
- setPreferredSize(new Dimension(500, 500));
- addMouseListener(new PanelMouseListener(this));
- addMouseMotionListener(new PanelMouseListener(this));
- spaceBorder = 20;
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- super.paintComponent(g);
-
- // grand rect
-
- this.nbColumns = this.minesweeper.nbColumns;
- this.nbRows = this.minesweeper.nbLines;
-
- this.carreWidth = (getWidth() - (spaceBorder * 2)) - ((getWidth() - (spaceBorder * 2)) % nbColumns);
- this.carreHeight = (getHeight() - (spaceBorder * 2)) - ((getHeight() - (spaceBorder * 2)) % nbRows);
-
- this.spaceHor = carreWidth / nbColumns;
- this.spaceVert = carreHeight / nbRows;
-
- int lineEndH = carreHeight + spaceBorder;
- int lineEndV = carreWidth + spaceBorder;
-
- // creating collumns
- int posH = spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(spaceBorder, spaceBorder, spaceBorder, lineEndH);
-
- for (int idx = 1; idx <= nbColumns; idx++) {
- posH = (idx * spaceHor) + spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(posH, spaceBorder, posH, lineEndH);
- }
-
- // creating rows
- int posV = spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(spaceBorder, spaceBorder, lineEndV, spaceBorder);
-
- for (int idx = 1; idx <= nbRows; idx++) {
- posV = (idx * spaceVert) + spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(spaceBorder, posV, lineEndV, posV);
- }
-
- // select and color
- this.selCol = this.minesweeper.selectedColumn;
- this.selLine = this.minesweeper.selectedLine;
-
- if (selCol == -1 && selLine == -1)
- System.out.println("aucune cellule n'est selectionnée !");
- else if (selCol == -1)
- System.out.println("aucune column n'est selectionnée !");
- else if (selLine == -1)
- System.out.println("aucune line n'est selectionnée !");
- else {
- int startSelCol = spaceBorder + (selCol * spaceHor);
- int startSelRow = spaceBorder + (selLine * spaceVert);
-
- g.setColor(Color.RED);
- g.fillRect(startSelCol, startSelRow, spaceHor, spaceVert);
- }
-
- }
-
- public int getColumn(int x) {
- int posCarre = x - this.spaceBorder;
-
- this.selCol = posCarre / spaceHor;
-// if (posCarre % spaceHor > 0)
-// this.selCol++;
- return this.selCol;
- }
-
- public int getLine(int y) {
- int posCarre = y - this.spaceBorder;
-
- this.selLine = posCarre / spaceVert;
-// if (posCarre % spaceVert > 0)
-// this.selLine++;
- return this.selLine;
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion3/PanelMouseListener.java b/CCI_Java/CCI_Java/src/tp3/minesweeperVersion3/PanelMouseListener.java
deleted file mode 100644
index 49c14de..0000000
--- a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion3/PanelMouseListener.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package tp3.minesweeperVersion3;
-
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-public class PanelMouseListener extends MouseAdapter {
- MinesweeperPanel panel;
-
- public PanelMouseListener(MinesweeperPanel panel) {
- this.panel = panel;
- }
-
- @Override
- public void mouseClicked(MouseEvent e) {
- //System.out.println("Clicked " + e.getX() + " " + e.getY());
- }
-
- @Override
- public void mouseMoved(MouseEvent e) {
- //System.out.println("Moved " + e.getX() + " " + e.getY());
-
- panel.minesweeper.selectedLine = panel.getLine(e.getY());
- panel.minesweeper.selectedColumn = panel.getColumn(e.getX());
-
- System.out.println("Line = " + panel.minesweeper.selectedLine); // e.getY());//
- System.out.println("Column = " + panel.minesweeper.selectedColumn); // e.getX()); //
-
- panel.repaint();
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion4/MainGui.java b/CCI_Java/CCI_Java/src/tp3/minesweeperVersion4/MainGui.java
deleted file mode 100644
index 3b729d3..0000000
--- a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion4/MainGui.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package tp3.minesweeperVersion4;
-
-public class MainGui {
- public static void main(String[] args) {
- new MinesweeperFrame();
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion4/Minesweeper.java b/CCI_Java/CCI_Java/src/tp3/minesweeperVersion4/Minesweeper.java
deleted file mode 100644
index 1387257..0000000
--- a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion4/Minesweeper.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package tp3.minesweeperVersion4;
-
-import java.util.ArrayList;
-import java.util.Scanner;
-
-public class Minesweeper {
- int nbColumns;
- int nbLines;
- int score;
- int selectedLine;
- int selectedColumn;
-// int selLineOpened;
-// int selColumnOpend;
- int [][] field;
- int [][] opend;
-
- private void checkSelect() {
- Scanner scanner = new Scanner(System.in);
- while (this.selectedColumn == -1 || this.selectedLine == -1) {
-
- if (this.selectedColumn == -1 && this.selectedLine == -1) {
- System.out.println("Selectionnez une cellule svp. (en utilisant d'une entier) !");
- System.out.println("Column : ");
- this.selectedColumn = scanner.nextInt();
- System.out.println("Line : ");
- this.selectedLine = scanner.nextInt();
- }
-
-
- }
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion4/MinesweeperFrame.java b/CCI_Java/CCI_Java/src/tp3/minesweeperVersion4/MinesweeperFrame.java
deleted file mode 100644
index a9fcf0c..0000000
--- a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion4/MinesweeperFrame.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package tp3.minesweeperVersion4;
-
-import javax.swing.JFrame;
-import javax.swing.WindowConstants;
-
-@SuppressWarnings("serial")
-public class MinesweeperFrame extends JFrame {
- Minesweeper minesweeper;
- MinesweeperPanel minesweeperPanel;
-
- public MinesweeperFrame() {
- this.minesweeper = new Minesweeper();
-
- this.minesweeper.nbColumns = 25;
- this.minesweeper.nbLines = 25;
- this.minesweeper.score = 30;
- this.minesweeper.selectedLine = 3;
- this.minesweeper.selectedColumn = 8;
- this.minesweeper.field = new int [this.minesweeper.nbColumns][this.minesweeper.nbLines];
- this.minesweeper.opend = new int [this.minesweeper.nbColumns][this.minesweeper.nbLines];
-
- this.minesweeperPanel = new MinesweeperPanel(minesweeper);
- add(minesweeperPanel);
- pack();
- setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
- setVisible(true);
-
- }
-}
\ No newline at end of file
diff --git a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion4/MinesweeperPanel.java b/CCI_Java/CCI_Java/src/tp3/minesweeperVersion4/MinesweeperPanel.java
deleted file mode 100644
index 4138428..0000000
--- a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion4/MinesweeperPanel.java
+++ /dev/null
@@ -1,134 +0,0 @@
-package tp3.minesweeperVersion4;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.event.MouseEvent;
-import java.util.Scanner;
-
-import javax.swing.JPanel;
-
-@SuppressWarnings("serial")
-public class MinesweeperPanel extends JPanel {
- Minesweeper minesweeper;
- int spaceHor;
- int spaceVert;
- int nbColumns;
- int nbRows;
- int selCol;
- int selLine;
- int carreWidth;
- int carreHeight;
- int spaceBorder;
-
- public MinesweeperPanel(Minesweeper minesweeper) {
- this.minesweeper = minesweeper;
- setPreferredSize(new Dimension(500, 500));
- addMouseListener(new PanelMouseListener(this));
- addMouseMotionListener(new PanelMouseListener(this));
- spaceBorder = 20;
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- super.paintComponent(g);
-
- // grand rect
-
- this.nbColumns = this.minesweeper.nbColumns;
- this.nbRows = this.minesweeper.nbLines;
-
- this.carreWidth = (getWidth() - (spaceBorder * 2)) - ((getWidth() - (spaceBorder * 2)) % nbColumns);
- this.carreHeight = (getHeight() - (spaceBorder * 2)) - ((getHeight() - (spaceBorder * 2)) % nbRows);
-
- this.spaceHor = carreWidth / nbColumns;
- this.spaceVert = carreHeight / nbRows;
-
- int lineEndH = carreHeight + spaceBorder;
- int lineEndV = carreWidth + spaceBorder;
-
- // creating collumns
- int posH = spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(spaceBorder, spaceBorder, spaceBorder, lineEndH);
-
- for (int idx = 1; idx <= nbColumns; idx++) {
- posH = (idx * spaceHor) + spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(posH, spaceBorder, posH, lineEndH);
- }
-
- // creating rows
- int posV = spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(spaceBorder, spaceBorder, lineEndV, spaceBorder);
-
- for (int idx = 1; idx <= nbRows; idx++) {
- posV = (idx * spaceVert) + spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(spaceBorder, posV, lineEndV, posV);
- }
-
-// // select and color
-// this.selCol = this.minesweeper.selectedColumn;
-// this.selLine = this.minesweeper.selectedLine;
-//
-// if (selCol == -1 && selLine == -1)
-// System.out.println("aucune cellule n'est selectionnée !");
-// else if (selCol == -1)
-// System.out.println("aucune column n'est selectionnée !");
-// else if (selLine == -1)
-// System.out.println("aucune line n'est selectionnée !");
-// else {
-// int startSelCol = spaceBorder + (selCol * spaceHor);
-// int startSelRow = spaceBorder + (selLine * spaceVert);
-//
-// g.setColor(Color.RED);
-// g.fillRect(startSelCol, startSelRow, spaceHor, spaceVert);
-// }
- selectAndColor(g);
-
- }
-
- private void selectAndColor(Graphics g) {
- // select and color
- this.selCol = this.minesweeper.selectedColumn;
- this.selLine = this.minesweeper.selectedLine;
-
- if (selCol == -1 && selLine == -1)
- System.out.println("aucune cellule n'est selectionnée !");
- else if (selCol == -1)
- System.out.println("aucune column n'est selectionnée !");
- else if (selLine == -1)
- System.out.println("aucune line n'est selectionnée !");
- else {
- int startSelCol = spaceBorder + (selCol * spaceHor);
- int startSelRow = spaceBorder + (selLine * spaceVert);
-
- g.setColor(Color.RED);
- g.fillRect(startSelCol, startSelRow, spaceHor, spaceVert);
- }
- }
-
- public int getColumn(int x) {
- int posCarre = x - this.spaceBorder;
-
- this.selCol = posCarre / spaceHor;
-// if (posCarre % spaceHor > 0)
-// this.selCol++;
- return this.selCol;
- }
-
- public int getLine(int y) {
- int posCarre = y - this.spaceBorder;
-
- this.selLine = posCarre / spaceVert;
-// if (posCarre % spaceVert > 0)
-// this.selLine++;
- return this.selLine;
- }
-
-// public void repaint() {
-//
-// }
-}
diff --git a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion4/PanelMouseListener.java b/CCI_Java/CCI_Java/src/tp3/minesweeperVersion4/PanelMouseListener.java
deleted file mode 100644
index 97ebc17..0000000
--- a/CCI_Java/CCI_Java/src/tp3/minesweeperVersion4/PanelMouseListener.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package tp3.minesweeperVersion4;
-
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-public class PanelMouseListener extends MouseAdapter {
- MinesweeperPanel panel;
-
- public PanelMouseListener(MinesweeperPanel panel) {
- this.panel = panel;
- }
-
- @Override
- public void mouseClicked(MouseEvent e) {
-// System.out.println("Clicked " + e.getX() + " " + e.getY());
- System.out.println("Click Line = " + panel.minesweeper.selectedLine); // e.getY());//
- System.out.println("Click Column = " + panel.minesweeper.selectedColumn); // e.getX()); //
- panel.minesweeper.opend[panel.getColumn(e.getX())][panel.getLine(e.getY())] = 1;
- }
-
- @Override
- public void mouseMoved(MouseEvent e) {
- //System.out.println("Moved " + e.getX() + " " + e.getY());
-
- panel.minesweeper.selectedLine = panel.getLine(e.getY());
- panel.minesweeper.selectedColumn = panel.getColumn(e.getX());
-
- System.out.println("Line = " + panel.minesweeper.selectedLine); // e.getY());//
- System.out.println("Column = " + panel.minesweeper.selectedColumn); // e.getX()); //
-
- panel.repaint();
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/ex01/Date.java b/CCI_Java/CCI_Java/src/tp4/ex01/Date.java
deleted file mode 100644
index 29f552e..0000000
--- a/CCI_Java/CCI_Java/src/tp4/ex01/Date.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package tp4.ex01;
-
-public class Date {
- int day;
- int month;
- int year;
-
- public Date() {
- this.day = 0;
- this.month = 0;
- this.year = 0;
- }
-
- public Date(int day, int month, int year) {
- this.day = day;
- this.month = month;
- this.year = year;
- }
-
- void print() {
- System.out.println("Date : " + day + "/" + month + "/" + year);
- }
-
- boolean isLeapYear() {
- boolean isLeap = (this.year % 4 == 0 && this.year % 100 != 0) || this.year % 400 == 0;
- if (isLeap)
- return true;
- return false;
- }
-
- boolean isBefore(Date d) {
- if (d.year > this.year)
- return true;
- else if (d.year == this.year)
- if (d.month > this.month)
- return true;
- else if (d.month == this.month)
- if (d.day > this.day)
- return true;
- return false;
- }
-
- int nbDaysInMonth() {
- int nbDays = 31;
-
- if (this.month == 2)
- if (isLeapYear())
- nbDays = 29;
- else
- nbDays = 28;
- else if (this.month < 7 && this.month % 2 == 0)
- nbDays = 30;
- else if (this.month == 9 || this.month == 11)
- nbDays = 30;
-
- return nbDays;
- }
-
- Date nextDay() {
- int newDay = this.day;
- int newMonth = this.month;
- int newYear = this.year;
-
- if (this.day < nbDaysInMonth())
- newDay++;
- else if (this.month != 12) {
- newMonth++;
- newDay = 1;
- } else {
- newDay = 1;
- newMonth = 1;
- newYear++;
- }
- return new Date(newDay, newMonth, newYear);
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/ex01/Date2.java b/CCI_Java/CCI_Java/src/tp4/ex01/Date2.java
deleted file mode 100644
index 57afec1..0000000
--- a/CCI_Java/CCI_Java/src/tp4/ex01/Date2.java
+++ /dev/null
@@ -1,81 +0,0 @@
-package tp4.ex01;
-
-public class Date2 {
- int day;
- int month;
- int year;
-
- public Date2() {
- this.day = 0;
- this.month = 0;
- this.year = 0;
- }
-
- public Date2(int day, int month, int year) {
- this.day = day;
- this.month = month;
- this.year = year;
- }
-
- void print() {
- System.out.println("Date : " + day + "/" + month + "/" + year);
- }
-
- boolean isLeapYear() {
- boolean isLeap = (this.year % 4 == 0 && this.year % 100 != 0) || this.year % 400 == 0;
- if (isLeap)
- return true;
- return false;
- }
-
- boolean isBefore(Date2 d) {
- if (d.year > this.year)
- return true;
- else if (d.year == this.year)
- if (d.month > this.month)
- return true;
- else if (d.month == this.month)
- if (d.day > this.day)
- return true;
- else
- return false;
- else
- return false;
- else
- return false;
- }
-
- int nbDaysInMonth() {
- int nbDays = 31;
-
- if (this.month == 2)
- if (isLeapYear())
- nbDays = 29;
- else
- nbDays = 28;
- else if (this.month < 7 && this.month % 2 == 0)
- nbDays = 30;
- else if (this.month == 9 || this.month == 11)
- nbDays = 30;
-
- return nbDays;
- }
-
- Date2 nextDay() {
- int newDay = this.day;
- int newMonth = this.month;
- int newYear = this.year;
-
- if (this.day < nbDaysInMonth())
- newDay++;
- else if (this.month != 12) {
- newMonth++;
- newDay = 1;
- } else {
- newDay = 1;
- newMonth = 1;
- newYear++;
- }
- return new Date2(newDay, newMonth, newYear);
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/ex01/TestConstructor.java b/CCI_Java/CCI_Java/src/tp4/ex01/TestConstructor.java
deleted file mode 100644
index 1e22cb5..0000000
--- a/CCI_Java/CCI_Java/src/tp4/ex01/TestConstructor.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package tp4.ex01;
-
-public class TestConstructor {
-
- public static void main(String[] args) {
- Date date1 = new Date(20, 9, 1997);
- Date date2 = new Date();
- date1.print();
- date2.print();
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/ex01/TestIsBefore.java b/CCI_Java/CCI_Java/src/tp4/ex01/TestIsBefore.java
deleted file mode 100644
index 5069b8e..0000000
--- a/CCI_Java/CCI_Java/src/tp4/ex01/TestIsBefore.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package tp4.ex01;
-
-public class TestIsBefore {
-
- public static void main(String[] args) {
- Date date1 = new Date(20, 9, 2000);
- Date date2 = new Date(1,1,2001);
- Date date3 = new Date(1,1,2024);
- Date date4 = new Date(1,1,2004);
- Date date5 = new Date(1,2,2004);
- Date date6 = new Date(2,2,2004);
- System.out.println(date1.isBefore(date4));
- System.out.println(date2.isBefore(date4));
- System.out.println(date3.isBefore(date4));
- System.out.println(date4.isBefore(date4));
- System.out.println(date4.isBefore(date5));
- System.out.println(date5.isBefore(date6));
-
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/ex01/TestIsLeap.java b/CCI_Java/CCI_Java/src/tp4/ex01/TestIsLeap.java
deleted file mode 100644
index 9a473bc..0000000
--- a/CCI_Java/CCI_Java/src/tp4/ex01/TestIsLeap.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package tp4.ex01;
-
-public class TestIsLeap {
-
- public static void main(String[] args) {
- Date date1 = new Date(20, 9, 2000);
- Date date2 = new Date(0,0,2001);
- Date date3 = new Date(0,0,2024);
- Date date4 = new Date(0,0,2004);
- System.out.println(date1.isLeapYear());
- System.out.println(date2.isLeapYear());
- System.out.println(date3.isLeapYear());
- System.out.println(date4.isLeapYear());
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/ex01/TestNbDaysInMonth.java b/CCI_Java/CCI_Java/src/tp4/ex01/TestNbDaysInMonth.java
deleted file mode 100644
index c63efa0..0000000
--- a/CCI_Java/CCI_Java/src/tp4/ex01/TestNbDaysInMonth.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package tp4.ex01;
-
-public class TestNbDaysInMonth {
-
- public static void main(String[] args) {
- Date date1 = new Date(20, 1, 2000);
- Date date2 = new Date(1, 2, 2001);
- Date date3 = new Date(1, 3, 2024);
- Date date4 = new Date(1, 4, 2004);
- Date date5 = new Date(1, 5, 2004);
- Date date6 = new Date(1, 6, 2004);
- Date date7 = new Date(1, 7, 2004);
- Date date8 = new Date(1, 8, 2004);
- Date date9 = new Date(1, 9, 2004);
- Date date10 = new Date(1, 10, 2004);
- Date date11 = new Date(1, 11, 2004);
- Date date12 = new Date(1, 12, 2004);
- Date date13 = new Date(1, 2, 2004);
- System.out.println("Januar: " + date1.nbDaysInMonth());
- System.out.println("Februar: " + date2.nbDaysInMonth());
- System.out.println("März: " + date3.nbDaysInMonth());
- System.out.println("April: " + date4.nbDaysInMonth());
- System.out.println("Mai: " + date5.nbDaysInMonth());
- System.out.println("Juni: " + date6.nbDaysInMonth());
- System.out.println("Juli: " + date7.nbDaysInMonth());
- System.out.println("August: " + date8.nbDaysInMonth());
- System.out.println("September: " + date9.nbDaysInMonth());
- System.out.println("Oktober: " + date10.nbDaysInMonth());
- System.out.println("November: " + date11.nbDaysInMonth());
- System.out.println("Dezember: " + date12.nbDaysInMonth());
- System.out.println("Februar Schaltjahr: " + date13.nbDaysInMonth());
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/ex01/TestNextDay.java b/CCI_Java/CCI_Java/src/tp4/ex01/TestNextDay.java
deleted file mode 100644
index 4e4fa7f..0000000
--- a/CCI_Java/CCI_Java/src/tp4/ex01/TestNextDay.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package tp4.ex01;
-
-public class TestNextDay {
-
- public static void main(String[] args) {
- Date date1 = new Date(20, 9, 1997);
- Date date2 = new Date(28,2,2001);
- Date date3 = new Date(28,2,2024);
- Date date4 = new Date(31,12,2004);
-
- Date date5 = new Date(29,2,2024);
-
- date1.print();
- date1.nextDay().print();
- date2.print();
- date2.nextDay().print();
- date3.print();
- date3.nextDay().print();
- date4.print();
- date4.nextDay().print();
- date5.print();
- date5.nextDay().print();
-
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/ex01/TestPrint.java b/CCI_Java/CCI_Java/src/tp4/ex01/TestPrint.java
deleted file mode 100644
index 91d4752..0000000
--- a/CCI_Java/CCI_Java/src/tp4/ex01/TestPrint.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package tp4.ex01;
-
-public class TestPrint {
-
- public static void main(String[] args) {
- Date date1 = new Date(20, 9, 1997);
- date1.print();
-
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/ex02/QuizAddition.java b/CCI_Java/CCI_Java/src/tp4/ex02/QuizAddition.java
deleted file mode 100644
index 6330fec..0000000
--- a/CCI_Java/CCI_Java/src/tp4/ex02/QuizAddition.java
+++ /dev/null
@@ -1,43 +0,0 @@
-package tp4.ex02;
-
-import java.util.Scanner;
-
-public class QuizAddition {
-
- public static void main(String[] args) {
-
- Scanner scanner = new Scanner(System.in);
- int flag = 1;
- int correctAnswersCount = 0;
- int incorrectAnswersCount = 0;
-
- while (flag == 1) {
- int firstNumber = (int) (Math.random() * 100);
- int secondNumber = (int) (Math.random() * 100);
- System.out.println(firstNumber + " + " + secondNumber + " ?");
- int userAnswer = scanner.nextInt();
- int res = firstNumber + secondNumber;
- if (userAnswer == res) {
- System.out.println("C'est juste !");
- System.out.println("Voulez - vous recommencer ? ( oui :1 / non :0) :");
- correctAnswersCount++;
- } else {
- System.out.println("C'est faux : le résultat est " + res + " !");
- System.out.println("Voulez - vous recommencer ? ( oui :1 / non :0) :");
- incorrectAnswersCount++;
- }
-
- flag = scanner.nextInt();
-
- while (flag != 1 && flag != 0) {
- System.out.println("tapez 1 où 0 s.v.p. !");
- flag = scanner.nextInt();
- }
-
- }
- System.out.println("Score : " + correctAnswersCount + " réponse ( s ) juste ( s ) ; " + incorrectAnswersCount
- + " réponse ( s ) fausse ( s ) .");
- scanner.close();
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion2/Cell.java b/CCI_Java/CCI_Java/src/tp4/minesweeperVersion2/Cell.java
deleted file mode 100644
index 01902b4..0000000
--- a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion2/Cell.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package tp4.minesweeperVersion2;
-
-public class Cell {
- boolean isRevealed;
- boolean isMine;
-
- public Cell() {
-
- }
-
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion2/MainGui.java b/CCI_Java/CCI_Java/src/tp4/minesweeperVersion2/MainGui.java
deleted file mode 100644
index 552ee71..0000000
--- a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion2/MainGui.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package tp4.minesweeperVersion2;
-
-public class MainGui {
- public static void main(String[] args) {
- new MinesweeperFrame();
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion2/Minesweeper.java b/CCI_Java/CCI_Java/src/tp4/minesweeperVersion2/Minesweeper.java
deleted file mode 100644
index 0660c9a..0000000
--- a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion2/Minesweeper.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package tp4.minesweeperVersion2;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Scanner;
-
-public class Minesweeper {
- int nbColumns;
- int nbLines;
- int score;
- int selectedLine;
- int selectedColumn;
-// int selLineOpened;
-// int selColumnOpend;
-// int[][] field;
-// int[][] opend;
- ArrayList<List<Cell>> board;
-
- public Minesweeper() {
- this.nbColumns = 10;
- this.nbLines = 10;
- this.score = 100;
- this.selectedLine = 0;
- this.selectedColumn = 0;
- this.board = new ArrayList<List<Cell>>();
-
- for (int line = 0; line < this.nbLines; line++) {
- this.board.add(new ArrayList<Cell>());
- for (int column = 0; column < this.nbColumns; column++) {
- Cell cell = new Cell();
- cell.isRevealed = false;
- cell.isMine = ((int) (Math.random() * 5)) == 0;
- this.board.get(line).add(cell);
- }
- }
- }
-
- private void checkSelect() {
- Scanner scanner = new Scanner(System.in);
- while (this.selectedColumn == -1 || this.selectedLine == -1) {
-
- if (this.selectedColumn == -1 && this.selectedLine == -1) {
- System.out.println("Selectionnez une cellule svp. (en utilisant d'une entier) !");
- System.out.println("Column : ");
- this.selectedColumn = scanner.nextInt();
- System.out.println("Line : ");
- this.selectedLine = scanner.nextInt();
- }
-
- }
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion2/MinesweeperFrame.java b/CCI_Java/CCI_Java/src/tp4/minesweeperVersion2/MinesweeperFrame.java
deleted file mode 100644
index 48a992a..0000000
--- a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion2/MinesweeperFrame.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package tp4.minesweeperVersion2;
-
-import javax.swing.JFrame;
-import javax.swing.WindowConstants;
-
-@SuppressWarnings("serial")
-public class MinesweeperFrame extends JFrame {
- Minesweeper minesweeper;
- MinesweeperPanel minesweeperPanel;
-
- public MinesweeperFrame() {
- this.minesweeper = new Minesweeper();
-
- this.minesweeperPanel = new MinesweeperPanel(minesweeper);
- add(minesweeperPanel);
- pack();
- setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
- setVisible(true);
-
- }
-}
\ No newline at end of file
diff --git a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion2/MinesweeperPanel.java b/CCI_Java/CCI_Java/src/tp4/minesweeperVersion2/MinesweeperPanel.java
deleted file mode 100644
index 2b9a4ff..0000000
--- a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion2/MinesweeperPanel.java
+++ /dev/null
@@ -1,183 +0,0 @@
-package tp4.minesweeperVersion2;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.event.MouseEvent;
-import java.util.Scanner;
-
-import javax.swing.JPanel;
-
-@SuppressWarnings("serial")
-public class MinesweeperPanel extends JPanel {
- Minesweeper minesweeper;
- int spaceHor;
- int spaceVert;
- int nbColumns;
- int nbRows;
- int selCol;
- int selLine;
- int carreWidth;
- int carreHeight;
- int spaceBorder;
-
- public MinesweeperPanel(Minesweeper minesweeper) {
- this.minesweeper = minesweeper;
- setPreferredSize(new Dimension(500, 500));
- addMouseListener(new PanelMouseListener(this));
- addMouseMotionListener(new PanelMouseListener(this));
- spaceBorder = 20;
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- super.paintComponent(g);
-
- // grand rect
-
- this.nbColumns = this.minesweeper.nbColumns;
- this.nbRows = this.minesweeper.nbLines;
-
- this.carreWidth = (getWidth() - (spaceBorder * 2)) - ((getWidth() - (spaceBorder * 2)) % nbColumns);
- this.carreHeight = (getHeight() - (spaceBorder * 2)) - ((getHeight() - (spaceBorder * 2)) % nbRows);
-
- this.spaceHor = carreWidth / nbColumns;
- this.spaceVert = carreHeight / nbRows;
-
- int lineEndH = carreHeight + spaceBorder;
- int lineEndV = carreWidth + spaceBorder;
-
- colorField(g);
-
- // creating collumns
- int posH = spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(spaceBorder, spaceBorder, spaceBorder, lineEndH);
-
- for (int idx = 1; idx <= nbColumns; idx++) {
- posH = (idx * spaceHor) + spaceBorder;
-// g.setColor(Color.BLACK);
- g.drawLine(posH, spaceBorder, posH, lineEndH);
- }
-
- // creating rows
- int posV = spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(spaceBorder, spaceBorder, lineEndV, spaceBorder);
-
- for (int idx = 1; idx <= nbRows; idx++) {
- posV = (idx * spaceVert) + spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(spaceBorder, posV, lineEndV, posV);
- }
-// g.setColor(Color.CYAN);
-// g.fillRect(0, 0, this.carreWidth, this.carreHeight);
- colorField(g);
- colorSelected(g);
-
- }
-
- private void colorField(Graphics g) {
-
- for (int col = 0; col < this.nbColumns; col++)
- for (int row = 0; row < this.nbRows; row++) {
-
- if (isSelected(row, col) && isMine(row, col)) {
-// g.fillRect(getCellX(col), getCellY(row), spaceHor, spaceVert);
- int sizeBomb = 25;
- g.setColor(Color.BLACK);
- g.fillOval(getCellX(col) + (spaceHor / 2) - (sizeBomb/2), getCellX(row) + (spaceVert / 2) - (sizeBomb/2), sizeBomb, sizeBomb);
- } else if (isSelected(row, col)) {
- g.setColor(Color.DARK_GRAY);
- g.fillRect(getCellX(col), getCellY(row), spaceHor, spaceVert);
- }
- }
-//
- }
-
- private void colorSelected(Graphics g) {
- // select and color
- this.selCol = this.minesweeper.selectedColumn;
- this.selLine = this.minesweeper.selectedLine;
- boolean eins = this.selCol < this.minesweeper.nbColumns;
- boolean zwei = this.selLine < this.minesweeper.nbLines;
-
- if (selCol == -1 && selLine == -1)
- System.out.println("aucune cellule n'est selectionnée !");
- else if (selCol == -1)
- System.out.println("aucune column n'est selectionnée !");
- else if (selLine == -1)
- System.out.println("aucune line n'est selectionnée !");
- else if (eins && zwei) {
-// int startSelCol = spaceBorder + (selCol * spaceHor);
-// int startSelRow = spaceBorder + (selLine * spaceVert);
-
- g.setColor(Color.RED);
- g.fillRect(getCellX(selCol), getCellY(selLine), spaceHor, spaceVert);
- }
- }
-
- public int getColumn(int x) {
- int posCarre = x - this.spaceBorder;
-
- this.selCol = posCarre / spaceHor;
-// if (posCarre % spaceHor > 0)
-// this.selCol++;
- return this.selCol;
- }
-
- public int getLine(int y) {
- int posCarre = y - this.spaceBorder;
-
- this.selLine = posCarre / spaceVert;
-// if (posCarre % spaceVert > 0)
-// this.selLine++;
- return this.selLine;
- }
-
- int getBoardBorder() {
- return this.spaceBorder;
- }
-
- boolean isMine(int line, int column) {
- return this.minesweeper.board.get(line).get(column).isMine;
- }
-
- boolean isEmpty(int line, int column) { // inutil --> la meme que isMine
- return !isMine(line, column);
- }
-
- boolean isBlack(int line, int column) {
-
- return false;
- }
-
- boolean isGray(int line, int column) {
-
- return false;
- }
-
- boolean isSelected(int line, int column) {
- return this.minesweeper.board.get(line).get(column).isRevealed;
- }
-
- int getCellX(int column) {
- return (this.spaceBorder + (column * this.spaceHor));
- }
-
- int getCellY(int line) {
- return (this.spaceBorder + (line * this.spaceVert));
- }
-
- int getCellWidth() {
- return 0;
- }
-
- int getCellHeight() {
- return 0;
- }
-
- void drawCell(Graphics g, int line, int column) {
-
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion2/PanelMouseListener.java b/CCI_Java/CCI_Java/src/tp4/minesweeperVersion2/PanelMouseListener.java
deleted file mode 100644
index e7eb238..0000000
--- a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion2/PanelMouseListener.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package tp4.minesweeperVersion2;
-
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-public class PanelMouseListener extends MouseAdapter {
- MinesweeperPanel panel;
-
- public PanelMouseListener(MinesweeperPanel panel) {
- this.panel = panel;
- }
-
- @Override
- public void mouseClicked(MouseEvent e) {
-
- System.out.println("Click Line = " + panel.minesweeper.selectedLine); // e.getY());//
- System.out.println("Click Column = " + panel.minesweeper.selectedColumn); // e.getX()); //
-
- panel.minesweeper.board.get(panel.getLine(e.getY())).get(panel.getColumn(e.getX())).isRevealed = true;
- panel.repaint();
- }
-
- @Override
- public void mouseMoved(MouseEvent e) {
-
- panel.minesweeper.selectedLine = panel.getLine(e.getY());
- panel.minesweeper.selectedColumn = panel.getColumn(e.getX());
-
- System.out.println("Line = " + panel.minesweeper.selectedLine); // e.getY());//
- System.out.println("Column = " + panel.minesweeper.selectedColumn); // e.getX()); //
-
- panel.repaint();
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/Cell.java b/CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/Cell.java
deleted file mode 100644
index 68fa46e..0000000
--- a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/Cell.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package tp4.minesweeperVersion3oneByeOne;
-
-public class Cell {
- boolean isRevealed;
- boolean isMine;
-
- public Cell() {
-
- }
-
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/MainGui.java b/CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/MainGui.java
deleted file mode 100644
index 81d78a6..0000000
--- a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/MainGui.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package tp4.minesweeperVersion3oneByeOne;
-
-public class MainGui {
- public static void main(String[] args) {
- new MinesweeperFrame();
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/Minesweeper.java b/CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/Minesweeper.java
deleted file mode 100644
index 02b141a..0000000
--- a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/Minesweeper.java
+++ /dev/null
@@ -1,49 +0,0 @@
-package tp4.minesweeperVersion3oneByeOne;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Scanner;
-
-public class Minesweeper {
- int nbColumns;
- int nbLines;
- int score;
- int selectedLine;
- int selectedColumn;
-
- ArrayList<List<Cell>> board;
-
- public Minesweeper() {
- this.nbColumns = 10;
- this.nbLines = 10;
- this.score = 100;
- this.selectedLine = 0;
- this.selectedColumn = 0;
- this.board = new ArrayList<List<Cell>>();
-
- for (int line = 0; line < this.nbLines; line++) {
- this.board.add(new ArrayList<Cell>());
- for (int column = 0; column < this.nbColumns; column++) {
- Cell cell = new Cell();
- cell.isRevealed = false;
- cell.isMine = ((int) (Math.random() * 5)) == 0;
- this.board.get(line).add(cell);
- }
- }
- }
-
- private void checkSelect() {
- Scanner scanner = new Scanner(System.in);
- while (this.selectedColumn == -1 || this.selectedLine == -1) {
-
- if (this.selectedColumn == -1 && this.selectedLine == -1) {
- System.out.println("Selectionnez une cellule svp. (en utilisant d'une entier) !");
- System.out.println("Column : ");
- this.selectedColumn = scanner.nextInt();
- System.out.println("Line : ");
- this.selectedLine = scanner.nextInt();
- }
-
- }
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/MinesweeperFrame.java b/CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/MinesweeperFrame.java
deleted file mode 100644
index 1e5d54c..0000000
--- a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/MinesweeperFrame.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package tp4.minesweeperVersion3oneByeOne;
-
-import javax.swing.JFrame;
-import javax.swing.WindowConstants;
-
-@SuppressWarnings("serial")
-public class MinesweeperFrame extends JFrame {
- Minesweeper minesweeper;
- MinesweeperPanel minesweeperPanel;
-
- public MinesweeperFrame() {
- this.minesweeper = new Minesweeper();
-
- this.minesweeperPanel = new MinesweeperPanel(minesweeper);
- add(minesweeperPanel);
- pack();
- setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
- setVisible(true);
-
- }
-}
\ No newline at end of file
diff --git a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/MinesweeperPanel.java b/CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/MinesweeperPanel.java
deleted file mode 100644
index 5162d15..0000000
--- a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/MinesweeperPanel.java
+++ /dev/null
@@ -1,125 +0,0 @@
-package tp4.minesweeperVersion3oneByeOne;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.event.MouseEvent;
-import java.util.Scanner;
-
-import javax.swing.JPanel;
-
-@SuppressWarnings("serial")
-public class MinesweeperPanel extends JPanel implements MinesweeperPanelable {
- Minesweeper minesweeper;
- int spaceHor;
- int spaceVert;
- int nbColumns;
- int nbRows;
- int selCol;
- int selLine;
- int carreWidth;
- int carreHeight;
- int spaceBorder;
-
- public MinesweeperPanel(Minesweeper minesweeper) {
- this.minesweeper = minesweeper;
- setPreferredSize(new Dimension(500, 500));
- addMouseListener(new PanelMouseListener(this));
- addMouseMotionListener(new PanelMouseListener(this));
- spaceBorder = 20;
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- super.paintComponent(g);
-
- this.nbColumns = this.minesweeper.nbColumns;
- this.nbRows = this.minesweeper.nbLines;
-
- this.carreWidth = (getWidth() - (spaceBorder * 2)) - ((getWidth() - (spaceBorder * 2)) % nbColumns);
- this.carreHeight = (getHeight() - (spaceBorder * 2)) - ((getHeight() - (spaceBorder * 2)) % nbRows);
-
- this.spaceHor = carreWidth / nbColumns;
- this.spaceVert = carreHeight / nbRows;
-
- int lineEndH = carreHeight + spaceBorder;
- int lineEndV = carreWidth + spaceBorder;
-
- for (int idxRow = 0; idxRow < this.minesweeper.board.size(); idxRow++) {
- for (int idxCol = 0; idxCol < this.minesweeper.board.get(idxRow).size(); idxCol++) {
- drawCell(g, idxRow, idxCol);
- }
- }
-
- }
-
- public int getColumn(int x) {
- int posCarre = x - this.spaceBorder;
- this.selCol = posCarre / spaceHor;
- return this.selCol;
- }
-
- public int getLine(int y) {
- int posCarre = y - this.spaceBorder;
- this.selLine = posCarre / spaceVert;
- return this.selLine;
- }
-
- public int getBoardBorder() {
- return this.spaceBorder;
- }
-
- @Override
- public boolean isBlackCell(int line, int column) {
- return this.minesweeper.board.get(line).get(column).isRevealed;
- }
-
- @Override
- public boolean isGrayCell(int line, int column) {
- return !this.minesweeper.board.get(line).get(column).isRevealed;
- }
-
- boolean isMine(int line, int column) {
- return this.minesweeper.board.get(line).get(column).isMine;
- }
-
- public boolean isSelected(int line, int column) {
- return (line == this.selLine && column == this.selCol);
- }
-
- public int getCellX(int column) {
- return (this.spaceBorder + (column * this.spaceHor));
- }
-
- public int getCellY(int line) {
- return (this.spaceBorder + (line * this.spaceVert));
- }
-
- public int getCellWidth() {
- return this.spaceHor;
- }
-
- public int getCellHeight() {
- return this.spaceVert;
- }
-
- public void drawCell(Graphics g, int line, int column) {
-
- g.setColor(Color.BLACK);
- g.drawRect(getCellX(column), getCellY(line), getCellWidth(), getCellHeight());
-
- if(isSelected(line, column)) {
- g.setColor(Color.RED);
- g.fillRect(getCellX(column), getCellY(line), getCellWidth(), getCellHeight());
- } else if (isBlackCell(line, column) && isMine(line, column)) {
- int sizeBomb = 25;
- g.setColor(Color.BLACK);
- g.fillOval(getCellX(column) + (getCellWidth() / 2) - (sizeBomb / 2),
- getCellX(line) + (getCellHeight() / 2) - (sizeBomb / 2), sizeBomb, sizeBomb);
- } else if (isBlackCell(line, column)) {
- g.setColor(Color.DARK_GRAY);
- g.fillRect(getCellX(column), getCellY(line), getCellWidth(), getCellHeight());
- }
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/MinesweeperPanelable.java b/CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/MinesweeperPanelable.java
deleted file mode 100644
index 1888a8e..0000000
--- a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/MinesweeperPanelable.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package tp4.minesweeperVersion3oneByeOne;
-
-import java.awt.Graphics;
-
-public interface MinesweeperPanelable {
-
- public int getBoardBorder();
- public boolean isBlackCell(int line, int column);
- public boolean isGrayCell(int line, int column);
- public boolean isSelected(int line, int column);
- public int getCellX(int column);
- public int getCellY(int line);
- public int getCellWidth();
- public int getCellHeight();
- public void drawCell(Graphics g, int line, int column);
- public int getColumn(int x);
- public int getLine(int y);
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/PanelMouseListener.java b/CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/PanelMouseListener.java
deleted file mode 100644
index 9057b4f..0000000
--- a/CCI_Java/CCI_Java/src/tp4/minesweeperVersion3oneByeOne/PanelMouseListener.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package tp4.minesweeperVersion3oneByeOne;
-
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-public class PanelMouseListener extends MouseAdapter {
- MinesweeperPanel panel;
-
- public PanelMouseListener(MinesweeperPanel panel) {
- this.panel = panel;
- }
-
- @Override
- public void mouseClicked(MouseEvent e) {
-
- System.out.println("Click Line = " + panel.minesweeper.selectedLine);
- System.out.println("Click Column = " + panel.minesweeper.selectedColumn);
-
- panel.minesweeper.board.get(panel.getLine(e.getY())).get(panel.getColumn(e.getX())).isRevealed = true;
- panel.repaint();
- }
-
- @Override
- public void mouseMoved(MouseEvent e) {
-
- panel.minesweeper.selectedLine = panel.getLine(e.getY());
- panel.minesweeper.selectedColumn = panel.getColumn(e.getX());
-
- System.out.println("Line = " + panel.minesweeper.selectedLine);
- System.out.println("Column = " + panel.minesweeper.selectedColumn);
-
- panel.repaint();
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/minesweeperVersionFreestyle/Cell.java b/CCI_Java/CCI_Java/src/tp4/minesweeperVersionFreestyle/Cell.java
deleted file mode 100644
index 2fa481a..0000000
--- a/CCI_Java/CCI_Java/src/tp4/minesweeperVersionFreestyle/Cell.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package tp4.minesweeperVersionFreestyle;
-
-public class Cell {
- boolean isRevealed;
- boolean isMine;
-
- public Cell() {
-
- }
-
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/minesweeperVersionFreestyle/MainGui.java b/CCI_Java/CCI_Java/src/tp4/minesweeperVersionFreestyle/MainGui.java
deleted file mode 100644
index ad44b17..0000000
--- a/CCI_Java/CCI_Java/src/tp4/minesweeperVersionFreestyle/MainGui.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package tp4.minesweeperVersionFreestyle;
-
-public class MainGui {
- public static void main(String[] args) {
- new MinesweeperFrame();
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/minesweeperVersionFreestyle/Minesweeper.java b/CCI_Java/CCI_Java/src/tp4/minesweeperVersionFreestyle/Minesweeper.java
deleted file mode 100644
index cb30470..0000000
--- a/CCI_Java/CCI_Java/src/tp4/minesweeperVersionFreestyle/Minesweeper.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package tp4.minesweeperVersionFreestyle;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Scanner;
-
-public class Minesweeper {
- int nbColumns;
- int nbLines;
- int score;
- int selectedLine;
- int selectedColumn;
-// int selLineOpened;
-// int selColumnOpend;
- int[][] field;
- int[][] opend;
- ArrayList<List<Cell>> board;
-
- public Minesweeper() {
- this.nbColumns = 20;
- this.nbLines = 15;
- this.score = 100;
- this.selectedLine = 3;
- this.selectedColumn = 5;
- this.board = new ArrayList<List<Cell>>();
-
- for (int line = 0; line < this.nbLines; line++) {
- this.board.add(new ArrayList<Cell>());
- for (int column = 0; column < this.nbColumns; column++) {
- Cell cell = new Cell();
- cell.isRevealed = false;
- cell.isMine = ((int) (Math.random() * 5)) == 0;
- this.board.get(line).add(cell);
- }
- }
- }
-
- private void checkSelect() {
- Scanner scanner = new Scanner(System.in);
- while (this.selectedColumn == -1 || this.selectedLine == -1) {
-
- if (this.selectedColumn == -1 && this.selectedLine == -1) {
- System.out.println("Selectionnez une cellule svp. (en utilisant d'une entier) !");
- System.out.println("Column : ");
- this.selectedColumn = scanner.nextInt();
- System.out.println("Line : ");
- this.selectedLine = scanner.nextInt();
- }
-
- }
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/minesweeperVersionFreestyle/MinesweeperFrame.java b/CCI_Java/CCI_Java/src/tp4/minesweeperVersionFreestyle/MinesweeperFrame.java
deleted file mode 100644
index fe3f3c4..0000000
--- a/CCI_Java/CCI_Java/src/tp4/minesweeperVersionFreestyle/MinesweeperFrame.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package tp4.minesweeperVersionFreestyle;
-
-import javax.swing.JFrame;
-import javax.swing.WindowConstants;
-
-@SuppressWarnings("serial")
-public class MinesweeperFrame extends JFrame {
- Minesweeper minesweeper;
- MinesweeperPanel minesweeperPanel;
-
- public MinesweeperFrame() {
- this.minesweeper = new Minesweeper();
-
- this.minesweeper.nbColumns = 5;
- this.minesweeper.nbLines = 5;
- this.minesweeper.score = 30;
- this.minesweeper.selectedLine = 1;
- this.minesweeper.selectedColumn = 1;
- this.minesweeper.field = new int [this.minesweeper.nbColumns][this.minesweeper.nbLines];
- this.minesweeper.opend = new int [this.minesweeper.nbColumns][this.minesweeper.nbLines];
-
- for(int col = 0;col < this.minesweeper.nbColumns; col++) {
- for(int row = 0;row< this.minesweeper.nbLines; row++) {
- double nb = Math.random()*2;
- this.minesweeper.field[col][row] = (int)nb;
- System.out.println((int)nb);
- }
- }
-
- this.minesweeperPanel = new MinesweeperPanel(minesweeper);
- add(minesweeperPanel);
- pack();
- setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
- setVisible(true);
-
- }
-}
\ No newline at end of file
diff --git a/CCI_Java/CCI_Java/src/tp4/minesweeperVersionFreestyle/MinesweeperPanel.java b/CCI_Java/CCI_Java/src/tp4/minesweeperVersionFreestyle/MinesweeperPanel.java
deleted file mode 100644
index c884e8b..0000000
--- a/CCI_Java/CCI_Java/src/tp4/minesweeperVersionFreestyle/MinesweeperPanel.java
+++ /dev/null
@@ -1,182 +0,0 @@
-package tp4.minesweeperVersionFreestyle;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.event.MouseEvent;
-import java.util.Scanner;
-
-import javax.swing.JPanel;
-
-@SuppressWarnings("serial")
-public class MinesweeperPanel extends JPanel {
- Minesweeper minesweeper;
- int spaceHor;
- int spaceVert;
- int nbColumns;
- int nbRows;
- int selCol;
- int selLine;
- int carreWidth;
- int carreHeight;
- int spaceBorder;
-
- public MinesweeperPanel(Minesweeper minesweeper) {
- this.minesweeper = minesweeper;
- setPreferredSize(new Dimension(500, 500));
- addMouseListener(new PanelMouseListener(this));
- addMouseMotionListener(new PanelMouseListener(this));
- spaceBorder = 20;
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- super.paintComponent(g);
-
- // grand rect
-
- this.nbColumns = this.minesweeper.nbColumns;
- this.nbRows = this.minesweeper.nbLines;
-
- this.carreWidth = (getWidth() - (spaceBorder * 2)) - ((getWidth() - (spaceBorder * 2)) % nbColumns);
- this.carreHeight = (getHeight() - (spaceBorder * 2)) - ((getHeight() - (spaceBorder * 2)) % nbRows);
-
- this.spaceHor = carreWidth / nbColumns;
- this.spaceVert = carreHeight / nbRows;
-
- int lineEndH = carreHeight + spaceBorder;
- int lineEndV = carreWidth + spaceBorder;
-
- colorField(g);
-
- // creating collumns
- int posH = spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(spaceBorder, spaceBorder, spaceBorder, lineEndH);
-
- for (int idx = 1; idx <= nbColumns; idx++) {
- posH = (idx * spaceHor) + spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(posH, spaceBorder, posH, lineEndH);
- }
-
- // creating rows
- int posV = spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(spaceBorder, spaceBorder, lineEndV, spaceBorder);
-
- for (int idx = 1; idx <= nbRows; idx++) {
- posV = (idx * spaceVert) + spaceBorder;
- g.setColor(Color.BLACK);
- g.drawLine(spaceBorder, posV, lineEndV, posV);
- }
-// g.setColor(Color.CYAN);
-// g.fillRect(0, 0, this.carreWidth, this.carreHeight);
- colorField(g);
- colorSelected(g);
-
- }
-
- private void colorField(Graphics g) {
-// g.setColor(Color.CYAN);
-// g.fillRect(0, 0, this.carreWidth, this.carreHeight);
- for (int col = 0; col < this.nbColumns; col++)
- for (int row = 0; row < this.nbRows; row++) {
-//
-// g.setColor(Color.BLUE);
-// g.fillRect(getCellX(col+1), getCellY(row+1), spaceHor, spaceVert);
- if (isSelected(row, col) && isMine(row, col)) {
- System.out.println("GAME OVER!!!");
- g.setColor(Color.CYAN);
- g.fillRect(0, 0, this.carreWidth, this.carreHeight);
- } else if (isSelected(row, col)) {
- g.setColor(Color.BLACK);
- g.fillRect(getCellX(col), getCellY(row), spaceHor, spaceVert);
- } else {
- g.setColor(Color.GRAY);
- g.fillRect(getCellX(col), getCellY(row), spaceHor, spaceVert);
- }
- }
-//
- }
-
- private void colorSelected(Graphics g) {
- // select and color
- this.selCol = this.minesweeper.selectedColumn;
- this.selLine = this.minesweeper.selectedLine;
-
- if (selCol == -1 && selLine == -1)
- System.out.println("aucune cellule n'est selectionnée !");
- else if (selCol == -1)
- System.out.println("aucune column n'est selectionnée !");
- else if (selLine == -1)
- System.out.println("aucune line n'est selectionnée !");
- else {
-// int startSelCol = spaceBorder + (selCol * spaceHor);
-// int startSelRow = spaceBorder + (selLine * spaceVert);
-
- g.setColor(Color.RED);
- g.fillRect(getCellX(selCol), getCellY(selLine), spaceHor, spaceVert);
- }
- }
-
- public int getColumn(int x) {
- int posCarre = x - this.spaceBorder;
-
- this.selCol = posCarre / spaceHor;
-// if (posCarre % spaceHor > 0)
-// this.selCol++;
- return this.selCol;
- }
-
- public int getLine(int y) {
- int posCarre = y - this.spaceBorder;
-
- this.selLine = posCarre / spaceVert;
-// if (posCarre % spaceVert > 0)
-// this.selLine++;
- return this.selLine;
- }
-
- int getBoardBorder() {
- return 0;
- }
-
- boolean isMine(int line, int column) {
- if (this.minesweeper.field[column][line] == 1)
- return true;
- return false;
- }
-
- boolean isEmpty(int line, int column) {
- if (isMine(line, column))
- return false;
- return true;
- }
-
- boolean isSelected(int line, int column) {
- if (this.minesweeper.opend[column][line] == 1)
- return true;
- return false;
- }
-
- int getCellX(int column) {
- return (this.spaceBorder + (column * this.spaceHor));
- }
-
- int getCellY(int line) {
- return (this.spaceBorder + (line * this.spaceVert));
- }
-
- int getCellWidth() {
- return 0;
- }
-
- int getCellHeight() {
- return 0;
- }
-
- void drawCell(Graphics g, int line, int column) {
-
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp4/minesweeperVersionFreestyle/PanelMouseListener.java b/CCI_Java/CCI_Java/src/tp4/minesweeperVersionFreestyle/PanelMouseListener.java
deleted file mode 100644
index 63cf51a..0000000
--- a/CCI_Java/CCI_Java/src/tp4/minesweeperVersionFreestyle/PanelMouseListener.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package tp4.minesweeperVersionFreestyle;
-
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-public class PanelMouseListener extends MouseAdapter {
- MinesweeperPanel panel;
-
- public PanelMouseListener(MinesweeperPanel panel) {
- this.panel = panel;
- }
-
- @Override
- public void mouseClicked(MouseEvent e) {
-// System.out.println("Clicked " + e.getX() + " " + e.getY());
- System.out.println("Click Line = " + panel.minesweeper.selectedLine); // e.getY());//
- System.out.println("Click Column = " + panel.minesweeper.selectedColumn); // e.getX()); //
- panel.minesweeper.opend[panel.getColumn(e.getX())][panel.getLine(e.getY())] = 1;
- }
-
- @Override
- public void mouseMoved(MouseEvent e) {
- //System.out.println("Moved " + e.getX() + " " + e.getY());
-
- panel.minesweeper.selectedLine = panel.getLine(e.getY());
- panel.minesweeper.selectedColumn = panel.getColumn(e.getX());
-
- System.out.println("Line = " + panel.minesweeper.selectedLine); // e.getY());//
- System.out.println("Column = " + panel.minesweeper.selectedColumn); // e.getX()); //
-
- panel.repaint();
- }
-}
diff --git a/CCI_Java/CCI_Java/minesweeper/tp4/v1/Cell.java b/CCI_Java/CCI_Java/src/tp4/v1/Cell.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp4/v1/Cell.java
rename to CCI_Java/CCI_Java/src/tp4/v1/Cell.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp4/v1/MainGui.java b/CCI_Java/CCI_Java/src/tp4/v1/MainGui.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp4/v1/MainGui.java
rename to CCI_Java/CCI_Java/src/tp4/v1/MainGui.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp4/v1/Minesweeper.java b/CCI_Java/CCI_Java/src/tp4/v1/Minesweeper.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp4/v1/Minesweeper.java
rename to CCI_Java/CCI_Java/src/tp4/v1/Minesweeper.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp4/v1/MinesweeperFrame.java b/CCI_Java/CCI_Java/src/tp4/v1/MinesweeperFrame.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp4/v1/MinesweeperFrame.java
rename to CCI_Java/CCI_Java/src/tp4/v1/MinesweeperFrame.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp4/v1/MinesweeperPanel.java b/CCI_Java/CCI_Java/src/tp4/v1/MinesweeperPanel.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp4/v1/MinesweeperPanel.java
rename to CCI_Java/CCI_Java/src/tp4/v1/MinesweeperPanel.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp4/v1/MinesweeperPanelable.java b/CCI_Java/CCI_Java/src/tp4/v1/MinesweeperPanelable.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp4/v1/MinesweeperPanelable.java
rename to CCI_Java/CCI_Java/src/tp4/v1/MinesweeperPanelable.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp4/v1/PanelMouseListener.java b/CCI_Java/CCI_Java/src/tp4/v1/PanelMouseListener.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp4/v1/PanelMouseListener.java
rename to CCI_Java/CCI_Java/src/tp4/v1/PanelMouseListener.java
diff --git a/CCI_Java/CCI_Java/src/tp5/ex01/Date.java b/CCI_Java/CCI_Java/src/tp5/ex01/Date.java
deleted file mode 100644
index c3f3683..0000000
--- a/CCI_Java/CCI_Java/src/tp5/ex01/Date.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package tp5.ex01;
-
-import java.util.Scanner;
-
-public class Date {
- int day;
- int month;
- int year;
-
- public Date() {
- this.day = 0;
- this.month = 0;
- this.year = 0;
- }
-
- public Date(int day, int month, int year) {
- this.day = day;
- this.month = month;
- this.year = year;
- }
-
- void print() {
- System.out.println(day + "/" + month + "/" + year);
- }
-
- @Override
- public String toString() {
- // TODO Auto-generated method stub
- return day + "/" + month + "/" + year;
- }
-
- public void scanWith(Scanner scanner) {
-// System.out.println("Taper la date (jour mois année) :");
- day = scanner.nextInt();
- month = scanner.nextInt();
- year = scanner.nextInt();
- }
-
- boolean isLeapYear() {
- boolean isLeap = (this.year % 4 == 0 && this.year % 100 != 0) || this.year % 400 == 0;
- if (isLeap)
- return true;
- else
- return false;
- }
-
- boolean isBefore(Date d) {
- if (d.year > this.year)
- return true;
- else if (d.year == this.year)
- if (d.month > this.month)
- return true;
- else if (d.month == this.month)
- if (d.day > this.day)
- return true;
- else
- return false;
- else
- return false;
- else
- return false;
- }
-
- int nbDaysInMonth() {
- int nbDays = 31;
-
- if(this.month == 2)
- if(isLeapYear())
- nbDays = 29;
- else
- nbDays = 28;
- else if (this.month < 7 && this.month % 2 == 0)
- nbDays = 30;
- else if (this.month == 9 || this.month == 11)
- nbDays = 30;
-
- return nbDays;
- }
-
- Date nextDay() {
- int newDay = this.day;
- int newMonth = this.month;
- int newYear = this.year;
-
- if(this.day < nbDaysInMonth())
- newDay ++;
- else if (this.month != 12) {
- newMonth ++;
- newDay = 1;
- }else {
- newDay = 1;
- newMonth = 1;
- newYear++;
- }
- return new Date(newDay, newMonth, newYear);
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/ex01/Employee.java b/CCI_Java/CCI_Java/src/tp5/ex01/Employee.java
deleted file mode 100644
index 9cbe69e..0000000
--- a/CCI_Java/CCI_Java/src/tp5/ex01/Employee.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package tp5.ex01;
-
-import java.util.ArrayList;
-import java.util.Scanner;
-
-public class Employee {
-
- int id;
- ArrayList<Holiday> holidays;
-
- public Employee(int id) {
- this.id = id;
- this.holidays = new ArrayList<Holiday>();
-
- }
-
- public void addHoliday(Holiday holiday) {
- holidays.add(holiday);
- System.out.println("Période ajoutée");
- }
-
- public void addHoliday(Scanner scanner) {
- System.out.println("à partir de : ");
-// System.out.println("le jour : ");
- int dayStart = scanner.nextInt();
-// System.out.println("le mois : ");
- int monthStart = scanner.nextInt();
-// System.out.println("l'année : ");
- int yearStart = scanner.nextInt();
-
- Date tempDate1 = new Date(dayStart, monthStart, yearStart);
-
- System.out.println("jusque à : ");
-// System.out.println("le jour : ");
- int dayEnd = scanner.nextInt();
-// System.out.println("le mois : ");
- int monthEnd = scanner.nextInt();
-// System.out.println("l'année : ");
- int yearEnd = scanner.nextInt();
-
- Date tempDate2 = new Date(dayEnd, monthEnd, yearEnd);
-
- holidays.add(new Holiday(tempDate1, tempDate2));
-
- }
-
- void scanAndAddHolidayWith(Scanner scanner){
- Holiday holi = new Holiday();
- holi.scanWith(scanner);
- addHoliday(holi);
- }
-
-// public void displayHolidays() {
-//
-// for (int idx = 0; idx < holidays.size(); idx++) {
-// System.out.println("Holidays " + idx + " :");
-// System.out.print("start : ");
-// holidays.get(idx).start.print();
-// System.out.print("fin : ");
-// holidays.get(idx).end.print();
-// }
-// }
-
- public void checkIfOnHoliday(Scanner scanner) {
- System.out.println("Taper une date pour v é rifier si l ' employ é est en vacances ( jour mois ann é e ) : ");
- int day = scanner.nextInt();
- int month = scanner.nextInt();
- int year = scanner.nextInt();
-
- Date tempDate = new Date(day, month, year);
- boolean holidayFlag = false;
- for (int idx = 0; idx < holidays.size(); idx++) {
- if (tempDate.isBefore(holidays.get(idx).end) && holidays.get(idx).start.isBefore(tempDate)) {
- holidayFlag = true;
- }
- }
- if(holidayFlag)
- System.out.println("L'employ é est en vacances à cette date .");
- else
- System.out.println("L'employé n'est pas en vacances à cette date.");
- }
-
- void print() {
- System.out.println("ID : " + id);
- System.out.println("Holidays :");
- for (int idx = 0; idx < holidays.size(); idx++) {
- int nb = idx +1;
- System.out.println("Holiday " + nb + " :");
- System.out.print("start : ");
- holidays.get(idx).start.print();
- System.out.print("fin : ");
- holidays.get(idx).end.print();
- }
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/ex01/Holiday.java b/CCI_Java/CCI_Java/src/tp5/ex01/Holiday.java
deleted file mode 100644
index a4a5974..0000000
--- a/CCI_Java/CCI_Java/src/tp5/ex01/Holiday.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package tp5.ex01;
-
-import java.util.Scanner;
-
-public class Holiday {
- Date start;
- Date end;
-
- public Holiday(Date start, Date end) {
- this.start = start;
- this.end = end;
- }
-
- public Holiday() {
- this.start = null;
- this.end = null;
- }
-
- public void print() {
- System.out.println("Du " + start.toString() + " au " + end.toString());
- }
-
- public void scanWith(Scanner scanner) {
- System.out.println("Saisie d ' une période");
- System.out.println("Taper la date de début (jour mois année) :");
- start = new Date();
- start.scanWith(scanner);
- System.out.println("Taper la date de fin (jour mois année) :");
- end = new Date();
- end.scanWith(scanner);
-
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/ex01/HolidayManager.java b/CCI_Java/CCI_Java/src/tp5/ex01/HolidayManager.java
deleted file mode 100644
index 3416c21..0000000
--- a/CCI_Java/CCI_Java/src/tp5/ex01/HolidayManager.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package tp5.ex01;
-
-import java.util.Scanner;
-
-public class HolidayManager {
-
- public static void main(String[] args) {
- Scanner scanner = new Scanner(System.in);
- Employee employee = new Employee(45252);
- int answer;
- do {
- System.out.println(" ------------- --------------- -------------- ------------ ");
- System.out.println(" Que voulez - vous faire ? ");
- System.out.println(" 1 - Afficher les p é riodes de vacances de l ' employ é . ");
- System.out.println(" 2 - Ajouter une p é riode de vacances . ");
- System.out.println(" 3 - Savoir si l ' employ é est en vacances un jour donn é . ");
- System.out.println(" 4 - Quitter l ' application . ");
- System.out.print(" Votre choix : ");
- answer = scanner.nextInt();
- System.out.println(" ------------- --------------- -------------- ------------ ");
- if (answer == 1)
- employee.print();
- else if (answer == 2)
- employee.scanAndAddHolidayWith(scanner);
- else if (answer == 3)
- employee.checkIfOnHoliday(scanner);
- else if (answer != 4)
- System.out.println("Commande non disponible ! ");
- } while (answer != 4);
- System.out.println("Merci d ' avoir utilis é l ' application . Au revoir ! ");
- scanner.close();
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/ex01/TestCheckIfOnHoliday.java b/CCI_Java/CCI_Java/src/tp5/ex01/TestCheckIfOnHoliday.java
deleted file mode 100644
index 0e181ca..0000000
--- a/CCI_Java/CCI_Java/src/tp5/ex01/TestCheckIfOnHoliday.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package tp5.ex01;
-
-import java.util.Scanner;
-
-public class TestCheckIfOnHoliday {
-
- public static void main(String[] args) {
-
- Scanner scanner = new Scanner(System.in);
- Employee employee = new Employee(320);
- employee.scanAndAddHolidayWith(scanner);
-// employee.scanAndAddHolidayWith(scanner);
- employee.print();
- employee.checkIfOnHoliday(scanner);
-
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/ex01/TestDateV1.java b/CCI_Java/CCI_Java/src/tp5/ex01/TestDateV1.java
deleted file mode 100644
index 0f0fa6e..0000000
--- a/CCI_Java/CCI_Java/src/tp5/ex01/TestDateV1.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package tp5.ex01;
-
-import java.util.Scanner;
-
-public class TestDateV1 {
-
- public static void main(String[] args) {
- Scanner scanner = new Scanner(System.in);
- System.out.println("Taper la date (jour mois année) :");
- Date dateTest = new Date(scanner.nextInt(),scanner.nextInt(),scanner.nextInt());
- Date date1 = new Date(20, 9, 1997);
- Date date2 = new Date();
- System . out . println ( "Date saisie :" ) ;
- dateTest.print();
- date1.print();
- date2.print();
- scanner.close();
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/ex01/TestDateV2.java b/CCI_Java/CCI_Java/src/tp5/ex01/TestDateV2.java
deleted file mode 100644
index 4e52ca6..0000000
--- a/CCI_Java/CCI_Java/src/tp5/ex01/TestDateV2.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package tp5.ex01;
-
-import java.util.Scanner;
-
-public class TestDateV2 {
-
- public static void main(String[] args) {
- Scanner scanner = new Scanner(System.in);
- Date date = new Date();
- System.out.println("Taper la date (jour mois année) : ");
- date.scanWith(scanner);
- System.out.println("Date saisie : ");
- date.print();
- scanner.close();
-
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/ex01/TestEmployeeV1.java b/CCI_Java/CCI_Java/src/tp5/ex01/TestEmployeeV1.java
deleted file mode 100644
index fae0aa6..0000000
--- a/CCI_Java/CCI_Java/src/tp5/ex01/TestEmployeeV1.java
+++ /dev/null
@@ -1,15 +0,0 @@
-package tp5.ex01;
-
-import java.util.Scanner;
-
-public class TestEmployeeV1 {
-
- public static void main(String[] args) {
- Scanner scanner = new Scanner(System.in);
- Holiday holi = new Holiday();
- holi.scanWith(scanner);
- Employee petra = new Employee(111);
- petra.addHoliday(holi);
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/ex01/TestEmployeeV2.java b/CCI_Java/CCI_Java/src/tp5/ex01/TestEmployeeV2.java
deleted file mode 100644
index c51b9a7..0000000
--- a/CCI_Java/CCI_Java/src/tp5/ex01/TestEmployeeV2.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package tp5.ex01;
-
-import java.util.Scanner;
-
-public class TestEmployeeV2 {
-
- public static void main(String[] args) {
- Scanner scanner = new Scanner(System.in);
- Employee employee = new Employee(320);
- employee.scanAndAddHolidayWith(scanner);
- employee.scanAndAddHolidayWith(scanner);
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/ex01/TestHolidayV1.java b/CCI_Java/CCI_Java/src/tp5/ex01/TestHolidayV1.java
deleted file mode 100644
index 7a37e4c..0000000
--- a/CCI_Java/CCI_Java/src/tp5/ex01/TestHolidayV1.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package tp5.ex01;
-
-import java.util.Scanner;
-
-public class TestHolidayV1 {
-
- public static void main(String[] args) {
- Scanner scanner = new Scanner(System.in);
- System.out.println("Saisie d ' une période");
- System.out.println("Taper la date de début (jour mois année) :");
- Date start = new Date();
- start.scanWith(scanner);
- System.out.println("Taper la date de fin (jour mois année) :");
- Date end = new Date();
- end.scanWith(scanner);
- Holiday holiday = new Holiday(start, end);
- System.out.println("Période saisie :");
- holiday.print();
-
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/ex01/TestHolidayV2.java b/CCI_Java/CCI_Java/src/tp5/ex01/TestHolidayV2.java
deleted file mode 100644
index a729fdc..0000000
--- a/CCI_Java/CCI_Java/src/tp5/ex01/TestHolidayV2.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package tp5.ex01;
-
-import java.util.Scanner;
-
-public class TestHolidayV2 {
-
- public static void main(String[] args) {
- Scanner scanner = new Scanner(System.in);
- Holiday holiday = new Holiday();
- holiday.scanWith(scanner);
- System.out.println("Période saisie : ");
- holiday.print();
- scanner.close();
-
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/ex01/TestPrintEmployee.java b/CCI_Java/CCI_Java/src/tp5/ex01/TestPrintEmployee.java
deleted file mode 100644
index 95f451d..0000000
--- a/CCI_Java/CCI_Java/src/tp5/ex01/TestPrintEmployee.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package tp5.ex01;
-
-import java.util.Scanner;
-
-public class TestPrintEmployee {
-
- public static void main(String[] args) {
-
- Scanner scanner = new Scanner(System.in);
- Employee employee = new Employee(320);
- employee.scanAndAddHolidayWith(scanner);
- employee.scanAndAddHolidayWith(scanner);
- employee.print();
-
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/ex02/CasinoGame.java b/CCI_Java/CCI_Java/src/tp5/ex02/CasinoGame.java
deleted file mode 100644
index c747d23..0000000
--- a/CCI_Java/CCI_Java/src/tp5/ex02/CasinoGame.java
+++ /dev/null
@@ -1,61 +0,0 @@
-package tp5.ex02;
-
-import java.util.Scanner;
-
-public class CasinoGame {
-
- public static void main(String[] args) {
- // TODO Auto-generated method stub
-
- Scanner scanner = new Scanner(System.in);
-
- int money = 100;
-
- int exitFlag = 1;
- System.out.println("Vous avez 100 euros . Bonne chance !");
-
- while (exitFlag == 1 && money > 0) {
-
- int bet = 0;
- while (bet <= 0 || bet > money) {
- System.out.println("Combien voulez - vous miser ? ");
- bet = scanner.nextInt();
- if (bet <= 0 || bet > money)
- System.out.println("Choisissez une valeur entre 1 et " + money + " s.v.p. !");
- }
- int userNumber = 0;
-
- while (userNumber <= 0 || userNumber > 6) {
- System.out.println("Sur quel numéro (il faut etre entre 1 et 6) ? ");
- userNumber = scanner.nextInt();
- if (userNumber <= 0 || userNumber > 6)
- System.out.println("Choisissez une valeur entre 1 et 6 s.v.p. !");
- }
-
- double number = 1 + Math.random() * 5 + 0.5;
- System.out.println("Le bon numéro était le " + (int) number);
-
- if ((int)number == userNumber)
- money += bet;
- else
- money -= bet;
- System.out.println("Vous avez à présent " + money + " euros.");
- if (money > 0) {
- System.out.println("Voulez - vous recommencer ? ( oui :1 / non :0) :");
- exitFlag = scanner.nextInt();
- }
-
- }
-
- if(money == 100)
- System.out.println("Vous n'avez pas perdu d'argent");
- else if(money == 0)
- System.out.println("Vous êtes ruiné !");
- else if(money >100)
- System.out.println("Vous avez gagné de l'argent !");
- else
- System.out.println("Vous avez perdu de l'argent !");
-
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/ex02/test.java b/CCI_Java/CCI_Java/src/tp5/ex02/test.java
deleted file mode 100644
index 4d6f570..0000000
--- a/CCI_Java/CCI_Java/src/tp5/ex02/test.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package tp5.ex02;
-
-public class test {
-
- public static void main(String[] args) {
- // TODO Auto-generated method stub
-
- for(int i = 0; i<100;i++) {
- double nb = 1+ Math.random()*5 + 0.5;
- System.out.println((int)nb);
- }
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/Cell.java b/CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/Cell.java
deleted file mode 100644
index 436fef0..0000000
--- a/CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/Cell.java
+++ /dev/null
@@ -1,76 +0,0 @@
-package tp5.minesweeper.freestyle;
-
-import java.awt.Color;
-
-public class Cell {
- boolean isRevealed;
- boolean isMine;
- boolean isSelected;
- Color color;
- int row;
- int column;
- boolean active;
-
- public Cell(boolean isMine, int row, int column) {
- this.isRevealed = false;
- this.isSelected = false;
- this.color = Color.GRAY;
- this.isMine = isMine;
- this.row = row;
- this.column = column;
- this.active = true;
- }
-
- private void refreshColor() {
-
- if (this.isSelected)
- this.color = Color.RED;
- else if (!this.isRevealed)
- this.color = Color.DARK_GRAY;
- else
- this.color = Color.lightGray;
- }
-
- public void setSelected(boolean isSelected) {
- this.isSelected = isSelected;
- }
-
- public void setRevealed(boolean status) {
- this.isRevealed = status;
- this.active = false;
-
- if (status && !this.isMine)
- this.color = Color.DARK_GRAY;
- }
-
- public void setMine(boolean isMine) {
- this.isMine = isMine;
- }
-
- public boolean getIsSelected() {
- return isSelected;
- }
-
- public Color getColor() {
- if (active)
- refreshColor();
- return color;
- }
-
- public void setColor(Color color) {
- this.color = color;
- }
-
- public boolean isRevealed() {
- return isRevealed;
- }
-
- public boolean getIsMine() {
- return isMine;
- }
-
- public void setActive(boolean active) {
- this.active = active;
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/MainGui.java b/CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/MainGui.java
deleted file mode 100644
index 584474d..0000000
--- a/CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/MainGui.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package tp5.minesweeper.freestyle;
-
-public class MainGui {
- public static void main(String[] args) {
- new MinesweeperFrame();
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/Minesweeper.java b/CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/Minesweeper.java
deleted file mode 100644
index 93d34d1..0000000
--- a/CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/Minesweeper.java
+++ /dev/null
@@ -1,57 +0,0 @@
-package tp5.minesweeper.freestyle;
-
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Scanner;
-
-public class Minesweeper {
- int nbColumns;
- int nbLines;
- int score;
- int selectedLine;
- int selectedColumn;
-
- double difficulte = 0.25;
- Color colorSweeper = Color.RED;
-
- ArrayList<List<Cell>> board;
-
- public Minesweeper() {
- this.nbColumns = 10;
- this.nbLines = 10;
- this.score = this.nbColumns * this.nbLines;
- this.selectedLine = 0;
- this.selectedColumn = 0;
- this.board = new ArrayList<List<Cell>>();
-
-
- for (int row = 0; row < this.nbLines; row++) {
- this.board.add(new ArrayList<Cell>());
- for (int column = 0; column < this.nbColumns; column++) {
- boolean isMine = ((int) (Math.random() + difficulte)) == 1;
- Cell cell = new Cell(isMine, row, column);
- if (isMine)
- score--;
- this.board.get(row).add(cell);
- }
- }
- }
-
- public double getDifficulte() {
- return difficulte;
- }
-
- public void setDifficulte(double difficulte) {
- this.difficulte = difficulte;
- }
-
- public Color getColorSweeper() {
- return colorSweeper;
- }
-
- public void setColorSweeper(Color color) {
- this.colorSweeper = color;
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/MinesweeperFrame.java b/CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/MinesweeperFrame.java
deleted file mode 100644
index d6163a1..0000000
--- a/CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/MinesweeperFrame.java
+++ /dev/null
@@ -1,71 +0,0 @@
-package tp5.minesweeper.freestyle;
-
-import javax.swing.JFrame;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.WindowConstants;
-
-@SuppressWarnings("serial")
-public class MinesweeperFrame extends JFrame {
- Minesweeper minesweeper;
- MinesweeperPanel minesweeperPanel;
- static JMenuBar mb;
-
- static JMenu menu, size, difficulte, color;
-
-// static JMenuItem size, difficulte, color;
- static JMenuItem size1, size2, size3, diff1, diff2, diff3, color1, color2, color3 ;
- static JFrame f;
-
- public MinesweeperFrame() {
-
- mb = new JMenuBar();
-
-
- menu = new JMenu("menu");
- size = new JMenu("size in pixel");
- difficulte = new JMenu("Mines/no mines");
- color = new JMenu("Color");
-
- size1 = new JMenuItem("500");
- size2 = new JMenuItem("700");
- size3 = new JMenuItem("1000");
-
- size.add(size1);
- size.add(size2);
- size.add(size3);
-
- diff1 = new JMenuItem("50/50");
- diff2 = new JMenuItem("25/75");
- diff3 = new JMenuItem("75/25");
-
- difficulte.add(diff1);
- difficulte.add(diff2);
- difficulte.add(diff3);
-
- color1 = new JMenuItem("red");
- color2 = new JMenuItem("blue");
- color3 = new JMenuItem("black");
-
- color.add(color1);
- color.add(color2);
- color.add(color3);
-
- menu.add(size);
- menu.add(difficulte);
- menu.add(color);
-
- mb.add(menu);
- setJMenuBar(mb);
- this.minesweeper = new Minesweeper();
-
- this.minesweeperPanel = new MinesweeperPanel(minesweeper);
- add(minesweeperPanel);
-
- pack();
- setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
- setVisible(true);
-
- }
-}
\ No newline at end of file
diff --git a/CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/MinesweeperPanel.java b/CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/MinesweeperPanel.java
deleted file mode 100644
index cb9c59b..0000000
--- a/CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/MinesweeperPanel.java
+++ /dev/null
@@ -1,181 +0,0 @@
-package tp5.minesweeper.freestyle;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.Graphics;
-import java.awt.event.MouseEvent;
-import java.util.Scanner;
-
-import javax.swing.JFrame;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.JPanel;
-
-@SuppressWarnings("serial")
-public class MinesweeperPanel extends JPanel implements MinesweeperPanelable {
- Minesweeper minesweeper;
- int spaceHor;
- int spaceVert;
- int nbColumns;
- int nbRows;
- int selCol;
- int selLine;
- int carreWidth;
- int carreHeight;
- int spaceBorder;
-
- static JMenuBar mb;
-
- static JMenu menu;
-
- static JMenuItem size, difficulte, color;
-
- static JFrame f;
-
- public MinesweeperPanel(Minesweeper minesweeper) {
- this.minesweeper = minesweeper;
- setPreferredSize(new Dimension(500, 500));
- addMouseListener(new PanelMouseListener(this));
- addMouseMotionListener(new PanelMouseListener(this));
- spaceBorder = 20;
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- super.paintComponent(g);
-
- this.nbColumns = this.minesweeper.nbColumns;
- this.nbRows = this.minesweeper.nbLines;
-
- this.carreWidth = (getWidth() - (getBoardBorder() * 2)) - ((getWidth() - (getBoardBorder() * 2)) % nbColumns);
- this.carreHeight = (getHeight() - (getBoardBorder() * 2)) - ((getHeight() - (getBoardBorder() * 2)) % nbRows);
-
- this.spaceHor = carreWidth / nbColumns;
- this.spaceVert = carreHeight / nbRows;
-
- int lineEndH = carreHeight + getBoardBorder();
- int lineEndV = carreWidth + getBoardBorder();
-
- for (int idxRow = 0; idxRow < this.minesweeper.board.size(); idxRow++) {
- for (int idxCol = 0; idxCol < this.minesweeper.board.get(idxRow).size(); idxCol++) {
- Cell tmp = this.minesweeper.board.get(idxRow).get(idxCol);
- drawCell(g, idxRow, idxCol);
- tmp.setSelected(false);
- }
- }
-
- // show score
- g.setColor(Color.darkGray);
- g.setFont(new Font("Ariel", Font.BOLD, spaceBorder - 3));
- g.drawString("Score : " + this.minesweeper.score, (getWidth() / 2) - 40, (spaceBorder - 3));
-
- }
-
- public void drawCell(Graphics g, int line, int column) {
-
- g.setColor(Color.BLACK);
- g.drawRect(getCellX(column), getCellY(line), getCellWidth(), getCellHeight());
- Cell tmp = this.minesweeper.board.get(line).get(column);
- g.setColor(tmp.getColor());
- g.fillRect(getCellX(column), getCellY(line), getCellWidth(), getCellHeight());
-
- if (tmp.isRevealed && tmp.isMine) {
- int sizeBomb = 25;
- g.setColor(Color.BLACK);
- g.fillOval(getCellX(column) + (getCellWidth() / 2) - (sizeBomb / 2),
- getCellX(line) + (getCellHeight() / 2) - (sizeBomb / 2), sizeBomb, sizeBomb);
- }
- }
-
- public void drawCell(Graphics g, Cell tmp) {
-
- g.setColor(Color.BLACK);
- g.drawRect(getCellX(tmp.column), getCellY(tmp.row), getCellWidth(), getCellHeight());
-
- g.setColor(tmp.getColor());
- g.fillRect(getCellX(tmp.column), getCellY(tmp.row), getCellWidth(), getCellHeight());
-
- if (tmp.isRevealed && tmp.isMine) {
- int sizeBomb = 25;
- g.setColor(Color.BLACK);
- g.fillOval(getCellX(tmp.column) + (getCellWidth() / 2) - (sizeBomb / 2),
- getCellX(tmp.row) + (getCellHeight() / 2) - (sizeBomb / 2), sizeBomb, sizeBomb);
- }
- }
-
- public int getColumn(int x) {
- boolean condX = x > getBoardBorder() && x < (getBoardBorder() + (this.nbColumns * getCellWidth()));
- if (condX) {
- int posCarre = x - getBoardBorder();
- this.selCol = posCarre / getCellWidth();
- return this.selCol;
- }
- return -1;
- }
-
- public int getLine(int y) {
-
- boolean condY = y > getBoardBorder() && y < (getBoardBorder() + (this.nbRows * getCellHeight()));
- if (condY) {
- int posCarre = y - getBoardBorder();
- this.selLine = posCarre / spaceVert;
- return this.selLine;
- }
- return -1;
-
- }
-
- public int getBoardBorder() {
- return this.spaceBorder;
- }
-
- @Override
- public boolean isBlackCell(int line, int column) {
- return this.minesweeper.board.get(line).get(column).getColor() == Color.DARK_GRAY;
- }
-
- @Override
- public boolean isGrayCell(int line, int column) {
- return this.minesweeper.board.get(line).get(column).getColor() == Color.GRAY;
- }
-
- public boolean isRedCell(int line, int column) {
- return this.minesweeper.board.get(line).get(column).getColor() == Color.RED;
- }
-
- boolean isMine(int line, int column) {
- return this.minesweeper.board.get(line).get(column).isMine;
- }
-
- public int getCellX(int column) {
- return (getBoardBorder() + (column * getCellWidth()));
- }
-
- public int getCellY(int line) {
- return (getBoardBorder() + (line * getCellHeight()));
- }
-
- public int getCellWidth() {
- return this.spaceHor;
- }
-
- public int getCellHeight() {
- return this.spaceVert;
- }
-
- public boolean isOutOfBounds(int x, int y) {
- boolean condX = x > getBoardBorder() && x < (getBoardBorder() + (this.nbColumns * getCellWidth()));
- boolean condY = y > getBoardBorder() && y < (getBoardBorder() + (this.nbRows * getCellHeight()));
- if (condX && condY)
- return true;
- return false;
- }
-
- @Override
- public void drawMinesweeper(Graphics g) {
-
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/MinesweeperPanelable.java b/CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/MinesweeperPanelable.java
deleted file mode 100644
index 8beb659..0000000
--- a/CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/MinesweeperPanelable.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package tp5.minesweeper.freestyle;
-
-import java.awt.Graphics;
-
-public interface MinesweeperPanelable {
-
- public int getBoardBorder();
- public boolean isBlackCell(int line, int column);
- public boolean isGrayCell(int line, int column);
- public boolean isRedCell(int line, int column);
- public int getCellX(int column);
- public int getCellY(int line);
- public int getCellWidth();
- public int getCellHeight();
- public void drawCell(Graphics g, int line, int column);
- public int getColumn(int x);
- public int getLine(int y);
- void drawMinesweeper(Graphics g);
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/PanelMouseListener.java b/CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/PanelMouseListener.java
deleted file mode 100644
index 9d9bd9a..0000000
--- a/CCI_Java/CCI_Java/src/tp5/minesweeper/freestyle/PanelMouseListener.java
+++ /dev/null
@@ -1,44 +0,0 @@
-package tp5.minesweeper.freestyle;
-
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-public class PanelMouseListener extends MouseAdapter {
- MinesweeperPanel panel;
-
- public PanelMouseListener(MinesweeperPanel panel) {
- this.panel = panel;
- }
-
- @Override
- public void mouseClicked(MouseEvent e) {
-
-// System.out.println("Click Line = " + panel.minesweeper.selectedLine);
-// System.out.println("Click Column = " + panel.minesweeper.selectedColumn);
- int line = panel.getLine(e.getY());
- int column = panel.getColumn(e.getX());
- panel.minesweeper.board.get(line).get(column).isRevealed = true;
-// panel.minesweeper.score--;
- panel.repaint();
- }
-
- @Override
- public void mouseMoved(MouseEvent e) {
-
-// panel.minesweeper.selectedLine = panel.getLine(e.getY());
-// panel.minesweeper.selectedColumn = panel.getColumn(e.getX());
-
- try {
- int line = panel.getLine(e.getY());
- int column = panel.getColumn(e.getX());
- if (!panel.isOutOfBounds(line, column)) {
- panel.minesweeper.board.get(line).get(column).setSelected(true);
- panel.repaint();
- }
- } catch (Exception e2) {
- // TODO: handle exception
-// e2.printStackTrace();
- }
-
-
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/minesweeper/version1/Cell.java b/CCI_Java/CCI_Java/src/tp5/minesweeper/version1/Cell.java
deleted file mode 100644
index 6ac9809..0000000
--- a/CCI_Java/CCI_Java/src/tp5/minesweeper/version1/Cell.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package tp5.minesweeper.version1;
-
-import java.awt.Color;
-
-public class Cell {
- boolean isRevealed;
- boolean isMine;
- Color color = Color.GRAY;
-
- public Cell() {
-
- }
-
- public void setRevealed(boolean status) {
- this.isRevealed = status;
-
- if(status && !this.isMine)
- this.color = Color.DARK_GRAY;
-
-
- }
-
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/minesweeper/version1/MainGui.java b/CCI_Java/CCI_Java/src/tp5/minesweeper/version1/MainGui.java
deleted file mode 100644
index 450f771..0000000
--- a/CCI_Java/CCI_Java/src/tp5/minesweeper/version1/MainGui.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package tp5.minesweeper.version1;
-
-public class MainGui {
- public static void main(String[] args) {
- new MinesweeperFrame();
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/minesweeper/version1/Minesweeper.java b/CCI_Java/CCI_Java/src/tp5/minesweeper/version1/Minesweeper.java
deleted file mode 100644
index 528ee79..0000000
--- a/CCI_Java/CCI_Java/src/tp5/minesweeper/version1/Minesweeper.java
+++ /dev/null
@@ -1,73 +0,0 @@
-package tp5.minesweeper.version1;
-
-import java.awt.Color;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Scanner;
-
-public class Minesweeper {
- int nbColumns;
- int nbLines;
- int score;
- int selectedLine;
- int selectedColumn;
-
- double difficulte = 0.5;
- Color color = Color.RED;
-
- ArrayList<List<Cell>> board;
-
- public Minesweeper() {
- this.nbColumns = 10;
- this.nbLines = 10;
- this.score = this.nbColumns * this.nbLines;
- this.selectedLine = 0;
- this.selectedColumn = 0;
- this.board = new ArrayList<List<Cell>>();
-
-
- for (int line = 0; line < this.nbLines; line++) {
- this.board.add(new ArrayList<Cell>());
- for (int column = 0; column < this.nbColumns; column++) {
- Cell cell = new Cell();
- cell.isRevealed = false;
- cell.isMine = ((int) (Math.random() + difficulte)) == 0;
- if (cell.isMine)
- score--;
- this.board.get(line).add(cell);
- }
- }
- }
-
- private void checkSelect() {
- Scanner scanner = new Scanner(System.in);
- while (this.selectedColumn == -1 || this.selectedLine == -1) {
-
- if (this.selectedColumn == -1 && this.selectedLine == -1) {
- System.out.println("Selectionnez une cellule svp. (en utilisant d'une entier) !");
- System.out.println("Column : ");
- this.selectedColumn = scanner.nextInt();
- System.out.println("Line : ");
- this.selectedLine = scanner.nextInt();
- }
-
- }
- }
-
- public double getDifficulte() {
- return difficulte;
- }
-
- public void setDifficulte(double difficulte) {
- this.difficulte = difficulte;
- }
-
- public Color getColor() {
- return color;
- }
-
- public void setColor(Color color) {
- this.color = color;
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/minesweeper/version1/MinesweeperFrame.java b/CCI_Java/CCI_Java/src/tp5/minesweeper/version1/MinesweeperFrame.java
deleted file mode 100644
index 0fffd93..0000000
--- a/CCI_Java/CCI_Java/src/tp5/minesweeper/version1/MinesweeperFrame.java
+++ /dev/null
@@ -1,83 +0,0 @@
-package tp5.minesweeper.version1;
-
-import javax.swing.JFrame;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.WindowConstants;
-
-@SuppressWarnings("serial")
-public class MinesweeperFrame extends JFrame {
- Minesweeper minesweeper;
- MinesweeperPanel minesweeperPanel;
- static JMenuBar mb;
-
- static JMenu menu, size, difficulte, color;
-
-// static JMenuItem size, difficulte, color;
- static JMenuItem size1, size2, size3, diff1, diff2, diff3, color1, color2, color3 ;
- static JFrame f;
-
- public MinesweeperFrame() {
-
- mb = new JMenuBar();
-
-
- menu = new JMenu("menu");
- size = new JMenu("size in pixel");
- difficulte = new JMenu("Mines/no mines");
- color = new JMenu("Color");
-
-
-
-//
-// size = new JMenuItem("size");
-// difficulte = new JMenuItem("difficulté");
-// color = new JMenuItem("color");
-//
-
- size1 = new JMenuItem("500");
- size2 = new JMenuItem("700");
- size3 = new JMenuItem("1000");
-
- size.add(size1);
- size.add(size2);
- size.add(size3);
-
- diff1 = new JMenuItem("50/50");
- diff2 = new JMenuItem("25/75");
- diff3 = new JMenuItem("75/25");
-
- difficulte.add(diff1);
- difficulte.add(diff2);
- difficulte.add(diff3);
-
- color1 = new JMenuItem("red");
- color2 = new JMenuItem("blue");
- color3 = new JMenuItem("black");
-
- color.add(color1);
- color.add(color2);
- color.add(color3);
-
- menu.add(size);
- menu.add(difficulte);
- menu.add(color);
-
- mb.add(menu);
- setJMenuBar(mb);
-
- this.minesweeper = new Minesweeper();
-
- this.minesweeperPanel = new MinesweeperPanel(minesweeper);
- add(minesweeperPanel);
-
-
-
-
- pack();
- setDefaultCloseOperation(WindowConstants.EXIT_ON_CLOSE);
- setVisible(true);
-
- }
-}
\ No newline at end of file
diff --git a/CCI_Java/CCI_Java/src/tp5/minesweeper/version1/MinesweeperPanel.java b/CCI_Java/CCI_Java/src/tp5/minesweeper/version1/MinesweeperPanel.java
deleted file mode 100644
index fa36bff..0000000
--- a/CCI_Java/CCI_Java/src/tp5/minesweeper/version1/MinesweeperPanel.java
+++ /dev/null
@@ -1,143 +0,0 @@
-package tp5.minesweeper.version1;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Graphics;
-import java.awt.event.MouseEvent;
-import java.util.Scanner;
-
-import javax.swing.JFrame;
-import javax.swing.JMenu;
-import javax.swing.JMenuBar;
-import javax.swing.JMenuItem;
-import javax.swing.JPanel;
-
-@SuppressWarnings("serial")
-public class MinesweeperPanel extends JPanel implements MinesweeperPanelable {
- Minesweeper minesweeper;
- int spaceHor;
- int spaceVert;
- int nbColumns;
- int nbRows;
- int selCol;
- int selLine;
- int carreWidth;
- int carreHeight;
- int spaceBorder;
-
-
- static JMenuBar mb;
-
- static JMenu menu;
-
- static JMenuItem size, difficulte, color;
-
- static JFrame f;
-
- public MinesweeperPanel(Minesweeper minesweeper) {
- this.minesweeper = minesweeper;
- setPreferredSize(new Dimension(500, 500));
- addMouseListener(new PanelMouseListener(this));
- addMouseMotionListener(new PanelMouseListener(this));
- spaceBorder = 20;
- }
-
- @Override
- protected void paintComponent(Graphics g) {
- super.paintComponent(g);
-
- this.nbColumns = this.minesweeper.nbColumns;
- this.nbRows = this.minesweeper.nbLines;
-
- this.carreWidth = (getWidth() - (getBoardBorder() * 2)) - ((getWidth() - (getBoardBorder() * 2)) % nbColumns);
- this.carreHeight = (getHeight() - (getBoardBorder() * 2)) - ((getHeight() - (getBoardBorder() * 2)) % nbRows);
-
- this.spaceHor = carreWidth / nbColumns;
- this.spaceVert = carreHeight / nbRows;
-
- int lineEndH = carreHeight + getBoardBorder();
- int lineEndV = carreWidth + getBoardBorder();
-
- for (int idxRow = 0; idxRow < this.minesweeper.board.size(); idxRow++) {
- for (int idxCol = 0; idxCol < this.minesweeper.board.get(idxRow).size(); idxCol++) {
- drawCell(g, idxRow, idxCol);
- }
- }
-
- }
-
- public int getColumn(int x) {
- int posCarre = x - getBoardBorder();
- this.selCol = posCarre / getCellWidth();
- return this.selCol;
- }
-
- public int getLine(int y) {
- int posCarre = y - getBoardBorder();
- this.selLine = posCarre / spaceVert;
- return this.selLine;
- }
-
- public int getBoardBorder() {
- return this.spaceBorder;
- }
-
- @Override
- public boolean isBlackCell(int line, int column) {
- return this.minesweeper.board.get(line).get(column).isRevealed;
- }
-
- @Override
- public boolean isGrayCell(int line, int column) {
- return !this.minesweeper.board.get(line).get(column).isRevealed;
- }
-
- boolean isMine(int line, int column) {
- return this.minesweeper.board.get(line).get(column).isMine;
- }
-
- public boolean isRedCell(int line, int column) {
- return (line == this.selLine && column == this.selCol);
- }
-
- public int getCellX(int column) {
- return (getBoardBorder() + (column * getCellWidth()));
- }
-
- public int getCellY(int line) {
- return (getBoardBorder() + (line * getCellHeight()));
- }
-
- public int getCellWidth() {
- return this.spaceHor;
- }
-
- public int getCellHeight() {
- return this.spaceVert;
- }
-
- public void drawCell(Graphics g, int line, int column) {
-
- g.setColor(Color.BLACK);
- g.drawRect(getCellX(column), getCellY(line), getCellWidth(), getCellHeight());
-
- if (isRedCell(line, column)) {
- g.setColor(this.minesweeper.getColor());
- g.fillRect(getCellX(column), getCellY(line), getCellWidth(), getCellHeight());
- } else if (isBlackCell(line, column) && isMine(line, column)) {
- int sizeBomb = 25;
- g.setColor(Color.BLACK);
- g.fillOval(getCellX(column) + (getCellWidth() / 2) - (sizeBomb / 2),
- getCellX(line) + (getCellHeight() / 2) - (sizeBomb / 2), sizeBomb, sizeBomb);
- } else if (isBlackCell(line, column)) {
- g.setColor(Color.DARK_GRAY);
- g.fillRect(getCellX(column), getCellY(line), getCellWidth(), getCellHeight());
- }
- }
-
- @Override
- public void drawMinesweeper(Graphics g) {
-
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/minesweeper/version1/MinesweeperPanelable.java b/CCI_Java/CCI_Java/src/tp5/minesweeper/version1/MinesweeperPanelable.java
deleted file mode 100644
index 4ce3879..0000000
--- a/CCI_Java/CCI_Java/src/tp5/minesweeper/version1/MinesweeperPanelable.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package tp5.minesweeper.version1;
-
-import java.awt.Graphics;
-
-public interface MinesweeperPanelable {
-
- public int getBoardBorder();
- public boolean isBlackCell(int line, int column);
- public boolean isGrayCell(int line, int column);
- public boolean isRedCell(int line, int column);
- public int getCellX(int column);
- public int getCellY(int line);
- public int getCellWidth();
- public int getCellHeight();
- public void drawCell(Graphics g, int line, int column);
- public int getColumn(int x);
- public int getLine(int y);
- void drawMinesweeper(Graphics g);
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp5/minesweeper/version1/PanelMouseListener.java b/CCI_Java/CCI_Java/src/tp5/minesweeper/version1/PanelMouseListener.java
deleted file mode 100644
index 5ad3294..0000000
--- a/CCI_Java/CCI_Java/src/tp5/minesweeper/version1/PanelMouseListener.java
+++ /dev/null
@@ -1,34 +0,0 @@
-package tp5.minesweeper.version1;
-
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-public class PanelMouseListener extends MouseAdapter {
- MinesweeperPanel panel;
-
- public PanelMouseListener(MinesweeperPanel panel) {
- this.panel = panel;
- }
-
- @Override
- public void mouseClicked(MouseEvent e) {
-
-// System.out.println("Click Line = " + panel.minesweeper.selectedLine);
-// System.out.println("Click Column = " + panel.minesweeper.selectedColumn);
-
- panel.minesweeper.board.get(panel.getLine(e.getY())).get(panel.getColumn(e.getX())).isRevealed = true;
- panel.minesweeper.score--;
- panel.repaint();
- }
-
- @Override
- public void mouseMoved(MouseEvent e) {
-
- panel.minesweeper.selectedLine = panel.getLine(e.getY());
- panel.minesweeper.selectedColumn = panel.getColumn(e.getX());
-
-// System.out.println("Line = " + panel.minesweeper.selectedLine);
-// System.out.println("Column = " + panel.minesweeper.selectedColumn);
-
- panel.repaint();
- }
-}
diff --git a/CCI_Java/CCI_Java/minesweeper/tp5/v1/Cell.java b/CCI_Java/CCI_Java/src/tp5/v1/Cell.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp5/v1/Cell.java
rename to CCI_Java/CCI_Java/src/tp5/v1/Cell.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp5/v1/MainGui.java b/CCI_Java/CCI_Java/src/tp5/v1/MainGui.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp5/v1/MainGui.java
rename to CCI_Java/CCI_Java/src/tp5/v1/MainGui.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp5/v1/Minesweeper.java b/CCI_Java/CCI_Java/src/tp5/v1/Minesweeper.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp5/v1/Minesweeper.java
rename to CCI_Java/CCI_Java/src/tp5/v1/Minesweeper.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp5/v1/MinesweeperFrame.java b/CCI_Java/CCI_Java/src/tp5/v1/MinesweeperFrame.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp5/v1/MinesweeperFrame.java
rename to CCI_Java/CCI_Java/src/tp5/v1/MinesweeperFrame.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp5/v1/MinesweeperPanel.java b/CCI_Java/CCI_Java/src/tp5/v1/MinesweeperPanel.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp5/v1/MinesweeperPanel.java
rename to CCI_Java/CCI_Java/src/tp5/v1/MinesweeperPanel.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp5/v1/MinesweeperPanelable.java b/CCI_Java/CCI_Java/src/tp5/v1/MinesweeperPanelable.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp5/v1/MinesweeperPanelable.java
rename to CCI_Java/CCI_Java/src/tp5/v1/MinesweeperPanelable.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp5/v1/PanelMouseListener.java b/CCI_Java/CCI_Java/src/tp5/v1/PanelMouseListener.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp5/v1/PanelMouseListener.java
rename to CCI_Java/CCI_Java/src/tp5/v1/PanelMouseListener.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp5/v1/TestArrayListOfCell.java b/CCI_Java/CCI_Java/src/tp5/v1/TestArrayListOfCell.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp5/v1/TestArrayListOfCell.java
rename to CCI_Java/CCI_Java/src/tp5/v1/TestArrayListOfCell.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp5/v1/TestArrayListOfCell2.java b/CCI_Java/CCI_Java/src/tp5/v1/TestArrayListOfCell2.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp5/v1/TestArrayListOfCell2.java
rename to CCI_Java/CCI_Java/src/tp5/v1/TestArrayListOfCell2.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp5/v1/TestCell.java b/CCI_Java/CCI_Java/src/tp5/v1/TestCell.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp5/v1/TestCell.java
rename to CCI_Java/CCI_Java/src/tp5/v1/TestCell.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp5/v2/Cell.java b/CCI_Java/CCI_Java/src/tp5/v2/Cell.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp5/v2/Cell.java
rename to CCI_Java/CCI_Java/src/tp5/v2/Cell.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp5/v2/MainGui.java b/CCI_Java/CCI_Java/src/tp5/v2/MainGui.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp5/v2/MainGui.java
rename to CCI_Java/CCI_Java/src/tp5/v2/MainGui.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp5/v2/Minesweeper.java b/CCI_Java/CCI_Java/src/tp5/v2/Minesweeper.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp5/v2/Minesweeper.java
rename to CCI_Java/CCI_Java/src/tp5/v2/Minesweeper.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp5/v2/MinesweeperFrame.java b/CCI_Java/CCI_Java/src/tp5/v2/MinesweeperFrame.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp5/v2/MinesweeperFrame.java
rename to CCI_Java/CCI_Java/src/tp5/v2/MinesweeperFrame.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp5/v2/MinesweeperPanel.java b/CCI_Java/CCI_Java/src/tp5/v2/MinesweeperPanel.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp5/v2/MinesweeperPanel.java
rename to CCI_Java/CCI_Java/src/tp5/v2/MinesweeperPanel.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp5/v2/MinesweeperPanelable.java b/CCI_Java/CCI_Java/src/tp5/v2/MinesweeperPanelable.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp5/v2/MinesweeperPanelable.java
rename to CCI_Java/CCI_Java/src/tp5/v2/MinesweeperPanelable.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp5/v2/PanelMouseListener.java b/CCI_Java/CCI_Java/src/tp5/v2/PanelMouseListener.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp5/v2/PanelMouseListener.java
rename to CCI_Java/CCI_Java/src/tp5/v2/PanelMouseListener.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp5/v2/TestArrayListOfCell.java b/CCI_Java/CCI_Java/src/tp5/v2/TestArrayListOfCell.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp5/v2/TestArrayListOfCell.java
rename to CCI_Java/CCI_Java/src/tp5/v2/TestArrayListOfCell.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp5/v2/TestArrayListOfCell2.java b/CCI_Java/CCI_Java/src/tp5/v2/TestArrayListOfCell2.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp5/v2/TestArrayListOfCell2.java
rename to CCI_Java/CCI_Java/src/tp5/v2/TestArrayListOfCell2.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp5/v2/TestCell.java b/CCI_Java/CCI_Java/src/tp5/v2/TestCell.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp5/v2/TestCell.java
rename to CCI_Java/CCI_Java/src/tp5/v2/TestCell.java
diff --git a/CCI_Java/CCI_Java/src/tp6/ex01/Contribution.java b/CCI_Java/CCI_Java/src/tp6/ex01/Contribution.java
deleted file mode 100644
index 8fdf9de..0000000
--- a/CCI_Java/CCI_Java/src/tp6/ex01/Contribution.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package tp6.ex01;
-
-public class Contribution {
-
- private String projectName;
- private double hoursWorked;
-
- public Contribution(String projectName, double hoursWorked) {
- this.projectName = projectName;
- this.hoursWorked = hoursWorked;
-
-
- }
-
- public String getProjectName() {
- return projectName;
- }
-
- public double getHoursWorked() {
- return hoursWorked;
- }
-
- @Override
- public String toString() {
- // TODO Auto-generated method stub
- return projectName + ", Hours Worked: " + hoursWorked;
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp6/ex01/Team.java b/CCI_Java/CCI_Java/src/tp6/ex01/Team.java
deleted file mode 100644
index fe101a6..0000000
--- a/CCI_Java/CCI_Java/src/tp6/ex01/Team.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package tp6.ex01;
-
-import java.util.ArrayList;
-
-public class Team {
-
- String name;
- ArrayList<TeamMember> members;
-
- public Team(String name) {
- this.name = name;
- members = new ArrayList<TeamMember>();
- }
-
- public void addMembers(TeamMember member) {
- members.add(member);
- }
-
- @Override
- public String toString() {
- String res = "Team: " + name + "\nMembers:\n\n";
- for (TeamMember m : members) {
- res += m.toString() + "\n\n";
- }
- return res;
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp6/ex01/TeamMember.java b/CCI_Java/CCI_Java/src/tp6/ex01/TeamMember.java
deleted file mode 100644
index 8656de3..0000000
--- a/CCI_Java/CCI_Java/src/tp6/ex01/TeamMember.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package tp6.ex01;
-
-import java.util.ArrayList;
-
-public class TeamMember {
- private String firstName;
- private String lastName;
- private ArrayList<Contribution> contributions;
-
- public TeamMember(String firstName, String lastName) {
-
- this.firstName = firstName;
- this.lastName = lastName;
- contributions = new ArrayList<Contribution>();
- }
-
- public void addContribution(Contribution con) {
- contributions.add(con);
- }
-
- public String getFirstName() {
- return firstName;
- }
-
- public String getLastName() {
- return lastName;
- }
-
- public ArrayList<Contribution> getContributions() {
- return contributions;
- }
-
- public Contribution getCont(int idx) {
- return contributions.get(idx);
- }
-
- public double houresWorked() {
- double res = 0;
-
- for(Contribution c : contributions) {
- res += c.getHoursWorked();
- }
- return res;
- }
-
- @Override
- public String toString() {
- String res = "Team Member: " + getFirstName() + " " + getLastName();
- res += "\nContributions:\n";
- for (Contribution c : contributions)
- res += c.toString()+ "\n";
- return res + "Total Hours Worked: " + houresWorked();
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp6/ex01/TestContribution.java b/CCI_Java/CCI_Java/src/tp6/ex01/TestContribution.java
deleted file mode 100644
index 45d8c41..0000000
--- a/CCI_Java/CCI_Java/src/tp6/ex01/TestContribution.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package tp6.ex01;
-
-public class TestContribution {
-
- public static void main(String[] args) {
- Contribution contributionA = new Contribution("Project Phoenix", 350.6);
- Contribution contributionB = new Contribution("Project Horizon", 1025.4);
-
- System.out.println(contributionA);
- System.out.println(contributionB);
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp6/ex01/TestTeam.java b/CCI_Java/CCI_Java/src/tp6/ex01/TestTeam.java
deleted file mode 100644
index d732b6d..0000000
--- a/CCI_Java/CCI_Java/src/tp6/ex01/TestTeam.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package tp6.ex01;
-
-public class TestTeam {
-
- public static void main(String[] args) {
-
- Team best = new Team("The best Team");
-
- TeamMember sophie = new TeamMember("Sophie", "Dupuis");
- Contribution contributionA = new Contribution("Project Phoenix", 350.6);
- Contribution contributionB = new Contribution("Project Horizon", 1025.4);
-
- sophie.addContribution(contributionA);
- sophie.addContribution(contributionB);
-
- TeamMember lucas = new TeamMember("Lucas", "Moreau");
- Contribution contributionC = new Contribution("Project Apollo", 420.3);
- Contribution contributionD = new Contribution("Project Zenith", 45.4);
- Contribution contributionE = new Contribution("Project Horizon", 1203.1);
-
- lucas.addContribution(contributionC);
- lucas.addContribution(contributionD);
- lucas.addContribution(contributionE);
-
- best.addMembers(sophie);
- best.addMembers(lucas);
-
- System.out.println(best);
- }
-}
diff --git a/CCI_Java/CCI_Java/src/tp6/ex01/TestTeamMember.java b/CCI_Java/CCI_Java/src/tp6/ex01/TestTeamMember.java
deleted file mode 100644
index 84721e5..0000000
--- a/CCI_Java/CCI_Java/src/tp6/ex01/TestTeamMember.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package tp6.ex01;
-
-public class TestTeamMember {
-
- public static void main(String[] args) {
- TeamMember sophie = new TeamMember("Sophie", "Dupuis");
- Contribution contributionA = new Contribution("Project Phoenix", 350.6);
- Contribution contributionB = new Contribution("Project Horizon", 1025.4);
-
- sophie.addContribution(contributionA);
- sophie.addContribution(contributionB);
-
- System.out.println(sophie);
-
- }
-
-}
diff --git a/CCI_Java/CCI_Java/minesweeper/tp6/v1/Cell.java b/CCI_Java/CCI_Java/src/tp6/v1/Cell.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp6/v1/Cell.java
rename to CCI_Java/CCI_Java/src/tp6/v1/Cell.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp6/v1/MainGui.java b/CCI_Java/CCI_Java/src/tp6/v1/MainGui.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp6/v1/MainGui.java
rename to CCI_Java/CCI_Java/src/tp6/v1/MainGui.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp6/v1/Minesweeper.java b/CCI_Java/CCI_Java/src/tp6/v1/Minesweeper.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp6/v1/Minesweeper.java
rename to CCI_Java/CCI_Java/src/tp6/v1/Minesweeper.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp6/v1/MinesweeperFrame.java b/CCI_Java/CCI_Java/src/tp6/v1/MinesweeperFrame.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp6/v1/MinesweeperFrame.java
rename to CCI_Java/CCI_Java/src/tp6/v1/MinesweeperFrame.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp6/v1/MinesweeperPanel.java b/CCI_Java/CCI_Java/src/tp6/v1/MinesweeperPanel.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp6/v1/MinesweeperPanel.java
rename to CCI_Java/CCI_Java/src/tp6/v1/MinesweeperPanel.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp6/v1/MinesweeperPanelable.java b/CCI_Java/CCI_Java/src/tp6/v1/MinesweeperPanelable.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp6/v1/MinesweeperPanelable.java
rename to CCI_Java/CCI_Java/src/tp6/v1/MinesweeperPanelable.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp6/v1/PanelMouseListener.java b/CCI_Java/CCI_Java/src/tp6/v1/PanelMouseListener.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp6/v1/PanelMouseListener.java
rename to CCI_Java/CCI_Java/src/tp6/v1/PanelMouseListener.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp6/v2/Cell.java b/CCI_Java/CCI_Java/src/tp6/v2/Cell.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp6/v2/Cell.java
rename to CCI_Java/CCI_Java/src/tp6/v2/Cell.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp6/v2/MainGui.java b/CCI_Java/CCI_Java/src/tp6/v2/MainGui.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp6/v2/MainGui.java
rename to CCI_Java/CCI_Java/src/tp6/v2/MainGui.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp6/v2/Minesweeper.java b/CCI_Java/CCI_Java/src/tp6/v2/Minesweeper.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp6/v2/Minesweeper.java
rename to CCI_Java/CCI_Java/src/tp6/v2/Minesweeper.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp6/v2/MinesweeperFrame.java b/CCI_Java/CCI_Java/src/tp6/v2/MinesweeperFrame.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp6/v2/MinesweeperFrame.java
rename to CCI_Java/CCI_Java/src/tp6/v2/MinesweeperFrame.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp6/v2/MinesweeperPanel.java b/CCI_Java/CCI_Java/src/tp6/v2/MinesweeperPanel.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp6/v2/MinesweeperPanel.java
rename to CCI_Java/CCI_Java/src/tp6/v2/MinesweeperPanel.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp6/v2/MinesweeperPanelable.java b/CCI_Java/CCI_Java/src/tp6/v2/MinesweeperPanelable.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp6/v2/MinesweeperPanelable.java
rename to CCI_Java/CCI_Java/src/tp6/v2/MinesweeperPanelable.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp6/v2/PanelMouseListener.java b/CCI_Java/CCI_Java/src/tp6/v2/PanelMouseListener.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp6/v2/PanelMouseListener.java
rename to CCI_Java/CCI_Java/src/tp6/v2/PanelMouseListener.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp6/v3/Cell.java b/CCI_Java/CCI_Java/src/tp6/v3/Cell.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp6/v3/Cell.java
rename to CCI_Java/CCI_Java/src/tp6/v3/Cell.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp6/v3/MainGui.java b/CCI_Java/CCI_Java/src/tp6/v3/MainGui.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp6/v3/MainGui.java
rename to CCI_Java/CCI_Java/src/tp6/v3/MainGui.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp6/v3/Minesweeper.java b/CCI_Java/CCI_Java/src/tp6/v3/Minesweeper.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp6/v3/Minesweeper.java
rename to CCI_Java/CCI_Java/src/tp6/v3/Minesweeper.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp6/v3/MinesweeperFrame.java b/CCI_Java/CCI_Java/src/tp6/v3/MinesweeperFrame.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp6/v3/MinesweeperFrame.java
rename to CCI_Java/CCI_Java/src/tp6/v3/MinesweeperFrame.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp6/v3/MinesweeperPanel.java b/CCI_Java/CCI_Java/src/tp6/v3/MinesweeperPanel.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp6/v3/MinesweeperPanel.java
rename to CCI_Java/CCI_Java/src/tp6/v3/MinesweeperPanel.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp6/v3/MinesweeperPanelable.java b/CCI_Java/CCI_Java/src/tp6/v3/MinesweeperPanelable.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp6/v3/MinesweeperPanelable.java
rename to CCI_Java/CCI_Java/src/tp6/v3/MinesweeperPanelable.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp6/v3/PanelMouseListener.java b/CCI_Java/CCI_Java/src/tp6/v3/PanelMouseListener.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp6/v3/PanelMouseListener.java
rename to CCI_Java/CCI_Java/src/tp6/v3/PanelMouseListener.java
diff --git a/CCI_Java/CCI_Java/minesweeper/tp6/v3/Position.java b/CCI_Java/CCI_Java/src/tp6/v3/Position.java
similarity index 100%
rename from CCI_Java/CCI_Java/minesweeper/tp6/v3/Position.java
rename to CCI_Java/CCI_Java/src/tp6/v3/Position.java
diff --git a/CCI_Java/CCI_Java/src/tp7/exo1/TestString1.java b/CCI_Java/CCI_Java/src/tp7/exo1/TestString1.java
deleted file mode 100644
index b573817..0000000
--- a/CCI_Java/CCI_Java/src/tp7/exo1/TestString1.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package tp7.exo1;
-
-import java.util.Scanner;
-
-public class TestString1 {
-
-// Taper la premi è re cha î ne : salut
-// Taper la deuxi è me cha î ne : bonjour
-// La premi è re cha î ne vaut " salut " .
-// La deuxi è me cha î ne vaut " bonjour " .
-
- public static void main(String[] args) {
- Scanner scanner = new Scanner(System.in);
-
- System.out.println("Taper la première chaîne :");
- String str1 = scanner.nextLine();
- System.out.println("Taper la deuxieme chaîne :");
- String str2 = scanner.nextLine();
-
- System.out.println("La première chaîne vaut \"" + str1 +"\"");
- System.out.println("La deuxieme chaîne vaut \"" + str2+"\"");
-
- scanner.close();
-
- }
-
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp7/exo1/TestString10.java b/CCI_Java/CCI_Java/src/tp7/exo1/TestString10.java
deleted file mode 100644
index ad08e4f..0000000
--- a/CCI_Java/CCI_Java/src/tp7/exo1/TestString10.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package tp7.exo1;
-
-import java.util.Scanner;
-
-public class TestString10 {
-
- public static void main(String[] args) {
- // TODO Auto-generated method stub
- Scanner scanner = new Scanner(System.in);
- System.out.println("Taper la première chaîne :");
- String str1 = scanner.nextLine();
- System.out.println("Taper la deuxieme chaîne :");
- String str2 = scanner.nextLine();
- if (str1.contains(str2))
- str1 = str1.replaceAll(str2, " ");
- System.out.println("Résultat : " + str1);
-
- scanner.close();
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp7/exo1/TestString11.java b/CCI_Java/CCI_Java/src/tp7/exo1/TestString11.java
deleted file mode 100644
index fe377e4..0000000
--- a/CCI_Java/CCI_Java/src/tp7/exo1/TestString11.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package tp7.exo1;
-
-import java.util.Scanner;
-
-public class TestString11 {
-
- public static void main(String[] args) {
- // TODO Auto-generated method stub
- Scanner scanner = new Scanner(System.in);
- System.out.print(" Taper un entier : ");
- int value = scanner.nextInt();
- scanner.nextLine();
- System.out.print(" Taper une cha î ne : ");
- String str = scanner.nextLine();
- System.out.println(" entier = " + value + " , cha î ne = " + str);
-
- scanner.close();
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp7/exo1/TestString2.java b/CCI_Java/CCI_Java/src/tp7/exo1/TestString2.java
deleted file mode 100644
index fc844b1..0000000
--- a/CCI_Java/CCI_Java/src/tp7/exo1/TestString2.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package tp7.exo1;
-
-import java.util.Scanner;
-
-public class TestString2 {
-
-// Taper la premi è re cha î ne : salut
-// Taper la deuxi è me cha î ne : bonjour
-// La premi è re cha î ne vaut " salut " .
-// La deuxi è me cha î ne vaut " bonjour " .
-// str1 == str2 vaut false
-// str1 . equals ( str2 ) vaut false
-
- public static void main(String[] args) {
- Scanner scanner = new Scanner(System.in);
-
- System.out.println("Taper la première chaîne :");
- String str1 = scanner.nextLine();
- System.out.println("Taper la deuxieme chaîne :");
- String str2 = scanner.nextLine();
-
- System.out.println("La première chaîne vaut \"" + str1 + "\"");
- System.out.println("La deuxieme chaîne vaut \"" + str2 + "\"");
-
- System.out.println("str1 == str2 vaut " + (str1 == str2));
- System.out.println("str1.equals(str2) vaut " + str1.equals(str2));
-
- scanner.close();
-
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp7/exo1/TestString3.java b/CCI_Java/CCI_Java/src/tp7/exo1/TestString3.java
deleted file mode 100644
index e04f791..0000000
--- a/CCI_Java/CCI_Java/src/tp7/exo1/TestString3.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package tp7.exo1;
-
-import java.util.Scanner;
-
-public class TestString3 {
-
- public static void main(String[] args) {
- // TODO Auto-generated method stub
- Scanner scanner = new Scanner(System.in);
- System.out.println("Taper un entier :");
- int value = scanner.nextInt();
- System.out.println("La chaîne correspondante est \"" + String.valueOf(value)+ "\"");
-
- scanner.close();
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp7/exo1/TestString4.java b/CCI_Java/CCI_Java/src/tp7/exo1/TestString4.java
deleted file mode 100644
index 230a463..0000000
--- a/CCI_Java/CCI_Java/src/tp7/exo1/TestString4.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package tp7.exo1;
-
-import java.util.Scanner;
-
-public class TestString4 {
-
- public static void main(String[] args) {
- // TODO Auto-generated method stub
- Scanner scanner = new Scanner(System.in);
- System.out.println("Taper une chaîne de caractères représentant un entier :");
- String str = scanner.nextLine();
- System.out.println("La valeur correspondante est " + Integer.parseInt(str));
-
- scanner.close();
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp7/exo1/TestString5.java b/CCI_Java/CCI_Java/src/tp7/exo1/TestString5.java
deleted file mode 100644
index e4c23a6..0000000
--- a/CCI_Java/CCI_Java/src/tp7/exo1/TestString5.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package tp7.exo1;
-
-import java.util.Scanner;
-
-public class TestString5 {
-
- public static void main(String[] args) {
- // TODO Auto-generated method stub
- Scanner scanner = new Scanner(System.in);
- System.out.println("Taper une chaîne de caractères représentant un entier :");
- String str = scanner.nextLine();
- System.out.println("La valeur correspondante est " + Double.parseDouble(str));
-
- scanner.close();
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp7/exo1/TestString6.java b/CCI_Java/CCI_Java/src/tp7/exo1/TestString6.java
deleted file mode 100644
index e7dd4dd..0000000
--- a/CCI_Java/CCI_Java/src/tp7/exo1/TestString6.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package tp7.exo1;
-
-import java.util.Scanner;
-
-public class TestString6 {
-
- public static void main(String[] args) {
- // TODO Auto-generated method stub
- Scanner scanner = new Scanner(System.in);
- System.out.println("Taper le nom de la ville :");
- String str = scanner.nextLine();
- System.out.println("Le nom de la ville en majuscules est \"" + str.stripIndent().toUpperCase()+"\"");
-
- scanner.close();
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp7/exo1/TestString7.java b/CCI_Java/CCI_Java/src/tp7/exo1/TestString7.java
deleted file mode 100644
index 9201d06..0000000
--- a/CCI_Java/CCI_Java/src/tp7/exo1/TestString7.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package tp7.exo1;
-
-import java.util.Scanner;
-
-public class TestString7 {
-
- public static void main(String[] args) {
- // TODO Auto-generated method stub
- Scanner scanner = new Scanner(System.in);
- System.out.println("Taper la première chaîne :");
- String str1 = scanner.nextLine();
- System.out.println("Taper la première chaîne :");
- String str2 = scanner.nextLine();
- System.out.println("Les deux chaînes commencent - elles parle même caractère ? " + (str1.charAt(0) == str2.charAt(0)));
-
- scanner.close();
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp7/exo1/TestString8.java b/CCI_Java/CCI_Java/src/tp7/exo1/TestString8.java
deleted file mode 100644
index afc0123..0000000
--- a/CCI_Java/CCI_Java/src/tp7/exo1/TestString8.java
+++ /dev/null
@@ -1,20 +0,0 @@
-package tp7.exo1;
-
-import java.util.Scanner;
-
-public class TestString8 {
-
- public static void main(String[] args) {
- // TODO Auto-generated method stub
- Scanner scanner = new Scanner(System.in);
- System.out.println("Taper la première chaîne :");
- String str1 = scanner.nextLine();
- System.out.println("Taper la deuxieme chaîne :");
- String str2 = scanner.nextLine();
- System.out.println("R é sultat de str1.compareTo(str2) : " + str1.compareTo(str2));
- System.out.println("R é sultat de str1.compareToIgnoreCase(str2) : " + str1.compareToIgnoreCase(str2));
-
- scanner.close();
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp7/exo1/TestString9.java b/CCI_Java/CCI_Java/src/tp7/exo1/TestString9.java
deleted file mode 100644
index 12fd513..0000000
--- a/CCI_Java/CCI_Java/src/tp7/exo1/TestString9.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package tp7.exo1;
-
-import java.util.Scanner;
-//Taper la premi è re cha î ne : bonjour
-//Taper la deuxi è me cha î ne : bon
-//str1 commence -t - elle par str2 ? true
-//str1 finit - elle par str2 ? false
-//str1 contient - elle str2 ? true
-public class TestString9 {
-
- public static void main(String[] args) {
- // TODO Auto-generated method stub
- Scanner scanner = new Scanner(System.in);
- System.out.println("Taper la première chaîne :");
- String str1 = scanner.nextLine();
- System.out.println("Taper la deuxieme chaîne :");
- String str2 = scanner.nextLine();
- System.out.println("str1 commence -t - elle par str2 ? " + str1.startsWith(str2));
- System.out.println("str1 finit - elle par str2 ? " + str1.endsWith(str2));
- System.out.println("str1 contient - elle str2 ? " + str1.contains(str2));
-
- scanner.close();
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp7/exo2/Calculator.java b/CCI_Java/CCI_Java/src/tp7/exo2/Calculator.java
deleted file mode 100644
index 9500a6e..0000000
--- a/CCI_Java/CCI_Java/src/tp7/exo2/Calculator.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package tp7.exo2;
-
-import java.math.BigInteger;
-
-public class Calculator {
-
- public int powOf10(int n) {
- return (int) Math.pow(10, n);
- }
-
- public BigInteger powOf10(BigInteger n) {
-
- BigInteger pow = BigInteger.ONE;
-
- for (int i = 0; i < n.intValue(); i++)
- pow = pow.multiply(BigInteger.TEN);
-// System.out.println(pow);
- return pow;
- }
-
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp7/exo2/TestPowOf10V1.java b/CCI_Java/CCI_Java/src/tp7/exo2/TestPowOf10V1.java
deleted file mode 100644
index bb9b924..0000000
--- a/CCI_Java/CCI_Java/src/tp7/exo2/TestPowOf10V1.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package tp7.exo2;
-
-public class TestPowOf10V1 {
-
- public static void main(String[] args) {
- Calculator cal = new Calculator();
- System.out.println("10^0 = " + cal.powOf10(0));
- System.out.println("10^1 = " + cal.powOf10(1));
- System.out.println("10^2 = " + cal.powOf10(2));
- System.out.println("10^3 = " + cal.powOf10(3));
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp7/exo2/TestPowOf10V2.java b/CCI_Java/CCI_Java/src/tp7/exo2/TestPowOf10V2.java
deleted file mode 100644
index e2cbc41..0000000
--- a/CCI_Java/CCI_Java/src/tp7/exo2/TestPowOf10V2.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package tp7.exo2;
-
-import java.math.BigInteger;
-
-public class TestPowOf10V2 {
-
- public static void main(String[] args) {
-
- Calculator cal = new Calculator();
-
-// System.out.println(BigInteger.ZERO.compareTo(BigInteger.ONE));
-// System.out.println(BigInteger.TEN.add(BigInteger.ONE));
-// cal.powOf10(BigInteger.TWO);
- System.out.println("La plus grande valeur d'un int est " + cal.powOf10(BigInteger.ONE));
- System.out.println("La plus grande valeur d'un int est " + cal.powOf10(BigInteger.TWO));
- System.out.println("La plus grande valeur d'un int est " + cal.powOf10(BigInteger.valueOf(3)));
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp7/exo2/TestPowOf10V3.java b/CCI_Java/CCI_Java/src/tp7/exo2/TestPowOf10V3.java
deleted file mode 100644
index 0153b5d..0000000
--- a/CCI_Java/CCI_Java/src/tp7/exo2/TestPowOf10V3.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package tp7.exo2;
-
-import java.math.BigInteger;
-
-public class TestPowOf10V3 {
-
- public static void main(String[] args) {
-
- Calculator cal = new Calculator();
-
- for (int i = 0; i <= 15; i++)
- System.out.println("10^" + i + " = " + cal.powOf10(i));
-
- System.out.println("La plus grande valeur d'un int est " + Integer.MAX_VALUE);
- }
-
-}
diff --git a/CCI_Java/CCI_Java/src/tp7/exo2/TestPowOf10V4.java b/CCI_Java/CCI_Java/src/tp7/exo2/TestPowOf10V4.java
deleted file mode 100644
index b4b55fc..0000000
--- a/CCI_Java/CCI_Java/src/tp7/exo2/TestPowOf10V4.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package tp7.exo2;
-
-import java.math.BigInteger;
-
-public class TestPowOf10V4 {
-
- public static void main(String[] args) {
-
- Calculator cal = new Calculator();
-
- for (int i = 0; i < 100; i++)
- System.out.println("La plus grande valeur d'un int est " + cal.powOf10(BigInteger.valueOf(i)));
-
- }
-
-}
diff --git a/CCI_Java/minesweeper/.project b/CCI_Java/minesweeper/.project
deleted file mode 100644
index 096bc88..0000000
--- a/CCI_Java/minesweeper/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>minesweeper</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
diff --git a/CCI_Java/tp/.project b/CCI_Java/tp/.project
deleted file mode 100644
index f984fef..0000000
--- a/CCI_Java/tp/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>tp</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- </buildSpec>
- <natures>
- </natures>
-</projectDescription>
--
GitLab