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:28 UTC
[09/20] git commit: Java 7 diamonds for wicket-cdi
Java 7 diamonds for wicket-cdi
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6510f107
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6510f107
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6510f107
Branch: refs/heads/master
Commit: 6510f10793b25ab9e048c7a490b8597cc7cb2f85
Parents: 747f933
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 15:00:01 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:38 2013 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/cdi/NonContextual.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6510f107/wicket-cdi/src/main/java/org/apache/wicket/cdi/NonContextual.java
----------------------------------------------------------------------
diff --git a/wicket-cdi/src/main/java/org/apache/wicket/cdi/NonContextual.java b/wicket-cdi/src/main/java/org/apache/wicket/cdi/NonContextual.java
index 2af8641..c2392e1 100644
--- a/wicket-cdi/src/main/java/org/apache/wicket/cdi/NonContextual.java
+++ b/wicket-cdi/src/main/java/org/apache/wicket/cdi/NonContextual.java
@@ -56,7 +56,7 @@ public class NonContextual<T>
synchronized (lock)
{
// copy-on-write the cache
- Map<BeanManager, ClassMetaCache<NonContextual<?>>> newCache = new WeakHashMap<BeanManager, ClassMetaCache<NonContextual<?>>>(
+ Map<BeanManager, ClassMetaCache<NonContextual<?>>> newCache = new WeakHashMap<>(
cache);
newCache.remove(beanManager);
cache = Collections.unmodifiableMap(newCache);
@@ -81,7 +81,7 @@ public class NonContextual<T>
if (nc == null)
{
- nc = new NonContextual<T>(manager, clazz);
+ nc = new NonContextual<>(manager, clazz);
meta.put(clazz, nc);
}
return nc;
@@ -97,10 +97,10 @@ public class NonContextual<T>
meta = cache.get(manager);
if (meta == null)
{
- meta = new ClassMetaCache<NonContextual<?>>();
+ meta = new ClassMetaCache<>();
// copy-on-write the cache
- Map<BeanManager, ClassMetaCache<NonContextual<?>>> newCache = new WeakHashMap<BeanManager, ClassMetaCache<NonContextual<?>>>(
+ Map<BeanManager, ClassMetaCache<NonContextual<?>>> newCache = new WeakHashMap<>(
cache);
newCache.put(manager, meta);
cache = Collections.unmodifiableMap(newCache);