Use short notation for relationship assignments (#185)

eclipse · Mar 19, 2020 · b83ea28 · b83ea28
1 parent 5039d9a
commit b83ea28
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/...ory/src/main/java/org/eclipse/winery/repository/converter/support/writer/YamlPrinter.java b/...ory/src/main/java/org/eclipse/winery/repository/converter/support/writer/YamlPrinter.java
@@ -81,6 +81,12 @@ public YamlPrinter print(char value) {
         return this;
     }
 
+    public YamlPrinter printQName(QName value) {
+        this.stringBuilder.append(qNameToString(value));
+        this.printNewLine();
+        return this;
+    }
+
     public YamlPrinter print(YamlPrinter printer) {
         if (Objects.isNull(printer) || printer.isEmpty()) return this;
         if (endsWithNewLine()) {
@@ -101,7 +107,6 @@ public YamlPrinter print(YamlPrinter printer) {
         if (printer.indent > this.indent && printer.endsWithNewLine()) {
             printer.stringBuilder.setLength(printer.stringBuilder.length() + this.indent - printer.indent);
         }
-
         print(printer.toString());
         return this;
     }

diff --git a/...tory/src/main/java/org/eclipse/winery/repository/converter/support/writer/YamlWriter.java b/...tory/src/main/java/org/eclipse/winery/repository/converter/support/writer/YamlWriter.java
@@ -488,7 +488,6 @@ public YamlPrinter visit(TRequirementAssignment node, Parameter parameter) {
 
     public YamlPrinter visit(TRelationshipAssignment node, Parameter parameter) {
         return new YamlPrinter(parameter.getIndent())
-            .printKeyValue("type", node.getType())
             .print(printMap("properties", node.getProperties(), parameter))
             .print(printMap("interfaces", node.getInterfaces(), parameter));
     }
@@ -505,6 +504,9 @@ public YamlPrinter printVisitorNode(VisitorNode node, Parameter parameter) {
                 printer.print(node.accept(this,
                     new Parameter(parameter.getIndent()).addContext(parameter.getKey())
                 ));
+            } else if (node instanceof TRelationshipAssignment) {
+                printer.print(parameter.getKey() + ": ").printQName(((TRelationshipAssignment) node).getType())
+                    .print(node.accept(this, new Parameter(parameter.getIndent() + INDENT_SIZE)));
             } else {
                 printer.printKey(parameter.getKey())
                     .print(node.accept(this, new Parameter(parameter.getIndent() + INDENT_SIZE)));