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:33 UTC
[14/20] git commit: Java 7 diamonds for wicket-devutils
Java 7 diamonds for wicket-devutils
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ed71768c
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ed71768c
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ed71768c
Branch: refs/heads/master
Commit: ed71768c0539ca005a35465b587d51f27083f47e
Parents: f022876
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Fri Jun 21 15:07:49 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Fri Jun 21 15:47:38 2013 +0200
----------------------------------------------------------------------
.../devutils/debugbar/InspectorDebugPanel.java | 2 +-
.../devutils/debugbar/StandardDebugPanel.java | 2 +-
.../devutils/diskstore/DebugDiskDataStore.java | 2 +-
.../diskstore/browser/BrowserPanel.java | 2 +-
.../diskstore/browser/PageWindowProvider.java | 6 ++---
.../browser/SessionsProviderModel.java | 2 +-
.../devutils/inspector/EnhancedPageView.java | 16 ++++++------
.../devutils/inspector/InspectorPage.java | 2 +-
.../devutils/inspector/LiveSessionsPage.java | 8 +++---
.../wicket/devutils/inspector/RequestsPage.java | 26 ++++++++++----------
10 files changed, 34 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed71768c/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java
index bdf95a1..eed4d93 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/InspectorDebugPanel.java
@@ -72,7 +72,7 @@ public class InspectorDebugPanel extends StandardDebugPanel
@Override
protected IModel<String> getDataModel()
{
- return new Model<String>("Inspector");
+ return new Model<>("Inspector");
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed71768c/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java
index 143146b..c88499e 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/debugbar/StandardDebugPanel.java
@@ -66,7 +66,7 @@ public abstract class StandardDebugPanel extends DevUtilsPanel
protected BookmarkablePageLink<Void> createLink(final String id)
{
- return new BookmarkablePageLink<Void>(id, getLinkPageClass(), getLinkPageParameters());
+ return new BookmarkablePageLink<>(id, getLinkPageClass(), getLinkPageParameters());
}
protected abstract IModel<String> getDataModel();
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed71768c/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/DebugDiskDataStore.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/DebugDiskDataStore.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/DebugDiskDataStore.java
index 1a23151..9c3d882 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/DebugDiskDataStore.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/DebugDiskDataStore.java
@@ -66,7 +66,7 @@ public class DebugDiskDataStore extends DiskDataStore
*/
public List<PageWindow> getLastPageWindows(String sessionId, int count)
{
- List<PageWindow> pageWindows = new ArrayList<PageWindowManager.PageWindow>();
+ List<PageWindow> pageWindows = new ArrayList<>();
SessionEntry sessionEntry = getSessionEntry(sessionId, false);
if (sessionEntry != null)
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed71768c/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/BrowserPanel.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/BrowserPanel.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/BrowserPanel.java
index accc825..25358cc 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/BrowserPanel.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/BrowserPanel.java
@@ -116,7 +116,7 @@ public class BrowserPanel extends Panel
{
PageWindowProvider provider = new PageWindowProvider(sessionId);
- List<IColumn<PageWindowDescription, String>> columns = new ArrayList<IColumn<PageWindowDescription, String>>();
+ List<IColumn<PageWindowDescription, String>> columns = new ArrayList<>();
PageWindowColumn pageIdColumn = new PageWindowColumn(Model.of("Id"), "id");
columns.add(pageIdColumn);
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed71768c/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/PageWindowProvider.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/PageWindowProvider.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/PageWindowProvider.java
index 3ae9f04..dd8397c 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/PageWindowProvider.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/PageWindowProvider.java
@@ -50,7 +50,7 @@ class PageWindowProvider implements ISortableDataProvider<PageWindowDescription,
{
List<PageWindow> lastPageWindows = getPageWindows();
List<PageWindow> subList = lastPageWindows.subList((int)first, (int)(first + count));
- List<PageWindowDescription> pageDescriptions = new ArrayList<PageWindowDescription>();
+ List<PageWindowDescription> pageDescriptions = new ArrayList<>();
for (PageWindow pw : subList)
{
pageDescriptions.add(new PageWindowDescription(pw, sessionId.getObject()));
@@ -61,7 +61,7 @@ class PageWindowProvider implements ISortableDataProvider<PageWindowDescription,
private List<PageWindow> getPageWindows()
{
- List<PageWindow> lastPageWindows = new ArrayList<PageWindow>();
+ List<PageWindow> lastPageWindows = new ArrayList<>();
if (sessionId != null && sessionId.getObject() != null)
{
String sessId = sessionId.getObject();
@@ -86,7 +86,7 @@ class PageWindowProvider implements ISortableDataProvider<PageWindowDescription,
@Override
public IModel<PageWindowDescription> model(PageWindowDescription description)
{
- return new Model<PageWindowDescription>(description);
+ return new Model<>(description);
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed71768c/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/SessionsProviderModel.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/SessionsProviderModel.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/SessionsProviderModel.java
index 1af7c11..6638303 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/SessionsProviderModel.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/diskstore/browser/SessionsProviderModel.java
@@ -34,7 +34,7 @@ public class SessionsProviderModel extends LoadableDetachableModel<List<String>>
@Override
protected List<String> load()
{
- List<String> sessionIds = new ArrayList<String>();
+ List<String> sessionIds = new ArrayList<>();
if (Application.exists())
{
DebugDiskDataStore dataStore = DataStoreHelper.getDataStore();
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed71768c/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java
index f7208b9..6398ce6 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/EnhancedPageView.java
@@ -126,7 +126,7 @@ public final class EnhancedPageView extends GenericPanel<Page>
showStatefulAndParentsOnly = false;
showBehaviors = true;
allColumns = allColumns();
- visibleColumns = new ArrayList<IColumn<TreeNode, Void>>(allColumns);
+ visibleColumns = new ArrayList<>(allColumns);
// Name of page
add(new Label("info", new Model<String>()
@@ -169,7 +169,7 @@ public final class EnhancedPageView extends GenericPanel<Page>
private List<IColumn<TreeNode, Void>> allColumns()
{
- List<IColumn<TreeNode, Void>> columns = new ArrayList<IColumn<TreeNode, Void>>();
+ List<IColumn<TreeNode, Void>> columns = new ArrayList<>();
columns.add(new PropertyColumn<TreeNode, Void>(Model.of("Path"), "path")
{
@@ -281,12 +281,12 @@ public final class EnhancedPageView extends GenericPanel<Page>
private void addTreeControls()
{
- Form<Void> form = new Form<Void>("form");
+ Form<Void> form = new Form<>("form");
add(form);
form.add(new CheckBox("showStateless", new PropertyModel<Boolean>(this,
"showStatefulAndParentsOnly")));
form.add(new CheckBox("showBehaviors", new PropertyModel<Boolean>(this, "showBehaviors")));
- form.add(new CheckBoxMultipleChoice<IColumn<TreeNode, Void>>("visibleColumns",
+ form.add(new CheckBoxMultipleChoice<>("visibleColumns",
new PropertyModel<List<IColumn<TreeNode, Void>>>(this, "visibleColumns"), allColumns).setSuffix(" "));
form.add(new AjaxFallbackButton("submit", form)
{
@@ -350,7 +350,7 @@ public final class EnhancedPageView extends GenericPanel<Page>
@Override
protected Item<TreeNode> newRowItem(String id, int index, IModel<TreeNode> model)
{
- return new OddEvenItem<TreeNode>(id, index, model);
+ return new OddEvenItem<>(id, index, model);
}
};
tree.setOutputMarkupId(true);
@@ -371,7 +371,7 @@ public final class EnhancedPageView extends GenericPanel<Page>
{
this.node = node;
this.parent = parent;
- children = new ArrayList<TreeNode>();
+ children = new ArrayList<>();
if (!(node instanceof Component) && !(node instanceof Behavior))
throw new IllegalArgumentException("Only accepts Components and Behaviors");
}
@@ -387,7 +387,7 @@ public final class EnhancedPageView extends GenericPanel<Page>
*/
public List<Integer> getPathIndexes()
{
- List<Integer> path = new ArrayList<Integer>();
+ List<Integer> path = new ArrayList<>();
TreeNode nextChild = this;
TreeNode parent;
while ((parent = nextChild.parent) != null)
@@ -706,7 +706,7 @@ public final class EnhancedPageView extends GenericPanel<Page>
{
private static final long serialVersionUID = 1L;
- private HashSet<List<Integer>> set = new HashSet<List<Integer>>();
+ private HashSet<List<Integer>> set = new HashSet<>();
private boolean reversed = false;
public void expandAll()
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed71768c/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java
index 69d8d50..023583d 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/InspectorPage.java
@@ -65,7 +65,7 @@ public final class InspectorPage extends DevUtilsPage
}
add(new EnhancedPageView("page", (Page)page));
add(new Image("bug", new PackageResourceReference(InspectorPage.class, "bug.png")));
- add(new BookmarkablePageLink<Void>("allsessions", LiveSessionsPage.class));
+ add(new BookmarkablePageLink<>("allsessions", LiveSessionsPage.class));
add(new Label("wicketVersion", getApplication().getFrameworkSettings().getVersion()));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed71768c/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.java
index 63631ea..6ff3cce 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.java
@@ -154,14 +154,14 @@ public class LiveSessionsPage extends DevUtilsPage
setResponsePage(new RequestsPage(sd));
}
};
- link.add(new Label("id", new Model<String>(sd.getSessionId())));
+ link.add(new Label("id", new Model<>(sd.getSessionId())));
item.add(link);
item.add(new Label("lastRequestTime", new Model<String>(
sdf.format(sd.getLastActive()))));
- item.add(new Label("requestCount", new Model<Long>(sd.getNumberOfRequests())));
- item.add(new Label("requestsTime", new Model<Long>(sd.getTotalTimeTaken())));
+ item.add(new Label("requestCount", new Model<>(sd.getNumberOfRequests())));
+ item.add(new Label("requestsTime", new Model<>(sd.getTotalTimeTaken())));
item.add(new Label("sessionSize",
- new Model<Bytes>(Bytes.bytes(sd.getSessionSize()))));
+ new Model<>(Bytes.bytes(sd.getSessionSize()))));
}
};
add(listView);
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed71768c/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java
index 2c829fa..a44c5f1 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.java
@@ -68,15 +68,15 @@ public class RequestsPage extends DevUtilsPage
}
else
{
- add(new Label("id", new Model<String>(sessionData.getSessionId())));
+ add(new Label("id", new Model<>(sessionData.getSessionId())));
add(new Label("sessionInfo", new Model<Serializable>(
(Serializable)sessionData.getSessionInfo())));
- add(new Label("startDate", new Model<String>(sdf.format(sessionData.getStartDate()))));
+ add(new Label("startDate", new Model<>(sdf.format(sessionData.getStartDate()))));
add(new Label("lastRequestTime", new Model<String>(
sdf.format(sessionData.getLastActive()))));
- add(new Label("numberOfRequests", new Model<Long>(sessionData.getNumberOfRequests())));
- add(new Label("totalTimeTaken", new Model<Long>(sessionData.getTotalTimeTaken())));
- add(new Label("size", new Model<Bytes>(Bytes.bytes(sessionData.getSessionSize()))));
+ add(new Label("numberOfRequests", new Model<>(sessionData.getNumberOfRequests())));
+ add(new Label("totalTimeTaken", new Model<>(sessionData.getTotalTimeTaken())));
+ add(new Label("size", new Model<>(Bytes.bytes(sessionData.getSessionSize()))));
add(new WebMarkupContainer("sessionid").setVisible(false));
}
@@ -90,7 +90,7 @@ public class RequestsPage extends DevUtilsPage
List<RequestData> requests = getRequestLogger().getRequests();
if (sessionData != null)
{
- ArrayList<RequestData> returnValues = new ArrayList<RequestData>();
+ ArrayList<RequestData> returnValues = new ArrayList<>();
for (RequestData data : requests)
{
if (sessionData.getSessionId().equals(data.getSessionId()))
@@ -100,7 +100,7 @@ public class RequestsPage extends DevUtilsPage
}
return returnValues;
}
- return new ArrayList<RequestData>(requests);
+ return new ArrayList<>(requests);
}
};
PageableListView<RequestData> listView = new PageableListView<RequestData>("requests",
@@ -112,18 +112,18 @@ public class RequestsPage extends DevUtilsPage
protected void populateItem(final ListItem<RequestData> item)
{
RequestData rd = item.getModelObject();
- item.add(new Label("id", new Model<String>(rd.getSessionId())).setVisible(sessionData == null));
- item.add(new Label("startDate", new Model<String>(sdf.format(rd.getStartDate()))));
- item.add(new Label("timeTaken", new Model<Long>(rd.getTimeTaken())));
+ item.add(new Label("id", new Model<>(rd.getSessionId())).setVisible(sessionData == null));
+ item.add(new Label("startDate", new Model<>(sdf.format(rd.getStartDate()))));
+ item.add(new Label("timeTaken", new Model<>(rd.getTimeTaken())));
String eventTarget = rd.getEventTarget() != null ? rd.getEventTarget()
.getClass()
.getName() : "";
- item.add(new Label("eventTarget", new Model<String>(eventTarget)));
+ item.add(new Label("eventTarget", new Model<>(eventTarget)));
String responseTarget = rd.getResponseTarget() != null ? rd.getResponseTarget()
.getClass()
.getName() : "";
- item.add(new Label("responseTarget", new Model<String>(responseTarget)));
- item.add(new Label("alteredObjects", new Model<String>(rd.getAlteredObjects())).setEscapeModelStrings(false));
+ item.add(new Label("responseTarget", new Model<>(responseTarget)));
+ item.add(new Label("alteredObjects", new Model<>(rd.getAlteredObjects())).setEscapeModelStrings(false));
item.add(new Label("sessionSize", new Model<Bytes>(Bytes.bytes(rd.getSessionSize()
.longValue()))));
}