From bd04dbe7d189ccf13d3f1eb2e7d97a7a9eefd277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 8 Sep 2009 16:26:25 +0200 Subject: [PATCH] ItEr25S07CUAsignacionGrupoRecursosAPlanificacionItEr24S08: Removing criterions relationshp from GenericDayAssignment --- .../planner/entities/GenericDayAssigment.java | 14 -------------- .../planner/entities/ResourceAllocations.hbm.xml | 5 ----- 2 files changed, 19 deletions(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssigment.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssigment.java index aaac0f840..2c1105351 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssigment.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/GenericDayAssigment.java @@ -1,10 +1,6 @@ package org.navalplanner.business.planner.entities; -import java.util.HashSet; -import java.util.Set; - import org.joda.time.LocalDate; -import org.navalplanner.business.resources.entities.Criterion; import org.navalplanner.business.resources.entities.Resource; /** @@ -16,8 +12,6 @@ public class GenericDayAssigment extends DayAssigment { private GenericResourceAllocation genericResourceAllocation; - private Set criterions = new HashSet(); - public static GenericDayAssigment create(LocalDate day, int hours, Resource resource) { return (GenericDayAssigment) create(new GenericDayAssigment(day, hours, @@ -35,14 +29,6 @@ public class GenericDayAssigment extends DayAssigment { } - public Set getCriterions() { - return criterions; - } - - public void setCriterions(Set criterions) { - this.criterions = criterions; - } - public GenericResourceAllocation getGenericResourceAllocation() { return genericResourceAllocation; } diff --git a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml index 0363651a3..9a211516a 100644 --- a/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml +++ b/navalplanner-business/src/main/resources/org/navalplanner/business/planner/entities/ResourceAllocations.hbm.xml @@ -70,11 +70,6 @@ - - - - -