From 443c142e5b327243e50ff412aa0a386ae03f823d Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Thu, 28 Feb 2013 12:50:52 +0000
Subject: [PATCH] git-svn-id:
 https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@10510
 9e42b895-fcda-4063-8a3b-11be15eb1bbd

---
 .../edu/kit/ipd/descartes/adaptation/AdaptationControl.java   | 2 +-
 .../src/edu/kit/ipd/descartes/adaptation/TacticExecutor.java  | 2 +-
 .../descartes/adaptation/model/dmm/DmmModelActionHandler.java | 4 ++--
 .../adaptation/{ => model/dmm}/util/DmmModelActionHelper.java | 2 +-
 .../adaptation/{ => model/dmm}/util/OclEvaluationHelper.java  | 2 +-
 .../adaptation/{ => model/dmm}/util/PerfDataRepoHelper.java   | 2 +-
 .../{ => model/dmm}/util/WeightingFunctionHelper.java         | 2 +-
 .../ipd/descartes/adaptation/model/util/DmmModelChanger.java  | 2 +-
 .../adaptation/weightingfunction/WeightedSumCalculator.java   | 2 +-
 9 files changed, 10 insertions(+), 10 deletions(-)
 rename edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/{ => model/dmm}/util/DmmModelActionHelper.java (99%)
 rename edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/{ => model/dmm}/util/OclEvaluationHelper.java (97%)
 rename edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/{ => model/dmm}/util/PerfDataRepoHelper.java (96%)
 rename edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/{ => model/dmm}/util/WeightingFunctionHelper.java (96%)

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 38202623..949aef09 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
@@ -14,7 +14,7 @@ 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.model.dmm.util.PerfDataRepoHelper;
 import edu.kit.ipd.descartes.adaptation.weightingfunction.IWeightingFunctionCalculator;
 import edu.kit.ipd.descartes.adaptation.weightingfunction.WeightedSumCalculator;
 import edu.kit.ipd.descartes.mm.adaptation.AdaptationFactory;
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/TacticExecutor.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/TacticExecutor.java
index 1384163d..e8ba1bb7 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/TacticExecutor.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/TacticExecutor.java
@@ -7,7 +7,7 @@ import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
 
 import edu.kit.ipd.descartes.adaptation.exceptions.OperationNotPerformedException;
-import edu.kit.ipd.descartes.adaptation.util.OclEvaluationHelper;
+import edu.kit.ipd.descartes.adaptation.model.dmm.util.OclEvaluationHelper;
 import edu.kit.ipd.descartes.mm.adaptation.AbstractControlFlowElement;
 import edu.kit.ipd.descartes.mm.adaptation.Action;
 import edu.kit.ipd.descartes.mm.adaptation.ActionReference;
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/DmmModelActionHandler.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/DmmModelActionHandler.java
index 8d1c4c25..de49a91c 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/DmmModelActionHandler.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/DmmModelActionHandler.java
@@ -10,9 +10,9 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
 
 import edu.kit.ipd.descartes.adaptation.IActionHandler;
 import edu.kit.ipd.descartes.adaptation.exceptions.OperationNotPerformedException;
+import edu.kit.ipd.descartes.adaptation.model.dmm.util.DmmModelActionHelper;
+import edu.kit.ipd.descartes.adaptation.model.dmm.util.OclEvaluationHelper;
 import edu.kit.ipd.descartes.adaptation.model.util.DmmModelChanger;
-import edu.kit.ipd.descartes.adaptation.util.DmmModelActionHelper;
-import edu.kit.ipd.descartes.adaptation.util.OclEvaluationHelper;
 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/src/edu/kit/ipd/descartes/adaptation/util/DmmModelActionHelper.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/DmmModelActionHelper.java
similarity index 99%
rename from edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/DmmModelActionHelper.java
rename to edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/DmmModelActionHelper.java
index 028162fe..279a88f9 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/DmmModelActionHelper.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/DmmModelActionHelper.java
@@ -1,4 +1,4 @@
-package edu.kit.ipd.descartes.adaptation.util;
+package edu.kit.ipd.descartes.adaptation.model.dmm.util;
 
 import java.util.ArrayList;
 import java.util.Iterator;
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/OclEvaluationHelper.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/OclEvaluationHelper.java
similarity index 97%
rename from edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/OclEvaluationHelper.java
rename to edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/OclEvaluationHelper.java
index c008b26e..2a12b591 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/OclEvaluationHelper.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/OclEvaluationHelper.java
@@ -1,4 +1,4 @@
-package edu.kit.ipd.descartes.adaptation.util;
+package edu.kit.ipd.descartes.adaptation.model.dmm.util;
 
 import java.util.Set;
 
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/PerfDataRepoHelper.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/PerfDataRepoHelper.java
similarity index 96%
rename from edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/PerfDataRepoHelper.java
rename to edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/PerfDataRepoHelper.java
index beced5ec..518caeb2 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/PerfDataRepoHelper.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/PerfDataRepoHelper.java
@@ -1,4 +1,4 @@
-package edu.kit.ipd.descartes.adaptation.util;
+package edu.kit.ipd.descartes.adaptation.model.dmm.util;
 
 import org.eclipse.emf.common.util.EList;
 
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/WeightingFunctionHelper.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/WeightingFunctionHelper.java
similarity index 96%
rename from edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/WeightingFunctionHelper.java
rename to edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/WeightingFunctionHelper.java
index f4f95a90..4e92239f 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/util/WeightingFunctionHelper.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/dmm/util/WeightingFunctionHelper.java
@@ -1,4 +1,4 @@
-package edu.kit.ipd.descartes.adaptation.util;
+package edu.kit.ipd.descartes.adaptation.model.dmm.util;
 
 import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.util.EcoreUtil;
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/util/DmmModelChanger.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/util/DmmModelChanger.java
index 00d1336c..61ec4c7b 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/util/DmmModelChanger.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/model/util/DmmModelChanger.java
@@ -10,7 +10,7 @@ import org.eclipse.emf.common.util.EList;
 import org.eclipse.emf.ecore.util.EcoreUtil;
 
 import edu.kit.ipd.descartes.adaptation.exceptions.OperationNotPerformedException;
-import edu.kit.ipd.descartes.adaptation.util.DmmModelActionHelper;
+import edu.kit.ipd.descartes.adaptation.model.dmm.util.DmmModelActionHelper;
 import edu.kit.ipd.descartes.core.AdaptableEntity;
 import edu.kit.ipd.descartes.core.Entity;
 import edu.kit.ipd.descartes.core.NamedElement;
diff --git a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/weightingfunction/WeightedSumCalculator.java b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/weightingfunction/WeightedSumCalculator.java
index 563af7fc..67c304e3 100644
--- a/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/weightingfunction/WeightedSumCalculator.java
+++ b/edu.kit.ipd.descartes.adaptation/src/edu/kit/ipd/descartes/adaptation/weightingfunction/WeightedSumCalculator.java
@@ -3,7 +3,7 @@ package edu.kit.ipd.descartes.adaptation.weightingfunction;
 import org.apache.log4j.Logger;
 import org.eclipse.emf.common.util.EList;
 
-import edu.kit.ipd.descartes.adaptation.util.WeightingFunctionHelper;
+import edu.kit.ipd.descartes.adaptation.model.dmm.util.WeightingFunctionHelper;
 import edu.kit.ipd.descartes.mm.adaptation.WeightedTactic;
 import edu.kit.ipd.descartes.mm.adaptation.WeightingFunction;
 import edu.kit.ipd.descartes.perfdatarepo.Impact;
-- 
GitLab