From 18cb569f79eea571d02cf8c8d8f77560c40953be Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Tue, 11 Jun 2013 09:17:09 +0000
Subject: [PATCH] git-svn-id:
https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@12015
9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../perfdatarepo/ObservationRepositoryHelper.java | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/ObservationRepositoryHelper.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/ObservationRepositoryHelper.java
index 410ff945..1b9ef678 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/ObservationRepositoryHelper.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/perfdatarepo/ObservationRepositoryHelper.java
@@ -2,7 +2,6 @@ package edu.kit.ipd.descartes.adaptation.model.perfdatarepo;
import java.util.List;
-import org.eclipse.emf.common.util.URI;
import org.eclipse.emf.ecore.util.EcoreUtil;
import edu.kit.ipd.descartes.mm.adaptation.WeightedTactic;
@@ -12,15 +11,12 @@ import edu.kit.ipd.descartes.ql.models.repository.ObservationRepository;
public class ObservationRepositoryHelper {
- public static ObservableImpact searchImpactOfTactic(String name, String modelUri) {
- ObservationRepositoryModelLoader loader = ObservationRepositoryModelLoader.getInstance();
- ObservationRepository repo = (ObservationRepository) loader.load(URI.createFileURI(modelUri));
-
+ public static ObservableImpact searchImpactOfTactic(String name, ObservationRepository repository) {
// Get correct result
- Observation o = getResultEndingWith(name, repo);
+ Observation o = getResultEndingWith(name, repository);
// Derive impact from result
- ObservableImpact i = deriveImpact(o, repo);
+ ObservableImpact i = getImpactForObservation(o, repository);
return i;
}
@@ -42,7 +38,7 @@ public class ObservationRepositoryHelper {
return null;
}
- private static ObservableImpact deriveImpact(Observation o, ObservationRepository repo) {
+ public static ObservableImpact getImpactForObservation(Observation o, ObservationRepository repo) {
if (o == null || repo == null)
return null;
--
GitLab