Blinker

@@ -54,6 +54,11 @@

       If this feature is not needed, the file <code>haltstream</code>

       should not exist.

     </p>

+    <h2>Operator Connection Interface</h2>

+    <p>

+    The name of the operator connection interface provided by this module

+    is the module name, i.e., <code>loveletters/NAME</code>.

+    </p>

   </body>

 </html>

@@ -23,6 +23,11 @@

       There are no further configuration files, i.e. the subdirectory for

       an operator connector module is empty.

     </p>

+    <h2>Operator Connection Interface</h2>

+    <p>

+    The name of the operator connection interface provided by this module

+    is the module name, i.e., <code>opprinters/NAME</code>.

+    </p>

   </body>

 </html>

@@ -64,14 +64,15 @@

       The configuration inside an extension consists of the following

       settings:

     </p>

-    <h4>Module</h4>

+    <h4>Target Operator Connection Slot</h4>

     <p>

-      The file <code>module</code> contains the name of the module to

+      The file <code>target</code> contains the name of the operator interface to

       contact via an operator connection if the extension is called.

-      The module name consists of two parts: <code>CLASS/NAME</class>

-      E.g. to connect to the operator connection printer named

-      <code>debug</code>, the file has to contain

-      <code>opprinters/debug</code> as module name.

+    </p>

+    <h2>Operator Connection Interface</h2>

+    <p>

+    The name of the operator connection interface provided by this module

+    is the module name, i.e., <code>opsplitters/NAME</code>.

     </p>

   </body>

 </html>

@@ -49,14 +49,10 @@

       The configuration inside an extension consists of the following

       settings:

     </p>

-    <h4>Module</h4>

+    <h4>Target Operator Connection Slot</h4>

     <p>

-      The file <code>module</code> contains the name of the module to

+      The file <code>target</code> contains the name of the operator interface to

       contact via an operator connection if the extension is called.

-      The module name consists of two parts: <code>CLASS/NAME</class>

-      E.g. to connect to the operator connection printer named

-      <code>debug</code>, the file has to contain

-      <code>opprinters/debug</code> as module name.

     </p>

   </body>

 </html>

@@ -49,14 +49,10 @@

       The configuration inside an extension consists of the following

       settings:

     </p>

-    <h4>Module</h4>

+    <h4>Target Operator Connection Slot</h4>

     <p>

-      The file <code>module</code> contains the name of the module to

+      The file <code>target</code> contains the name of the operator interface to

       contact via an operator connection if the extension is called.

-      The module name consists of two parts: <code>CLASS/NAME</class>

-      E.g. to connect to the operator connection printer named

-      <code>debug</code>, the file has to contain

-      <code>opprinters/debug</code> as module name.

     </p>

   </body>

 </html>

@@ -25,11 +25,11 @@ OpSplitter::Extension::Extension(OpSplitter &opSplitter,

                                  const Directory &dirBase):

   m_opSplitter(opSplitter),

   m_name(name),

-  m_fileModule(dirBase.getFile("module"))

+  m_fileTarget(dirBase.getFile("target"))

 {

   // set up

   name2number(m_name, m_number);

-  getModule();

+  getTarget();

 }

 /// destructor

@@ -43,13 +43,13 @@ OpSplitter::Extension::~Extension()

 /// check for update of configuration

 void OpSplitter::Extension::updateConfig()

 {

-  // module file was modified -> re-get module to connect to

-  if (m_fileModule.checkModified())

-    getModule();

+  // target file was modified -> re-get target operator interface to connect to

+  if (m_fileTarget.checkModified())

+    getTarget();

 }

-/// (re-)get module to connect to

-void OpSplitter::Extension::getModule()

+/// (re-)get target operator interface to connect to

+void OpSplitter::Extension::getTarget()

 {

   // remove old extension information from extension map

   if (m_addedToMap) {

@@ -57,13 +57,13 @@ void OpSplitter::Extension::getModule()

     m_addedToMap = false;

   }

-  // get new module name from file

-  m_fileModule.update();

+  // get new target operator interface name from file

+  m_fileTarget.update();

   // add new module name to extension map

-  if (m_fileModule.m_valid) {

+  if (m_fileTarget.m_valid) {

     if (m_opSplitter.m_extMap.find(m_number) == m_opSplitter.m_extMap.end()) {

-      m_opSplitter.m_extMap[m_number] = m_fileModule.m_obj.m_str;

+      m_opSplitter.m_extMap[m_number] = m_fileTarget.m_obj.m_str;

       m_addedToMap = true;

     }

   }

@@ -43,8 +43,8 @@ public:

   void updateConfig();

 protected:

-  /// (re-)get module to connect to

-  void getModule();

+  /// (re-)get target operator interface to connect to

+  void getTarget();

   /**

    * @brief convert extension name to extension number

@@ -56,7 +56,7 @@ protected:

 protected:

   OpSplitter  &m_opSplitter; ///< owning operator connection splitter object

   std::string m_name;        ///< extension name (i.e. number)

-  NameFile    m_fileModule;  ///< file containing module to connect to

+  NameFile    m_fileTarget;  ///< target operator interface name to connect to

   std::string m_number;      ///< number of extension

   bool        m_addedToMap;  ///< if extension number could be added to map

 }; // class OpSplitter::Extension

@@ -43,13 +43,13 @@ public:

   void updateConfig();

 protected:

-  /// (re-)get module to connect to

-  void getModule();

+  /// (re-)get target operator interface to connect to

+  void getTarget();

 protected:

   Phone       &m_phone;     ///< owning phone object

   std::string m_name;       ///< extension name (i.e. phone number)

-  NameFile    m_fileModule; ///< file containing module to connect to

+  NameFile    m_fileTarget; ///< target operator interface name to connect to

 }; // class Phone<ADDR, SOCK>::Extension

 } // namespace Blinker

@@ -28,10 +28,10 @@ Phone<ADDR, SOCK>::Extension::Extension(Phone &phone, const std::string &name,

                                const Directory &dirBase):

   m_phone(phone),

   m_name(name),

-  m_fileModule(dirBase.getFile("module"))

+  m_fileTarget(dirBase.getFile("target"))

 {

   // set up

-  getModule();

+  getTarget();

 }

 /// destructor

@@ -46,24 +46,24 @@ Phone<ADDR, SOCK>::Extension::~Extension()

 template<typename ADDR, typename SOCK>

 void Phone<ADDR, SOCK>::Extension::updateConfig()

 {

-  // module file was modified -> re-get module to connect to

-  if (m_fileModule.checkModified())

-    getModule();

+  // target file was modified -> re-get target operator interface to connect to

+  if (m_fileTarget.checkModified())

+    getTarget();

 }

-/// (re-)get module to connect to

+/// (re-)get target operator interface to connect to

 template<typename ADDR, typename SOCK>

-void Phone<ADDR, SOCK>::Extension::getModule()

+void Phone<ADDR, SOCK>::Extension::getTarget()

 {

   // remove old extension information from extension map

   m_phone.m_extMap.erase(m_name);

   // get new module name from file

-  m_fileModule.update();

+  m_fileTarget.update();

   // add new module name to extension map

-  if (m_fileModule.m_valid)

-    m_phone.m_extMap[m_name] = m_fileModule.m_obj.m_str;

+  if (m_fileTarget.m_valid)

+    m_phone.m_extMap[m_name] = m_fileTarget.m_obj.m_str;

 }

 } // namespace Blinker