From 1c85c514c1fd8cebd019c2d389320601f42a234e Mon Sep 17 00:00:00 2001 From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de> Date: Thu, 26 Jun 2014 09:34:34 +0000 Subject: [PATCH] split *.descartes.model.repository package: - connector for performance data repositories has been moved to *.descartes.evaluation.performance - logic for handling model files will be moved to *.descartes.model git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/DMM/trunk@16121 9e42b895-fcda-4063-8a3b-11be15eb1bbd --- .../META-INF/MANIFEST.MF | 4 ++-- .../model/adaptation/dmm/DmmModelActionHandler.java | 2 +- .../adaptation/model/adaptation/dmm/TacticExecutor.java | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) 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 1aba5778..b0259a64 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,8 +7,8 @@ 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.repository, - edu.kit.ipd.descartes.adaptation.model.repository.dmm, + edu.kit.ipd.descartes.adaptation.model, + edu.kit.ipd.descartes.adaptation.model.dmm, edu.kit.ipd.descartes.core, edu.kit.ipd.descartes.identifier, edu.kit.ipd.descartes.mm.adaptation, 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 01bef265..b3835bf9 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.DmlModelLoader; +import edu.kit.ipd.descartes.adaptation.model.dmm.DmlModelLoader; import edu.kit.ipd.descartes.core.AdaptableEntity; import edu.kit.ipd.descartes.core.Entity; import edu.kit.ipd.descartes.mm.adaptation.AdaptationActionOperation; 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 b2e62f7e..36d02354 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.DmlModelLoader; +import edu.kit.ipd.descartes.adaptation.model.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; -- GitLab