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

edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/AdaptationControl.java

@@ -11,16 +11,16 @@ import org.apache.log4j.Logger;
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.xmi.DanglingHREFException;
 
+import edu.kit.ipd.descartes.adaptation.analysis.IModelAnalyzer;
 import edu.kit.ipd.descartes.adaptation.evaluation.performance.IEvaluator;
 import edu.kit.ipd.descartes.adaptation.evaluation.performance.WeightingFunctionEvaluator;
 import edu.kit.ipd.descartes.adaptation.event.EventTypeEnum;
 import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.DmmModelActionHandler;
 import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.util.ObjectivesHelper;
-import edu.kit.ipd.descartes.adaptation.model.analysis.IModelAnalyzer;
-import edu.kit.ipd.descartes.adaptation.model.analysis.pcm.PcmModelAnalyzer;
-import edu.kit.ipd.descartes.adaptation.model.perfdatarepo.IPerformanceDataRepositoryHandler;
-import edu.kit.ipd.descartes.adaptation.model.perfdatarepo.PerformanceDataRepositoryHandlerFactory;
-import edu.kit.ipd.descartes.adaptation.model.repository.AdaptationProcessModelLoader;
+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.perfdatarepo.IPerformanceDataRepositoryHandler;
+import edu.kit.ipd.descartes.adaptation.model.repository.perfdatarepo.PerformanceDataRepositoryHandlerFactory;
 import edu.kit.ipd.descartes.mm.adaptation.AdaptationProcess;
 import edu.kit.ipd.descartes.mm.adaptation.Event;
 import edu.kit.ipd.descartes.mm.adaptation.Strategy;

edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/TacticExecutor.java

@@ -9,11 +9,11 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.change.ChangeDescription;
 
-import edu.kit.ipd.descartes.adaptation.exceptions.InvalidAdaptationPlan;
 import edu.kit.ipd.descartes.adaptation.model.adaptation.IActionHandler;
-import edu.kit.ipd.descartes.adaptation.model.adaptation.OperationNotPerformedException;
 import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.util.OclEvaluationHelper;
-import edu.kit.ipd.descartes.adaptation.model.repository.AdaptationProcessModelLoader;
+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.util.BlueYonderExperimentTracker;
 import edu.kit.ipd.descartes.adaptation.util.IObserver;
 import edu.kit.ipd.descartes.mm.adaptation.AbstractControlFlowElement;