Updated Branches: refs/heads/master 5cb06d979 -> 6b0f09bd0
Java 7 diamonds Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7e9abf19 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7e9abf19 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7e9abf19 Branch: refs/heads/master Commit: 7e9abf192c69422ecef8f2be18ecc0db29587fa1 Parents: 5cb06d9 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Sep 27 09:05:17 2013 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Sep 27 09:05:17 2013 +0200 ---------------------------------------------------------------------- wicket-core/src/main/java/org/apache/wicket/Session.java | 2 +- .../wicket/core/util/resource/locator/ResourceStreamLocator.java | 2 +- .../resource/locator/caching/CachingResourceStreamLocator.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/7e9abf19/wicket-core/src/main/java/org/apache/wicket/Session.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/Session.java b/wicket-core/src/main/java/org/apache/wicket/Session.java index c8a47dd..080e8e9 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Session.java +++ b/wicket-core/src/main/java/org/apache/wicket/Session.java @@ -836,7 +836,7 @@ public abstract class Session implements IClusterable, IEventSink // session instance gets shared across threads if (temporarySessionAttributes == null) { - temporarySessionAttributes = new HashMap<String, Serializable>(3); + temporarySessionAttributes = new HashMap<>(3); } temporarySessionAttributes.put(name, value); } http://git-wip-us.apache.org/repos/asf/wicket/blob/7e9abf19/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/ResourceStreamLocator.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/ResourceStreamLocator.java b/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/ResourceStreamLocator.java index 282ac6a..776a259 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/ResourceStreamLocator.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/ResourceStreamLocator.java @@ -73,7 +73,7 @@ public class ResourceStreamLocator implements IResourceStreamLocator /** Logging */ private static final Logger log = LoggerFactory.getLogger(ResourceStreamLocator.class); - private static final Iterable<String> NO_EXTENSIONS = new ArrayList<String>(0); + private static final Iterable<String> NO_EXTENSIONS = new ArrayList<>(0); /** If null, the application registered finder will be used */ private List<IResourceFinder> finders; http://git-wip-us.apache.org/repos/asf/wicket/blob/7e9abf19/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/caching/CachingResourceStreamLocator.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/caching/CachingResourceStreamLocator.java b/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/caching/CachingResourceStreamLocator.java index 48506d8..49301e2 100644 --- a/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/caching/CachingResourceStreamLocator.java +++ b/wicket-core/src/main/java/org/apache/wicket/core/util/resource/locator/caching/CachingResourceStreamLocator.java @@ -59,7 +59,7 @@ public class CachingResourceStreamLocator implements IResourceStreamLocator delegate = resourceStreamLocator; - cache = new ConcurrentHashMap<Key, IResourceStreamReference>(); + cache = new ConcurrentHashMap<>(); } /**
