Moved back out of "Generic" namespace, really no need

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

diff --git a/application/tests/class_ApplicationHelper.php b/application/tests/class_ApplicationHelper.php
index c82b00d63e5c293995ce90881412b2977fefa2c8..a2765cc2f607ac8d1d92ec893a9cf5e7ccc8bc11 100644 (file)
--- a/application/tests/class_ApplicationHelper.php
+++ b/application/tests/class_ApplicationHelper.php
@@ -7,7 +7,7 @@ use CoreFramework\Manager\ManageableApplication;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registerable;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Template\CompileableTemplate;
 
 /**

diff --git a/application/tests/classes/controller/console/class_TestsConsoleDefaultNewsController.php b/application/tests/classes/controller/console/class_TestsConsoleDefaultNewsController.php
index 355fc53f021ff05ce11f0cfe1c45c561394259da..83e9fafda84e147226f7c143671bb730089ae94d 100644 (file)
--- a/application/tests/classes/controller/console/class_TestsConsoleDefaultNewsController.php
+++ b/application/tests/classes/controller/console/class_TestsConsoleDefaultNewsController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Tests\Controller;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/actions/html/class_HtmlLoginProfileAction.php b/inc/main/classes/actions/html/class_HtmlLoginProfileAction.php
index 8fe62d9c84635bd69e823e1dedbf04e612adeb5b..9875268be71c6327344a73063f75183e997f8a35 100644 (file)
--- a/inc/main/classes/actions/html/class_HtmlLoginProfileAction.php
+++ b/inc/main/classes/actions/html/class_HtmlLoginProfileAction.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Action\Login;
 
 // Import framework stuff
+use CoreFramework\Action\PerformableAction;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registerable;
 use CoreFramework\Request\Requestable;
@@ -30,7 +31,7 @@ use CoreFramework\Response\Responseable;
  * You should have received a copy of the GNU General Public License
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
-class HtmlLoginProfileAction extends BaseAction implements Commandable, Registerable {
+class HtmlLoginProfileAction extends BaseAction implements PerformableAction, Registerable {
        /**
         * Protected constructor
         *
@@ -59,7 +60,7 @@ class HtmlLoginProfileAction extends BaseAction implements Commandable, Register
        }
 
        /**
-        * Executes the command with given request and response objects
+        * Executes the action with given request and response objects
         *
         * @param       $requestInstance        An instance of a class with an Requestable interface
         * @param       $responseInstance       An instance of a class with an Responseable interface

diff --git a/inc/main/classes/application/class_BaseApplication.php b/inc/main/classes/application/class_BaseApplication.php
index 4f977191422d74213ca443c814f3f05d6f361a06..e638a23a80fa0a62c230c623e41cbc047e904c0e 100644 (file)
--- a/inc/main/classes/application/class_BaseApplication.php
+++ b/inc/main/classes/application/class_BaseApplication.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Application;
 
 // Import framework stuff
 use CoreFramework\Object\BaseFrameworkSystem;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 
 /**
  * A general application class for the ApplicationHelper classes.

diff --git a/inc/main/classes/class_BaseFrameworkSystem.php b/inc/main/classes/class_BaseFrameworkSystem.php
index 7cd7419b9338f19c33b7df389de080070a4f0a0c..ffae818445cdb82e9b01fd7e54e1d18abdba1f54 100644 (file)
--- a/inc/main/classes/class_BaseFrameworkSystem.php
+++ b/inc/main/classes/class_BaseFrameworkSystem.php
@@ -12,7 +12,7 @@ use CoreFramework\Loader\ClassLoader;
 use CoreFramework\Manager\ManageableApplication;
 use CoreFramework\Middleware\Debug\DebugMiddleware;
 use CoreFramework\Registry\Register;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 use CoreFramework\Stream\Output\OutputStreamer;

diff --git a/inc/main/classes/commands/html/class_HtmlConfirmCommand.php b/inc/main/classes/commands/html/class_HtmlConfirmCommand.php
index 01cee1902c40f8bacfab6242c1586f5c4b98a017..526540c7d1bed4b3583b130984b577cc6bb86af6 100644 (file)
--- a/inc/main/classes/commands/html/class_HtmlConfirmCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlConfirmCommand.php
@@ -6,7 +6,7 @@ namespace CoreFramework\Command\Guest;
 use CoreFramework\Command\BaseCommand;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\NullPointerException;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php b/inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php
index 909cb92f4cadcaf51f56f684c5133e0708083d77..9bc563c0517aff32e1a7680e0804662ee1cbf79c 100644 (file)
--- a/inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlLoginAreaCommand.php
@@ -6,7 +6,7 @@ namespace CoreFramework\Command\Login;
 use CoreFramework\Action\PerformableAction;
 use CoreFramework\Command\BaseCommand;
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/commands/html/class_HtmlLoginCommand.php b/inc/main/classes/commands/html/class_HtmlLoginCommand.php
index fefa24ae8e8a76c8ff09094979930ce340b17c73..707324682d0136441cbd53ee162dff844d3bf6ac 100644 (file)
--- a/inc/main/classes/commands/html/class_HtmlLoginCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlLoginCommand.php
@@ -6,7 +6,7 @@ namespace CoreFramework\Command\Login;
 use CoreFramework\Command\BaseCommand;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registerable;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/commands/html/class_HtmlRegisterCommand.php b/inc/main/classes/commands/html/class_HtmlRegisterCommand.php
index 388cf4ca17ed2d1961bd14ad00403bb3694673cb..aaf5c4e52a9a00e9eb2508c2624c2420bb604f9e 100644 (file)
--- a/inc/main/classes/commands/html/class_HtmlRegisterCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlRegisterCommand.php
@@ -6,7 +6,7 @@ namespace CoreFramework\Command\Register;
 use CoreFramework\Command\BaseCommand;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Registry\Registerable;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/commands/html/class_HtmlResendLinkCommand.php b/inc/main/classes/commands/html/class_HtmlResendLinkCommand.php
index 57e8f64a4646e8861d5206eebf2d7da954f7c432..a8b1fc729577afb819d985aec46eb61fb31eafd4 100644 (file)
--- a/inc/main/classes/commands/html/class_HtmlResendLinkCommand.php
+++ b/inc/main/classes/commands/html/class_HtmlResendLinkCommand.php
@@ -5,7 +5,7 @@ namespace CoreFramework\Command\Guest;
 // Import framework stuff
 use CoreFramework\Command\BaseCommand;
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/controller/class_BaseController.php b/inc/main/classes/controller/class_BaseController.php
index 84f2eb9a4411f6698f064d9dbe0d658e75ea8362..81399137f4f3e765ad8166c201a4e465b6004961 100644 (file)
--- a/inc/main/classes/controller/class_BaseController.php
+++ b/inc/main/classes/controller/class_BaseController.php
@@ -5,7 +5,7 @@ namespace CoreFramework\Controller;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Object\BaseFrameworkSystem;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Registry\Registerable;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;

diff --git a/inc/main/classes/controller/console/class_ConsoleDefaultNewsController.php b/inc/main/classes/controller/console/class_ConsoleDefaultNewsController.php
index c9b9e5d13632ecb47ab31f4affc5cd5b056d8b52..8625a332c3a4d1977b3f8fe9b242246f5a79f348 100644 (file)
--- a/inc/main/classes/controller/console/class_ConsoleDefaultNewsController.php
+++ b/inc/main/classes/controller/console/class_ConsoleDefaultNewsController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Default;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;

diff --git a/inc/main/classes/controller/html/class_HtmlConfirmController.php b/inc/main/classes/controller/html/class_HtmlConfirmController.php
index d5477f666c364968e15b035406cd90ae3a0ce438..0982c52891306723699eb342cb8e7a06bfe7b563 100644 (file)
--- a/inc/main/classes/controller/html/class_HtmlConfirmController.php
+++ b/inc/main/classes/controller/html/class_HtmlConfirmController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Confirm;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/controller/html/class_HtmlDefaultController.php b/inc/main/classes/controller/html/class_HtmlDefaultController.php
index 6a108016d2908a9356cd048875a6762e122764c0..feb18d90b7c38c6d6fb75e22c20f7a49d18fd6bb 100644 (file)
--- a/inc/main/classes/controller/html/class_HtmlDefaultController.php
+++ b/inc/main/classes/controller/html/class_HtmlDefaultController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Default;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/controller/html/class_HtmlDefaultNewsController.php b/inc/main/classes/controller/html/class_HtmlDefaultNewsController.php
index e659be7ed8a9573e900f84fc2dc462f778b2783e..59d717fda21c59108b97f8e2bff0030f70efcfe7 100644 (file)
--- a/inc/main/classes/controller/html/class_HtmlDefaultNewsController.php
+++ b/inc/main/classes/controller/html/class_HtmlDefaultNewsController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\News;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/controller/html/class_HtmlLoginController.php b/inc/main/classes/controller/html/class_HtmlLoginController.php
index f6f9581b75721010d82c7b5e7a34f9ddbc896d92..181f107f690b111cb9944de8b7bde4660cf1ca58 100644 (file)
--- a/inc/main/classes/controller/html/class_HtmlLoginController.php
+++ b/inc/main/classes/controller/html/class_HtmlLoginController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Login;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/controller/html/class_HtmlLoginFailedController.php b/inc/main/classes/controller/html/class_HtmlLoginFailedController.php
index 9d7b940ea4224b6288d68d678e3739f4162984f3..34b52d9045b17dfcbc17073560a6c5ae417983fb 100644 (file)
--- a/inc/main/classes/controller/html/class_HtmlLoginFailedController.php
+++ b/inc/main/classes/controller/html/class_HtmlLoginFailedController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Failed;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/controller/html/class_HtmlLogoutController.php b/inc/main/classes/controller/html/class_HtmlLogoutController.php
index 465059670e235302c768c8a18df2119d2d42b1d0..ffa9675e207574aa5536e4600ebe64f4ab652d4d 100644 (file)
--- a/inc/main/classes/controller/html/class_HtmlLogoutController.php
+++ b/inc/main/classes/controller/html/class_HtmlLogoutController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Logout;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;

diff --git a/inc/main/classes/controller/html/class_HtmlLogoutDoneController.php b/inc/main/classes/controller/html/class_HtmlLogoutDoneController.php
index 28460c471d2f16e1db84fde306d6a5a540efb763..1e3a2cddd8401ebec3edede0bf58900bceddaf64 100644 (file)
--- a/inc/main/classes/controller/html/class_HtmlLogoutDoneController.php
+++ b/inc/main/classes/controller/html/class_HtmlLogoutDoneController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Logout;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Request\Requestable;
 
 /**

diff --git a/inc/main/classes/controller/html/class_HtmlProblemController.php b/inc/main/classes/controller/html/class_HtmlProblemController.php
index 3cb8143595068497942b17b91d63fac4caf1d6d2..1017a104d309b1fb0bb99d37ff171f13cb0c82ed 100644 (file)
--- a/inc/main/classes/controller/html/class_HtmlProblemController.php
+++ b/inc/main/classes/controller/html/class_HtmlProblemController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Problem;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/controller/html/class_HtmlRegisterController.php b/inc/main/classes/controller/html/class_HtmlRegisterController.php
index 5357cedbfb089ca24d2fc5ddc8d406b30e4d704d..e299168ceccf92aaaff2ca7496533766394702be 100644 (file)
--- a/inc/main/classes/controller/html/class_HtmlRegisterController.php
+++ b/inc/main/classes/controller/html/class_HtmlRegisterController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Register;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Response\Responseable;
 
 /**

diff --git a/inc/main/classes/controller/html/class_HtmlStatusController.php b/inc/main/classes/controller/html/class_HtmlStatusController.php
index 83dbe6452b9191f9ca21a8484874ba664b7dd408..34901917c34d858fedfe66546140144c41c0ad97 100644 (file)
--- a/inc/main/classes/controller/html/class_HtmlStatusController.php
+++ b/inc/main/classes/controller/html/class_HtmlStatusController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Status;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/controller/html/form/class_HtmlDoFormController.php b/inc/main/classes/controller/html/form/class_HtmlDoFormController.php
index 379300c5b7ac7a28436fbd52c909bc9390bd098c..169f0e52a5822921939cd57e4261971f8b2cddfc 100644 (file)
--- a/inc/main/classes/controller/html/form/class_HtmlDoFormController.php
+++ b/inc/main/classes/controller/html/form/class_HtmlDoFormController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Form;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/controller/html/login/class_HtmlLoginAreaController.php b/inc/main/classes/controller/html/login/class_HtmlLoginAreaController.php
index 0b4608a0ff367ea501c63613d63b12d2cadf0cc8..251f6db3f279ff76e03d8e68864ff30c9e237f0a 100644 (file)
--- a/inc/main/classes/controller/html/login/class_HtmlLoginAreaController.php
+++ b/inc/main/classes/controller/html/login/class_HtmlLoginAreaController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Login;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;

diff --git a/inc/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php b/inc/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php
index 165dfd76e1be0faefdaeb32be5c20cd5cf5414d4..4fa888dea3817020524fd077b6478f8741c817f4 100644 (file)
--- a/inc/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php
+++ b/inc/main/classes/controller/image/captcha/class_ImageCodeCaptchaController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Image\Captcha;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;

diff --git a/inc/main/classes/controller/image/class_ImageDefaultController.php b/inc/main/classes/controller/image/class_ImageDefaultController.php
index c1e22b8c1b2fe187efc9b4c9694bd9439dcee924..953cca0edc44c34a66868b32a29d8591d409df50 100644 (file)
--- a/inc/main/classes/controller/image/class_ImageDefaultController.php
+++ b/inc/main/classes/controller/image/class_ImageDefaultController.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Controller\Default;
 
 // Import framework stuff
 use CoreFramework\Controller\BaseController;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/factories/client/class_ClientFactory.php b/inc/main/classes/factories/client/class_ClientFactory.php
index 2a49abac00d925024365053a162e3108e29b062a..38f1bf83686edcb28f3774f1cde0634da967afec 100644 (file)
--- a/inc/main/classes/factories/client/class_ClientFactory.php
+++ b/inc/main/classes/factories/client/class_ClientFactory.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Factory\Client;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 
 /**
  * An object factory for clients

diff --git a/inc/main/classes/factories/database/class_DatabaseWrapperFactory.php b/inc/main/classes/factories/database/class_DatabaseWrapperFactory.php
index 39a6668f14c712f60c925e3a1194df9e3474a69c..f0cc20bd4554348faa32647adc844393823ee392 100644 (file)
--- a/inc/main/classes/factories/database/class_DatabaseWrapperFactory.php
+++ b/inc/main/classes/factories/database/class_DatabaseWrapperFactory.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Factory\Database\Wrapper;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for socket registries

diff --git a/inc/main/classes/factories/index/class_FileStackIndexFactory.php b/inc/main/classes/factories/index/class_FileStackIndexFactory.php
index 32af8142add2e39802dd6e87da98147b54b99b7f..612bf52be1e36908648bb6857ac4534d194b4d95 100644 (file)
--- a/inc/main/classes/factories/index/class_FileStackIndexFactory.php
+++ b/inc/main/classes/factories/index/class_FileStackIndexFactory.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Factory\Filesystem\Stack;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for file-based stack indexes

diff --git a/inc/main/classes/factories/login/class_LoginFactory.php b/inc/main/classes/factories/login/class_LoginFactory.php
index bc056503f37ae2757037d9bb9cbb3b0d0d8ed5c0..e999fcd7ac596b65e78adc8307089c1357f27620 100644 (file)
--- a/inc/main/classes/factories/login/class_LoginFactory.php
+++ b/inc/main/classes/factories/login/class_LoginFactory.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Factory\Login;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 
 /**

diff --git a/inc/main/classes/factories/registry/class_SocketRegistryFactory.php b/inc/main/classes/factories/registry/class_SocketRegistryFactory.php
index 70c2d0ee44558d7ad727bd3d44c76e04cabdb459..bf6f0a568aaa8aa6f2e5cbd768ba119f89d545c0 100644 (file)
--- a/inc/main/classes/factories/registry/class_SocketRegistryFactory.php
+++ b/inc/main/classes/factories/registry/class_SocketRegistryFactory.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Factory\Registry;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for socket registries

diff --git a/inc/main/classes/factories/stacks/class_FileStackFactory.php b/inc/main/classes/factories/stacks/class_FileStackFactory.php
index 4116b4e1d13ee5298bbcc0794ecf49fa76d5cd52..4394ab4c089b8c4498fc4897a485626e26843d39 100644 (file)
--- a/inc/main/classes/factories/stacks/class_FileStackFactory.php
+++ b/inc/main/classes/factories/stacks/class_FileStackFactory.php
@@ -5,7 +5,7 @@ namespace CoreFramework\Factory\Stack;
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for file-based stacks

diff --git a/inc/main/classes/factories/user/class_UserFactory.php b/inc/main/classes/factories/user/class_UserFactory.php
index 8abdd293b6addc42f865c27c8d05e48db9fd3ffb..3e15d02815bc8909ec72be57655a7ac747c47e66 100644 (file)
--- a/inc/main/classes/factories/user/class_UserFactory.php
+++ b/inc/main/classes/factories/user/class_UserFactory.php
@@ -5,7 +5,7 @@ namespace CoreFramework\Factory\User;
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 
 /**

diff --git a/inc/main/classes/factories/xml/class_XmlTemplateEngineFactory.php b/inc/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
index 7085ea5ee9d323670f2b2b3215fc0c23791206bc..2b82f60a0b7b1b2ff24ddd550df14f6e6d09e244 100644 (file)
--- a/inc/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
+++ b/inc/main/classes/factories/xml/class_XmlTemplateEngineFactory.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Factory\Template;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 
 /**
  * A factory class for XML template engines. All instances generated by this

diff --git a/inc/main/classes/filter/auth/class_UserAuthFilter.php b/inc/main/classes/filter/auth/class_UserAuthFilter.php
index 5ed54d726beb84e93002d481b5cd807c8119e4aa..98eb3f1e6deced676b01cd82700e5693bb21aa1f 100644 (file)
--- a/inc/main/classes/filter/auth/class_UserAuthFilter.php
+++ b/inc/main/classes/filter/auth/class_UserAuthFilter.php
@@ -5,7 +5,7 @@ namespace CoreFramework\Filter\User\Auth;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Loader\NoClassException;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/filter/change/class_EmailChangeFilter.php b/inc/main/classes/filter/change/class_EmailChangeFilter.php
index 700e97885abbb37b73996eea25aacd614b55c2d4..2f2188ed98243c95d54de03b65526937303fd3ac 100644 (file)
--- a/inc/main/classes/filter/change/class_EmailChangeFilter.php
+++ b/inc/main/classes/filter/change/class_EmailChangeFilter.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Filter\Change\Email;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/filter/change/class_PasswordChangeFilter.php b/inc/main/classes/filter/change/class_PasswordChangeFilter.php
index d171a58454a90125eec3303ff4c451524c74b03f..c584d2832654c6951e8d57bf83b92cc2ce614765 100644 (file)
--- a/inc/main/classes/filter/change/class_PasswordChangeFilter.php
+++ b/inc/main/classes/filter/change/class_PasswordChangeFilter.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Filter\Change\Email;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/filter/news/class_NewsDownloadFilter.php b/inc/main/classes/filter/news/class_NewsDownloadFilter.php
index 82324a27c01d2541db4eb8e125782f76e4f00ee9..58df0f5c28fe130727dde9f57e3cfb6fdf958981 100644 (file)
--- a/inc/main/classes/filter/news/class_NewsDownloadFilter.php
+++ b/inc/main/classes/filter/news/class_NewsDownloadFilter.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Filter\News;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php b/inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
index 426976bca63915a177e318ff6dc03299ea2a7a78..44a31f1acbb43ee98cf64f8c595dbcc56912815c 100644 (file)
--- a/inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
+++ b/inc/main/classes/filter/payment/class_PaymentDiscoveryFilter.php
@@ -7,7 +7,7 @@ use CoreFramework\Action\PerformableAction;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\NullPointerException;
 use CoreFramework\Loader\NoClassException;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php b/inc/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
index 00c8bd66124029f5cd7a4dcba9007b8c1141da18..f6142fbfc91a9b7fa200a5e30608d8f21b5b8140 100644 (file)
--- a/inc/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
+++ b/inc/main/classes/filter/update/class_UserStatusConfimedUpdateFilter.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Filter\User\Status;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/filter/update/class_UserUpdateFilter.php b/inc/main/classes/filter/update/class_UserUpdateFilter.php
index 390366bbc4ec3b7b7d890ebc308222fe4ac65fd7..a557dc7f6aa2d98502494a9e8979fe22c4be7a2d 100644 (file)
--- a/inc/main/classes/filter/update/class_UserUpdateFilter.php
+++ b/inc/main/classes/filter/update/class_UserUpdateFilter.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Filter\User;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/filter/validator/class_EmailValidatorFilter.php b/inc/main/classes/filter/validator/class_EmailValidatorFilter.php
index d60647b84e633cee12dc97e2162460e5655d10d6..db4f3602abb3c8fcc9a0751649fec551f75a0d75 100644 (file)
--- a/inc/main/classes/filter/validator/class_EmailValidatorFilter.php
+++ b/inc/main/classes/filter/validator/class_EmailValidatorFilter.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Filter\Validator\Email;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/filter/validator/class_UserNameValidatorFilter.php b/inc/main/classes/filter/validator/class_UserNameValidatorFilter.php
index 3d7abafab15efef344f03554de8055451206be89..950a0650fcaa00e2fd6347bbc66c18a0aa396e9c 100644 (file)
--- a/inc/main/classes/filter/validator/class_UserNameValidatorFilter.php
+++ b/inc/main/classes/filter/validator/class_UserNameValidatorFilter.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Filter\Validator\Username;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php b/inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
index dba14fadb263ee0a62018abe53bb20490984d973..ff92428d35de350ab815479c6068a0bd20d286be 100644 (file)
--- a/inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
+++ b/inc/main/classes/filter/verifier/class_AccountPasswordVerifierFilter.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Filter\Verifier\Password;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php b/inc/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
index 7689bdcd31a732c8daa17afca01bd036a16ec1e5..9ebc209ab49934437ad81ea5eb6a5bcebb66affb 100644 (file)
--- a/inc/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
+++ b/inc/main/classes/filter/verifier/class_ConfirmCodeVerifierFilter.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Filter\Verifier\Confirmation;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/filter/verifier/class_UserGuestVerifierFilter.php b/inc/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
index cc8c4ec3c4c54e5104f83fbd5e143e2a2d6f938d..3405542d1fd94e0ab8d4854226f02eb19a987dcc 100644 (file)
--- a/inc/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
+++ b/inc/main/classes/filter/verifier/class_UserGuestVerifierFilter.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Filter\Verifier\User;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/filter/verifier/class_UserNameVerifierFilter.php b/inc/main/classes/filter/verifier/class_UserNameVerifierFilter.php
index ac56acfae7fe8b4370d25e8d4b18881431933afb..44fca1b134eb0a3915659f892afda74c03a59349 100644 (file)
--- a/inc/main/classes/filter/verifier/class_UserNameVerifierFilter.php
+++ b/inc/main/classes/filter/verifier/class_UserNameVerifierFilter.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Filter\Verifier\User;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/filter/verifier/class_UserStatusVerifierFilter.php b/inc/main/classes/filter/verifier/class_UserStatusVerifierFilter.php
index 27150412d22900b7a9acd763ed7d59e3347a7251..ba9cf7eff0171adcd16d27f4c9ef1568203ae317 100644 (file)
--- a/inc/main/classes/filter/verifier/class_UserStatusVerifierFilter.php
+++ b/inc/main/classes/filter/verifier/class_UserStatusVerifierFilter.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Filter\Verifier\User;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php b/inc/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
index f714fc85c4f8b2d0236913b92ca01413225eb39c..628aa650f5049b98daa58d31f0496228b2f54f10 100644 (file)
--- a/inc/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
+++ b/inc/main/classes/filter/verifier/class_UserUnconfirmedVerifierFilter.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Filter\Verifier\User;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Request\Requestable;
 use CoreFramework\Response\Responseable;
 

diff --git a/inc/main/classes/helper/class_BaseHelper.php b/inc/main/classes/helper/class_BaseHelper.php
index 34958ab05b052e729366a0dd959a362a50eaf390..b0948b673255647635fc1834ba26749be5f1a690 100644 (file)
--- a/inc/main/classes/helper/class_BaseHelper.php
+++ b/inc/main/classes/helper/class_BaseHelper.php
@@ -7,7 +7,7 @@ use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\FrameworkInterface;
 use CoreFramework\Generic\NullPointerException;
 use CoreFramework\Object\BaseFrameworkSystem;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 
 /**
  * A generic helper class with generic methods

diff --git a/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php b/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php
index c56706e3b65e00f9763ce687fa55f93a14fdcee1..8ec16e08be99d7e04f4d614fa6c12426016906a0 100644 (file)
--- a/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php
+++ b/inc/main/classes/helper/html/forms/class_HtmlFormHelper.php
@@ -5,7 +5,7 @@ namespace CoreFramework\Helper;
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Generic\NullPointerException;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Template\CompileableTemplate;
 
 /**

diff --git a/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php b/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php
index ee6e54ff006069e0ec5265a162f494d093edd637..f38d05e21146e788f1f8212adf8677325bd81b44 100644 (file)
--- a/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php
+++ b/inc/main/classes/helper/html/links/class_HtmlLinkHelper.php
@@ -5,7 +5,7 @@ namespace CoreFramework\Helper;
 // Import framework stuff
 use CoreFramework\Configuration\FrameworkConfiguration;
 use CoreFramework\Generic\NullPointerException;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Template\CompileableTemplate;
 
 /**

diff --git a/inc/main/classes/language/class_LanguageSystem.php b/inc/main/classes/language/class_LanguageSystem.php
index ed93bb0ba6dfb074f559cf1610103b2b40bc078a..0c2875ac2c9740666d07ecdb437f151d01be50f0 100644 (file)
--- a/inc/main/classes/language/class_LanguageSystem.php
+++ b/inc/main/classes/language/class_LanguageSystem.php
@@ -6,7 +6,7 @@ namespace CoreFramework\Localization;
 use CoreFramework\Configuration\FrameworkConfiguration;
 use CoreFramework\Object\BaseFrameworkSystem;
 use CoreFramework\Registry\Registerable;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 
 /**
  * The language sub-system for handling language strings being used in the

diff --git a/inc/main/classes/registry/generic/class_Registry.php b/inc/main/classes/registry/generic/class_Registry.php
index 3647dfc773c84a14c60f08b124690d500538b4cd..da4c931ab2498df9a1e9e3260c4fa41708e02fff 100644 (file)
--- a/inc/main/classes/registry/generic/class_Registry.php
+++ b/inc/main/classes/registry/generic/class_Registry.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Registry\Generic;
+namespace CoreFramework\Registry;
 
 // Import framework stuff
 use CoreFramework\Registry\BaseRegistry;

diff --git a/inc/main/classes/resolver/command/class_BaseCommandResolver.php b/inc/main/classes/resolver/command/class_BaseCommandResolver.php
index 5f948a56ad4d84335c5a709ddbf4f7d1946681a6..6e469a30c64553f93d50068dd0280a0fe7fbda7d 100644 (file)
--- a/inc/main/classes/resolver/command/class_BaseCommandResolver.php
+++ b/inc/main/classes/resolver/command/class_BaseCommandResolver.php
@@ -3,6 +3,7 @@
 namespace CoreFramework\Resolver\Command;
 
 // Import framework stuff
+use CoreFramework\Command\Commandable;
 use CoreFramework\Command\InvalidCommandException;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Request\Requestable;

diff --git a/inc/main/classes/resolver/controller/class_BaseControllerResolver.php b/inc/main/classes/resolver/controller/class_BaseControllerResolver.php
index 6f2da6fe4d2f174726b4dd8481b0c9a1bb3d4c6b..97d3607aea3840f32304507c9906e1fed1c0c984 100644 (file)
--- a/inc/main/classes/resolver/controller/class_BaseControllerResolver.php
+++ b/inc/main/classes/resolver/controller/class_BaseControllerResolver.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Resolver\Controller;
 
 // Import framework stuff
 use CoreFramework\Controller\DefaultControllerException;
-use CoreFramework\Controller\Generic\Controller;
+use CoreFramework\Controller\Controller;
 use CoreFramework\Factory\ObjectFactory;
 use CoreFramework\Resolver\BaseResolver;
 use CoreFramework\Resolver\Controller\ControllerResolver;

diff --git a/inc/main/classes/response/class_BaseResponse.php b/inc/main/classes/response/class_BaseResponse.php
index d0925c146f2af1e9705d721d02a16b14ebcf21a6..bb21e39197c9ad621be7acddd1b39e104059277e 100644 (file)
--- a/inc/main/classes/response/class_BaseResponse.php
+++ b/inc/main/classes/response/class_BaseResponse.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Response;
 
 // Import framework stuff
 use CoreFramework\Object\BaseFrameworkSystem;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 
 /**
  * A generic request class

diff --git a/inc/main/classes/template/console/class_ConsoleTemplateEngine.php b/inc/main/classes/template/console/class_ConsoleTemplateEngine.php
index be70a160defa73f51367ec2bdf592788eb1a162b..09aadd22bf6fb54ae88f55b1e66516ee625114bd 100644 (file)
--- a/inc/main/classes/template/console/class_ConsoleTemplateEngine.php
+++ b/inc/main/classes/template/console/class_ConsoleTemplateEngine.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Template\Engine;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Template\CompileableTemplate;
 
 /**

diff --git a/inc/main/classes/template/html/class_HtmlTemplateEngine.php b/inc/main/classes/template/html/class_HtmlTemplateEngine.php
index 9d7e505725381d59e28ab37784f0caed41169093..32b16fad42b7c02c5f6cab2c6d9db40a6c27c372 100644 (file)
--- a/inc/main/classes/template/html/class_HtmlTemplateEngine.php
+++ b/inc/main/classes/template/html/class_HtmlTemplateEngine.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Template\Engine;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Template\CompileableTemplate;
 
 /**

diff --git a/inc/main/classes/template/image/class_ImageTemplateEngine.php b/inc/main/classes/template/image/class_ImageTemplateEngine.php
index b32963ddd6a253b33314584cd2ee7efa7d40165f..c438b04916be4690904c2131235a379ccfc184a1 100644 (file)
--- a/inc/main/classes/template/image/class_ImageTemplateEngine.php
+++ b/inc/main/classes/template/image/class_ImageTemplateEngine.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Template\Engine;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Response\Responseable;
 use CoreFramework\Template\CompileableTemplate;
 

diff --git a/inc/main/classes/template/mail/class_MailTemplateEngine.php b/inc/main/classes/template/mail/class_MailTemplateEngine.php
index 7584dc7e872946254ee97d1cea2dbb01d2c0b631..8f031a85419d6b31f5616f78b8d6de02c8eaab11 100644 (file)
--- a/inc/main/classes/template/mail/class_MailTemplateEngine.php
+++ b/inc/main/classes/template/mail/class_MailTemplateEngine.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Template\Engine;
 
 // Import framework stuff
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Response\Responseable;
 use CoreFramework\Template\CompileableTemplate;
 

diff --git a/inc/main/classes/template/menu/class_MenuTemplateEngine.php b/inc/main/classes/template/menu/class_MenuTemplateEngine.php
index f00cb5b76759e61b35afdc677c2a87168816a812..64ab5b3cd01abaf04970a5817b3dc8806172a64b 100644 (file)
--- a/inc/main/classes/template/menu/class_MenuTemplateEngine.php
+++ b/inc/main/classes/template/menu/class_MenuTemplateEngine.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Template\Engine;
 
 // Import framework stuff
 use CoreFramework\Factory\ObjectFactory;
-use CoreFramework\Registry\Generic\Registry;
+use CoreFramework\Registry\Registry;
 use CoreFramework\Template\CompileableTemplate;
 
 /**

diff --git a/inc/main/interfaces/controller/class_Controller.php b/inc/main/interfaces/controller/class_Controller.php
index e5a894576265c7e7050d3464f5eb4bbbc255435f..0a2d52c437b2a2dfe9bebb1be5387d365d6c40fa 100644 (file)
--- a/inc/main/interfaces/controller/class_Controller.php
+++ b/inc/main/interfaces/controller/class_Controller.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Controller\Generic;
+namespace CoreFramework\Controller;
 
 // Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;

diff --git a/inc/main/interfaces/resolver/actions/class_ActionResolver.php b/inc/main/interfaces/resolver/actions/class_ActionResolver.php
index ec97b79a76605d6088d12266d7cd4d0d84bb67b6..c63382fb671dc39678851dc6d9812f0103fd2a20 100644 (file)
--- a/inc/main/interfaces/resolver/actions/class_ActionResolver.php
+++ b/inc/main/interfaces/resolver/actions/class_ActionResolver.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Resolver\Action;
 
 // Import framework stuff
 use CoreFramework\Request\Requestable;
-use CoreFramework\Resolver\Generic\Resolver;
+use CoreFramework\Resolver\Resolver;
 
 /**
  * An instance for action resolver classes

diff --git a/inc/main/interfaces/resolver/class_Resolver.php b/inc/main/interfaces/resolver/class_Resolver.php
index 437bbb861e3dfd07e874b3739d1598b513bfec25..e06bdd4360d0b8aaa5faab254ee29eb06f025c94 100644 (file)
--- a/inc/main/interfaces/resolver/class_Resolver.php
+++ b/inc/main/interfaces/resolver/class_Resolver.php
@@ -1,6 +1,6 @@
 <?php
 // Own namespace
-namespace CoreFramework\Resolver\Generic;
+namespace CoreFramework\Resolver;
 
 // Import framework stuff
 use CoreFramework\Generic\FrameworkInterface;

diff --git a/inc/main/interfaces/resolver/commands/class_CommandResolver.php b/inc/main/interfaces/resolver/commands/class_CommandResolver.php
index 5d5ca170befe761749b5f348896e3028072bfae9..01677a3ff5754843788f3b9aead7ba88034776ac 100644 (file)
--- a/inc/main/interfaces/resolver/commands/class_CommandResolver.php
+++ b/inc/main/interfaces/resolver/commands/class_CommandResolver.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Resolver\Command;
 
 // Import framework stuff
 use CoreFramework\Request\Requestable;
-use CoreFramework\Resolver\Generic\Resolver;
+use CoreFramework\Resolver\Resolver;
 
 /**
  * An instance for command resolver classes

diff --git a/inc/main/interfaces/resolver/controller/class_ControllerResolver.php b/inc/main/interfaces/resolver/controller/class_ControllerResolver.php
index ff8f5b612f61838fa6962b99f429d9f7944be7d2..ff5e984badf378f7b25c66fd1765825e9bd42466 100644 (file)
--- a/inc/main/interfaces/resolver/controller/class_ControllerResolver.php
+++ b/inc/main/interfaces/resolver/controller/class_ControllerResolver.php
@@ -4,7 +4,7 @@ namespace CoreFramework\Resolver\Controller;
 
 // Import framework stuff
 use CoreFramework\Resolver\Controller\ControllerResolver;
-use CoreFramework\Resolver\Generic\Resolver;
+use CoreFramework\Resolver\Resolver;
 
 /**
  * An instance for controller resolver classes

diff --git a/inc/main/interfaces/resolver/state/class_StateResolver.php b/inc/main/interfaces/resolver/state/class_StateResolver.php
index d9b8707a299436754d2934c76d4fe0678637d01d..9c8b952e0855dabb514e09aa82329e4cfb22f4ed 100644 (file)
--- a/inc/main/interfaces/resolver/state/class_StateResolver.php
+++ b/inc/main/interfaces/resolver/state/class_StateResolver.php
@@ -3,7 +3,7 @@
 namespace CoreFramework\Resolver\State;
 
 // Import framework stuff
-use CoreFramework\Resolver\Generic\Resolver;
+use CoreFramework\Resolver\Resolver;
 
 /**
  * An instance for state resolver classes