From 310735b7c39eb5fdf42bd1dd74f5e49c7d3f9b62 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Thu, 20 Dec 2012 21:18:49 +0000 Subject: [PATCH] Updated ApplicationHelper class to latest API --- application/hub/class_ApplicationHelper.php | 2 +- application/hub/main/nodes/class_BaseHubNode.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/hub/class_ApplicationHelper.php b/application/hub/class_ApplicationHelper.php index 82c3ae471..34c421ee9 100644 --- a/application/hub/class_ApplicationHelper.php +++ b/application/hub/class_ApplicationHelper.php @@ -195,7 +195,7 @@ class ApplicationHelper extends BaseFrameworkSystem implements ManageableApplica } // END - if // Get a resolver - $resolverClass = sprintf("Hub%sControllerResolver", $this->convertToClassName($responseType)); + $resolverClass = $this->convertToClassName($this->getAppShortName() . '_' . $responseType); $resolverInstance = ObjectFactory::createObjectByName($resolverClass, array($commandName, $this)); // Get a controller instance as well diff --git a/application/hub/main/nodes/class_BaseHubNode.php b/application/hub/main/nodes/class_BaseHubNode.php index 8f0148813..5f1618157 100644 --- a/application/hub/main/nodes/class_BaseHubNode.php +++ b/application/hub/main/nodes/class_BaseHubNode.php @@ -730,13 +730,13 @@ class BaseHubNode extends BaseHubSystem implements Updateable { */ public function ifNodeHasAnnounced () { // Debug message - /* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NODE: ifNodeHasAnnouncementCompleted(): state=' . $this->getStateInstance()->getStateName()); + /* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NODE: ifNodeHasAnnounced(): state=' . $this->getStateInstance()->getStateName()); // Simply check the state of this node $hasAnnounced = ($this->getStateInstance() instanceof NodeAnnouncedState); // Debug message - /* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NODE: ifNodeHasAnnouncementCompleted(): hasAnnounced=' . intval($hasAnnounced)); + /* DEBUG: */ self::createDebugInstance(__CLASS__)->debugOutput('NODE: ifNodeHasAnnounced(): hasAnnounced=' . intval($hasAnnounced)); // Return it return $hasAnnounced; -- 2.39.5