Issue #2169505 by Wim Leers: Clean up Edit's Plugin class names and file locations.

core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/FormEditor.php

@@ -8,7 +8,7 @@
 namespace Drupal\edit\Plugin\InPlaceEditor;
 
 use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\edit\EditorBase;
+use Drupal\edit\Plugin\InPlaceEditorBase;
 
 /**
  * Defines the form in-place editor.
@@ -17,7 +17,7 @@
  *   id = "form"
  * )
  */
-class FormEditor extends EditorBase {
+class FormEditor extends InPlaceEditorBase {
 
   /**
    * {@inheritdoc}

core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditor/PlainTextEditor.php

@@ -8,7 +8,7 @@
 namespace Drupal\edit\Plugin\InPlaceEditor;
 
 use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\edit\EditorBase;
+use Drupal\edit\Plugin\InPlaceEditorBase;
 
 /**
  * Defines the plain text in-place editor.
@@ -17,7 +17,7 @@
  *   id = "plain_text"
  * )
  */
-class PlainTextEditor extends EditorBase {
+class PlainTextEditor extends InPlaceEditorBase {
 
   /**
    * {@inheritdoc}

core/modules/edit/lib/Drupal/edit/EditorBase.php → core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditorBase.php

@@ -2,19 +2,18 @@
 
 /**
  * @file
- * Contains \Drupal\edit\EditorBase.
+ * Contains \Drupal\edit\Plugin\InPlaceEditorBase.
  */
 
-namespace Drupal\edit;
+namespace Drupal\edit\Plugin;
 
 use Drupal\Core\Plugin\PluginBase;
-use Drupal\edit\EditPluginInterface;
 use Drupal\Core\Field\FieldItemListInterface;
 
 /**
- * Defines a base editor implementation.
+ * Defines a base in-place editor implementation.
  */
-abstract class EditorBase extends PluginBase implements EditPluginInterface {
+abstract class InPlaceEditorBase extends PluginBase implements InPlaceEditorInterface {
 
   /**
    * {@inheritdoc}

core/modules/edit/lib/Drupal/edit/EditPluginInterface.php → core/modules/edit/lib/Drupal/edit/Plugin/InPlaceEditorInterface.php

@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\edit\EditPluginInterface.
+ * Contains \Drupal\edit\Plugin\InPlaceEditorInterface.
  */
 
-namespace Drupal\edit;
+namespace Drupal\edit\Plugin;
 
 use Drupal\Component\Plugin\PluginInspectionInterface;
 use Drupal\Core\Field\FieldItemListInterface;
@@ -13,7 +13,7 @@
 /**
  * Defines an interface for in-place editors plugins.
  */
-interface EditPluginInterface extends PluginInspectionInterface {
+interface InPlaceEditorInterface extends PluginInspectionInterface {
 
   /**
    * Checks whether this in-place editor is compatible with a given field.

core/modules/edit/tests/modules/lib/Drupal/edit_test/Plugin/InPlaceEditor/WysiwygEditor.php

@@ -8,7 +8,7 @@
 namespace Drupal\edit_test\Plugin\InPlaceEditor;
 
 use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\edit\EditorBase;
+use Drupal\edit\Plugin\InPlaceEditorBase;
 
 /**
  * Defines the 'wysiwyg' in-place editor.
@@ -18,7 +18,7 @@
  *   alternativeTo = {"plain_text"}
  * )
  */
-class WysiwygEditor extends EditorBase {
+class WysiwygEditor extends InPlaceEditorBase {
 
   /**
    * {@inheritdoc}
@@ -44,7 +44,7 @@ public function isCompatible(FieldItemListInterface $items) {
   /**
    * {@inheritdoc}
    */
-  function getMetadata(FieldItemListInterface $items) {
+  public function getMetadata(FieldItemListInterface $items) {
     $metadata['format'] = $items[0]->format;
     return $metadata;
   }

core/modules/editor/lib/Drupal/editor/Plugin/EditorPluginInterface.php

@@ -2,7 +2,7 @@
 
 /**
  * @file
- * Contains \Drupal\editor\Plugin\EditPluginInterface.
+ * Contains \Drupal\editor\Plugin\EditorPluginInterface.
  */
 
 namespace Drupal\editor\Plugin;

core/modules/editor/lib/Drupal/editor/Plugin/InPlaceEditor/Editor.php

@@ -9,7 +9,7 @@
 
 use Drupal\Component\Plugin\PluginBase;
 use Drupal\Core\Field\FieldItemListInterface;
-use Drupal\edit\EditPluginInterface;
+use Drupal\edit\Plugin\InPlaceEditorInterface;
 
 /**
  * Defines the formatted text in-place editor.
@@ -19,7 +19,7 @@
  *   alternativeTo = {"plain_text"}
  * )
  */
-class Editor extends PluginBase implements EditPluginInterface {
+class Editor extends PluginBase implements InPlaceEditorInterface {
 
   /**
    * {@inheritdoc}