push

src/main/java/fr/univlille/iutinfo/m3105/q1/Subject.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 public abstract class Subject {
 	public List<Observer> observers = new ArrayList<>();
+
 	public void attach(Observer obs) {
 		this.observers.add(obs);
 	}
@@ -25,9 +26,8 @@ public abstract class Subject {
 		if (this.observers != null) {
 			for (int i = 0; i < this.observers.size(); i++) {
 				this.observers.get(i).update(this, data);
-			}		}
 			}
-
-
+		}
+	}
 
 }

src/main/java/fr/univlille/iutinfo/m3105/q2/ConnectableProperty.java

 package fr.univlille.iutinfo.m3105.q2;
 
-public class ConnectableProperty extends ObservableProperty {
+import fr.univlille.iutinfo.m3105.q1.Observer;
+import fr.univlille.iutinfo.m3105.q1.Subject;
+
+public class ConnectableProperty extends ObservableProperty implements Observer{
 
 	public void connectTo(ConnectableProperty p2) {
+		p2.attach(this);
+		this.setValue(p2.getValue());
 	}
 
 	public void biconnectTo(ConnectableProperty p2) {
+		this.attach(p2);
+		connectTo(p2);
 	}
 
 	public void unconnectFrom(ConnectableProperty p2) {
+		p2.detach(this);
+	}
+
+	@Override
+	public void update(Subject subj){
+		// TODO Auto-generated method stub
+	}
+
+	@Override
+	public void update(Subject subj, Object data) {
+		if(this.getValue()!=data) {
+			this.setValue(data);
+		}
 		}
 
 }