Make it possible to delete container data sets

SVN: 24353

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/DataSetTable.java

@@ -189,12 +189,12 @@ public final class DataSetTable extends AbstractDataSetBusinessObject implements
         return dataSets;
     }
 
-    public List<DataPE> getUnavailableDataSets()
+    public List<DataPE> getUnavailableContainedDataSets()
     {
         List<DataPE> result = new ArrayList<DataPE>();
         for (DataPE dataSet : dataSets)
         {
-            if (dataSet.isAvailable() == false)
+            if (dataSet.isContainer() == false && dataSet.isAvailable() == false)
             {
                 result.add(dataSet);
             }

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IDataSetTable.java

@@ -63,7 +63,7 @@ public interface IDataSetTable
      */
     List<DataPE> getDataSets();
 
-    List<DataPE> getUnavailableDataSets();
+    List<DataPE> getUnavailableContainedDataSets();
 
     /**
      * Returns the loaded {@link DataPE}-s filtered to instances of {@link ExternalDataPE}.

openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/TrashBO.java

@@ -143,7 +143,7 @@ public class TrashBO extends AbstractBusinessObject implements ITrashBO
     {
         IDataSetTable dataSetTable = boFactory.createDataSetTable(session);
         dataSetTable.loadByIds(allIdsAsList);
-        List<DataPE> unavailableDataSets = dataSetTable.getUnavailableDataSets();
+        List<DataPE> unavailableDataSets = dataSetTable.getUnavailableContainedDataSets();
         if (unavailableDataSets.isEmpty())
         {
             return;

openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/business/bo/TrashBOTest.java

@@ -176,7 +176,7 @@ public final class TrashBOTest extends AbstractBOTest
             {
                 {
                     one(dataSetTable).loadByIds(dataSetIds);
-                    one(dataSetTable).getUnavailableDataSets();
+                    one(dataSetTable).getUnavailableContainedDataSets();
                     will(returnValue(Arrays.asList()));
 
                     one(deletionDAO).trash(EntityKind.EXPERIMENT, experimentIds, deletion);
@@ -227,7 +227,7 @@ public final class TrashBOTest extends AbstractBOTest
             {
                 {
                     one(dataSetTable).loadByIds(dataSetIds);
-                    one(dataSetTable).getUnavailableDataSets();
+                    one(dataSetTable).getUnavailableContainedDataSets();
                     will(returnValue(Arrays.asList()));
 
                     one(deletionDAO).trash(EntityKind.EXPERIMENT, experimentIds, deletion);
@@ -288,7 +288,7 @@ public final class TrashBOTest extends AbstractBOTest
             {
                 {
                     one(dataSetTable).loadByIds(TechId.createList(70, 71, 72, 73));
-                    one(dataSetTable).getUnavailableDataSets();
+                    one(dataSetTable).getUnavailableContainedDataSets();
                     will(returnValue(Arrays.asList()));
 
                     RecordingMatcher<List<TechId>> sampleIdsMatcher =
@@ -352,7 +352,7 @@ public final class TrashBOTest extends AbstractBOTest
             {
                 {
                     one(dataSetTable).loadByIds(allIds);
-                    one(dataSetTable).getUnavailableDataSets();
+                    one(dataSetTable).getUnavailableContainedDataSets();
                     will(returnValue(Arrays.asList()));
 
                     one(dataDAO).listContainedDataSets(dataSetIds);
@@ -379,7 +379,7 @@ public final class TrashBOTest extends AbstractBOTest
             {
                 {
                     one(dataSetTable).loadByIds(allIds);
-                    one(dataSetTable).getUnavailableDataSets();
+                    one(dataSetTable).getUnavailableContainedDataSets();
                     ExternalDataPE dataSet = new ExternalDataPE();
                     dataSet.setCode("ds1");
                     dataSet.setStatus(DataSetArchivingStatus.ARCHIVE_PENDING);