From b91a1f373976592a8cdf3a014ef6cf5e4e4d18cd Mon Sep 17 00:00:00 2001 From: buczekp <buczekp> Date: Wed, 13 Jul 2011 08:44:15 +0000 Subject: [PATCH] [LMS-2364] introduced IDeletablePE SVN: 22109 --- .../openbis/generic/shared/dto/DataPE.java | 2 +- .../generic/shared/dto/DeletionPE.java | 4 +-- .../generic/shared/dto/ExperimentPE.java | 2 +- .../generic/shared/dto/IDeletablePE.java | 26 +++++++++++++++++++ .../openbis/generic/shared/dto/SamplePE.java | 2 +- 5 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IDeletablePE.java diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataPE.java index e50cd37f1ac..266a60ed09f 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataPE.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataPE.java @@ -83,7 +83,7 @@ import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils; @Friend(toClasses = EventPE.class) @Indexed(index = "DataPE") public class DataPE extends AbstractIdAndCodeHolder<DataPE> implements - IEntityInformationWithPropertiesHolder, IMatchingEntity, IIdentifierHolder + IEntityInformationWithPropertiesHolder, IMatchingEntity, IIdentifierHolder, IDeletablePE { private static final long serialVersionUID = IServer.VERSION; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletionPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletionPE.java index 074a474e733..b45a039b188 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletionPE.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletionPE.java @@ -70,9 +70,9 @@ public class DeletionPE extends HibernateAbstractRegistrationHolder implements I return reason; } - public void setReason(final String description) + public void setReason(final String reason) { - this.reason = description; + this.reason = reason; } @Override diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentPE.java index c01ffa8a2f7..52f64fcc000 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentPE.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ExperimentPE.java @@ -87,7 +87,7 @@ import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils; { AttachmentPE.class, ProjectPE.class }) public class ExperimentPE extends AttachmentHolderPE implements IEntityInformationWithPropertiesHolder, IIdAndCodeHolder, Comparable<ExperimentPE>, - IMatchingEntity, Serializable + IMatchingEntity, IDeletablePE, Serializable { private static final long serialVersionUID = IServer.VERSION; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IDeletablePE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IDeletablePE.java new file mode 100644 index 00000000000..987a044986f --- /dev/null +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IDeletablePE.java @@ -0,0 +1,26 @@ +/* + * Copyright 2008 ETH Zuerich, CISD + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package ch.systemsx.cisd.openbis.generic.shared.dto; + + +/** + * @author Piotr Buczek + */ +public interface IDeletablePE +{ + public DeletionPE getDeletion(); +} diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java index 2b79379cb7c..2f7d6c39d18 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SamplePE.java @@ -86,7 +86,7 @@ import ch.systemsx.cisd.openbis.generic.shared.util.HibernateUtils; + " IS NULL AND " + ColumnNames.SPACE_COLUMN + " IS NOT NULL)") @Indexed(index = "SamplePE") public class SamplePE extends AttachmentHolderPE implements IIdAndCodeHolder, Comparable<SamplePE>, - IEntityInformationWithPropertiesHolder, IMatchingEntity, Serializable + IEntityInformationWithPropertiesHolder, IMatchingEntity, IDeletablePE, Serializable { private static final long serialVersionUID = IServer.VERSION; -- GitLab