bdi-network-resilience

diff --git a/network-resilience/src/br/ufrgs/inf/bdinetr/agent/LinkMonitorCapability.java b/network-resilience/src/br/ufrgs/inf/bdinetr/agent/LinkMonitorCapability.java
index 6196db8..f467f73 100644
--- a/network-resilience/src/br/ufrgs/inf/bdinetr/agent/LinkMonitorCapability.java
+++ b/network-resilience/src/br/ufrgs/inf/bdinetr/agent/LinkMonitorCapability.java
@@ -21,6 +21,8 @@
 //----------------------------------------------------------------------------
 package br.ufrgs.inf.bdinetr.agent;
 
+import java.util.Observable;
+import java.util.Observer;
 import java.util.Set;
 
 import bdi4jade.annotation.Parameter;
@@ -43,7 +45,6 @@ import bdi4jade.reasoning.BeliefRevisionStrategy;
 import bdi4jade.reasoning.OptionGenerationFunction;
 import br.ufrgs.inf.bdinetr.domain.Link;
 import br.ufrgs.inf.bdinetr.domain.LinkMonitor;
-import br.ufrgs.inf.bdinetr.domain.Observer;
 import br.ufrgs.inf.bdinetr.domain.Role;
 import br.ufrgs.inf.bdinetr.domain.predicate.AnomalousUsage;
 import br.ufrgs.inf.bdinetr.domain.predicate.AttackPrevented;
@@ -143,7 +144,7 @@ public class LinkMonitorCapability extends RouterAgentCapability implements
 	public LinkMonitorCapability(LinkMonitor linkMonitor,
 			GoalRequestPlan beliefGoalRequestPlan) {
 		this.role = linkMonitor;
-		role.attachObserver(this);
+		role.addObserver(this);
 
 		setBeliefRevisionStrategy(this);
 		setOptionGenerationFunction(this);
@@ -261,7 +262,7 @@ public class LinkMonitorCapability extends RouterAgentCapability implements
 	}
 
 	@Override
-	public void update(Object o, Object arg) {
+	public void update(Observable o, Object arg) {
 		getMyAgent().restart();
 	}
 

diff --git a/network-resilience/src/br/ufrgs/inf/bdinetr/domain/dummy/AbstractRouterComponent.java b/network-resilience/src/br/ufrgs/inf/bdinetr/domain/dummy/AbstractRouterComponent.java
index 12f05f1..d63b533 100644
--- a/network-resilience/src/br/ufrgs/inf/bdinetr/domain/dummy/AbstractRouterComponent.java
+++ b/network-resilience/src/br/ufrgs/inf/bdinetr/domain/dummy/AbstractRouterComponent.java
@@ -21,14 +21,15 @@
 //----------------------------------------------------------------------------
 package br.ufrgs.inf.bdinetr.domain.dummy;
 
-import br.ufrgs.inf.bdinetr.domain.ObservableImpl;
+import java.util.Observable;
+
 import br.ufrgs.inf.bdinetr.domain.Router;
 import br.ufrgs.inf.bdinetr.domain.RouterComponent;
 
 /**
  * @author Ingrid Nunes
  */
-public abstract class AbstractRouterComponent extends ObservableImpl implements
+public abstract class AbstractRouterComponent extends Observable implements
 		RouterComponent {
 
 	protected final Router router;

diff --git a/network-resilience/src/br/ufrgs/inf/bdinetr/domain/dummy/DummyLinkMonitor.java b/network-resilience/src/br/ufrgs/inf/bdinetr/domain/dummy/DummyLinkMonitor.java
index 912b70f..8fbdeae 100644
--- a/network-resilience/src/br/ufrgs/inf/bdinetr/domain/dummy/DummyLinkMonitor.java
+++ b/network-resilience/src/br/ufrgs/inf/bdinetr/domain/dummy/DummyLinkMonitor.java
@@ -63,6 +63,7 @@ public class DummyLinkMonitor extends AbstractRouterComponent implements
 	@Override
 	public void setOverUsage(Link link, boolean overUsage) {
 		this.overUsageLinks.put(link, overUsage);
+		setChanged();
 		notifyObservers(link);
 	}
 

diff --git a/network-resilience/src/br/ufrgs/inf/bdinetr/domain/dummy/DummyRateLimiter.java b/network-resilience/src/br/ufrgs/inf/bdinetr/domain/dummy/DummyRateLimiter.java
index 8f31ae2..d63a4ca 100644
--- a/network-resilience/src/br/ufrgs/inf/bdinetr/domain/dummy/DummyRateLimiter.java
+++ b/network-resilience/src/br/ufrgs/inf/bdinetr/domain/dummy/DummyRateLimiter.java
@@ -61,6 +61,7 @@ public class DummyRateLimiter extends AbstractRouterComponent implements
 	@Override
 	public void limitLink(Link link, double rate) {
 		this.rateLimitedLinks.put(link, rate);
+		setChanged();
 		notifyObservers(new LimitLinkEvent(link));
 	}
 

diff --git a/network-resilience/src/br/ufrgs/inf/bdinetr/domain/Observable.java b/network-resilience/src/br/ufrgs/inf/bdinetr/domain/Observable.java
index f1b603c..ac106cf 100644
--- a/network-resilience/src/br/ufrgs/inf/bdinetr/domain/Observable.java
+++ b/network-resilience/src/br/ufrgs/inf/bdinetr/domain/Observable.java
@@ -21,11 +21,13 @@
 //----------------------------------------------------------------------------
 package br.ufrgs.inf.bdinetr.domain;
 
+import java.util.Observer;
+
 /**
  * @author Ingrid Nunes
  */
 public interface Observable {
 
-	public abstract void attachObserver(Observer observer);
+	public abstract void addObserver(Observer o);
 
 }
\ No newline at end of file

diff --git a/network-resilience/src/br/ufrgs/inf/bdinetr/domain/omnet/EventBroker.java b/network-resilience/src/br/ufrgs/inf/bdinetr/domain/omnet/EventBroker.java
index 9bfdacc..b2a8689 100644
--- a/network-resilience/src/br/ufrgs/inf/bdinetr/domain/omnet/EventBroker.java
+++ b/network-resilience/src/br/ufrgs/inf/bdinetr/domain/omnet/EventBroker.java
@@ -26,11 +26,11 @@ import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.ServerSocket;
 import java.net.Socket;
+import java.util.Observable;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
-import br.ufrgs.inf.bdinetr.domain.ObservableImpl;
 import br.ufrgs.inf.bdinetr.domain.omnet.event.AnomalousEvent;
 import br.ufrgs.inf.bdinetr.domain.omnet.event.OMNeTEvent;
 import br.ufrgs.inf.bdinetr.domain.omnet.event.OverUsageEvent;
@@ -39,7 +39,7 @@ import br.ufrgs.inf.bdinetr.domain.omnet.event.ThreatEvent;
 /**
  * @author Alberto Egon and Ingrid Nunes
  */
-public class EventBroker extends ObservableImpl {
+public class EventBroker extends Observable {
 
 	private class BrokerThread extends Thread {
 
@@ -68,6 +68,7 @@ public class EventBroker extends ObservableImpl {
 
 				// notify observers
 				if (event != null) {
+					setChanged();
 					notifyObservers(event);
 				}
 

diff --git a/network-resilience/src/br/ufrgs/inf/bdinetr/domain/omnet/OMNeTAnomalyDetection.java b/network-resilience/src/br/ufrgs/inf/bdinetr/domain/omnet/OMNeTAnomalyDetection.java
index 6ae53bc..ed685d2 100644
--- a/network-resilience/src/br/ufrgs/inf/bdinetr/domain/omnet/OMNeTAnomalyDetection.java
+++ b/network-resilience/src/br/ufrgs/inf/bdinetr/domain/omnet/OMNeTAnomalyDetection.java
@@ -23,12 +23,13 @@ package br.ufrgs.inf.bdinetr.domain.omnet;
 
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Observable;
+import java.util.Observer;
 import java.util.Set;
 
 import br.ufrgs.inf.bdinetr.domain.AnomalyDetection;
 import br.ufrgs.inf.bdinetr.domain.Ip;
 import br.ufrgs.inf.bdinetr.domain.Link;
-import br.ufrgs.inf.bdinetr.domain.Observer;
 import br.ufrgs.inf.bdinetr.domain.Router;
 import br.ufrgs.inf.bdinetr.domain.omnet.event.AnomalousEvent;
 
@@ -43,7 +44,7 @@ public class OMNeTAnomalyDetection extends OMNeTRouterComponent implements
 	public OMNeTAnomalyDetection(Router router) {
 		super(router);
 		this.events = new HashSet<>();
-		EventBroker.getInstance().attachObserver(this);
+		EventBroker.getInstance().addObserver(this);
 	}
 
 	@Override
@@ -69,7 +70,7 @@ public class OMNeTAnomalyDetection extends OMNeTRouterComponent implements
 	}
 
 	@Override
-	public void update(Object o, Object arg) {
+	public void update(Observable o, Object arg) {
 		if (arg instanceof AnomalousEvent) {
 			synchronized (events) {
 				events.add((AnomalousEvent) arg);

diff --git a/network-resilience/src/br/ufrgs/inf/bdinetr/domain/omnet/OMNeTClassifier.java b/network-resilience/src/br/ufrgs/inf/bdinetr/domain/omnet/OMNeTClassifier.java
index e4042ac..8fbb33b 100644
--- a/network-resilience/src/br/ufrgs/inf/bdinetr/domain/omnet/OMNeTClassifier.java
+++ b/network-resilience/src/br/ufrgs/inf/bdinetr/domain/omnet/OMNeTClassifier.java
@@ -23,12 +23,13 @@ package br.ufrgs.inf.bdinetr.domain.omnet;
 
 import java.util.HashSet;
 import java.util.Iterator;
+import java.util.Observable;
+import java.util.Observer;
 import java.util.Set;
 
 import br.ufrgs.inf.bdinetr.domain.Classifier;
 import br.ufrgs.inf.bdinetr.domain.Flow;
 import br.ufrgs.inf.bdinetr.domain.Ip;
-import br.ufrgs.inf.bdinetr.domain.Observer;
 import br.ufrgs.inf.bdinetr.domain.Router;
 import br.ufrgs.inf.bdinetr.domain.omnet.event.ThreatEvent;
 
@@ -43,7 +44,7 @@ public class OMNeTClassifier extends OMNeTRouterComponent implements
 	public OMNeTClassifier(Router router) {
 		super(router);
 		this.events = new HashSet<>();
-		EventBroker.getInstance().attachObserver(this);
+		EventBroker.getInstance().addObserver(this);
 	}
 
 	@Override
@@ -69,7 +70,7 @@ public class OMNeTClassifier extends OMNeTRouterComponent implements
 	}
 
 	@Override
-	public void update(Object o, Object arg) {
+	public void update(Observable o, Object arg) {
 		if (arg instanceof ThreatEvent) {
 			synchronized (events) {
 				events.add((ThreatEvent) arg);

diff --git a/network-resilience/src/br/ufrgs/inf/bdinetr/domain/omnet/OMNeTLinkMonitor.java b/network-resilience/src/br/ufrgs/inf/bdinetr/domain/omnet/OMNeTLinkMonitor.java
index 921f3d9..b8ce4ec 100644
--- a/network-resilience/src/br/ufrgs/inf/bdinetr/domain/omnet/OMNeTLinkMonitor.java
+++ b/network-resilience/src/br/ufrgs/inf/bdinetr/domain/omnet/OMNeTLinkMonitor.java
@@ -23,11 +23,12 @@ package br.ufrgs.inf.bdinetr.domain.omnet;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Observable;
+import java.util.Observer;
 import java.util.Set;
 
 import br.ufrgs.inf.bdinetr.domain.Link;
 import br.ufrgs.inf.bdinetr.domain.LinkMonitor;
-import br.ufrgs.inf.bdinetr.domain.Observer;
 import br.ufrgs.inf.bdinetr.domain.Router;
 import br.ufrgs.inf.bdinetr.domain.omnet.event.OverUsageEvent;
 
@@ -42,7 +43,7 @@ public class OMNeTLinkMonitor extends OMNeTRouterComponent implements
 	public OMNeTLinkMonitor(Router router) {
 		super(router);
 		this.overUsageLinks = new HashMap<>();
-		EventBroker.getInstance().attachObserver(this);
+		EventBroker.getInstance().addObserver(this);
 	}
 
 	@Override
@@ -66,13 +67,14 @@ public class OMNeTLinkMonitor extends OMNeTRouterComponent implements
 	@Override
 	public void setOverUsage(Link link, boolean overUsage) {
 		this.overUsageLinks.put(link, overUsage);
+		setChanged();
 		notifyObservers(link);
 	}
 
 	@Override
-	public void update(Object o, Object arg) {
+	public void update(Observable o, Object arg) {
 		if (arg instanceof OverUsageEvent) {
-			setOverUsage(((OverUsageEvent) o).getLink(), true);
+			setOverUsage(((OverUsageEvent) arg).getLink(), true);
 		}
 	}
 

diff --git a/network-resilience/src/br/ufrgs/inf/bdinetr/domain/omnet/OMNeTRateLimiter.java b/network-resilience/src/br/ufrgs/inf/bdinetr/domain/omnet/OMNeTRateLimiter.java
index 97847c6..d550ece 100644
--- a/network-resilience/src/br/ufrgs/inf/bdinetr/domain/omnet/OMNeTRateLimiter.java
+++ b/network-resilience/src/br/ufrgs/inf/bdinetr/domain/omnet/OMNeTRateLimiter.java
@@ -66,6 +66,7 @@ public class OMNeTRateLimiter extends OMNeTRouterComponent implements
 		params[2] = rate;
 		invoke("limitlink", params);
 
+		setChanged();
 		notifyObservers(new LimitLinkEvent(link));
 	}
 

diff --git a/network-resilience/src/br/ufrgs/inf/bdinetr/domain/omnet/OMNeTRouterComponent.java b/network-resilience/src/br/ufrgs/inf/bdinetr/domain/omnet/OMNeTRouterComponent.java
index f1120ab..cb78b1d 100644
--- a/network-resilience/src/br/ufrgs/inf/bdinetr/domain/omnet/OMNeTRouterComponent.java
+++ b/network-resilience/src/br/ufrgs/inf/bdinetr/domain/omnet/OMNeTRouterComponent.java
@@ -23,6 +23,7 @@ package br.ufrgs.inf.bdinetr.domain.omnet;
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.Observable;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -30,14 +31,13 @@ import org.apache.xmlrpc.XmlRpcException;
 import org.apache.xmlrpc.client.XmlRpcClient;
 import org.apache.xmlrpc.client.XmlRpcClientConfigImpl;
 
-import br.ufrgs.inf.bdinetr.domain.ObservableImpl;
 import br.ufrgs.inf.bdinetr.domain.Router;
 import br.ufrgs.inf.bdinetr.domain.RouterComponent;
 
 /**
  * @author Alberto Egon and Ingrid Nunes
  */
-public abstract class OMNeTRouterComponent extends ObservableImpl implements
+public abstract class OMNeTRouterComponent extends Observable implements
 		RouterComponent {
 
 	private final XmlRpcClient adaptorRPC;

diff --git a/network-resilience/src/br/ufrgs/inf/bdinetr/Network.java b/network-resilience/src/br/ufrgs/inf/bdinetr/Network.java
index bc02180..b2b54ca 100644
--- a/network-resilience/src/br/ufrgs/inf/bdinetr/Network.java
+++ b/network-resilience/src/br/ufrgs/inf/bdinetr/Network.java
@@ -24,6 +24,8 @@ package br.ufrgs.inf.bdinetr;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Observable;
+import java.util.Observer;
 import java.util.Set;
 
 import org.apache.commons.logging.Log;
@@ -32,7 +34,6 @@ import org.apache.commons.logging.LogFactory;
 import br.ufrgs.inf.bdinetr.agent.RouterAgent;
 import br.ufrgs.inf.bdinetr.domain.LimitLinkEvent;
 import br.ufrgs.inf.bdinetr.domain.LinkMonitor;
-import br.ufrgs.inf.bdinetr.domain.Observer;
 import br.ufrgs.inf.bdinetr.domain.RateLimiter;
 import br.ufrgs.inf.bdinetr.domain.Role;
 import br.ufrgs.inf.bdinetr.domain.Router;
@@ -53,8 +54,7 @@ public class Network implements Observer {
 	public void addRouter(Router router) {
 		this.routerAgents.put(router, new RouterAgent(router));
 		if (router.hasRole(Role.RATE_LIMITER)) {
-			((RateLimiter) router.getRole(Role.RATE_LIMITER))
-					.attachObserver(this);
+			((RateLimiter) router.getRole(Role.RATE_LIMITER)).addObserver(this);
 		}
 	}
 
@@ -71,7 +71,7 @@ public class Network implements Observer {
 	}
 
 	@Override
-	public void update(Object o, Object arg) {
+	public void update(Observable o, Object arg) {
 		if (arg instanceof LimitLinkEvent) {
 			LimitLinkEvent event = (LimitLinkEvent) arg;
 			for (Router router : getRouters()) {