From 6f84582689d36b145eff10a797a2df8cbcefd5b6 Mon Sep 17 00:00:00 2001 From: Pierre Pouchin Date: Wed, 27 Nov 2024 18:40:39 +0100 Subject: [PATCH] Rename loadFolders() method to getFolders() --- .../java/fr/igred/omero/annotations/AnnotationWrapper.java | 2 +- src/main/java/fr/igred/omero/client/Browser.java | 4 ++-- src/main/java/fr/igred/omero/client/BrowserWrapper.java | 2 +- src/main/java/fr/igred/omero/core/ImageWrapper.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/fr/igred/omero/annotations/AnnotationWrapper.java b/src/main/java/fr/igred/omero/annotations/AnnotationWrapper.java index bb401269..00d440da 100644 --- a/src/main/java/fr/igred/omero/annotations/AnnotationWrapper.java +++ b/src/main/java/fr/igred/omero/annotations/AnnotationWrapper.java @@ -307,7 +307,7 @@ public List getFolders(Browser browser) .map(RLong::getValue) .sorted() .toArray(Long[]::new); - return browser.loadFolders(ids); + return browser.getFolders(ids); } diff --git a/src/main/java/fr/igred/omero/client/Browser.java b/src/main/java/fr/igred/omero/client/Browser.java index a1a8defb..10e9f1b5 100644 --- a/src/main/java/fr/igred/omero/client/Browser.java +++ b/src/main/java/fr/igred/omero/client/Browser.java @@ -818,7 +818,7 @@ default List getWells(ExperimenterWrapper experimenter) */ default FolderWrapper getFolder(long id) throws ServiceException, AccessException, ExecutionException { - List folders = loadFolders(id); + List folders = getFolders(id); if (folders.isEmpty()) { String msg = format("Folder %d doesn't exist in this context", id); throw new NoSuchElementException(msg); @@ -866,7 +866,7 @@ List getFolders(ExperimenterWrapper experimenter) * @throws AccessException Cannot access data. * @throws ExecutionException A Facility can't be retrieved or instantiated. */ - List loadFolders(Long... ids) + List getFolders(Long... ids) throws ServiceException, AccessException, ExecutionException; diff --git a/src/main/java/fr/igred/omero/client/BrowserWrapper.java b/src/main/java/fr/igred/omero/client/BrowserWrapper.java index 206e4051..338c020c 100644 --- a/src/main/java/fr/igred/omero/client/BrowserWrapper.java +++ b/src/main/java/fr/igred/omero/client/BrowserWrapper.java @@ -530,7 +530,7 @@ public List getFolders(ExperimenterWrapper experimenter) * @throws ExecutionException A Facility can't be retrieved or instantiated. */ @Override - public List loadFolders(Long... ids) + public List getFolders(Long... ids) throws ServiceException, AccessException, ExecutionException { String error = "Cannot get folders with IDs: " + Arrays.toString(ids); Collection folders = call(getBrowseFacility(), diff --git a/src/main/java/fr/igred/omero/core/ImageWrapper.java b/src/main/java/fr/igred/omero/core/ImageWrapper.java index 59e998f3..425c0679 100644 --- a/src/main/java/fr/igred/omero/core/ImageWrapper.java +++ b/src/main/java/fr/igred/omero/core/ImageWrapper.java @@ -621,7 +621,7 @@ public List getFolders(Browser browser) .stream() .map(o -> o.getId().getValue()) .toArray(Long[]::new); - return browser.loadFolders(ids); + return browser.getFolders(ids); }