From 4f66d8018db6fff362555b85b4a78442e89e3c6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= Date: Fri, 21 Oct 2011 14:15:03 +0200 Subject: [PATCH] Replace the component Detail from ZK EE with our free replacement in the Java code too. FEA: ItEr75S08MigrationZK5 --- .../AssignedTaskQualityFormsToOrderElementController.java | 3 ++- .../AssignedCriterionRequirementController.java | 3 ++- .../org/navalplanner/web/planner/allocation/AllocationRow.java | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java index d4f506882..b2aba1050 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedTaskQualityFormsToOrderElementController.java @@ -54,13 +54,14 @@ import org.zkoss.zul.Column; import org.zkoss.zul.Columns; import org.zkoss.zul.Constraint; import org.zkoss.zul.Datebox; -import org.zkoss.zul.Detail; import org.zkoss.zul.Grid; import org.zkoss.zul.Messagebox; import org.zkoss.zul.Row; import org.zkoss.zul.RowRenderer; import org.zkoss.zul.SimpleListModel; +import com.igalia.java.zk.components.customdetailrowcomponent.Detail; + /** * Controller for showing OrderElement assigned task quality forms * @author Susana Montes Pedreira diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java index a1b285ac5..f244b06c8 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/criterionrequirements/AssignedCriterionRequirementController.java @@ -59,7 +59,6 @@ import org.zkoss.zk.ui.util.GenericForwardComposer; import org.zkoss.zul.Bandbox; import org.zkoss.zul.Combobox; import org.zkoss.zul.Constraint; -import org.zkoss.zul.Detail; import org.zkoss.zul.Grid; import org.zkoss.zul.Hbox; import org.zkoss.zul.Intbox; @@ -75,6 +74,8 @@ import org.zkoss.zul.Row; import org.zkoss.zul.Rows; import org.zkoss.zul.SimpleListModel; +import com.igalia.java.zk.components.customdetailrowcomponent.Detail; + /** * Controller for showing OrderElement assigned labels * diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java index 1220b33ff..47bd234f0 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java @@ -71,7 +71,6 @@ import org.zkoss.zk.ui.event.Events; import org.zkoss.zk.ui.util.Clients; import org.zkoss.zul.Constraint; import org.zkoss.zul.Decimalbox; -import org.zkoss.zul.Detail; import org.zkoss.zul.Grid; import org.zkoss.zul.Label; import org.zkoss.zul.Listbox; @@ -79,6 +78,8 @@ import org.zkoss.zul.Listitem; import org.zkoss.zul.SimpleConstraint; import org.zkoss.zul.SimpleListModel; +import com.igalia.java.zk.components.customdetailrowcomponent.Detail; + /** * The information that must be introduced to create a * {@link ResourceAllocation}