refactorings to ModelManager

git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@9946 9e42b895-fcda-4063-8a3b-11be15eb1bbd

edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/util/PerfDataRepoHelperTest.java

@@ -6,7 +6,7 @@ import org.eclipse.emf.common.util.URI;
 import org.junit.Before;
 import org.junit.Test;
 
-import edu.kit.ipd.descartes.adaptation.model.PerformanceDataRepositoryHandler;
+import edu.kit.ipd.descartes.adaptation.model.PerformanceDataRepositoryModelManager;
 import edu.kit.ipd.descartes.perfdatarepo.Impact;
 import edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository;
 
@@ -18,8 +18,8 @@ public class PerfDataRepoHelperTest {
 	@Before
 	public void setUp() throws Exception {
 		
-		PerformanceDataRepositoryHandler repoHander = PerformanceDataRepositoryHandler.getInstance();
-		perfDataRepo = (PerformanceDataRepository) repoHander.load(URI
+		PerformanceDataRepositoryModelManager repoManager = PerformanceDataRepositoryModelManager.getInstance();
+		perfDataRepo = (PerformanceDataRepository) repoManager.load(URI
 				.createFileURI(PERF_DATA_REPO_XMI_FILE));
 	}
 

edu.kit.ipd.descartes.adaptation.test/src/edu/kit/ipd/descartes/adaptation/util/WeightingFunctionHelperTest.java

@@ -7,7 +7,7 @@ import org.eclipse.emf.common.util.URI;
 import org.junit.Before;
 import org.junit.Test;
 
-import edu.kit.ipd.descartes.adaptation.model.PerformanceDataRepositoryHandler;
+import edu.kit.ipd.descartes.adaptation.model.PerformanceDataRepositoryModelManager;
 import edu.kit.ipd.descartes.mm.adaptation.AdaptationFactory;
 import edu.kit.ipd.descartes.mm.adaptation.WeightedMetric;
 import edu.kit.ipd.descartes.mm.adaptation.WeightingFunction;
@@ -22,7 +22,7 @@ public class WeightingFunctionHelperTest {
     private static final String PERF_DATA_REPO_XMI_FILE = "./test_models/PerformanceDataRepositoryDummy.xmi";
     private static final double UTIL_WEIGHT = 2.0d;
 
-    private PerformanceDataRepositoryHandler perfDataHandler = PerformanceDataRepositoryHandler.getInstance();
+    private PerformanceDataRepositoryModelManager perfDataModelManager = PerformanceDataRepositoryModelManager.getInstance();
     private PerformanceDataRepository perfDataRepo = null;
     private WeightingFunction function = null;
 
@@ -44,7 +44,7 @@ public class WeightingFunctionHelperTest {
 
     @Before
     public void setUp() throws Exception {
-        perfDataRepo = (PerformanceDataRepository) perfDataHandler.load(URI.createFileURI(PERF_DATA_REPO_XMI_FILE));
+        perfDataRepo = (PerformanceDataRepository) perfDataModelManager.load(URI.createFileURI(PERF_DATA_REPO_XMI_FILE));
         MetricType metricType = getTypeHelper(METRIC_TYPES.UTILIZATION);
 
         function = AdaptationFactory.eINSTANCE.createWeightingFunction();