From d2e8aeebec5f695742d87600aad4fe3ab24e8e6f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 15 Sep 2009 11:07:03 +0200 Subject: [PATCH] ItEr26S07CUAsignacionGrupoRecursosAPlanificacionItEr25S07: Inlining use of EditTaskModel --- .../web/planner/EditTaskController.java | 4 +-- .../web/planner/EditTaskModel.java | 31 ------------------- .../web/planner/IEditTaskModel.java | 21 ------------- 3 files changed, 1 insertion(+), 55 deletions(-) delete mode 100644 navalplanner-webapp/src/main/java/org/navalplanner/web/planner/EditTaskModel.java delete mode 100644 navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IEditTaskModel.java diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/EditTaskController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/EditTaskController.java index efb9e2063..476207836 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/EditTaskController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/EditTaskController.java @@ -21,8 +21,6 @@ import org.zkoss.zul.Intbox; @Scope(BeanDefinition.SCOPE_PROTOTYPE) public class EditTaskController extends GenericForwardComposer { - private IEditTaskModel editTaskModel; - private TaskElement currentTaskElement; private Intbox hours; @@ -59,7 +57,7 @@ public class EditTaskController extends GenericForwardComposer { // Sets the value of fields fixedDuration.setChecked(task.isFixedDuration() == null ? false : task.isFixedDuration()); - duration.setValue(editTaskModel.getDuration(task)); + duration.setValue(task.getDaysDuration()); // Disable some fields depending on fixedDuration value duration.setDisabled(task.isFixedDuration() == null ? true : !task diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/EditTaskModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/EditTaskModel.java deleted file mode 100644 index bbc2d3a6c..000000000 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/EditTaskModel.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.navalplanner.web.planner; - -import org.navalplanner.business.planner.daos.ITaskElementDAO; -import org.navalplanner.business.planner.entities.Task; -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; - -/** - * Model for UI operations related to edit {@link Task} popup. - * - * @author Manuel Rego Casasnovas - */ -@Service -@Scope(BeanDefinition.SCOPE_PROTOTYPE) -public class EditTaskModel implements IEditTaskModel { - - @Autowired - private ITaskElementDAO taskElementDAO; - - @Override - @Transactional(readOnly = true) - public Integer getDuration(Task task) { - taskElementDAO.save(task); - - return task.getDaysDuration(); - } - -} diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IEditTaskModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IEditTaskModel.java deleted file mode 100644 index 573ee8e28..000000000 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/IEditTaskModel.java +++ /dev/null @@ -1,21 +0,0 @@ -package org.navalplanner.web.planner; - -import org.navalplanner.business.planner.entities.Task; - -/** - * Contract for edit {@link Task} popup. - * - * @author Manuel Rego Casasnovas - */ -public interface IEditTaskModel { - - /** - * Returns the duration of a {@link Task} in number of days. - * - * @param task - * The {@link Task} to get the duration - * @return The days of the {@link Task} - */ - Integer getDuration(Task task); - -}