From ca99becbe1cd49edb99a191add3b7570913d280b Mon Sep 17 00:00:00 2001 From: SebastianEbert <sebastian.ebert@tu-dresden.de> Date: Wed, 14 Jun 2023 18:09:23 +0200 Subject: [PATCH] fixed toolspecifics export, navigation for dinerosplaces --- src/main/jastadd/base/Navigation.jrag | 6 +++++- src/main/jastadd/base/export/ComplexElementsConverter.jadd | 5 ++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main/jastadd/base/Navigation.jrag b/src/main/jastadd/base/Navigation.jrag index 92e53ae..5f2cd9e 100644 --- a/src/main/jastadd/base/Navigation.jrag +++ b/src/main/jastadd/base/Navigation.jrag @@ -165,8 +165,12 @@ aspect Navigation { to PetriNet.allDinerosTransitions() for petriNet(); + coll java.util.Set<DinerosPlace> PetriNet.allDinerosPlaces() [new java.util.HashSet()] root PetriNet; + DinerosPlace contributes this + to PetriNet.allDinerosPlaces() + for petriNet(); - coll java.util.Set<Arc> PetriNet.allArcs() [new java.util.HashSet()] root PetriNet; + coll java.util.Set<Arc> PetriNet.allArcs() [new java.util.HashSet()] root PetriNet; Arc contributes this to PetriNet.allArcs() for petriNet(); diff --git a/src/main/jastadd/base/export/ComplexElementsConverter.jadd b/src/main/jastadd/base/export/ComplexElementsConverter.jadd index 168001c..cda4abf 100644 --- a/src/main/jastadd/base/export/ComplexElementsConverter.jadd +++ b/src/main/jastadd/base/export/ComplexElementsConverter.jadd @@ -14,6 +14,8 @@ aspect ComplexElementsConverter{ private static StringBuffer clipToolSpecificsFormattedXmlBuffer(String toolName, String toolVersion, StringBuffer formattedXmlBuffer) { + System.out.println("Clipping: " + formattedXmlBuffer); + if (formattedXmlBuffer != null) { int endCharsLength = 15; @@ -27,7 +29,8 @@ aspect ComplexElementsConverter{ indexGt = formattedXmlBuffer.indexOf(">"); } - if (toolNameLenth > 0 || toolVersionLength > 0) { + if ((toolNameLenth > 0 || toolVersionLength > 0) + && formattedXmlBuffer.toString().contains("tool=\"" + toolName + "\"")) { formattedXmlBuffer.delete(0, indexGt + 1); formattedXmlBuffer.delete(formattedXmlBuffer.length() - endCharsLength, formattedXmlBuffer.length()); } -- GitLab