diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java
index 8bab12f8e1bfb983dfb9ed537349abd576080d62..7904b8edeba670759c36cad14d76ba877cb22787 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java
@@ -160,7 +160,8 @@ abstract public class GenericSampleViewer extends AbstractViewerWithVerticalSpli
         addToolBarButton(createDeleteButton(new IDelegatedAction()
             {
                 @Override
-                @SuppressWarnings("unchecked")
+                @SuppressWarnings(
+                    { "unchecked", "rawtypes" })
                 public void execute()
                 {
                     final AsyncCallback<Void> callback =