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

Renames ImportTask to OrderElementDTO

Browse source 
FEA: ItEr77S05BasicProjectImport
This commit is contained in:
Alba Carro 2012-08-24 23:54:33 +02:00 • committed by Manuel Rego Casasnovas
parent 6ea304f988
commit 9f29ec9bb7
4 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libreplan-business/src/main/java/org/libreplan/business/orders/imports/MPXJProjectFileConversor.java
View file

@ -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<ImportTask> List of ImportTask with the data that we want to
* import.
*/
private static List<ImportTask> getImportTasks(List<Task> tasks) {
private static List<OrderElementDTO> getImportTasks(List<Task> tasks) {
List<ImportTask> importTasks = new ArrayList<ImportTask>();
List<OrderElementDTO> importTasks = new ArrayList<OrderElementDTO>();
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();

4
libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderDTO.java
View file

@ -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<ImportTask> tasks;
public List<OrderElementDTO> tasks;
}

4
libreplan-business/src/main/java/org/libreplan/business/orders/imports/ImportTask.java → libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderElementDTO.java
View file

@ -29,7 +29,7 @@ import java.util.List;
* @author Alba Carro Pérez <alba.carro@gmail.com>
* @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<ImportTask> children;
public List<OrderElementDTO> children;
}

8
libreplan-business/src/main/java/org/libreplan/business/orders/imports/OrderImporterMPXJ.java
View file

@ -154,7 +154,7 @@ public class OrderImporterMPXJ implements OrderImporter {
List<OrderElement> children = new ArrayList<OrderElement>();
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<OrderElement> children = new ArrayList<OrderElement>();
for (ImportTask childrenTask : task.children) {
for (OrderElementDTO childrenTask : task.children) {
children.add(convertImportTaskToOrderElement(orderVersion,
childrenTask));
}