From 9d688e655d75cf25c9601067c4cff09749be4d8d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 10 Mar 2016 13:38:48 +0100
Subject: [PATCH] move failedstorage to core

---
 apps/files_external/lib/config/configadapter.php              | 2 +-
 apps/files_sharing/lib/sharedstorage.php                      | 2 +-
 .../lib => lib/private/files/cache}/failedcache.php           | 4 ++--
 .../lib => lib/private/files/storage}/failedstorage.php       | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename {apps/files_external/lib => lib/private/files/cache}/failedcache.php (96%)
 rename {apps/files_external/lib => lib/private/files/storage}/failedstorage.php (99%)

diff --git a/apps/files_external/lib/config/configadapter.php b/apps/files_external/lib/config/configadapter.php
index d85e0f4563..a19a111d3d 100644
--- a/apps/files_external/lib/config/configadapter.php
+++ b/apps/files_external/lib/config/configadapter.php
@@ -34,7 +34,7 @@ use OCP\IUser;
 use OCA\Files_external\Service\UserStoragesService;
 use OCA\Files_External\Service\UserGlobalStoragesService;
 use OCA\Files_External\Lib\StorageConfig;
-use OCA\Files_External\Lib\FailedStorage;
+use OC\Files\Storage\FailedStorage;
 use OCP\Files\StorageNotAvailableException;
 
 /**
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 6257320ca4..8f4888d20e 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -31,7 +31,7 @@
 namespace OC\Files\Storage;
 
 use OC\Files\Filesystem;
-use OCA\Files_External\Lib\FailedCache;
+use OC\Files\Cache\FailedCache;
 use OCA\Files_Sharing\ISharedStorage;
 use OCP\Constants;
 use OCP\Files\Cache\ICacheEntry;
diff --git a/apps/files_external/lib/failedcache.php b/lib/private/files/cache/failedcache.php
similarity index 96%
rename from apps/files_external/lib/failedcache.php
rename to lib/private/files/cache/failedcache.php
index 2fddb3eca8..0386ba3ca3 100644
--- a/apps/files_external/lib/failedcache.php
+++ b/lib/private/files/cache/failedcache.php
@@ -19,9 +19,8 @@
  *
  */
 
-namespace OCA\Files_External\Lib;
+namespace OC\Files\Cache;
 
-use OC\Files\Cache\CacheEntry;
 use OCP\Constants;
 use OCP\Files\Cache\ICache;
 
@@ -29,6 +28,7 @@ use OCP\Files\Cache\ICache;
  * Storage placeholder to represent a missing precondition, storage unavailable
  */
 class FailedCache implements ICache {
+	/** @var bool whether to show the failed storage in the ui */
 	private $visible;
 
 	/**
diff --git a/apps/files_external/lib/failedstorage.php b/lib/private/files/storage/failedstorage.php
similarity index 99%
rename from apps/files_external/lib/failedstorage.php
rename to lib/private/files/storage/failedstorage.php
index 20cf43d74b..df7f76856d 100644
--- a/apps/files_external/lib/failedstorage.php
+++ b/lib/private/files/storage/failedstorage.php
@@ -20,10 +20,10 @@
  *
  */
 
-namespace OCA\Files_External\Lib;
+namespace OC\Files\Storage;
 
+use OC\Files\Cache\FailedCache;
 use \OCP\Lock\ILockingProvider;
-use \OC\Files\Storage\Common;
 use \OCP\Files\StorageNotAvailableException;
 
 /**