diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/imports/MPXJProjectFileConversor.java b/libreplan-business/src/main/java/org/libreplan/business/orders/imports/MPXJProjectFileConversor.java index eb729f7b2..48aeff0de 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/imports/MPXJProjectFileConversor.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/imports/MPXJProjectFileConversor.java @@ -132,20 +132,20 @@ public class MPXJProjectFileConversor { } /** - * Converts a List of MPXJ Tasks into a List of {@link ImportTask}. + * Converts a List of MPXJ Tasks into a List of {@link OrderElementDTO}. * * @param tasks * List of MPXJ Tasks to extract data from. * @return List List of ImportTask with the data that we want to * import. */ - private static List getImportTasks(List tasks) { + private static List getImportTasks(List tasks) { - List importTasks = new ArrayList(); + List importTasks = new ArrayList(); for (Task task : tasks) { - ImportTask importTask = getTaskData(task); + OrderElementDTO importTask = getTaskData(task); importTask.children = getImportTasks(task.getChildTasks()); @@ -158,15 +158,15 @@ public class MPXJProjectFileConversor { } /** - * Converts a MPXJ Task into a {@link ImportTask}. + * Converts a MPXJ Task into a {@link OrderElementDTO}. * * @param task * MPXJ Task to extract data from. * @return ImportTask ImportTask with the data that we want to import. */ - private static ImportTask getTaskData(Task task) { + private static OrderElementDTO getTaskData(Task task) { - ImportTask importTask = new ImportTask(); + OrderElementDTO importTask = new OrderElementDTO(); importTask.name = task.getName(); diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderDTO.java b/libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderDTO.java index 20973966c..f18db381a 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderDTO.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderDTO.java @@ -36,8 +36,8 @@ public class OrderDTO { public String name; /** - * List of {@link ImportTask} of the project that is going to be imported. + * List of {@link OrderElementDTO} of the project that is going to be imported. */ - public List tasks; + public List tasks; } diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/imports/ImportTask.java b/libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderElementDTO.java similarity index 94% rename from libreplan-business/src/main/java/org/libreplan/business/orders/imports/ImportTask.java rename to libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderElementDTO.java index 21cafa24b..46d14768a 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/imports/ImportTask.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderElementDTO.java @@ -29,7 +29,7 @@ import java.util.List; * @author Alba Carro Pérez * @todo It last hours, resources, relationships, etc. */ -public class ImportTask { +public class OrderElementDTO { /** * Name of the task @@ -39,6 +39,6 @@ public class ImportTask { /** * List of task that are children of this task */ - public List children; + public List children; } diff --git a/libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderImporterMPXJ.java b/libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderImporterMPXJ.java index d57b06e87..26c6161c8 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderImporterMPXJ.java +++ b/libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderImporterMPXJ.java @@ -154,7 +154,7 @@ public class OrderImporterMPXJ implements OrderImporter { List children = new ArrayList(); - for (ImportTask task : project.tasks) { + for (OrderElementDTO task : project.tasks) { children.add(convertImportTaskToOrderElement(orderVersion, task)); } @@ -174,7 +174,7 @@ public class OrderImporterMPXJ implements OrderImporter { /** * Private method. * - * It makes a {@link OrderElement} from a {@link ImportTask} + * It makes a {@link OrderElement} from a {@link OrderElementDTO} * * @param task * ImportTask to extract data from. @@ -183,7 +183,7 @@ public class OrderImporterMPXJ implements OrderImporter { * @return OrderElement OrderElement that represent the data. */ private OrderElement convertImportTaskToOrderElement( - OrderVersion orderVersion, ImportTask task) { + OrderVersion orderVersion, OrderElementDTO task) { Validate.notNull(orderVersion); OrderElement orderElement; @@ -208,7 +208,7 @@ public class OrderImporterMPXJ implements OrderImporter { List children = new ArrayList(); - for (ImportTask childrenTask : task.children) { + for (OrderElementDTO childrenTask : task.children) { children.add(convertImportTaskToOrderElement(orderVersion, childrenTask)); }