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/18 17:03:09 UTC
[1/6] git commit: Small improvement - avoid a instanceof check.
Repository: wicket
Updated Branches:
refs/heads/master d31415397 -> 8cb208b1d
Small improvement - avoid a instanceof check.
If the type is not Component then it will fail with ClassCastException providing the same information about the problem.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/0b37503f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0b37503f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0b37503f
Branch: refs/heads/master
Commit: 0b37503f13aefe57406b3782bd1c49d2883b11ff
Parents: d314153
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Mar 18 17:54:21 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Mar 18 17:54:21 2014 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/MarkupContainer.java | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/0b37503f/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
index b11eb10..68c16f7 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -1092,14 +1092,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
*/
private String getId(Object object)
{
- if (object instanceof Component)
- {
- return ((Component)object).getId();
- }
- else
- {
- throw new IllegalArgumentException("Unknown type of object " + object);
- }
+ return ((Component)object).getId();
}
/**
[5/6] git commit: Do not call String.valueOf(String).
Posted by mg...@apache.org.
Do not call String.valueOf(String).
This will "save us" only if the value is null.
But it is not Wicket' job to decide what keys and/or values an application can store in the ISessionStore.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b30b7a2e
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b30b7a2e
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b30b7a2e
Branch: refs/heads/master
Commit: b30b7a2e18db00752b7d043e77d1be1599fee4e9
Parents: 7054ccc
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Mar 18 17:59:16 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Mar 18 17:59:16 2014 +0200
----------------------------------------------------------------------
wicket-core/src/main/java/org/apache/wicket/Session.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/b30b7a2e/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 147351b..4b55b73 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Session.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Session.java
@@ -272,7 +272,7 @@ public abstract class Session implements IClusterable, IEventSink
{
for (Map.Entry<String, Serializable> entry : temporarySessionAttributes.entrySet())
{
- store.setAttribute(request, String.valueOf(entry.getKey()), entry.getValue());
+ store.setAttribute(request, entry.getKey(), entry.getValue());
}
temporarySessionAttributes = null;
}
[3/6] git commit: Fix broken javadoc
Posted by mg...@apache.org.
Fix broken javadoc
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6f8c8888
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6f8c8888
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6f8c8888
Branch: refs/heads/master
Commit: 6f8c88882401c60c0cdfce93ff27c568c3196040
Parents: e47e61e
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Mar 18 17:57:35 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Mar 18 17:57:35 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/examples/niceurl/mounted/Page5.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/6f8c8888/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java
index 88cd076..d87a12a 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/niceurl/mounted/Page5.java
@@ -69,7 +69,7 @@ public class Page5 extends WicketExamplePage
}
/**
- * @param parameters
+ * @param values
* @return
*/
private String join(List<org.apache.wicket.util.string.StringValue> values)
[6/6] git commit: Javadoc fixes, Java 7 diamonds
Posted by mg...@apache.org.
Javadoc fixes, 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/8cb208b1
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8cb208b1
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8cb208b1
Branch: refs/heads/master
Commit: 8cb208b1dbfb512ad5d319feb33ecce06e11e63b
Parents: b30b7a2
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Mar 18 18:01:07 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Mar 18 18:01:07 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/markup/repeater/RefreshingView.java | 4 ++--
.../wicket/request/resource/LessResourceReferenceTest.java | 2 +-
.../org/apache/wicket/examples/compref/DropDownChoicePage.java | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/8cb208b1/wicket-core/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java b/wicket-core/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java
index 280116f..a2c2220 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/repeater/RefreshingView.java
@@ -128,7 +128,7 @@ public abstract class RefreshingView<T> extends RepeatingView
/**
* Populate the given Item container.
* <p>
- * <b>be carefull</b> to add any components to the item and not the view itself. So, don't do:
+ * <b>be careful</b> to add any components to the item and not the view itself. So, don't do:
*
* <pre>
* add(new Label("foo", "bar"));
@@ -163,7 +163,7 @@ public abstract class RefreshingView<T> extends RepeatingView
*/
protected Item<T> newItem(final String id, int index, final IModel<T> model)
{
- return new Item<T>(id, index, model);
+ return new Item<>(id, index, model);
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/8cb208b1/wicket-core/src/test/java/org/apache/wicket/request/resource/LessResourceReferenceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/LessResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/LessResourceReferenceTest.java
index fe05851..6435752 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/LessResourceReferenceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/LessResourceReferenceTest.java
@@ -43,7 +43,7 @@ public class LessResourceReferenceTest extends WicketTestCase
private static final AtomicBoolean PROCESS_RESPONSE_CALLED = new AtomicBoolean(false);
/**
- * An {@link org.apache.wicket.request.resource.ResourceReferenceRegistry.IResourceReferenceFactory} that creates
+ * An {@link org.apache.wicket.request.resource.IResourceReferenceFactory} that creates
* LessResourceReference for resources with extension '.less'
*/
private static class LessResourceReferenceFactory extends ResourceReferenceRegistry.DefaultResourceReferenceFactory
http://git-wip-us.apache.org/repos/asf/wicket/blob/8cb208b1/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java
index 8b2031d..d86bbc5 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/DropDownChoicePage.java
@@ -89,7 +89,7 @@ public class DropDownChoicePage extends WicketExamplePage
/**
* Gets the display value that is visible to the end user.
*
- * @see org.apache.wicket.markup.html.form.IChoiceRenderer#getDisplayValue(java.lang.Object)
+ * @see org.apache.wicket.markup.html.form.ChoiceRenderer#getDisplayValue(java.lang.Object)
*/
@Override
public Object getDisplayValue(Integer value)
@@ -114,7 +114,7 @@ public class DropDownChoicePage extends WicketExamplePage
* Gets the value that is invisible to the end user, and that is used as the selection
* id.
*
- * @see org.apache.wicket.markup.html.form.IChoiceRenderer#getIdValue(java.lang.Object,
+ * @see org.apache.wicket.markup.html.form.ChoiceRenderer#getIdValue(java.lang.Object,
* int)
*/
@Override
[4/6] git commit: WICKET-5535 Intern strings generated by Wicket that
have bigger chance to be duplicated
Posted by mg...@apache.org.
WICKET-5535 Intern strings generated by Wicket that have bigger chance to be duplicated
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7054ccc0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7054ccc0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7054ccc0
Branch: refs/heads/master
Commit: 7054ccc08e29553da06b0d73dba5ff18e754a39b
Parents: 6f8c888
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Mar 18 17:58:20 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Mar 18 17:58:20 2014 +0200
----------------------------------------------------------------------
.../org/apache/wicket/application/WildcardMatcherHelper.java | 3 ++-
.../wicket/markup/html/navigation/paging/PagingNavigation.java | 6 +++---
.../src/main/java/org/apache/wicket/mock/MockWebResponse.java | 2 +-
.../resource/caching/version/LastModifiedResourceVersion.java | 2 +-
.../markup/html/repeater/data/table/NavigationToolbar.java | 2 +-
.../markup/html/repeater/data/table/NoRecordsToolbar.java | 2 +-
.../markup/html/repeater/data/table/export/ExportToolbar.java | 2 +-
7 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/7054ccc0/wicket-core/src/main/java/org/apache/wicket/application/WildcardMatcherHelper.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/application/WildcardMatcherHelper.java b/wicket-core/src/main/java/org/apache/wicket/application/WildcardMatcherHelper.java
index 148909d..a1edc2d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/application/WildcardMatcherHelper.java
+++ b/wicket-core/src/main/java/org/apache/wicket/application/WildcardMatcherHelper.java
@@ -181,7 +181,8 @@ public class WildcardMatcherHelper
*/
private void add(final String aStr)
{
- map.put(String.valueOf(idx++), aStr);
+ String key = String.valueOf(idx++).intern();
+ map.put(key, aStr);
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/7054ccc0/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java
index b498f09..cce7c63 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigation.java
@@ -287,7 +287,7 @@ public class PagingNavigation extends Loop
}
else
{
- label = String.valueOf(pageIndex + 1);
+ label = String.valueOf(pageIndex + 1).intern();
}
link.add(new Label("pageNumber", label));
}
@@ -422,8 +422,8 @@ public class PagingNavigation extends Loop
@Override
public void onComponentTag(Component component, ComponentTag tag)
{
- Map<String, String> vars = new MicroMap<String, String>("page",
- String.valueOf(page + 1));
+ String pageIndex = String.valueOf(page + 1).intern();
+ Map<String, String> vars = new MicroMap<String, String>("page", pageIndex);
tag.put("title", PagingNavigation.this.getString(RES, Model.ofMap(vars)));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/7054ccc0/wicket-core/src/main/java/org/apache/wicket/mock/MockWebResponse.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/mock/MockWebResponse.java b/wicket-core/src/main/java/org/apache/wicket/mock/MockWebResponse.java
index 6ac2c28..ba09a16 100644
--- a/wicket-core/src/main/java/org/apache/wicket/mock/MockWebResponse.java
+++ b/wicket-core/src/main/java/org/apache/wicket/mock/MockWebResponse.java
@@ -119,7 +119,7 @@ public class MockWebResponse extends WebResponse
public void setContentLength(long length)
{
contentLength = length;
- setHeader("Content-Length", String.valueOf(length));
+ setHeader("Content-Length", String.valueOf(length).intern());
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/7054ccc0/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/LastModifiedResourceVersion.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/LastModifiedResourceVersion.java b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/LastModifiedResourceVersion.java
index dcdbc6c..1ba8de2 100644
--- a/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/LastModifiedResourceVersion.java
+++ b/wicket-core/src/main/java/org/apache/wicket/request/resource/caching/version/LastModifiedResourceVersion.java
@@ -57,7 +57,7 @@ public class LastModifiedResourceVersion implements IResourceVersion
return null;
}
// version string = last modified timestamp converted to milliseconds
- return String.valueOf(lastModified.getMilliseconds());
+ return String.valueOf(lastModified.getMilliseconds()).intern();
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/7054ccc0/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java
index 58b7801..83aad70 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NavigationToolbar.java
@@ -51,7 +51,7 @@ public class NavigationToolbar extends AbstractToolbar
@Override
public String getObject()
{
- return String.valueOf(table.getColumns().size());
+ return String.valueOf(table.getColumns().size()).intern();
}
}));
http://git-wip-us.apache.org/repos/asf/wicket/blob/7054ccc0/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java
index bdb5410..ff06af0 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/NoRecordsToolbar.java
@@ -72,7 +72,7 @@ public class NoRecordsToolbar extends AbstractToolbar
@Override
public String getObject()
{
- return String.valueOf(table.getColumns().size());
+ return String.valueOf(table.getColumns().size()).intern();
}
}));
td.add(new Label("msg", messageModel));
http://git-wip-us.apache.org/repos/asf/wicket/blob/7054ccc0/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar.java
index 2fbf6cf..4c0facb 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/repeater/data/table/export/ExportToolbar.java
@@ -170,7 +170,7 @@ public class ExportToolbar extends AbstractToolbar
@Override
public String getObject()
{
- return String.valueOf(getTable().getColumns().size());
+ return String.valueOf(getTable().getColumns().size()).intern();
}
}));
[2/6] git commit: Simplify the check of children's type.
Posted by mg...@apache.org.
Simplify the check of children's type.
It can be either Component or something else. We can use #getId(Object) only if it is a Component.
Reduces the check from two instanceof's to one.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/e47e61e2
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/e47e61e2
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/e47e61e2
Branch: refs/heads/master
Commit: e47e61e28b704da9829edc9941c4c9fb6b2bf551
Parents: 0b37503
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue Mar 18 17:55:34 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue Mar 18 17:55:34 2014 +0200
----------------------------------------------------------------------
.../src/main/java/org/apache/wicket/MarkupContainer.java | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/e47e61e2/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
index 68c16f7..30293fb 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -1107,7 +1107,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
return null;
}
Component component = null;
- if ((children instanceof Object[] == false) && (children instanceof List == false))
+ if (children instanceof Component)
{
if (getId(children).equals(id))
{
@@ -1117,7 +1117,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
else
{
Object[] children;
- int size = 0;
+ int size;
if (this.children instanceof ChildList)
{
children = ((ChildList)this.children).childs;
@@ -1151,7 +1151,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
{
return -1;
}
- if (children instanceof Object[] == false && children instanceof ChildList == false)
+ if (children instanceof Component)
{
if (getId(children).equals(child.getId()))
{
@@ -1160,7 +1160,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
}
else
{
- int size = 0;
+ int size;
Object[] children;
if (this.children instanceof Object[])
{