diff --git a/dist/r3.js b/dist/r3.js index b9c40c0..3c4aa40 100644 --- a/dist/r3.js +++ b/dist/r3.js @@ -1,6 +1,6 @@ class R3 { - static version = '2.0.128'; - static compileDate = '2021 Sep 06 - 07:58:41 am'; + static version = '2.0.132'; + static compileDate = '2021 Sep 06 - 08:50:36 am'; } class System { @@ -63,14 +63,12 @@ class System { */ static Stop() { + console.log('Stopped System'); + if ('System' !== 'System') { System.Stop(); } - System.Started = false; - - console.log('Stopped System'); - } } @@ -1640,19 +1638,19 @@ class Utils { Methods: - - start(options = {}) - Just calls System.Start(options) + - start() + Overrides for R3.System.start() - - stop(options = {}) - Just calls System.Stop(options) + - stop() + Overrides for R3.System.stop() Static Methods: - - Start(options = {}) - Starts the system by registering subscriptions to events + - Start() + Overrides for R3.System.Start() - - Stop(options = {}) - Stops the system by removing these subscriptions to events + - Stop() + Overrides for R3.System.Stop() **/ @@ -1676,10 +1674,9 @@ class SystemInput extends System { /** * start() - * - Just calls System.Start(options) - * @param options = {} + * - Just calls System.Start() */ - start(options = {}) { + start() { SystemInput.Start(); this.started = true; @@ -1688,10 +1685,9 @@ class SystemInput extends System { /** * stop() - * - Just calls System.Stop(options) - * @param options = {} + * - Just calls System.Stop() */ - stop(options = {}) { + stop() { SystemInput.Stop(); this.started = false; @@ -1700,10 +1696,9 @@ class SystemInput extends System { /** * Start() - * - Starts the system by registering subscriptions to events - * @param options = {} + * - Starts the system by registering subscriptions to events */ - static Start(options = {}) { + static Start() { if ('System' !== 'SystemInput') { System.Start(); @@ -1778,119 +1773,116 @@ class SystemInput extends System { /** * Stop() - * - Stops the system by removing these subscriptions to events - * @param options = {} + * - Stops the system by removing these subscriptions to events */ - static Stop(options = {}) { + static Stop() { + + SystemInput.Subscriptions = SystemInput.Subscriptions.reduce( + (result, subscription) => { + if (subscription.remove() !== true) { + result.push(subscription); + } + return result; + }, + [] + ); + + SystemInput.Subscriptions = SystemInput.Subscriptions.reduce( + (result, subscription) => { + if (subscription.remove() !== true) { + result.push(subscription); + } + return result; + }, + [] + ); + + SystemInput.Subscriptions = SystemInput.Subscriptions.reduce( + (result, subscription) => { + if (subscription.remove() !== true) { + result.push(subscription); + } + return result; + }, + [] + ); + + SystemInput.Subscriptions = SystemInput.Subscriptions.reduce( + (result, subscription) => { + if (subscription.remove() !== true) { + result.push(subscription); + } + return result; + }, + [] + ); + + SystemInput.Subscriptions = SystemInput.Subscriptions.reduce( + (result, subscription) => { + if (subscription.remove() !== true) { + result.push(subscription); + } + return result; + }, + [] + ); + + SystemInput.Subscriptions = SystemInput.Subscriptions.reduce( + (result, subscription) => { + if (subscription.remove() !== true) { + result.push(subscription); + } + return result; + }, + [] + ); + + SystemInput.Subscriptions = SystemInput.Subscriptions.reduce( + (result, subscription) => { + if (subscription.remove() !== true) { + result.push(subscription); + } + return result; + }, + [] + ); + + SystemInput.Subscriptions = SystemInput.Subscriptions.reduce( + (result, subscription) => { + if (subscription.remove() !== true) { + result.push(subscription); + } + return result; + }, + [] + ); + + SystemInput.Subscriptions = SystemInput.Subscriptions.reduce( + (result, subscription) => { + if (subscription.remove() !== true) { + result.push(subscription); + } + return result; + }, + [] + ); + + SystemInput.Subscriptions = SystemInput.Subscriptions.reduce( + (result, subscription) => { + if (subscription.remove() !== true) { + result.push(subscription); + } + return result; + }, + [] + ); + + console.log('Stopped SystemInput'); if ('System' !== 'SystemInput') { System.Stop(); } - SystemInput.Subscriptions = SystemInput.Subscriptions.reduce( - (result, subscription) => { - if (subscription.remove() !== true) { - result.push(subscription); - } - return result; - }, - [] - ); - - SystemInput.Subscriptions = SystemInput.Subscriptions.reduce( - (result, subscription) => { - if (subscription.remove() !== true) { - result.push(subscription); - } - return result; - }, - [] - ); - - SystemInput.Subscriptions = SystemInput.Subscriptions.reduce( - (result, subscription) => { - if (subscription.remove() !== true) { - result.push(subscription); - } - return result; - }, - [] - ); - - SystemInput.Subscriptions = SystemInput.Subscriptions.reduce( - (result, subscription) => { - if (subscription.remove() !== true) { - result.push(subscription); - } - return result; - }, - [] - ); - - SystemInput.Subscriptions = SystemInput.Subscriptions.reduce( - (result, subscription) => { - if (subscription.remove() !== true) { - result.push(subscription); - } - return result; - }, - [] - ); - - SystemInput.Subscriptions = SystemInput.Subscriptions.reduce( - (result, subscription) => { - if (subscription.remove() !== true) { - result.push(subscription); - } - return result; - }, - [] - ); - - SystemInput.Subscriptions = SystemInput.Subscriptions.reduce( - (result, subscription) => { - if (subscription.remove() !== true) { - result.push(subscription); - } - return result; - }, - [] - ); - - SystemInput.Subscriptions = SystemInput.Subscriptions.reduce( - (result, subscription) => { - if (subscription.remove() !== true) { - result.push(subscription); - } - return result; - }, - [] - ); - - SystemInput.Subscriptions = SystemInput.Subscriptions.reduce( - (result, subscription) => { - if (subscription.remove() !== true) { - result.push(subscription); - } - return result; - }, - [] - ); - - SystemInput.Subscriptions = SystemInput.Subscriptions.reduce( - (result, subscription) => { - if (subscription.remove() !== true) { - result.push(subscription); - } - return result; - }, - [] - ); - - SystemInput.Started = false; - - console.log('Stopped SystemInput'); - } /** @@ -2123,34 +2115,32 @@ class SystemLinking extends System { */ static Stop(options) { + SystemLinking.Subscriptions = SystemLinking.Subscriptions.reduce( + (result, subscription) => { + if (subscription.remove() !== true) { + result.push(subscription); + } + return result; + }, + [] + ); + + SystemLinking.Subscriptions = SystemLinking.Subscriptions.reduce( + (result, subscription) => { + if (subscription.remove() !== true) { + result.push(subscription); + } + return result; + }, + [] + ); + + console.log('Stopped SystemLinking'); + if ('System' !== 'SystemLinking') { System.Stop(); } - SystemLinking.Subscriptions = SystemLinking.Subscriptions.reduce( - (result, subscription) => { - if (subscription.remove() !== true) { - result.push(subscription); - } - return result; - }, - [] - ); - - SystemLinking.Subscriptions = SystemLinking.Subscriptions.reduce( - (result, subscription) => { - if (subscription.remove() !== true) { - result.push(subscription); - } - return result; - }, - [] - ); - - SystemLinking.Started = false; - - console.log('Stopped SystemLinking'); - } /** @@ -2294,14 +2284,12 @@ class SystemSocket extends System { */ static Stop(options) { + console.log('Stopped SystemSocket'); + if ('System' !== 'SystemSocket') { System.Stop(); } - SystemSocket.Started = false; - - console.log('Stopped SystemSocket'); - } } @@ -2421,14 +2409,12 @@ class SystemTest extends System { */ static Stop(options) { + console.log('Stopped SystemTest'); + if ('System' !== 'SystemTest') { System.Stop(); } - SystemTest.Started = false; - - console.log('Stopped SystemTest'); - } } diff --git a/package.json b/package.json index db26135..9660466 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "r3", - "version" : "2.0.128", + "version" : "2.0.132", "description": "", "private": true, "dependencies": { diff --git a/src/r3/r3-r3.js b/src/r3/r3-r3.js index 8a81cc5..96ad50e 100644 --- a/src/r3/r3-r3.js +++ b/src/r3/r3-r3.js @@ -1,6 +1,6 @@ class R3 { - static version = '2.0.128'; - static compileDate = '2021 Sep 06 - 07:58:41 am'; + static version = '2.0.132'; + static compileDate = '2021 Sep 06 - 08:50:36 am'; } //GENERATED_IMPORTS_START diff --git a/src/r3/r3-system/r3-system-input.js b/src/r3/r3-system/r3-system-input.js index 9c26865..65d3bdf 100644 --- a/src/r3/r3-system/r3-system-input.js +++ b/src/r3/r3-system/r3-system-input.js @@ -37,25 +37,28 @@ const System = require('./r3-system.js'); Methods: - - start(options = {}) - Just calls System.Start(options) + - start() + Overrides for R3.System.start() - - stop(options = {}) - Just calls System.Stop(options) + - stop() + Overrides for R3.System.stop() Static Methods: - - Start(options = {}) - Starts the system by registering subscriptions to events + - Start() + Overrides for R3.System.Start() - - Stop(options = {}) - Stops the system by removing these subscriptions to events + - Stop() + Overrides for R3.System.Stop() GENERATED_INHERITED_END CUSTOM_OPTIONS_START CUSTOM_OPTIONS_END + CUSTOM_STATIC_OPTIONS_START + CUSTOM_STATIC_OPTIONS_END + CUSTOM_EVENT_LISTENERS_START Event.TOUCH_START Event.TOUCH_END @@ -70,13 +73,13 @@ const System = require('./r3-system.js'); CUSTOM_EVENT_LISTENERS_END CUSTOM_METHODS_START - start(options = {}) - Just calls System.Start(options) - stop(options = {}) - Just calls System.Stop(options) + start() - Just calls System.Start() + stop() - Just calls System.Stop() CUSTOM_METHODS_END CUSTOM_STATIC_METHODS_START - Start(options = {}) - Starts the system by registering subscriptions to events - Stop(options = {}) - Stops the system by removing these subscriptions to events + Start() - Starts the system by registering subscriptions to events + Stop() - Stops the system by removing these subscriptions to events CUSTOM_STATIC_METHODS_END **/ @@ -116,10 +119,9 @@ class SystemInput extends System { /** * start() - * - Just calls System.Start(options) - * @param options = {} + * - Just calls System.Start() */ - start(options = {}) { + start() { //GENERATED_START_METHOD_START SystemInput.Start(); @@ -133,10 +135,9 @@ class SystemInput extends System { /** * stop() - * - Just calls System.Stop(options) - * @param options = {} + * - Just calls System.Stop() */ - stop(options = {}) { + stop() { //GENERATED_STOP_METHOD_START SystemInput.Stop(); @@ -153,10 +154,9 @@ class SystemInput extends System { /** * Start() - * - Starts the system by registering subscriptions to events - * @param options = {} + * - Starts the system by registering subscriptions to events */ - static Start(options = {}) { + static Start() { //GENERATED_STATIC_START_METHOD_START @@ -240,17 +240,12 @@ class SystemInput extends System { /** * Stop() - * - Stops the system by removing these subscriptions to events - * @param options = {} + * - Stops the system by removing these subscriptions to events */ - static Stop(options = {}) { + static Stop() { //GENERATED_STATIC_STOP_METHOD_START - if ('System' !== 'SystemInput') { - System.Stop(); - } - //GENERATED_EVENT_LISTENERS_STOP_START SystemInput.Subscriptions = SystemInput.Subscriptions.reduce( @@ -354,10 +349,12 @@ class SystemInput extends System { ); //GENERATED_EVENT_LISTENERS_STOP_END - SystemInput.Started = false; - console.log('Stopped SystemInput'); + if ('System' !== 'SystemInput') { + System.Stop(); + } + //GENERATED_STATIC_STOP_METHOD_END //CUSTOM_STATIC_STOP_METHOD_START @@ -534,6 +531,9 @@ class SystemInput extends System { } +//GENERATED_STATIC_OPTIONS_INIT_START +//GENERATED_STATIC_OPTIONS_INIT_END + //CUSTOM_OUT_OF_CLASS_IMPLEMENTATION_START //CUSTOM_OUT_OF_CLASS_IMPLEMENTATION_END diff --git a/src/r3/r3-system/r3-system-linking.js b/src/r3/r3-system/r3-system-linking.js index 1c1294c..d8a018b 100644 --- a/src/r3/r3-system/r3-system-linking.js +++ b/src/r3/r3-system/r3-system-linking.js @@ -56,6 +56,9 @@ const System = require('./r3-system.js'); CUSTOM_OPTIONS_START CUSTOM_OPTIONS_END + CUSTOM_STATIC_OPTIONS_START + CUSTOM_STATIC_OPTIONS_END + CUSTOM_EVENT_LISTENERS_START Event.OBJECT_CREATED Event.INSTANCE_CREATED @@ -191,10 +194,6 @@ class SystemLinking extends System { //GENERATED_STATIC_STOP_METHOD_START - if ('System' !== 'SystemLinking') { - System.Stop(); - } - //GENERATED_EVENT_LISTENERS_STOP_START SystemLinking.Subscriptions = SystemLinking.Subscriptions.reduce( @@ -218,10 +217,12 @@ class SystemLinking extends System { ); //GENERATED_EVENT_LISTENERS_STOP_END - SystemLinking.Started = false; - console.log('Stopped SystemLinking'); + if ('System' !== 'SystemLinking') { + System.Stop(); + } + //GENERATED_STATIC_STOP_METHOD_END //CUSTOM_STATIC_STOP_METHOD_START @@ -270,6 +271,9 @@ class SystemLinking extends System { } +//GENERATED_STATIC_OPTIONS_INIT_START +//GENERATED_STATIC_OPTIONS_INIT_END + //CUSTOM_OUT_OF_CLASS_IMPLEMENTATION_START //CUSTOM_OUT_OF_CLASS_IMPLEMENTATION_END diff --git a/src/r3/r3-system/r3-system-socket.js b/src/r3/r3-system/r3-system-socket.js index e6a92ae..039e969 100644 --- a/src/r3/r3-system/r3-system-socket.js +++ b/src/r3/r3-system/r3-system-socket.js @@ -56,6 +56,9 @@ const System = require('./r3-system.js'); CUSTOM_OPTIONS_START CUSTOM_OPTIONS_END + CUSTOM_STATIC_OPTIONS_START + CUSTOM_STATIC_OPTIONS_END + CUSTOM_EVENT_LISTENERS_START CUSTOM_EVENT_LISTENERS_END @@ -179,17 +182,15 @@ class SystemSocket extends System { //GENERATED_STATIC_STOP_METHOD_START - if ('System' !== 'SystemSocket') { - System.Stop(); - } - //GENERATED_EVENT_LISTENERS_STOP_START //GENERATED_EVENT_LISTENERS_STOP_END - SystemSocket.Started = false; - console.log('Stopped SystemSocket'); + if ('System' !== 'SystemSocket') { + System.Stop(); + } + //GENERATED_STATIC_STOP_METHOD_END //CUSTOM_STATIC_STOP_METHOD_START @@ -206,6 +207,9 @@ class SystemSocket extends System { } +//GENERATED_STATIC_OPTIONS_INIT_START +//GENERATED_STATIC_OPTIONS_INIT_END + //CUSTOM_OUT_OF_CLASS_IMPLEMENTATION_START //CUSTOM_OUT_OF_CLASS_IMPLEMENTATION_END diff --git a/src/r3/r3-system/r3-system-test.js b/src/r3/r3-system/r3-system-test.js index e44c373..1539ddc 100644 --- a/src/r3/r3-system/r3-system-test.js +++ b/src/r3/r3-system/r3-system-test.js @@ -56,6 +56,9 @@ const System = require('./r3-system.js'); CUSTOM_OPTIONS_START CUSTOM_OPTIONS_END + CUSTOM_STATIC_OPTIONS_START + CUSTOM_STATIC_OPTIONS_END + CUSTOM_EVENT_LISTENERS_START CUSTOM_EVENT_LISTENERS_END @@ -177,17 +180,15 @@ class SystemTest extends System { //GENERATED_STATIC_STOP_METHOD_START - if ('System' !== 'SystemTest') { - System.Stop(); - } - //GENERATED_EVENT_LISTENERS_STOP_START //GENERATED_EVENT_LISTENERS_STOP_END - SystemTest.Started = false; - console.log('Stopped SystemTest'); + if ('System' !== 'SystemTest') { + System.Stop(); + } + //GENERATED_STATIC_STOP_METHOD_END //CUSTOM_STATIC_STOP_METHOD_START @@ -204,6 +205,9 @@ class SystemTest extends System { } +//GENERATED_STATIC_OPTIONS_INIT_START +//GENERATED_STATIC_OPTIONS_INIT_END + //CUSTOM_OUT_OF_CLASS_IMPLEMENTATION_START //CUSTOM_OUT_OF_CLASS_IMPLEMENTATION_END diff --git a/src/r3/r3-system/r3-system.js b/src/r3/r3-system/r3-system.js index 658f395..2cc0598 100644 --- a/src/r3/r3-system/r3-system.js +++ b/src/r3/r3-system/r3-system.js @@ -6,6 +6,9 @@ const Utils = require('.././r3-utils'); CUSTOM_OPTIONS_START CUSTOM_OPTIONS_END + CUSTOM_STATIC_OPTIONS_START + CUSTOM_STATIC_OPTIONS_END + CUSTOM_METHODS_START start() - Just calls System.Start() stop() - Just calls System.Stop() @@ -118,17 +121,15 @@ class System { //GENERATED_STATIC_STOP_METHOD_START - if ('System' !== 'System') { - System.Stop(); - } - //GENERATED_EVENT_LISTENERS_STOP_START //GENERATED_EVENT_LISTENERS_STOP_END - System.Started = false; - console.log('Stopped System'); + if ('System' !== 'System') { + System.Stop(); + } + //GENERATED_STATIC_STOP_METHOD_END //CUSTOM_STATIC_STOP_METHOD_START @@ -142,6 +143,9 @@ class System { } +//GENERATED_STATIC_OPTIONS_INIT_START +//GENERATED_STATIC_OPTIONS_INIT_END + //CUSTOM_OUT_OF_CLASS_IMPLEMENTATION_START System.Started = false; //CUSTOM_OUT_OF_CLASS_IMPLEMENTATION_END diff --git a/src/templates/static_stop.template b/src/templates/static_stop.template index 4838490..3f276cd 100644 --- a/src/templates/static_stop.template +++ b/src/templates/static_stop.template @@ -1,11 +1,9 @@ - if ('PARENT_SYSTEM' !== 'CLASS_NAME') { - PARENT_SYSTEM.Stop(); - } - //GENERATED_EVENT_LISTENERS_STOP_START //GENERATED_EVENT_LISTENERS_STOP_END - CLASS_NAME.Started = false; - console.log('Stopped CLASS_NAME'); + + if ('PARENT_SYSTEM' !== 'CLASS_NAME') { + PARENT_SYSTEM.Stop(); + } diff --git a/src/templates/system-base.template b/src/templates/system-base.template index fe49363..a62bb4c 100644 --- a/src/templates/system-base.template +++ b/src/templates/system-base.template @@ -6,6 +6,9 @@ const Utils = require('INCLUDE_PATH/r3-utils'); CUSTOM_OPTIONS_START CUSTOM_OPTIONS_END + CUSTOM_STATIC_OPTIONS_START + CUSTOM_STATIC_OPTIONS_END + CUSTOM_METHODS_START start() - Just calls System.Start() stop() - Just calls System.Stop() @@ -34,6 +37,9 @@ class CLASS_NAME { } +//GENERATED_STATIC_OPTIONS_INIT_START +//GENERATED_STATIC_OPTIONS_INIT_END + //CUSTOM_OUT_OF_CLASS_IMPLEMENTATION_START CLASS_NAME.Started = false; //CUSTOM_OUT_OF_CLASS_IMPLEMENTATION_END diff --git a/src/templates/system.template b/src/templates/system.template index 56831f2..c4be3d2 100644 --- a/src/templates/system.template +++ b/src/templates/system.template @@ -11,6 +11,9 @@ const EXTEND_CLASS = require('./EXTEND_CLASS_FILE_NAME'); CUSTOM_OPTIONS_START CUSTOM_OPTIONS_END + CUSTOM_STATIC_OPTIONS_START + CUSTOM_STATIC_OPTIONS_END + CUSTOM_EVENT_LISTENERS_START CUSTOM_EVENT_LISTENERS_END @@ -45,6 +48,9 @@ class CLASS_NAME extends EXTEND_CLASS { } +//GENERATED_STATIC_OPTIONS_INIT_START +//GENERATED_STATIC_OPTIONS_INIT_END + //CUSTOM_OUT_OF_CLASS_IMPLEMENTATION_START //CUSTOM_OUT_OF_CLASS_IMPLEMENTATION_END diff --git a/src/templates/token.db b/src/templates/token.db index 963f8de..9608664 100644 --- a/src/templates/token.db +++ b/src/templates/token.db @@ -37,6 +37,7 @@ GENERATED_STATIC_ON_TOUCH_CANCEL_METHOD GENERATED_STATIC_ON_TOUCH_END_METHOD GENERATED_STATIC_ON_TOUCH_MOVE_METHOD GENERATED_STATIC_ON_TOUCH_START_METHOD +GENERATED_STATIC_OPTIONS_INIT GENERATED_STATIC_START_METHOD GENERATED_STATIC_STOP_METHOD GENERATED_STATIC_SUBSCRIBE_METHOD @@ -80,6 +81,7 @@ CUSTOM_STATIC_ON_TOUCH_CANCEL_METHOD CUSTOM_STATIC_ON_TOUCH_END_METHOD CUSTOM_STATIC_ON_TOUCH_MOVE_METHOD CUSTOM_STATIC_ON_TOUCH_START_METHOD +CUSTOM_STATIC_OPTIONS CUSTOM_STATIC_START_METHOD CUSTOM_STATIC_STOP_METHOD CUSTOM_STATIC_SUBSCRIBE_METHOD diff --git a/version b/version index 12f184a..c89c8e3 100644 --- a/version +++ b/version @@ -1 +1 @@ -2.0.128 \ No newline at end of file +2.0.132 \ No newline at end of file