1 files changed, 14 insertions, 11 deletions

diff --git a/plugins/Contents/Columns/ContentPiece.php b/plugins/Contents/Columns/ContentPiece.php
index 4cd0722e5a..0bf5464611 100644
--- a/plugins/Contents/Columns/ContentPiece.php
+++ b/plugins/Contents/Columns/ContentPiece.php
@@ -8,9 +8,9 @@
  */
 namespace Piwik\Plugins\Contents\Columns;
 
-use Piwik\Piwik;
+use Piwik\Columns\Discriminator;
+use Piwik\Columns\Join\ActionNameJoin;
 use Piwik\Plugin\Dimension\ActionDimension;
-use Piwik\Plugins\Actions\Segment;
 use Piwik\Plugins\Contents\Actions\ActionContent;
 use Piwik\Tracker\Action;
 use Piwik\Tracker\Request;
@@ -19,19 +19,22 @@ class ContentPiece extends ActionDimension
 {
     protected $columnName = 'idaction_content_piece';
     protected $columnType = 'INTEGER(10) UNSIGNED DEFAULT NULL';
-
-    protected function configureSegments()
+    protected $segmentName = 'contentPiece';
+    protected $nameSingular = 'Contents_ContentPiece';
+    protected $namePlural = 'Contents_ContentPieces';
+    protected $acceptValues = 'The actual content. For instance "ad.jpg" or "My text ad"';
+    protected $type = self::TYPE_TEXT;
+    protected $category = 'General_Actions';
+    protected $sqlFilter = '\\Piwik\\Tracker\\TableLogAction::getIdActionFromSegment';
+
+    public function getDbColumnJoin()
     {
-        $segment = new Segment();
-        $segment->setSegment('contentPiece');
-        $segment->setName('Contents_ContentPiece');
-        $segment->setAcceptedValues('The actual content. For instance "ad.jpg" or "My text ad"');
-        $this->addSegment($segment);
+        return new ActionNameJoin();
     }
 
-    public function getName()
+    public function getDbDiscriminator()
     {
-        return Piwik::translate('Contents_ContentPiece');
+        return new Discriminator('log_action', 'type', $this->getActionId());
     }
 
     public function getActionId()