From 065474556b1e2778910b06cdb7e7d9eb9616165d Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Thu, 28 Feb 2013 12:49:47 +0000
Subject: [PATCH] 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/AdaptationControl.java | 6 +++---
.../model/{ => dmm}/AdaptationProcessModelManager.java | 3 ++-
.../adaptation/model/{ => dmm}/DmmModelActionHandler.java | 2 +-
.../{ => dmm}/PerformanceDataRepositoryModelManager.java | 3 ++-
4 files changed, 8 insertions(+), 6 deletions(-)
rename edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/{ => dmm}/AdaptationProcessModelManager.java (96%)
rename edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/{ => dmm}/DmmModelActionHandler.java (99%)
rename edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/{ => dmm}/PerformanceDataRepositoryModelManager.java (93%)
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 5dc0abed..38202623 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
@@ -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;
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/AdaptationProcessModelManager.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/AdaptationProcessModelManager.java
similarity index 96%
rename from edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/AdaptationProcessModelManager.java
rename to edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/AdaptationProcessModelManager.java
index 4a4747dd..9e30607c 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/AdaptationProcessModelManager.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/AdaptationProcessModelManager.java
@@ -1,4 +1,4 @@
-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;
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/DmmModelActionHandler.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/DmmModelActionHandler.java
similarity index 99%
rename from edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/DmmModelActionHandler.java
rename to edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/DmmModelActionHandler.java
index d1a33915..8d1c4c25 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/DmmModelActionHandler.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/DmmModelActionHandler.java
@@ -1,4 +1,4 @@
-package edu.kit.ipd.descartes.adaptation.model;
+package edu.kit.ipd.descartes.adaptation.model.dmm;
import java.io.IOException;
import java.util.List;
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/PerformanceDataRepositoryModelManager.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/PerformanceDataRepositoryModelManager.java
similarity index 93%
rename from edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/PerformanceDataRepositoryModelManager.java
rename to edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/PerformanceDataRepositoryModelManager.java
index eaef0307..080f44b2 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/PerformanceDataRepositoryModelManager.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/PerformanceDataRepositoryModelManager.java
@@ -1,4 +1,4 @@
-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;
--
GitLab