Serialization refactoring to drop suboject logic

js/serialization/ObjectSerializer.js

@@ -10,15 +10,15 @@ export default class ObjectSerializer extends ISerializer {
         super(ObjectEntity, "   ", "\n", false)
     }
 
-    showProperty(entity, object, attributeKey, attributeValue) {
-        switch (attributeKey.toString()) {
+    showProperty(entity, key) {
+        switch (key) {
             case "Class":
             case "Name":
             case "CustomProperties":
                 // Serielized separately, check write()
                 return false
         }
-        return super.showProperty(entity, object, attributeKey, attributeValue)
+        return super.showProperty(entity, key)
     }
 
     /** @param {String} value */
@@ -43,21 +43,20 @@ export default class ObjectSerializer extends ISerializer {
     }
 
     /**
-     * @param {ObjectEntity} object
+     * @param {ObjectEntity} entity
      * @param {Boolean} insideString
      */
-    write(entity, object, insideString) {
-        let result = `Begin Object Class=${object.Class.path} Name=${this.writeValue(entity, object.Name, "Name", insideString)}
-${this.subWrite(entity, [], object, insideString)
-            + object
-                .CustomProperties.map(pin =>
-                    this.attributeSeparator
-                    + this.attributePrefix
-                    + "CustomProperties "
-                    + SerializerFactory.getSerializer(PinEntity).serialize(pin)
-                )
-                .join("")}
-End Object\n`
+    write(entity, insideString) {
+        let result = `Begin Object Class=${entity.Class.path} Name=${this.writeValue(entity, "Name", insideString)}\n`
+            + super.write(entity, insideString)
+            + entity.CustomProperties.map(pin =>
+                this.attributeSeparator
+                + this.attributePrefix
+                + "CustomProperties "
+                + SerializerFactory.getSerializer(PinEntity).serialize(pin)
+            )
+                .join("")
+            + "\nEnd Object\n"
         return result
     }
 }