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

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

@@ -9,11 +9,11 @@ import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.eclipse.emf.common.util.URI;
 
-import edu.kit.ipd.descartes.adaptation.model.DmmModelActionHandler;
-import edu.kit.ipd.descartes.adaptation.model.AdaptationProcessModelManager;
-import edu.kit.ipd.descartes.adaptation.model.PerformanceDataRepositoryModelManager;
 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.dmm.AdaptationProcessModelManager;
+import edu.kit.ipd.descartes.adaptation.model.dmm.DmmModelActionHandler;
+import edu.kit.ipd.descartes.adaptation.model.dmm.PerformanceDataRepositoryModelManager;
 import edu.kit.ipd.descartes.adaptation.util.PerfDataRepoHelper;
 import edu.kit.ipd.descartes.adaptation.weightingfunction.IWeightingFunctionCalculator;
 import edu.kit.ipd.descartes.adaptation.weightingfunction.WeightedSumCalculator;

edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/AdaptationProcessModelManager.java → edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/AdaptationProcessModelManager.java

-package edu.kit.ipd.descartes.adaptation.model;
+package edu.kit.ipd.descartes.adaptation.model.dmm;
 
 import java.io.IOException;
 import java.util.HashMap;
@@ -14,6 +14,7 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.xmi.XMIResource;
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
 
+import edu.kit.ipd.descartes.adaptation.model.AbstractEcoreModelManager;
 import edu.kit.ipd.descartes.mm.adaptation.AdaptationPackage;
 import edu.kit.ipd.descartes.mm.adaptation.AdaptationProcess;
 import edu.kit.ipd.descartes.mm.adaptationpoints.AdaptationpointsPackage;

edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/DmmModelActionHandler.java → edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/DmmModelActionHandler.java

-package edu.kit.ipd.descartes.adaptation.model;
+package edu.kit.ipd.descartes.adaptation.model.dmm;
 
 import java.io.IOException;
 import java.util.List;

edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/PerformanceDataRepositoryModelManager.java → edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/PerformanceDataRepositoryModelManager.java

-package edu.kit.ipd.descartes.adaptation.model;
+package edu.kit.ipd.descartes.adaptation.model.dmm;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.EPackage;
@@ -7,6 +7,7 @@ import org.eclipse.emf.ecore.resource.ResourceSet;
 import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.xmi.impl.XMIResourceFactoryImpl;
 
+import edu.kit.ipd.descartes.adaptation.model.AbstractEcoreModelManager;
 import edu.kit.ipd.descartes.perfdatarepo.PerfdatarepoPackage;
 import edu.kit.ipd.descartes.perfdatarepo.PerformanceDataRepository;