From cb2c32763e354dd4ec40b24d550667d48250094e Mon Sep 17 00:00:00 2001 From: Johannes Mey <johannes.mey@tu-dresden.de> Date: Sat, 26 Jan 2019 13:19:47 +0100 Subject: [PATCH] naming and fix for deepCopy --- .../solution/{Helpers.jadd => DeepCopy.jadd} | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) rename jastadd-mquat-base/src/main/jastadd/solution/{Helpers.jadd => DeepCopy.jadd} (75%) diff --git a/jastadd-mquat-base/src/main/jastadd/solution/Helpers.jadd b/jastadd-mquat-base/src/main/jastadd/solution/DeepCopy.jadd similarity index 75% rename from jastadd-mquat-base/src/main/jastadd/solution/Helpers.jadd rename to jastadd-mquat-base/src/main/jastadd/solution/DeepCopy.jadd index 1de9680..a5f2a60 100644 --- a/jastadd-mquat-base/src/main/jastadd/solution/Helpers.jadd +++ b/jastadd-mquat-base/src/main/jastadd/solution/DeepCopy.jadd @@ -1,4 +1,7 @@ -aspect Helpers { +aspect DeepCopy { + + // TODO this aspect is probably not required, since there is treeCopy(). But since treeCopy() does not consider + // intrinsic references, it might be wise to keep it for now. /** * @return a deep copy of the assignment @@ -34,10 +37,19 @@ aspect Helpers { return copy; } + /** + * @return a deep copy of a resource class + */ public ResourceClassMapping ResourceClassMapping.deepCopy() { ResourceClassMapping copy = new ResourceClassMapping(); copy.setInstance(this.getInstance()); copy.setResourceClass(this.getResourceClass()); + for (ResourceClassMapping subMapping : getResourceClassMappingList()) { + copy.addResourceClassMapping(subMapping.deepCopy()); + } + for (ResourceRef resourceRef : getResourceRefList()) { + copy.addResourceRef(resourceRef.getRef().createRef()); + } return copy; } -- GitLab