Rename KeyActionNone to NoneAction.

This commit is contained in:
László Monda
2016-03-29 13:07:33 +02:00
parent 00827b1b94
commit 5f6727b53a
3 changed files with 14 additions and 14 deletions
+4 -4
View File
@@ -6,8 +6,8 @@ class KeyAction {
return new KeystrokeAction().fromJsObject(jsObject); return new KeystrokeAction().fromJsObject(jsObject);
case MouseAction.keyActionTypeString: case MouseAction.keyActionTypeString:
return new MouseAction().fromJsObject(jsObject); return new MouseAction().fromJsObject(jsObject);
case KeyActionNone.keyActionTypeString: case NoneAction.keyActionTypeString:
return new KeyActionNone().fromJsObject(jsObject); return new NoneAction().fromJsObject(jsObject);
default: default:
throw 'Invalid KeyAction.keyActionType: "${jsObject.actionType}"'; throw 'Invalid KeyAction.keyActionType: "${jsObject.actionType}"';
} }
@@ -21,8 +21,8 @@ class KeyAction {
return new KeystrokeAction().fromBinary(buffer); return new KeystrokeAction().fromBinary(buffer);
} else if (keyActionFirstByte === MouseAction.keyActionId) { } else if (keyActionFirstByte === MouseAction.keyActionId) {
return new MouseAction().fromBinary(buffer); return new MouseAction().fromBinary(buffer);
} else if (keyActionFirstByte === KeyActionNone.keyActionId) { } else if (keyActionFirstByte === NoneAction.keyActionId) {
return new KeyActionNone().fromBinary(buffer); return new NoneAction().fromBinary(buffer);
} else { } else {
throw 'Invalid KeyAction first byte "${keyActionFirstByte}"'; throw 'Invalid KeyAction first byte "${keyActionFirstByte}"';
} }
@@ -1,24 +1,24 @@
class KeyActionNone extends KeyAction implements Serializable<KeyActionNone> { class NoneAction extends KeyAction implements Serializable<NoneAction> {
static keyActionTypeString = 'none'; static keyActionTypeString = 'none';
static keyActionId = 0; static keyActionId = 0;
static keyActionNoneParam = 0; static keyActionNoneParam = 0;
fromJsObject(jsObject: any): KeyActionNone { fromJsObject(jsObject: any): NoneAction {
if (jsObject.keyActionType !== KeyActionNone.keyActionTypeString) { if (jsObject.keyActionType !== NoneAction.keyActionTypeString) {
throw 'Invalid KeyActionNone.keyActionType: "${jsObject.keyActionType}"'; throw 'Invalid KeyActionNone.keyActionType: "${jsObject.keyActionType}"';
} }
return this; return this;
} }
fromBinary(buffer: UhkBuffer): KeyActionNone { fromBinary(buffer: UhkBuffer): NoneAction {
let keyActionId = buffer.readUInt8(); let keyActionId = buffer.readUInt8();
if (keyActionId !== KeyActionNone.keyActionId) { if (keyActionId !== NoneAction.keyActionId) {
throw 'Invalid KeyActionNone.id: ${keyActionId}'; throw 'Invalid KeyActionNone.id: ${keyActionId}';
} }
let keyActionParam = buffer.readUInt8(); let keyActionParam = buffer.readUInt8();
if (keyActionParam !== KeyActionNone.keyActionNoneParam) { if (keyActionParam !== NoneAction.keyActionNoneParam) {
throw 'Invalid KeyActionNone.param: ${keyActionParam}'; throw 'Invalid KeyActionNone.param: ${keyActionParam}';
} }
@@ -27,12 +27,12 @@ class KeyActionNone extends KeyAction implements Serializable<KeyActionNone> {
toJsObject(): any { toJsObject(): any {
return { return {
keyActionType: KeyActionNone.keyActionTypeString keyActionType: NoneAction.keyActionTypeString
}; };
} }
toBinary(buffer: UhkBuffer) { toBinary(buffer: UhkBuffer) {
buffer.writeUInt8(KeyActionNone.keyActionId); buffer.writeUInt8(NoneAction.keyActionId);
buffer.writeUInt8(KeyActionNone.keyActionNoneParam); buffer.writeUInt8(NoneAction.keyActionNoneParam);
} }
} }
@@ -1,4 +1,4 @@
/// <reference path="KeyAction.ts" /> /// <reference path="KeyAction.ts" />
/// <reference path="KeystrokeAction.ts" /> /// <reference path="KeystrokeAction.ts" />
/// <reference path="MouseAction.ts" /> /// <reference path="MouseAction.ts" />
/// <reference path="KeyActionNone.ts" /> /// <reference path="NoneAction.ts" />