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/09/22 10:22:41 UTC
[2/5] git commit: Minor non-functional improvements
Minor non-functional improvements
Remove useless "@see parent" javadoc
Simplify String concatenation
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/0ce7be03
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/0ce7be03
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/0ce7be03
Branch: refs/heads/master
Commit: 0ce7be0382c9c8113afb2827e633e23fdfad1eb3
Parents: 79c0118
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Sep 22 10:01:48 2014 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Sep 22 10:01:48 2014 +0200
----------------------------------------------------------------------
.../java/org/apache/wicket/model/PropertyModel.java | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/0ce7be03/wicket-core/src/main/java/org/apache/wicket/model/PropertyModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/PropertyModel.java b/wicket-core/src/main/java/org/apache/wicket/model/PropertyModel.java
index 01d3d18..37a42b6 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/PropertyModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/PropertyModel.java
@@ -103,20 +103,12 @@ public class PropertyModel<T> extends AbstractPropertyModel<T>
this.expression = expression;
}
- /**
- * @see java.lang.Object#toString()
- */
@Override
public String toString()
{
- StringBuilder sb = new StringBuilder(super.toString());
- sb.append(":expression=[").append(expression).append("]");
- return sb.toString();
+ return super.toString() + ":expression=[" + expression + ']';
}
- /**
- * @see AbstractPropertyModel#propertyExpression()
- */
@Override
protected String propertyExpression()
{
@@ -127,6 +119,7 @@ public class PropertyModel<T> extends AbstractPropertyModel<T>
* Type-infering factory method
*
* @param <Z>
+ * the of the resolved object from the property
* @param parent
* object that contains the property
* @param property
@@ -135,6 +128,6 @@ public class PropertyModel<T> extends AbstractPropertyModel<T>
*/
public static <Z> PropertyModel<Z> of(Object parent, String property)
{
- return new PropertyModel<Z>(parent, property);
+ return new PropertyModel<>(parent, property);
}
-}
\ No newline at end of file
+}