diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java index 7a450ffcf6b93abd1ac76c7e0e13db4a7a6359de..771d7558cff91203b051421adebf3661a8a311d0 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java @@ -49,7 +49,6 @@ import ch.systemsx.cisd.openbis.generic.server.dataaccess.IGridCustomFilterDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IHibernateSearchDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.ILocatorTypeDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IMaterialDAO; -import ch.systemsx.cisd.openbis.generic.server.dataaccess.IMetaprojectAssignmentDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IMetaprojectDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IPersonDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IPostRegistrationDAO; @@ -448,10 +447,4 @@ abstract class AbstractBusinessObject implements IDAOFactory { return daoFactory.getMetaprojectDAO(); } - - @Override - public IMetaprojectAssignmentDAO getMetaprojectAssignmentDAO() - { - return daoFactory.getMetaprojectAssignmentDAO(); - } } diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDAOFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDAOFactory.java index 018f0319ae8d06e1085bdd6f95e9cfbfacdb9d72..b79a0de51036ae1bf397ecb2151927596d376631 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDAOFactory.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/IDAOFactory.java @@ -115,10 +115,4 @@ public interface IDAOFactory extends IAuthorizationDAOFactory /** Returns an implementation of {@link IExternalDataManagementSystemDAO}. */ public IExternalDataManagementSystemDAO getExternalDataManagementSystemDAO(); - - /** Returns an implementation of {@link IMetaprojectDAO}. */ - public IMetaprojectDAO getMetaprojectDAO(); - - /** Returns an implementation of {@link IMetaprojectAssignmentDAO}. */ - public IMetaprojectAssignmentDAO getMetaprojectAssignmentDAO(); } diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactory.java index 82c6eb20ffd7283afb110f3a1e6b65ddceaa188e..8b5501a1b15390dc69507bbdfc880a8f2aa80636 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactory.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/DAOFactory.java @@ -40,7 +40,6 @@ import ch.systemsx.cisd.openbis.generic.server.dataaccess.IFileFormatTypeDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IHibernateSearchDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.ILocatorTypeDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IMaterialDAO; -import ch.systemsx.cisd.openbis.generic.server.dataaccess.IMetaprojectAssignmentDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IMetaprojectDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IPostRegistrationDAO; import ch.systemsx.cisd.openbis.generic.server.dataaccess.IPropertyTypeDAO; @@ -120,8 +119,6 @@ public final class DAOFactory extends AuthorizationDAOFactory implements IDAOFac private final IMetaprojectDAO metaprojectDAO; - private final IMetaprojectAssignmentDAO metaprojectAssignmentDAO; - public DAOFactory(final DatabaseConfigurationContext context, final SessionFactory sessionFactory, HibernateSearchContext hibernateSearchContext, final IFullTextIndexUpdateScheduler fullTextIndexUpdateScheduler, @@ -165,7 +162,6 @@ public final class DAOFactory extends AuthorizationDAOFactory implements IDAOFac externalDataManagementSystemDAO = new ExternalDataManagementSystemDAO(sessionFactory, databaseInstance); metaprojectDAO = new MetaprojectDAO(sessionFactory, databaseInstance); - metaprojectAssignmentDAO = new MetaprojectAssignmentDAO(sessionFactory, databaseInstance); } // @@ -325,10 +321,4 @@ public final class DAOFactory extends AuthorizationDAOFactory implements IDAOFac { return metaprojectDAO; } - - @Override - public IMetaprojectAssignmentDAO getMetaprojectAssignmentDAO() - { - return metaprojectAssignmentDAO; - } }