Skip to content
Snippets Groups Projects
Commit 37362d9d authored by Nikolaus Huber's avatar Nikolaus Huber
Browse files

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
parent 4ff22ac9
No related branches found
No related tags found
No related merge requests found
......@@ -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,
......
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();
}
......
package edu.kit.ipd.descartes.adaptation.model.adaptation.dmm;
public interface IObserver {
public void undo();
}
......@@ -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);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment