Merge pull request #210 from smartdevicelink/bugfix/private-managers

Make the internal managers private

Author: crokita

lib/js/src/manager/screen/_ScreenManagerBase.js

@@ -31,9 +31,9 @@
 */
 
 import { _SubManagerBase } from '../_SubManagerBase.js';
-import { SoftButtonManager } from './SoftButtonManager.js';
-import { TextAndGraphicManager } from './TextAndGraphicManager.js';
-import { VoiceCommandManager } from './VoiceCommandManager.js';
+import { _SoftButtonManager } from './_SoftButtonManager.js';
+import { _TextAndGraphicManager } from './_TextAndGraphicManager.js';
+import { _VoiceCommandManager } from './_VoiceCommandManager.js';
 
 class _ScreenManagerBase extends _SubManagerBase {
     /**
@@ -48,10 +48,10 @@ class _ScreenManagerBase extends _SubManagerBase {
 
         this._fileManager = fileManager;
         if (this._fileManager !== null) {
-            this._softButtonManager = new SoftButtonManager(lifecycleManager, this._fileManager);
-            this._textAndGraphicManager = new TextAndGraphicManager(lifecycleManager, this._fileManager, this._softButtonManager);
+            this._softButtonManager = new _SoftButtonManager(lifecycleManager, this._fileManager);
+            this._textAndGraphicManager = new _TextAndGraphicManager(lifecycleManager, this._fileManager, this._softButtonManager);
         }
-        this._voiceCommandManager = new VoiceCommandManager(lifecycleManager);
+        this._voiceCommandManager = new _VoiceCommandManager(lifecycleManager);
     }
 
     /**

…/src/manager/screen/SoftButtonManager.js …src/manager/screen/_SoftButtonManager.jslib/js/src/manager/screen/SoftButtonManager.js renamed to lib/js/src/manager/screen/_SoftButtonManager.js lib/js/src/manager/screen/SoftButtonManager.js renamed to lib/js/src/manager/screen/_SoftButtonManager.js

@@ -32,9 +32,9 @@
 
 import { _SoftButtonManagerBase } from './_SoftButtonManagerBase.js';
 
-class SoftButtonManager extends _SoftButtonManagerBase {
+class _SoftButtonManager extends _SoftButtonManagerBase {
     /**
-     * Initializes an instance of SoftButtonManager.
+     * Initializes an instance of _SoftButtonManager.
      * @class
      * @param {_LifecycleManager} lifecycleManager - An instance of _LifecycleManager.
      * @param {FileManager} fileManager - An instance of FileManager.
@@ -44,4 +44,4 @@ class SoftButtonManager extends _SoftButtonManagerBase {
     }
 }
 
-export { SoftButtonManager };
+export { _SoftButtonManager };

…/manager/screen/TextAndGraphicManager.js …manager/screen/_TextAndGraphicManager.jslib/js/src/manager/screen/TextAndGraphicManager.js renamed to lib/js/src/manager/screen/_TextAndGraphicManager.js lib/js/src/manager/screen/TextAndGraphicManager.js renamed to lib/js/src/manager/screen/_TextAndGraphicManager.js

@@ -34,13 +34,13 @@ import { _TextAndGraphicManagerBase } from './_TextAndGraphicManagerBase.js';
 import { SdlArtwork } from '../file/filetypes/SdlArtwork.js';
 import { FileType } from '../../rpc/enums/FileType.js';
 
-class TextAndGraphicManager extends _TextAndGraphicManagerBase {
+class _TextAndGraphicManager extends _TextAndGraphicManagerBase {
     /**
-     * Initializes an instance of TextAndGraphicManager.
+     * Initializes an instance of _TextAndGraphicManager.
      * @class
      * @param {_LifecycleManager} lifecycleManager - An instance of _LifecycleManager.
      * @param {FileManager} fileManager - An instance of FileManager.
-     * @param {SoftButtonManager} softButtonManager - An instance of SoftButtonManager.
+     * @param {_SoftButtonManager} softButtonManager - An instance of _SoftButtonManager.
      */
     constructor (lifecycleManager, fileManager, softButtonManager) {
         super(lifecycleManager, fileManager, softButtonManager);
@@ -62,4 +62,4 @@ class TextAndGraphicManager extends _TextAndGraphicManagerBase {
     }
 }
 
-export { TextAndGraphicManager };
+export { _TextAndGraphicManager };

lib/js/src/manager/screen/_TextAndGraphicManagerBase.js

@@ -42,7 +42,7 @@ class _TextAndGraphicManagerBase extends _SubManagerBase {
      * @private
      * @param {_LifecycleManager} lifecycleManager - An instance of _LifecycleManager.
      * @param {FileManager} fileManager - An instance of FileManager.
-     * @param {SoftButtonManager} softButtonManager - An instance of SoftButtonManager.
+     * @param {_SoftButtonManager} softButtonManager - An instance of _SoftButtonManager.
      */
     constructor (lifecycleManager, fileManager = null, softButtonManager = null) {
         super(lifecycleManager);

…rc/manager/screen/VoiceCommandManager.js …c/manager/screen/_VoiceCommandManager.jslib/js/src/manager/screen/VoiceCommandManager.js renamed to lib/js/src/manager/screen/_VoiceCommandManager.js lib/js/src/manager/screen/VoiceCommandManager.js renamed to lib/js/src/manager/screen/_VoiceCommandManager.js

@@ -32,9 +32,9 @@
 
 import { _VoiceCommandManagerBase } from './_VoiceCommandManagerBase.js';
 
-class VoiceCommandManager extends _VoiceCommandManagerBase {
+class _VoiceCommandManager extends _VoiceCommandManagerBase {
     /**
-     * Initializes an instance of VoiceCommandManager.
+     * Initializes an instance of _VoiceCommandManager.
      * @class
      * @param {_LifecycleManager} lifecycleManager - An instance of _LifecycleManager.
      * @param {FileManager} fileManager - An instance of FileManager.
@@ -44,4 +44,4 @@ class VoiceCommandManager extends _VoiceCommandManagerBase {
     }
 }
 
-export { VoiceCommandManager };
+export { _VoiceCommandManager };

lib/js/src/manager/screen/utils/SoftButtonObject.js

@@ -82,7 +82,7 @@ class SoftButtonObject {
         if (typeof this._updateListener === 'function') {
             this._updateListener();
         } else {
-            console.error(`SoftButtonManager is not set for soft button object: ${this._name}. Update cannot be triggered`);
+            console.error(`_SoftButtonManager is not set for soft button object: ${this._name}. Update cannot be triggered`);
         }
 
         return true;
@@ -153,9 +153,9 @@ class SoftButtonObject {
     }
 
     /**
-     * Set the SoftButtonManager's update listener
+     * Set the _SoftButtonManager's update listener
      * @private
-     * @param {function} updateListener - the SoftButtonManager.UpdateListener object
+     * @param {function} updateListener - the _SoftButtonManager.UpdateListener object
      */
     _setUpdateListener (updateListener) {
         this._updateListener = updateListener;