From 427ec64dfcc763042434b276338e0295442f2d97 Mon Sep 17 00:00:00 2001
From: Tim Plunkett <git@plnktt.com>
Date: Sun, 29 Jul 2012 12:41:48 -0500
Subject: [PATCH] Switch from AnnotatedClassDiscovery to ViewsDiscovery.

---
 .../views/Plugin/Type/ArgumentDefaultPluginManager.php       | 5 ++---
 .../views/Plugin/Type/ArgumentValidatorPluginManager.php     | 3 +--
 lib/Drupal/views/Plugin/Type/CachePluginManager.php          | 3 +--
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/Drupal/views/Plugin/Type/ArgumentDefaultPluginManager.php b/lib/Drupal/views/Plugin/Type/ArgumentDefaultPluginManager.php
index f8266f4e3d9d..3b27898479ee 100644
--- a/lib/Drupal/views/Plugin/Type/ArgumentDefaultPluginManager.php
+++ b/lib/Drupal/views/Plugin/Type/ArgumentDefaultPluginManager.php
@@ -9,12 +9,11 @@
 
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
-use Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery;
-
+use Drupal\views\Plugin\Discovery\ViewsDiscovery;
 
 class ArgumentDefaultPluginManager extends PluginManagerBase {
   public function __construct() {
-    $this->discovery = new AnnotatedClassDiscovery('views', 'argument_default');
+    $this->discovery = new ViewsDiscovery('views', 'argument_default');
     $this->factory = new DefaultFactory($this->discovery);
   }
 }
diff --git a/lib/Drupal/views/Plugin/Type/ArgumentValidatorPluginManager.php b/lib/Drupal/views/Plugin/Type/ArgumentValidatorPluginManager.php
index 0ac99341f57b..a2c473f9223e 100644
--- a/lib/Drupal/views/Plugin/Type/ArgumentValidatorPluginManager.php
+++ b/lib/Drupal/views/Plugin/Type/ArgumentValidatorPluginManager.php
@@ -10,11 +10,10 @@
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
 use Drupal\views\Plugin\Discovery\ViewsDiscovery;
-use Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery;
 
 class ArgumentValidatorPluginManager extends PluginManagerBase {
   public function __construct() {
-    $this->discovery = new AnnotatedClassDiscovery('views', 'argument_validator');
+    $this->discovery = new ViewsDiscovery('views', 'argument_validator');
     $this->factory = new DefaultFactory($this->discovery);
   }
 }
diff --git a/lib/Drupal/views/Plugin/Type/CachePluginManager.php b/lib/Drupal/views/Plugin/Type/CachePluginManager.php
index 11fdc29df03b..d48e0b0ca0b5 100644
--- a/lib/Drupal/views/Plugin/Type/CachePluginManager.php
+++ b/lib/Drupal/views/Plugin/Type/CachePluginManager.php
@@ -10,11 +10,10 @@
 use Drupal\Component\Plugin\PluginManagerBase;
 use Drupal\Component\Plugin\Factory\DefaultFactory;
 use Drupal\views\Plugin\Discovery\ViewsDiscovery;
-use Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery;
 
 class CachePluginManager extends PluginManagerBase {
   public function __construct() {
-    $this->discovery = new AnnotatedClassDiscovery('views', 'cache');
+    $this->discovery = new ViewsDiscovery('views', 'cache');
     $this->factory = new DefaultFactory($this->discovery);
   }
 }
-- 
GitLab