From b53f24108a082114cc237cfdbed344a98c3a02f2 Mon Sep 17 00:00:00 2001
From: f20021643 <alexandre.fournel@etu.univ-amu.fr>
Date: Wed, 14 Dec 2022 09:58:04 +0100
Subject: [PATCH] task 5
---
.../7.4/executionHistory/executionHistory.bin | Bin 26483 -> 26483 bytes
.../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes
.gradle/7.4/fileHashes/fileHashes.bin | Bin 19047 -> 19047 bytes
.gradle/7.4/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes
.../7.4/fileHashes/resourceHashesCache.bin | Bin 19755 -> 20163 bytes
.../buildOutputCleanup.lock | Bin 17 -> 17 bytes
.../fr/univamu/ticker/PrintHourTicable.class | Bin 1390 -> 1419 bytes
.../fr/univamu/ticker/PrintHourTicable.java | 16 +++++++++-------
8 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/.gradle/7.4/executionHistory/executionHistory.bin b/.gradle/7.4/executionHistory/executionHistory.bin
index a2b845bbb0ca2febcb0e7b5d747bf635090d4ae4..978fcc62f0b804b70c3d8ae430db73f1d0428234 100644
GIT binary patch
delta 264
zcmex-j`8z3#tkQ8l&W%!s`5+IGSl*sQz}xb%=5}BOmdQql5;W{AfSJ9p~rLP$#!93
zlhqUZgswj-WBm2<?3bHd0dL+*H!f#fG1=Ewe6m2ez~*;}e;5VKWUmXP-x1VUyuj#I
z!T;>HlOOnXPi{>SU|#X<>EszH>JpkE2j~CYI9L1Lrb()?R(jLteS7-vf<ZU;WVtBK
zNvW}(msPdD9Pv!~oMrUa^k;?8GiC;X^Gm-*`Ft>8`O*2(Lh9Dkf6NR5&Mj|yJ{?)g
z<!7?$g78k;56lb#E{}OGWj&s5wa-LS_`&<?cbnfvt!I>rj6Jr$tWdzc{a^B>7xvLF
Qj)1MZ%*4XTz`(T?0ItJ&z5oCK
delta 264
zcmex-j`8z3#tkQ8lv1;^3QdeN%#!kwvrJPni;_$evx<{avXV>~AYjVoLXYRnlkLL7
zCaWj*2{FEq`&YRvcAMq~Hpa(GUrRHtnC$B-K3O1KVDr1gKa2t_KaXtimphx|+IK<h
z`^BC`lOOnXPi{>SV1B>2Ve*U=b&2St+7-LQJGsnOEy`%j{JQ4(;)Z`04Bl}~mW$Gy
zlp5>F@#I4bSMc%6=Qms^6AiEGVrCGCPcIBQsk7^>8Q+$!=tVAJ%nSmH>nej2cZC*L
zvhhl9RW^FW%pj0@f9CD`d}$k2SjK1cFsz=w`EAsCM!DAJTq!SeX67|FvhAyi=AY<X
P0<!Kh6AL2)1J_mnxvg*w
diff --git a/.gradle/7.4/executionHistory/executionHistory.lock b/.gradle/7.4/executionHistory/executionHistory.lock
index 96628decf31d45cf9aef53cc4f01ac0f53fca547..4c209d6daea80e0c6c924d48e12376a726219498 100644
GIT binary patch
literal 17
UcmZSPTPC&MXA@5t0|YDu03?P3h5!Hn
literal 17
UcmZSPTPC&MXA@5t0|XQS03=fbQvd(}
diff --git a/.gradle/7.4/fileHashes/fileHashes.bin b/.gradle/7.4/fileHashes/fileHashes.bin
index 5bb4c05a23c63a53f75679be0961affcf24b3031..a7d847c5c8e3e4fd01aae5417d0dfccd0eeae9fa 100644
GIT binary patch
delta 176
zcmaDph4J|m#tnx&>u*+TFn|HmYX$}eJ!1w222BPA21O7Sh>Sh9zpPNez5QSEr5E<m
zFBljYTlsHRyMQ$?Fa~4l;1pj!WnIpmfX3BDF;&7}mqBz?EP?1?;X&7-rYN8pa&Z3N
ajdQi{ZJMMSYo#|GqNQ36qJ^~^qy+$ovMO`{
delta 176
zcmaDph4J|m#tnx&>kkONX8;4H*9;5{dd3V444MoK42mEu(Au0U<z>#yyyix>eO1x?
z6ATQDt^5asIKdhi7=tl&NHe;ZHW^Qz<SVDsD4Q#A8=`~%21Ez*BXk{ViUQF|wJUaq
ZcXFAnT9nb4`E?CMi{NvJ7S=qF767YrCO-fG
diff --git a/.gradle/7.4/fileHashes/fileHashes.lock b/.gradle/7.4/fileHashes/fileHashes.lock
index fc42a103debcd7d7d44038dab3a30c811c5943c6..fec4fd0104fefd2abee0f897c4399ec548bc1a64 100644
GIT binary patch
literal 17
VcmZQRTK1apX2SJn3}C=m3jjZ?1)l%_
literal 17
VcmZQRTK1apX2SJn3}C=02mn7o1v3Bu
diff --git a/.gradle/7.4/fileHashes/resourceHashesCache.bin b/.gradle/7.4/fileHashes/resourceHashesCache.bin
index 989a99e595b597b0324c61780405dda2a0c0beb0..9a4a18bad584be548b225b4de2492a9b4940ac77 100644
GIT binary patch
delta 705
zcmZ2Ii}CPW#tkMCjE0*{B{&!z)*D^kVq1GLhXD+HzyF7V9Tz5WSt_j60ShzuYD0zp
z?{!K0^HiX%1S;-3*;G=IfAWjF2LtwWL&W^7C;LiT2;7U+7ddXqdI}=wdv$WHq=mqr
z?Tcq?&o|?R3QnB7R#HKLK`L<ltaDO)5JA8C$wws>1el)-H>V$qo(L6;oqSi)LO@||
z@}5WP+b%!^eK$|$l~NEeOmNiy%%sl^5%gO)Syf6w!~6te`O(RercgminDZ_FGcmXA
z6ET2@`{r-9m8xQ7Vp+LS@rU?Eg972rjvlXA>Wvu~7$g}O7z9CBAj{~x+9XAmCa2Z<
zYog;4-Z3yR$f2q*$_V&wwK0E|oSjIl*ULkjF;yHges#6ab&mbs(rK+fm$O{KRIy6I
zM$$;AW?@c9dwrY171!OEN&<5tx0hyo-}tR!s?z^|@#`>E)Yk9sYv(Q%`upt+`=MV2
z(U>aCHpV^P`f&Ty#d+njo)1nrVydXrtapz&uB4G(9m?~<<-e64rV^RC(t(~jPKOfi
z+)49NU<t-l5v1DLrQiFxQggC*c}9M$AEt_zYo>VzURAuG-kHPS?;SrINrf~t;IBU_
VWBm2<?3bHd0dL+*H!cS$0RSnY$;to#
delta 69
zcmX>+mvQwh#tkMCjH;VWB{&!-w@OM*-X^I(`LCqGWLGJP$)!>flb1>vOnxgRF<Dkx
bVsol=5hD|G=SIaJ;u{Snh-`NBc*Oz$GAS3P
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
index aec899638e611bd834a0167350e53468df3358dc..3c4719f0538819c2fdbb21c98e062c4a62297338 100644
GIT binary patch
literal 17
VcmZQR-&t|dwP4P61~6b`0027u1g-!8
literal 17
UcmZQR-&t|dwP4P61_;;z06Vh<WdHyG
diff --git a/build/classes/java/main/fr/univamu/ticker/PrintHourTicable.class b/build/classes/java/main/fr/univamu/ticker/PrintHourTicable.class
index 3f1019049689e5500fb1c9f3e6fdcc2f41060ea9..be3191e8453e07339100b7e0aa13ef3c46d548f8 100644
GIT binary patch
delta 529
zcmaFI)y>Uy>ff$?3=9mm3?3V~elW&!F>o-L@GzJ%m@zW2CFUd+<)$(+uxogFdU|Sx
zaWGggGRV55CgqowC?u<=7MCcL6(wforskC><fvz)mKLRQFjz4%h@mKf$|xwZGuTYF
zVCs-&DM>9ZVPxP9E=f$z_Dw7ZNleN~Wn^G3N-dcDfJu+hdNMz=E~D*aTV_>lI|c>@
zF$Pu!1_n+B76vW`P6loUJ_a5JVFq3Xdj<vuEd~|_1_luZ2L{K<z0AtOP7G`ej10C6
z3=H2GI2o827#L<xKFS=(=rdWI#k4+h3xfem!d3<YZDwWxE&;A>48|K77#NrtK-MTR
za4;}12rx)62r?Kj2r<|(2r~pRh%mG<h%!uI5M!9dAPKfo3}P(EN(KgoAO=qcX9h<G
zMg|uK1_o9JW(jd#21ZZ-LftWsfeGw>Bdsm<3<jbs3mCXJF^CD7Z)4EX+QPsty?{Yl
zYYPLf%mM~stt|`!vQT-;Z46onw?TqHhJlkomO+p~o<WmAfx(bL3G5ydi1ASOFfbS~
ya5L~QFfxEx{0ux`*BUVhG4L?RGlK<P8F(02z|Li1U=oyPU}SJ(U|?Wka0dX8;!~;s
delta 476
zcmeC?e#gai>ff$?3=9mm4DK7belVJGFqkkhaHkYy=A|ouNiGHs1~VQ8a|TgH2DZeU
z#G>3(4hBm`2F~)t>{Nx)0tH2O2J6X*OdSdwxtV#TC8?!Fj0`L#sl_FX47|Z5iOJc%
zi3K5vNja&LS(x=0ttJ~Y>oVF*PGnZqwq;;o5My9vU|`^6U}4~5;AG%t;A7xn5N6<I
zuw!6g&|+X=U|<kouxD_XypdU1)RBRWfsw(6fq_wxfs=umfq`K)ht1^Y%z=!)lPy_H
z>$fl%NH1XE-ozj#WW0?*ODl2<g8@szRt5tdW@Z7dZ49Ox85kIt89>%*F>o<3FbFU(
zF$gk9F$ggjF$gm_Fo-aOFo-gAFo-eCU=U|m#2~@2ia`?W6a|QNAg3@eFfcK!WN>2O
zVPIqkVF+h%W^iC&VsK$lXJFuCVEMx!#VF4EhasGufrEh&6mAeVGgL7!f&HU6`45Xs
zg2grlErfIUz{blkNHEAUC@{!_t%Ueq5o#p^gCYYr*h&zKpMi&gi2=kCV&Gw5W^e&}
Oj8TDsk--)0J~sf10Y-iR
diff --git a/src/main/java/fr/univamu/ticker/PrintHourTicable.java b/src/main/java/fr/univamu/ticker/PrintHourTicable.java
index 3745d15..a8afccd 100644
--- a/src/main/java/fr/univamu/ticker/PrintHourTicable.java
+++ b/src/main/java/fr/univamu/ticker/PrintHourTicable.java
@@ -13,21 +13,23 @@ public class PrintHourTicable implements Tickable{
}
public void notifyTick(){
- //int minuteur = 10;
if (seconds >= 60){seconds = 0; minutes ++;}
if (minutes >= 60){minutes = 0; hour ++;}
if (hour >= 24) {hour = 0;}
- PrintHourTicable test = new PrintHourTicable(hour, seconds, minutes);
+ PrintHourTicable test = new PrintHourTicable(hour,minutes, seconds);
System.out.println(String.format("%02d:%02d:%02d", hour , minutes, seconds++));
- test.alarme(7,0,0);
- //if (unit == minuteur){System.out.println("dring dring");}
- //unit ++;
+ unit ++;
+ test.alarme(0,0, 10,10);
+
}
- public void alarme(int hour, int minutes, int seconds){
+ public void alarme(int hour, int minutes, int seconds, int rep){
+ if (unit == rep){
+ System.out.println("Debout c'est vraiment l'heure");
+ }
if (this.hour == hour && this.minutes == minutes && this.seconds == seconds){
- System.out.println("wake up !");
+ System.out.println("Debout c'est l'heure !");
}
}
}
--
GitLab