From 0c9c847e5840476eaf328c8b738724b808fd4087 Mon Sep 17 00:00:00 2001
From: Tim Plunkett <git@plnktt.com>
Date: Wed, 22 Aug 2012 15:09:54 +0200
Subject: [PATCH] Issue #1744248 by tim.plunkett: Plugin and Handler should be
 PluginBase and HandlerBase.

---
 .../Plugin/views/{Handler.php => HandlerBase.php}      |  6 +++---
 .../views/Plugin/views/{Plugin.php => PluginBase.php}  | 10 +++++-----
 .../views/Plugin/views/access/AccessPluginBase.php     |  4 ++--
 lib/Drupal/views/Plugin/views/area/AreaPluginBase.php  |  8 ++++----
 .../views/Plugin/views/argument/ArgumentPluginBase.php |  6 +++---
 .../argument_default/ArgumentDefaultPluginBase.php     |  4 ++--
 .../argument_validator/ArgumentValidatorPluginBase.php |  4 ++--
 .../views/Plugin/views/cache/CachePluginBase.php       |  4 ++--
 .../views/Plugin/views/display/DisplayPluginBase.php   |  4 ++--
 .../display_extender/DisplayExtenderPluginBase.php     |  4 ++--
 .../views/exposed_form/ExposedFormPluginBase.php       |  4 ++--
 .../views/Plugin/views/field/FieldPluginBase.php       |  4 ++--
 .../views/Plugin/views/filter/FilterPluginBase.php     |  4 ++--
 .../views/localization/LocalizationPluginBase.php      |  4 ++--
 .../views/Plugin/views/pager/PagerPluginBase.php       |  4 ++--
 .../views/Plugin/views/query/QueryPluginBase.php       |  4 ++--
 lib/Drupal/views/Plugin/views/relationship/Broken.php  |  1 -
 .../views/relationship/RelationshipPluginBase.php      |  4 ++--
 lib/Drupal/views/Plugin/views/row/RowPluginBase.php    |  4 ++--
 lib/Drupal/views/Plugin/views/sort/SortPluginBase.php  |  4 ++--
 .../views/Plugin/views/style/StylePluginBase.php       |  4 ++--
 21 files changed, 47 insertions(+), 48 deletions(-)
 rename lib/Drupal/views/Plugin/views/{Handler.php => HandlerBase.php} (99%)
 rename lib/Drupal/views/Plugin/views/{Plugin.php => PluginBase.php} (97%)

diff --git a/lib/Drupal/views/Plugin/views/Handler.php b/lib/Drupal/views/Plugin/views/HandlerBase.php
similarity index 99%
rename from lib/Drupal/views/Plugin/views/Handler.php
rename to lib/Drupal/views/Plugin/views/HandlerBase.php
index c6f8044982a..9cf2130a1f3 100644
--- a/lib/Drupal/views/Plugin/views/Handler.php
+++ b/lib/Drupal/views/Plugin/views/HandlerBase.php
@@ -2,15 +2,15 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\Handler
+ * Definition of Drupal\views\Plugin\views\HandlerBase.
  */
 
 namespace Drupal\views\Plugin\views;
 
-use Drupal\views\Plugin\views\Plugin;
+use Drupal\views\Plugin\views\PluginBase;
 use Drupal\views\View;
 
-abstract class Handler extends Plugin {
+abstract class HandlerBase extends PluginBase {
 
   /**
    * Where the $query object will reside:
diff --git a/lib/Drupal/views/Plugin/views/Plugin.php b/lib/Drupal/views/Plugin/views/PluginBase.php
similarity index 97%
rename from lib/Drupal/views/Plugin/views/Plugin.php
rename to lib/Drupal/views/Plugin/views/PluginBase.php
index 227d29889b8..eb2b3955026 100644
--- a/lib/Drupal/views/Plugin/views/Plugin.php
+++ b/lib/Drupal/views/Plugin/views/PluginBase.php
@@ -2,14 +2,14 @@
 
 /**
  * @file
- * Definition of Drupal\views\Plugin\views\Plugin.
+ * Definition of Drupal\views\Plugin\views\PluginBase.
  */
 
 namespace Drupal\views\Plugin\views;
 
-use Drupal\Component\Plugin\PluginBase;
+use Drupal\Component\Plugin\PluginBase as ComponentPluginBase;
 
-abstract class Plugin extends PluginBase {
+abstract class PluginBase extends ComponentPluginBase {
 
   /**
    * Except for displays, options for the object will be held here.
@@ -74,8 +74,8 @@ abstract class Plugin extends PluginBase {
    * @return array
    *   Returns the options of this handler/plugin.
    *
-   * @see Drupal\views\Plugin\views\Plugin::export_option()
-   * @see Drupal\views\Plugin\views\Plugin::unpack_translatable()
+   * @see Drupal\views\Plugin\views\PluginBase::export_option()
+   * @see Drupal\views\Plugin\views\PluginBase::unpack_translatable()
    */
   function option_definition() { return array(); }
 
diff --git a/lib/Drupal/views/Plugin/views/access/AccessPluginBase.php b/lib/Drupal/views/Plugin/views/access/AccessPluginBase.php
index 4b9dfc8e072..1e1180b2e1c 100644
--- a/lib/Drupal/views/Plugin/views/access/AccessPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/access/AccessPluginBase.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Plugin\views\access;
 
-use Drupal\views\Plugin\views\Plugin;
+use Drupal\views\Plugin\views\PluginBase;
 
 /**
  * @defgroup views_access_plugins Views access plugins
@@ -20,7 +20,7 @@ use Drupal\views\Plugin\views\Plugin;
 /**
  * The base plugin to handle access control.
  */
-abstract class AccessPluginBase extends Plugin {
+abstract class AccessPluginBase extends PluginBase {
 
   /**
    * Initialize the plugin.
diff --git a/lib/Drupal/views/Plugin/views/area/AreaPluginBase.php b/lib/Drupal/views/Plugin/views/area/AreaPluginBase.php
index 7eb387641a6..ae50cbc5659 100644
--- a/lib/Drupal/views/Plugin/views/area/AreaPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/area/AreaPluginBase.php
@@ -7,8 +7,8 @@
 
 namespace Drupal\views\Plugin\views\area;
 
-use Drupal\views\Plugin\views\Plugin;
-use Drupal\views\Plugin\views\Handler;
+use Drupal\views\Plugin\views\PluginBase;
+use Drupal\views\Plugin\views\HandlerBase;
 
 /**
  * @defgroup views_area_handlers Views area handlers
@@ -22,10 +22,10 @@ use Drupal\views\Plugin\views\Handler;
  *
  * @ingroup views_area_handlers
  */
-abstract class AreaPluginBase extends Handler {
+abstract class AreaPluginBase extends HandlerBase {
 
   /**
-   * Overrides Handler::init().
+   * Overrides Drupal\views\Plugin\views\HandlerBase::init().
    *
    * Make sure that no result area handlers are set to be shown when the result
    * is empty.
diff --git a/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php b/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
index 8036e159cb8..36e542f78a7 100644
--- a/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/argument/ArgumentPluginBase.php
@@ -7,8 +7,8 @@
 
 namespace Drupal\views\Plugin\views\argument;
 
-use Drupal\views\Plugin\views\Plugin;
-use Drupal\views\Plugin\views\Handler;
+use Drupal\views\Plugin\views\PluginBase;
+use Drupal\views\Plugin\views\HandlerBase;
 
 /**
  * @defgroup views_argument_handlers Views argument handlers
@@ -40,7 +40,7 @@ use Drupal\views\Plugin\views\Handler;
  *
  * @ingroup views_argument_handlers
  */
-abstract class ArgumentPluginBase extends Handler {
+abstract class ArgumentPluginBase extends HandlerBase {
 
   var $validator = NULL;
   var $argument = NULL;
diff --git a/lib/Drupal/views/Plugin/views/argument_default/ArgumentDefaultPluginBase.php b/lib/Drupal/views/Plugin/views/argument_default/ArgumentDefaultPluginBase.php
index 476cc0e912e..1e329e7a52e 100644
--- a/lib/Drupal/views/Plugin/views/argument_default/ArgumentDefaultPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/argument_default/ArgumentDefaultPluginBase.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Plugin\views\argument_default;
 
-use Drupal\views\Plugin\views\Plugin;
+use Drupal\views\Plugin\views\PluginBase;
 
 /**
  * @defgroup views_argument_default_plugins Views argument default plugins
@@ -20,7 +20,7 @@ use Drupal\views\Plugin\views\Plugin;
 /**
  * The fixed argument default handler; also used as the base.
  */
-abstract class ArgumentDefaultPluginBase extends Plugin {
+abstract class ArgumentDefaultPluginBase extends PluginBase {
 
   /**
    * Return the default argument.
diff --git a/lib/Drupal/views/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php b/lib/Drupal/views/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php
index f89c57d55bd..99a29920360 100644
--- a/lib/Drupal/views/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/argument_validator/ArgumentValidatorPluginBase.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Plugin\views\argument_validator;
 
-use Drupal\views\Plugin\views\Plugin;
+use Drupal\views\Plugin\views\PluginBase;
 
 /**
  * @defgroup views_argument_validate_plugins Views argument validate plugins
@@ -20,7 +20,7 @@ use Drupal\views\Plugin\views\Plugin;
 /**
  * Base argument validator plugin to provide basic functionality.
  */
-abstract class ArgumentValidatorPluginBase extends Plugin {
+abstract class ArgumentValidatorPluginBase extends PluginBase {
 
   /**
    * Initialize this plugin with the view and the argument
diff --git a/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php b/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php
index ecf010e9c53..6334895e88f 100644
--- a/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php
+++ b/lib/Drupal/views/Plugin/views/cache/CachePluginBase.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Plugin\views\cache;
 
-use Drupal\views\Plugin\views\Plugin;
+use Drupal\views\Plugin\views\PluginBase;
 use Drupal\Core\Database\Query\Select;
 
 /**
@@ -21,7 +21,7 @@ use Drupal\Core\Database\Query\Select;
 /**
  * The base plugin to handle caching.
  */
-abstract class CachePluginBase extends Plugin {
+abstract class CachePluginBase extends PluginBase {
 
   /**
    * Contains all data that should be written/read from cache.
diff --git a/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php b/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
index 5fc77acc883..8c6483c45f4 100644
--- a/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/display/DisplayPluginBase.php
@@ -8,7 +8,7 @@
 namespace Drupal\views\Plugin\views\display;
 
 use Drupal\views\View;
-use Drupal\views\Plugin\views\Plugin;
+use Drupal\views\Plugin\views\PluginBase;
 use Drupal\views\Plugin\Type\ViewsPluginManager;
 
 /**
@@ -28,7 +28,7 @@ use Drupal\views\Plugin\Type\ViewsPluginManager;
  * The default display plugin handler. Display plugins handle options and
  * basic mechanisms for different output methods.
  */
-abstract class DisplayPluginBase extends Plugin {
+abstract class DisplayPluginBase extends PluginBase {
 
   /**
    * The top object of a view.
diff --git a/lib/Drupal/views/Plugin/views/display_extender/DisplayExtenderPluginBase.php b/lib/Drupal/views/Plugin/views/display_extender/DisplayExtenderPluginBase.php
index 107c91ea59f..9985f1e5137 100644
--- a/lib/Drupal/views/Plugin/views/display_extender/DisplayExtenderPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/display_extender/DisplayExtenderPluginBase.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Plugin\views\display_extender;
 
-use Drupal\views\Plugin\views\Plugin;
+use Drupal\views\Plugin\views\PluginBase;
 use Drupal\Core\Annotation\Translation;
 
 /**
@@ -15,7 +15,7 @@ use Drupal\Core\Annotation\Translation;
  *
  * @ingroup views_display_plugins
  */
-abstract class DisplayExtenderPluginBase extends Plugin {
+abstract class DisplayExtenderPluginBase extends PluginBase {
 
   function init(&$view, &$display) {
     $this->view = $view;
diff --git a/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php b/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
index 8ce60dbc925..3c0da96fe82 100644
--- a/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/exposed_form/ExposedFormPluginBase.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Plugin\views\exposed_form;
 
-use Drupal\views\Plugin\views\Plugin;
+use Drupal\views\Plugin\views\PluginBase;
 
 /**
  * @defgroup views_exposed_form_plugins Views exposed form plugins
@@ -22,7 +22,7 @@ use Drupal\views\Plugin\views\Plugin;
 /**
  * The base plugin to handle exposed filter forms.
  */
-abstract class ExposedFormPluginBase extends Plugin {
+abstract class ExposedFormPluginBase extends PluginBase {
 
   /**
    * Initialize the plugin.
diff --git a/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php b/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
index f9fedc6cb34..5fc0251229e 100644
--- a/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/field/FieldPluginBase.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Plugin\views\field;
 
-use Drupal\views\Plugin\views\Handler;
+use Drupal\views\Plugin\views\HandlerBase;
 use Drupal\Core\Annotation\Plugin;
 
 /**
@@ -47,7 +47,7 @@ define('VIEWS_HANDLER_RENDER_TEXT_PHASE_EMPTY', 2);
  *
  * @ingroup views_field_handlers
  */
-abstract class FieldPluginBase extends Handler {
+abstract class FieldPluginBase extends HandlerBase {
 
   var $field_alias = 'unknown';
   var $aliases = array();
diff --git a/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php b/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
index 3f8c93f364b..27acacabfd5 100644
--- a/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/filter/FilterPluginBase.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Plugin\views\filter;
 
-use Drupal\views\Plugin\views\Handler;
+use Drupal\views\Plugin\views\HandlerBase;
 use Drupal\Core\Annotation\Plugin;
 
 /**
@@ -36,7 +36,7 @@ use Drupal\Core\Annotation\Plugin;
  *
  * @ingroup views_filter_handlers
  */
-abstract class FilterPluginBase extends Handler {
+abstract class FilterPluginBase extends HandlerBase {
 
   /**
    * Contains the actual value of the field,either configured in the views ui
diff --git a/lib/Drupal/views/Plugin/views/localization/LocalizationPluginBase.php b/lib/Drupal/views/Plugin/views/localization/LocalizationPluginBase.php
index 8e38aaf92d9..81151d6e352 100644
--- a/lib/Drupal/views/Plugin/views/localization/LocalizationPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/localization/LocalizationPluginBase.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Plugin\views\localization;
 
-use Drupal\views\Plugin\views\Plugin;
+use Drupal\views\Plugin\views\PluginBase;
 
 /**
  * @defgroup views_localization_plugins Views localization plugins
@@ -20,7 +20,7 @@ use Drupal\views\Plugin\views\Plugin;
 /**
  * The base plugin to handle localization of Views strings.
  */
-abstract class LocalizationPluginBase extends Plugin {
+abstract class LocalizationPluginBase extends PluginBase {
 
   // Store for exported strings
   var $export_strings = array();
diff --git a/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php b/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php
index 605c9f798ac..e7cee8bd5aa 100644
--- a/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/pager/PagerPluginBase.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Plugin\views\pager;
 
-use Drupal\views\Plugin\views\Plugin;
+use Drupal\views\Plugin\views\PluginBase;
 
 /**
  * @defgroup views_pager_plugins Views pager plugins
@@ -20,7 +20,7 @@ use Drupal\views\Plugin\views\Plugin;
 /**
  * The base plugin to handle pager.
  */
-abstract class PagerPluginBase extends Plugin {
+abstract class PagerPluginBase extends PluginBase {
 
   var $current_page = NULL;
 
diff --git a/lib/Drupal/views/Plugin/views/query/QueryPluginBase.php b/lib/Drupal/views/Plugin/views/query/QueryPluginBase.php
index bf4d0b99456..026e7a99d97 100644
--- a/lib/Drupal/views/Plugin/views/query/QueryPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/query/QueryPluginBase.php
@@ -6,12 +6,12 @@
 
 namespace Drupal\views\Plugin\views\query;
 
-use Drupal\views\Plugin\views\Plugin;
+use Drupal\views\Plugin\views\PluginBase;
 
 /**
  * @todo.
  */
-abstract class QueryPluginBase extends Plugin implements QueryInterface {
+abstract class QueryPluginBase extends PluginBase implements QueryInterface {
 
   /**
    * A pager plugin that should be provided by the display.
diff --git a/lib/Drupal/views/Plugin/views/relationship/Broken.php b/lib/Drupal/views/Plugin/views/relationship/Broken.php
index a4c64d1d24f..d551db07352 100644
--- a/lib/Drupal/views/Plugin/views/relationship/Broken.php
+++ b/lib/Drupal/views/Plugin/views/relationship/Broken.php
@@ -7,7 +7,6 @@
 
 namespace Drupal\views\Plugin\views\relationship;
 
-use Drupal\views\Plugin\views\Handler;
 use Drupal\Core\Annotation\Plugin;
 
 /**
diff --git a/lib/Drupal/views/Plugin/views/relationship/RelationshipPluginBase.php b/lib/Drupal/views/Plugin/views/relationship/RelationshipPluginBase.php
index 6753be3dd68..7a268dba182 100644
--- a/lib/Drupal/views/Plugin/views/relationship/RelationshipPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/relationship/RelationshipPluginBase.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Plugin\views\relationship;
 
-use Drupal\views\Plugin\views\Handler;
+use Drupal\views\Plugin\views\HandlerBase;
 use Drupal\views\Join;
 use Drupal\Core\Annotation\Plugin;
 
@@ -41,7 +41,7 @@ use Drupal\Core\Annotation\Plugin;
  *
  * @ingroup views_relationship_handlers
  */
-abstract class RelationshipPluginBase extends Handler {
+abstract class RelationshipPluginBase extends HandlerBase {
 
   /**
    * Init handler to let relationships live on tables other than
diff --git a/lib/Drupal/views/Plugin/views/row/RowPluginBase.php b/lib/Drupal/views/Plugin/views/row/RowPluginBase.php
index d6e303f72c3..f51d232d079 100644
--- a/lib/Drupal/views/Plugin/views/row/RowPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/row/RowPluginBase.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Plugin\views\row;
 
-use Drupal\views\Plugin\views\Plugin;
+use Drupal\views\Plugin\views\PluginBase;
 
 /**
  * @defgroup views_row_plugins Views row plugins
@@ -24,7 +24,7 @@ use Drupal\views\Plugin\views\Plugin;
  * Default plugin to view a single row of a table. This is really just a wrapper around
  * a theme function.
  */
-abstract class RowPluginBase extends Plugin {
+abstract class RowPluginBase extends PluginBase {
 
   /**
    * Initialize the row plugin.
diff --git a/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php b/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php
index f3988618cc7..d73ede63faa 100644
--- a/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php
+++ b/lib/Drupal/views/Plugin/views/sort/SortPluginBase.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Plugin\views\sort;
 
-use Drupal\views\Plugin\views\Handler;
+use Drupal\views\Plugin\views\HandlerBase;
 use Drupal\Core\Annotation\Plugin;
 
 /**
@@ -21,7 +21,7 @@ use Drupal\Core\Annotation\Plugin;
  *
  * @ingroup views_sort_handlers
  */
-abstract class SortPluginBase extends Handler {
+abstract class SortPluginBase extends HandlerBase {
 
   /**
    * Determine if a sort can be exposed.
diff --git a/lib/Drupal/views/Plugin/views/style/StylePluginBase.php b/lib/Drupal/views/Plugin/views/style/StylePluginBase.php
index 3d7b9d281d0..7735f298a80 100644
--- a/lib/Drupal/views/Plugin/views/style/StylePluginBase.php
+++ b/lib/Drupal/views/Plugin/views/style/StylePluginBase.php
@@ -7,7 +7,7 @@
 
 namespace Drupal\views\Plugin\views\style;
 
-use Drupal\views\Plugin\views\Plugin as ViewsPlugin;
+use Drupal\views\Plugin\views\PluginBase;
 use Drupal\Core\Annotation\Plugin;
 use Drupal\Core\Annotation\Translation;
 
@@ -28,7 +28,7 @@ use Drupal\Core\Annotation\Translation;
 /**
  * Base class to define a style plugin handler.
  */
-abstract class StylePluginBase extends ViewsPlugin {
+abstract class StylePluginBase extends PluginBase {
 
   /**
    * Store all available tokens row rows.