From 140709e31f85dcb8313746cb96eed132e5dbd6cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Farkas=20J=C3=B3zsef?= <fjozsef001@gmail.com>
Date: Sun, 25 Sep 2016 13:56:03 +0200
Subject: [PATCH] refactor: Macro

---
 src/components/macro/macro.component.html      |  4 ++--
 src/components/macro/macro.component.ts        |  8 ++++----
 .../popover/tab/macro/macro-tab.component.html |  2 +-
 src/config-serializer/config-items/Macro.ts    | 18 +++++++++++-------
 4 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/components/macro/macro.component.html b/src/components/macro/macro.component.html
index 3854f364..079b9449 100644
--- a/src/components/macro/macro.component.html
+++ b/src/components/macro/macro.component.html
@@ -1,8 +1,8 @@
 <macro-header [macro]="macro"></macro-header>
 <div class="row list-container">
     <div class="col-xs-10 col-xs-offset-1 list-group">
-        <div class="macro-actions-container" [dragula]="'macroActions'" [dragulaModel]="macro.macroActions.elements">
-            <macro-item *ngFor="let macroAction of macro.macroActions.elements; let macroActionIndex = index"
+        <div class="macro-actions-container" [dragula]="'macroActions'" [dragulaModel]="macro.macroActions">
+            <macro-item *ngFor="let macroAction of macro.macroActions; let macroActionIndex = index"
                         [macroAction]="macroAction"
                         [editable]="true"
                         [deletable]="true"
diff --git a/src/components/macro/macro.component.ts b/src/components/macro/macro.component.ts
index 72d77f75..3c7d0b21 100644
--- a/src/components/macro/macro.component.ts
+++ b/src/components/macro/macro.component.ts
@@ -58,8 +58,8 @@ export class MacroComponent implements OnInit, OnDestroy {
     }
 
     addAction() {
-        this.hideOtherActionEditors(this.macro.macroActions.elements.length);
-        this.macro.macroActions.elements.push(undefined);
+        this.hideOtherActionEditors(this.macro.macroActions.length);
+        this.macro.macroActions.push(undefined);
     }
 
     discardChanges() {
@@ -83,12 +83,12 @@ export class MacroComponent implements OnInit, OnDestroy {
 
     onSaveAction(macroAction: MacroAction, index: number) {
         this.hasChanges = true;
-        this.macro.macroActions.elements[index] = macroAction;
+        this.macro.macroActions[index] = macroAction;
     }
 
     onDeleteAction(index: number) {
         // @ todo show confirm action dialog
-        this.macro.macroActions.elements.splice(index, 1);
+        this.macro.macroActions.splice(index, 1);
         this.hasChanges = true;
     }
 
diff --git a/src/components/popover/tab/macro/macro-tab.component.html b/src/components/popover/tab/macro/macro-tab.component.html
index 075d63ad..801069a7 100644
--- a/src/components/popover/tab/macro/macro-tab.component.html
+++ b/src/components/popover/tab/macro/macro-tab.component.html
@@ -5,7 +5,7 @@
 <div class="macro-action-container" [class.inactive]="selectedMacroIndex === -1">
     <template [ngIf]="selectedMacroIndex >= 0">
       <div class="list-group"> 
-        <macro-item *ngFor="let macroAction of macros[selectedMacroIndex].macroActions.elements"
+        <macro-item *ngFor="let macroAction of macros[selectedMacroIndex].macroActions"
                     [macroAction]="macroAction">
         </macro-item>
       </div>
diff --git a/src/config-serializer/config-items/Macro.ts b/src/config-serializer/config-items/Macro.ts
index b6f7b1e0..ad723c21 100644
--- a/src/config-serializer/config-items/Macro.ts
+++ b/src/config-serializer/config-items/Macro.ts
@@ -1,7 +1,7 @@
 import { assertUInt8 } from '../assert';
 import { Serializable } from '../Serializable';
 import { UhkBuffer } from '../UhkBuffer';
-import { MacroActions } from './macro-action';
+import { Helper as MacroActionHelper, MacroAction } from './macro-action';
 
 export class Macro extends Serializable<Macro> {
 
@@ -14,7 +14,7 @@ export class Macro extends Serializable<Macro> {
 
     name: string;
 
-    macroActions: MacroActions;
+    macroActions: MacroAction[];
 
     constructor(other?: Macro) {
         super();
@@ -25,7 +25,7 @@ export class Macro extends Serializable<Macro> {
         this.isLooped = other.isLooped;
         this.isPrivate = other.isPrivate;
         this.name = other.name;
-        this.macroActions = new MacroActions(other.macroActions);
+        this.macroActions = other.macroActions.map(macroAction => MacroActionHelper.createMacroAction(macroAction));
     }
 
     _fromJsObject(jsObject: any): Macro {
@@ -33,7 +33,7 @@ export class Macro extends Serializable<Macro> {
         this.isLooped = jsObject.isLooped;
         this.isPrivate = jsObject.isPrivate;
         this.name = jsObject.name;
-        this.macroActions = new MacroActions().fromJsObject(jsObject.macroActions);
+        this.macroActions = jsObject.macroActions.map((macroAction: any) => MacroActionHelper.createMacroAction(macroAction));
         return this;
     }
 
@@ -42,7 +42,11 @@ export class Macro extends Serializable<Macro> {
         this.isLooped = buffer.readBoolean();
         this.isPrivate = buffer.readBoolean();
         this.name = buffer.readString();
-        this.macroActions = new MacroActions().fromBinary(buffer);
+        let macroActionsLength: number = buffer.readCompactLength();
+        this.macroActions = [];
+        for (let i = 0; i < macroActionsLength; ++i) {
+            this.macroActions.push(MacroActionHelper.createMacroAction(buffer));
+        }
         return this;
     }
 
@@ -52,7 +56,7 @@ export class Macro extends Serializable<Macro> {
             isLooped: this.isLooped,
             isPrivate: this.isPrivate,
             name: this.name,
-            macroActions: this.macroActions.toJsObject()
+            macroActions: this.macroActions.map(macroAction => macroAction.toJsObject())
         };
     }
 
@@ -61,7 +65,7 @@ export class Macro extends Serializable<Macro> {
         buffer.writeBoolean(this.isLooped);
         buffer.writeBoolean(this.isPrivate);
         buffer.writeString(this.name);
-        this.macroActions.toBinary(buffer);
+        buffer.writeArray(this.macroActions);
     }
 
     toString(): string {