Added case SubStatement for conversion from jObject to StatementBase, checking for nested SubStatements

mnutz · mnutz · commit 55173faf458e · 2014-07-07T11:01:26.000+02:00
diff --git a/TinCan/StatementBase.cs b/TinCan/StatementBase.cs
@@ -70,6 +70,18 @@ public StatementBase(JObject jobj)
                     {
                         target = (StatementRef)jobj.Value<JObject>("object");
                     }
+                    else if ((String)jobj["object"]["objectType"] == SubStatement.OBJECT_TYPE)
+                    {
+                        if ((string)jobj["objectType"] != "SubStatement")
+                        {
+                            target = (SubStatement)jobj.Value<JObject>("object");
+                        }
+                        else
+                        {
+                            // nested statement not allowed exception here?
+                            target = (Activity)jobj.Value<JObject>("object");
+                        }
+                    }
                 }
                 else
                 {

Original file line number	Diff line number	Diff line change
`@@ -70,6 +70,18 @@ public StatementBase(JObject jobj)`
`70`	`70`	`{`
`71`	`71`	`target = (StatementRef)jobj.Value<JObject>("object");`
`72`	`72`	`}`
	`73`	`+ else if ((String)jobj["object"]["objectType"] == SubStatement.OBJECT_TYPE)`
	`74`	`+ {`
	`75`	`+ if ((string)jobj["objectType"] != "SubStatement")`
	`76`	`+ {`
	`77`	`+ target = (SubStatement)jobj.Value<JObject>("object");`
	`78`	`+ }`
	`79`	`+ else`
	`80`	`+ {`
	`81`	`+ // nested statement not allowed exception here?`
	`82`	`+ target = (Activity)jobj.Value<JObject>("object");`
	`83`	`+ }`
	`84`	`+ }`
`73`	`85`	`}`
`74`	`86`	`else`
`75`	`87`	`{`