move public files api to a clearer namespace

lib/public/files/node/file.php → lib/public/files/file.php

@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-namespace OCP\Files\Node;
+namespace OCP\Files;
 
 use OC\Files\NotPermittedException;
 

lib/public/files/node/folder.php → lib/public/files/folder.php

@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-namespace OCP\Files\Node;
+namespace OCP\Files;
 
 use OC\Files\Cache\Cache;
 use OC\Files\Cache\Scanner;
@@ -31,7 +31,7 @@ interface Folder extends Node {
 	/**
 	 * check if a node is a (grand-)child of the folder
 	 *
-	 * @param \OCP\Files\Node\Node $node
+	 * @param \OCP\Files\Node $node
 	 * @return bool
 	 */
 	public function isSubNode($node);
@@ -40,7 +40,7 @@ interface Folder extends Node {
 	 * get the content of this directory
 	 *
 	 * @throws \OC\Files\NotFoundException
-	 * @return \OCP\Files\Node\Node[]
+	 * @return \OCP\Files\Node[]
 	 */
 	public function getDirectoryListing();
 
@@ -48,7 +48,7 @@ interface Folder extends Node {
 	 * Get the node at $path
 	 *
 	 * @param string $path
-	 * @return \OCP\Files\Node\Node
+	 * @return \OCP\Files\Node
 	 * @throws \OC\Files\NotFoundException
 	 */
 	public function get($path);
@@ -61,14 +61,14 @@ interface Folder extends Node {
 
 	/**
 	 * @param string $path
-	 * @return \OCP\Files\Node\Folder
+	 * @return \OCP\Files\Folder
 	 * @throws NotPermittedException
 	 */
 	public function newFolder($path);
 
 	/**
 	 * @param string $path
-	 * @return \OCP\Files\Node\File
+	 * @return \OCP\Files\File
 	 * @throws NotPermittedException
 	 */
 	public function newFile($path);
@@ -77,7 +77,7 @@ interface Folder extends Node {
 	 * search for files with the name matching $query
 	 *
 	 * @param string $query
-	 * @return \OCP\Files\Node\Node[]
+	 * @return \OCP\Files\Node[]
 	 */
 	public function search($query);
 
@@ -85,13 +85,13 @@ interface Folder extends Node {
 	 * search for files by mimetype
 	 *
 	 * @param string $mimetype
-	 * @return \OCP\Files\Node\Node[]
+	 * @return \OCP\Files\Node[]
 	 */
 	public function searchByMime($mimetype);
 
 	/**
 	 * @param $id
-	 * @return \OCP\Files\Node\Node[]
+	 * @return \OCP\Files\Node[]
 	 */
 	public function getById($id);
 

lib/public/files/node/node.php → lib/public/files/node.php

@@ -6,13 +6,13 @@
  * See the COPYING-README file.
  */
 
-namespace OCP\Files\Node;
+namespace OCP\Files;
 
 interface Node {
 	/**
 	 * @param string $targetPath
 	 * @throws \OC\Files\NotPermittedException
-	 * @return \OCP\Files\Node\Node
+	 * @return \OCP\Files\Node
 	 */
 	public function move($targetPath);
 
@@ -20,7 +20,7 @@ interface Node {
 
 	/**
 	 * @param string $targetPath
-	 * @return \OCP\Files\Node\Node
+	 * @return \OCP\Files\Node
 	 */
 	public function copy($targetPath);