Non-functional changes: Fix wrong HTML example. Java 7 diamonds Simplify Java condition
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/cdfaeed7 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/cdfaeed7 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/cdfaeed7 Branch: refs/heads/lambdas Commit: cdfaeed71cfc9fce7863ab5c19994daefcb8519b Parents: b986051 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Feb 26 14:41:20 2016 +0100 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Feb 26 21:54:36 2016 +0100 ---------------------------------------------------------------------- .../java/org/apache/wicket/markup/html/form/RadioGroup.java | 4 ++-- .../main/java/org/apache/wicket/spring/SpringBeanLocator.java | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/cdfaeed7/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java index 8e412e5..38361e2 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/RadioGroup.java @@ -34,9 +34,9 @@ import org.apache.wicket.util.visit.IVisitor; * <pre> * <span wicket:id="radiochoicegroup"> * ... - * <input type="radio" wicket:id="singleradiochoice1">choice 1</input> + * <input type="radio" wicket:id="singleradiochoice1"/>choice 1 * ... - * <input type="radio" wicket:id="singleradiochoice2">choice 2</input> + * <input type="radio" wicket:id="singleradiochoice2"/>choice 2 * ... * </span> * </pre> http://git-wip-us.apache.org/repos/asf/wicket/blob/cdfaeed7/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java ---------------------------------------------------------------------- diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java b/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java index 5344f91..af0d490 100644 --- a/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java +++ b/wicket-spring/src/main/java/org/apache/wicket/spring/SpringBeanLocator.java @@ -178,7 +178,7 @@ public class SpringBeanLocator implements IProxyTargetLocator Class<?> clazz = beanTypeCache == null ? null : beanTypeCache.get(); if (clazz == null) { - beanTypeCache = new WeakReference<Class<?>>( + beanTypeCache = new WeakReference<>( clazz = WicketObjects.resolveClass(beanTypeName)); if (clazz == null) { @@ -305,7 +305,7 @@ public class SpringBeanLocator implements IProxyTargetLocator if (lookupClass != fieldType) { beanNamesArr = ctx.getBeanNamesForType(lookupClass); - beanNames.addAll(Arrays.asList(beanNamesArr)); + beanNames.addAll(Arrays.asList(beanNamesArr)); } Iterator<String> nameIterator = beanNames.iterator(); @@ -366,8 +366,7 @@ public class SpringBeanLocator implements IProxyTargetLocator } boolean exactMatch = fieldResolvableType.isAssignableFrom(candidateResolvableType); - boolean elementMatch = fieldElementsResolvableType != null ? - fieldElementsResolvableType.isAssignableFrom(candidateResolvableType) : false; + boolean elementMatch = fieldElementsResolvableType != null && fieldElementsResolvableType.isAssignableFrom(candidateResolvableType); if (exactMatch) {
