From 2df6de388ad3cb5910918c7a6012ac182e8f624d Mon Sep 17 00:00:00 2001 From: brinn <brinn> Date: Thu, 4 Oct 2012 21:43:22 +0000 Subject: [PATCH] Move IClassFilter to package reflection. SVN: 27025 --- .../ch/systemsx/cisd/common/reflection/ClassFilterUtils.java | 1 - .../java/ch/systemsx/cisd/common/reflection/ClassUtils.java | 1 - .../cisd/common/{utilities => reflection}/IClassFilter.java | 2 +- .../java/ch/systemsx/cisd/common/reflection/ClassUtilsTest.java | 1 - .../dataaccess/db/search/PackageBasedIndexedEntityFinder.java | 2 +- 5 files changed, 2 insertions(+), 5 deletions(-) rename common/source/java/ch/systemsx/cisd/common/{utilities => reflection}/IClassFilter.java (95%) 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 12ff223679b..0a066e5e45b 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 89d7c64cd4c..4e49bde7802 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 b400f651b2c..387076b43ba 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 f094c375da1..19d4182218f 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 e26c4ccf494..9e439256f2d 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. -- GitLab