diff --git a/common/source/java/ch/systemsx/cisd/common/concurrent/ExecutionResult.java b/common/source/java/ch/systemsx/cisd/common/concurrent/ExecutionResult.java index 5d8f53a244a503ab9116d74b0a1e483619e61957..9491e0cb55126d3be1f7e8d5eccd2d59602b84da 100644 --- a/common/source/java/ch/systemsx/cisd/common/concurrent/ExecutionResult.java +++ b/common/source/java/ch/systemsx/cisd/common/concurrent/ExecutionResult.java @@ -21,7 +21,7 @@ import java.util.concurrent.ExecutorService; import org.apache.commons.lang.builder.ToStringBuilder; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; /** * A class that contains the result of the execution of a {@link Runnable} (or {@link Callable}) in diff --git a/common/source/java/ch/systemsx/cisd/common/filesystem/ResultStatus.java b/common/source/java/ch/systemsx/cisd/common/filesystem/ResultStatus.java index 9ce2974e8bc900d2d0090f8692652aec0ce6f44f..e00c6e329d7a88d57b57e53e8ee9261064deb99f 100644 --- a/common/source/java/ch/systemsx/cisd/common/filesystem/ResultStatus.java +++ b/common/source/java/ch/systemsx/cisd/common/filesystem/ResultStatus.java @@ -20,7 +20,7 @@ import java.io.Serializable; import org.apache.commons.lang.builder.ToStringBuilder; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; /** * A class that holds the information about the status and the result of an operation. To be used diff --git a/common/source/java/ch/systemsx/cisd/common/reflection/AbstractHashable.java b/common/source/java/ch/systemsx/cisd/common/reflection/AbstractHashable.java index 257993fe294fc8d4517cccccadcac26eec99eb02..708ee7d92890834448bb0e001742abb586bf4467 100644 --- a/common/source/java/ch/systemsx/cisd/common/reflection/AbstractHashable.java +++ b/common/source/java/ch/systemsx/cisd/common/reflection/AbstractHashable.java @@ -23,7 +23,6 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; /** * If you want your class to behave correctly when used in {@link Map}s or {@link Set}s, you can diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/ModifiedShortPrefixToStringStyle.java b/common/source/java/ch/systemsx/cisd/common/reflection/ModifiedShortPrefixToStringStyle.java similarity index 97% rename from common/source/java/ch/systemsx/cisd/common/utilities/ModifiedShortPrefixToStringStyle.java rename to common/source/java/ch/systemsx/cisd/common/reflection/ModifiedShortPrefixToStringStyle.java index 3a488177528d5a71f80342e559c0663b4f931437..d4eafb61f1482385d83eb9b953d1ea2c11213774 100644 --- a/common/source/java/ch/systemsx/cisd/common/utilities/ModifiedShortPrefixToStringStyle.java +++ b/common/source/java/ch/systemsx/cisd/common/reflection/ModifiedShortPrefixToStringStyle.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.common.utilities; +package ch.systemsx.cisd.common.reflection; import org.apache.commons.lang.builder.ToStringStyle; diff --git a/common/source/java/ch/systemsx/cisd/common/test/LogMonitoringAppender.java b/common/source/java/ch/systemsx/cisd/common/test/LogMonitoringAppender.java index faadb4b744e66abff79c0e03b09db70d20c53eb8..bb1140f3c102a0a99d26ebbc45acb37459ad606e 100644 --- a/common/source/java/ch/systemsx/cisd/common/test/LogMonitoringAppender.java +++ b/common/source/java/ch/systemsx/cisd/common/test/LogMonitoringAppender.java @@ -32,7 +32,7 @@ import org.apache.log4j.spi.ThrowableInformation; import ch.systemsx.cisd.common.collections.CollectionUtils; import ch.systemsx.cisd.common.collections.IToStringConverter; import ch.systemsx.cisd.common.logging.LogCategory; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; /** * A class that allows to monitor the log for unit tests. diff --git a/eu_basysbio/source/java/eu/basysbio/cisd/dss/TimeSeriesColumnDescriptor.java b/eu_basysbio/source/java/eu/basysbio/cisd/dss/TimeSeriesColumnDescriptor.java index 392d8172fbc58d92937911b7dc2205e0eaa460d9..9fbe85a9de707e91861b137e0a7eaf6fa1742fce 100644 --- a/eu_basysbio/source/java/eu/basysbio/cisd/dss/TimeSeriesColumnDescriptor.java +++ b/eu_basysbio/source/java/eu/basysbio/cisd/dss/TimeSeriesColumnDescriptor.java @@ -18,7 +18,7 @@ package eu.basysbio.cisd.dss; import org.apache.commons.lang.builder.ToStringBuilder; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; /** diff --git a/eu_basysbio/source/java/eu/basysbio/cisd/dss/TimeSeriesValue.java b/eu_basysbio/source/java/eu/basysbio/cisd/dss/TimeSeriesValue.java index 3ce6f03ccd67057fe9a09ebd474a7ea27bc403b4..773aad6a84cc6caabd98ced8e1855cc01209832f 100644 --- a/eu_basysbio/source/java/eu/basysbio/cisd/dss/TimeSeriesValue.java +++ b/eu_basysbio/source/java/eu/basysbio/cisd/dss/TimeSeriesValue.java @@ -20,7 +20,7 @@ import java.util.List; import org.apache.commons.lang.builder.ToStringBuilder; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; /** * @author Franz-Josef Elmer diff --git a/eu_basysbio/source/java/eu/basysbio/cisd/dss/ValueGroupDescriptor.java b/eu_basysbio/source/java/eu/basysbio/cisd/dss/ValueGroupDescriptor.java index 00580013daa8ce012e51eb3f36b1bf0befafbc25..6612566112ff846fe9d9efdaeb4b92566fba3dd8 100644 --- a/eu_basysbio/source/java/eu/basysbio/cisd/dss/ValueGroupDescriptor.java +++ b/eu_basysbio/source/java/eu/basysbio/cisd/dss/ValueGroupDescriptor.java @@ -18,7 +18,7 @@ package eu.basysbio.cisd.dss; import org.apache.commons.lang.builder.ToStringBuilder; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; /** * A value group groups all value types of one data set file together. diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/Argument.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/Argument.java index 5f6ab1f035659eebb34f08d906468c83cb9f23ae..9f78a080076e1cf344ba351f6700db6b56a6608c 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/Argument.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/authorization/Argument.java @@ -2,7 +2,7 @@ package ch.systemsx.cisd.openbis.generic.server.authorization; import org.apache.commons.lang.builder.ToStringBuilder; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.server.authorization.annotation.AuthorizationGuard; /** diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/search/HibernateSearchContext.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/search/HibernateSearchContext.java index bee53696a9363f3da7974168f8da7bc75fb5e836..cd9408794b525559c72460fe07a83c1411da40e6 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/search/HibernateSearchContext.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/search/HibernateSearchContext.java @@ -28,7 +28,7 @@ import ch.systemsx.cisd.common.filesystem.FileUtilities; import ch.systemsx.cisd.common.logging.Log4jSimpleLogger; import ch.systemsx.cisd.common.logging.LogCategory; import ch.systemsx.cisd.common.logging.LogFactory; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; /** * A bean class that contains properties related to <i>Hibernate Search</i>. diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom023To024.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom023To024.java index 65346e0d6a37c039615ccb5c6ab6e6017a1e82a9..3fcd503984519bc8ba01cabc4de5ebbeb48c7c8f 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom023To024.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom023To024.java @@ -31,7 +31,7 @@ import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; import ch.systemsx.cisd.common.collections.CollectionUtils; import ch.systemsx.cisd.common.logging.LogCategory; import ch.systemsx.cisd.common.logging.LogFactory; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.dbmigration.java.MigrationStepAdapter; import ch.systemsx.cisd.openbis.generic.shared.dto.TableNames; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom025To026.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom025To026.java index aedf69c503ac5651d0fabdd0e8416202bdf89bd7..ce0ec7c0302ff4b14038c22c60c4858baff122de 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom025To026.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom025To026.java @@ -33,7 +33,7 @@ import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; import ch.systemsx.cisd.common.collections.CollectionUtils; import ch.systemsx.cisd.common.logging.LogCategory; import ch.systemsx.cisd.common.logging.LogFactory; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.dbmigration.java.MigrationStepAdapter; import ch.systemsx.cisd.openbis.generic.shared.dto.TableNames; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom036To037.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom036To037.java index 42bd5b7e40ba6fd8096569374b79f5eb391cbedf..3ab71e0a214c0cdbf3e10a6ba8b3064789da5459 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom036To037.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/migration/MigrationStepFrom036To037.java @@ -33,7 +33,7 @@ import org.springframework.jdbc.core.simple.SimpleJdbcTemplate; import ch.systemsx.cisd.common.collections.CollectionUtils; import ch.systemsx.cisd.common.logging.LogCategory; import ch.systemsx.cisd.common.logging.LogFactory; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.dbmigration.java.MigrationStepAdapter; import ch.systemsx.cisd.openbis.generic.shared.util.SimplePropertyValidator.TimestampValidator; import ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractDeletedEntityPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractDeletedEntityPE.java index 7f36071844255b66171ebcb35deb17cdf3deba85..ee4cbcc3e8471a8578b0a3cc2c35910491cc7cb1 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractDeletedEntityPE.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractDeletedEntityPE.java @@ -32,7 +32,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; import org.hibernate.validator.constraints.Length; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.shared.IServer; /** diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractIdAndCodeHolder.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractIdAndCodeHolder.java index e0acb21a54cda338557dea115062d33102473f2d..57225a6bcebd3d9cad18d6fbf6187c8f422c51cf 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractIdAndCodeHolder.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AbstractIdAndCodeHolder.java @@ -23,7 +23,7 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.shared.IServer; import ch.systemsx.cisd.openbis.generic.shared.util.EqualsHashUtils; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AttachmentPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AttachmentPE.java index 25e02a6f74d39c7afa797fe2f2787efcf7db9781..636eaac444510a470b620282e1094a801ab86668 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AttachmentPE.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AttachmentPE.java @@ -55,7 +55,7 @@ import org.hibernate.validator.constraints.Length; import com.sun.org.apache.xerces.internal.impl.io.UTF8Reader; import ch.rinn.restrictions.Private; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants; import ch.systemsx.cisd.openbis.generic.shared.IServer; import ch.systemsx.cisd.openbis.generic.shared.basic.IIdHolder; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AuthorizationGroupPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AuthorizationGroupPE.java index 941de66451c3fbd31dafadc3ed34cbcf81d490fe..a21d48938e0c5182c87f8808c8c84163e50b7324 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AuthorizationGroupPE.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/AuthorizationGroupPE.java @@ -48,7 +48,7 @@ import org.hibernate.validator.constraints.Length; import ch.rinn.restrictions.Friend; import ch.systemsx.cisd.common.collections.UnmodifiableSetDecorator; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants; import ch.systemsx.cisd.openbis.generic.shared.IServer; import ch.systemsx.cisd.openbis.generic.shared.dto.hibernate.SearchFieldConstants; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/Code.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/Code.java index b8a5e0b49edf7770a93cab4b7fb9723e4bceb97f..88b505ecb1803ac40ac479b11a76e7a18aa82e9e 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/Code.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/Code.java @@ -25,7 +25,7 @@ import org.apache.commons.lang.builder.ToStringBuilder; import com.google.gwt.user.client.rpc.IsSerializable; import ch.systemsx.cisd.common.annotation.BeanProperty; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.shared.IServer; /** diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetUploadContext.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetUploadContext.java index 366816604528beb4b2873398d12913bb94db68f5..21d988e9151aaefa13a847f5edde156d55da5dbd 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetUploadContext.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataSetUploadContext.java @@ -23,7 +23,7 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.shared.IServer; /** diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataTypePE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataTypePE.java index b5af4a77949fcafd49c2450eb59657fe02847dc4..d3451d075dc0d6903af5079df0a6b644235b0598 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataTypePE.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DataTypePE.java @@ -36,7 +36,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; import org.hibernate.validator.constraints.Length; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants; import ch.systemsx.cisd.openbis.generic.shared.IServer; import ch.systemsx.cisd.openbis.generic.shared.basic.IIdHolder; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedDataPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedDataPE.java index fa96926a9cf06cac5eb1f203c4d01f9f61f9e5e8..2ea874baf3fab7334f6636f8423c1fefc9bbafcc 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedDataPE.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedDataPE.java @@ -36,7 +36,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; import org.hibernate.search.annotations.DocumentId; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.shared.IServer; import ch.systemsx.cisd.openbis.generic.shared.dto.hibernate.SearchFieldConstants; import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedExperimentPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedExperimentPE.java index f60aed0ff75e21014ac1e39e6bc6991c95bcb632..7638e1b196007f3c1f67f4de31d6cfae0c22283c 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedExperimentPE.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedExperimentPE.java @@ -37,7 +37,7 @@ import org.hibernate.search.annotations.DocumentId; import org.hibernate.validator.constraints.Length; import ch.rinn.restrictions.Private; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.shared.IServer; import ch.systemsx.cisd.openbis.generic.shared.dto.hibernate.SearchFieldConstants; import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.ExperimentIdentifier; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedSamplePE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedSamplePE.java index d6eaed97669ca9888bb5b88357a35a531a73e185..cc825635333f5ffcd8c3d9412a4d9db7041075d1 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedSamplePE.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/DeletedSamplePE.java @@ -44,7 +44,7 @@ import org.hibernate.annotations.FetchMode; import org.hibernate.search.annotations.DocumentId; import org.hibernate.validator.constraints.Length; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.shared.IServer; import ch.systemsx.cisd.openbis.generic.shared.dto.hibernate.SearchFieldConstants; import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.IdentifierHelper; 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 a5aedeaf0242926fe4dd6cda953b3297a6ff9448..f116a945e1e8bf5ab68a83f3d0118525aadf713a 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 @@ -30,7 +30,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; import org.hibernate.validator.constraints.Length; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants; import ch.systemsx.cisd.openbis.generic.shared.IServer; import ch.systemsx.cisd.openbis.generic.shared.basic.IIdHolder; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityPropertyPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityPropertyPE.java index ecbfdcd95565bd10db79efff94e9d5689b99d250..d3a117a9bb8519f4953998d8e5c670bba215f367 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityPropertyPE.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityPropertyPE.java @@ -38,7 +38,7 @@ import org.hibernate.search.bridge.FieldBridge; import org.hibernate.search.bridge.LuceneOptions; import ch.systemsx.cisd.common.reflection.ClassUtils; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.shared.IServer; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.MaterialIdentifier; import ch.systemsx.cisd.openbis.generic.shared.dto.hibernate.SearchFieldConstants; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypePropertyTypePE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypePropertyTypePE.java index ee7d48278b0c5d3d135080c84d38afde22bc5d2d..f03a7a664e6d86dd6e153e3d648a4308cbac5fc8 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypePropertyTypePE.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EntityTypePropertyTypePE.java @@ -32,7 +32,7 @@ import org.apache.commons.lang.builder.ToStringBuilder; import org.hibernate.validator.constraints.Length; import ch.systemsx.cisd.common.reflection.ClassUtils; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants; import ch.systemsx.cisd.openbis.generic.shared.IServer; import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EventPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EventPE.java index 98b2e669930e623d2ee245e91cb77ed593f540c6..6b68a29db6348956e874752220cc1334741e3674 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EventPE.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/EventPE.java @@ -40,7 +40,7 @@ import org.hibernate.validator.constraints.Length; import ch.rinn.restrictions.Friend; import ch.systemsx.cisd.common.collections.CollectionStyle; import ch.systemsx.cisd.common.collections.CollectionUtils; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants; import ch.systemsx.cisd.openbis.generic.shared.IServer; import ch.systemsx.cisd.openbis.generic.shared.basic.IIdHolder; 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 2bcf43c5d6febd7f70f54552728bb83327aadb96..28c5b44389f56dfe1ab13a9fe0b9d05c95eb162a 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 @@ -64,7 +64,7 @@ import ch.rinn.restrictions.Friend; import ch.rinn.restrictions.Private; import ch.systemsx.cisd.common.collections.UnmodifiableListDecorator; import ch.systemsx.cisd.common.collections.UnmodifiableSetDecorator; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.shared.IServer; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AttachmentHolderKind; import ch.systemsx.cisd.openbis.generic.shared.dto.hibernate.SearchFieldConstants; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/Id.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/Id.java index 4320f65cbf97288f714f0ac4d553fcb7be66305d..0886e2cdaeba45545b9273c01afdc89842ebd97f 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/Id.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/Id.java @@ -22,7 +22,7 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.shared.IServer; import ch.systemsx.cisd.openbis.generic.shared.basic.IIdHolder; 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 2e371eb7e5eeaf4ce189281446caac6ffcf4d3d0..3be55aa6aabfd5284120fac2f74491caa86f53de 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 @@ -58,7 +58,7 @@ import org.hibernate.search.annotations.Store; import org.hibernate.validator.constraints.Length; import ch.systemsx.cisd.common.collections.UnmodifiableSetDecorator; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.shared.IServer; import ch.systemsx.cisd.openbis.generic.shared.dto.hibernate.SearchFieldConstants; import ch.systemsx.cisd.openbis.generic.shared.dto.properties.EntityKind; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewProperty.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewProperty.java index cfe52386a766c21f4b277ff45fe938486ca67900..e965ca90122d83f61029bb9afdce236b890f5195 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewProperty.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/NewProperty.java @@ -22,7 +22,7 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.ToStringBuilder; import ch.systemsx.cisd.common.annotation.BeanProperty; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.shared.IServer; /** diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonPE.java index 358e439dc176f8a0543cef9deab77eb4f2ecff8b..3863e65ed41165d8bd329a1ad3ad86723539e0d3 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonPE.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/PersonPE.java @@ -50,7 +50,7 @@ import org.hibernate.validator.constraints.Length; import ch.rinn.restrictions.Friend; import ch.systemsx.cisd.common.collections.UnmodifiableSetDecorator; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.shared.IServer; import ch.systemsx.cisd.openbis.generic.shared.basic.IIdHolder; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DisplaySettings; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProjectPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProjectPE.java index 21e30f4b15d75b0d8f752acb3c942d4155bb27f5..84b8b622125eb46c035fbfa408323b538918c4a3 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProjectPE.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/ProjectPE.java @@ -57,7 +57,7 @@ import org.hibernate.validator.constraints.Length; import ch.rinn.restrictions.Friend; import ch.rinn.restrictions.Private; import ch.systemsx.cisd.common.collections.UnmodifiableListDecorator; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants; import ch.systemsx.cisd.openbis.generic.shared.IServer; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AttachmentHolderKind; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RoleAssignmentPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RoleAssignmentPE.java index 373dc056e700319ac611b41fd01d288338314589..f12249415ee37de7de371061bb3fe69fa3776b9a 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RoleAssignmentPE.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/RoleAssignmentPE.java @@ -39,7 +39,7 @@ import org.apache.commons.lang.builder.ToStringBuilder; import org.hibernate.annotations.Check; import ch.rinn.restrictions.Private; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.shared.IServer; import ch.systemsx.cisd.openbis.generic.shared.basic.IIdHolder; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy.RoleCode; 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 794c82778e4329aede06973e9fd903314552671e..e0dbec8a2e7b1c3cd33d8e9c28d47fdec4bfd391 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 @@ -64,7 +64,7 @@ import org.hibernate.search.annotations.Store; import org.hibernate.validator.constraints.Length; import ch.systemsx.cisd.common.collections.UnmodifiableSetDecorator; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.shared.IServer; import ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.AttachmentHolderKind; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SpacePE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SpacePE.java index 5ebc235b48947b4704dc1dd82ec00a2c7be891fc..cf210178e041702c8fa0009f23c0cbd51346fbcf 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SpacePE.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/SpacePE.java @@ -45,7 +45,7 @@ import org.hibernate.search.annotations.Store; import org.hibernate.validator.constraints.Length; import ch.rinn.restrictions.Private; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants; import ch.systemsx.cisd.openbis.generic.shared.IServer; import ch.systemsx.cisd.openbis.generic.shared.dto.hibernate.SearchFieldConstants; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/TimeInterval.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/TimeInterval.java index 0a7afddd70fafe1338155e75b698dfc252c22d0f..872261eb9006f66e80b7d4d9367a0d276c47e7da 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/TimeInterval.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/TimeInterval.java @@ -23,7 +23,7 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.shared.IServer; /** diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyPE.java index c93c9cfaea49853a31c5bcf5d2c50c67b6f5418c..8bd495afa65b0590c447f7b21de4b434c9ac79e6 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyPE.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyPE.java @@ -48,7 +48,7 @@ import org.hibernate.validator.constraints.Length; import ch.rinn.restrictions.Private; import ch.systemsx.cisd.common.collections.UnmodifiableSetDecorator; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants; import ch.systemsx.cisd.openbis.generic.shared.IServer; import ch.systemsx.cisd.openbis.generic.shared.basic.CodeConverter; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyTermPE.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyTermPE.java index 0cf1791f58980ffdafa0d89c12a394ae6856cf4b..d8ccc772ab17c990b0fcb7fce616ad4d1d045df4 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyTermPE.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/VocabularyTermPE.java @@ -38,7 +38,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; import org.hibernate.validator.constraints.Length; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants; import ch.systemsx.cisd.openbis.generic.shared.IServer; import ch.systemsx.cisd.openbis.generic.shared.basic.BasicConstant; diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/AbstractIdentifierFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/AbstractIdentifierFactory.java index 384a8bba43665f7e4153172a436ac3ad966c1600..3a2b9bc70f9198801428adcd5fc7fc837dfefa88 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/AbstractIdentifierFactory.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/dto/identifier/AbstractIdentifierFactory.java @@ -22,7 +22,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.ToStringBuilder; import ch.systemsx.cisd.common.exceptions.UserFailureException; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; import ch.systemsx.cisd.openbis.generic.shared.dto.identifier.DatabaseInstanceIdentifier.Constants; /** diff --git a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/ImgChannelStackDTO.java b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/ImgChannelStackDTO.java index eb973b183d0a88850fd86c4bc6c6bf1431452573..b9f3e0f0aa2c4f9a2f53b210c682175cbaf00879 100644 --- a/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/ImgChannelStackDTO.java +++ b/screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/shared/imaging/dataaccess/ImgChannelStackDTO.java @@ -20,7 +20,7 @@ import net.lemnik.eodsql.ResultColumn; import org.apache.commons.lang.builder.ToStringBuilder; -import ch.systemsx.cisd.common.utilities.ModifiedShortPrefixToStringStyle; +import ch.systemsx.cisd.common.reflection.ModifiedShortPrefixToStringStyle; /** * @author Tomasz Pylak