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 2014/03/06 09:33:27 UTC
[10/19] git commit: Java 7 diamonds
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/e48853d3
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e48853d3
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e48853d3
Branch: refs/heads/master
Commit: e48853d33717aa4a0f103fec6a8946999ccb8ec9
Parents: e208c0b
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 6 10:10:20 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 6 10:10:20 2014 +0200
----------------------------------------------------------------------
.../markup/html/image/resource/DefaultButtonImageResource.java | 2 +-
.../main/java/org/apache/wicket/pageStore/memory/PageTable.java | 4 ++--
.../java/org/apache/wicket/protocol/http/IRequestLogger.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e48853d3/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResource.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResource.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResource.java
index b39331f..34190be 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/resource/DefaultButtonImageResource.java
@@ -212,7 +212,7 @@ public class DefaultButtonImageResource extends RenderedDynamicImageResource
*/
public synchronized void setFont(Font font)
{
- fontAttributes = new HashMap<TextAttribute, Object>(font.getAttributes());
+ fontAttributes = new HashMap<>(font.getAttributes());
invalidate();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/e48853d3/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/PageTable.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/PageTable.java b/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/PageTable.java
index f49e9ee..87c40c9 100644
--- a/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/PageTable.java
+++ b/wicket-core/src/main/java/org/apache/wicket/pageStore/memory/PageTable.java
@@ -54,8 +54,8 @@ public class PageTable implements IClusterable
public PageTable()
{
- pages = new ConcurrentHashMap<Integer, byte[]>();
- index = new ConcurrentLinkedQueue<Integer>();
+ pages = new ConcurrentHashMap<>();
+ index = new ConcurrentLinkedQueue<>();
}
public void storePage(Integer pageId, byte[] pageAsBytes)
http://git-wip-us.apache.org/repos/asf/wicket/blob/e48853d3/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java
index f712e92..df99e4f 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/IRequestLogger.java
@@ -303,7 +303,7 @@ public interface IRequestLogger
private long startDate;
private long timeTaken;
- private final List<String> entries = new ArrayList<String>(5);
+ private final List<String> entries = new ArrayList<>(5);
private String requestedUrl;
private IRequestHandler eventTarget;
private IRequestHandler responseTarget;