Fixes recursion error in toString thatcan occur with collection types

miho · Apr 5, 2019 · 860eee8 · 860eee8
1 parent ef3b651
commit 860eee8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/config/common.properties b/config/common.properties
@@ -1,3 +1,3 @@
 # version number (is used for core, runtime and default dependencies in plugin and plugin)
 # publication.version  = 0.3-SNAPSHOT
-publication.version  = 0.3-SNAPSHOT
+publication.version  = 0.2.4
diff --git a/core/src/main/java/eu/mihosoft/vmf/core/Refers.java b/core/src/main/java/eu/mihosoft/vmf/core/Refers.java
@@ -3,15 +3,26 @@
 import java.lang.annotation.*;
 
 /**
- * Used to define a cross reference (linking releationship). 
+ * Used to define a cross reference (bidirectional linking relationship). 
  * <h3>Example Model:</h3>
  * <pre><code>
  * package mypkg.vmfmodel;
  * 
  * import eu.mihosoft.vmf.core.*;
  *
- * Todo add code
- * 
+ * interface Book {
+ *    String getTitle();
+ *
+ *    @Refers(opposite="books")
+ *    Writer[] getAuthors();
+ * }
+ *
+ * interface Writer {
+ *    String getName();
+ *
+ *    @Refers(opposite="authors")
+ *    Book[] getBooks();
+ * }
  * </code></pre>
  * 
  * <p>Created by miho on 12.03.2019.</p>

diff --git a/core/src/main/resources/eu/mihosoft/vmf/vmtemplates/impl/to-string.vm b/core/src/main/resources/eu/mihosoft/vmf/vmtemplates/impl/to-string.vm
@@ -56,8 +56,8 @@
 
 #foreach ($prop in $type.implementation.properties)
 #if (${prop.isIgnoredForToString()} == false)
-#if ($prop.containmentInfo.containmentType != "CONTAINER" )
-#if ($prop.containmentInfo.containmentType == "CONTAINED" && $prop.propType == "COLLECTION")
+#if (${prop.containmentInfo.containmentType} != "CONTAINER" )
+#if ( (${prop.containmentInfo.containmentType} == "CONTAINED" || ${prop.crossRefProperty}) && ${prop.propType} == "COLLECTION")
 
         // -- writing collection param '$prop.name'
         //