X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=inc%2Fclasses%2Fmain%2Fresolver%2Fcontroller%2Fweb%2Fclass_WebControllerResolver.php;h=0c4036938ca09b4863194db9d9efbf03fcfd7b4e;hp=a941f53c2309c7cb6991779847491f0c7fc3408e;hb=4b88c118b615335d06bd74e444173d21aef4406c;hpb=aa7ec363e1fd2d22ddda871d6c36cd78b753692c

diff --git a/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php b/inc/classes/main/resolver/controller/web/class_WebControllerResolver.php
index a941f53c..0c403693 100644
--- 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 - 2011 Core Developer Team
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.ship-simu.org
  *
@@ -41,8 +41,8 @@ class WebControllerResolver extends BaseControllerResolver implements Controller
 		// Call parent constructor
 		parent::__construct(__CLASS__);
 
-		// Set prefix to "Web"
-		$this->setControllerPrefix("Web");
+		// Set prefix to '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,84 +103,11 @@ class WebControllerResolver extends BaseControllerResolver implements Controller
 		} // 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_web_command');
-
-		// Init controller instance
-		$controllerInstance = null;
-
-		// Default controller
-		$this->setClassName('WebDefaultNewsController');
-
-		// Generate the class name
-		//* DEBUG: */ echo __METHOD__.": Controller=".$controllerName;
-		if ($controllerName != $defaultController) {
-			// Create controller class name
-			$className = 'Web' . $this->convertToClassName($controllerName) . 'Controller';
-
-			// ... and set it
-			$this->setClassName($className);
-		} else {
-			// No news at home page or non-news page
-			$this->setClassName('WebDefaultNewsController');
-		}
-		//* DEBUG: */ echo ", controller=".$this->getClassName()."<br />\n";
-
-		// Is this class loaded?
-		if (!class_exists($this->getClassName())) {
-			// Throw an exception here
-			throw new InvalidControllerException(array($this, $controllerName), self::EXCEPTION_INVALID_CONTROLLER);
-		} // END - if
-
-		// Set default resolver config name
-		$resolverConfigEntry = '';
-
-		// Try to read a config entry for our resolver including controller name... ;-)
-		try {
-			// Create the resolver name
-			$resolverConfigEntry = sprintf("web_cmd_%s_resolver_class", strtolower($controllerName));
-
-			// Get the config, this will throw an exception if there is no special command resolver
-			$resolverClass = $this->getConfigInstance()->readConfig($resolverConfigEntry);
-		} catch (ConfigEntryNotFoundException $e) {
-			// Use default resolver entry
-			// @TODO Maybe we need to log this?
-			$resolverConfigEntry = 'web_cmd_resolver_class';
-		}
-
-		// Initiate the resolver and controller
-		$resolverInstance = ObjectFactory::createObjectByConfiguredName(
-			$resolverConfigEntry,
-			array(
-				$controllerName,
-				$this->getApplicationInstance()
-			)
-		);
-		$controllerInstance = ObjectFactory::createObjectByName(
-			$this->getClassName(),
-			array($resolverInstance)
-		);
-
-		// Return the result
-		return $controllerInstance;
-	}
 }
 
 // [EOF]