| commit | c41085112e62223d14f411dd21d3e60d15b7f539 | [log] [tgz] |
|---|---|---|
| author | Ed Willink <ed@willink.me.uk> | Sat Dec 18 11:25:57 2021 +0000 |
| committer | Ed Willink <ed@willink.me.uk> | Sat Dec 18 11:58:09 2021 +0000 |
| tree | 6b3d3c9549f072dfb34b67337ea746f4947968d5 | |
| parent | 442c7e743efae68b7321d7fe6a63f219b9db846c [diff] |
[unrelated] Clarify ElementCS.toString / ElementUtil.getRaw/TrimmedText
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtbase/src/org/eclipse/qvtd/xtext/qvtbase/cs2as/QVTbaseCSContainmentVisitor.java b/plugins/org.eclipse.qvtd.xtext.qvtbase/src/org/eclipse/qvtd/xtext/qvtbase/cs2as/QVTbaseCSContainmentVisitor.java index 18c84f6..6859423 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtbase/src/org/eclipse/qvtd/xtext/qvtbase/cs2as/QVTbaseCSContainmentVisitor.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtbase/src/org/eclipse/qvtd/xtext/qvtbase/cs2as/QVTbaseCSContainmentVisitor.java
@@ -30,6 +30,7 @@ import org.eclipse.ocl.xtext.base.cs2as.CS2ASConversion; import org.eclipse.ocl.xtext.base.cs2as.Continuation; import org.eclipse.ocl.xtext.base.cs2as.SingleContinuation; +import org.eclipse.ocl.xtext.base.utilities.ElementUtil; import org.eclipse.ocl.xtext.basecs.ClassCS; import org.eclipse.ocl.xtext.basecs.ElementCS; import org.eclipse.ocl.xtext.basecs.PackageCS; @@ -227,7 +228,7 @@ if ((ownedPathElements != null) && !ownedPathElements.isEmpty()) { asParent = asContextPackage; for (@NonNull PathElementCS pathElement : ownedPathElements) { - @SuppressWarnings("null")@NonNull String name = pathElement.toString(); + String name = ElementUtil.getTrimmedText(pathElement); org.eclipse.ocl.pivot.Package asPackage = getPackage(asParent, name); asParent = asPackage; }
diff --git a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/cs2as/QVTrelationCSContainmentVisitor.java b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/cs2as/QVTrelationCSContainmentVisitor.java index 81af3ca..db4b432 100644 --- a/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/cs2as/QVTrelationCSContainmentVisitor.java +++ b/plugins/org.eclipse.qvtd.xtext.qvtrelation/src/org/eclipse/qvtd/xtext/qvtrelation/cs2as/QVTrelationCSContainmentVisitor.java
@@ -187,7 +187,7 @@ * Return the name referenced by an element template, null for a dummy variable. */ protected static @Nullable String getElementTemplateName(@NonNull ElementTemplateCS csElementTemplate) { - String name = ElementUtil.getText(csElementTemplate); + String name = ElementUtil.getTrimmedText(csElementTemplate); if (QVTrelationUtil.DUMMY_VARIABLE_NAME.equals(name)) { return null; }