Rename Metric::getColumn to Metric::getMetric and get rid of Metrics\Base.

2 files changed, 5 insertions, 8 deletions

diff --git a/core/DataTable/Filter/AddColumnsProcessedMetrics.php b/core/DataTable/Filter/AddColumnsProcessedMetrics.php
index 21fbef976a..778a202b8b 100644
--- a/core/DataTable/Filter/AddColumnsProcessedMetrics.php
+++ b/core/DataTable/Filter/AddColumnsProcessedMetrics.php
@@ -11,7 +11,7 @@ namespace Piwik\DataTable\Filter;
 use Piwik\DataTable\BaseFilter;
 use Piwik\DataTable\Row;
 use Piwik\DataTable;
-use Piwik\Metrics;
+use Piwik\Plugin\Metric;
 use Piwik\Plugins\CoreHome\Metrics\ActionsPerVisit;
 use Piwik\Plugins\CoreHome\Metrics\AverageTimeOnSite;
 use Piwik\Plugins\CoreHome\Metrics\BounceRate;
@@ -81,11 +81,9 @@ class AddColumnsProcessedMetrics extends BaseFilter
 
     private function deleteRowsWithNoVisit(DataTable $table)
     {
-        $metrics = new Metrics\Base();
-
         foreach ($table->getRows() as $key => $row) {
-            $nbVisits  = $metrics->getColumn($row, Metrics::INDEX_NB_VISITS);
-            $nbActions = $metrics->getColumn($row, Metrics::INDEX_NB_ACTIONS);
+            $nbVisits  = Metric::getMetric($row, Metrics::INDEX_NB_VISITS);
+            $nbActions = Metric::getMetric($row, Metrics::INDEX_NB_ACTIONS);
 
             if ($nbVisits == 0
                 && $nbActions == 0
diff --git a/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php b/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php
index aed53e3d30..1410103174 100644
--- a/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php
+++ b/core/DataTable/Filter/AddColumnsProcessedMetricsGoal.php
@@ -12,6 +12,7 @@ use Piwik\DataTable;
 use Piwik\DataTable\Row;
 use Piwik\Metrics;
 use Piwik\Piwik;
+use Piwik\Plugin\Metric;
 use Piwik\Plugins\Goals\Metrics\GoalSpecific\AverageOrderRevenue;
 use Piwik\Plugins\Goals\Metrics\GoalSpecific\ConversionRate;
 use Piwik\Plugins\Goals\Metrics\GoalSpecific\Conversions;
@@ -160,11 +161,9 @@ class AddColumnsProcessedMetricsGoal extends AddColumnsProcessedMetrics
 
     private function getGoalsInTable(DataTable $table)
     {
-        $metrics = new Metrics\Base(); // TODO: should probably get rid of Base too...
-
         $result = array();
         foreach ($table->getRows() as $row) {
-            $goals = $metrics->getColumn($row, Metrics::INDEX_GOALS);
+            $goals = Metric::getMetric($row, Metrics::INDEX_GOALS);
             if (!$goals) {
                 continue;
             }