Fix TagAnnotation return type

GReD-Clermont · Dec 2, 2024 · 02f735c · 02f735c
1 parent f47c3bb
commit 02f735c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/fr/igred/omero/annotations/AnnotationsBrowser.java b/src/main/java/fr/igred/omero/annotations/AnnotationsBrowser.java
@@ -56,7 +56,7 @@ default List<TagAnnotation> getTags(String name)
      * @throws ServiceException       Cannot connect to OMERO.
      * @throws NoSuchElementException No element with this ID.
      */
-    TagAnnotationWrapper getTag(Long id)
+    TagAnnotation getTag(Long id)
     throws AccessException, ServiceException;
 
 

diff --git a/src/main/java/fr/igred/omero/client/BrowserWrapper.java b/src/main/java/fr/igred/omero/client/BrowserWrapper.java
@@ -21,6 +21,7 @@
 import fr.igred.omero.RemoteObject;
 import fr.igred.omero.annotations.MapAnnotation;
 import fr.igred.omero.annotations.MapAnnotationWrapper;
+import fr.igred.omero.annotations.TagAnnotation;
 import fr.igred.omero.annotations.TagAnnotationWrapper;
 import fr.igred.omero.containers.Dataset;
 import fr.igred.omero.containers.DatasetWrapper;
@@ -50,7 +51,6 @@
 import omero.gateway.model.TagAnnotationData;
 import omero.gateway.model.WellData;
 import omero.model.IObject;
-import omero.model.TagAnnotation;
 
 import java.util.Arrays;
 import java.util.Collection;
@@ -558,14 +558,14 @@ public List<Folder> getFolders(Long... ids)
      * @throws ServiceException Cannot connect to OMERO.
      */
     @Override
-    public List<fr.igred.omero.annotations.TagAnnotation> getTags()
+    public List<TagAnnotation> getTags()
     throws AccessException, ServiceException {
-        String klass = TagAnnotation.class.getSimpleName();
+        String klass = omero.model.TagAnnotation.class.getSimpleName();
         List<IObject> os = call(getQueryService(),
                                 qs -> qs.findAll(klass, null),
                                 "Cannot get tags");
         return os.stream()
-                 .map(TagAnnotation.class::cast)
+                 .map(omero.model.TagAnnotation.class::cast)
                  .map(TagAnnotationData::new)
                  .map(TagAnnotationWrapper::new)
                  .sorted(Comparator.comparing(RemoteObject::getId))
@@ -585,7 +585,7 @@ public List<fr.igred.omero.annotations.TagAnnotation> getTags()
      * @throws NoSuchElementException No element with this ID.
      */
     @Override
-    public TagAnnotationWrapper getTag(Long id)
+    public TagAnnotation getTag(Long id)
     throws AccessException, ServiceException {
         IObject o = call(getQueryService(),
                          qs -> qs.find(TagAnnotation.class.getSimpleName(), id),
@@ -595,7 +595,7 @@ public TagAnnotationWrapper getTag(Long id)
             String msg = format("Tag %d doesn't exist in this context", id);
             throw new NoSuchElementException(msg);
         } else {
-            tag = new TagAnnotationData((TagAnnotation) requireNonNull(o));
+            tag = new TagAnnotationData((omero.model.TagAnnotation) requireNonNull(o));
         }
         return new TagAnnotationWrapper(tag);
     }