Index: src/main/java/info/magnolia/module/templatingkit/setup/UpdateTemplateInSitesConfig.java =================================================================== --- src/main/java/info/magnolia/module/templatingkit/setup/UpdateTemplateInSitesConfig.java (revision 28427) +++ src/main/java/info/magnolia/module/templatingkit/setup/UpdateTemplateInSitesConfig.java Mon Nov 23 11:28:00 MST 2009 @@ -80,19 +80,17 @@ protected void updateSiteDefinition(InstallContext ctx, Content siteDefinition) throws RepositoryException, TaskExecutionException { Content availableTemplatesNode = getAvailableTemplatesFromSite(siteDefinition); if(availableTemplatesNode != null) { - Collection availableTemplates = availableTemplatesNode.getChildren(ItemType.CONTENTNODE); + Collection availableTemplates = availableTemplatesNode.getChildren(ItemType.CONTENTNODE); - Iterator iteratorAvailableTemplates = availableTemplates.iterator(); - while (iteratorAvailableTemplates.hasNext()) { - Content template = (Content) iteratorAvailableTemplates.next(); + for (Content template : availableTemplates) { String templateName = template.getName(); - if(templateName.equals(expectedTemplateName) && !expectedTemplateName.equals(newTemplateName)){ + if (templateName.equals(expectedTemplateName) && !expectedTemplateName.equals(newTemplateName)) { NodeData nameProperty = template.getNodeData("name"); nameProperty.setValue(newTemplateName); String templateHandleBeforeRename = template.getHandle(); ContentUtil.rename(template, newTemplateName); - log.info("Updated node '"+templateHandleBeforeRename+"' from value '"+expectedTemplateName+"' to value '"+newTemplateName+"'"); + log.info("Updated node '" + templateHandleBeforeRename + "' from value '" + expectedTemplateName + "' to value '" + newTemplateName + "'"); - log.info("Renamed node '"+templateHandleBeforeRename+"' to '"+template.getHandle()+"'"); + log.info("Renamed node '" + templateHandleBeforeRename + "' to '" + template.getHandle() + "'"); } } } Index: src/main/java/info/magnolia/module/templatingkit/paragraphs/ImageGalleryParagraphModel.java =================================================================== --- src/main/java/info/magnolia/module/templatingkit/paragraphs/ImageGalleryParagraphModel.java (revision 25444) +++ src/main/java/info/magnolia/module/templatingkit/paragraphs/ImageGalleryParagraphModel.java Mon Nov 23 11:39:44 MST 2009 @@ -102,12 +102,11 @@ if(dmsFolder == null) { return new ArrayList(); } - Collection children = dmsFolder.getChildren(ItemType.CONTENTNODE); + Collection imageChildren = dmsFolder.getChildren(ItemType.CONTENTNODE); List keys = new ArrayList(); - for (Iterator iterator = children.iterator(); iterator.hasNext();) { - Content imageNode = (Content) iterator.next(); + for (Content imageNode: imageChildren) { - if(showImage(new Document(imageNode))) { + if (showImage(new Document(imageNode))) { keys.add(imageNode.getUUID()); } } Index: src/main/java/info/magnolia/module/templatingkit/search/SearchResultItem.java =================================================================== --- src/main/java/info/magnolia/module/templatingkit/search/SearchResultItem.java (revision 25848) +++ src/main/java/info/magnolia/module/templatingkit/search/SearchResultItem.java Mon Nov 23 11:27:59 MST 2009 @@ -162,12 +162,10 @@ endProcess = true; break; } - Collection paragraphs = paragraphCollection.getChildren(); + Collection paragraphs = paragraphCollection.getChildren(); - Iterator parIterator = paragraphs.iterator(); - while (parIterator.hasNext()) { - Content paragraph = (Content) parIterator.next(); + for (Content paragraph : paragraphs) { - if(!processNodeDatas(numberOfSnippets, snippets, paragraph )) { + if (!processNodeDatas(numberOfSnippets, snippets, paragraph)) { endProcess = true; break; } @@ -185,11 +183,9 @@ protected boolean processNodeDatas(int numberOfSnippets, StringBuffer snippets, Content paragraph) { //TODO: code extracted from SearchResultSnippetTag - Collection properties = paragraph.getNodeDataCollection(); + Collection properties = paragraph.getNodeDataCollection(); - Iterator dataIterator = properties.iterator(); - while (dataIterator.hasNext()) { - NodeData property = (NodeData) dataIterator.next(); + for (NodeData property : properties) { if (property.getType() != PropertyType.BINARY) { String resultString = property.getString(); @@ -206,7 +202,7 @@ String searchTerm = this.query; // exclude words with less than 2 chars - if ( searchTerm.length() > 2) { + if (searchTerm.length() > 2) { log.debug("Looking for search term [{}] in [{}]", searchTerm, resultString); @@ -256,7 +252,7 @@ if (numberOfSnippets >= this.maxSnippets) { log.debug("Maximum number of snippets ({}) reached, exiting", - Integer.toString(this.maxSnippets)); + Integer.toString(this.maxSnippets)); return false; } Index: src/main/java/info/magnolia/module/templatingkit/setup/UpdateParagraphInTemplatesConfig.java =================================================================== --- src/main/java/info/magnolia/module/templatingkit/setup/UpdateParagraphInTemplatesConfig.java (revision 24234) +++ src/main/java/info/magnolia/module/templatingkit/setup/UpdateParagraphInTemplatesConfig.java Mon Nov 23 11:40:31 MST 2009 @@ -122,11 +122,10 @@ if(areaNode.hasContent("paragraphs")) { Content paragraphsNode = areaNode.getChildByName("paragraphs"); - for(Iterator iterator = paragraphsNode.getChildren(ItemType.CONTENTNODE).iterator(); iterator.hasNext();){ - Content paraDef = (Content) iterator.next(); + for (Content paraDef : paragraphsNode.getChildren(ItemType.CONTENTNODE)) { String name = paraDef.getName(); - if(name.equals(expectedParagraphName)){ + if (name.equals(expectedParagraphName)) { - log.info("Updated node '"+paraDef.getHandle()+"' from value '"+expectedParagraphName+"' to value '"+newParagraphName+"'"); + log.info("Updated node '" + paraDef.getHandle() + "' from value '" + expectedParagraphName + "' to value '" + newParagraphName + "'"); NodeData nameNode = paraDef.getNodeData("name"); nameNode.setValue(newParagraphName); ContentUtil.rename(paraDef, newParagraphName); Index: src/main/java/info/magnolia/module/templatingkit/paragraphs/FlashModel.java =================================================================== --- src/main/java/info/magnolia/module/templatingkit/paragraphs/FlashModel.java (revision 25373) +++ src/main/java/info/magnolia/module/templatingkit/paragraphs/FlashModel.java Mon Nov 23 11:27:59 MST 2009 @@ -89,8 +89,7 @@ if(StringUtils.isNotEmpty(height)){ LinkUtil.addParameter(link, "height", height); } - for (int i = 0; i < vars.length; i++) { - String var = vars[i]; + for (String var : vars) { String name = StringUtils.substringBefore(var, "="); String value = StringUtils.substringAfter(var, "="); LinkUtil.addParameter(link, name, value); Index: src/main/java/info/magnolia/module/templatingkit/setup/for1_1/AddAvailableTemplatesInSitesTask.java =================================================================== --- src/main/java/info/magnolia/module/templatingkit/setup/for1_1/AddAvailableTemplatesInSitesTask.java (revision 24274) +++ src/main/java/info/magnolia/module/templatingkit/setup/for1_1/AddAvailableTemplatesInSitesTask.java Mon Nov 23 11:42:41 MST 2009 @@ -99,11 +99,9 @@ private void addAvailableTemplatesInETKSites(InstallContext ctx, String etkModulePath) throws RepositoryException, TaskExecutionException{ HierarchyManager hm = ctx.getHierarchyManager(ContentRepository.CONFIG); Content sitesNode = hm.getContent(etkModulePath+"config/sites/"); - Collection sites = sitesNode.getChildren(ItemType.CONTENTNODE); + Collection sites = sitesNode.getChildren(ItemType.CONTENTNODE); - Iterator iteratorSites = sites.iterator(); - while (iteratorSites.hasNext()) { - Content siteDefinition = (Content) iteratorSites.next(); + for (Content siteDefinition : sites) { addAvailableTemplatesInSite(ctx, siteDefinition); } } @@ -112,23 +110,22 @@ Content templates = site.getContent("templates"); Content moduleNode = ctx.getOrCreateCurrentModuleNode(); Content availableTemplates = ContentUtil.getOrCreateContent(templates, "availableTemplates", ItemType.CONTENTNODE); - Content templateDefs = moduleNode.getContent("templates"); + Content templateDefs = moduleNode.getContent("templates"); - for (Iterator iterator = templateDefs.getChildren(ItemType.CONTENTNODE).iterator(); iterator.hasNext();) { - Content templateDef = (Content) iterator.next(); + for (Content templateDef : templateDefs.getChildren(ItemType.CONTENTNODE)) { String name = templateDef.getName(); Content availableTemplateNode; - if(!availableTemplates.hasContent(name)){ + if (!availableTemplates.hasContent(name)) { availableTemplateNode = availableTemplates.createContent(name, ItemType.CONTENTNODE); availableTemplateNode.createNodeData("name", name); - log.info("Created node '"+availableTemplateNode.getHandle()+"' with value '"+name+"' in property 'name'"); + log.info("Created node '" + availableTemplateNode.getHandle() + "' with value '" + name + "' in property 'name'"); } else { availableTemplateNode = availableTemplates.getContent(name); } - if(TemplateCategory.FEATURE.equals(NodeDataUtil.getString(templateDef, "category"))){ + if (TemplateCategory.FEATURE.equals(NodeDataUtil.getString(templateDef, "category"))) { - if(!availableTemplateNode.hasContent("roles")){ + if (!availableTemplateNode.hasContent("roles")) { availableTemplateNode.createContent("roles", ItemType.CONTENTNODE).createNodeData("superuser", "superuser"); - log.info("Created in '"+availableTemplateNode.getHandle()+"' a subnode 'roles' with the property 'superuser' and value 'superuser'"); + log.info("Created in '" + availableTemplateNode.getHandle() + "' a subnode 'roles' with the property 'superuser' and value 'superuser'"); } } } Index: src/main/java/info/magnolia/module/templatingkit/navigation/SubNavigation.java =================================================================== --- src/main/java/info/magnolia/module/templatingkit/navigation/SubNavigation.java (revision 23119) +++ src/main/java/info/magnolia/module/templatingkit/navigation/SubNavigation.java Mon Nov 23 11:43:10 MST 2009 @@ -69,10 +69,9 @@ public List getItems(){ List items = new ArrayList(); if(depth>0){ - for (Iterator iterator = content.getChildren().iterator(); iterator.hasNext();) { - Content child = (Content) iterator.next(); + for (Content child : content.getChildren()) { - NavigationItem mp = new NavigationItem(child, this, depth-1, allOpen); + NavigationItem mp = new NavigationItem(child, this, depth - 1, allOpen); - if(mp.isVisible()){ + if (mp.isVisible()) { items.add(mp); } } Index: src/main/java/info/magnolia/module/templatingkit/beanmerger/CopyPropertiesMerger.java =================================================================== --- src/main/java/info/magnolia/module/templatingkit/beanmerger/CopyPropertiesMerger.java (revision 23116) +++ src/main/java/info/magnolia/module/templatingkit/beanmerger/CopyPropertiesMerger.java Mon Nov 23 11:27:59 MST 2009 @@ -73,20 +73,18 @@ return base; } PropertyDescriptor[] descrs = PropertyUtils.getPropertyDescriptors(instance); - for (int i = 0; i < descrs.length; i++) { - PropertyDescriptor descr = descrs[i]; + for (PropertyDescriptor descr : descrs) { final String propertyName = descr.getName(); - if(descr.getWriteMethod() != null && !isExcluded(instance, propertyName)){ + if (descr.getWriteMethod() != null && !isExcluded(instance, propertyName)) { List values = new ArrayList(); - for (Iterator iterator = sources.iterator(); iterator.hasNext();) { - Object source = (Object) iterator.next(); + for (Object source : sources) { try { - if(PropertyUtils.getPropertyDescriptor(source, propertyName) != null){ + if (PropertyUtils.getPropertyDescriptor(source, propertyName) != null) { values.add(PropertyUtils.getProperty(source, propertyName)); } } catch (Exception e) { - log.error("Can't read property " + propertyName,e); + log.error("Can't read property " + propertyName, e); } } try { Index: src/main/java/info/magnolia/module/templatingkit/setup/for1_1/AddDAMPropertyInWebsiteContentOpetation.java =================================================================== --- src/main/java/info/magnolia/module/templatingkit/setup/for1_1/AddDAMPropertyInWebsiteContentOpetation.java (revision 25453) +++ src/main/java/info/magnolia/module/templatingkit/setup/for1_1/AddDAMPropertyInWebsiteContentOpetation.java Mon Nov 23 11:27:59 MST 2009 @@ -86,12 +86,10 @@ template = node.getAncestor(1).getTemplate(); } if(template.startsWith("stk")){ - Iterator nodeDatas = node.getNodeDataCollection().iterator(); - while (nodeDatas.hasNext()) { - NodeData nodeData = (NodeData) nodeDatas.next(); + for (NodeData nodeData : node.getNodeDataCollection()) { - if(StringUtils.endsWith(nodeData.getName(), propertySuffix)) { + if (StringUtils.endsWith(nodeData.getName(), propertySuffix)) { String damNodeDataName = StringUtils.replace(nodeData.getName(), propertySuffix, ""); - if(!node.hasNodeData(damNodeDataName)) { + if (!node.hasNodeData(damNodeDataName)) { NodeDataUtil.getOrCreateAndSet(node, damNodeDataName, expectedValue); } } Index: src/main/java/info/magnolia/module/templatingkit/beanmerger/ProxyBasedBeanMerger.java =================================================================== --- src/main/java/info/magnolia/module/templatingkit/beanmerger/ProxyBasedBeanMerger.java (revision 21829) +++ src/main/java/info/magnolia/module/templatingkit/beanmerger/ProxyBasedBeanMerger.java Mon Nov 23 11:27:59 MST 2009 @@ -105,8 +105,7 @@ } List values = new ArrayList(); - for (Iterator iterator = sources.iterator(); iterator.hasNext();) { - Object obj = (Object) iterator.next(); + for (Object obj : sources) { values.add(evaluate(obj, method, arguments)); } Index: src/main/java/info/magnolia/module/templatingkit/setup/for1_1/UpdateSiteConfigurationTask.java =================================================================== --- src/main/java/info/magnolia/module/templatingkit/setup/for1_1/UpdateSiteConfigurationTask.java (revision 25818) +++ src/main/java/info/magnolia/module/templatingkit/setup/for1_1/UpdateSiteConfigurationTask.java Mon Nov 23 11:27:59 MST 2009 @@ -101,11 +101,10 @@ protected void updateInETKSites(InstallContext ctx, String etkModulePath) throws RepositoryException, TaskExecutionException{ HierarchyManager hm = ctx.getHierarchyManager(ContentRepository.CONFIG); Content sitesNode = hm.getContent(etkModulePath+"config/sites/"); - Collection sites = sitesNode.getChildren(ItemType.CONTENTNODE); + Collection sites = sitesNode.getChildren(ItemType.CONTENTNODE); - Iterator iteratorSites = sites.iterator(); - while (iteratorSites.hasNext()) { - Content siteDefinition = (Content) iteratorSites.next(); + for (Content site : sites) { + Content siteDefinition = site; updateSite(ctx, siteDefinition); } } Index: src/main/java/info/magnolia/module/templatingkit/templates/SingletonParagraphTemplateModel.java =================================================================== --- src/main/java/info/magnolia/module/templatingkit/templates/SingletonParagraphTemplateModel.java (revision 29281) +++ src/main/java/info/magnolia/module/templatingkit/templates/SingletonParagraphTemplateModel.java Mon Nov 23 11:27:59 MST 2009 @@ -137,8 +137,8 @@ protected void setDefaultValues(Content singletonNode, Map defaultValues) throws RepositoryException { // set default Values - for (Iterator iterator = defaultValues.keySet().iterator(); iterator.hasNext();) { - String name = (String) iterator.next(); + for (Object key : defaultValues.keySet()) { + String name = (String) key; Object value = defaultValues.get(name); singletonNode.createNodeData(name, value); } Index: src/main/java/info/magnolia/module/templatingkit/beanmerger/BeanMergerBase.java =================================================================== --- src/main/java/info/magnolia/module/templatingkit/beanmerger/BeanMergerBase.java (revision 23116) +++ src/main/java/info/magnolia/module/templatingkit/beanmerger/BeanMergerBase.java Mon Nov 23 11:48:00 MST 2009 @@ -92,12 +92,11 @@ abstract protected Object mergeBean(List sources); - protected Object mergeMaps(List sources) { + protected Map mergeMaps(List sources) { Map mergedMap; try { - mergedMap = (Map) sources.get(0).getClass().newInstance(); - for (Iterator iterator = sources.iterator(); iterator.hasNext();) { - Map map = (Map) iterator.next(); + mergedMap = sources.get(0).getClass().newInstance(); + for (Map map : sources) { mergedMap.putAll(map); } return mergedMap; @@ -108,11 +107,10 @@ } } - protected Object mergeCollections(List sources){ + protected Collection mergeCollections(List sources){ try{ - Collection mergedCol = (Collection) sources.get(0).getClass().newInstance(); - for (Iterator iterator = sources.iterator(); iterator.hasNext();) { - Collection col = (Collection) iterator.next(); + Collection mergedCol = sources.get(0).getClass().newInstance(); + for ( Collection col : sources) { mergedCol.addAll(col); } return mergedCol; Index: src/main/java/info/magnolia/module/templatingkit/dam/dialog/DialogDAM.java =================================================================== --- src/main/java/info/magnolia/module/templatingkit/dam/dialog/DialogDAM.java (revision 25575) +++ src/main/java/info/magnolia/module/templatingkit/dam/dialog/DialogDAM.java Mon Nov 23 11:31:15 MST 2009 @@ -117,10 +117,9 @@ out.write(""); } - Iterator it = handler.getControls().iterator(); - while (it.hasNext()) { - Content controlNodeConfig = (Content) it.next(); + for (Object control : handler.getControls()) { + Content controlNodeConfig = (Content) control; - ((DialogControlImpl)this.getSub(this.getName() + controlNodeConfig.getName())).drawHtml(out); + ((DialogControlImpl) this.getSub(this.getName() + controlNodeConfig.getName())).drawHtml(out); } if(handlers.size() > 1) { @@ -135,16 +134,15 @@ for(DAMHandler handler: handlers) { - Iterator it = handler.getControls().iterator(); - while (it.hasNext()) { - Content controlNodeConfig = (Content) it.next(); + for (Object c : handler.getControls()) { + Content controlNodeConfig = (Content) c; try { DialogControl control = DialogFactory.loadDialog(this.getRequest(), this.getResponse(), this.getStorageNode(), controlNodeConfig); - String name = ((DialogControlImpl)control).getName(); + String name = ((DialogControlImpl) control).getName(); - ((DialogControlImpl)control).setName(this.getName() + name); + ((DialogControlImpl) control).setName(this.getName() + name); - this.addSub((DialogControlImpl)control); + this.addSub((DialogControlImpl) control); } catch (RepositoryException e) { // @@ -221,19 +219,18 @@ control.setHtmlPost("" + control.getHtmlPost()); int item = 1; int itemsPerCol = (int) Math.ceil(selectOptions.size() / ((double) cols)); - for (int i = 0; i < selectOptions.size(); i++) { - Button b = (Button) selectOptions.get(i); + for (Object selectOption : selectOptions) { + Button b = (Button) selectOption; if (item == 1) { b.setHtmlPre("" - + control.getButtonHtmlPre()); + + control.getButtonHtmlPre()); } if (item == itemsPerCol) { b.setHtmlPost(control.getButtonHtmlPost() + "
"); + + CssConstants.CSSCLASS_BUTTONSETINTERCOL + + "\">"); item = 1; - } - else { + } else { item++; } } Index: src/main/java/info/magnolia/module/templatingkit/setup/ResourceXmlUtil.java =================================================================== --- src/main/java/info/magnolia/module/templatingkit/setup/ResourceXmlUtil.java (revision 24525) +++ src/main/java/info/magnolia/module/templatingkit/setup/ResourceXmlUtil.java Mon Nov 23 11:27:59 MST 2009 @@ -94,8 +94,8 @@ List namespaces = new ArrayList(); namespaces.add(doc.getRootElement().getNamespace()); List additionalNs = doc.getRootElement().getAdditionalNamespaces(); - for (int i=0; i < additionalNs.size(); i++) { - Namespace namespace = (Namespace) additionalNs.get(i); + for (Object additionalN : additionalNs) { + Namespace namespace = (Namespace) additionalN; xpath.addNamespace(namespace); } @@ -142,9 +142,9 @@ String xpathExpr = ""; String[] slices = path.split("/"); - for(int i=0; i < slices.length; i++) { - if(slices[i] != null && slices[i].length() > 0) { - xpathExpr += "/sv:node[@sv:name='" + slices[i] + "']"; + for (String slice : slices) { + if (slice != null && slice.length() > 0) { + xpathExpr += "/sv:node[@sv:name='" + slice + "']"; } } return xpathExpr; Index: src/main/java/info/magnolia/module/templatingkit/setup/InstallJavascriptsTask.java =================================================================== --- src/main/java/info/magnolia/module/templatingkit/setup/InstallJavascriptsTask.java (revision 29656) +++ src/main/java/info/magnolia/module/templatingkit/setup/InstallJavascriptsTask.java Mon Nov 23 11:27:59 MST 2009 @@ -89,8 +89,7 @@ // add aggregation script this.addTask(new InstallResourceTask(JAVASCRIPT_RESOURCES_PATH + "/all.js", "processedJs", STKResourceModel.class.getName())); - for (int i = 0; i < scripts.length; i++) { - String script = scripts[i]; + for (String script : scripts) { this.addTask(new InstallResourceTask(JAVASCRIPT_RESOURCES_PATH + "/all/" + script, "js")); } } Index: src/main/java/info/magnolia/module/templatingkit/setup/UpdateParagraphInSitesConfig.java =================================================================== --- src/main/java/info/magnolia/module/templatingkit/setup/UpdateParagraphInSitesConfig.java (revision 28427) +++ src/main/java/info/magnolia/module/templatingkit/setup/UpdateParagraphInSitesConfig.java Mon Nov 23 11:27:59 MST 2009 @@ -110,16 +110,16 @@ } private void updateInParagraphsNodeExpectedValue(Content paragraphsNode) throws AccessDeniedException, RepositoryException{ - for(Iterator iterator = paragraphsNode.getChildren(ItemType.CONTENTNODE).iterator(); iterator.hasNext();){ - Content paragraph = (Content) iterator.next(); + for (Object node : paragraphsNode.getChildren(ItemType.CONTENTNODE)) { + Content paragraph = (Content) node; String paragraphName = paragraph.getName(); - if(paragraphName.equals(expectedParagraphName) && !expectedParagraphName.equals(newParagraphName)){ + if (paragraphName.equals(expectedParagraphName) && !expectedParagraphName.equals(newParagraphName)) { NodeData nameProperty = paragraph.getNodeData("name"); nameProperty.setValue(newParagraphName); String paragraphHandleBeforeRename = paragraph.getHandle(); ContentUtil.rename(paragraph, newParagraphName); - log.info("Updated node '"+paragraphHandleBeforeRename+"' from value '"+expectedParagraphName+"' to value '"+newParagraphName+"'"); + log.info("Updated node '" + paragraphHandleBeforeRename + "' from value '" + expectedParagraphName + "' to value '" + newParagraphName + "'"); - log.info("Renamed node '"+paragraphHandleBeforeRename+"' to '"+paragraph.getHandle()+"'"); + log.info("Renamed node '" + paragraphHandleBeforeRename + "' to '" + paragraph.getHandle() + "'"); } } } Index: src/main/java/info/magnolia/module/templatingkit/navigation/NavigationModel.java =================================================================== --- src/main/java/info/magnolia/module/templatingkit/navigation/NavigationModel.java (revision 23119) +++ src/main/java/info/magnolia/module/templatingkit/navigation/NavigationModel.java Mon Nov 23 11:27:59 MST 2009 @@ -88,21 +88,20 @@ } private NavigationItem _getSelectedItem(List items) { - for (Iterator iterator = items.iterator(); iterator.hasNext();) { - NavigationItem item = (NavigationItem) iterator.next(); - if(item.isSelected()){ - return item; - } - else if(selectedNode.getHandle().startsWith(item.getContent().getHandle())){ - if(item.isLeaf()){ + for (Object item1 : items) { + NavigationItem navigationItem = (NavigationItem) item1; + if (navigationItem.isSelected()) { + return navigationItem; + } else if (selectedNode.getHandle().startsWith(navigationItem.getContent().getHandle())) { + if (navigationItem.isLeaf()) { // once we don't find a menu point we still fall back on the home // otherwise the home would always match because content wise it is the shared parent - if(!(item.equals(home))){ - return item; + if (!(navigationItem.equals(home))) { + return navigationItem; } } - NavigationItem found = _getSelectedItem(item.getItems()); + NavigationItem found = _getSelectedItem(navigationItem.getItems()); - if(found != null){ + if (found != null) { return found; } }