Copyright updated

[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 39d88d16728dc4dd3067e504e2a4940c33111ef6..89de2d8c0ea991286859bd963e224c9f82618d9c 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, 2008 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
  *
@@ -25,7 +25,7 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
        /**
         * Last successfull resolved controller (name)
         */
-       private $lastControllerName = "";
+       private $lastControllerName = '';
 
        /**
         * Last successfull resolved controller (instance)
@@ -41,8 +41,8 @@ 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');
        }
 
        /**
@@ -54,7 +54,7 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
         * @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 $appInstance) {
                // Create the new instance
                $resolverInstance = new ImageControllerResolver();
 
@@ -87,7 +87,7 @@ class ImageControllerResolver extends BaseControllerResolver implements Controll
         */
        public function resolveController () {
                // Init variables
-               $controllerName = "";
+               $controllerName = '';
                $controllerInstance = null;
 
                // Get the command name 
@@ -103,58 +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
-                       $this->setClassName(sprintf("Image%sController",
-                               $this->convertToClassName($controllerName)
-                       ));
-               } // 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));
-
-               // Remove resolver
-               unset($resolverInstance);
-
-               // Return the result
-               return $controllerInstance;
-       }
 }
 
 // [EOF]