From 4e60d98e396105f9be08ccb719373cb94e578dce Mon Sep 17 00:00:00 2001
From: Aurelien PINTRAND <Aurelien.PINTRAND@etu.uca.fr>
Date: Sat, 21 Jan 2023 08:07:23 +0100
Subject: [PATCH] commit

---
 WeatherStation/src/launch/Launch.java         |   9 ++++--
 WeatherStation/src/modele/SensorManager.java  |  30 ++++++++++++++++++
 .../src/views/WeatherController.java          |   9 +++---
 .../views/WeatherController$1.class           | Bin 1194 -> 1200 bytes
 .../views/WeatherController.class             | Bin 5224 -> 5260 bytes
 5 files changed, 41 insertions(+), 7 deletions(-)
 create mode 100644 WeatherStation/src/modele/SensorManager.java

diff --git a/WeatherStation/src/launch/Launch.java b/WeatherStation/src/launch/Launch.java
index 278eb17..01b60b4 100644
--- a/WeatherStation/src/launch/Launch.java
+++ b/WeatherStation/src/launch/Launch.java
@@ -4,6 +4,7 @@ import javafx.application.Application;
 import javafx.stage.Stage;
 import modele.ConcreteSensor;
 import modele.Sensor;
+import modele.SensorManager;
 import modele.VirtualSensor;
 import views.WeatherController;
 
@@ -14,15 +15,17 @@ public class Launch extends Application {
     @Override
     public void start(Stage primaryStage) throws Exception {
         //Create captors here
-        List<Sensor> sensorsList = new ArrayList<>();
+        SensorManager.getInstance();
+
         VirtualSensor virtualSensor = new VirtualSensor(new ArrayList<>(), 0, "testmachin", 54);
         ConcreteSensor concreteSensor1 = new ConcreteSensor(3);
         ConcreteSensor concreteSensor2 = new ConcreteSensor(78);
         virtualSensor.addSensor(concreteSensor1,concreteSensor1.getWeight());
         virtualSensor.addSensor(concreteSensor2,concreteSensor2.getWeight());
-        sensorsList.add(virtualSensor);
 
-        WeatherController weatherController = new WeatherController(sensorsList,"FXML/WeatherStation.fxml","WeatherStation");
+        SensorManager.getInstance().addSensor(virtualSensor);
+
+        WeatherController weatherController = new WeatherController(SensorManager.getInstance().getSensorList(), "FXML/WeatherStation.fxml","WeatherStation");
 
     }
 }
diff --git a/WeatherStation/src/modele/SensorManager.java b/WeatherStation/src/modele/SensorManager.java
new file mode 100644
index 0000000..7543012
--- /dev/null
+++ b/WeatherStation/src/modele/SensorManager.java
@@ -0,0 +1,30 @@
+package modele;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SensorManager {
+    private static SensorManager instance;
+
+    private List<Sensor> sensorList;
+
+    private SensorManager() {
+        sensorList = new ArrayList<>();
+    }
+
+    public static SensorManager getInstance() {
+        if (instance == null) {
+            instance = new SensorManager();
+        }
+        return instance;
+    }
+
+    public void addSensor(Sensor sensor) {
+        sensorList.add(sensor);
+    }
+
+    public List<Sensor> getSensorList() {
+        return sensorList;
+    }
+}
+
diff --git a/WeatherStation/src/views/WeatherController.java b/WeatherStation/src/views/WeatherController.java
index 2945c29..8d32565 100644
--- a/WeatherStation/src/views/WeatherController.java
+++ b/WeatherStation/src/views/WeatherController.java
@@ -4,6 +4,7 @@ import javafx.fxml.FXML;
 import javafx.scene.control.*;
 import modele.ConcreteSensor;
 import modele.Sensor;
+import modele.SensorManager;
 import modele.VirtualSensor;
 
 import java.io.IOException;
@@ -35,11 +36,10 @@ public class WeatherController extends FXMLWindow {
             root.getChildren().add(sensorItem);
         }
 
-
-
+        this.initializeSensor();
     }
 
-    public void initialize(){
+    public void initializeSensor(){
         //------------------------------------------------------------------------------------------------------
 
         sensor = new ConcreteSensor(56);
@@ -50,7 +50,8 @@ public class WeatherController extends FXMLWindow {
                 if (empty) {
                     setText(null);
                 } else {
-                    textProperty().bindBidirectional(item.getName());
+                   // setText(item.getName().getValue().toString());
+                   textProperty().bindBidirectional(item.getName());
                 }
             }
         });
diff --git a/out/production/WeatherStation/views/WeatherController$1.class b/out/production/WeatherStation/views/WeatherController$1.class
index 47780536126f566462a2db4e3ef7b447895fb3c2..6d02f91a91a6e924025b72a9d7102ba9003b38d7 100644
GIT binary patch
delta 55
zcmZ3*xq)+oHnX5WW?p7VW@1ieRcdf*UU7cWWHaViM!m^XnBzGO7}yvL8MqjXCjVhh
K2a2VzxB&p^WDpJj

delta 49
zcmdnMxr%dxHZwO@W?p7VW@1ieRqA9L=2%Ak$+MW_ISm=u7>pRW7>p+~v7`gVvRK>z
DW(5qU

diff --git a/out/production/WeatherStation/views/WeatherController.class b/out/production/WeatherStation/views/WeatherController.class
index ffbd92f8e48d46d80b22b7d249909433e0120999..eed7e3d6b5ad21a87f59b0905a69277d307039b8 100644
GIT binary patch
delta 1481
zcmZ{kd2kd(6vltOyP3&OI>{zPArJy36eJ-W5voKnfF=T#k;7mxpkRO%qML&R5Cse>
z3MvZP;(g$KpmJ{{2wo_Nc%$Miii)=)cz}YhcT!OP;nZxuuU~)f^}BZV<SokgwjFBO
z1Qe^_D$fgc^T?)Da~eYwk?Pv&>D5)S>Pw^L(b~qk21PJ0zrtmhX&dY^a42P(B+gWX
z@=Eh7!eTi>Gm=pXr?HivURF~#IU0-h_8kn!l&i`$qdD8m3J!9{XwIS1Yz!7T<22`T
zp4k^H3Qr*4<$OhssaMCC!H(;Bq%%=7iOFVkXn=EpW(rfy(ony&3%ST8rm3M;k!xb1
zT(duPqN+E&lg2qSH5W6>EJ^B+Q^y<|>|BMLS1M0_g~tS%H1oLJY)L9jp1_rw`CMh%
zI3+0ySm<(%=31^ZRnF9u>$$;Yv1SQ3njKEmF`Apj@gTQ-$6GYF+8Vfx(dnb3HT7X`
z=MI-UHFt5hnd$cJa<3xuXeB#0)>qfoMjJft<9?S1G!OES+3udyeF2YX9;Lq`c}jG8
zMOAD@)RG>zj5e7BctZ0ePnn*{V?rwx*`~8<tGgC?tYEdxZOxkH$^8TBRkPbWPQ7m2
zlu2f8%KY}(v8tMhldHNO4Z-h4*CMkqt*;rT=j8q`rH^88o;gKzG6!`-+7}*QvfJe=
z&DVUhW_D^wsc+4^w8D(<?b!UF`H+ty_WfC0kLvWR)$Y~2!;T0$(jE4D{LUXPf7(R;
zGCk8btAl25dbv7mhD7oMN||Yq6QVLfG9}QB?kLs@3b0OA84p4JK2Eb}965hlB;?TX
z$l3b;oP~swL<>PSfEq!FWZ^fO)QsAUf;c6sWEbKYS&v7Xg&94Xy3rsvZxqciT*i~i
zCY}{kPCGl@a;w<$9M6li=!Ha_7QM)3iNd0n1O+AgvAis{A-0INvuJ#8Tg97ixlW?<
zSzCqmifD722ppyu$0ggvbJ>=7U6(#^K$h)7vPr$xT8cLW%imR2Nsxc=5+N)u*uc=r
zEKYCcjCBkzSWCNt7S4h=6|xx{iZfp1@Hka1L}5ME0dY`QnbpL!EE@f@8ChJ?%<M92
z(Id`fR>rv^&eg59aTZzR?{12-bTzkS-V<k;$Rp&3<2+`|988qC7b$`ZNuw7XIGHXC
zq#vhJMu~hEN->3PB2BjX$NGu1R@xrF$y<`9t)&*}Yu-jhJUe2o1sEyU1ci|%5%ef*
zVYy9tnY})cxZW?%AnEGhM2~G(gw4CWC(@$#+1Vt{Ec}3-1R?=D*RAf0g>G9M-oT2=
zf@W5&l#TD%P9u`k(b&UBrX<YAGNJON<dX#dQ$7=E+qi<y1?7m_UGm$*cl^k%UIKsO
d7k*=(P!907P}+;Gjs?=;uo(HzA%zN%{V#4(Pig=F

delta 1442
zcmZXU2XGWs7{`C_ZnK+gUM@$%ki>z&NRYb(DTCu6Oa?S@C`LrVAV$#x4vYz)A&4Rv
z6$>be`cy=MT|uK_C>IQh4I2t7Dt5t+Sg?1%@7+cm$DO_R{omKy-s1S~n7?Iz`zD}V
zsaD?)hdnCI;Be2P3Pxx$7^!e#mGSB<ia1VF#qs96aCi3v%@|HJ%fmz6v6^w5Y<7hQ
zxZ^daFu@c!1Kb+o9;cbnPEU8D<_yj>bDSaWB+X=|m<`Smk*Q4cI7?H@*@|Mb#3?p~
z8Amzwierp&V`hFv|MCXSEE*Nwv}EJB<n(hC;aI%V9lA^MmB*)!^KFtBh)S$do_MuS
z4Hs(WG2iUTsLZUPNpmrmm?Pba$O10&xLk7uS1MxZD68G_$Re)txLUKAYZN7tNf#6K
zs>+vWuCu}OrzK}38xoC4n}G$h8<IY`+@LYGJ>IM!xh!ttW{;(sTUch6c>~pQv(+oe
zUcqf1w`=a;PP5k=+<O6cYwlr?B2&t$PSnp9cPqHhYUJk;VwL889x!7v$2$)yicAkx
zpi2h$wD7PkcJ<nAnS(;=dE;dts<xQY?8&))?Tp&S+C+Wr+@x)hS(LpnFTXx9ebSUf
z$-g2K*R6&BXP5L>42zkgRd-X6(-7I^^AR6=e4_c3&(<!@ag_SPG)MY$`qGyj*rR!y
zccS+F#+2!SM&}lH-)kk`X<lP{l<m1LKl=Q{&mO<nQhqffb2qEsO(Z(j*{A4b5|IKk
zFPfXd0XunnTN&+^l+{X4^)Py)ctmiBRyk#(1O@jstQC$c@^xw5u5>#nTmK)KBRUzR
z2-5~?I1ZU&G1J65&B(D{9X80>mu$1DQ(04tN98sGkBQ{a&PG9FDYWY@(Zr6&cwDGO
zo6`AN^aM{zbc>!66qX)T^R(DHJR{s5!U?=>7H@%Nt7H{uZ5FL(g<DMM08Qn%9z`C$
z$8+h|^XLzM$nk<G*<xPoXu(T@UuLVEQW*Q>Bd{qfDcwlLgw7n>#_;uwDqTlmX*;8l
z4xA*HYA401LPw=Iy`2P7ZZag9)``jV&P<&d$j<G|>^A09S&On1b1hAAQHo1DY*Q?>
zD7aml;`%k*n0IT6W}yd_?@Dp6ZE^UY77IR{2>r~E{9aAA(OrU^JDOTW1>1N<Dza_U
zLIcjLsHksus-xC1;xQ~55eZh-r=69yx@H?Gl#Ud1VyFyoSbCgx0HV$7ydl)0H`&o7
z&MbV39fYDGyUZQ#%SGL`GHW9(6H427C|EhWCU)VVU)pPsd)C2)$l_gDLiv~EJ<$pA
zJ|76R6Kml^L0!e|PWgS#ZoXn?Ux8oqE#LElsQe})hC_r`#{&K&ON@f&FZN5!qQ3zr
CKR=5A