Fix table creation when multiple ROIs share the same name (#64)

* Fix table creation when multiple ROIs share the same name
* Improve tests

Author: ppouchin

src/main/java/fr/igred/omero/annotations/TableWrapper.java

@@ -385,7 +385,9 @@ private static ROIData[] createROIColumn(ResultsTable results,
         Map<Long, ROIData> id2roi = rois.stream().collect(toMap(ROIWrapper::getId, GenericObjectWrapper::asDataObject));
         Map<String, ROIData> name2roi = rois.stream()
                                             .filter(r -> !r.getName().isEmpty())
-                                            .collect(toMap(ROIWrapper::getName, GenericObjectWrapper::asDataObject));
+                                            .collect(toMap(ROIWrapper::getName,
+                                                           GenericObjectWrapper::asDataObject,
+                                                           (x1, x2) -> x1));
 
         Map<String, ROIData> label2roi = ijRois.stream()
                                                .map(r -> new SimpleEntry<>(r.getProperty(roiProperty),

src/test/java/fr/igred/omero/annotations/ImageJTableTest.java

@@ -500,7 +500,9 @@ void testCreateTableWithROINamesFromIJResults2() throws Exception {
         ROIWrapper roi2 = new ROIWrapper();
 
         roi1.setImage(image);
+        roi1.setName("ROI");
         roi2.setImage(image);
+        roi2.setName("ROI");
 
         final int max = 14;
         for (int i = 10; i < max; i++) {