From 5f6727b53acb4f79795eb4230c0bfdc52b0c91dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Tue, 29 Mar 2016 13:07:33 +0200 Subject: [PATCH] Rename KeyActionNone to NoneAction. --- config-serializer/config-items/KeyAction.ts | 8 ++++---- .../{KeyActionNone.ts => NoneAction.ts} | 18 +++++++++--------- config-serializer/config-items/config-items.ts | 2 +- 3 files changed, 14 insertions(+), 14 deletions(-) rename config-serializer/config-items/{KeyActionNone.ts => NoneAction.ts} (52%) diff --git a/config-serializer/config-items/KeyAction.ts b/config-serializer/config-items/KeyAction.ts index adecf42b..af916a27 100644 --- a/config-serializer/config-items/KeyAction.ts +++ b/config-serializer/config-items/KeyAction.ts @@ -6,8 +6,8 @@ class KeyAction { return new KeystrokeAction().fromJsObject(jsObject); case MouseAction.keyActionTypeString: return new MouseAction().fromJsObject(jsObject); - case KeyActionNone.keyActionTypeString: - return new KeyActionNone().fromJsObject(jsObject); + case NoneAction.keyActionTypeString: + return new NoneAction().fromJsObject(jsObject); default: throw 'Invalid KeyAction.keyActionType: "${jsObject.actionType}"'; } @@ -21,8 +21,8 @@ class KeyAction { return new KeystrokeAction().fromBinary(buffer); } else if (keyActionFirstByte === MouseAction.keyActionId) { return new MouseAction().fromBinary(buffer); - } else if (keyActionFirstByte === KeyActionNone.keyActionId) { - return new KeyActionNone().fromBinary(buffer); + } else if (keyActionFirstByte === NoneAction.keyActionId) { + return new NoneAction().fromBinary(buffer); } else { throw 'Invalid KeyAction first byte "${keyActionFirstByte}"'; } diff --git a/config-serializer/config-items/KeyActionNone.ts b/config-serializer/config-items/NoneAction.ts similarity index 52% rename from config-serializer/config-items/KeyActionNone.ts rename to config-serializer/config-items/NoneAction.ts index 7f13c9e2..65b93313 100644 --- a/config-serializer/config-items/KeyActionNone.ts +++ b/config-serializer/config-items/NoneAction.ts @@ -1,24 +1,24 @@ -class KeyActionNone extends KeyAction implements Serializable { +class NoneAction extends KeyAction implements Serializable { static keyActionTypeString = 'none'; static keyActionId = 0; static keyActionNoneParam = 0; - fromJsObject(jsObject: any): KeyActionNone { - if (jsObject.keyActionType !== KeyActionNone.keyActionTypeString) { + fromJsObject(jsObject: any): NoneAction { + if (jsObject.keyActionType !== NoneAction.keyActionTypeString) { throw 'Invalid KeyActionNone.keyActionType: "${jsObject.keyActionType}"'; } return this; } - fromBinary(buffer: UhkBuffer): KeyActionNone { + fromBinary(buffer: UhkBuffer): NoneAction { let keyActionId = buffer.readUInt8(); - if (keyActionId !== KeyActionNone.keyActionId) { + if (keyActionId !== NoneAction.keyActionId) { throw 'Invalid KeyActionNone.id: ${keyActionId}'; } let keyActionParam = buffer.readUInt8(); - if (keyActionParam !== KeyActionNone.keyActionNoneParam) { + if (keyActionParam !== NoneAction.keyActionNoneParam) { throw 'Invalid KeyActionNone.param: ${keyActionParam}'; } @@ -27,12 +27,12 @@ class KeyActionNone extends KeyAction implements Serializable { toJsObject(): any { return { - keyActionType: KeyActionNone.keyActionTypeString + keyActionType: NoneAction.keyActionTypeString }; } toBinary(buffer: UhkBuffer) { - buffer.writeUInt8(KeyActionNone.keyActionId); - buffer.writeUInt8(KeyActionNone.keyActionNoneParam); + buffer.writeUInt8(NoneAction.keyActionId); + buffer.writeUInt8(NoneAction.keyActionNoneParam); } } diff --git a/config-serializer/config-items/config-items.ts b/config-serializer/config-items/config-items.ts index 515bb8ba..e090425c 100644 --- a/config-serializer/config-items/config-items.ts +++ b/config-serializer/config-items/config-items.ts @@ -1,4 +1,4 @@ /// /// /// -/// +///