From c1b5d234a1a5a44b57d618e6c98d994bd2f03b84 Mon Sep 17 00:00:00 2001 From: Luis Fernando Molina Date: Mon, 6 Apr 2020 08:17:43 +0200 Subject: [PATCH] Refactoring --- Canvas.js | 2 +- .../Workspace/FunctionLibraries/SessionFunctions.js | 4 ++-- .../Workspace/FunctionLibraries/TaskFunctions.js | 6 +++--- FloatingSpace/CircularProgressBar.js | 4 ++-- FloatingSpace/UiObject.js | 10 +++++----- PostLoader.js | 6 +++--- SystemEventHandler.js | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Canvas.js b/Canvas.js index b50e017af..7959cb344 100644 --- a/Canvas.js +++ b/Canvas.js @@ -131,7 +131,7 @@ function newCanvas () { thisObject.animation = animation /* Low Level Infraestructure First */ - animation.addCallBackFunction('System Event Handler Physics', systemEventHandler.physics) + animation.addCallBackFunction('System Event Handler Physics', eventsServerClient.physics) /* Spcaces Physics */ animation.addCallBackFunction('CockpitSpace Physics', thisObject.cockpitSpace.physics) diff --git a/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js b/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js index 33542151d..a35c3ec60 100644 --- a/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js +++ b/DesignSpace/Workspace/FunctionLibraries/SessionFunctions.js @@ -65,7 +65,7 @@ function newSessionFunctions () { tradingSystem: JSON.stringify(tradingSystem) } - systemEventHandler.raiseEvent(key, 'Run Session', event) + eventsServerClient.raiseEvent(key, 'Run Session', event) if (node.payload.parentNode.payload.parentNode.payload.parentNode.payload.parentNode === undefined) { callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE) @@ -75,7 +75,7 @@ function newSessionFunctions () { function stopSession (node, functionLibraryProtocolNode, callBackFunction) { let key = node.name + '-' + node.type + '-' + node.id - systemEventHandler.raiseEvent(key, 'Stop Session') + eventsServerClient.raiseEvent(key, 'Stop Session') node.payload.uiObject.stop(callBackFunction) } diff --git a/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js b/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js index 330c6d668..6c89285ed 100644 --- a/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js +++ b/DesignSpace/Workspace/FunctionLibraries/TaskFunctions.js @@ -68,12 +68,12 @@ function newTaskFunctions () { if (node.payload.parentNode === undefined) { callBackFunction(GLOBAL.DEFAULT_FAIL_RESPONSE) - systemEventHandler.raiseEvent('Task Server', 'Debug Task Started', event) + eventsServerClient.raiseEvent('Task Server', 'Debug Task Started', event) return } node.payload.uiObject.run(callBackFunction) - systemEventHandler.raiseEvent('Task Manager', 'Run Task', event) + eventsServerClient.raiseEvent('Task Manager', 'Run Task', event) } function stopTask (node, functionLibraryProtocolNode, callBackFunction) { @@ -83,7 +83,7 @@ function newTaskFunctions () { } node.payload.uiObject.stop(callBackFunction) - systemEventHandler.raiseEvent('Task Manager', 'Stop Task', event) + eventsServerClient.raiseEvent('Task Manager', 'Stop Task', event) if (node.bot === undefined) { return } if (node.bot.processes.length === 0) { return } diff --git a/FloatingSpace/CircularProgressBar.js b/FloatingSpace/CircularProgressBar.js index a78943473..8e6a55336 100644 --- a/FloatingSpace/CircularProgressBar.js +++ b/FloatingSpace/CircularProgressBar.js @@ -32,7 +32,7 @@ function newCircularProgressBar () { function finalize () { let key = thisObject.payload.node.name + '-' + thisObject.payload.node.type + '-' + thisObject.payload.node.id if (eventSubscriptionIdHeartbeat !== undefined) { - systemEventHandler.stopListening(key, eventSubscriptionIdHeartbeat) + eventsServerClient.stopListening(key, eventSubscriptionIdHeartbeat) } thisObject.container = undefined @@ -48,7 +48,7 @@ function newCircularProgressBar () { } let key = thisObject.payload.node.name + '-' + thisObject.payload.node.type + '-' + thisObject.payload.node.id - systemEventHandler.listenToEvent(key, 'Heartbeat', undefined, key, onResponse, onHeartBeat) + eventsServerClient.listenToEvent(key, 'Heartbeat', undefined, key, onResponse, onHeartBeat) function onResponse (message) { eventSubscriptionIdHeartbeat = message.eventSubscriptionId diff --git a/FloatingSpace/UiObject.js b/FloatingSpace/UiObject.js index 1219557a7..ba8c9abdb 100644 --- a/FloatingSpace/UiObject.js +++ b/FloatingSpace/UiObject.js @@ -122,10 +122,10 @@ function newUiObject () { let key = thisObject.payload.node.name + '-' + thisObject.payload.node.type + '-' + thisObject.payload.node.id if (eventSubscriptionIdOnRunning !== undefined) { - systemEventHandler.stopListening(key, eventSubscriptionIdOnRunning, 'UiObject') + eventsServerClient.stopListening(key, eventSubscriptionIdOnRunning, 'UiObject') } if (eventSubscriptionIdOnStopped !== undefined) { - systemEventHandler.stopListening(key, eventSubscriptionIdOnStopped, 'UiObject') + eventsServerClient.stopListening(key, eventSubscriptionIdOnStopped, 'UiObject') } thisObject.container.eventHandler.stopListening(selfFocusEventSubscriptionId) @@ -759,7 +759,7 @@ function newUiObject () { /* We will wait to hear the Running event in order to confirm the execution was really started */ let key = thisObject.payload.node.name + '-' + thisObject.payload.node.type + '-' + thisObject.payload.node.id - systemEventHandler.listenToEvent(key, 'Running', undefined, 'UiObject', onResponse, onRunning) + eventsServerClient.listenToEvent(key, 'Running', undefined, 'UiObject', onResponse, onRunning) onRunningCallBackFunction = callBackFunction @@ -771,7 +771,7 @@ function newUiObject () { if (thisObject.payload === undefined) { return } let key = thisObject.payload.node.name + '-' + thisObject.payload.node.type + '-' + thisObject.payload.node.id - systemEventHandler.stopListening(key, eventSubscriptionIdOnRunning, 'UiObject') + eventsServerClient.stopListening(key, eventSubscriptionIdOnRunning, 'UiObject') thisObject.isRunning = true @@ -801,7 +801,7 @@ function newUiObject () { function stop (callBackFunction, event) { /* We will wait to the event that the execution was terminated in order to call back the menu item */ let key = thisObject.payload.node.name + '-' + thisObject.payload.node.type + '-' + thisObject.payload.node.id - systemEventHandler.listenToEvent(key, 'Stopped', undefined, 'UiObject', onResponse, onStopped) + eventsServerClient.listenToEvent(key, 'Stopped', undefined, 'UiObject', onResponse, onStopped) function onResponse (message) { eventSubscriptionIdOnStopped = message.eventSubscriptionId diff --git a/PostLoader.js b/PostLoader.js index 567be6bdf..c0f41ee78 100644 --- a/PostLoader.js +++ b/PostLoader.js @@ -1,6 +1,6 @@ let canvas let markets -let systemEventHandler +let eventsServerClient let APP_SCHEMA_MAP = new Map() let APP_SCHEMA_ARRAY = [] @@ -24,8 +24,8 @@ function newDashboard () { try { setBrowserEvents() - systemEventHandler = newSystemEventHandler() - systemEventHandler.initialize(setUpAppSchema) + eventsServerClient = newEventsServerClient() + eventsServerClient.initialize(setUpAppSchema) function setUpAppSchema () { APP_SCHEMA_ARRAY = getAppSchema() diff --git a/SystemEventHandler.js b/SystemEventHandler.js index 3c7626ebc..abf08b292 100644 --- a/SystemEventHandler.js +++ b/SystemEventHandler.js @@ -1,5 +1,5 @@ -function newSystemEventHandler () { +function newEventsServerClient () { /* Web Sockets Connection */ const MODULE_NAME = 'System Event Handler'