Some cleanups, more usage of ObjectFactory:

[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 191609f6f3e5ae8c83a22ebe68b1526c2ec03553..92dd54066d71e86e4fddb72c78013217666ea589 100644 (file)
--- a/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php
+++ b/inc/classes/main/resolver/controller/image/class_ImageControllerResolver.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007 - 2009 Roland Haeder, this is free software
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2011 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -30,7 +30,7 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
        /**
         * Last successfull resolved controller (instance)
         */
-       private $lastControllerInstance = null;
+       private $lastControllerInstance = NULL;
 
        /**
         * Protected constructor
@@ -41,20 +41,20 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
                // Call parent constructor
                parent::__construct(__CLASS__);
 
-               // Set prefix to "Image"
-               $this->setControllerPrefix("Image");
+               // Set prefix to 'Image'
+               $this->setClassPrefix('Image');
        }
 
        /**
         * Creates an instance of a resolver class with a given command
         *
         * @param       $controllerName                         The controller we shall resolve
-        * @param       $appInstance                            An instance of a manageable application helper class
+        * @param       $applicationInstance            An instance of a manageable application helper class
         * @return      $resolverInstance                       The prepared controller resolver instance
         * @throws      EmptyVariableException          Thrown if default command is not set
         * @throws      InvalidControllerException      Thrown if default controller is invalid
         */
-       public final static function createImageControllerResolver ($controllerName, ManageableApplication $appInstance) {
+       public static final function createImageControllerResolver ($controllerName, ManageableApplication $applicationInstance) {
                // Create the new instance
                $resolverInstance = new ImageControllerResolver();
 
@@ -68,7 +68,7 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
                }
 
                // Set the application instance
-               $resolverInstance->setApplicationInstance($appInstance);
+               $resolverInstance->setApplicationInstance($applicationInstance);
 
                // Set command name
                $resolverInstance->setControllerName($controllerName);
@@ -88,7 +88,7 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
        public function resolveController () {
                // Init variables
                $controllerName = '';
-               $controllerInstance = null;
+               $controllerInstance = NULL;
 
                // Get the command name 
                $controllerName = $this->getControllerName();
@@ -103,65 +103,11 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
                } // END - if
 
                // Set last controller
-               $this->lastControllerInstance = $controllerInstance;
+               $this->setResolvedInstance($controllerInstance);
 
                // Return the maybe resolved instance
                return $controllerInstance;
        }
-
-       /**
-        * "Loads" a given controller and instances it if not yet cached. If the
-        * controller was not found one of the default controllers will be used
-        * depending on wether news shall be displayed.
-        *
-        * @param       $controllerName                 A controller name we shall look for
-        * @return      $controllerInstance             A loaded controller instance
-        * @throws      InvalidControllerException      Thrown if even the requested
-        *                                                                              controller class is missing (bad!)
-        */
-       private function loadController ($controllerName) {
-               // Cache default command
-               $defaultController = $this->getConfigInstance()->readConfig('default_image_command');
-
-               // Init controller instance
-               $controllerInstance = null;
-
-               // Default controller
-               $this->setClassName($defaultController);
-
-               // Generate the class name
-               //* DEBUG: */ echo __METHOD__.": Controller=".$controllerName;
-               if ($controllerName != $defaultController) {
-                       // Create controller class name
-                       $className = 'Image' . $this->convertToClassName($controllerName) . 'Controller';
-
-                       // ... and set it
-                       $this->setClassName($className);
-               } // END - if
-               //* DEBUG: */ echo ", controller=".$this->getClassName()."<br />\n";
-
-               // Is this class loaded?
-               if (!class_exists($this->getClassName())) {
-                       // Class not found, so or throw an exception
-                       throw new InvalidControllerException(array($this, $controllerName), self::EXCEPTION_INVALID_CONTROLLER);
-               } // END - if
-
-               // Initiate the resolver and controller
-               $resolverInstance = ObjectFactory::createObjectByConfiguredName(
-                       'image_cmd_resolver_class',
-                       array(
-                               $controllerName,
-                               $this->getApplicationInstance()
-                       )
-               );
-               $controllerInstance = ObjectFactory::createObjectByName(
-                       $this->getClassName(),
-                       array($resolverInstance)
-               );
-
-               // Return the result
-               return $controllerInstance;
-       }
 }
 
 // [EOF]