diff --git a/common/source/java/ch/systemsx/cisd/common/reflection/ClassFilterUtils.java b/common/source/java/ch/systemsx/cisd/common/reflection/ClassFilterUtils.java index 12ff223679b77247d151e0a6a61fca84f4b49589..0a066e5e45bcd94868043dd230cb134562570e1c 100644 --- a/common/source/java/ch/systemsx/cisd/common/reflection/ClassFilterUtils.java +++ b/common/source/java/ch/systemsx/cisd/common/reflection/ClassFilterUtils.java @@ -16,7 +16,6 @@ package ch.systemsx.cisd.common.reflection; -import ch.systemsx.cisd.common.utilities.IClassFilter; /** * Useful utilities for working with class filters. diff --git a/common/source/java/ch/systemsx/cisd/common/reflection/ClassUtils.java b/common/source/java/ch/systemsx/cisd/common/reflection/ClassUtils.java index 89d7c64cd4c3990d0219b18b36d63ab624d6cbb2..4e49bde78029fa59e00e69bee55109c72952b65f 100644 --- a/common/source/java/ch/systemsx/cisd/common/reflection/ClassUtils.java +++ b/common/source/java/ch/systemsx/cisd/common/reflection/ClassUtils.java @@ -42,7 +42,6 @@ import org.apache.commons.io.FilenameUtils; import org.apache.commons.lang.StringUtils; import ch.systemsx.cisd.base.exceptions.CheckedExceptionTunnel; -import ch.systemsx.cisd.common.utilities.IClassFilter; /** * Operations on classes using reflection. diff --git a/common/source/java/ch/systemsx/cisd/common/utilities/IClassFilter.java b/common/source/java/ch/systemsx/cisd/common/reflection/IClassFilter.java similarity index 95% rename from common/source/java/ch/systemsx/cisd/common/utilities/IClassFilter.java rename to common/source/java/ch/systemsx/cisd/common/reflection/IClassFilter.java index b400f651b2c1bde197d19b870792834ee6d29246..387076b43ba2b2de8ad55f6771581161aec708ee 100644 --- a/common/source/java/ch/systemsx/cisd/common/utilities/IClassFilter.java +++ b/common/source/java/ch/systemsx/cisd/common/reflection/IClassFilter.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package ch.systemsx.cisd.common.utilities; +package ch.systemsx.cisd.common.reflection; /** * A filter for {@link Class}. diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/reflection/ClassUtilsTest.java b/common/sourceTest/java/ch/systemsx/cisd/common/reflection/ClassUtilsTest.java index f094c375da18c5392f8ac38a1b455d088464faeb..19d4182218f82a2733fe1203be684abdba5ab5b3 100644 --- a/common/sourceTest/java/ch/systemsx/cisd/common/reflection/ClassUtilsTest.java +++ b/common/sourceTest/java/ch/systemsx/cisd/common/reflection/ClassUtilsTest.java @@ -37,7 +37,6 @@ import org.testng.remote.SuiteSlave; import ch.systemsx.cisd.common.TimingParameters; import ch.systemsx.cisd.common.TimingParametersTest; import ch.systemsx.cisd.common.reflection.ClassUtils; -import ch.systemsx.cisd.common.utilities.IClassFilter; /** * Test cases for the {@link ClassUtils} class. diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/search/PackageBasedIndexedEntityFinder.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/search/PackageBasedIndexedEntityFinder.java index e26c4ccf494b5b4331586f4ee45ec1ece84c32c3..9e439256f2df43e860dd24bf465ef9fd5d2ede54 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/search/PackageBasedIndexedEntityFinder.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/search/PackageBasedIndexedEntityFinder.java @@ -23,7 +23,7 @@ import java.util.Set; import org.hibernate.search.annotations.Indexed; import ch.systemsx.cisd.common.reflection.ClassUtils; -import ch.systemsx.cisd.common.utilities.IClassFilter; +import ch.systemsx.cisd.common.reflection.IClassFilter; /** * A {@link IIndexedEntityFinder} based on a package name specified in the constructor.