ctf: Allow structs to have ctf2 data

Change-Id: Ie35533f33a482aff519f9472b0a34b088be1506e
Signed-off-by: Matthew Khouzam <[email protected]>

Author: MatthewKhouzam

ctf/org.eclipse.tracecompass.ctf.core/src/org/eclipse/tracecompass/internal/ctf/core/event/metadata/tsdl/struct/StructParser.java

@@ -206,9 +206,17 @@ public StructDeclaration parse(ICTFMetadataNode struct, ICommonTreeParserParamet
                     structAlign = minimumAlignment.getAsLong();
                 }
                 JsonElement memberClasses = memberNode.getFieldClass().getAsJsonObject().get(JsonMetadataStrings.MEMBER_CLASSES);
-                if (memberClasses != null) {
+                if (memberClasses != null && memberClasses.isJsonArray()) {
                     hasBody = true;
-                    structBody = struct;
+                    for (JsonElement memberElement : memberClasses.getAsJsonArray()) {
+                        if (memberElement.isJsonObject()) {
+                            String name = memberElement.getAsJsonObject().get(JsonMetadataStrings.NAME).getAsString();
+                            JsonElement fieldClass = memberElement.getAsJsonObject().get(JsonMetadataStrings.FIELD_CLASS);
+                            JsonStructureFieldMemberMetadataNode childNode = new JsonStructureFieldMemberMetadataNode(memberNode, "", "", name, fieldClass.getAsJsonObject()); //$NON-NLS-1$ //$NON-NLS-2$
+                            memberNode.addChild(childNode);
+                        }
+                    }
+                    structBody = memberNode;
                 }
             }
         }