renamed Updates => Updater as mentioned in todo

2 files changed, 8 insertions, 23 deletions

diff --git a/core/Columns/Updates.php b/core/Columns/Updater.php
index f744d794f1..1a311977f0 100644
--- a/core/Columns/Updates.php
+++ b/core/Columns/Updater.php
@@ -12,14 +12,12 @@ use Piwik\DbHelper;
 use Piwik\Plugin\ActionDimension;
 use Piwik\Plugin\VisitDimension;
 use Piwik\Db;
-use Piwik\Updater;
+use Piwik\Updater as PiwikUpdater;
 
 /**
  * Class that handles dimension updates
- *
- * TODO rename to "Updater"
  */
-class Updates extends \Piwik\Updates
+class Updater extends \Piwik\Updates
 {
     /**
      * @var Updater
@@ -62,7 +60,7 @@ class Updates extends \Piwik\Updates
                 Db::exec($sql);
             } catch (\Exception $e) {
                 if (!Db::get()->isErrNo($e, '1091') && !Db::get()->isErrNo($e, '1060')) {
-                    Updater::handleQueryError($e, $sql, false, __FILE__);
+                    PiwikUpdater::handleQueryError($e, $sql, false, __FILE__);
                 }
             }
         }
@@ -136,17 +134,4 @@ class Updates extends \Piwik\Updates
         return $changingColumns;
     }
 
-    public static function hasUpdates()
-    {
-        $changingColumns = self::getUpdates();
-
-        foreach ($changingColumns as $columns) {
-            if (!empty($columns)) {
-                return true;
-            }
-        }
-
-        return false;
-    }
-
 }
diff --git a/core/Updater.php b/core/Updater.php
index cd66baf1f0..747163dfad 100644
--- a/core/Updater.php
+++ b/core/Updater.php
@@ -7,7 +7,7 @@
  *
  */
 namespace Piwik;
-use Piwik\Columns\Updates as ColumnUpdates;
+use Piwik\Columns\Updater as ColumnUpdater;
 
 /**
  * Load and execute all relevant, incremental update scripts for Piwik core and plugins, and bump the component version numbers for completed updates.
@@ -32,7 +32,7 @@ class Updater
         $this->pathUpdateFileCore = PIWIK_INCLUDE_PATH . '/core/Updates/';
         $this->pathUpdateFilePlugins = PIWIK_INCLUDE_PATH . '/plugins/%s/Updates/';
 
-        ColumnUpdates::setUpdater($this);
+        ColumnUpdater::setUpdater($this);
     }
 
     /**
@@ -127,7 +127,7 @@ class Updater
                 }
 
                 if (in_array($className, $classNames)) {
-                    continue; // prevent from getting updates from Piwik\Columns\Updates multiple times
+                    continue; // prevent from getting updates from Piwik\Columns\Updater multiple times
                 }
 
                 $classNames[] = $className;
@@ -156,7 +156,7 @@ class Updater
         }
 
         if ($this->isDimensionComponent($componentName)) {
-            return '\\Piwik\\Columns\\Updates';
+            return '\\Piwik\\Columns\\Updater';
         }
 
         return '\\Piwik\\Plugins\\' . $componentName . '\\' . $className;
@@ -224,7 +224,7 @@ class Updater
             if ($name == 'core') {
                 $pathToUpdates = $this->pathUpdateFileCore . '*.php';
             } elseif ($this->isDimensionComponent($name)) {
-                $componentsWithUpdateFile[$name][PIWIK_INCLUDE_PATH . '/core/Columns/Updates.php'] = $newVersion;
+                $componentsWithUpdateFile[$name][PIWIK_INCLUDE_PATH . '/core/Columns/Updater.php'] = $newVersion;
             } else {
                 $pathToUpdates = sprintf($this->pathUpdateFilePlugins, $name) . '*.php';
             }