Commit 02ee6ae5 authored by dawehner's avatar dawehner Committed by tim.plunkett

fix some merge conflicts

parent 1d248ad7
......@@ -9,7 +9,7 @@
use Drupal\Component\Plugin\PluginManagerBase;
use Drupal\Component\Plugin\Factory\DefaultFactory;
use Drupal\views\Plugins\views\Discovery\ViewsDiscovery;
use Drupal\views\Plugins\Discovery\ViewsDiscovery;
class DisplayPluginManager extends PluginManagerBase {
public function __construct() {
......
......@@ -9,7 +9,7 @@
use Drupal\Component\Plugin\PluginManagerBase;
use Drupal\Component\Plugin\Factory\DefaultFactory;
use Drupal\views\Plugins\views\Discovery\ViewsDiscovery;
use Drupal\views\Plugins\Discovery\ViewsDiscovery;
class ExposedFormPluginManager extends PluginManagerBase {
public function __construct() {
......
......@@ -9,11 +9,22 @@
use Drupal\Component\Plugin\PluginManagerBase;
use Drupal\Component\Plugin\Factory\DefaultFactory;
use Drupal\views\Plugins\views\Discovery\ViewsDiscovery;
use Drupal\Core\Plugin\Discovery\AnnotatedClassDiscovery;
class HandlerPluginManager extends PluginManagerBase {
public function __construct() {
$this->discovery = new ViewsDiscovery('views_plugins', 'handler');
$this->factory = new DefaultFactory($this);
/**
* The handler type of this plugin manager, for example filter or field.
*
* @var string
*/
protected $type;
public function __construct($type) {
$this->type = $type;
if (in_array($this->type, array('sort', 'filter', 'relationship', 'field', 'area', 'argument'))) {
$this->discovery = new AnnotatedClassDiscovery('views', $this->type);
}
$this->factory = new DefaultFactory($this->discovery);
}
}
......@@ -9,7 +9,7 @@
use Drupal\Component\Plugin\PluginManagerBase;
use Drupal\Component\Plugin\Factory\DefaultFactory;
use Drupal\views\Plugins\views\Discovery\ViewsDiscovery;
use Drupal\views\Plugins\Discovery\ViewsDiscovery;
class LocalizationPluginManager extends PluginManagerBase {
public function __construct() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment