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

ItEr43S08CUImportacionRecursosProductivosItEr42S12: Resource::checkConstraintUniqueFirstNameSurnameNif provided.

Browse source 
The old method Resource::checkConstraintUniqueFirstName has been renamed to Resource::checkConstraintUniqueFirstNameSurnameNif to better specify its purpose. Furthermore, this method is now redefined in VirtualWorker to always return true (previously this special case was implemented in Resource::checkConstraintUniqueFirstName by using instanceof VirtualWorker).
This commit is contained in:
Fernando Bellas Permuy 2010-01-13 19:00:46 +01:00 • committed by Javier Moran Rua
parent aca51969df
commit 53d8cc7dbf
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/VirtualWorker.java
View file

@ -30,6 +30,7 @@ import org.navalplanner.business.common.Registry;
* This class models a VirtualWorker.
*
* @author Lorenzo Tilve Álvaro <ltilve@igalia.com>
* @author Fernando Bellas Permuy <fbellas@udc.es>
*/
public class VirtualWorker extends Worker {
@ -72,6 +73,11 @@ public class VirtualWorker extends Worker {
this.observations = observations;
}
@AssertTrue
@Override
public boolean checkConstraintUniqueFirstNameSurnameNif() {
return true;
}
@AssertTrue(message = "Virtual worker group name must be unique")
public boolean checkConstraintUniqueVirtualGroupName() {

7
navalplanner-business/src/main/java/org/navalplanner/business/resources/entities/Worker.java
View file

@ -128,12 +128,7 @@ public class Worker extends Resource {
}
@AssertTrue(message = "Worker with the same first name, surname and nif previously existed")
public boolean checkConstraintUniqueFirstName() {
/* Check if it makes sense to check the constraint .*/
if (this instanceof VirtualWorker) {
return true;
}
public boolean checkConstraintUniqueFirstNameSurnameNif() {
if (!areFirstNameSurnameNifSpecified()) {
return true;