From 1b29a21ec5758e0bd3bfc1f73cbbc0b7af56cb76 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Sat, 20 Dec 2008 20:19:22 +0000 Subject: [PATCH] Application helper class rewritten, buildMasterTemplateName() method added, ManageableApplication interface updated --- application/admin/class_ApplicationHelper.php | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/application/admin/class_ApplicationHelper.php b/application/admin/class_ApplicationHelper.php index c041e08..1fd3e76 100644 --- a/application/admin/class_ApplicationHelper.php +++ b/application/admin/class_ApplicationHelper.php @@ -55,11 +55,6 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication */ private $shortName = ""; - /** - * The name of the master template - */ - private $masterTemplate = "admin_main"; - /** * An instance of a controller */ @@ -159,12 +154,16 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication } /** - * Getter for master template name + * Builds the master template's name * - * @return $masterTemplate Name of the master template + * @return $masterTemplateName Name of the master template */ - public final function getMasterTemplate () { - return $this->masterTemplate; + public function buildMasterTemplateName () { + // Get short name and add suffix + $masterTemplateName = $this->getAppShortName() . "_main"; + + // Return it + return $masterTemplateName; } /** @@ -188,7 +187,8 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication } // END - if // ... and a new response object - $responseInstance = ObjectFactory::createObjectByName(ucfirst($response)."Response", array($this)); + $responseClass = sprintf("%sResponse", $this->convertToClassName($response)); + $responseInstance = ObjectFactory::createObjectByName($responseClass, array($this)); // Remember both in this application $this->setRequestInstance($requestInstance); @@ -203,7 +203,8 @@ class ApplicationHelper extends BaseApplication implements ManageableApplication } // END - if // Get a resolver - $resolverInstance = ObjectFactory::createObjectByName(ucfirst($responseType)."ControllerResolver", array($commandName, $this)); + $resolverClass = sprintf("%sControllerResolver", $this->convertToClassName($responseType)); + $resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this)); // Get a controller instance as well $this->controllerInstance = $resolverInstance->resolveController(); -- 2.39.5