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

ItEr37S11CUAdministracionMateriaisItEr36S13: Fix find category in tree (insert new category under new category -> NullPointerException)

Browse source
This commit is contained in:
Diego Pino Garcia 2009-12-03 11:50:07 +01:00 • committed by Javier Moran Rua
parent d1d5884eae
commit 90d8106836
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
navalplanner-webapp/src/main/java/org/navalplanner/web/materials/MaterialsController.java
View file

@ -327,7 +327,7 @@ public class MaterialsController extends
}
private boolean locateAndSelectMaterialCategory(MaterialCategory materialCategory) {
Treeitem treeitem = findTreeItemByMaterialCategory(categoriesTree.getRoot(), materialCategory);
Treeitem treeitem = findTreeItemByMaterialCategory(categoriesTree, materialCategory);
if (treeitem != null) {
treeitem.setSelected(true);
return true;
@ -335,23 +335,14 @@ public class MaterialsController extends
return false;
}
private Treeitem findTreeItemByMaterialCategory(Component node, MaterialCategory materialCategory) {
if (node instanceof Treeitem) {
final Treeitem treeitem = (Treeitem) node;
private Treeitem findTreeItemByMaterialCategory(Tree tree, MaterialCategory materialCategory) {
for (Iterator i = tree.getItems().iterator(); i.hasNext();) {
final Treeitem treeitem = (Treeitem) i.next();
final MaterialCategory _materialCategory = (MaterialCategory) treeitem.getValue();
if (_materialCategory.getId().equals(materialCategory.getId())) {
if (_materialCategory.getId() != null && _materialCategory.getId().equals(materialCategory.getId())) {
return treeitem;
}
}
for (Iterator i = node.getChildren().iterator(); i.hasNext(); ) {
Object obj = i.next();
if (obj instanceof Component) {
Treeitem treeitem = findTreeItemByMaterialCategory((Component) obj, materialCategory);
if (treeitem != null) {
return treeitem;
}
}
}
return null;
}