diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java index e98f63590..63710174d 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java @@ -162,18 +162,10 @@ public class CriterionType extends BaseEntity implements this.allowSimultaneousCriterionsPerResource = allowSimultaneousCriterionsPerResource; } - public ResourceEnum resource() { + public ResourceEnum getResource() { return resource; } - public String getResource() { - return resource.toString(); - } - - public void setResource(String resource) { - setResource(ResourceEnum.valueOf(resource)); - } - public void setResource(ResourceEnum resource) { this.resource = resource; } @@ -213,8 +205,8 @@ public class CriterionType extends BaseEntity implements */ @Override public boolean criterionCanBeRelatedTo(Class klass) { - return ResourceEnum.RESOURCE.equals(resource()) - || resource().isAssignableFrom(klass); + return ResourceEnum.RESOURCE.equals(getResource()) + || getResource().isAssignableFrom(klass); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java b/navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java index d8af91a09..389fffe9e 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java @@ -99,7 +99,7 @@ public final class CriterionConverter { criterionType.allowHierarchy(), criterionType.isAllowSimultaneousCriterionsPerResource(), criterionType.isEnabled(), - toDTO(criterionType.resource()), + toDTO(criterionType.getResource()), criterionDTOs); }