From 879ff25489446fae3cea56e3b3dc9f602ef650d6 Mon Sep 17 00:00:00 2001
From: Nikolaus Huber <nikolaus.huber@uni-wuerzburg.de>
Date: Thu, 28 Feb 2013 09:50:27 +0000
Subject: [PATCH] renaming
git-svn-id: https://se1.informatik.uni-wuerzburg.de/usvn/svn/code/code/DMM/trunk@10504 9e42b895-fcda-4063-8a3b-11be15eb1bbd
---
.../descartes/adaptation/model/DmmModelActionHandler.java | 7 +++----
.../descartes/adaptation/model/util/DmmModelChanger.java | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
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/DmmModelActionHandler.java
index 973c9487..d1a33915 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/DmmModelActionHandler.java
@@ -229,7 +229,7 @@ public class DmmModelActionHandler implements IActionHandler {
RuntimeEnvironment re = null;
switch (adaptableEntity.eClass().getClassifierID()) {
case ResourcelandscapePackage.RUNTIME_ENVIRONMENT:
- re = DmmModelChanger.scaleOutRuntimeEnvironmentInstance((RuntimeEnvironment) adaptableEntity);
+ re = DmmModelChanger.createNewRuntimeEnvironmentInstance((RuntimeEnvironment) adaptableEntity);
break;
case ContainerrepositoryPackage.CONTAINER_TEMPLATE:
re = scaleOutContainerTemplate((ContainerTemplate) adaptableEntity);
@@ -256,8 +256,7 @@ public class DmmModelActionHandler implements IActionHandler {
return removedRe;
}
- /** Implements similar behavior as scaleOutRuntimeEnvironment()
- * because if you want to scale an attribute of the ContainerTemplate,
+ /** Creates a new RuntimeEnvironment. If you want to scale an attribute of the ContainerTemplate,
* ModelVariableConfigurationRange must be used. However, here we are
* scaling a ModelEntityConfigurationRange.
*/
@@ -266,7 +265,7 @@ public class DmmModelActionHandler implements IActionHandler {
Container referringContainer = template.getReferringContainers().get(0);
if (referringContainer != null && referringContainer instanceof RuntimeEnvironment) {
- return DmmModelChanger.scaleOutRuntimeEnvironmentInstance((RuntimeEnvironment) referringContainer);
+ return DmmModelChanger.createNewRuntimeEnvironmentInstance((RuntimeEnvironment) referringContainer);
} else {
logger.error("Cannot scale " + referringContainer);
}
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 39816ae4..c46f07f7 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
@@ -113,7 +113,7 @@ public class DmmModelChanger {
* the {@link RuntimeEnvironment} to copy
* @return
*/
- public static RuntimeEnvironment scaleOutRuntimeEnvironmentInstance(RuntimeEnvironment runtimeEnvironment) {
+ public static RuntimeEnvironment createNewRuntimeEnvironmentInstance(RuntimeEnvironment runtimeEnvironment) {
RuntimeEnvironment newRuntimeEnvironment = EcoreUtil.copy(runtimeEnvironment);
newRuntimeEnvironment.setId(EcoreUtil.generateUUID());
newRuntimeEnvironment.setName(newRuntimeEnvironment.getName() + COPY_MARK);
--
GitLab