diff --git a/src/impl/Afficheur.java b/src/impl/Afficheur.java index 43b445a..932b36e 100644 --- a/src/impl/Afficheur.java +++ b/src/impl/Afficheur.java @@ -2,10 +2,13 @@ package impl; import interfaces.Capteur; import interfaces.ObserverdeCapteur; + +import java.util.Random; import java.util.concurrent.Future; public class Afficheur implements ObserverdeCapteur { private Canal canalAsync; + private int id= new Random().nextInt(100); public Afficheur() {} @@ -23,7 +26,7 @@ public class Afficheur implements ObserverdeCapteur { try{ Future futureValue= canalAsync.getValue(); Integer value=futureValue.get(); - System.out.println(value); + System.out.println("Afficheur " + id+", value: "+ value); }catch(Exception e){ //TODO e.printStackTrace(); diff --git a/src/interfaces/Observer.java b/src/interfaces/Observer.java deleted file mode 100644 index 99da751..0000000 --- a/src/interfaces/Observer.java +++ /dev/null @@ -1,4 +0,0 @@ -package interfaces; -public interface Observer { - public void update(T subject); -} diff --git a/src/interfaces/ObserverdeCapteur.java b/src/interfaces/ObserverdeCapteur.java index dc8451e..f1e9ded 100644 --- a/src/interfaces/ObserverdeCapteur.java +++ b/src/interfaces/ObserverdeCapteur.java @@ -1,6 +1,5 @@ package interfaces; -public interface ObserverdeCapteur extends Observer{ +public interface ObserverdeCapteur{ //AO1 - servant - @Override public void update(Capteur subject); } diff --git a/src/interfaces/Subject.java b/src/interfaces/Subject.java deleted file mode 100644 index bec4e9d..0000000 --- a/src/interfaces/Subject.java +++ /dev/null @@ -1,5 +0,0 @@ -package interfaces; -public interface Subject { - public void attach(Observer o); - public void detach(Observer o); -}