From abafcf2af578ed898bb228ec55e8b7312447b036 Mon Sep 17 00:00:00 2001
From: Claudiu Cristea <clau.cristea@gmail.com>
Date: Wed, 9 Oct 2013 13:51:57 +0300
Subject: [PATCH] Issue #2108077 by claudiu.cristea: ImageToolkit annotation
 object left under system module.

---
 .../Annotation => lib/Drupal/Core/ImageToolkit}/ImageToolkit.php      | 4 ++--
 core/lib/Drupal/Core/ImageToolkit/ImageToolkitManager.php             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename core/{modules/system/lib/Drupal/system/Annotation => lib/Drupal/Core/ImageToolkit}/ImageToolkit.php (87%)

diff --git a/core/modules/system/lib/Drupal/system/Annotation/ImageToolkit.php b/core/lib/Drupal/Core/ImageToolkit/ImageToolkit.php
similarity index 87%
rename from core/modules/system/lib/Drupal/system/Annotation/ImageToolkit.php
rename to core/lib/Drupal/Core/ImageToolkit/ImageToolkit.php
index 0a75e97..4544dc3 100644
--- a/core/modules/system/lib/Drupal/system/Annotation/ImageToolkit.php
+++ b/core/lib/Drupal/Core/ImageToolkit/ImageToolkit.php
@@ -2,10 +2,10 @@
 
 /**
  * @file
- * Contains \Drupal\system\Annotation\ImageToolkit.
+ * Contains \Drupal\Core\ImageToolkit\ImageToolkit.
  */
 
-namespace Drupal\system\Annotation;
+namespace Drupal\Core\ImageToolkit;
 
 use Drupal\Component\Annotation\Plugin;
 
diff --git a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitManager.php b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitManager.php
index 9dd46d4..bd05e9c 100644
--- a/core/lib/Drupal/Core/ImageToolkit/ImageToolkitManager.php
+++ b/core/lib/Drupal/Core/ImageToolkit/ImageToolkitManager.php
@@ -38,7 +38,7 @@ class ImageToolkitManager extends DefaultPluginManager {
    *   The config factory.
    */
   public function __construct(\Traversable $namespaces, CacheBackendInterface $cache_backend, LanguageManager $language_manager, ConfigFactory $config_factory) {
-    parent::__construct('Plugin/ImageToolkit', $namespaces, 'Drupal\system\Annotation\ImageToolkit');
+    parent::__construct('Plugin/ImageToolkit', $namespaces, 'Drupal\Core\ImageToolkit\ImageToolkit');
 
     $this->setCacheBackend($cache_backend, $language_manager, 'image_toolkit');
     $this->configFactory = $config_factory;
-- 
1.8.3.1

