AbstractObject: Rename to MonitoredObject

refs #6932
Icinga · Sep 4, 2014 · f8b3ffb · f8b3ffb
1 parent 4fb47ef
commit f8b3ffb
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/modules/monitoring/application/controllers/ShowController.php b/modules/monitoring/application/controllers/ShowController.php
@@ -3,13 +3,13 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 
 use Icinga\Application\Benchmark;
+use Icinga\Module\Monitoring\Object\MonitoredObject;
 use Icinga\Web\Hook;
 use Icinga\Web\Widget\Tabs;
 use Icinga\Web\Widget\Tabextension\OutputFormat;
 use Icinga\Web\Widget\Tabextension\DashboardAction;
 use Icinga\Module\Monitoring\Backend;
 use Icinga\Module\Monitoring\Controller;
-use Icinga\Module\Monitoring\Object\AbstractObject;
 use Icinga\Module\Monitoring\Object\Host;
 use Icinga\Module\Monitoring\Object\Service;
 
@@ -41,7 +41,7 @@ public function init()
             $this->view->object = new Service($this->params);
         } else {
             // TODO: Well... this could be done better
-            $this->view->object = AbstractObject::fromParams($this->params);
+            $this->view->object = MonitoredObject::fromParams($this->params);
         }
         if (Hook::has('ticket')) {
             $this->view->tickets = Hook::first('ticket');

diff --git a/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php b/modules/monitoring/application/forms/Command/ScheduleDowntimeForm.php
@@ -4,6 +4,7 @@
 
 namespace Icinga\Module\Monitoring\Form\Command;
 
+use Icinga\Module\Monitoring\Object\MonitoredObject;
 use Zend_Form_Element_Text;
 use Zend_Validate_GreaterThan;
 use Zend_Validate_Digits;
@@ -12,7 +13,6 @@
 use Icinga\Util\DateTimeFactory;
 use Icinga\Module\Monitoring\Backend;
 use Icinga\Module\Monitoring\Command\ScheduleDowntimeCommand;
-use Icinga\Module\Monitoring\Object\AbstractObject;
 use Icinga\Module\Monitoring\Object\Service;
 use Icinga\Web\Url;
 
@@ -67,7 +67,7 @@ private function getCurrentDowntimes()
 
         $cfg = $this->getConfiguration();
         $preferences = $this->getUserPreferences();
-        $object = AbstractObject::fromParams(Url::fromRequest()->getParams());
+        $object = MonitoredObject::fromParams(Url::fromRequest()->getParams());
         $object->fetchDowntimes();
         $downtimes = $object->downtimes;
 /*

diff --git a/modules/monitoring/application/views/helpers/MonitoringFlags.php b/modules/monitoring/application/views/helpers/MonitoringFlags.php
@@ -2,7 +2,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 // {{{ICINGA_LICENSE_HEADER}}}
 
-/*use Icinga\Module\Monitoring\Object\AbstractObject;*/
+/* use Icinga\Module\Monitoring\Object\MonitoredObject; */
 
 /**
  * Rendering helper for object's properties which may be either enabled or disabled
@@ -26,11 +26,11 @@ class Zend_View_Helper_MonitoringFlags extends Zend_View_Helper_Abstract
     /**
      * Retrieve flags as array with either true or false as value
      *
-     * @param   AbstractObject $object
+     * @param   MonitoredObject $object
      *
      * @return  array
      */
-    public function monitoringFlags(/*AbstractObject*/$object)
+    public function monitoringFlags(/*MonitoredObject*/ $object)
     {
         $flags = array();
         foreach (self::$flags as $column => $description) {

diff --git a/modules/monitoring/application/views/helpers/ResolveMacros.php b/modules/monitoring/application/views/helpers/ResolveMacros.php
@@ -3,7 +3,7 @@
 // {{{ICINGA_LICENSE_HEADER}}}
 
 use \Zend_View_Helper_Abstract;
-use Icinga\Module\Monitoring\Object\AbstractObject;
+use Icinga\Module\Monitoring\Object\MonitoredObject;
 
 class Zend_View_Helper_ResolveMacros extends Zend_View_Helper_Abstract
 {
@@ -22,7 +22,7 @@ class Zend_View_Helper_ResolveMacros extends Zend_View_Helper_Abstract
      * Return the given string with macros being resolved
      *
      * @param   string                      $input      The string in which to look for macros
-     * @param   AbstractObject|stdClass     $object     The host or service used to resolve macros
+     * @param   MonitoredObject|stdClass     $object     The host or service used to resolve macros
      *
      * @return  string                                  The substituted or unchanged string
      */
@@ -45,7 +45,7 @@ public function resolveMacros($input, $object)
      * Resolve a macro based on the given object
      *
      * @param   string                      $macro      The macro to resolve
-     * @param   AbstractObject|stdClass     $object     The object used to resolve the macro
+     * @param   MonitoredObject|stdClass     $object     The object used to resolve the macro
      *
      * @return  string                                  The new value or the macro if it cannot be resolved
      */

diff --git a/modules/monitoring/library/Monitoring/Object/Host.php b/modules/monitoring/library/Monitoring/Object/Host.php
@@ -7,7 +7,7 @@
 use Icinga\Module\Monitoring\DataView\HostStatus;
 use Icinga\Data\Db\DbQuery;
 
-class Host extends AbstractObject
+class Host extends MonitoredObject
 {
     public $type   = 'host';
     public $prefix = 'host_';

diff --git a/...rary/Monitoring/Object/AbstractObject.php → ...ary/Monitoring/Object/MonitoredObject.php b/...rary/Monitoring/Object/AbstractObject.php → ...ary/Monitoring/Object/MonitoredObject.php
@@ -23,7 +23,7 @@
 use Icinga\Application\Config;
 
 
-abstract class AbstractObject
+abstract class MonitoredObject
 {
     public $type;
     public $prefix;

diff --git a/modules/monitoring/library/Monitoring/Object/Service.php b/modules/monitoring/library/Monitoring/Object/Service.php
@@ -7,7 +7,7 @@
 use Icinga\Module\Monitoring\DataView\ServiceStatus;
 use Icinga\Data\Db\DbQuery;
 
-class Service extends AbstractObject
+class Service extends MonitoredObject
 {
     public $type   = 'service';
     public $prefix = 'service_';