Collections getFileContent method renamed to getFileListing.

Arvados-DCO-1.1-Signed-off-by: Fuad Muhic <fmuhic@capeannenterprises.com>

diff --git a/sdk/R/R/ArvadosFile.R b/sdk/R/R/ArvadosFile.R
index c5fa1832565cb7ef3564a2d4f256df89f0bcffb0..3be24c464f918b13b371256089aa98fa4d046671 100644 (file)
--- a/sdk/R/R/ArvadosFile.R
+++ b/sdk/R/R/ArvadosFile.R
@@ -18,7 +18,7 @@ ArvadosFile <- R6::R6Class(
 
         getName = function() private$name,
 
-        getFileList = function(fullpath = TRUE)
+        getFileListing = function(fullpath = TRUE)
         {
             self$getName()
         },

diff --git a/sdk/R/R/Collection.R b/sdk/R/R/Collection.R
index ca26082e076af04615ef304690634c78bf3e8f60..fb9af1117dc481afd6f180f0dd490359617f8af9 100644 (file)
--- a/sdk/R/R/Collection.R
+++ b/sdk/R/R/Collection.R
@@ -105,7 +105,7 @@ Collection <- R6::R6Class(
             elementToMove$move(newLocation)
         },
 
-        getFileContent = function() private$getCollectionContent(),
+        getFileListing = function() private$getCollectionContent(),
 
         get = function(relativePath)
         {

diff --git a/sdk/R/R/Subcollection.R b/sdk/R/R/Subcollection.R
index 62c62d457e519434a7aa32543a9267ae6172ad59..296cb92e5ec255220cc563354f29b674dabe0df7 100644 (file)
--- a/sdk/R/R/Subcollection.R
+++ b/sdk/R/R/Subcollection.R
@@ -32,7 +32,7 @@ Subcollection <- R6::R6Class(
                 if(!is.null(private$collection))
                 {       
                     contentPath <- paste0(self$getRelativePath(),
-                                          "/", content$getFileList())
+                                          "/", content$getFileListing())
 
                     private$collection$.__enclos_env__$private$createFilesOnREST(contentPath)
                     content$.__enclos_env__$private$addToCollection(private$collection)
@@ -59,7 +59,7 @@ Subcollection <- R6::R6Class(
                 stop("Unable to delete root folder.")
 
             collectionList <- paste0(self$getRelativePath(),
-                                     "/", self$getFileList(fullpath = FALSE))
+                                     "/", self$getFileListing(fullpath = FALSE))
             sapply(collectionList, function(file)
             {
                 private$collection$.__enclos_env__$private$deleteFromREST(file)
@@ -71,14 +71,14 @@ Subcollection <- R6::R6Class(
             "Content removed successfully."
         },
 
-        getFileList = function(fullpath = TRUE)
+        getFileListing = function(fullpath = TRUE)
         {
             content <- NULL
 
             if(fullpath)
             {
                 for(child in private$children)
-                    content <- c(content, child$getFileList())
+                    content <- c(content, child$getFileListing())
 
                 if(private$name != "")
                     content <- unlist(paste0(private$name, "/", content))