ziver/zutil
1
0
Fork 0
Code Issues Pull requests Activity Actions

Some robustness changes

Browse source
This commit is contained in:
Ziver Koc 2016-07-23 01:00:53 +02:00
parent b79284009d
commit cbca0c42c4
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/zutil/ui/Navigation.java
View file

@ -172,7 +172,10 @@ public class Navigation implements Iterable{
* Will create a clone of the navigation tree with some request instance specific information * Will create a clone of the navigation tree with some request instance specific information
*/ */
public NavInstance createParameterizedNavInstance(Map<String, String> request){ public NavInstance createParameterizedNavInstance(Map<String, String> request){
return createParameterizedNavInstance(getBreadcrumb(getParameterizedNavigation(request))); Navigation nav = getParameterizedNavigation(request);
if (nav != null)
return createParameterizedNavInstance(getBreadcrumb(nav));
return createParameterizedNavInstance(Collections.EMPTY_LIST);
} }
private NavInstance createParameterizedNavInstance(List<Navigation> activeList){ private NavInstance createParameterizedNavInstance(List<Navigation> activeList){
NavInstance instance = new ParameterizedNavInstance(this); NavInstance instance = new ParameterizedNavInstance(this);
@ -196,7 +199,7 @@ public class Navigation implements Iterable{
Navigation nav = getPagedNavigation(header); Navigation nav = getPagedNavigation(header);
if (nav != null) if (nav != null)
return createPagedNavInstance(getBreadcrumb(nav)); return createPagedNavInstance(getBreadcrumb(nav));
return null; return createPagedNavInstance(Collections.EMPTY_LIST);
} }
private NavInstance createPagedNavInstance(List<Navigation> activeList){ private NavInstance createPagedNavInstance(List<Navigation> activeList){
NavInstance instance = new PagedNavInstance(this); NavInstance instance = new PagedNavInstance(this);