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/03/16 21:11:51 UTC
[1/5] wicket git commit: Change HomePageProvider type to "extends
Page" - this is what Application#getHomePage() uses.
Repository: wicket
Updated Branches:
refs/heads/master 24568fcf1 -> c1a7ef050
Change HomePageProvider type to "extends Page" - this is what Application#getHomePage() uses.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ced96957
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ced96957
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ced96957
Branch: refs/heads/master
Commit: ced96957060b67f37a7a30b4887faf840a20b22f
Parents: 24568fc
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Mar 16 21:01:00 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Mar 16 21:01:00 2016 +0100
----------------------------------------------------------------------
wicket-core/src/main/java/org/apache/wicket/SystemMapper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ced96957/wicket-core/src/main/java/org/apache/wicket/SystemMapper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/SystemMapper.java b/wicket-core/src/main/java/org/apache/wicket/SystemMapper.java
index 9157daf..4be59b7 100644
--- a/wicket-core/src/main/java/org/apache/wicket/SystemMapper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/SystemMapper.java
@@ -77,7 +77,7 @@ public class SystemMapper extends CompoundRequestMapper
}
}
- private static class HomePageProvider<C extends IRequestablePage> implements Supplier<Class<C>>
+ private static class HomePageProvider<C extends Page> implements Supplier<Class<C>>
{
private final Application application;
[2/5] wicket git commit: Make IDataProvider#detach() a default method
and remove all empty implementations
Posted by mg...@apache.org.
Make IDataProvider#detach() a default method and remove all empty implementations
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e93eb0ae
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e93eb0ae
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e93eb0ae
Branch: refs/heads/master
Commit: e93eb0ae99c0c0257a1511739512326ecf00cc73
Parents: ced9695
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Mar 16 21:08:06 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Mar 16 21:08:06 2016 +0100
----------------------------------------------------------------------
.../markup/repeater/data/EmptyDataProvider.java | 17 -----------------
.../wicket/markup/repeater/data/IDataProvider.java | 3 +++
.../markup/repeater/data/ListDataProvider.java | 17 +----------------
.../examples/repeater/ContactDataProvider.java | 9 ---------
.../html/repeater/util/SortableDataProvider.java | 16 ----------------
.../html/repeater/data/table/DataTableTest.java | 5 -----
6 files changed, 4 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e93eb0ae/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/EmptyDataProvider.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/EmptyDataProvider.java b/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/EmptyDataProvider.java
index eac95b2..b8a21a4 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/EmptyDataProvider.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/EmptyDataProvider.java
@@ -45,9 +45,6 @@ public class EmptyDataProvider<T> implements IDataProvider<T>
return (EmptyDataProvider<T>)INSTANCE;
}
- /**
- * @see IDataProvider#iterator(long, long)
- */
@Override
public Iterator<T> iterator(long first, long count)
{
@@ -55,29 +52,15 @@ public class EmptyDataProvider<T> implements IDataProvider<T>
return list.iterator();
}
- /**
- * @see IDataProvider#size()
- */
@Override
public long size()
{
return 0;
}
- /**
- * @see IDataProvider#model(Object)
- */
@Override
public IModel<T> model(Object object)
{
return null;
}
-
- /**
- * @see org.apache.wicket.model.IDetachable#detach()
- */
- @Override
- public void detach()
- {
- }
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/e93eb0ae/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/IDataProvider.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/IDataProvider.java b/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/IDataProvider.java
index dd5c639..805cdd0 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/IDataProvider.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/IDataProvider.java
@@ -93,4 +93,7 @@ public interface IDataProvider<T> extends IDetachable
*/
IModel<T> model(T object);
+ @Override
+ default void detach()
+ {}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/e93eb0ae/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/ListDataProvider.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/ListDataProvider.java b/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/ListDataProvider.java
index c3af567..2e6e778 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/ListDataProvider.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/repeater/data/ListDataProvider.java
@@ -87,30 +87,15 @@ public class ListDataProvider<T extends Serializable> implements IDataProvider<T
return list.subList((int)first, (int)toIndex).listIterator();
}
- /**
- * @see IDataProvider#size()
- */
@Override
public long size()
{
return getData().size();
}
- /**
- * @see IDataProvider#model(Object)
- */
@Override
public IModel<T> model(T object)
{
- return new Model<T>(object);
+ return new Model<>(object);
}
-
- /**
- * @see org.apache.wicket.model.IDetachable#detach()
- */
- @Override
- public void detach()
- {
- }
-
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/e93eb0ae/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactDataProvider.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactDataProvider.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactDataProvider.java
index 8f1aecb..30d0714 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactDataProvider.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactDataProvider.java
@@ -70,13 +70,4 @@ public class ContactDataProvider implements IDataProvider<Contact>
{
return new DetachableContactModel(object);
}
-
- /**
- * @see org.apache.wicket.model.IDetachable#detach()
- */
- @Override
- public void detach()
- {
- }
-
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/e93eb0ae/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java
index aba3b00..7e85bbd 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/util/SortableDataProvider.java
@@ -35,16 +35,10 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.ISortableDat
*/
public abstract class SortableDataProvider<T, S> implements ISortableDataProvider<T, S>
{
- /**
- *
- */
private static final long serialVersionUID = 1L;
private final SingleSortState<S> state = new SingleSortState<>();
- /**
- * @see ISortableDataProvider#getSortState()
- */
@Override
public final ISortState<S> getSortState()
{
@@ -84,14 +78,4 @@ public abstract class SortableDataProvider<T, S> implements ISortableDataProvide
{
state.setPropertySortOrder(property, order);
}
-
- /**
- * @see ISortableDataProvider#detach()
- */
- @Override
- public void detach()
- {
- }
-
-
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/e93eb0ae/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java
index 9b365f6..74d6e1d 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/markup/html/repeater/data/table/DataTableTest.java
@@ -145,11 +145,6 @@ public class DataTableTest extends WicketTestCase
private List<Integer> items = Arrays.asList(1, 3, 5);
@Override
- public void detach()
- {
- }
-
- @Override
public Iterator<Integer> iterator(long first, long count)
{
StringValue emptyValue = getPageParameters().get("empty");
[3/5] wicket git commit: Java 7 diamonds
Posted by mg...@apache.org.
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/94272394
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/94272394
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/94272394
Branch: refs/heads/master
Commit: 94272394f2ef2ca56e0828837b019962addfbe20
Parents: e93eb0a
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Mar 16 21:09:27 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Mar 16 21:09:27 2016 +0100
----------------------------------------------------------------------
.../org/apache/wicket/examples/repeater/ContactDataProvider.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/94272394/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactDataProvider.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactDataProvider.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactDataProvider.java
index 30d0714..70d88c8 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactDataProvider.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactDataProvider.java
@@ -45,7 +45,7 @@ public class ContactDataProvider implements IDataProvider<Contact>
@Override
public Iterator<Contact> iterator(long first, long count)
{
- return getContactsDB().find(first, count, new SortParam<String>("firstName", true))
+ return getContactsDB().find(first, count, new SortParam<>("firstName", true))
.iterator();
}
[5/5] wicket git commit: Minor improvements
Posted by mg...@apache.org.
Minor improvements
- remove 'public' qualifiers for methods in private inner classes
- fix javadocs
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c1a7ef05
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c1a7ef05
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c1a7ef05
Branch: refs/heads/master
Commit: c1a7ef0502f09dcfc6f5aa42cd6f4b4dcdb04d38
Parents: 67d86e5
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Mar 16 21:10:48 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Mar 16 21:10:48 2016 +0100
----------------------------------------------------------------------
.../wicket/examples/repeater/ContactDataProvider.java | 2 +-
.../extensions/markup/html/repeater/tree/TableTree.java | 2 +-
.../html/repeater/tree/table/TreeDataProvider.java | 12 ++++++------
3 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/c1a7ef05/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactDataProvider.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactDataProvider.java b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactDataProvider.java
index 70d88c8..9a95307 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactDataProvider.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/repeater/ContactDataProvider.java
@@ -40,7 +40,7 @@ public class ContactDataProvider implements IDataProvider<Contact>
* retrieves contacts from database starting with index <code>first</code> and ending with
* <code>first+count</code>
*
- * @see org.apache.wicket.markup.repeater.data.IDataProvider#iterator(int, int)
+ * @see org.apache.wicket.markup.repeater.data.IDataProvider#iterator(long, long)
*/
@Override
public Iterator<Contact> iterator(long first, long count)
http://git-wip-us.apache.org/repos/asf/wicket/blob/c1a7ef05/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java
index df61813..0ae190f 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/TableTree.java
@@ -109,7 +109,7 @@ public abstract class TableTree<T, S> extends AbstractTree<T>
* Factory method for the wrapped {@link DataTable}.
*
* Note: If overwritten, the DataTable's row items have to output their markupId, or
- * {@link #updateNode(Object, IPartialPageRequestHandler)} will fail.
+ * {@link #updateNode(Object, Optional)} will fail.
*
* @param id
* @param columns
http://git-wip-us.apache.org/repos/asf/wicket/blob/c1a7ef05/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProvider.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProvider.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProvider.java
index d803918..549d230 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProvider.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/tree/table/TreeDataProvider.java
@@ -47,7 +47,7 @@ public abstract class TreeDataProvider<T> implements ITreeDataProvider<T>
* @param provider
* the provider to adapt
*/
- public TreeDataProvider(ITreeProvider<T> provider)
+ protected TreeDataProvider(ITreeProvider<T> provider)
{
this.provider = provider;
}
@@ -128,7 +128,7 @@ public abstract class TreeDataProvider<T> implements ITreeDataProvider<T>
}
/**
- * Hook method to decide wether the given node's children should be iterated.
+ * Hook method to decide whether the given node's children should be iterated.
*
* @param node
* node
@@ -157,13 +157,13 @@ public abstract class TreeDataProvider<T> implements ITreeDataProvider<T>
private Iterator<? extends T> children;
- public Branch(Branch<T> parent, Iterator<? extends T> children)
+ Branch(Branch<T> parent, Iterator<? extends T> children)
{
this.parent = parent;
this.children = children;
}
- public NodeModel<T> wrapModel(IModel<T> model)
+ NodeModel<T> wrapModel(IModel<T> model)
{
boolean[] branches = new boolean[getDepth()];
@@ -178,7 +178,7 @@ public abstract class TreeDataProvider<T> implements ITreeDataProvider<T>
return new NodeModel<>(model, branches);
}
- public int getDepth()
+ int getDepth()
{
if (parent == null)
{
@@ -213,4 +213,4 @@ public abstract class TreeDataProvider<T> implements ITreeDataProvider<T>
throw new UnsupportedOperationException();
}
}
-}
\ No newline at end of file
+}
[4/5] wicket git commit: Make use of
BaseWicketTester#isFollowRedirects()
Posted by mg...@apache.org.
Make use of BaseWicketTester#isFollowRedirects()
This way custom impl of BaseWicketTester may override it and use logic inside
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/67d86e5b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/67d86e5b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/67d86e5b
Branch: refs/heads/master
Commit: 67d86e5bf3bee5ad2defa9710959a42f545abef4
Parents: 9427239
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Mar 16 21:09:49 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Mar 16 21:09:49 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/wicket/util/tester/BaseWicketTester.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/67d86e5b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
index 80d292f..4266f6c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/BaseWicketTester.java
@@ -732,7 +732,7 @@ public class BaseWicketTester
try
{
- if (followRedirects && lastResponse.isRedirect())
+ if (isFollowRedirects() && lastResponse.isRedirect())
{
if (redirectCount++ >= 100)
{