diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientService.java
index c7675bbfeae9e04f435ad0a50dc3f0039676100e..f4f058da528eaa9ee60aa20ec710e80908a16547 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientService.java
@@ -831,9 +831,7 @@ public interface ICommonClientService extends IClientService
public void updateColumn(IFilterOrColumnUpdates updates) throws UserFailureException;
/** Deletes the specified materials. */
- public void deleteMaterials(DisplayedOrSelectedIdHolderCriteria<Sample> criteria, String reason)
- throws UserFailureException;
+ public void deleteMaterials(DisplayedOrSelectedIdHolderCriteria<Material> criteria,
+ String reason) throws UserFailureException;
- /** Deletes the specified material. */
- public void deleteMaterial(TechId sampleId, String reason) throws UserFailureException;
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientServiceAsync.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientServiceAsync.java
index 505114e9b9cf885078e4eb7a82ebfb5fc079405f..5bcb07f555f7ab247c96e05d165900090cd4f5f5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientServiceAsync.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/ICommonClientServiceAsync.java
@@ -734,9 +734,6 @@ public interface ICommonClientServiceAsync extends IClientServiceAsync
public void updateColumn(IFilterOrColumnUpdates updates,
AsyncCallback<Void> registrationCallback);
- /** @see ICommonClientService#deleteMaterial(TechId, String) */
- public void deleteMaterial(TechId create, String value, AsyncCallback<Void> callback);
-
/** @see ICommonClientService#deleteMaterials(DisplayedOrSelectedIdHolderCriteria, String) */
public void deleteMaterials(DisplayedOrSelectedIdHolderCriteria<Material> uploadCriteria,
String value, AsyncCallback<Void> callback);
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialListDeletionConfirmationDialog.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialListDeletionConfirmationDialog.java
index cfae488d0c448f285d2070cc00eff7b28eeb1c03..47ae9d8ddebbdfc66eb8d59682325e77bf49ce8e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialListDeletionConfirmationDialog.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/material/MaterialListDeletionConfirmationDialog.java
@@ -28,7 +28,6 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.materia
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.AbstractDataListDeletionConfirmationDialog;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.WidgetUtils;
import ch.systemsx.cisd.openbis.generic.client.web.client.dto.DisplayedOrSelectedIdHolderCriteria;
-import ch.systemsx.cisd.openbis.generic.shared.basic.TechId;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.EntityKind;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Material;
@@ -40,9 +39,7 @@ public final class MaterialListDeletionConfirmationDialog extends
private final AbstractAsyncCallback<Void> callback;
- private final DisplayedAndSelectedMaterials selectedAndDisplayedItemsOrNull;
-
- private final Material singleDataOrNull;
+ private final DisplayedAndSelectedMaterials selectedAndDisplayedItems;
public MaterialListDeletionConfirmationDialog(
IViewContext<ICommonClientServiceAsync> viewContext, List<Material> data,
@@ -52,35 +49,16 @@ public final class MaterialListDeletionConfirmationDialog extends
super(viewContext, data, true);
this.viewContext = viewContext;
this.callback = callback;
- this.singleDataOrNull = null;
- this.selectedAndDisplayedItemsOrNull = selectedAndDisplayedItems;
- }
-
- public MaterialListDeletionConfirmationDialog(
- IViewContext<ICommonClientServiceAsync> viewContext, List<Material> data,
- AbstractAsyncCallback<Void> callback, Material material)
- {
- super(viewContext, data, false);
- this.viewContext = viewContext;
- this.callback = callback;
- this.singleDataOrNull = material;
- this.selectedAndDisplayedItemsOrNull = null;
+ this.selectedAndDisplayedItems = selectedAndDisplayedItems;
}
@Override
protected void executeConfirmedAction()
{
- if (selectedAndDisplayedItemsOrNull != null)
- {
- final DisplayedOrSelectedIdHolderCriteria<Material> uploadCriteria =
- selectedAndDisplayedItemsOrNull.createCriteria(isOnlySelected());
- viewContext.getCommonService().deleteMaterials(uploadCriteria, reason.getValue(),
- callback);
- } else
- {
- viewContext.getCommonService().deleteMaterial(TechId.create(singleDataOrNull),
- reason.getValue(), callback);
- }
+ final DisplayedOrSelectedIdHolderCriteria<Material> uploadCriteria =
+ selectedAndDisplayedItems.createCriteria(isOnlySelected());
+ viewContext.getCommonService().deleteMaterials(uploadCriteria, reason.getValue(), callback);
+
}
@Override
@@ -95,7 +73,7 @@ public final class MaterialListDeletionConfirmationDialog extends
return WidgetUtils.createAllOrSelectedRadioGroup(onlySelectedRadioOrNull =
WidgetUtils.createRadio(viewContext.getMessage(Dict.ONLY_SELECTED_RADIO, data
.size())), WidgetUtils.createRadio(viewContext.getMessage(Dict.ALL_RADIO,
- selectedAndDisplayedItemsOrNull.getDisplayedItemsCount())), viewContext
+ selectedAndDisplayedItems.getDisplayedItemsCount())), viewContext
.getMessage(Dict.MATERIALS_RADIO_GROUP_LABEL), data.size(),
createRefreshMessageAction());
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
index fbfaf1f1098295b1b1e34f5ea804f0f1e03af5c0..91a3a47386b2eb9ea2a4ec32fd5e1640eb656c10 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/CommonClientService.java
@@ -2374,13 +2374,8 @@ public final class CommonClientService extends AbstractClientService implements
}
}
- public void deleteMaterial(TechId sampleId, String reason)
- throws ch.systemsx.cisd.openbis.generic.client.web.client.exception.UserFailureException
- {
- throw new UserFailureException("Functionality not implemented.");// FIXME: implement
- }
-
- public void deleteMaterials(DisplayedOrSelectedIdHolderCriteria<Sample> criteria, String reason)
+ public void deleteMaterials(DisplayedOrSelectedIdHolderCriteria<Material> criteria,
+ String reason)
throws ch.systemsx.cisd.openbis.generic.client.web.client.exception.UserFailureException
{
throw new UserFailureException("Functionality not implemented.");// FIXME: implement
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java
index 95a7a517ca577a6ee0b43016814454fcbdfa3237..d15069ef12706120219be2e2cf615325bb6f4949 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/CommonServer.java
@@ -179,7 +179,8 @@ import ch.systemsx.cisd.openbis.generic.shared.translator.GridCustomExpressionTr
import ch.systemsx.cisd.openbis.generic.shared.util.EntityHelper;
import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils;
-public final class CommonServer extends AbstractCommonServer<ICommonServer> implements ICommonServer
+public final class CommonServer extends AbstractCommonServer<ICommonServer> implements
+ ICommonServer
{
private final IAuthenticationService authenticationService;
@@ -1840,4 +1841,5 @@ public final class CommonServer extends AbstractCommonServer<ICommonServer> impl
bo.updateTerms(terms);
bo.save();
}
+
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IMaterialBO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IMaterialBO.java
index 24d5116e1ec846067ea763c055721fd6803187b1..9ab184bc64ea19d7ff82d436b0bab78e4ab3130e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IMaterialBO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/IMaterialBO.java
@@ -45,4 +45,5 @@ public interface IMaterialBO extends IEntityBusinessObject
* Changes given material. Currently allowed changes: properties.
*/
public void update(TechId techId, List<IEntityProperty> properties, Date version);
+
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ICommonServer.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ICommonServer.java
index 6c3a7330d31f076b26860577f8ddf6fbbe1ae45c..962eabd960651d984c59cb79b30e0ae5ec0062a5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ICommonServer.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/ICommonServer.java
@@ -1000,4 +1000,5 @@ public interface ICommonServer extends IServer
@DatabaseUpdateModification(value = ObjectKind.VOCABULARY_TERM)
public void updateVocabularyTerms(String sessionToken, TechId vocabularyId,
List<VocabularyTerm> terms);
+
}