From 965218f81806c8c383d8ce7177988a2b3a73f52f Mon Sep 17 00:00:00 2001
From: jakubs <jakubs>
Date: Thu, 23 Aug 2012 12:33:09 +0000
Subject: [PATCH] BIS-153 SP-257 add IIdentifierHolder to
IEntityInformationHolderDTO
SVN: 26435
---
.../server/dataaccess/db/EntityVerificationInterceptor.java | 2 +-
.../generic/shared/dto/IEntityInformationHolderDTO.java | 4 +++-
.../systemsx/cisd/openbis/generic/shared/dto/MaterialPE.java | 2 ++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityVerificationInterceptor.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityVerificationInterceptor.java
index 143b8c93374..defb5386635 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityVerificationInterceptor.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/EntityVerificationInterceptor.java
@@ -188,7 +188,7 @@ public class EntityVerificationInterceptor extends EmptyInterceptor
private String entityDescription(IEntityInformationWithPropertiesHolder entity)
{
- return entity.getEntityKind().getLabel() + " " + entity.getCode() + " ("
+ return entity.getEntityKind().getLabel() + " " + entity.getIdentifier() + " ("
+ entity.getEntityType().getCode() + ")";
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityInformationHolderDTO.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityInformationHolderDTO.java
index b253685ceef..0b3e4ebcd04 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityInformationHolderDTO.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/IEntityInformationHolderDTO.java
@@ -17,6 +17,7 @@
package ch.systemsx.cisd.openbis.generic.shared.dto;
import ch.systemsx.cisd.openbis.generic.shared.basic.IIdAndCodeHolder;
+import ch.systemsx.cisd.openbis.generic.shared.basic.IIdentifierHolder;
import ch.systemsx.cisd.openbis.generic.shared.basic.IPermIdHolder;
import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
@@ -25,7 +26,8 @@ import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
*
* @author Izabela Adamczyk
*/
-public interface IEntityInformationHolderDTO extends IIdAndCodeHolder, IPermIdHolder
+public interface IEntityInformationHolderDTO extends IIdAndCodeHolder, IPermIdHolder,
+ IIdentifierHolder
{
/**
* Returns the entity type of this matching entity.
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPE.java
index e3251c4ea68..12940228c73 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPE.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/MaterialPE.java
@@ -60,6 +60,7 @@ import org.hibernate.validator.constraints.Length;
import ch.systemsx.cisd.common.collections.UnmodifiableSetDecorator;
import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle;
import ch.systemsx.cisd.openbis.generic.shared.IServer;
+import ch.systemsx.cisd.openbis.generic.shared.basic.IIdentifierHolder;
import ch.systemsx.cisd.openbis.generic.shared.dto.hibernate.SearchFieldConstants;
import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind;
import ch.systemsx.cisd.openbis.generic.shared.util.EqualsHashUtils;
@@ -349,6 +350,7 @@ public class MaterialPE implements IIdAndCodeHolder, Comparable<MaterialPE>,
// IMatchingEntity
//
+ @Override
@Transient
@Field(index = Index.NO, store = Store.YES, name = SearchFieldConstants.IDENTIFIER)
public final String getIdentifier()
--
GitLab