'public static final' is correct

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

diff --git a/inc/classes/main/resolver/controller/class_BaseControllerResolver.php b/inc/classes/main/resolver/controller/class_BaseControllerResolver.php
index 85662f67546c8282619cfcca6a86ca326a4f3807..0c39b385e170c0a70d0f839cb688394fb110622a 100644 (file)
--- a/inc/classes/main/resolver/controller/class_BaseControllerResolver.php
+++ b/inc/classes/main/resolver/controller/class_BaseControllerResolver.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
  *
@@ -94,7 +94,7 @@ class BaseControllerResolver extends BaseResolver {
         */
        protected function loadController ($controllerName) {
                // Cache default command
-               $defaultController = $this->getConfigInstance()->readConfig('default_' . strtolower($this->getControllerPrefix()) . '_command');
+               $defaultController = $this->getConfigInstance()->getConfigEntry('default_' . strtolower($this->getControllerPrefix()) . '_command');
 
                // Init controller instance
                $controllerInstance = null;
@@ -126,17 +126,10 @@ class BaseControllerResolver extends BaseResolver {
                $resolverConfigEntry = '';
 
                // Try to read a config entry for our resolver including controller name... ;-)
-               try {
-                       // Create the resolver name
-                       $resolverConfigEntry = sprintf("%s_cmd_%s_resolver_class", strtolower($this->getControllerPrefix()), 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 = strtolower($this->getControllerPrefix()) . '_cmd_resolver_class';
-               }
+               $resolverConfigEntry = sprintf("%s_cmd_%s_resolver_class", strtolower($this->getControllerPrefix()), strtolower($controllerName));
+
+               // Get the config, this will throw an exception if there is no special command resolver
+               $resolverClass = $this->getConfigInstance()->getConfigEntry($resolverConfigEntry);
 
                // Initiate the resolver and controller
                $resolverInstance = ObjectFactory::createObjectByConfiguredName(