Host name fixed (a redirect causes an error), duplicate code rewrriten to be more...

[core.git] / inc / classes / main / resolver / controller / web / class_WebControllerResolver.php

diff --git a/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php b/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
index 5cf6b41794dae94b268043d22f64a6f7d76b06cb..8cf46cc47a1e271ede60563c3be166e4d2b9edeb 100644 (file)
--- a/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
+++ b/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
- * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 Core Developer Team
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009, 2010 Core Developer Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -42,7 +42,7 @@ class WebControllerResolver extends BaseControllerResolver implements Controller
                parent::__construct(__CLASS__);
 
                // Set prefix to 'Web'
-               $this->setControllerPrefix('Web');
+               $this->setClassPrefix('Web');
        }
 
        /**
@@ -54,7 +54,7 @@ class WebControllerResolver extends BaseControllerResolver implements Controller
         * @throws      EmptyVariableException          Thrown if default command is not set
         * @throws      InvalidControllerException      Thrown if default controller is invalid
         */
-       public final static function createWebControllerResolver ($controllerName, ManageableApplication $appInstance) {
+       public static final function createWebControllerResolver ($controllerName, ManageableApplication $appInstance) {
                // Create the new instance
                $resolverInstance = new WebControllerResolver();
 
@@ -103,7 +103,7 @@ class WebControllerResolver extends BaseControllerResolver implements Controller
                } // END - if
 
                // Set last controller
-               $this->lastControllerInstance = $controllerInstance;
+               $this->setResolvedInstance($controllerInstance);
 
                // Return the maybe resolved instance
                return $controllerInstance;