RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr32S09ValidacionEProbasFuncionaisItEr31S12: [Bug #64] Rename method resource() to getResource()

Browse source
This commit is contained in:
Diego Pino Garcia 2009-10-28 12:59:08 +01:00 • committed by Javier Moran Rua
parent 5452251e1e
commit 6812e03d15
2 changed files with 4 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/CriterionType.java
View file

@ -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<? extends Resource> klass) {
return ResourceEnum.RESOURCE.equals(resource())
|| resource().isAssignableFrom(klass);
return ResourceEnum.RESOURCE.equals(getResource())
|| getResource().isAssignableFrom(klass);
}

2
navalplanner-webapp/src/main/java/org/navalplanner/ws/resources/criterion/impl/CriterionConverter.java
View file

@ -99,7 +99,7 @@ public final class CriterionConverter {
criterionType.allowHierarchy(),
criterionType.isAllowSimultaneousCriterionsPerResource(),
criterionType.isEnabled(),
toDTO(criterionType.resource()),
toDTO(criterionType.getResource()),
criterionDTOs);
}