diff --git a/edu.kit.ipd.descartes.adaptation.model.analysis/.project b/edu.kit.ipd.descartes.adaptation.model.analysis/.project index 6e15557a8e3a22801b1fe861b5ec9ec4cb5618e6..e149435de3978ad7587d336f495596744fc8f28d 100644 --- a/edu.kit.ipd.descartes.adaptation.model.analysis/.project +++ b/edu.kit.ipd.descartes.adaptation.model.analysis/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>edu.kit.ipd.descartes.adaptation.analysis</name> + <name>edu.kit.ipd.descartes.adaptation.model.analysis</name> <comment></comment> <projects> </projects> diff --git a/edu.kit.ipd.descartes.adaptation.model.analysis/META-INF/MANIFEST.MF b/edu.kit.ipd.descartes.adaptation.model.analysis/META-INF/MANIFEST.MF index 8487857df983be5d69975e405cedc9d79103955f..7227a4fcb1328e7807656991eb694b7d99b76c8e 100644 --- a/edu.kit.ipd.descartes.adaptation.model.analysis/META-INF/MANIFEST.MF +++ b/edu.kit.ipd.descartes.adaptation.model.analysis/META-INF/MANIFEST.MF @@ -1,9 +1,9 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Analysis -Bundle-SymbolicName: edu.kit.ipd.descartes.adaptation.analysis +Bundle-SymbolicName: edu.kit.ipd.descartes.adaptation.model.analysis Bundle-Version: 1.0.0.qualifier -Bundle-Activator: edu.kit.ipd.descartes.adaptation.analysis.Activator +Bundle-Activator: edu.kit.ipd.descartes.adaptation.model.analysis.Activator Bundle-Vendor: Descartes Research Group Bundle-RequiredExecutionEnvironment: JavaSE-1.6 Import-Package: edu.kit.ipd.descartes.adaptation.evaluation.performance.repository, @@ -17,5 +17,5 @@ Import-Package: edu.kit.ipd.descartes.adaptation.evaluation.performance.reposito org.eclipse.emf.common, org.eclipse.emf.ecore, org.osgi.framework;version="1.3.0" -Export-Package: edu.kit.ipd.descartes.adaptation.analysis, - edu.kit.ipd.descartes.adaptation.analysis.pcm +Export-Package: edu.kit.ipd.descartes.adaptation.model.analysis, + edu.kit.ipd.descartes.adaptation.model.analysis.pcm diff --git a/edu.kit.ipd.descartes.adaptation.model.analysis/src/edu/kit/ipd/descartes/adaptation/analysis/Activator.java b/edu.kit.ipd.descartes.adaptation.model.analysis/src/edu/kit/ipd/descartes/adaptation/model/analysis/Activator.java similarity index 92% rename from edu.kit.ipd.descartes.adaptation.model.analysis/src/edu/kit/ipd/descartes/adaptation/analysis/Activator.java rename to edu.kit.ipd.descartes.adaptation.model.analysis/src/edu/kit/ipd/descartes/adaptation/model/analysis/Activator.java index 06ef4cfc42583ba707a551da71827414fcfe1f8a..123e995b1d9a96e201f3f99409eec8c15df98573 100644 --- a/edu.kit.ipd.descartes.adaptation.model.analysis/src/edu/kit/ipd/descartes/adaptation/analysis/Activator.java +++ b/edu.kit.ipd.descartes.adaptation.model.analysis/src/edu/kit/ipd/descartes/adaptation/model/analysis/Activator.java @@ -1,4 +1,4 @@ -package edu.kit.ipd.descartes.adaptation.analysis; +package edu.kit.ipd.descartes.adaptation.model.analysis; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; diff --git a/edu.kit.ipd.descartes.adaptation.model.analysis/src/edu/kit/ipd/descartes/adaptation/analysis/IModelAnalyzer.java b/edu.kit.ipd.descartes.adaptation.model.analysis/src/edu/kit/ipd/descartes/adaptation/model/analysis/IModelAnalyzer.java similarity index 78% rename from edu.kit.ipd.descartes.adaptation.model.analysis/src/edu/kit/ipd/descartes/adaptation/analysis/IModelAnalyzer.java rename to edu.kit.ipd.descartes.adaptation.model.analysis/src/edu/kit/ipd/descartes/adaptation/model/analysis/IModelAnalyzer.java index 8ee1b2493c301a4aa498b467f6b38f0832c96ee4..ca364f475e8f36b5fc5acbbcd75325c6ba175293 100644 --- a/edu.kit.ipd.descartes.adaptation.model.analysis/src/edu/kit/ipd/descartes/adaptation/analysis/IModelAnalyzer.java +++ b/edu.kit.ipd.descartes.adaptation.model.analysis/src/edu/kit/ipd/descartes/adaptation/model/analysis/IModelAnalyzer.java @@ -1,4 +1,4 @@ -package edu.kit.ipd.descartes.adaptation.analysis; +package edu.kit.ipd.descartes.adaptation.model.analysis; import edu.kit.ipd.descartes.perfdatarepo.Impact; diff --git a/edu.kit.ipd.descartes.adaptation.model.analysis/src/edu/kit/ipd/descartes/adaptation/analysis/pcm/PcmModelAnalyzer.java b/edu.kit.ipd.descartes.adaptation.model.analysis/src/edu/kit/ipd/descartes/adaptation/model/analysis/pcm/PcmModelAnalyzer.java similarity index 93% rename from edu.kit.ipd.descartes.adaptation.model.analysis/src/edu/kit/ipd/descartes/adaptation/analysis/pcm/PcmModelAnalyzer.java rename to edu.kit.ipd.descartes.adaptation.model.analysis/src/edu/kit/ipd/descartes/adaptation/model/analysis/pcm/PcmModelAnalyzer.java index 9667d9df73be8027cbdfa694d8f6297acb48225d..02bc959700cacc46239bcc3b25adbe27e5700db6 100644 --- a/edu.kit.ipd.descartes.adaptation.model.analysis/src/edu/kit/ipd/descartes/adaptation/analysis/pcm/PcmModelAnalyzer.java +++ b/edu.kit.ipd.descartes.adaptation.model.analysis/src/edu/kit/ipd/descartes/adaptation/model/analysis/pcm/PcmModelAnalyzer.java @@ -1,13 +1,13 @@ -package edu.kit.ipd.descartes.adaptation.analysis.pcm; +package edu.kit.ipd.descartes.adaptation.model.analysis.pcm; import org.apache.log4j.Logger; -import edu.kit.ipd.descartes.adaptation.analysis.IModelAnalyzer; import edu.kit.ipd.descartes.adaptation.evaluation.performance.repository.IPerformanceDataRepositoryHandler; import edu.kit.ipd.descartes.adaptation.evaluation.performance.repository.ObservationRepositoryHelper; import edu.kit.ipd.descartes.adaptation.evaluation.performance.repository.PerfDataRepoConverter; import edu.kit.ipd.descartes.adaptation.evaluation.performance.repository.PerformanceDataRepositoryHandler; import edu.kit.ipd.descartes.adaptation.model.adaptation.dmm.BlueYonderExperimentTracker; +import edu.kit.ipd.descartes.adaptation.model.analysis.IModelAnalyzer; import edu.kit.ipd.descartes.adaptation.model.dmm.DmlModelLoader; import edu.kit.ipd.descartes.perfdatarepo.Impact; import edu.kit.ipd.descartes.ql.models.repository.ObservationRepository;