Got some property dependencies to work.

2 files changed, 11 insertions, 3 deletions

diff --git a/sol-pretty-printer/src/SolutionItem.java b/sol-pretty-printer/src/SolutionItem.java
index f251b62..7b23061 100644
--- a/sol-pretty-printer/src/SolutionItem.java
+++ b/sol-pretty-printer/src/SolutionItem.java
@@ -29,6 +29,7 @@ public class SolutionItem
       }
 
       FROM_ID.put(wfm_id, si);
+      si.function_values.put("wfm_id", wfm_id);
    }
 
    public static void handle_unary_set_function
diff --git a/sol-pretty-printer/src/Solutions.java b/sol-pretty-printer/src/Solutions.java
index 0129794..4b676b1 100644
--- a/sol-pretty-printer/src/Solutions.java
+++ b/sol-pretty-printer/src/Solutions.java
@@ -74,6 +74,10 @@ public class Solutions
 
          for (final Map.Entry<String, String> me: si.get_functions_data())
          {
+            final String keyword;
+
+            keyword = me.getKey().toUpperCase();
+
             pp_content =
                pp_content.replace
                (
@@ -81,11 +85,14 @@ public class Solutions
                      "$"
                      + sol_data[0]
                      + "."
-                     + me.getKey().toUpperCase()
+                     + keyword
                      + "$"
                   ),
-                  /* FIXME */
-                  (Strings.get_string_from_id(me.getValue()) == null) ? "null" : Strings.get_string_from_id(me.getValue())
+                  (
+                     keyword.endsWith("ID") ?
+                        me.getValue() :
+                        Strings.get_string_from_id(me.getValue())
+                  )
                );
          }
       }