SP-249 BIS-18: Name of file container for thumbnails is ambiguous

SVN: 26424

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/thumbnails/AbstractThumbnailsConfiguration.java

@@ -98,4 +98,15 @@ public abstract class AbstractThumbnailsConfiguration implements IThumbnailsConf
     {
         return transformations.put(channelCode.toUpperCase(), transformationCode);
     }
+
+    protected String getFirstTransformationCode()
+    {
+        if (transformations.size() == 0)
+        {
+            return "";
+        } else
+        {
+            return "_" + transformations.values().iterator().next();
+        }
+    }
 }

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/thumbnails/ResolutionBasedThumbnailsConfiguration.java

@@ -56,6 +56,7 @@ public class ResolutionBasedThumbnailsConfiguration extends AbstractThumbnailsCo
     @Override
     protected String getDefaultFileName()
     {
-        return String.format("thumbnails_%dx%d.h5ar", maxWidth, maxHeight);
+        return String.format("thumbnails_%dx%d%s.h5ar", maxWidth, maxHeight,
+                getFirstTransformationCode());
     }
 }

screening/source/java/ch/systemsx/cisd/openbis/dss/etl/dto/api/v1/thumbnails/ZoomLevelBasedThumbnailsConfiguration.java

@@ -42,6 +42,7 @@ public class ZoomLevelBasedThumbnailsConfiguration extends AbstractThumbnailsCon
     @Override
     protected String getDefaultFileName()
     {
-        return String.format("thumbnails_%.0fpct.h5ar", zoomLevel * 100.0);
+        return String.format("thumbnails_%.0fpct%s.h5ar", zoomLevel * 100.0,
+                getFirstTransformationCode());
     }
 }