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 2016/04/25 21:17:26 UTC
wicket git commit: Java 7 diamonds and spell check corrections
Repository: wicket
Updated Branches:
refs/heads/master 3e6c0a819 -> c650a9580
Java 7 diamonds and spell check corrections
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c650a958
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c650a958
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c650a958
Branch: refs/heads/master
Commit: c650a958083fe7d653c66f584e49ed0d088356be
Parents: 3e6c0a8
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Apr 25 21:16:37 2016 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Apr 25 21:16:37 2016 +0200
----------------------------------------------------------------------
.../wicket/examples/repeater/AjaxDataTablePage.java | 10 +++++-----
.../org/apache/wicket/examples/repeater/Contact.java | 7 -------
.../wicket/examples/repeater/ContactGenerator.java | 2 +-
.../wicket/examples/repeater/ContactsDatabase.java | 10 +++++-----
.../apache/wicket/examples/repeater/DataGridPage.java | 10 +++++-----
.../examples/repeater/DataTableFilterToolbarPage.java | 8 ++++----
.../wicket/examples/repeater/DataTablePage.java | 4 ++--
.../org/apache/wicket/examples/repeater/FormPage.java | 4 +---
.../org/apache/wicket/examples/repeater/OIRPage.java | 4 ++--
.../wicket/examples/repeater/RepeaterApplication.java | 14 --------------
.../apache/wicket/examples/repeater/SortingPage.java | 4 ++--
11 files changed, 27 insertions(+), 50 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/c650a958/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.java
index b82a514..db3497d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/AjaxDataTablePage.java
@@ -51,13 +51,13 @@ public class AjaxDataTablePage extends BasePage
}
});
- columns.add(new PropertyColumn<Contact, String>(Model.of("ID"), "id"));
- columns.add(new PropertyColumn<Contact, String>(Model.of("First Name"), "firstName",
+ columns.add(new PropertyColumn<>(Model.of("ID"), "id"));
+ columns.add(new PropertyColumn<>(Model.of("First Name"), "firstName",
"firstName"));
- columns.add(new PropertyColumn<Contact, String>(Model.of("Last Name"), "lastName",
+ columns.add(new PropertyColumn<>(Model.of("Last Name"), "lastName",
"lastName"));
- columns.add(new PropertyColumn<Contact, String>(Model.of("Home Phone"), "homePhone"));
- columns.add(new PropertyColumn<Contact, String>(Model.of("Cell Phone"), "cellPhone"));
+ columns.add(new PropertyColumn<>(Model.of("Home Phone"), "homePhone"));
+ columns.add(new PropertyColumn<>(Model.of("Cell Phone"), "cellPhone"));
add(new AjaxFallbackDefaultDataTable<>("table", columns,
new SortableContactDataProvider(), 8));
http://git-wip-us.apache.org/repos/asf/wicket/blob/c650a958/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Contact.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Contact.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Contact.java
index ded5f80..78a2e85 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Contact.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/Contact.java
@@ -48,9 +48,6 @@ public class Contact implements IClusterable
}
- /**
- * @see java.lang.Object#toString()
- */
@Override
public String toString()
{
@@ -58,10 +55,6 @@ public class Contact implements IClusterable
" homePhone=" + homePhone + " cellPhone=" + cellPhone + "]";
}
-
- /**
- * @see java.lang.Object#equals(java.lang.Object)
- */
@Override
public boolean equals(Object obj)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/c650a958/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactGenerator.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactGenerator.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactGenerator.java
index cb7f5ab..7d771cc 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactGenerator.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactGenerator.java
@@ -79,7 +79,7 @@ public class ContactGenerator
}
/**
- * generats <code>count</code> number contacts and puts them into <code>collection</code>
+ * Generates <code>count</code> number contacts and puts them into <code>collection</code>
* collection
*
* @param collection
http://git-wip-us.apache.org/repos/asf/wicket/blob/c650a958/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactsDatabase.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactsDatabase.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactsDatabase.java
index d057f7c..00adc84 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactsDatabase.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactsDatabase.java
@@ -33,11 +33,11 @@ import org.apache.wicket.extensions.markup.html.repeater.util.SortParam;
*/
public class ContactsDatabase
{
- private final Map<Long, Contact> map = Collections.synchronizedMap(new HashMap<Long, Contact>());
- private final List<Contact> fnameIdx = Collections.synchronizedList(new ArrayList<Contact>());
- private final List<Contact> lnameIdx = Collections.synchronizedList(new ArrayList<Contact>());
- private final List<Contact> fnameDescIdx = Collections.synchronizedList(new ArrayList<Contact>());
- private final List<Contact> lnameDescIdx = Collections.synchronizedList(new ArrayList<Contact>());
+ private final Map<Long, Contact> map = Collections.synchronizedMap(new HashMap<>());
+ private final List<Contact> fnameIdx = Collections.synchronizedList(new ArrayList<>());
+ private final List<Contact> lnameIdx = Collections.synchronizedList(new ArrayList<>());
+ private final List<Contact> fnameDescIdx = Collections.synchronizedList(new ArrayList<>());
+ private final List<Contact> lnameDescIdx = Collections.synchronizedList(new ArrayList<>());
/**
* Constructor
http://git-wip-us.apache.org/repos/asf/wicket/blob/c650a958/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.java
index 10b3ce6..e9ee674 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataGridPage.java
@@ -39,11 +39,11 @@ public class DataGridPage extends BasePage
{
List<ICellPopulator<Contact>> columns = new ArrayList<>();
- columns.add(new PropertyPopulator<Contact>("id"));
- columns.add(new PropertyPopulator<Contact>("firstName"));
- columns.add(new PropertyPopulator<Contact>("lastName"));
- columns.add(new PropertyPopulator<Contact>("homePhone"));
- columns.add(new PropertyPopulator<Contact>("cellPhone"));
+ columns.add(new PropertyPopulator<>("id"));
+ columns.add(new PropertyPopulator<>("firstName"));
+ columns.add(new PropertyPopulator<>("lastName"));
+ columns.add(new PropertyPopulator<>("homePhone"));
+ columns.add(new PropertyPopulator<>("cellPhone"));
add(new DataGridView<>("rows", columns, new SortableContactDataProvider()));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/c650a958/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.java
index 031e120..add4d2a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTableFilterToolbarPage.java
@@ -56,7 +56,7 @@ public class DataTableFilterToolbarPage extends ExamplePage
}
});
- columns.add(new PropertyColumn<Contact, String>(new Model<>("First Name"), "firstName", "firstName"));
+ columns.add(new PropertyColumn<>(new Model<>("First Name"), "firstName", "firstName"));
columns.add(new PropertyColumn<Contact, String>(new Model<>("Last Name"), "lastName", "lastName")
{
@@ -67,13 +67,13 @@ public class DataTableFilterToolbarPage extends ExamplePage
}
});
- columns.add(new PropertyColumn<Contact, String>(new Model<>("Home Phone"), "homePhone"));
- columns.add(new PropertyColumn<Contact, String>(new Model<>("Cell Phone"), "cellPhone"));
+ columns.add(new PropertyColumn<>(new Model<>("Home Phone"), "homePhone"));
+ columns.add(new PropertyColumn<>(new Model<>("Cell Phone"), "cellPhone"));
SortableContactDataProvider dataProvider = new SortableContactDataProvider();
columns = new ArrayList<>(columns);
- columns.add(new PropertyColumn<Contact, String>(new Model<>("Born Date"), "bornDate"));
+ columns.add(new PropertyColumn<>(new Model<>("Born Date"), "bornDate"));
DataTable<Contact, String> tableWithFilterForm = new DataTable<>("tableWithFilterForm", columns,
dataProvider, 8);
http://git-wip-us.apache.org/repos/asf/wicket/blob/c650a958/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.java
index 8da2d39..c99d65c 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/DataTablePage.java
@@ -82,8 +82,8 @@ public class DataTablePage extends BasePage
}
});
- columns.add(new PropertyColumn<Contact, String>(new Model<>("Home Phone"), "homePhone"));
- columns.add(new PropertyColumn<Contact, String>(new Model<>("Cell Phone"), "cellPhone"));
+ columns.add(new PropertyColumn<>(new Model<>("Home Phone"), "homePhone"));
+ columns.add(new PropertyColumn<>(new Model<>("Cell Phone"), "cellPhone"));
SortableContactDataProvider dataProvider = new SortableContactDataProvider();
DataTable<Contact, String> dataTable = new DefaultDataTable<>("table", columns,
http://git-wip-us.apache.org/repos/asf/wicket/blob/c650a958/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java
index c290919..076c4e9 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/FormPage.java
@@ -71,12 +71,10 @@ public class FormPage extends BasePage
@Override
protected IModel<Contact> model(Contact object)
{
- return new CompoundPropertyModel<Contact>(
+ return new CompoundPropertyModel<>(
new DetachableContactModel(object));
}
-
};
-
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/c650a958/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java
index c145917..678d4bd 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/OIRPage.java
@@ -128,7 +128,7 @@ public class OIRPage extends BasePage
dataView.setItemsPerPage(8L);
dataView.setItemReuseStrategy(ReuseIfModelsEqualStrategy.getInstance());
- add(new OrderByBorder("orderByFirstName", "firstName", dp)
+ add(new OrderByBorder<String>("orderByFirstName", "firstName", dp)
{
private static final long serialVersionUID = 1L;
@@ -139,7 +139,7 @@ public class OIRPage extends BasePage
}
});
- add(new OrderByBorder("orderByLastName", "lastName", dp)
+ add(new OrderByBorder<String>("orderByLastName", "lastName", dp)
{
private static final long serialVersionUID = 1L;
http://git-wip-us.apache.org/repos/asf/wicket/blob/c650a958/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeaterApplication.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeaterApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeaterApplication.java
index cd9c0ea..e5ee87e 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeaterApplication.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/RepeaterApplication.java
@@ -30,17 +30,6 @@ public class RepeaterApplication extends WebApplication
{
private final ContactsDatabase contactsDB = new ContactsDatabase(50);
-
- /**
- * Constructor.
- */
- public RepeaterApplication()
- {
- }
-
- /**
- * @see org.apache.wicket.protocol.http.WebApplication#init()
- */
@Override
protected void init()
{
@@ -59,9 +48,6 @@ public class RepeaterApplication extends WebApplication
return contactsDB;
}
- /**
- * @see org.apache.wicket.Application#getHomePage()
- */
@Override
public Class<? extends Page> getHomePage()
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/c650a958/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.java
index f2ffac6..a27fd7f 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/SortingPage.java
@@ -70,7 +70,7 @@ public class SortingPage extends BasePage
dataView.setItemsPerPage(8L);
- add(new OrderByBorder("orderByFirstName", "firstName", dp)
+ add(new OrderByBorder<String>("orderByFirstName", "firstName", dp)
{
private static final long serialVersionUID = 1L;
@@ -81,7 +81,7 @@ public class SortingPage extends BasePage
}
});
- add(new OrderByBorder("orderByLastName", "lastName", dp)
+ add(new OrderByBorder<String>("orderByLastName", "lastName", dp)
{
private static final long serialVersionUID = 1L;