From a19c2a116a55192bac34d7457af466b4c27e774c Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Thu, 26 Jun 2014 09:14:26 +0000
Subject: [PATCH] renaming to more specifc name DmlModelLoader
git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/DMM/trunk@16118 9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../adaptation/analysis/pcm/PcmModelAnalyzer.java | 4 ++--
.../model/adaptation/dmm/DmmModelActionHandler.java | 4 ++--
.../model/adaptation/dmm/TacticExecutor.java | 6 +++---
...tionProcessModelLoader.java => DmlModelLoader.java} | 10 +++++-----
.../ipd/descartes/adaptation/AdaptationControl.java | 8 ++++----
.../kit/ipd/descartes/adaptation/TacticExecutor.java | 6 +++---
6 files changed, 19 insertions(+), 19 deletions(-)
rename edu.kit.ipd.descartes.adaptation.model.repository/src/edu/kit/ipd/descartes/adaptation/model/repository/dmm/{AdaptationProcessModelLoader.java => DmlModelLoader.java} (93%)
diff --git a/edu.kit.ipd.descartes.adaptation.analysis/src/edu/kit/ipd/descartes/adaptation/analysis/pcm/PcmModelAnalyzer.java b/edu.kit.ipd.descartes.adaptation.analysis/src/edu/kit/ipd/descartes/adaptation/analysis/pcm/PcmModelAnalyzer.java
index 8157bb7d..86235db5 100644
--- a/edu.kit.ipd.descartes.adaptation.analysis/src/edu/kit/ipd/descartes/adaptation/analysis/pcm/PcmModelAnalyzer.java
+++ b/edu.kit.ipd.descartes.adaptation.analysis/src/edu/kit/ipd/descartes/adaptation/analysis/pcm/PcmModelAnalyzer.java
@@ -4,7 +4,7 @@ import org.apache.log4j.Logger;
import edu.kit.ipd.descartes.adaptation.analysis.IModelAnalyzer;
import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.BlueYonderExperimentTracker;
-import edu.kit.ipd.descartes.adaptation.model.repository.dmm.AdaptationProcessModelLoader;
+import edu.kit.ipd.descartes.adaptation.model.repository.dmm.DmlModelLoader;
import edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo.IPerformanceDataRepositoryHandler;
import edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo.ObservationRepositoryHelper;
import edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo.PerfDataRepoConverter;
@@ -33,7 +33,7 @@ public class PcmModelAnalyzer /*extends SimuComWorkflowLauncher*/ implements IMo
if (perfDataRepoHandler.getClass().getName() == PerformanceDataRepositoryHandler.class.getName())
return perfDataRepoHandler.getLatestImpact();
else {
- String expName = BlueYonderExperimentTracker.getInstance().getExperimentNameForDistributedDataCenter(AdaptationProcessModelLoader.getDistributedDataCenter());
+ String expName = BlueYonderExperimentTracker.getInstance().getExperimentNameForDistributedDataCenter(DmlModelLoader.getDistributedDataCenter());
logger.debug("Searching for impact of " + expName);
Impact latestImpact = PerfDataRepoConverter.convertObservableImpact(ObservationRepositoryHelper
.searchImpactOfTactic(expName, (ObservationRepository) perfDataRepoHandler.getRepository()));
diff --git a/edu.kit.ipd.descartes.adaptation.model.adaptation/src/edu/kit/ipd/descartes/adaptation/model/adaptation/dmm/DmmModelActionHandler.java b/edu.kit.ipd.descartes.adaptation.model.adaptation/src/edu/kit/ipd/descartes/adaptation/model/adaptation/dmm/DmmModelActionHandler.java
index 5388b733..01bef265 100644
--- a/edu.kit.ipd.descartes.adaptation.model.adaptation/src/edu/kit/ipd/descartes/adaptation/model/adaptation/dmm/DmmModelActionHandler.java
+++ b/edu.kit.ipd.descartes.adaptation.model.adaptation/src/edu/kit/ipd/descartes/adaptation/model/adaptation/dmm/DmmModelActionHandler.java
@@ -14,7 +14,7 @@ import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.util.DmmModelAction
import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.util.DmmModelChanger;
import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.util.OclEvaluationHelper;
import edu.kit.ipd.descartes.adaptation.model.adaptation.exceptions.OperationNotPerformedException;
-import edu.kit.ipd.descartes.adaptation.model.repository.dmm.AdaptationProcessModelLoader;
+import edu.kit.ipd.descartes.adaptation.model.repository.dmm.DmlModelLoader;
import edu.kit.ipd.descartes.core.AdaptableEntity;
import edu.kit.ipd.descartes.core.Entity;
import edu.kit.ipd.descartes.mm.adaptation.AdaptationActionOperation;
@@ -40,7 +40,7 @@ public class DmmModelActionHandler implements IActionHandler {
private void saveModels() {
try {
- AdaptationProcessModelLoader.saveAll();
+ DmlModelLoader.saveAll();
} catch (IOException e) {
logger.error("Error while saving models", e);
}
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 baeeb5ef..b2e62f7e 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
@@ -13,7 +13,7 @@ import edu.kit.ipd.descartes.adaptation.model.adaptation.IActionHandler;
import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.util.OclEvaluationHelper;
import edu.kit.ipd.descartes.adaptation.model.adaptation.exceptions.InvalidAdaptationPlan;
import edu.kit.ipd.descartes.adaptation.model.adaptation.exceptions.OperationNotPerformedException;
-import edu.kit.ipd.descartes.adaptation.model.repository.dmm.AdaptationProcessModelLoader;
+import edu.kit.ipd.descartes.adaptation.model.repository.dmm.DmlModelLoader;
import edu.kit.ipd.descartes.mm.adaptation.AbstractControlFlowElement;
import edu.kit.ipd.descartes.mm.adaptation.Action;
import edu.kit.ipd.descartes.mm.adaptation.ActionReference;
@@ -55,14 +55,14 @@ public class TacticExecutor {
try {
logger.info("Applying tactic " + weightedTactic.getUsedTactic().getName() + ", ID: "
+ weightedTactic.getUsedTactic().getId() + ".");
- AdaptationProcessModelLoader.startRecording();
+ DmlModelLoader.startRecording();
executeAdaptationPlan(weightedTactic.getUsedTactic().getImplementedPlan());
logger.info("Tactic " + weightedTactic.getUsedTactic().getName() + " successfully applied.");
hist.add(weightedTactic, TacticsHistory.NO_RESULT, true);
// if this point is reached everything was fine, so persist them (save the models)
dmmModelActionHandler.persistActions();
- changeDescription = AdaptationProcessModelLoader.endRecording();
+ changeDescription = DmlModelLoader.endRecording();
return;
} catch (OperationNotPerformedException e) {
logger.error("Tactic " + weightedTactic.getUsedTactic().getName()
diff --git a/edu.kit.ipd.descartes.adaptation.model.repository/src/edu/kit/ipd/descartes/adaptation/model/repository/dmm/AdaptationProcessModelLoader.java b/edu.kit.ipd.descartes.adaptation.model.repository/src/edu/kit/ipd/descartes/adaptation/model/repository/dmm/DmlModelLoader.java
similarity index 93%
rename from edu.kit.ipd.descartes.adaptation.model.repository/src/edu/kit/ipd/descartes/adaptation/model/repository/dmm/AdaptationProcessModelLoader.java
rename to edu.kit.ipd.descartes.adaptation.model.repository/src/edu/kit/ipd/descartes/adaptation/model/repository/dmm/DmlModelLoader.java
index 0200cd79..082e92b6 100644
--- a/edu.kit.ipd.descartes.adaptation.model.repository/src/edu/kit/ipd/descartes/adaptation/model/repository/dmm/AdaptationProcessModelLoader.java
+++ b/edu.kit.ipd.descartes.adaptation.model.repository/src/edu/kit/ipd/descartes/adaptation/model/repository/dmm/DmlModelLoader.java
@@ -25,7 +25,7 @@ import edu.kit.ipd.descartes.mm.containerrepository.ContainerrepositoryPackage;
import edu.kit.ipd.descartes.mm.resourcelandscape.DistributedDataCenter;
import edu.kit.ipd.descartes.mm.resourcelandscape.ResourcelandscapePackage;
-public class AdaptationProcessModelLoader extends AbstractEcoreModelLoader {
+public class DmlModelLoader extends AbstractEcoreModelLoader {
public static final EPackage[] DMM_EPACKAGES = new EPackage[] {
ResourcelandscapePackage.eINSTANCE,
@@ -33,17 +33,17 @@ public class AdaptationProcessModelLoader extends AbstractEcoreModelLoader {
ContainerrepositoryPackage.eINSTANCE,
AdaptationPackage.eINSTANCE };
- private static AdaptationProcessModelLoader instance = null;
+ private static DmlModelLoader instance = null;
private static ChangeRecorder recorder = null;
- public static AdaptationProcessModelLoader getInstance() {
+ public static DmlModelLoader getInstance() {
if (instance == null) {
- instance = new AdaptationProcessModelLoader();
+ instance = new DmlModelLoader();
}
return instance;
}
- private AdaptationProcessModelLoader() {
+ private DmlModelLoader() {
initializeResourceSet(new ResourceSetImpl());
}
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java
index 78e5b181..56cc2479 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java
@@ -20,7 +20,7 @@ import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.DmmModelActionHandl
import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.TacticsHistory;
import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.util.ObjectivesHelper;
import edu.kit.ipd.descartes.adaptation.analysis.pcm.PcmModelAnalyzer;
-import edu.kit.ipd.descartes.adaptation.model.repository.dmm.AdaptationProcessModelLoader;
+import edu.kit.ipd.descartes.adaptation.model.repository.dmm.DmlModelLoader;
import edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo.IPerformanceDataRepositoryHandler;
import edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo.ObservationRepositoryHelper;
import edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo.PerfDataRepoConverter;
@@ -53,7 +53,7 @@ public class AdaptationControl {
private String pdrMetamodelType = null;
private String eventType = null;
- private AdaptationProcessModelLoader adaptationProcessModelLoader = AdaptationProcessModelLoader.getInstance();
+ private DmlModelLoader adaptationProcessModelLoader = DmlModelLoader.getInstance();
private IPerformanceDataRepositoryHandler perfDataRepoHandler;
private DmmModelActionHandler dmmModelActionHandler;
private AdaptationProcess adaptationProcess = null;
@@ -132,7 +132,7 @@ public class AdaptationControl {
// save results
try {
logger.debug("Saving tactics evaluation results...");
- AdaptationProcessModelLoader.saveAll();
+ DmlModelLoader.saveAll();
} catch (IOException e) {
if (e.getCause() instanceof DanglingHREFException)
logger.error("Error while persisting results because of dangling references. Probably not all changes have been saved.");
@@ -160,7 +160,7 @@ public class AdaptationControl {
WeightedTactic latestTactic = TacticsHistory.getInstance().getLatestAppliedTactic();
if (latestTactic != null && !(perfDataRepoHandler instanceof PerformanceDataRepositoryHandler)) {
String expName = BlueYonderExperimentTracker.getInstance()
- .getExperimentNameForDistributedDataCenter(AdaptationProcessModelLoader.getDistributedDataCenter());
+ .getExperimentNameForDistributedDataCenter(DmlModelLoader.getDistributedDataCenter());
logger.debug("Searching for result of " + expName);
Observation o = ObservationRepositoryHelper.getResultEndingWith(expName, (ObservationRepository) perfDataRepoHandler.getRepository());
currentSystemState = PerfDataRepoConverter.convertResult(o);
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/TacticExecutor.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/TacticExecutor.java
index 42758af2..13249436 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/TacticExecutor.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/TacticExecutor.java
@@ -16,7 +16,7 @@ import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.TacticsHistory;
import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.util.OclEvaluationHelper;
import edu.kit.ipd.descartes.adaptation.model.adaptation.exceptions.InvalidAdaptationPlan;
import edu.kit.ipd.descartes.adaptation.model.adaptation.exceptions.OperationNotPerformedException;
-import edu.kit.ipd.descartes.adaptation.model.repository.dmm.AdaptationProcessModelLoader;
+import edu.kit.ipd.descartes.adaptation.model.repository.dmm.DmlModelLoader;
import edu.kit.ipd.descartes.mm.adaptation.AbstractControlFlowElement;
import edu.kit.ipd.descartes.mm.adaptation.Action;
import edu.kit.ipd.descartes.mm.adaptation.ActionReference;
@@ -58,14 +58,14 @@ public class TacticExecutor {
try {
logger.info("Applying tactic " + weightedTactic.getUsedTactic().getName() + ", ID: "
+ weightedTactic.getUsedTactic().getId() + ".");
- AdaptationProcessModelLoader.startRecording();
+ DmlModelLoader.startRecording();
executeAdaptationPlan(weightedTactic.getUsedTactic().getImplementedPlan());
logger.info("Tactic " + weightedTactic.getUsedTactic().getName() + " successfully applied.");
hist.add(weightedTactic, TacticsHistory.NO_RESULT, true);
// if this point is reached everything was fine, so persist them (save the models)
dmmModelActionHandler.persistActions();
- changeDescription = AdaptationProcessModelLoader.endRecording();
+ changeDescription = DmlModelLoader.endRecording();
return;
} catch (OperationNotPerformedException e) {
logger.error("Tactic " + weightedTactic.getUsedTactic().getName()
--
GitLab