diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/IResourceSearchModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/IResourceSearchModel.java index f74103a13..427c45dda 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/IResourceSearchModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/IResourceSearchModel.java @@ -71,10 +71,4 @@ public interface IResourceSearchModel { public IResourcesQuery searchBoth(); - /** - * Returns all resources - * @return - */ - List getAllResources(); - } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/ResourceSearchModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/ResourceSearchModel.java index 028729fe0..ea4671afc 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/ResourceSearchModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resources/search/ResourceSearchModel.java @@ -43,7 +43,6 @@ import org.hibernate.classic.Session; import org.navalplanner.business.common.IAdHocTransactionService; import org.navalplanner.business.common.IOnTransaction; import org.navalplanner.business.resources.daos.ICriterionDAO; -import org.navalplanner.business.resources.daos.IResourceDAO; import org.navalplanner.business.resources.entities.Criterion; import org.navalplanner.business.resources.entities.CriterionType; import org.navalplanner.business.resources.entities.Machine; @@ -54,7 +53,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; @Service @Scope(BeanDefinition.SCOPE_PROTOTYPE) @@ -229,18 +227,9 @@ public class ResourceSearchModel implements IResourceSearchModel { }; } - @Autowired - private IResourceDAO resourceDAO; - @Autowired private ICriterionDAO criterionDAO; - @Override - @Transactional(readOnly = true) - public List getAllResources() { - return resourceDAO.getResources(); - } - private IOnTransaction>> getCriterionsTree( final Class klassTheCriterionTypeMustBeRelatedWith) { return new IOnTransaction>>() {