From 42ba4bd8d9cc0313f256ca7b909435a76f7451b6 Mon Sep 17 00:00:00 2001
From: anperederi <antoine.perederii@etu.uca.fr>
Date: Tue, 21 Nov 2023 21:55:19 +0100
Subject: [PATCH] java

---
 .../out/production/TP3/controlers/Main.class  | Bin 601 -> 0 bytes
 .../out/production/TP3/data/Serialiser.class  | Bin 265 -> 0 bytes
 .../TP3/out/production/TP3/main/Main.class    | Bin 0 -> 1071 bytes
 .../out/production/TP3/models/Vehicule.class  | Bin 932 -> 932 bytes
 .../TP3/models/VehiculeTheque.class           | Bin 1242 -> 1390 bytes
 .../out/production/TP3/models/Voiture.class   | Bin 1171 -> 1155 bytes
 2A/Java/tp/3_tp/TP3/src/data/Serialiser.java  |  24 ++++++++---------
 2A/Java/tp/3_tp/TP3/src/data/Stub.java        |  13 +++++++++
 2A/Java/tp/3_tp/TP3/src/main/Main.java        |  25 +++++++++---------
 2A/Java/tp/3_tp/TP3/src/models/Vehicule.java  |   4 +--
 .../3_tp/TP3/src/models/VehiculeTheque.java   |   6 ++++-
 2A/Java/tp/3_tp/TP3/src/models/Voiture.java   |   4 +--
 12 files changed, 45 insertions(+), 31 deletions(-)
 delete mode 100644 2A/Java/tp/3_tp/TP3/out/production/TP3/controlers/Main.class
 delete mode 100644 2A/Java/tp/3_tp/TP3/out/production/TP3/data/Serialiser.class
 create mode 100644 2A/Java/tp/3_tp/TP3/out/production/TP3/main/Main.class

diff --git a/2A/Java/tp/3_tp/TP3/out/production/TP3/controlers/Main.class b/2A/Java/tp/3_tp/TP3/out/production/TP3/controlers/Main.class
deleted file mode 100644
index 5180302a77665de013d519e2f29f6aaa8a2d45ad..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 601
zcmZuu$xg#C5PfdbrU_wdS<1dvDjbN!wZNqkr?N;zy>N1aRgBUYB@Pmw1qVPJ_y9f%
zF-|J6sF$&4=Dj!1p3krM4*<t#xG11#!}3r<nPKLRKX5<f(ZIjx--$pol#gU2^$A0<
zxz}@0fn&q<Fahrmy!)7FF(i~qi8SBIgrxE>V;SkLjs+jKDwra@wn_t)x|qSNjjD$l
z<``;Y@C^37VTTb3Hgm<y8p+9M(Aw*{Siqu<x`!p>emYQ*j#Vh)#6RPbXs#BC&IdAB
zZFM6E)sc}nPltUGU-5oOm1;)?JnZpUntW8W^sP)7W;_2xTO>5h#21>^<4jSX#{;6)
z#<a;&SEX?vPNkXb7@G&??bxEX6lf_x5zK6Z;xc7Eos7=X{wvrMT?$yCXxe~{Rf=8?
zz#7&mbIfN@#gH2#N#_}Mb@Bz%Mu24kX7fOm7Fr|91~x~O!wdmfZ<zlXm!lWSTm9Ea
Oi(GGK_#KJ`?0y5C0Cjc%

diff --git a/2A/Java/tp/3_tp/TP3/out/production/TP3/data/Serialiser.class b/2A/Java/tp/3_tp/TP3/out/production/TP3/data/Serialiser.class
deleted file mode 100644
index 494a8affe681867a256cd96d7c8349f373b3e764..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 265
zcmZ8by9&ZU5S)#P(fEk^2X<;<KEOvKSOqN<`%OIbLQEiu{+E?t;RpCp;zk6)JD9zh
z+1;Dx>;3>RL&t%EiVd>~3spiV;tP8*CkJmGL@F!@)u~Q&F(*_8!<~&9!QFGg-bQ7b
zW1XvvU@p?V62sStTAfdU%C;QDqV)VU<ao!@D*P*&#Zl*kuK%}ZLU1<eISbWNm&5Mw
vi*cC?eb^GWJS0~F3)Y2s9}ZZf8|W&60Y|X3AtMdJ=I3omZ3!c^1r4}wt6ep;

diff --git a/2A/Java/tp/3_tp/TP3/out/production/TP3/main/Main.class b/2A/Java/tp/3_tp/TP3/out/production/TP3/main/Main.class
new file mode 100644
index 0000000000000000000000000000000000000000..4e2eb0ae1c665b1b720263cc6a089792e91b8497
GIT binary patch
literal 1071
zcmZuw?M@Rx6g|@}>~_0Q*cMP!1QlruWo;{nln();CN64H(uDYHsgp8f+tuwXiErVn
z=nqgyd;lNHc&8sA$e%kO_s%`%+<WKupP#<~tmC<f7~(oK3j-Kr7&-EeJ;(Q24d?B_
z5wA;z!8Oqma)TkB&DC@m3}emU1NYlbjUS47<nz5l{wd-nbd@Q|Fx>YCLPjAsFvJi$
zE*eNNn8jkTu(e$%l}aW|j4E84VJ_=lAXjB5T8+y8H@TXDjLKCqFiyG3<#OTWtHR3i
zk^;YB;U*>-Qr=MzNgnp;F=VoCpHh!<C09$}Hty({vTzsEmy}mOw<T|qU`j)3yF5hT
zydzqY$Z@Y(QGoX>+{Xg~Y;fuFb|0_JU}tmPSCJIH<BGPdB=Hb)I<gjW$Wx6va?jli
zh77v872V$JP9J*JFtLDwjztR&9x<dl?=O>L&_61Qev4RNQ_x(^L<wabk1Z^zZYP?a
zXgRxNh_d8u*_Y7mD1){`ohE^<Xz@2u^MHqY-hodywj0zvzvhKPoqLy>JQO58>7J*p
zkkI2xQ^GKDwHIA53LU-bp*v0GVi?c9ziu4J?}ZJ*Okd-s0jUO2Sm!T<qMT4V7ggCX
zLuH83`~z_?HTYzg>EzJLXdTF(f_<e;3{S`^H>lq$WUX!ho??|w2~|hBQIEesqjbRP
z8T9>ABwnAv+_x=z_!J{<XP>smXuq4EKfy$Pfy_7D%Aa872WA;gFn@tKMQAF!L0=?;
zB&G>>7DLEmn2=K)CewswkdO-2C^kdmHAEkpQS2n0)`@!p8`$izD^ZM6p?yd30!RIR
Vz@|*;f7EGshOJKgHrW_<{sIjC=FI>A

literal 0
HcmV?d00001

diff --git a/2A/Java/tp/3_tp/TP3/out/production/TP3/models/Vehicule.class b/2A/Java/tp/3_tp/TP3/out/production/TP3/models/Vehicule.class
index 6464de55a73e489682d40d754367149afa05283b..7ee983c1640942745795fce235c4e086aa172503 100644
GIT binary patch
delta 77
zcmZ3&zJz^410ypBgZ$($CIvx$HU>p51|<e%b_Nw51|bI3$rBk5O)g_9;$&gqX5e99
fU|^a2k!hZ&0s|w19D^E=&jn<uGiWksGe`me5vL1^

delta 105
zcmZ3&zJz^41EU~68-qL-g93vhJA)DrgAjxA<SmSclsOnw85v~5QZq7>OLJ1I^YU|T
z)fv@w6bf<@3rkZ$?Apm?Ohueb4BQMn3=9lRlRq-e6P06NWKdyH1M<0mEOiD=25kmO
E0I4PvKL7v#

diff --git a/2A/Java/tp/3_tp/TP3/out/production/TP3/models/VehiculeTheque.class b/2A/Java/tp/3_tp/TP3/out/production/TP3/models/VehiculeTheque.class
index 650495e268a7f211d73a3ea54af65e652b011c6e..b85a8e1e7713ac6da0ad1b94b3e288effe77a052 100644
GIT binary patch
delta 320
zcmXAj%}T>S6ot=BV$-IfwbEDwu|^Fhts4JYe`;5{5wa6pxrs7pBy`~<ZheS(0DS}n
zS1tqvH-cLiK7@}T-X@Egd(Ppzhx=3cHO<ezmsbEo44=#|=3k056!KJD#TQv3B*T>F
zhu6_<6l7_f1Ys=G0fX!L>YTain`K%V>&nrbM!keh6I<9e(6ca$zB=RYHiLCM8i||3
zB$84{1ADZs-gryh^O|O0pzgF@gQJEz80P2_jy81lp`9FY%##l&XEY}|&oCczz@fjC
zhgB?)wh91?SRz-HEK}yeS1rBUuA_>{oSdfmF<+2l)j?N9dcV?y4x7$sst4V6SBT<R
W#Tv~rHEqxfutUxywTpcmVCEm)e=%<W

delta 224
zcmaFIb&Heh)W2Q(7#J9A8LT#Pon@S?##AE6&&Ht3#h}Na&(2`L!yv<8IQcx&A!ZH+
z<H>WG6h#>scs%p+Qj45(5{rvdi`f~>7#UP2Uu2f!Qt`>p&n_)sXRw%jj@eX@k%5na
zpMjA<4rn|RgFFNCWD%C&$!l1&<hdER8F(0!fZ}3683rI*nL!0egIMYe8k4`Wm^lkD
zurLS$O%MR9;{lq(05lDvj+sFd$YWyAV$cTC96&i8AU0w!0rI$jEK>$^21^D>0I3xr
AWdHyG

diff --git a/2A/Java/tp/3_tp/TP3/out/production/TP3/models/Voiture.class b/2A/Java/tp/3_tp/TP3/out/production/TP3/models/Voiture.class
index 9ae2f7444a5c906da2e593f176e73bb2904557ac..ee915ddad0ec71e3bdffeb765ce813b2fcc0d016 100644
GIT binary patch
delta 129
zcmbQt+041&45Kjzg9;;qOjv$qNoi4PbzXk1tvaK+jzU3BVqs}2h+WIi#-PT<pw6Jd
z&Y;P|AjF_G`7Yz3$p@JVCOa~l^RhCqFt9OjGO#o7F>p+7We#BEo_vkjhLL}=FpDdr
e$mB>CRZ&$2Mh0aDZ3YGgE+9*XL65<JK@tF<3mFms

delta 119
zcmWNIyA8rH6aeqp7Kx366(o?TC?NcWQc}>SNXIBNOuz_l5mtbL3W<@xy5g?6yI24C
zNSy{O0}ZQ!b!5y&fAX>=JN?RBpXQnjh9MEM6H!}xstOz>J~JZd&0eI^w>?X()^#$~
S-Zhg2!j^shLaqZxT4sN_8WCdv

diff --git a/2A/Java/tp/3_tp/TP3/src/data/Serialiser.java b/2A/Java/tp/3_tp/TP3/src/data/Serialiser.java
index 57c9d9a..fe72393 100644
--- a/2A/Java/tp/3_tp/TP3/src/data/Serialiser.java
+++ b/2A/Java/tp/3_tp/TP3/src/data/Serialiser.java
@@ -4,7 +4,7 @@ import models.VehiculeTheque;
 
 import java.io.*;
 
-public class Serialiser {
+//public class Serialiser {
 //    try (
 //    BufferedReader in = new BufferedReader(
 //            new FileReader("donnees.txt"))) {
@@ -18,14 +18,14 @@ public class Serialiser {
 //    } catch (IOException e) {
 //// Gestion erreur
 //    }public record Personne (String nom, int age) implements Serializable {}
-// dans le code
-    VehiculeTheque vehiculeTheque = new VehiculeTheque();
-
-    try (
-    ObjectOutputStream out = new ObjectOutputStream(
-        new FileOutputStream("data.ser"))) {
-        out.writeObject(vehiculeTheque);
-    } catch (IOException e;) {
-        // Gestion erreur
-    }
-}
+//// dans le code
+//    VehiculeTheque vehiculeTheque = new VehiculeTheque();
+//
+//    try (
+//    ObjectOutputStream out = new ObjectOutputStream(
+//        new FileOutputStream("data.ser"))) {
+//        out.writeObject(vehiculeTheque);
+//    } catch (IOException e;) {
+//        // Gestion erreur
+//    }
+//}
diff --git a/2A/Java/tp/3_tp/TP3/src/data/Stub.java b/2A/Java/tp/3_tp/TP3/src/data/Stub.java
index 1931915..0dd766c 100644
--- a/2A/Java/tp/3_tp/TP3/src/data/Stub.java
+++ b/2A/Java/tp/3_tp/TP3/src/data/Stub.java
@@ -1,4 +1,17 @@
 package data;
 
+import models.Vehicule;
+import models.VehiculeTheque;
+import models.Voiture;
+
 public class Stub {
+    public static VehiculeTheque Stub(){
+        VehiculeTheque vehiculeTheque = new VehiculeTheque();
+        vehiculeTheque.ajouterVehicule(new Voiture("Merco", "ABC-123"));
+        vehiculeTheque.ajouterVehicule(new Voiture("Audi", "XYZ-987"));
+        vehiculeTheque.ajouterVehicule(new Voiture("Renault", "HIJ-456"));
+
+        // Retourne la collection de test
+        return vehiculeTheque;
+    }
 }
diff --git a/2A/Java/tp/3_tp/TP3/src/main/Main.java b/2A/Java/tp/3_tp/TP3/src/main/Main.java
index 6a4fa6c..4d9e1df 100644
--- a/2A/Java/tp/3_tp/TP3/src/main/Main.java
+++ b/2A/Java/tp/3_tp/TP3/src/main/Main.java
@@ -1,21 +1,20 @@
 package main;
 
-public class Main {
-//    public static void testVehiculeTheque(){
-//        VehiculeTheque vehiculeTheque = new VehiculeTheque();
-//        Vehicule v1 = new Voiture("v1", "111-AB-222");
-//        Vehicule v2 = new Voiture("v2", "333-GH-865");
-//        vehiculeTheque.lesVehicules.add(v1);
-////        vehiculeTheque.ajouterVehicule(v2);
-//        System.out.println(VehiculeTheque.lesVehicules.toString());
-//    }
+import models.Vehicule;
+import models.VehiculeTheque;
+import models.Voiture;
 
-    public static void testCoucou(){
-        System.out.println("Coucou");
+public class Main {
+    public static void testVehiculeTheque(){
+        VehiculeTheque vehiculeTheque = new VehiculeTheque();
+        Vehicule v1 = new Voiture("v1", "111-AB-222");
+        Vehicule v2 = new Voiture("v2", "333-GH-865");
+        vehiculeTheque.ajouterVehicule(v1);
+        vehiculeTheque.ajouterVehicule(v2);
+        System.out.println(vehiculeTheque.getLesVehicules().toString());
     }
 
     public static void main(String[] args){
-//        testVehiculeTheque();
-        testCoucou();
+        testVehiculeTheque();
     }
 }
diff --git a/2A/Java/tp/3_tp/TP3/src/models/Vehicule.java b/2A/Java/tp/3_tp/TP3/src/models/Vehicule.java
index d63329d..0e4eed0 100644
--- a/2A/Java/tp/3_tp/TP3/src/models/Vehicule.java
+++ b/2A/Java/tp/3_tp/TP3/src/models/Vehicule.java
@@ -1,8 +1,8 @@
 package models;
 
 public abstract class Vehicule {
-    private String nom;
-    private String plaque;
+    protected String nom;
+    protected String plaque;
 
     @Override
     public String toString() {
diff --git a/2A/Java/tp/3_tp/TP3/src/models/VehiculeTheque.java b/2A/Java/tp/3_tp/TP3/src/models/VehiculeTheque.java
index 8197b44..4da5e68 100644
--- a/2A/Java/tp/3_tp/TP3/src/models/VehiculeTheque.java
+++ b/2A/Java/tp/3_tp/TP3/src/models/VehiculeTheque.java
@@ -5,7 +5,11 @@ import java.util.List;
 
 public class VehiculeTheque {
 
-    public List<Vehicule> lesVehicules = new ArrayList<>();
+    private List<Vehicule> lesVehicules = new ArrayList<>();
+
+    public List<Vehicule> getLesVehicules() {
+        return this.lesVehicules;
+    }
 
     public void ajouterVehicule(Vehicule v) {
         lesVehicules.add(v);
diff --git a/2A/Java/tp/3_tp/TP3/src/models/Voiture.java b/2A/Java/tp/3_tp/TP3/src/models/Voiture.java
index 8b6b095..b617a3d 100644
--- a/2A/Java/tp/3_tp/TP3/src/models/Voiture.java
+++ b/2A/Java/tp/3_tp/TP3/src/models/Voiture.java
@@ -1,8 +1,6 @@
 package models;
 
 public class Voiture extends Vehicule {
-    private String nom;
-    private String plaque;
 
     public Voiture(String nomV, String plaqueV) {
         this.nom = nomV;
@@ -22,6 +20,6 @@ public class Voiture extends Vehicule {
         return "Voiture{" +
                 "nom='" + nom + '\'' +
                 ", plaque='" + plaque + '\'' +
-                '}';
+                "}\n";
     }
 }