From df512e12d5c1391ae4a73a2ab151422be6b18d75 Mon Sep 17 00:00:00 2001 From: Pierre Pouchin Date: Sun, 22 Jan 2023 17:14:03 +0100 Subject: [PATCH 1/5] Update pom.xml, README.md and year in header license --- README.md | 4 ++-- pom.xml | 11 +++++++---- src/main/java/fr/igred/omero/Client.java | 2 +- src/main/java/fr/igred/omero/GatewayWrapper.java | 2 +- .../java/fr/igred/omero/GenericObjectWrapper.java | 2 +- .../omero/annotations/FileAnnotationWrapper.java | 2 +- .../omero/annotations/GenericAnnotationWrapper.java | 2 +- .../igred/omero/annotations/MapAnnotationWrapper.java | 2 +- .../java/fr/igred/omero/annotations/TableWrapper.java | 2 +- .../igred/omero/annotations/TagAnnotationWrapper.java | 2 +- .../java/fr/igred/omero/annotations/package-info.java | 2 +- .../fr/igred/omero/exception/AccessException.java | 2 +- .../fr/igred/omero/exception/ExceptionHandler.java | 2 +- .../fr/igred/omero/exception/OMEROServerError.java | 2 +- .../fr/igred/omero/exception/ServiceException.java | 2 +- .../java/fr/igred/omero/exception/package-info.java | 2 +- .../java/fr/igred/omero/meta/ExperimenterWrapper.java | 2 +- src/main/java/fr/igred/omero/meta/GroupWrapper.java | 2 +- .../java/fr/igred/omero/meta/PlaneInfoWrapper.java | 2 +- src/main/java/fr/igred/omero/meta/package-info.java | 2 +- src/main/java/fr/igred/omero/package-info.java | 2 +- .../fr/igred/omero/repository/ChannelWrapper.java | 2 +- .../fr/igred/omero/repository/DatasetWrapper.java | 2 +- .../java/fr/igred/omero/repository/FolderWrapper.java | 2 +- .../repository/GenericRepositoryObjectWrapper.java | 2 +- .../java/fr/igred/omero/repository/ImageWrapper.java | 2 +- .../java/fr/igred/omero/repository/PixelsWrapper.java | 2 +- .../omero/repository/PlateAcquisitionWrapper.java | 2 +- .../java/fr/igred/omero/repository/PlateWrapper.java | 2 +- .../fr/igred/omero/repository/ProjectWrapper.java | 2 +- .../java/fr/igred/omero/repository/ScreenWrapper.java | 2 +- .../fr/igred/omero/repository/WellSampleWrapper.java | 2 +- .../java/fr/igred/omero/repository/WellWrapper.java | 2 +- .../java/fr/igred/omero/repository/package-info.java | 2 +- src/main/java/fr/igred/omero/roi/EllipseWrapper.java | 2 +- .../java/fr/igred/omero/roi/GenericShapeWrapper.java | 2 +- src/main/java/fr/igred/omero/roi/LineWrapper.java | 2 +- src/main/java/fr/igred/omero/roi/MaskWrapper.java | 2 +- src/main/java/fr/igred/omero/roi/PointWrapper.java | 2 +- src/main/java/fr/igred/omero/roi/PolygonWrapper.java | 2 +- src/main/java/fr/igred/omero/roi/PolylineWrapper.java | 2 +- src/main/java/fr/igred/omero/roi/ROIWrapper.java | 2 +- .../java/fr/igred/omero/roi/RectangleWrapper.java | 2 +- src/main/java/fr/igred/omero/roi/ShapeList.java | 2 +- src/main/java/fr/igred/omero/roi/TextWrapper.java | 2 +- src/main/java/fr/igred/omero/roi/package-info.java | 2 +- src/main/java/fr/igred/omero/util/LibraryChecker.java | 2 +- src/main/java/fr/igred/omero/util/package-info.java | 2 +- src/test/java/fr/igred/omero/AccessExceptionTest.java | 2 +- src/test/java/fr/igred/omero/BasicTest.java | 2 +- src/test/java/fr/igred/omero/ClientTest.java | 2 +- src/test/java/fr/igred/omero/ConnectionTest.java | 2 +- src/test/java/fr/igred/omero/ExceptionTest.java | 2 +- src/test/java/fr/igred/omero/LoggingExtension.java | 2 +- src/test/java/fr/igred/omero/RootTest.java | 2 +- src/test/java/fr/igred/omero/SudoTest.java | 2 +- src/test/java/fr/igred/omero/TestObject.java | 2 +- src/test/java/fr/igred/omero/UserTest.java | 2 +- .../fr/igred/omero/annotations/ImageJTableTest.java | 2 +- .../java/fr/igred/omero/annotations/TableTest.java | 2 +- src/test/java/fr/igred/omero/annotations/TagTest.java | 2 +- .../java/fr/igred/omero/meta/ExperimenterTest.java | 2 +- src/test/java/fr/igred/omero/meta/GroupTest.java | 2 +- .../fr/igred/omero/meta/PlaneInfoWrapperTest.java | 2 +- .../java/fr/igred/omero/repository/DatasetTest.java | 2 +- .../java/fr/igred/omero/repository/FolderTest.java | 2 +- .../fr/igred/omero/repository/ImageImportTest.java | 2 +- .../java/fr/igred/omero/repository/ImageTest.java | 2 +- .../java/fr/igred/omero/repository/PixelsTest.java | 2 +- .../igred/omero/repository/PlateAcquisitionTest.java | 2 +- .../java/fr/igred/omero/repository/PlateTest.java | 2 +- .../java/fr/igred/omero/repository/ProjectTest.java | 2 +- .../java/fr/igred/omero/repository/ScreenTest.java | 2 +- .../fr/igred/omero/repository/WellSampleTest.java | 2 +- src/test/java/fr/igred/omero/repository/WellTest.java | 2 +- src/test/java/fr/igred/omero/roi/ROI2ImageJTest.java | 2 +- src/test/java/fr/igred/omero/roi/ROITest.java | 2 +- src/test/java/fr/igred/omero/roi/ShapeErrorTest.java | 2 +- src/test/java/fr/igred/omero/roi/ShapeTest.java | 2 +- .../java/fr/igred/omero/util/LibraryCheckerTest.java | 2 +- 80 files changed, 87 insertions(+), 84 deletions(-) diff --git a/README.md b/README.md index bd64dbd0..f7eef2e9 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ [![Java CI with Maven](https://github.com/GReD-Clermont/simple-omero-client/actions/workflows/maven.yml/badge.svg)](https://github.com/GReD-Clermont/simple-omero-client/actions/workflows/maven.yml) [![codecov](https://codecov.io/gh/GReD-Clermont/simple-omero-client/branch/main/graph/badge.svg)](https://codecov.io/gh/GReD-Clermont/simple-omero-client) -[![DOI](https://img.shields.io/badge/DOI-10.12688%2Ff1000research.110385.1-GREEN)](https://doi.org/10.12688/f1000research.110385.1) +[![DOI](https://img.shields.io/badge/DOI-10.12688%2Ff1000research.110385.2-GREEN)](https://doi.org/10.12688/f1000research.110385.2) # simple-omero-client @@ -107,7 +107,7 @@ List rois = image.getROIs(client); They can also be converted from or to ImageJ Rois: ```java -// The property is a string used to create 3D/4D ROIs in OMERO, by grouping shapes sharing the same value +// The property is a string used to create 3D/4D ROIs in OMERO, by grouping shapes sharing the same value (used to name the ROI) List omeroRois = ROIWrapper.fromImageJ(ijRois, property); ROIWrapper roi = new ROIWrapper(); diff --git a/pom.xml b/pom.xml index ad19e210..d8029aaa 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ fr.igred simple-omero-client - 5.9.3 + 5.9.4 jar Simple OMERO Client @@ -19,7 +19,7 @@ GReD - https://www.gred-clermont.fr + https://www.igred.fr @@ -35,9 +35,9 @@ ppouchin Pierre Pouchin pierre.pouchin@uca.fr - https://www.gred-clermont.fr/directory/member/pierre-pouchin/ + https://www.igred.fr/directory/member/pierre-pouchin/ GReD (INSERM U1103 / CNRS UMR 6293 / UCA) - https://www.gred-clermont.fr + https://www.igred.fr lead developer @@ -54,6 +54,9 @@ Rémi Valarcher + + Rémy Dornier + diff --git a/src/main/java/fr/igred/omero/Client.java b/src/main/java/fr/igred/omero/Client.java index e931f68c..5663d1b6 100644 --- a/src/main/java/fr/igred/omero/Client.java +++ b/src/main/java/fr/igred/omero/Client.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/GatewayWrapper.java b/src/main/java/fr/igred/omero/GatewayWrapper.java index d0e2a3d1..c648e0fa 100644 --- a/src/main/java/fr/igred/omero/GatewayWrapper.java +++ b/src/main/java/fr/igred/omero/GatewayWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/GenericObjectWrapper.java b/src/main/java/fr/igred/omero/GenericObjectWrapper.java index bbcaf510..b239fa98 100644 --- a/src/main/java/fr/igred/omero/GenericObjectWrapper.java +++ b/src/main/java/fr/igred/omero/GenericObjectWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/annotations/FileAnnotationWrapper.java b/src/main/java/fr/igred/omero/annotations/FileAnnotationWrapper.java index c9738788..56403dfc 100644 --- a/src/main/java/fr/igred/omero/annotations/FileAnnotationWrapper.java +++ b/src/main/java/fr/igred/omero/annotations/FileAnnotationWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/annotations/GenericAnnotationWrapper.java b/src/main/java/fr/igred/omero/annotations/GenericAnnotationWrapper.java index e81ad8c0..fcaf0902 100644 --- a/src/main/java/fr/igred/omero/annotations/GenericAnnotationWrapper.java +++ b/src/main/java/fr/igred/omero/annotations/GenericAnnotationWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/annotations/MapAnnotationWrapper.java b/src/main/java/fr/igred/omero/annotations/MapAnnotationWrapper.java index 9bb4ce37..7483e6de 100644 --- a/src/main/java/fr/igred/omero/annotations/MapAnnotationWrapper.java +++ b/src/main/java/fr/igred/omero/annotations/MapAnnotationWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/annotations/TableWrapper.java b/src/main/java/fr/igred/omero/annotations/TableWrapper.java index b09184c8..027f2383 100644 --- a/src/main/java/fr/igred/omero/annotations/TableWrapper.java +++ b/src/main/java/fr/igred/omero/annotations/TableWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/annotations/TagAnnotationWrapper.java b/src/main/java/fr/igred/omero/annotations/TagAnnotationWrapper.java index 50157823..4057ce25 100644 --- a/src/main/java/fr/igred/omero/annotations/TagAnnotationWrapper.java +++ b/src/main/java/fr/igred/omero/annotations/TagAnnotationWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/annotations/package-info.java b/src/main/java/fr/igred/omero/annotations/package-info.java index 0737931b..03bbd9cc 100644 --- a/src/main/java/fr/igred/omero/annotations/package-info.java +++ b/src/main/java/fr/igred/omero/annotations/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/exception/AccessException.java b/src/main/java/fr/igred/omero/exception/AccessException.java index 75abbf3e..65357a87 100644 --- a/src/main/java/fr/igred/omero/exception/AccessException.java +++ b/src/main/java/fr/igred/omero/exception/AccessException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/exception/ExceptionHandler.java b/src/main/java/fr/igred/omero/exception/ExceptionHandler.java index ff9c2e5a..6937f8d1 100644 --- a/src/main/java/fr/igred/omero/exception/ExceptionHandler.java +++ b/src/main/java/fr/igred/omero/exception/ExceptionHandler.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/exception/OMEROServerError.java b/src/main/java/fr/igred/omero/exception/OMEROServerError.java index 2cb7f78c..66e7663a 100644 --- a/src/main/java/fr/igred/omero/exception/OMEROServerError.java +++ b/src/main/java/fr/igred/omero/exception/OMEROServerError.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/exception/ServiceException.java b/src/main/java/fr/igred/omero/exception/ServiceException.java index 8d40df68..739b970c 100644 --- a/src/main/java/fr/igred/omero/exception/ServiceException.java +++ b/src/main/java/fr/igred/omero/exception/ServiceException.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/exception/package-info.java b/src/main/java/fr/igred/omero/exception/package-info.java index 1e978c81..e4523b8a 100644 --- a/src/main/java/fr/igred/omero/exception/package-info.java +++ b/src/main/java/fr/igred/omero/exception/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/meta/ExperimenterWrapper.java b/src/main/java/fr/igred/omero/meta/ExperimenterWrapper.java index 36b7fad2..0c412853 100644 --- a/src/main/java/fr/igred/omero/meta/ExperimenterWrapper.java +++ b/src/main/java/fr/igred/omero/meta/ExperimenterWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/meta/GroupWrapper.java b/src/main/java/fr/igred/omero/meta/GroupWrapper.java index 8a281245..51aa61b9 100644 --- a/src/main/java/fr/igred/omero/meta/GroupWrapper.java +++ b/src/main/java/fr/igred/omero/meta/GroupWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/meta/PlaneInfoWrapper.java b/src/main/java/fr/igred/omero/meta/PlaneInfoWrapper.java index 3db8141b..aef2c7e4 100644 --- a/src/main/java/fr/igred/omero/meta/PlaneInfoWrapper.java +++ b/src/main/java/fr/igred/omero/meta/PlaneInfoWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/meta/package-info.java b/src/main/java/fr/igred/omero/meta/package-info.java index 3655d1a1..61b825f7 100644 --- a/src/main/java/fr/igred/omero/meta/package-info.java +++ b/src/main/java/fr/igred/omero/meta/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/package-info.java b/src/main/java/fr/igred/omero/package-info.java index 56489706..dd4cbb1e 100644 --- a/src/main/java/fr/igred/omero/package-info.java +++ b/src/main/java/fr/igred/omero/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/repository/ChannelWrapper.java b/src/main/java/fr/igred/omero/repository/ChannelWrapper.java index e440dc13..600bdb0b 100644 --- a/src/main/java/fr/igred/omero/repository/ChannelWrapper.java +++ b/src/main/java/fr/igred/omero/repository/ChannelWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/repository/DatasetWrapper.java b/src/main/java/fr/igred/omero/repository/DatasetWrapper.java index 1380ca02..d1410832 100644 --- a/src/main/java/fr/igred/omero/repository/DatasetWrapper.java +++ b/src/main/java/fr/igred/omero/repository/DatasetWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/repository/FolderWrapper.java b/src/main/java/fr/igred/omero/repository/FolderWrapper.java index 88dfa23e..942fb6d3 100644 --- a/src/main/java/fr/igred/omero/repository/FolderWrapper.java +++ b/src/main/java/fr/igred/omero/repository/FolderWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/repository/GenericRepositoryObjectWrapper.java b/src/main/java/fr/igred/omero/repository/GenericRepositoryObjectWrapper.java index f78a1d00..3d1ff684 100644 --- a/src/main/java/fr/igred/omero/repository/GenericRepositoryObjectWrapper.java +++ b/src/main/java/fr/igred/omero/repository/GenericRepositoryObjectWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/repository/ImageWrapper.java b/src/main/java/fr/igred/omero/repository/ImageWrapper.java index 00f1d0a8..1a3e734f 100644 --- a/src/main/java/fr/igred/omero/repository/ImageWrapper.java +++ b/src/main/java/fr/igred/omero/repository/ImageWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/repository/PixelsWrapper.java b/src/main/java/fr/igred/omero/repository/PixelsWrapper.java index 6496f4a2..d9d7a80f 100644 --- a/src/main/java/fr/igred/omero/repository/PixelsWrapper.java +++ b/src/main/java/fr/igred/omero/repository/PixelsWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/repository/PlateAcquisitionWrapper.java b/src/main/java/fr/igred/omero/repository/PlateAcquisitionWrapper.java index 80e2c7cc..951d1859 100644 --- a/src/main/java/fr/igred/omero/repository/PlateAcquisitionWrapper.java +++ b/src/main/java/fr/igred/omero/repository/PlateAcquisitionWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/repository/PlateWrapper.java b/src/main/java/fr/igred/omero/repository/PlateWrapper.java index 67946c3a..5375cc50 100644 --- a/src/main/java/fr/igred/omero/repository/PlateWrapper.java +++ b/src/main/java/fr/igred/omero/repository/PlateWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/repository/ProjectWrapper.java b/src/main/java/fr/igred/omero/repository/ProjectWrapper.java index 39cf24b3..eaf80328 100644 --- a/src/main/java/fr/igred/omero/repository/ProjectWrapper.java +++ b/src/main/java/fr/igred/omero/repository/ProjectWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/repository/ScreenWrapper.java b/src/main/java/fr/igred/omero/repository/ScreenWrapper.java index fd1513a0..588f3f14 100644 --- a/src/main/java/fr/igred/omero/repository/ScreenWrapper.java +++ b/src/main/java/fr/igred/omero/repository/ScreenWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/repository/WellSampleWrapper.java b/src/main/java/fr/igred/omero/repository/WellSampleWrapper.java index e0078b64..c94bc7ad 100644 --- a/src/main/java/fr/igred/omero/repository/WellSampleWrapper.java +++ b/src/main/java/fr/igred/omero/repository/WellSampleWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/repository/WellWrapper.java b/src/main/java/fr/igred/omero/repository/WellWrapper.java index c12db03c..f096ca7e 100644 --- a/src/main/java/fr/igred/omero/repository/WellWrapper.java +++ b/src/main/java/fr/igred/omero/repository/WellWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/repository/package-info.java b/src/main/java/fr/igred/omero/repository/package-info.java index 4e185486..434e31e6 100644 --- a/src/main/java/fr/igred/omero/repository/package-info.java +++ b/src/main/java/fr/igred/omero/repository/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/roi/EllipseWrapper.java b/src/main/java/fr/igred/omero/roi/EllipseWrapper.java index f875b1a6..a8886419 100644 --- a/src/main/java/fr/igred/omero/roi/EllipseWrapper.java +++ b/src/main/java/fr/igred/omero/roi/EllipseWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/roi/GenericShapeWrapper.java b/src/main/java/fr/igred/omero/roi/GenericShapeWrapper.java index c514676a..201ca548 100644 --- a/src/main/java/fr/igred/omero/roi/GenericShapeWrapper.java +++ b/src/main/java/fr/igred/omero/roi/GenericShapeWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/roi/LineWrapper.java b/src/main/java/fr/igred/omero/roi/LineWrapper.java index 8abb33fd..87271863 100644 --- a/src/main/java/fr/igred/omero/roi/LineWrapper.java +++ b/src/main/java/fr/igred/omero/roi/LineWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/roi/MaskWrapper.java b/src/main/java/fr/igred/omero/roi/MaskWrapper.java index dcd44abe..c82ff058 100644 --- a/src/main/java/fr/igred/omero/roi/MaskWrapper.java +++ b/src/main/java/fr/igred/omero/roi/MaskWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/roi/PointWrapper.java b/src/main/java/fr/igred/omero/roi/PointWrapper.java index 45bcd7e3..454eff06 100644 --- a/src/main/java/fr/igred/omero/roi/PointWrapper.java +++ b/src/main/java/fr/igred/omero/roi/PointWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/roi/PolygonWrapper.java b/src/main/java/fr/igred/omero/roi/PolygonWrapper.java index c05548a0..c6655087 100644 --- a/src/main/java/fr/igred/omero/roi/PolygonWrapper.java +++ b/src/main/java/fr/igred/omero/roi/PolygonWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/roi/PolylineWrapper.java b/src/main/java/fr/igred/omero/roi/PolylineWrapper.java index cf8fd54e..0075313c 100644 --- a/src/main/java/fr/igred/omero/roi/PolylineWrapper.java +++ b/src/main/java/fr/igred/omero/roi/PolylineWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/roi/ROIWrapper.java b/src/main/java/fr/igred/omero/roi/ROIWrapper.java index c6f29640..4fc4cfe8 100644 --- a/src/main/java/fr/igred/omero/roi/ROIWrapper.java +++ b/src/main/java/fr/igred/omero/roi/ROIWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/roi/RectangleWrapper.java b/src/main/java/fr/igred/omero/roi/RectangleWrapper.java index f0ce48b7..340a8bbe 100644 --- a/src/main/java/fr/igred/omero/roi/RectangleWrapper.java +++ b/src/main/java/fr/igred/omero/roi/RectangleWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/roi/ShapeList.java b/src/main/java/fr/igred/omero/roi/ShapeList.java index 068635df..dbb25414 100644 --- a/src/main/java/fr/igred/omero/roi/ShapeList.java +++ b/src/main/java/fr/igred/omero/roi/ShapeList.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/roi/TextWrapper.java b/src/main/java/fr/igred/omero/roi/TextWrapper.java index 942967e1..b5465846 100644 --- a/src/main/java/fr/igred/omero/roi/TextWrapper.java +++ b/src/main/java/fr/igred/omero/roi/TextWrapper.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/roi/package-info.java b/src/main/java/fr/igred/omero/roi/package-info.java index c0bc6015..6bdfdec0 100644 --- a/src/main/java/fr/igred/omero/roi/package-info.java +++ b/src/main/java/fr/igred/omero/roi/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/util/LibraryChecker.java b/src/main/java/fr/igred/omero/util/LibraryChecker.java index 27cf0388..10bd02c8 100644 --- a/src/main/java/fr/igred/omero/util/LibraryChecker.java +++ b/src/main/java/fr/igred/omero/util/LibraryChecker.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/main/java/fr/igred/omero/util/package-info.java b/src/main/java/fr/igred/omero/util/package-info.java index 801b97aa..4b1b1d60 100644 --- a/src/main/java/fr/igred/omero/util/package-info.java +++ b/src/main/java/fr/igred/omero/util/package-info.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/AccessExceptionTest.java b/src/test/java/fr/igred/omero/AccessExceptionTest.java index 84234e7a..f8b2bc87 100644 --- a/src/test/java/fr/igred/omero/AccessExceptionTest.java +++ b/src/test/java/fr/igred/omero/AccessExceptionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/BasicTest.java b/src/test/java/fr/igred/omero/BasicTest.java index b0895d10..12667a59 100644 --- a/src/test/java/fr/igred/omero/BasicTest.java +++ b/src/test/java/fr/igred/omero/BasicTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/ClientTest.java b/src/test/java/fr/igred/omero/ClientTest.java index bbe5e1d4..af5466b1 100644 --- a/src/test/java/fr/igred/omero/ClientTest.java +++ b/src/test/java/fr/igred/omero/ClientTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/ConnectionTest.java b/src/test/java/fr/igred/omero/ConnectionTest.java index 24cd3a61..2f789f63 100644 --- a/src/test/java/fr/igred/omero/ConnectionTest.java +++ b/src/test/java/fr/igred/omero/ConnectionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/ExceptionTest.java b/src/test/java/fr/igred/omero/ExceptionTest.java index 5e08214e..f8d1200b 100644 --- a/src/test/java/fr/igred/omero/ExceptionTest.java +++ b/src/test/java/fr/igred/omero/ExceptionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/LoggingExtension.java b/src/test/java/fr/igred/omero/LoggingExtension.java index 5b8ea75b..9c1da577 100644 --- a/src/test/java/fr/igred/omero/LoggingExtension.java +++ b/src/test/java/fr/igred/omero/LoggingExtension.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/RootTest.java b/src/test/java/fr/igred/omero/RootTest.java index edb01e13..e703ee67 100644 --- a/src/test/java/fr/igred/omero/RootTest.java +++ b/src/test/java/fr/igred/omero/RootTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/SudoTest.java b/src/test/java/fr/igred/omero/SudoTest.java index ca34c646..28fe11e1 100644 --- a/src/test/java/fr/igred/omero/SudoTest.java +++ b/src/test/java/fr/igred/omero/SudoTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/TestObject.java b/src/test/java/fr/igred/omero/TestObject.java index e52a59ac..947a18d6 100644 --- a/src/test/java/fr/igred/omero/TestObject.java +++ b/src/test/java/fr/igred/omero/TestObject.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/UserTest.java b/src/test/java/fr/igred/omero/UserTest.java index 7d7bf7c4..b88946c5 100644 --- a/src/test/java/fr/igred/omero/UserTest.java +++ b/src/test/java/fr/igred/omero/UserTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/annotations/ImageJTableTest.java b/src/test/java/fr/igred/omero/annotations/ImageJTableTest.java index ec5b308a..5fc799fc 100644 --- a/src/test/java/fr/igred/omero/annotations/ImageJTableTest.java +++ b/src/test/java/fr/igred/omero/annotations/ImageJTableTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/annotations/TableTest.java b/src/test/java/fr/igred/omero/annotations/TableTest.java index 233a5036..29d38ad8 100644 --- a/src/test/java/fr/igred/omero/annotations/TableTest.java +++ b/src/test/java/fr/igred/omero/annotations/TableTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/annotations/TagTest.java b/src/test/java/fr/igred/omero/annotations/TagTest.java index 4bfd3cce..2dcb2841 100644 --- a/src/test/java/fr/igred/omero/annotations/TagTest.java +++ b/src/test/java/fr/igred/omero/annotations/TagTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/meta/ExperimenterTest.java b/src/test/java/fr/igred/omero/meta/ExperimenterTest.java index 8fa3cd3d..5939424a 100644 --- a/src/test/java/fr/igred/omero/meta/ExperimenterTest.java +++ b/src/test/java/fr/igred/omero/meta/ExperimenterTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/meta/GroupTest.java b/src/test/java/fr/igred/omero/meta/GroupTest.java index 26574e0a..c7e2d757 100644 --- a/src/test/java/fr/igred/omero/meta/GroupTest.java +++ b/src/test/java/fr/igred/omero/meta/GroupTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/meta/PlaneInfoWrapperTest.java b/src/test/java/fr/igred/omero/meta/PlaneInfoWrapperTest.java index a7fadc3d..3c2c95a1 100644 --- a/src/test/java/fr/igred/omero/meta/PlaneInfoWrapperTest.java +++ b/src/test/java/fr/igred/omero/meta/PlaneInfoWrapperTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/repository/DatasetTest.java b/src/test/java/fr/igred/omero/repository/DatasetTest.java index 7ce15855..cd7ebbaa 100644 --- a/src/test/java/fr/igred/omero/repository/DatasetTest.java +++ b/src/test/java/fr/igred/omero/repository/DatasetTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/repository/FolderTest.java b/src/test/java/fr/igred/omero/repository/FolderTest.java index b5e2a14f..ef78b18c 100644 --- a/src/test/java/fr/igred/omero/repository/FolderTest.java +++ b/src/test/java/fr/igred/omero/repository/FolderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/repository/ImageImportTest.java b/src/test/java/fr/igred/omero/repository/ImageImportTest.java index 4aa6af39..7671d279 100644 --- a/src/test/java/fr/igred/omero/repository/ImageImportTest.java +++ b/src/test/java/fr/igred/omero/repository/ImageImportTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/repository/ImageTest.java b/src/test/java/fr/igred/omero/repository/ImageTest.java index d64afe91..e16f6616 100644 --- a/src/test/java/fr/igred/omero/repository/ImageTest.java +++ b/src/test/java/fr/igred/omero/repository/ImageTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/repository/PixelsTest.java b/src/test/java/fr/igred/omero/repository/PixelsTest.java index 1087486d..956e508c 100644 --- a/src/test/java/fr/igred/omero/repository/PixelsTest.java +++ b/src/test/java/fr/igred/omero/repository/PixelsTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/repository/PlateAcquisitionTest.java b/src/test/java/fr/igred/omero/repository/PlateAcquisitionTest.java index bb104761..368e5b7a 100644 --- a/src/test/java/fr/igred/omero/repository/PlateAcquisitionTest.java +++ b/src/test/java/fr/igred/omero/repository/PlateAcquisitionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/repository/PlateTest.java b/src/test/java/fr/igred/omero/repository/PlateTest.java index c79d5761..b46c8ac7 100644 --- a/src/test/java/fr/igred/omero/repository/PlateTest.java +++ b/src/test/java/fr/igred/omero/repository/PlateTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/repository/ProjectTest.java b/src/test/java/fr/igred/omero/repository/ProjectTest.java index 20108e84..463b3d42 100644 --- a/src/test/java/fr/igred/omero/repository/ProjectTest.java +++ b/src/test/java/fr/igred/omero/repository/ProjectTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/repository/ScreenTest.java b/src/test/java/fr/igred/omero/repository/ScreenTest.java index 75426181..7a7e1540 100644 --- a/src/test/java/fr/igred/omero/repository/ScreenTest.java +++ b/src/test/java/fr/igred/omero/repository/ScreenTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/repository/WellSampleTest.java b/src/test/java/fr/igred/omero/repository/WellSampleTest.java index 09473dc7..afd40bc0 100644 --- a/src/test/java/fr/igred/omero/repository/WellSampleTest.java +++ b/src/test/java/fr/igred/omero/repository/WellSampleTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/repository/WellTest.java b/src/test/java/fr/igred/omero/repository/WellTest.java index 72caf4f5..bd67d019 100644 --- a/src/test/java/fr/igred/omero/repository/WellTest.java +++ b/src/test/java/fr/igred/omero/repository/WellTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/roi/ROI2ImageJTest.java b/src/test/java/fr/igred/omero/roi/ROI2ImageJTest.java index b59726fd..0d4aa2df 100644 --- a/src/test/java/fr/igred/omero/roi/ROI2ImageJTest.java +++ b/src/test/java/fr/igred/omero/roi/ROI2ImageJTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/roi/ROITest.java b/src/test/java/fr/igred/omero/roi/ROITest.java index a6bf7164..47c67ece 100644 --- a/src/test/java/fr/igred/omero/roi/ROITest.java +++ b/src/test/java/fr/igred/omero/roi/ROITest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/roi/ShapeErrorTest.java b/src/test/java/fr/igred/omero/roi/ShapeErrorTest.java index 91899886..7ffb1c29 100644 --- a/src/test/java/fr/igred/omero/roi/ShapeErrorTest.java +++ b/src/test/java/fr/igred/omero/roi/ShapeErrorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/roi/ShapeTest.java b/src/test/java/fr/igred/omero/roi/ShapeTest.java index f9903d14..09bca160 100644 --- a/src/test/java/fr/igred/omero/roi/ShapeTest.java +++ b/src/test/java/fr/igred/omero/roi/ShapeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software diff --git a/src/test/java/fr/igred/omero/util/LibraryCheckerTest.java b/src/test/java/fr/igred/omero/util/LibraryCheckerTest.java index 07200a91..d431ad04 100644 --- a/src/test/java/fr/igred/omero/util/LibraryCheckerTest.java +++ b/src/test/java/fr/igred/omero/util/LibraryCheckerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2020-2022 GReD + * Copyright (C) 2020-2023 GReD * * This program is free software; you can redistribute it and/or modify it under * the terms of the GNU General Public License as published by the Free Software From ae8bf0c0662003fb65b3086fb3ac29d234e5f760 Mon Sep 17 00:00:00 2001 From: Pierre Pouchin Date: Sun, 22 Jan 2023 17:14:44 +0100 Subject: [PATCH 2/5] Add .editorconfig --- .editorconfig | 303 ++++++++++++++++++++++++++++ src/test/resources/logback-test.xml | 20 +- 2 files changed, 313 insertions(+), 10 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..f9b7763c --- /dev/null +++ b/.editorconfig @@ -0,0 +1,303 @@ +# Topmost editor config file +root = true + +[*] +charset = utf-8 +indent_size = 4 +indent_style = space +insert_final_newline = false +max_line_length = 120 +tab_width = 4 +ij_continuation_indent_size = 8 +ij_formatter_off_tag = @formatter:off +ij_formatter_on_tag = @formatter:on +ij_formatter_tags_enabled = false +ij_smart_tabs = false +ij_visual_guides = none +ij_wrap_on_typing = false + +[*.java] +ij_visual_guides = 80 +ij_java_align_consecutive_assignments = false +ij_java_align_consecutive_variable_declarations = true +ij_java_align_group_field_declarations = true +ij_java_align_multiline_annotation_parameters = false +ij_java_align_multiline_array_initializer_expression = true +ij_java_align_multiline_assignment = true +ij_java_align_multiline_binary_operation = true +ij_java_align_multiline_chained_methods = true +ij_java_align_multiline_extends_list = true +ij_java_align_multiline_for = true +ij_java_align_multiline_method_parentheses = false +ij_java_align_multiline_parameters = true +ij_java_align_multiline_parameters_in_calls = true +ij_java_align_multiline_parenthesized_expression = true +ij_java_align_multiline_records = true +ij_java_align_multiline_resources = true +ij_java_align_multiline_ternary_operation = true +ij_java_align_multiline_text_blocks = true +ij_java_align_multiline_throws_list = true +ij_java_align_subsequent_simple_methods = false +ij_java_align_throws_keyword = true +ij_java_annotation_parameter_wrap = off +ij_java_array_initializer_new_line_after_left_brace = false +ij_java_array_initializer_right_brace_on_new_line = false +ij_java_array_initializer_wrap = on_every_item +ij_java_assert_statement_colon_on_next_line = false +ij_java_assert_statement_wrap = normal +ij_java_assignment_wrap = normal +ij_java_binary_operation_sign_on_next_line = false +ij_java_binary_operation_wrap = normal +ij_java_blank_lines_after_anonymous_class_header = 0 +ij_java_blank_lines_after_class_header = 1 +ij_java_blank_lines_after_imports = 2 +ij_java_blank_lines_after_package = 2 +ij_java_blank_lines_around_class = 2 +ij_java_blank_lines_around_field = 0 +ij_java_blank_lines_around_field_in_interface = 0 +ij_java_blank_lines_around_initializer = 1 +ij_java_blank_lines_around_method = 2 +ij_java_blank_lines_around_method_in_interface = 2 +ij_java_blank_lines_before_class_end = 1 +ij_java_blank_lines_before_imports = 1 +ij_java_blank_lines_before_method_body = 0 +ij_java_blank_lines_before_package = 0 +ij_java_block_brace_style = end_of_line +ij_java_block_comment_at_first_column = true +ij_java_call_parameters_new_line_after_left_paren = false +ij_java_call_parameters_right_paren_on_new_line = false +ij_java_call_parameters_wrap = normal +ij_java_case_statement_on_separate_line = true +ij_java_catch_on_new_line = false +ij_java_class_annotation_wrap = split_into_lines +ij_java_class_brace_style = end_of_line +ij_java_class_count_to_use_import_on_demand = 10 +ij_java_class_names_in_javadoc = 1 +ij_java_do_not_indent_top_level_class_members = false +ij_java_do_not_wrap_after_single_annotation = false +ij_java_do_while_brace_force = never +ij_java_doc_add_blank_line_after_description = true +ij_java_doc_add_blank_line_after_param_comments = true +ij_java_doc_add_blank_line_after_return = true +ij_java_doc_add_p_tag_on_empty_lines = true +ij_java_doc_align_exception_comments = true +ij_java_doc_align_param_comments = true +ij_java_doc_do_not_wrap_if_one_line = true +ij_java_doc_enable_formatting = true +ij_java_doc_enable_leading_asterisks = true +ij_java_doc_indent_on_continuation = false +ij_java_doc_keep_empty_lines = true +ij_java_doc_keep_empty_parameter_tag = true +ij_java_doc_keep_empty_return_tag = true +ij_java_doc_keep_empty_throws_tag = true +ij_java_doc_keep_invalid_tags = true +ij_java_doc_param_description_on_new_line = false +ij_java_doc_preserve_line_breaks = false +ij_java_doc_use_throws_not_exception_tag = true +ij_java_else_on_new_line = false +ij_java_enum_constants_wrap = on_every_item +ij_java_extends_keyword_wrap = off +ij_java_extends_list_wrap = on_every_item +ij_java_field_annotation_wrap = split_into_lines +ij_java_finally_on_new_line = false +ij_java_for_brace_force = never +ij_java_for_statement_new_line_after_left_paren = false +ij_java_for_statement_right_paren_on_new_line = false +ij_java_for_statement_wrap = on_every_item +ij_java_generate_final_locals = false +ij_java_generate_final_parameters = false +ij_java_if_brace_force = never +ij_java_imports_layout = *, |, javax.**, java.**, |, $* +ij_java_indent_case_from_switch = true +ij_java_insert_inner_class_imports = false +ij_java_insert_override_annotation = true +ij_java_keep_blank_lines_before_right_brace = 2 +ij_java_keep_blank_lines_between_package_declaration_and_header = 2 +ij_java_keep_blank_lines_in_code = 2 +ij_java_keep_blank_lines_in_declarations = 2 +ij_java_keep_control_statement_in_one_line = true +ij_java_keep_first_column_comment = true +ij_java_keep_indents_on_empty_lines = false +ij_java_keep_line_breaks = true +ij_java_keep_multiple_expressions_in_one_line = false +ij_java_keep_simple_blocks_in_one_line = false +ij_java_keep_simple_classes_in_one_line = false +ij_java_keep_simple_lambdas_in_one_line = false +ij_java_keep_simple_methods_in_one_line = false +ij_java_label_indent_absolute = false +ij_java_label_indent_size = 0 +ij_java_lambda_brace_style = end_of_line +ij_java_layout_static_imports_separately = true +ij_java_line_comment_add_space = false +ij_java_line_comment_at_first_column = true +ij_java_method_annotation_wrap = split_into_lines +ij_java_method_brace_style = end_of_line +ij_java_method_call_chain_wrap = normal +ij_java_method_parameters_new_line_after_left_paren = false +ij_java_method_parameters_right_paren_on_new_line = false +ij_java_method_parameters_wrap = normal +ij_java_modifier_list_wrap = false +ij_java_names_count_to_use_import_on_demand = 10 +ij_java_new_line_after_lparen_in_record_header = false +ij_java_packages_to_use_import_on_demand = javax.swing.* +ij_java_parameter_annotation_wrap = off +ij_java_parentheses_expression_new_line_after_left_paren = false +ij_java_parentheses_expression_right_paren_on_new_line = false +ij_java_place_assignment_sign_on_next_line = false +ij_java_prefer_longer_names = true +ij_java_prefer_parameters_wrap = false +ij_java_record_components_wrap = normal +ij_java_repeat_synchronized = true +ij_java_replace_instanceof_and_cast = false +ij_java_replace_null_check = true +ij_java_replace_sum_lambda_with_method_ref = true +ij_java_resource_list_new_line_after_left_paren = false +ij_java_resource_list_right_paren_on_new_line = false +ij_java_resource_list_wrap = on_every_item +ij_java_rparen_on_new_line_in_record_header = false +ij_java_space_after_closing_angle_bracket_in_type_argument = false +ij_java_space_after_colon = true +ij_java_space_after_comma = true +ij_java_space_after_comma_in_type_arguments = true +ij_java_space_after_for_semicolon = true +ij_java_space_after_quest = true +ij_java_space_after_type_cast = true +ij_java_space_before_annotation_array_initializer_left_brace = false +ij_java_space_before_annotation_parameter_list = false +ij_java_space_before_array_initializer_left_brace = false +ij_java_space_before_catch_keyword = true +ij_java_space_before_catch_left_brace = true +ij_java_space_before_catch_parentheses = true +ij_java_space_before_class_left_brace = true +ij_java_space_before_colon = true +ij_java_space_before_colon_in_foreach = true +ij_java_space_before_comma = false +ij_java_space_before_do_left_brace = true +ij_java_space_before_else_keyword = true +ij_java_space_before_else_left_brace = true +ij_java_space_before_finally_keyword = true +ij_java_space_before_finally_left_brace = true +ij_java_space_before_for_left_brace = true +ij_java_space_before_for_parentheses = true +ij_java_space_before_for_semicolon = false +ij_java_space_before_if_left_brace = true +ij_java_space_before_if_parentheses = true +ij_java_space_before_method_call_parentheses = false +ij_java_space_before_method_left_brace = true +ij_java_space_before_method_parentheses = false +ij_java_space_before_opening_angle_bracket_in_type_parameter = false +ij_java_space_before_quest = true +ij_java_space_before_switch_left_brace = true +ij_java_space_before_switch_parentheses = true +ij_java_space_before_synchronized_left_brace = true +ij_java_space_before_synchronized_parentheses = true +ij_java_space_before_try_left_brace = true +ij_java_space_before_try_parentheses = true +ij_java_space_before_type_parameter_list = false +ij_java_space_before_while_keyword = true +ij_java_space_before_while_left_brace = true +ij_java_space_before_while_parentheses = true +ij_java_space_inside_one_line_enum_braces = false +ij_java_space_within_empty_array_initializer_braces = false +ij_java_space_within_empty_method_call_parentheses = false +ij_java_space_within_empty_method_parentheses = false +ij_java_spaces_around_additive_operators = true +ij_java_spaces_around_assignment_operators = true +ij_java_spaces_around_bitwise_operators = true +ij_java_spaces_around_equality_operators = true +ij_java_spaces_around_lambda_arrow = true +ij_java_spaces_around_logical_operators = true +ij_java_spaces_around_method_ref_dbl_colon = false +ij_java_spaces_around_multiplicative_operators = true +ij_java_spaces_around_relational_operators = true +ij_java_spaces_around_shift_operators = true +ij_java_spaces_around_type_bounds_in_type_parameters = true +ij_java_spaces_around_unary_operator = false +ij_java_spaces_within_angle_brackets = false +ij_java_spaces_within_annotation_parentheses = false +ij_java_spaces_within_array_initializer_braces = false +ij_java_spaces_within_braces = false +ij_java_spaces_within_brackets = false +ij_java_spaces_within_cast_parentheses = false +ij_java_spaces_within_catch_parentheses = false +ij_java_spaces_within_for_parentheses = false +ij_java_spaces_within_if_parentheses = false +ij_java_spaces_within_method_call_parentheses = false +ij_java_spaces_within_method_parentheses = false +ij_java_spaces_within_parentheses = false +ij_java_spaces_within_record_header = false +ij_java_spaces_within_switch_parentheses = false +ij_java_spaces_within_synchronized_parentheses = false +ij_java_spaces_within_try_parentheses = false +ij_java_spaces_within_while_parentheses = false +ij_java_special_else_if_treatment = true +ij_java_subclass_name_suffix = Impl +ij_java_ternary_operation_signs_on_next_line = false +ij_java_ternary_operation_wrap = normal +ij_java_test_name_suffix = Test +ij_java_throws_keyword_wrap = normal +ij_java_throws_list_wrap = on_every_item +ij_java_use_external_annotations = false +ij_java_use_fq_class_names = false +ij_java_use_relative_indents = false +ij_java_use_single_class_imports = true +ij_java_variable_annotation_wrap = off +ij_java_visibility = public +ij_java_while_brace_force = never +ij_java_while_on_new_line = false +ij_java_wrap_comments = true +ij_java_wrap_first_method_in_call_chain = false +ij_java_wrap_long_lines = false + +[.editorconfig] +ij_editorconfig_align_group_field_declarations = false +ij_editorconfig_space_after_colon = false +ij_editorconfig_space_after_comma = true +ij_editorconfig_space_before_colon = false +ij_editorconfig_space_before_comma = false +ij_editorconfig_spaces_around_assignment_operators = true + +[{*.ant, *.fxml, *.jhm, *.jnlp, *.jrxml, *.jspx, *.pom, *.rng, *.tagx, *.tld, *.wsdl, *.xml, *.xsd, *.xsl, *.xslt, *.xul}] +ij_xml_align_attributes = true +ij_xml_align_text = false +ij_xml_attribute_wrap = normal +ij_xml_block_comment_at_first_column = true +ij_xml_keep_blank_lines = 2 +ij_xml_keep_indents_on_empty_lines = false +ij_xml_keep_line_breaks = true +ij_xml_keep_line_breaks_in_text = true +ij_xml_keep_whitespaces = false +ij_xml_keep_whitespaces_around_cdata = preserve +ij_xml_keep_whitespaces_inside_cdata = false +ij_xml_line_comment_at_first_column = true +ij_xml_space_after_tag_name = false +ij_xml_space_around_equals_in_attribute = false +ij_xml_space_inside_empty_tag = false +ij_xml_text_wrap = normal +ij_xml_use_custom_settings = false + +[{*.markdown, *.md}] +ij_markdown_force_one_space_after_blockquote_symbol = true +ij_markdown_force_one_space_after_header_symbol = true +ij_markdown_force_one_space_after_list_bullet = true +ij_markdown_force_one_space_between_words = true +ij_markdown_keep_indents_on_empty_lines = false +ij_markdown_max_lines_around_block_elements = 1 +ij_markdown_max_lines_around_header = 1 +ij_markdown_max_lines_between_paragraphs = 1 +ij_markdown_min_lines_around_block_elements = 1 +ij_markdown_min_lines_around_header = 1 +ij_markdown_min_lines_between_paragraphs = 1 + +[{*.yaml, *.yml}] +indent_size = 2 +ij_yaml_align_values_properties = do_not_align +ij_yaml_autoinsert_sequence_marker = true +ij_yaml_block_mapping_on_new_line = false +ij_yaml_indent_sequence_value = true +ij_yaml_keep_indents_on_empty_lines = false +ij_yaml_keep_line_breaks = true +ij_yaml_sequence_on_new_line = false +ij_yaml_space_before_colon = false +ij_yaml_spaces_within_braces = true +ij_yaml_spaces_within_brackets = true diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml index 83465c91..f08c2044 100644 --- a/src/test/resources/logback-test.xml +++ b/src/test/resources/logback-test.xml @@ -1,12 +1,12 @@ - - - %d{yyyy-MM-dd} | %d{HH:mm:ss.SSS} | %-9.9t | %-5p | %-27.27logger{27} | %m%n - - - - - - - + + + %d{yyyy-MM-dd} | %d{HH:mm:ss.SSS} | %-9.9t | %-5p | %-27.27logger{27} | %m%n + + + + + + + \ No newline at end of file From 35ce40b4b20b49d92a2b1be226a6f0225e87b8d8 Mon Sep 17 00:00:00 2001 From: Pierre Pouchin Date: Sun, 22 Jan 2023 17:15:17 +0100 Subject: [PATCH 3/5] Prevent returned ROI names from being null --- src/main/java/fr/igred/omero/roi/ROIWrapper.java | 4 ++-- .../java/fr/igred/omero/repository/ImageImportTest.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/fr/igred/omero/roi/ROIWrapper.java b/src/main/java/fr/igred/omero/roi/ROIWrapper.java index 4fc4cfe8..3c57738d 100644 --- a/src/main/java/fr/igred/omero/roi/ROIWrapper.java +++ b/src/main/java/fr/igred/omero/roi/ROIWrapper.java @@ -192,7 +192,7 @@ public static List toImageJ(List rois, String int index = 1; for (ROIWrapper roi : rois) { String name = roi.getName(); - if (name == null || name.trim().isEmpty()) { + if (name.trim().isEmpty()) { name = "SOC_INDEX_" + index; } List shapes = roi.toImageJ(property); @@ -216,7 +216,7 @@ public static List toImageJ(List rois, String */ public String getName() { RString name = ((_RoiOperationsNC) data.asIObject()).getName(); - return name != null ? name.getValue() : null; + return name != null ? name.getValue() : ""; } diff --git a/src/test/java/fr/igred/omero/repository/ImageImportTest.java b/src/test/java/fr/igred/omero/repository/ImageImportTest.java index 7671d279..cce29a91 100644 --- a/src/test/java/fr/igred/omero/repository/ImageImportTest.java +++ b/src/test/java/fr/igred/omero/repository/ImageImportTest.java @@ -95,8 +95,8 @@ void testReplaceAndDeleteImages() throws Exception { image2.addFileAnnotation(client, image1.getFileAnnotations(client).get(0)); image2.addMapAnnotation(client, image1.getMapAnnotations(client).get(0)); - RectangleWrapper rectangle = new RectangleWrapper(30, 30, 20, 20); - ROIWrapper roi = new ROIWrapper(); + RectangleWrapper rectangle = new RectangleWrapper(3, 3, 2, 2); + ROIWrapper roi = new ROIWrapper(); roi.setImage(image2); roi.addShape(rectangle); image2.saveROI(client, roi); @@ -179,8 +179,8 @@ void testReplaceAndUnlinkImages() throws Exception { image2.addFileAnnotation(client, image1.getFileAnnotations(client).get(0)); image2.addMapAnnotation(client, image1.getMapAnnotations(client).get(0)); - RectangleWrapper rectangle = new RectangleWrapper(30, 30, 20, 20); - ROIWrapper roi = new ROIWrapper(); + RectangleWrapper rectangle = new RectangleWrapper(3, 3, 2, 2); + ROIWrapper roi = new ROIWrapper(); roi.setImage(image2); roi.addShape(rectangle); image2.saveROI(client, roi); From 70d715d32d95aee12cdd31886611111ac7743034 Mon Sep 17 00:00:00 2001 From: Pierre Pouchin Date: Sun, 22 Jan 2023 17:16:14 +0100 Subject: [PATCH 4/5] Suppress warnings for methods referencing subclasses --- .../fr/igred/omero/GenericObjectWrapper.java | 1 + .../fr/igred/omero/roi/GenericShapeWrapper.java | 16 +++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/fr/igred/omero/GenericObjectWrapper.java b/src/main/java/fr/igred/omero/GenericObjectWrapper.java index b239fa98..3e485abe 100644 --- a/src/main/java/fr/igred/omero/GenericObjectWrapper.java +++ b/src/main/java/fr/igred/omero/GenericObjectWrapper.java @@ -167,6 +167,7 @@ public Timestamp getCreated() { * * @return owner id. */ + @SuppressWarnings("ClassReferencesSubclass") public ExperimenterWrapper getOwner() { return new ExperimenterWrapper(data.getOwner()); } diff --git a/src/main/java/fr/igred/omero/roi/GenericShapeWrapper.java b/src/main/java/fr/igred/omero/roi/GenericShapeWrapper.java index 201ca548..bba82d82 100644 --- a/src/main/java/fr/igred/omero/roi/GenericShapeWrapper.java +++ b/src/main/java/fr/igred/omero/roi/GenericShapeWrapper.java @@ -48,6 +48,7 @@ public abstract class GenericShapeWrapper extends GenericOb private static final Color TRANSPARENT = new Color(0, 0, 0, 0); + /** * Constructor of the GenericShapeWrapper class using a ShapeData. * @@ -125,11 +126,11 @@ protected void copy(ij.gui.Roi ijRoi) { data.setC(Math.max(-1, ijRoi.getCPosition() - 1)); data.setZ(Math.max(-1, ijRoi.getZPosition() - 1)); data.setT(Math.max(-1, ijRoi.getTPosition() - 1)); - LengthI size = new LengthI(ijRoi.getStrokeWidth(), UnitsLength.POINT); - Color defaultStroke = Optional.ofNullable(Roi.getColor()).orElse(Color.YELLOW); - Color defaultFill = Optional.ofNullable(Roi.getDefaultFillColor()).orElse(TRANSPARENT); - Color stroke = Optional.ofNullable(ijRoi.getStrokeColor()).orElse(defaultStroke); - Color fill = Optional.ofNullable(ijRoi.getFillColor()).orElse(defaultFill); + LengthI size = new LengthI(ijRoi.getStrokeWidth(), UnitsLength.POINT); + Color defaultStroke = Optional.ofNullable(Roi.getColor()).orElse(Color.YELLOW); + Color defaultFill = Optional.ofNullable(Roi.getDefaultFillColor()).orElse(TRANSPARENT); + Color stroke = Optional.ofNullable(ijRoi.getStrokeColor()).orElse(defaultStroke); + Color fill = Optional.ofNullable(ijRoi.getFillColor()).orElse(defaultFill); data.getShapeSettings().setStrokeWidth(size); data.getShapeSettings().setStroke(stroke); data.getShapeSettings().setFill(fill); @@ -388,11 +389,12 @@ public java.awt.Shape createTransformedAWTShape() { /** - * Returns a new {@link RectangleWrapper} corresponding to the bounding box of the shape, once the related {@link - * AffineTransform} has been applied. + * Returns a new {@link RectangleWrapper} corresponding to the bounding box of the shape, once the related + * {@link AffineTransform} has been applied. * * @return The bounding box. */ + @SuppressWarnings("ClassReferencesSubclass") public RectangleWrapper getBoundingBox() { Rectangle2D rectangle = createTransformedAWTShape().getBounds2D(); From afa5ef4728045b2b7933d350090204a6420eaf1f Mon Sep 17 00:00:00 2001 From: Pierre Pouchin Date: Sun, 22 Jan 2023 17:17:34 +0100 Subject: [PATCH 5/5] Improve code coverage for FileAnnotationWrapper and reformat code --- .../java/fr/igred/omero/repository/PixelsWrapper.java | 1 + .../java/fr/igred/omero/repository/package-info.java | 4 ++-- .../java/fr/igred/omero/annotations/TableTest.java | 1 + .../java/fr/igred/omero/meta/PlaneInfoWrapperTest.java | 1 + .../java/fr/igred/omero/repository/FolderTest.java | 2 +- src/test/java/fr/igred/omero/repository/ImageTest.java | 6 ++++++ .../java/fr/igred/omero/repository/WellSampleTest.java | 4 ++-- src/test/java/fr/igred/omero/roi/ShapeTest.java | 10 +++++----- 8 files changed, 19 insertions(+), 10 deletions(-) diff --git a/src/main/java/fr/igred/omero/repository/PixelsWrapper.java b/src/main/java/fr/igred/omero/repository/PixelsWrapper.java index d9d7a80f..3994686b 100644 --- a/src/main/java/fr/igred/omero/repository/PixelsWrapper.java +++ b/src/main/java/fr/igred/omero/repository/PixelsWrapper.java @@ -68,6 +68,7 @@ public class PixelsWrapper extends GenericObjectWrapper { */ public PixelsWrapper(PixelsData pixels) { super(pixels); + rawDataFacility = null; } diff --git a/src/main/java/fr/igred/omero/repository/package-info.java b/src/main/java/fr/igred/omero/repository/package-info.java index 434e31e6..1ac70639 100644 --- a/src/main/java/fr/igred/omero/repository/package-info.java +++ b/src/main/java/fr/igred/omero/repository/package-info.java @@ -16,7 +16,7 @@ */ /** * This package contains classes related to the hierarchical organization for images. - *

This includes containers (such as screens or projects for example), as well as data contained within images (e.g. - * pixels and channels). + *

This includes containers (such as screens or projects for example), as well as data contained within images + * (e.g. pixels and channels). */ package fr.igred.omero.repository; \ No newline at end of file diff --git a/src/test/java/fr/igred/omero/annotations/TableTest.java b/src/test/java/fr/igred/omero/annotations/TableTest.java index 29d38ad8..fb8a8e2f 100644 --- a/src/test/java/fr/igred/omero/annotations/TableTest.java +++ b/src/test/java/fr/igred/omero/annotations/TableTest.java @@ -196,4 +196,5 @@ void testErrorTableNotEnoughArgs() throws Exception { assertThrows(IllegalArgumentException.class, () -> images.forEach(img -> table.addRow(img.asImageData()))); } + } \ No newline at end of file diff --git a/src/test/java/fr/igred/omero/meta/PlaneInfoWrapperTest.java b/src/test/java/fr/igred/omero/meta/PlaneInfoWrapperTest.java index 3c2c95a1..3e1dce86 100644 --- a/src/test/java/fr/igred/omero/meta/PlaneInfoWrapperTest.java +++ b/src/test/java/fr/igred/omero/meta/PlaneInfoWrapperTest.java @@ -45,6 +45,7 @@ void testComputeMeanTimeInterval() throws Exception { assertEquals(time.getValue(), pixels.getMeanTimeInterval().getValue()); } + @Test void testComputeMeanExposureTime() throws Exception { PixelsWrapper pixels = client.getImage(IMAGE1.id).getPixels(); diff --git a/src/test/java/fr/igred/omero/repository/FolderTest.java b/src/test/java/fr/igred/omero/repository/FolderTest.java index ef78b18c..ffc8ee2e 100644 --- a/src/test/java/fr/igred/omero/repository/FolderTest.java +++ b/src/test/java/fr/igred/omero/repository/FolderTest.java @@ -37,7 +37,7 @@ void testGetDeletedFolder() throws Exception { ImageWrapper image = client.getImage(IMAGE2.id); FolderWrapper folder = new FolderWrapper(client, "Test"); - long id = folder.getId(); + long id = folder.getId(); client.delete(folder); assertThrows(NoSuchElementException.class, () -> image.getFolder(client, id)); } diff --git a/src/test/java/fr/igred/omero/repository/ImageTest.java b/src/test/java/fr/igred/omero/repository/ImageTest.java index e16f6616..302bdce9 100644 --- a/src/test/java/fr/igred/omero/repository/ImageTest.java +++ b/src/test/java/fr/igred/omero/repository/ImageTest.java @@ -28,6 +28,7 @@ import ij.plugin.ImageCalculator; import ij.process.ImageStatistics; import loci.plugins.BF; +import omero.constants.metadata.NSCLIENTMAPANNOTATION; import omero.gateway.model.MapAnnotationData; import omero.model.NamedValue; import org.junit.jupiter.api.Test; @@ -35,6 +36,8 @@ import java.awt.image.BufferedImage; import java.io.File; import java.nio.file.Files; +import java.sql.Timestamp; +import java.time.Instant; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; @@ -225,6 +228,7 @@ void testAddKeyValuePair4() throws Exception { String value1 = "Value Test"; String value2 = "Value Test2"; + Timestamp ts = Timestamp.from(Instant.now()); image.addPairKeyValue(client, key1, value1); image.addPairKeyValue(client, key2, value2); @@ -234,6 +238,8 @@ void testAddKeyValuePair4() throws Exception { client.delete(maps); assertEquals(2, maps.size()); + assertEquals(NSCLIENTMAPANNOTATION.value, maps.get(0).getNameSpace()); + assertEquals(0, (maps.get(0).getLastModified().getTime() - ts.getTime()) / 1000); assertEquals(value1, value); } diff --git a/src/test/java/fr/igred/omero/repository/WellSampleTest.java b/src/test/java/fr/igred/omero/repository/WellSampleTest.java index afd40bc0..53f7401e 100644 --- a/src/test/java/fr/igred/omero/repository/WellSampleTest.java +++ b/src/test/java/fr/igred/omero/repository/WellSampleTest.java @@ -44,8 +44,8 @@ void testGetImage() throws Exception { @Test void testGetWell() throws Exception { - final long wellId = 1L; - WellWrapper well = client.getWell(wellId); + final long wellId = 1L; + WellWrapper well = client.getWell(wellId); WellSampleWrapper sample = well.getWellSamples().get(0); assertEquals(wellId, sample.getWell(client).getId()); diff --git a/src/test/java/fr/igred/omero/roi/ShapeTest.java b/src/test/java/fr/igred/omero/roi/ShapeTest.java index 09bca160..d958143c 100644 --- a/src/test/java/fr/igred/omero/roi/ShapeTest.java +++ b/src/test/java/fr/igred/omero/roi/ShapeTest.java @@ -383,7 +383,7 @@ void testRectangleConstructor() { void testMaskConstructor() { byte[] maskValues = new byte[25]; for (int i = 0; i < maskValues.length; i++) { - maskValues[i] = (byte) (i >= maskValues.length/2 ? 1 : 0); + maskValues[i] = (byte) (i >= maskValues.length / 2 ? 1 : 0); } MaskWrapper m1 = new MaskWrapper(10, 10, 5, 5, maskValues); @@ -465,7 +465,7 @@ void testPolygonConstructor() { void testAWTRectangle() { RectangleWrapper shape = new RectangleWrapper(25, 26, 27, 28); Rectangle2D awtShape = new Rectangle2D.Double(25, 26, 27, 28); - java.awt.Shape awtShape2 = shape.toAWTShape(); + java.awt.Shape awtShape2 = shape.toAWTShape(); assertEquals(awtShape, awtShape2); } @@ -474,10 +474,10 @@ void testAWTRectangle() { void testAWTMask() { byte[] maskValues = new byte[25]; for (int i = 0; i < maskValues.length; i++) { - maskValues[i] = (byte) (i >= maskValues.length/2 ? 1 : 0); + maskValues[i] = (byte) (i >= maskValues.length / 2 ? 1 : 0); } - MaskWrapper shape = new MaskWrapper(25, 26, 27, 28, maskValues); - Rectangle2D awtShape = new Rectangle2D.Double(25, 26, 27, 28); + MaskWrapper shape = new MaskWrapper(25, 26, 27, 28, maskValues); + Rectangle2D awtShape = new Rectangle2D.Double(25, 26, 27, 28); java.awt.Shape awtShape2 = shape.toAWTShape(); assertEquals(awtShape, awtShape2);