uhk/agent
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make SwitchLayerAction.getToggleFlag() private. Simplify SwitchLayerAction._fromJsObject()

Browse Source
This commit is contained in:
László Monda
2016-04-09 13:17:40 +02:00
parent ec65369f3c
commit 1c30b4231c
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
config-serializer/config-items/SwitchLayerAction.ts
View File

@@ -13,10 +13,6 @@ class SwitchLayerAction extends KeyAction {
@assertEnum(Layer) @assertEnum(Layer)
private layer: Layer; private layer: Layer;
getToggleFlag() {
return this.isLayerToggleable ? SwitchLayerAction.toggleFlag : 0;
}
_fromJsObject(jsObject: any): SwitchLayerAction { _fromJsObject(jsObject: any): SwitchLayerAction {
this.assertKeyActionType(jsObject); this.assertKeyActionType(jsObject);
this.layer = Layer[<string> jsObject.layer]; this.layer = Layer[<string> jsObject.layer];
@@ -28,8 +24,7 @@ class SwitchLayerAction extends KeyAction {
this.readAndAssertKeyActionId(buffer); this.readAndAssertKeyActionId(buffer);
let layer = buffer.readUInt8(); let layer = buffer.readUInt8();
this.isLayerToggleable = (layer & SwitchLayerAction.toggleFlag) !== 0; this.isLayerToggleable = (layer & SwitchLayerAction.toggleFlag) !== 0;
layer &= ~SwitchLayerAction.toggleFlag; // Clear toggle bit. this.layer = layer & ~SwitchLayerAction.toggleFlag; // Clear toggle bit.
this.layer = layer;
return this; return this;
} }
@@ -49,4 +44,8 @@ class SwitchLayerAction extends KeyAction {
toString(): string { toString(): string {
return `<SwitchLayerAction layer="${this.layer}" toggle="${this.isLayerToggleable}">`; return `<SwitchLayerAction layer="${this.layer}" toggle="${this.isLayerToggleable}">`;
} }
private getToggleFlag() {
return this.isLayerToggleable ? SwitchLayerAction.toggleFlag : 0;
}
} }