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

Avoided cast exception when entering WBS with Gantt resource filters

Browse source 
FEA: ItEr77S15FilteringEnhancements
This commit is contained in:
Lorenzo Tilve Álvaro 2013-02-08 10:34:06 +01:00
parent 1e10f58c3a
commit f539a84627
1 changed files with 13 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
libreplan-webapp/src/main/java/org/libreplan/web/orders/OrderElementTreeController.java
View file

@ -43,6 +43,7 @@ import org.libreplan.business.orders.entities.OrderElement;
import org.libreplan.business.orders.entities.OrderLine;
import org.libreplan.business.orders.entities.OrderLineGroup;
import org.libreplan.business.orders.entities.SchedulingState;
import org.libreplan.business.planner.entities.TaskElement;
import org.libreplan.business.requirements.entities.CriterionRequirement;
import org.libreplan.business.templates.entities.OrderElementTemplate;
import org.libreplan.business.users.entities.UserRole;
@ -53,7 +54,9 @@ import org.libreplan.web.common.Util;
import org.libreplan.web.common.components.bandboxsearch.BandboxMultipleSearch;
import org.libreplan.web.common.components.bandboxsearch.BandboxSearch;
import org.libreplan.web.common.components.finders.FilterPair;
import org.libreplan.web.common.components.finders.IFilterEnum;
import org.libreplan.web.common.components.finders.OrderElementFilterEnum;
import org.libreplan.web.common.components.finders.TaskElementFilterEnum;
import org.libreplan.web.orders.assigntemplates.TemplateFinderPopup;
import org.libreplan.web.orders.assigntemplates.TemplateFinderPopup.IOnResult;
import org.libreplan.web.security.SecurityUtils;
@ -293,8 +296,10 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
if (FilterUtils.readOrderParameters(order) != null) {
for (FilterPair each : (List<FilterPair>) FilterUtils
.readOrderParameters(order)) {
bdFiltersOrderElement
.addSelectedElement(toOrderFilterEnum(each));
if (toOrderFilterEnum(each) != null) {
bdFiltersOrderElement
.addSelectedElement(toOrderFilterEnum(each));
}
}
}
if (FilterUtils.readOrderInheritance(order) != null) {
@ -304,13 +309,17 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
}
private FilterPair toOrderFilterEnum(FilterPair each) {
if (each.getValue() instanceof Label) {
switch ((TaskElementFilterEnum) each.getType()) {
case Label:
return new FilterPair(OrderElementFilterEnum.Label,
each.getPattern(), each.getValue());
} else {
case Criterion:
return new FilterPair(OrderElementFilterEnum.Criterion,
each.getPattern(), each.getValue());
case Resource:
// Resources are discarded on WBS filter
}
return null;
}
private void disableCreateTemplateButtonIfNeeded(Component comp) {