From 9b3466349fc432c85a2766217f1dad2ee68b6e1e Mon Sep 17 00:00:00 2001 From: webchick Date: Tue, 23 Oct 2012 15:53:04 -0700 Subject: [PATCH] Issue #1817554 by damiankloip: Review and improve naming of entity specific row plugins. --- .../comment/Plugin/views/row/{View.php => CommentRow.php} | 6 +++--- .../Drupal/node/Plugin/views/row/{View.php => NodeRow.php} | 6 +++--- .../search/Plugin/views/row/{View.php => SearchRow.php} | 4 ++-- .../system/Plugin/views/row/{Entity.php => EntityRow.php} | 5 ++--- .../Drupal/user/Plugin/views/row/{View.php => UserRow.php} | 6 +++--- 5 files changed, 13 insertions(+), 14 deletions(-) rename core/modules/comment/lib/Drupal/comment/Plugin/views/row/{View.php => CommentRow.php} (90%) rename core/modules/node/lib/Drupal/node/Plugin/views/row/{View.php => NodeRow.php} (91%) rename core/modules/search/lib/Drupal/search/Plugin/views/row/{View.php => SearchRow.php} (91%) rename core/modules/system/lib/Drupal/system/Plugin/views/row/{Entity.php => EntityRow.php} (96%) rename core/modules/user/lib/Drupal/user/Plugin/views/row/{View.php => UserRow.php} (83%) diff --git a/core/modules/comment/lib/Drupal/comment/Plugin/views/row/View.php b/core/modules/comment/lib/Drupal/comment/Plugin/views/row/CommentRow.php similarity index 90% rename from core/modules/comment/lib/Drupal/comment/Plugin/views/row/View.php rename to core/modules/comment/lib/Drupal/comment/Plugin/views/row/CommentRow.php index 56a3afb4755..7bafe53f651 100644 --- a/core/modules/comment/lib/Drupal/comment/Plugin/views/row/View.php +++ b/core/modules/comment/lib/Drupal/comment/Plugin/views/row/CommentRow.php @@ -2,12 +2,12 @@ /** * @file - * Definition of Drupal\comment\Plugin\views\row\View. + * Definition of Drupal\comment\Plugin\views\row\CommentRow. */ namespace Drupal\comment\Plugin\views\row; -use Drupal\system\Plugin\views\row\Entity; +use Drupal\system\Plugin\views\row\EntityRow; use Drupal\Core\Annotation\Plugin; use Drupal\Core\Annotation\Translation; @@ -25,7 +25,7 @@ use Drupal\Core\Annotation\Translation; * type = "normal" * ) */ -class View extends Entity { +class CommentRow extends EntityRow { /** * Overrides Drupal\system\Plugin\views\row\Entity::defineOptions(). diff --git a/core/modules/node/lib/Drupal/node/Plugin/views/row/View.php b/core/modules/node/lib/Drupal/node/Plugin/views/row/NodeRow.php similarity index 91% rename from core/modules/node/lib/Drupal/node/Plugin/views/row/View.php rename to core/modules/node/lib/Drupal/node/Plugin/views/row/NodeRow.php index 327fa106498..e096fc26240 100644 --- a/core/modules/node/lib/Drupal/node/Plugin/views/row/View.php +++ b/core/modules/node/lib/Drupal/node/Plugin/views/row/NodeRow.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\node\Plugin\views\row\View. + * Definition of Drupal\node\Plugin\views\row\NodeRow. */ namespace Drupal\node\Plugin\views\row; @@ -10,7 +10,7 @@ namespace Drupal\node\Plugin\views\row; use Drupal\views\ViewExecutable; use Drupal\Core\Annotation\Plugin; use Drupal\Core\Annotation\Translation; -use Drupal\system\Plugin\views\row\Entity; +use Drupal\system\Plugin\views\row\EntityRow; /** * Plugin which performs a node_view on the resulting object. @@ -29,7 +29,7 @@ use Drupal\system\Plugin\views\row\Entity; * type = "normal" * ) */ -class View extends Entity { +class NodeRow extends EntityRow { /** * Overrides Drupal\system\Plugin\views\row\Entity::defineOptions(). diff --git a/core/modules/search/lib/Drupal/search/Plugin/views/row/View.php b/core/modules/search/lib/Drupal/search/Plugin/views/row/SearchRow.php similarity index 91% rename from core/modules/search/lib/Drupal/search/Plugin/views/row/View.php rename to core/modules/search/lib/Drupal/search/Plugin/views/row/SearchRow.php index 86eaecb964b..9bebc88c4f6 100644 --- a/core/modules/search/lib/Drupal/search/Plugin/views/row/View.php +++ b/core/modules/search/lib/Drupal/search/Plugin/views/row/SearchRow.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\search\Plugin\views\row\View. + * Definition of Drupal\search\Plugin\views\row\SearchRow. */ namespace Drupal\search\Plugin\views\row; @@ -21,7 +21,7 @@ use Drupal\Core\Annotation\Translation; * no_uid = TRUE * ) */ -class View extends RowPluginBase { +class SearchRow extends RowPluginBase { protected function defineOptions() { $options = parent::defineOptions(); diff --git a/core/modules/system/lib/Drupal/system/Plugin/views/row/Entity.php b/core/modules/system/lib/Drupal/system/Plugin/views/row/EntityRow.php similarity index 96% rename from core/modules/system/lib/Drupal/system/Plugin/views/row/Entity.php rename to core/modules/system/lib/Drupal/system/Plugin/views/row/EntityRow.php index 025a3f0da90..d00edd1494c 100644 --- a/core/modules/system/lib/Drupal/system/Plugin/views/row/Entity.php +++ b/core/modules/system/lib/Drupal/system/Plugin/views/row/EntityRow.php @@ -2,7 +2,7 @@ /** * @file - * Definition of Drupal\system\Plugin\views\row\Entity. + * Definition of Drupal\system\Plugin\views\row\EntityRow. */ namespace Drupal\system\Plugin\views\row; @@ -13,8 +13,7 @@ use Drupal\views\ViewExecutable; /** * Generic entity row plugin to provide a common base for all entity types. */ -class Entity extends RowPluginBase { - protected $entityInfo1; +class EntityRow extends RowPluginBase { /** * The table the entity is using for storage. diff --git a/core/modules/user/lib/Drupal/user/Plugin/views/row/View.php b/core/modules/user/lib/Drupal/user/Plugin/views/row/UserRow.php similarity index 83% rename from core/modules/user/lib/Drupal/user/Plugin/views/row/View.php rename to core/modules/user/lib/Drupal/user/Plugin/views/row/UserRow.php index 44bd31701ff..b7d1de039e5 100644 --- a/core/modules/user/lib/Drupal/user/Plugin/views/row/View.php +++ b/core/modules/user/lib/Drupal/user/Plugin/views/row/UserRow.php @@ -2,12 +2,12 @@ /** * @file - * Definition of Drupal\user\Plugin\views\row\View + * Definition of Drupal\user\Plugin\views\row\UserRow. */ namespace Drupal\user\Plugin\views\row; -use Drupal\system\Plugin\views\row\Entity; +use Drupal\system\Plugin\views\row\EntityRow; use Drupal\Core\Annotation\Plugin; use Drupal\Core\Annotation\Translation; @@ -26,7 +26,7 @@ use Drupal\Core\Annotation\Translation; * type = "normal" * ) */ -class View extends Entity { +class UserRow extends EntityRow { /** * Overrides Drupal\system\Plugin\views\row\Entity::defineOptions().