resolveController() was everywhere the same, still you can overwrite it with

[core.git] / inc / classes / main / resolver / controller / image / class_ImageControllerResolver.php

diff --git a/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php b/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php
index 92dd54066d71e86e4fddb72c78013217666ea589..dde5f036217dca8eabf6732e959ade1b88db0ab8 100644 (file)
--- a/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php
+++ b/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php
@@ -2,11 +2,11 @@
 /**
  * A resolver for resolving controllers locally
  *
- * @author             Roland Haeder <webmaster@ship-simu.org>
+ * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2015 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
- * @link               http://www.ship-simu.org
+ * @link               http://www.shipsimu.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
@@ -22,16 +22,6 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 class ImageControllerResolver extends BaseControllerResolver implements ControllerResolver {
-       /**
-        * Last successfull resolved controller (name)
-        */
-       private $lastControllerName = '';
-
-       /**
-        * Last successfull resolved controller (instance)
-        */
-       private $lastControllerInstance = NULL;
-
        /**
         * Protected constructor
         *
@@ -41,8 +31,8 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
                // Call parent constructor
                parent::__construct(__CLASS__);
 
-               // Set prefix to 'Image'
-               $this->setClassPrefix('Image');
+               // Set prefix to 'image'
+               $this->setClassPrefix('image');
        }
 
        /**
@@ -62,7 +52,7 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
                if (empty($controllerName)) {
                        // Then thrown an exception here
                        throw new EmptyVariableException(array($resolverInstance, 'commandName'), self::EXCEPTION_UNEXPECTED_EMPTY_STRING);
-               } elseif ($resolverInstance->isControllerValid($controllerName) === false) {
+               } elseif ($resolverInstance->isControllerValid($controllerName) === FALSE) {
                        // Invalid command found
                        throw new InvalidControllerException(array($resolverInstance, $controllerName), self::EXCEPTION_INVALID_CONTROLLER);
                }
@@ -76,38 +66,6 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
                // Return the prepared instance
                return $resolverInstance;
        }
-
-       /**
-        * Resolves the default controller of the given command
-        *
-        * @return      $controllerInstance             A controller instance for the default
-        *                                                                      command
-        * @throws      InvalidControllerInstanceException      Thrown if $controllerInstance
-        *                                                                                              is invalid
-        */
-       public function resolveController () {
-               // Init variables
-               $controllerName = '';
-               $controllerInstance = NULL;
-
-               // Get the command name 
-               $controllerName = $this->getControllerName();
-
-               // Get the command
-               $controllerInstance = $this->loadController($controllerName);
-
-               // And validate it
-               if ((!is_object($controllerInstance)) || (!$controllerInstance instanceof Controller)) {
-                       // This command has an invalid instance!
-                       throw new InvalidControllerInstanceException(array($this, $controllerName), self::EXCEPTION_INVALID_CONTROLLER);
-               } // END - if
-
-               // Set last controller
-               $this->setResolvedInstance($controllerInstance);
-
-               // Return the maybe resolved instance
-               return $controllerInstance;
-       }
 }
 
 // [EOF]