From d2f3ec62f0ad4ebb605d9340e73d31f364456b68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= <laci@monda.hu>
Date: Wed, 30 Mar 2016 22:17:07 +0200
Subject: [PATCH] Use template strings where needed.

---
 config-serializer/config-items/DualRoleKeystrokeAction.ts | 2 +-
 config-serializer/config-items/KeyAction.ts               | 8 ++++----
 config-serializer/config-items/KeystrokeAction.ts         | 2 +-
 .../config-items/KeystrokeWithModifiersAction.ts          | 2 +-
 config-serializer/config-items/MouseAction.ts             | 4 ++--
 config-serializer/config-items/NoneAction.ts              | 2 +-
 config-serializer/config-items/PlayMacroAction.ts         | 2 +-
 config-serializer/config-items/SwitchLayerAction.ts       | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/config-serializer/config-items/DualRoleKeystrokeAction.ts b/config-serializer/config-items/DualRoleKeystrokeAction.ts
index b9f6ad8d..43c397be 100644
--- a/config-serializer/config-items/DualRoleKeystrokeAction.ts
+++ b/config-serializer/config-items/DualRoleKeystrokeAction.ts
@@ -25,7 +25,7 @@ class DualRoleKeystrokeAction extends KeyAction implements Serializable<DualRole
 
     set longPressAction(value) {
         if (!DualRoleKeystrokeAction.isDualRoleKeystrokeActionValid(value)) {
-            throw 'Invalid DualRoleKeystrokeAction.longPressAction: ${value}';
+            throw `Invalid DualRoleKeystrokeAction.longPressAction: ${value}`;
         }
         this._longPressAction = value;
     }
diff --git a/config-serializer/config-items/KeyAction.ts b/config-serializer/config-items/KeyAction.ts
index 0ec66172..df937ebf 100644
--- a/config-serializer/config-items/KeyAction.ts
+++ b/config-serializer/config-items/KeyAction.ts
@@ -23,7 +23,7 @@ class KeyAction {
             case NoneAction.keyActionTypeString:
                 return new NoneAction().fromJsObject(jsObject);
             default:
-                throw 'Invalid KeyAction.keyActionType: "${jsObject.actionType}"';
+                throw `Invalid KeyAction.keyActionType: "${jsObject.actionType}"`;
         }
     }
 
@@ -39,20 +39,20 @@ class KeyAction {
             case KeyActionId.NoneAction:
                 return new NoneAction().fromBinary(buffer);
             default:
-                throw 'Invalid KeyAction first byte "${keyActionFirstByte}"';
+                throw `Invalid KeyAction first byte "${keyActionFirstByte}"`;
         }
     }
 
     assertKeyActionType(jsObject: any, keyActionTypeString: string, classname: string) {
         if (jsObject.keyActionType !== keyActionTypeString) {
-            throw 'Invalid ${classname}.id: ${jsObject.keyActionType}';
+            throw `Invalid ${classname}.keyActionType: ${jsObject.keyActionType}`;
         }
     }
 
     readAndAssertKeyActionId(buffer: UhkBuffer, keyActionIdParam: KeyActionId, classname: string) {
         let readKeyActionId = buffer.readUInt8();
         if (readKeyActionId !== keyActionIdParam) {
-            throw 'Invalid ${classname} first byte: ${keyActionId}';
+            throw `Invalid ${classname} first byte: ${readKeyActionId}`;
         }
     }
 }
diff --git a/config-serializer/config-items/KeystrokeAction.ts b/config-serializer/config-items/KeystrokeAction.ts
index 6d3e2e58..ff94de37 100644
--- a/config-serializer/config-items/KeystrokeAction.ts
+++ b/config-serializer/config-items/KeystrokeAction.ts
@@ -10,7 +10,7 @@ class KeystrokeAction extends KeyAction implements Serializable<KeystrokeAction>
 
     set scancode(value) {
         if (!TypeChecker.isScancodeValid(value)) {
-            throw 'Invalid KeystrokeAction.scancode: ${scancode}';
+            throw `Invalid KeystrokeAction.scancode: ${value}`;
         }
         this._scancode = value;
     }
diff --git a/config-serializer/config-items/KeystrokeWithModifiersAction.ts b/config-serializer/config-items/KeystrokeWithModifiersAction.ts
index 1e18d0e7..a4376bc8 100644
--- a/config-serializer/config-items/KeystrokeWithModifiersAction.ts
+++ b/config-serializer/config-items/KeystrokeWithModifiersAction.ts
@@ -12,7 +12,7 @@ class KeystrokeWithModifiersAction extends KeyAction implements Serializable<Key
 
     set scancode(value) {
         if (!TypeChecker.isScancodeValid(value)) {
-            throw 'Invalid KeystrokeWithModifiersAction.scancode: ${scancode}';
+            throw `Invalid KeystrokeWithModifiersAction.scancode: ${value}`;
         }
         this._scancode = value;
     }
diff --git a/config-serializer/config-items/MouseAction.ts b/config-serializer/config-items/MouseAction.ts
index 17741e8e..a8adf982 100644
--- a/config-serializer/config-items/MouseAction.ts
+++ b/config-serializer/config-items/MouseAction.ts
@@ -25,7 +25,7 @@ class MouseAction extends KeyAction implements Serializable<MouseAction> {
 
     set mouseAction(mouseAction) {
         if (!MouseAction.isMouseActionValid(mouseAction)) {
-            throw 'Invalid MouseAction.mouseAction: ${mouseAction}';
+            throw `Invalid MouseAction.mouseAction: ${mouseAction}`;
         }
         this._mouseAction = mouseAction;
     }
@@ -45,7 +45,7 @@ class MouseAction extends KeyAction implements Serializable<MouseAction> {
 
         this.mouseAction = buffer.readUInt8();
         if (!MouseAction.isMouseActionValid(this.mouseAction)) {
-            throw 'Invalid MouseAction.param: ${keyActionParam}';
+            throw `Invalid MouseAction.param: ${this.mouseAction}`;
         }
 
         return this;
diff --git a/config-serializer/config-items/NoneAction.ts b/config-serializer/config-items/NoneAction.ts
index ff760216..ee74b151 100644
--- a/config-serializer/config-items/NoneAction.ts
+++ b/config-serializer/config-items/NoneAction.ts
@@ -13,7 +13,7 @@ class NoneAction extends KeyAction implements Serializable<NoneAction> {
 
         let keyActionParam = buffer.readUInt8();
         if (keyActionParam !== NoneAction.noneActionParam) {
-            throw 'Invalid NoneAction.param: ${keyActionParam}';
+            throw `Invalid NoneAction.param: ${keyActionParam}`;
         }
 
         return this;
diff --git a/config-serializer/config-items/PlayMacroAction.ts b/config-serializer/config-items/PlayMacroAction.ts
index cc021bba..5b3206c2 100644
--- a/config-serializer/config-items/PlayMacroAction.ts
+++ b/config-serializer/config-items/PlayMacroAction.ts
@@ -10,7 +10,7 @@ class PlayMacroAction extends KeyAction implements Serializable<PlayMacroAction>
 
     set macroId(value) {
         if (!TypeChecker.isUInt8Valid(value)) {
-            throw 'Invalid PlayMacroAction.macroId: ${value}';
+            throw `Invalid PlayMacroAction.macroId: ${value}`;
         }
         this._macroId = value;
     }
diff --git a/config-serializer/config-items/SwitchLayerAction.ts b/config-serializer/config-items/SwitchLayerAction.ts
index 9749786f..bce92189 100644
--- a/config-serializer/config-items/SwitchLayerAction.ts
+++ b/config-serializer/config-items/SwitchLayerAction.ts
@@ -10,7 +10,7 @@ class SwitchKeymapAction extends KeyAction implements Serializable<SwitchKeymapA
 
     set keymapId(value) {
         if (!TypeChecker.isUInt8Valid(value)) {
-            throw 'Invalid SwitchKeymapAction.keymapId: ${value}';
+            throw `Invalid SwitchKeymapAction.keymapId: ${value}`;
         }
         this._keymapId = value;
     }