Index: src/main/java/info/magnolia/module/templatingkit/templates/DefaultSTKTemplateConfiguration.java =================================================================== --- src/main/java/info/magnolia/module/templatingkit/templates/DefaultSTKTemplateConfiguration.java (revision 27041) +++ src/main/java/info/magnolia/module/templatingkit/templates/DefaultSTKTemplateConfiguration.java Mon Nov 23 11:27:59 MST 2009 @@ -182,14 +182,14 @@ final Navigation horizontal = new Navigation(); horizontal.setEnabled(Boolean.TRUE); - horizontal.setLevel(Integer.valueOf(1)); + horizontal.setLevel(1); horizontal.setAllOpen(Boolean.FALSE); horizontal.setTemplate("/templating-kit/templates/global/horizontalNavigation.ftl"); final Navigation vertical = new Navigation(); vertical.setEnabled(Boolean.TRUE); - vertical.setLevel(Integer.valueOf(4)); + vertical.setLevel(4); vertical.setAllOpen(Boolean.FALSE); vertical.setTemplate("/templating-kit/templates/global/verticalNavigation.ftl"); @@ -201,7 +201,7 @@ protected ExtrasArea getExtrasArea() { final ExtrasArea extras = new ExtrasArea(); extras.setEnabled(Boolean.TRUE); - extras.setColumns(Integer.valueOf(1)); + extras.setColumns(1); extras.setSmall(Boolean.TRUE); extras.setTemplate("/templating-kit/templates/global/extrasArea.ftl"); Index: src/main/java/info/magnolia/module/templatingkit/paragraphs/AbstractItemListModel.java =================================================================== --- src/main/java/info/magnolia/module/templatingkit/paragraphs/AbstractItemListModel.java (revision 23373) +++ src/main/java/info/magnolia/module/templatingkit/paragraphs/AbstractItemListModel.java Mon Nov 23 11:05:19 MST 2009 @@ -118,8 +118,8 @@ return subNodeSearchPath; } - public Collection getItems() throws RepositoryException{ - List itemsList = search(); + public Collection getItems() throws RepositoryException{ + List itemsList = search(); this.filter(itemsList); this.sort(itemsList); @@ -134,7 +134,7 @@ return new STKPager(currentPageLink, getItems(), content); } - protected List search() throws RepositoryException { + protected List search() throws RepositoryException { return STKUtil.getContentListByTemplateCategorySubCategory(getSearchRoot(), getCategoryName(), getSubcategoryName()); } Index: src/main/java/info/magnolia/module/templatingkit/util/STKUtil.java =================================================================== --- src/main/java/info/magnolia/module/templatingkit/util/STKUtil.java (revision 28812) +++ src/main/java/info/magnolia/module/templatingkit/util/STKUtil.java Mon Nov 23 11:07:38 MST 2009 @@ -275,7 +275,7 @@ final InheritanceContentWrapper wrapper = new InheritanceContentWrapper(content); if(!wrapper.hasContent(name)){ - return Collections.EMPTY_LIST; + return Collections.emptyList(); } Collection children = wrapper.getContent(name).getChildren(new InheritanceContentFilter(content)); @@ -384,7 +384,7 @@ return null; } - public static List getContentListByTemplateName(Content searchRoot, String templateName) throws RepositoryException{ + public static List getContentListByTemplateName(Content searchRoot, String templateName) throws RepositoryException{ HierarchyManager hm = searchRoot.getHierarchyManager(); String path = searchRoot.getHandle(); String repository = hm.getName(); @@ -406,9 +406,9 @@ return itemsList; } - public static List getContentListByTemplateCategorySubCategory(Content siteRoot, String category, String subCategory) throws RepositoryException { + public static List getContentListByTemplateCategorySubCategory(Content siteRoot, String category, String subCategory) throws RepositoryException { - List templates = new ArrayList(); + List templates = new ArrayList(); Iterator templatesIterator = TemplateManager.getInstance().getAvailableTemplates(); Template template; @@ -427,12 +427,11 @@ public static Content getNearestContentByTemplateCategorySubCategory(Content siteRoot, String category, String subCategory, Content current) throws RepositoryException { - List contentList = getContentListByTemplateCategorySubCategory(siteRoot, category, subCategory); + List contentList = getContentListByTemplateCategorySubCategory(siteRoot, category, subCategory); if(!contentList.isEmpty()) { Content bestMatching = null; int bestMatchingLength =-1; - for (Iterator iterator = contentList.iterator(); iterator.hasNext();) { - Content content = (Content) iterator.next(); + for (Content content : contentList) { int matchingLegth = StringUtils.indexOfDifference(content.getHandle(), current.getHandle()); if(matchingLegth > bestMatchingLength){ bestMatchingLength = matchingLegth; @@ -446,7 +445,7 @@ public static Content getContentByTemplateCategorySubCategory(Content siteRoot, String category, String subCategory) throws RepositoryException { - List contentList = getContentListByTemplateCategorySubCategory(siteRoot, category, subCategory); + List contentList = getContentListByTemplateCategorySubCategory(siteRoot, category, subCategory); if(!contentList.isEmpty()) { Collections.sort(contentList, new Comparator(){ public int compare(final Object arg0, final Object arg1) { @@ -459,7 +458,7 @@ } } }); - return (Content) contentList.get(0); + return contentList.get(0); } return null; } Index: src/main/java/info/magnolia/module/templatingkit/badge/LicenseChecker.java =================================================================== --- src/main/java/info/magnolia/module/templatingkit/badge/LicenseChecker.java (revision 21829) +++ src/main/java/info/magnolia/module/templatingkit/badge/LicenseChecker.java Mon Nov 23 11:27:59 MST 2009 @@ -74,7 +74,7 @@ public static boolean isLicensed(String moduleName){ if(licenseCheckMethod != null){ try { - return ((Boolean)licenseCheckMethod.invoke(null, new Object[]{moduleName})).booleanValue(); + return (Boolean) licenseCheckMethod.invoke(null, new Object[]{moduleName}); } catch (Exception e) { // Index: src/main/java/info/magnolia/module/templatingkit/navigation/SiteNavigationModel.java =================================================================== --- src/main/java/info/magnolia/module/templatingkit/navigation/SiteNavigationModel.java (revision 23219) +++ src/main/java/info/magnolia/module/templatingkit/navigation/SiteNavigationModel.java Mon Nov 23 11:27:59 MST 2009 @@ -82,7 +82,7 @@ public NavigationModel getHorizontalNavigation() throws RepositoryException{ if(isShowHorizontalNavigation()){ - boolean allOpen = siteNavigation.getHorizontal().getAllOpen().booleanValue(); + boolean allOpen = siteNavigation.getHorizontal().getAllOpen(); return new NavigationModel(siteRoot, currentNode, getHorizontalLevel(), allOpen, true); } return null; @@ -103,12 +103,12 @@ rootIsHome = false; } Content root = currentNode.getAncestor(startLevel); - boolean allOpen = siteNavigation.getVertical().getAllOpen().booleanValue(); + boolean allOpen = siteNavigation.getVertical().getAllOpen(); return new NavigationModel(root, currentNode, getVerticalLevel(), allOpen, rootIsHome); } public boolean isShowHorizontalNavigation() { - return siteNavigation.getHorizontal().getEnabled().booleanValue(); + return siteNavigation.getHorizontal().getEnabled(); } public boolean isShowVerticalNavigation() { @@ -116,7 +116,7 @@ if(isShowHorizontalNavigation() && siteRoot.getLevel() + this.getHorizontalLevel() > currentNode.getLevel() ){ return false; } - final boolean enabled = siteNavigation.getVertical().getEnabled().booleanValue(); + final boolean enabled = siteNavigation.getVertical().getEnabled(); final boolean empty = _getVerticalNavigation().getItems().isEmpty(); return enabled && !empty; } @@ -127,11 +127,11 @@ } public int getVerticalLevel() { - return siteNavigation.getVertical().getLevel().intValue(); + return siteNavigation.getVertical().getLevel(); } public int getHorizontalLevel() { - return siteNavigation.getHorizontal().getLevel().intValue(); + return siteNavigation.getHorizontal().getLevel(); } } Index: src/main/java/info/magnolia/module/templatingkit/style/BodyClassResolver.java =================================================================== --- src/main/java/info/magnolia/module/templatingkit/style/BodyClassResolver.java (revision 25571) +++ src/main/java/info/magnolia/module/templatingkit/style/BodyClassResolver.java Mon Nov 23 11:27:59 MST 2009 @@ -106,9 +106,9 @@ } ExtrasArea extrasArea = def.getExtrasArea(); - boolean extras = extrasArea.getEnabled().booleanValue(); - int extrasColumns = extrasArea.getColumns().intValue(); - boolean extrasSmall = extrasArea.getSmall().booleanValue(); + boolean extras = extrasArea.getEnabled(); + int extrasColumns = extrasArea.getColumns(); + boolean extrasSmall = extrasArea.getSmall(); if(extras){ for(int i=1; i<= extrasColumns; i++) {