You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2013/06/21 15:50:25 UTC
[06/20] git commit: Java 7 diamonds for wicket-spring
Java 7 diamonds for wicket-spring
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/747f933e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/747f933e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/747f933e
Branch: refs/heads/master
Commit: 747f933ee4eb0630654c3e0678635c8c0be1ef97
Parents: ae1a126
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 14:57:20 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:38 2013 +0200
----------------------------------------------------------------------
.../spring/injection/annot/AnnotProxyFieldValueFactory.java | 2 +-
.../apache/wicket/spring/test/ApplicationContextMock.java | 8 ++++----
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/747f933e/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
index 3d219da..648d2c7 100644
--- a/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
+++ b/wicket-spring/src/main/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactory.java
@@ -241,7 +241,7 @@ public class AnnotProxyFieldValueFactory implements IFieldValueFactory
{
if (ctx instanceof AbstractApplicationContext)
{
- List<String> primaries = new ArrayList<String>();
+ List<String> primaries = new ArrayList<>();
for (String name : names)
{
BeanDefinition beanDef = getBeanDefinition(
http://git-wip-us.apache.org/repos/asf/wicket/blob/747f933e/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java b/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
index fb26d2e..a38c18b 100644
--- a/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
+++ b/wicket-spring/src/main/java/org/apache/wicket/spring/test/ApplicationContextMock.java
@@ -54,7 +54,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
{
private static final long serialVersionUID = 1L;
- private final Map<String, Object> beans = new HashMap<String, Object>();
+ private final Map<String, Object> beans = new HashMap<>();
/**
* puts bean with the given name into the context
@@ -118,7 +118,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
@SuppressWarnings({ "unchecked" })
public <T> Map<String, T> getBeansOfType(Class<T> type) throws BeansException
{
- final Map<String, T> found = new HashMap<String, T>();
+ final Map<String, T> found = new HashMap<>();
for (Entry<String, Object> entry : beans.entrySet())
{
@@ -155,7 +155,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
public Map<String, Object> getBeansWithAnnotation(Class<? extends Annotation> annotationType)
throws BeansException
{
- final Map<String, Object> found = new HashMap<String, Object>();
+ final Map<String, Object> found = new HashMap<>();
for (Entry<String, Object> entry : beans.entrySet())
{
@@ -273,7 +273,7 @@ public class ApplicationContextMock implements ApplicationContext, Serializable
@SuppressWarnings({ "unchecked" })
public String[] getBeanNamesForType(final Class type)
{
- ArrayList<String> names = new ArrayList<String>();
+ ArrayList<String> names = new ArrayList<>();
for (Entry<String, Object> entry : beans.entrySet())
{
Object bean = entry.getValue();