Continued:

- added basic interface Poolable (seems to be lost?)
- added "import" for it as well
- added "import" of ListenerVisitor and DecoratorVisitor
- added "import" of Listenable
- added "import" of BaseDecorator

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/framework/main/classes/class_BaseFrameworkSystem.php b/framework/main/classes/class_BaseFrameworkSystem.php
index 24822399720ac488a6c916f0fc74fa4b090b7f87..45645cff3509bdbeecffa67be405da37d800458d 100644 (file)
--- a/framework/main/classes/class_BaseFrameworkSystem.php
+++ b/framework/main/classes/class_BaseFrameworkSystem.php
@@ -18,6 +18,7 @@ use CoreFramework\Filesystem\FrameworkDirectory;
 use CoreFramework\Generic\FrameworkInterface;
 use CoreFramework\Generic\NullPointerException;
 use CoreFramework\Handler\Stream\IoHandler;
+use CoreFramework\Listener\Listenable;
 use CoreFramework\Lists\Listable;
 use CoreFramework\Loader\ClassLoader;
 use CoreFramework\Manager\ManageableApplication;

diff --git a/framework/main/classes/container/socket/class_SocketContainer.php b/framework/main/classes/container/socket/class_SocketContainer.php
index 011899661bbcd472ada89bcda6c5e1687e8b4098..fa1d2aab02eee6d45030c5dc494b270ec5a03cba 100644 (file)
--- a/framework/main/classes/container/socket/class_SocketContainer.php
+++ b/framework/main/classes/container/socket/class_SocketContainer.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Container\Socket;
 
 // Import framework stuff
+use CoreFramework\Listener\Listenable;
 use CoreFramework\Registry\Registerable;
 
 /**

diff --git a/framework/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php b/framework/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php
index 8dc142eacb2e9ba6ac6a216b91b81db281727df6..9b4e6a036c91ca8a922b3e09c91be4806d1d4c16 100644 (file)
--- a/framework/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php
+++ b/framework/main/classes/decorator/template/class_XmlRewriterTemplateDecorator.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Template\Xml;
 
 // Import framework stuff
+use CoreFramework\Generic\BaseDecorator;
 use CoreFramework\Manager\ManageableApplication;
 use CoreFramework\Response\Responseable;
 use CoreFramework\Template\CompileableTemplate;

diff --git a/framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php b/framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php
index 50fba45f93226052abd15dac2dd3f76432a9f797..3bd84ad3c56e0d465eaeb665ea0d901e2a92ee17 100644 (file)
--- a/framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php
+++ b/framework/main/classes/decorator/xml/class_XmlCompactorDecorator.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Parser\Xml;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Generic\BaseDecorator;
 use CoreFramework\Parser\Parseable;
 
 /**

diff --git a/framework/main/classes/listener/class_ b/framework/main/classes/listener/class_
index 49eec7a4d0b014df860cc9eea6f7b7e7c78b2851..d98b8e3973926f547dbf33db34a11fadebc460fd 100644 (file)
--- a/framework/main/classes/listener/class_
+++ b/framework/main/classes/listener/class_
@@ -1,4 +1,10 @@
 <?php
+// Own namespace
+namespace CoreFramework\Listener\!!!;
+
+// Import framework stuff
+use CoreFramework\Listener\Listenable;
+
 /**
  * A ??? listener
  *

diff --git a/framework/main/classes/listener/class_BaseListener.php b/framework/main/classes/listener/class_BaseListener.php
index 46f7d5d69f4728b9ae65cbd5af3d968360e5ba47..f7340cb059c11f616351adf36b3dfb2352ad2bf8 100644 (file)
--- a/framework/main/classes/listener/class_BaseListener.php
+++ b/framework/main/classes/listener/class_BaseListener.php
@@ -5,6 +5,7 @@ namespace CoreFramework\Listener;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
+use CoreFramework\Pool\Poolable;
 use CoreFramework\Visitor\Visitor;
 
 /**

diff --git a/framework/main/classes/listener/class_BaseListenerDecorator.php b/framework/main/classes/listener/class_BaseListenerDecorator.php
index 5e3c959b06d55f26c23fe893a255f5955b7bef29..2f7200a9cf70074a4adda81ddb437110d5884a21 100644 (file)
--- a/framework/main/classes/listener/class_BaseListenerDecorator.php
+++ b/framework/main/classes/listener/class_BaseListenerDecorator.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Listener;
 
 // Import framework stuff
+use CoreFramework\Generic\BaseDecorator;
 use CoreFramework\Visitor\Visitor;
 
 /**

diff --git a/framework/main/classes/listener/socket/class_SocketFileListener.php b/framework/main/classes/listener/socket/class_SocketFileListener.php
index 1b12a3a61859991de2e2d8ce503a3a532a40c6ac..7261b9fa9b4122cadd81ffc8215434da3fa071c5 100644 (file)
--- a/framework/main/classes/listener/socket/class_SocketFileListener.php
+++ b/framework/main/classes/listener/socket/class_SocketFileListener.php
@@ -4,6 +4,7 @@ namespace CoreFramework\Listener\Socket;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
+use CoreFramework\Listener\Listenable;
 
 /**
  * A file-based socket listener

diff --git a/framework/main/classes/listener/socket/decorator/class_SocketFileListenerDecorator.php b/framework/main/classes/listener/socket/decorator/class_SocketFileListenerDecorator.php
index a2664a59e19e57b5f219116f9cad40dc7ba4434e..85a66dc0fc9cb422888b2d44fdb1ee3832937835 100644 (file)
--- a/framework/main/classes/listener/socket/decorator/class_SocketFileListenerDecorator.php
+++ b/framework/main/classes/listener/socket/decorator/class_SocketFileListenerDecorator.php
@@ -2,6 +2,9 @@
 // Own namespace
 namespace CoreFramework\Listener\Socket;
 
+// Import framework stuff
+use CoreFramework\Listener\Listenable;
+
 /**
  * A decorator for the SocketFileListener to communicate to hubs
  *

diff --git a/framework/main/classes/visitor/tasks/class_ActiveTaskVisitor.php b/framework/main/classes/visitor/tasks/class_ActiveTaskVisitor.php
index d4f6d9f58a9c626a1f977a78b6e7ab6324bc3560..be9b83bc04193ae89773346a19ae74207ed9ea95 100644 (file)
--- a/framework/main/classes/visitor/tasks/class_ActiveTaskVisitor.php
+++ b/framework/main/classes/visitor/tasks/class_ActiveTaskVisitor.php
@@ -3,8 +3,13 @@
 namespace CoreFramework\Visitor\Task\Active;
 
 // Import framework stuff
+use CoreFramework\Generic\BaseDecorator;
+use CoreFramework\Listener\Listenable;
+use CoreFramework\Pool\Poolable;
 use CoreFramework\Task\Taskable;
 use CoreFramework\Visitor\BaseVisitor;
+use CoreFramework\Visitor\Decorator\DecoratorVisitor;
+use CoreFramework\Visitor\Listener\ListenerVisitor;
 use CoreFramework\Visitor\Pool\PoolVisitor;
 use CoreFramework\Visitor\Task\TaskVisitor;
 

diff --git a/framework/main/classes/visitor/tasks/class_ShutdownTaskVisitor.php b/framework/main/classes/visitor/tasks/class_ShutdownTaskVisitor.php
index bb329f90370ad4711f999ea87bb4b4fda3faec75..144357be44e3ea9f00a195693c75037e7932039b 100644 (file)
--- a/framework/main/classes/visitor/tasks/class_ShutdownTaskVisitor.php
+++ b/framework/main/classes/visitor/tasks/class_ShutdownTaskVisitor.php
@@ -3,8 +3,13 @@
 namespace CoreFramework\Visitor\Task\Shutdown;
 
 // Import framework stuff
+use CoreFramework\Generic\BaseDecorator;
+use CoreFramework\Listener\Listenable;
+use CoreFramework\Pool\Poolable;
 use CoreFramework\Task\Taskable;
 use CoreFramework\Visitor\BaseVisitor;
+use CoreFramework\Visitor\Decorator\DecoratorVisitor;
+use CoreFramework\Visitor\Listener\ListenerVisitor;
 use CoreFramework\Visitor\Pool\PoolVisitor;
 use CoreFramework\Visitor\Task\TaskVisitor;
 

diff --git a/framework/main/interfaces/class_ b/framework/main/interfaces/class_
index 5cd1b5d5a24e28c77662c611bcfb2957d391f646..9a2aecd04c7907d254c08d525fdbe6b8909eab83 100644 (file)
--- a/framework/main/interfaces/class_
+++ b/framework/main/interfaces/class_
@@ -25,7 +25,5 @@ namespace CoreFramework\!!!;
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 interface ??? extends FrameworkInterface {
-}
 
-// [EOF]
-?>
+}

diff --git a/framework/main/interfaces/pool/.htaccess b/framework/main/interfaces/pool/.htaccess
new file mode 100644 (file)
index 0000000..3a42882
--- /dev/null
+++ b/framework/main/interfaces/pool/.htaccess
@@ -0,0 +1 @@
+Deny from all

diff --git a/framework/main/interfaces/pool/class_Poolable.php b/framework/main/interfaces/pool/class_Poolable.php
new file mode 100644 (file)
index 0000000..424010b
--- /dev/null
+++ b/framework/main/interfaces/pool/class_Poolable.php
@@ -0,0 +1,47 @@
+<?php
+// Own namespace
+namespace CoreFramework\Pool;
+
+// Import framework stuff
+use CoreFramework\Listener\Listenable;
+
+/**
+ * A Poolable interface
+ *
+ * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @version            0.0.0
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+ * @license            GNU GPL 3.0 or any newer version
+ * @link               http://www.ship-simu.org
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+interface Poolable extends FrameworkInterface {
+
+       /**
+        * Pre-shuts down the pool
+        *
+        * @return      void
+        */
+       function preShutdown ();
+
+       /**
+        * Adds a listener instance to this pool
+        *
+        * @param       $poolInstance   An instance of a Listenable class
+        * @return      void
+        */
+       function addListener (Listenable $poolInstance);
+
+}

diff --git a/framework/main/interfaces/registry/socket/class_RegisterableSocket.php b/framework/main/interfaces/registry/socket/class_RegisterableSocket.php
index 227fd83923bfac89b9005bb3427628ce2a0f5624..a542f312667805424d01aba303c3a6ae5d6e8a74 100644 (file)
--- a/framework/main/interfaces/registry/socket/class_RegisterableSocket.php
+++ b/framework/main/interfaces/registry/socket/class_RegisterableSocket.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Registry\Socket;
 
 // Import framework stuff
+use CoreFramework\Listener\Listenable;
 use CoreFramework\Registry\Registerable;
 
 /**

diff --git a/framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php b/framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php
index 033d013f7821426eafbc21eb54e15746f5c84a2a..22bba43ec02e619f4d915d45d174fa29802f2dd7 100644 (file)
--- a/framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php
+++ b/framework/main/interfaces/visitor/decorator/class_DecoratorVisitor.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Visitor\Decorator;
 
 // Import framework stuff
+use CoreFramework\Generic\BaseDecorator;
 use CoreFramework\Visitor\Visitor;
 
 /**
@@ -33,6 +34,7 @@ interface DecoratorVisitor extends Visitor {
         *
         * @param       $decoratorInstance      A decorator instance
         * @return      void
+        * @todo        Find interface for this type-hint (only interface/array as type-hints rule)
         */
        function visitDecorator (BaseDecorator $decoratorInstance);
 

diff --git a/framework/main/interfaces/visitor/listener/class_ListenerVisitor.php b/framework/main/interfaces/visitor/listener/class_ListenerVisitor.php
index 979e69c5966c603687dda249f10ac732f445aa3f..3da78201e86d001bdab01d990fc3d209e3b07986 100644 (file)
--- a/framework/main/interfaces/visitor/listener/class_ListenerVisitor.php
+++ b/framework/main/interfaces/visitor/listener/class_ListenerVisitor.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Visitor\Listener;
 
 // Import framework stuff
+use CoreFramework\Listener\Listenable;
 use CoreFramework\Visitor\Visitor;
 
 /**

diff --git a/framework/main/interfaces/visitor/pool/class_PoolVisitor.php b/framework/main/interfaces/visitor/pool/class_PoolVisitor.php
index a3bc173b34f839b4fb15e00d14c9e50b4e1588b1..465ce3d30c98cc63370d7d2758c34b1f0c3c31c4 100644 (file)
--- a/framework/main/interfaces/visitor/pool/class_PoolVisitor.php
+++ b/framework/main/interfaces/visitor/pool/class_PoolVisitor.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Visitor\Pool;
 
 // Import framework stuff
+use CoreFramework\Pool\Poolable;
 use CoreFramework\Visitor\Visitor;
 
 /**