From 37362d9da58806e35707e1a876180a1dc19e799d Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Fri, 4 Jul 2014 09:40:18 +0000
Subject: [PATCH] switch to ObservationRepository removed obsolete Observer

git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/DMM/trunk@16151 9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
 .../META-INF/MANIFEST.MF                                  | 2 --
 .../model/adaptation/dmm/BlueYonderExperimentTracker.java | 8 ++++++--
 .../adaptation/model/adaptation/dmm/IObserver.java        | 7 -------
 .../adaptation/model/adaptation/dmm/TacticExecutor.java   | 7 ++++---
 4 files changed, 10 insertions(+), 14 deletions(-)
 delete mode 100644 edu.kit.ipd.descartes.adaptation.model.adaptation/src/edu/kit/ipd/descartes/adaptation/model/adaptation/dmm/IObserver.java

diff --git a/edu.kit.ipd.descartes.adaptation.model.adaptation/META-INF/MANIFEST.MF b/edu.kit.ipd.descartes.adaptation.model.adaptation/META-INF/MANIFEST.MF
index b0259a64..ee4f63e3 100644
--- a/edu.kit.ipd.descartes.adaptation.model.adaptation/META-INF/MANIFEST.MF
+++ b/edu.kit.ipd.descartes.adaptation.model.adaptation/META-INF/MANIFEST.MF
@@ -7,7 +7,6 @@ Bundle-Activator: edu.kit.ipd.descartes.adaptation.model.adaptation.Activator
 Bundle-Vendor: Descartes Research Group
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Import-Package: 
- edu.kit.ipd.descartes.adaptation.model,
  edu.kit.ipd.descartes.adaptation.model.dmm,
  edu.kit.ipd.descartes.core,
  edu.kit.ipd.descartes.identifier,
@@ -19,7 +18,6 @@ Import-Package:
  edu.kit.ipd.descartes.mm.runtimeenvironmentclasses,
  edu.kit.ipd.descartes.perfdatarepo,
  org.apache.log4j;version="1.2.15",
- org.eclipse.emf.common,
  org.eclipse.emf.common.util,
  org.eclipse.emf.ecore,
  org.eclipse.emf.ecore.change,
diff --git a/edu.kit.ipd.descartes.adaptation.model.adaptation/src/edu/kit/ipd/descartes/adaptation/model/adaptation/dmm/BlueYonderExperimentTracker.java b/edu.kit.ipd.descartes.adaptation.model.adaptation/src/edu/kit/ipd/descartes/adaptation/model/adaptation/dmm/BlueYonderExperimentTracker.java
index 1391cd5f..21ca8725 100644
--- a/edu.kit.ipd.descartes.adaptation.model.adaptation/src/edu/kit/ipd/descartes/adaptation/model/adaptation/dmm/BlueYonderExperimentTracker.java
+++ b/edu.kit.ipd.descartes.adaptation.model.adaptation/src/edu/kit/ipd/descartes/adaptation/model/adaptation/dmm/BlueYonderExperimentTracker.java
@@ -1,10 +1,13 @@
 package edu.kit.ipd.descartes.adaptation.model.adaptation.dmm;
 
+import java.util.Observable;
+import java.util.Observer;
+
 import edu.kit.ipd.descartes.mm.adaptation.WeightedTactic;
 import edu.kit.ipd.descartes.mm.resourcelandscape.ComputingInfrastructure;
 import edu.kit.ipd.descartes.mm.resourcelandscape.DistributedDataCenter;
 
-public class BlueYonderExperimentTracker implements IObserver {
+public class BlueYonderExperimentTracker implements Observer {
 
 //    private static final String RESULT_NAME_TEMPLATE = "Xreq-par-$1Yps-desc4-gw-desc3-db-desc2-predict-Z ps=$2-req=5-size=50000";
     private static final String RESULT_NAME_TEMPLATE = "Xreq-par-$1$3Yps-desc4-gw-desc3-db-desc2-predict-Z ps=$2-req=40-size=500000";
@@ -16,6 +19,7 @@ public class BlueYonderExperimentTracker implements IObserver {
     private int psOnDescFourBackup;
 
     public void setSubject(TacticExecutor te) {
+//        te.register(this);
         te.register(this);
     }
 
@@ -70,7 +74,7 @@ public class BlueYonderExperimentTracker implements IObserver {
     }
 
     @Override
-    public void undo() {
+    public void update(Observable o, Object arg) {
         resetValues();
     }
 
diff --git a/edu.kit.ipd.descartes.adaptation.model.adaptation/src/edu/kit/ipd/descartes/adaptation/model/adaptation/dmm/IObserver.java b/edu.kit.ipd.descartes.adaptation.model.adaptation/src/edu/kit/ipd/descartes/adaptation/model/adaptation/dmm/IObserver.java
deleted file mode 100644
index 52fcaaf2..00000000
--- a/edu.kit.ipd.descartes.adaptation.model.adaptation/src/edu/kit/ipd/descartes/adaptation/model/adaptation/dmm/IObserver.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package edu.kit.ipd.descartes.adaptation.model.adaptation.dmm;
-
-public interface IObserver {
-    
-    public void undo();
-
-}
diff --git a/edu.kit.ipd.descartes.adaptation.model.adaptation/src/edu/kit/ipd/descartes/adaptation/model/adaptation/dmm/TacticExecutor.java b/edu.kit.ipd.descartes.adaptation.model.adaptation/src/edu/kit/ipd/descartes/adaptation/model/adaptation/dmm/TacticExecutor.java
index 36d02354..30fc5642 100644
--- a/edu.kit.ipd.descartes.adaptation.model.adaptation/src/edu/kit/ipd/descartes/adaptation/model/adaptation/dmm/TacticExecutor.java
+++ b/edu.kit.ipd.descartes.adaptation.model.adaptation/src/edu/kit/ipd/descartes/adaptation/model/adaptation/dmm/TacticExecutor.java
@@ -3,6 +3,7 @@ package edu.kit.ipd.descartes.adaptation.model.adaptation.dmm;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Observer;
 
 import org.apache.log4j.Logger;
 import org.eclipse.emf.ecore.EClass;
@@ -31,7 +32,7 @@ import edu.kit.ipd.descartes.mm.resourcelandscape.ResourcelandscapePackage;
 public class TacticExecutor {
 
     private static Logger logger = Logger.getLogger(TacticExecutor.class);
-    private List<IObserver> observers = new ArrayList<IObserver>();
+    private List<Observer> observers = new ArrayList<Observer>();
 
     private IActionHandler dmmModelActionHandler;
     private TacticsHistory hist;
@@ -190,11 +191,11 @@ public class TacticExecutor {
             changeDescription.apply();
     }
 
-    public void register(IObserver observer) {
+    public void register(Observer observer) {
         observers.add(observer);
     }
 
-    public void remove(IObserver observer) {
+    public void remove(Observer observer) {
         observers.remove(observer);
     }
 
-- 
GitLab