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

ItEr44S08ImplantacionAplicacionItEr43S09: Pulling up getIndirectAdvanceAssignments method

Browse source
This commit is contained in:
Óscar González Fernández 2010-01-19 19:02:03 +01:00
parent 57941e5d63
commit c57c59b56b
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,6 +39,7 @@ import org.navalplanner.business.advance.bootstrap.PredefinedAdvancedTypes;
import org.navalplanner.business.advance.entities.AdvanceAssignment;
import org.navalplanner.business.advance.entities.AdvanceType;
import org.navalplanner.business.advance.entities.DirectAdvanceAssignment;
import org.navalplanner.business.advance.entities.IndirectAdvanceAssignment;
import org.navalplanner.business.advance.exceptions.DuplicateAdvanceAssignmentForOrderElementException;
import org.navalplanner.business.advance.exceptions.DuplicateValueTrueReportGlobalAdvanceException;
import org.navalplanner.business.common.BaseEntity;
@ -497,6 +498,8 @@ public abstract class OrderElement extends BaseEntity implements
public abstract BigDecimal getAdvancePercentage(LocalDate date);
public abstract Set<IndirectAdvanceAssignment> getIndirectAdvanceAssignments();
public List<OrderElement> getAllChildren() {
List<OrderElement> children = getChildren();
List<OrderElement> result = new ArrayList<OrderElement>(children);

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

@ -24,6 +24,7 @@ import static org.navalplanner.business.i18n.I18nHelper._;
import java.math.BigDecimal;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@ -34,6 +35,7 @@ import org.hibernate.validator.Valid;
import org.joda.time.LocalDate;
import org.navalplanner.business.advance.entities.AdvanceType;
import org.navalplanner.business.advance.entities.DirectAdvanceAssignment;
import org.navalplanner.business.advance.entities.IndirectAdvanceAssignment;
import org.navalplanner.business.requirements.entities.CriterionRequirement;
import org.navalplanner.business.requirements.entities.DirectCriterionRequirement;
import org.navalplanner.business.templates.entities.OrderLineTemplate;
@ -542,4 +544,9 @@ public class OrderLine extends OrderElement {
return OrderLineTemplate.create(this);
}
@Override
public Set<IndirectAdvanceAssignment> getIndirectAdvanceAssignments() {
return Collections.emptySet();
}
}

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

@ -673,6 +673,7 @@ public class OrderLineGroup extends OrderElement implements
return result;
}
@Override
public Set<IndirectAdvanceAssignment> getIndirectAdvanceAssignments() {
return Collections.unmodifiableSet(indirectAdvanceAssignments);
}