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

ItEr16S11CUCreacionDeOrganizacionsDeTraballoItEr15S06: Change behaviour when moving a TaskLeaf or a TaskContainer to a TaskLeaf

Browse source
This commit is contained in:
Diego Pino Garcia 2009-07-09 13:04:58 +02:00 • committed by Javier Moran Rua
parent f93836439b
commit 7da8d5165c
4 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderElement.java
View file

@ -93,7 +93,7 @@ public abstract class OrderElement {
return description;
}
public abstract OrderLineGroup asContainer();
public abstract OrderLineGroup toContainer();
public abstract void forceLoadHourGroups();

6
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLine.java
View file

@ -26,13 +26,13 @@ public class OrderLine extends OrderElement {
}
@Override
public OrderLineGroup asContainer() {
public OrderLineGroup toContainer() {
OrderLineGroup result = new OrderLineGroup();
result.setName(getName());
result.setInitDate(getInitDate());
result.setEndDate(getEndDate());
// FIXME
// result.setHoursGroups(getHoursGroups());
result.add(this);
return result;
}

2
navalplanner-business/src/main/java/org/navalplanner/business/orders/entities/OrderLineGroup.java
View file

@ -42,7 +42,7 @@ public class OrderLineGroup extends OrderElement implements IOrderLineGroup {
}
@Override
public OrderLineGroup asContainer() {
public OrderLineGroup toContainer() {
return this;
}

7
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeModel.java
View file

@ -68,7 +68,8 @@ public class OrderElementTreeModel extends SimpleTreeModel {
}
private void addOrderElementAtImpl(SimpleTreeNode node, OrderElement orderElement) {
addOrderElementAtImpl(node, orderElement, node.getChildCount());
IOrderLineGroup container = turnIntoContainerIfNeeded(node);
container.add(orderElement);
}
private void addOrderElementAtImpl(SimpleTreeNode destinationNode, OrderElement orderElement,
@ -84,7 +85,7 @@ public class OrderElementTreeModel extends SimpleTreeModel {
return (IOrderLineGroup) selectedForTurningIntoContainer
.getData();
OrderElement toBeTurned = asOrderLine(selectedForTurningIntoContainer);
OrderLineGroup asContainer = toBeTurned.asContainer();
OrderLineGroup asContainer = toBeTurned.toContainer();
parentContainer.replace(toBeTurned, asContainer);
return asContainer;
}
@ -203,4 +204,4 @@ public class OrderElementTreeModel extends SimpleTreeModel {
orderLineGroup.remove(asOrderLine(value));
}
}
}