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/13 17:55:01 UTC

[1/4] wicket git commit: Remove useless javadoc.

Repository: wicket
Updated Branches:
  refs/heads/master 89bffd2d5 -> bad3aa708


Remove useless javadoc.

It is implicitly provided even without "@see parent"


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/6f2d227f
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/6f2d227f
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/6f2d227f

Branch: refs/heads/master
Commit: 6f2d227fd6e27e8be81e412a1c17e261d92c0490
Parents: 89bffd2
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Mar 13 17:21:03 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Mar 13 17:21:03 2016 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/wicket/Component.java  |  2 +-
 .../java/org/apache/wicket/MarkupContainer.java | 23 ---------------
 .../src/main/java/org/apache/wicket/Page.java   | 31 --------------------
 .../org/apache/wicket/markup/html/WebPage.java  |  4 ---
 4 files changed, 1 insertion(+), 59 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/6f2d227f/wicket-core/src/main/java/org/apache/wicket/Component.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Component.java b/wicket-core/src/main/java/org/apache/wicket/Component.java
index dd515d6..44a5309 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -700,7 +700,7 @@ public abstract class Component
 			setModelImpl(wrap(model));
 		}
 	}
-	
+
 	/**
 	 * Let subclasses initialize this instance, before constructors are executed. <br>
 	 * This method is intentionally <b>not</b> declared protected, to limit overriding to classes in

http://git-wip-us.apache.org/repos/asf/wicket/blob/6f2d227f/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 9e983c7..b31b8bb 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -163,17 +163,11 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
 	 */
 	private Object children;
 
-	/**
-	 * @see org.apache.wicket.Component#Component(String)
-	 */
 	public MarkupContainer(final String id)
 	{
 		this(id, null);
 	}
 
-	/**
-	 * @see org.apache.wicket.Component#Component(String, IModel)
-	 */
 	public MarkupContainer(final String id, IModel<?> model)
 	{
 		super(id, model);
@@ -899,9 +893,6 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
 		return children_size();
 	}
 
-	/**
-	 * @see org.apache.wicket.Component#toString()
-	 */
 	@Override
 	public String toString()
 	{
@@ -1596,9 +1587,6 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
 		renderComponentTagBody(markupStream, openTag);
 	}
 
-	/**
-	 * @see org.apache.wicket.Component#onRender()
-	 */
 	@Override
 	protected void onRender()
 	{
@@ -1685,9 +1673,6 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
 		}
 	}
 
-	/**
-	 * @see org.apache.wicket.Component#removeChildren()
-	 */
 	@Override
 	void removeChildren()
 	{
@@ -1710,10 +1695,6 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
 		}
 	}
 
-	/**
-	 * 
-	 * @see org.apache.wicket.Component#internalMarkRendering(boolean)
-	 */
 	@Override
 	void internalMarkRendering(boolean setRenderingFlag)
 	{
@@ -1749,10 +1730,6 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
 		}
 	}
 
-	/**
-	 * 
-	 * @see org.apache.wicket.Component#onBeforeRenderChildren()
-	 */
 	@Override
 	void onBeforeRenderChildren()
 	{

http://git-wip-us.apache.org/repos/asf/wicket/blob/6f2d227f/wicket-core/src/main/java/org/apache/wicket/Page.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/Page.java b/wicket-core/src/main/java/org/apache/wicket/Page.java
index 0935942..3c24a1e 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Page.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Page.java
@@ -228,9 +228,6 @@ public abstract class Page extends MarkupContainer
 		super.detachModels();
 	}
 
-	/**
-	 * @see org.apache.wicket.Component#internalPrepareForRender(boolean)
-	 */
 	@Override
 	public void internalPrepareForRender(boolean setRenderingFlag)
 	{
@@ -334,9 +331,6 @@ public abstract class Page extends MarkupContainer
 		return autoIndex++;
 	}
 
-	/**
-	 * @see org.apache.wicket.Component#getId()
-	 */
 	@Override
 	public final String getId()
 	{
@@ -721,9 +715,6 @@ public abstract class Page extends MarkupContainer
 		stateless = null;
 	}
 
-	/**
-	 * 
-	 */
 	private void setNextAvailableId()
 	{
 		setNumericId(getSession().nextPageId());
@@ -785,10 +776,6 @@ public abstract class Page extends MarkupContainer
 		}
 	}
 
-	/**
-	 * 
-	 * @see org.apache.wicket.Component#onBeforeRender()
-	 */
 	@Override
 	protected void onBeforeRender()
 	{
@@ -809,9 +796,6 @@ public abstract class Page extends MarkupContainer
 		}
 	}
 
-	/**
-	 * @see org.apache.wicket.Component#onAfterRender()
-	 */
 	@Override
 	protected void onAfterRender()
 	{
@@ -852,9 +836,6 @@ public abstract class Page extends MarkupContainer
 		}
 	}
 
-	/**
-	 * @see org.apache.wicket.Component#onDetach()
-	 */
 	@Override
 	protected void onDetach()
 	{
@@ -868,9 +849,6 @@ public abstract class Page extends MarkupContainer
 		super.onDetach();
 	}
 
-	/**
-	 * @see org.apache.wicket.MarkupContainer#onRender()
-	 */
 	@Override
 	protected void onRender()
 	{
@@ -940,9 +918,6 @@ public abstract class Page extends MarkupContainer
 		this.stateless = stateless;
 	}
 
-	/**
-	 * @see org.apache.wicket.MarkupContainer#getMarkupType()
-	 */
 	@Override
 	public MarkupType getMarkupType()
 	{
@@ -965,9 +940,6 @@ public abstract class Page extends MarkupContainer
 		return new PageReference(numericId);
 	}
 
-	/**
-	 * @see org.apache.wicket.page.IManageablePage#getPageId()
-	 */
 	@Override
 	public int getPageId()
 	{
@@ -1004,9 +976,6 @@ public abstract class Page extends MarkupContainer
 		return getFlag(FLAG_WAS_CREATED_BOOKMARKABLE);
 	}
 
-	/**
-	 * @see org.apache.wicket.request.component.IRequestablePage#renderPage()
-	 */
 	@Override
 	public void renderPage()
 	{

http://git-wip-us.apache.org/repos/asf/wicket/blob/6f2d227f/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
index 71fb9ad..22b5e65 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
@@ -60,7 +60,6 @@ import org.slf4j.LoggerFactory;
  */
 public class WebPage extends Page
 {
-	/** log. */
 	private static final Logger log = LoggerFactory.getLogger(WebPage.class);
 
 	private static final long serialVersionUID = 1L;
@@ -76,9 +75,6 @@ public class WebPage extends Page
 		commonInit();
 	}
 
-	/**
-	 * @see Page#Page(IModel)
-	 */
 	protected WebPage(final IModel<?> model)
 	{
 		super(model);


[3/4] wicket git commit: Remove no-op method.

Posted by mg...@apache.org.
Remove no-op method.


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/c7ff8376
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/c7ff8376
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/c7ff8376

Branch: refs/heads/master
Commit: c7ff83766fbb6d77452c646bd6b8394a446cbc4c
Parents: bee1e05
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Mar 13 17:54:08 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Mar 13 17:54:08 2016 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/wicket/markup/html/WebPage.java | 11 -----------
 1 file changed, 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/c7ff8376/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
index 22b5e65..c1e8e58 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/WebPage.java
@@ -72,13 +72,11 @@ public class WebPage extends Page
 	 */
 	protected WebPage()
 	{
-		commonInit();
 	}
 
 	protected WebPage(final IModel<?> model)
 	{
 		super(model);
-		commonInit();
 	}
 
 	/**
@@ -99,7 +97,6 @@ public class WebPage extends Page
 	protected WebPage(final PageParameters parameters)
 	{
 		super(parameters);
-		commonInit();
 	}
 
 	/**
@@ -116,14 +113,6 @@ public class WebPage extends Page
 		return MarkupType.HTML_MARKUP_TYPE;
 	}
 
-	/**
-	 * Common code executed by constructors.
-	 */
-	private void commonInit()
-	{
-		// so far a noop
-	}
-
 	@Override
 	protected void onRender()
 	{


[4/4] 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/bad3aa70
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/bad3aa70
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/bad3aa70

Branch: refs/heads/master
Commit: bad3aa70845dcd1b9a68673ee9e6ddec5c25dfc9
Parents: c7ff837
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Mar 13 17:54:25 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Mar 13 17:54:25 2016 +0100

----------------------------------------------------------------------
 .../java/org/apache/wicket/markup/html/link/ExternalLink.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/bad3aa70/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
index cc106d7..e37799b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
@@ -68,7 +68,7 @@ public class ExternalLink extends AbstractLink
 	{
 		super(id);
 
-		setDefaultModel(href != null ? new Model<String>(href) : null);
+		setDefaultModel(href != null ? new Model<>(href) : null);
 		setBody(Model.of(label));
 	}
 
@@ -228,4 +228,4 @@ public class ExternalLink extends AbstractLink
 		this.contextRelative = contextRelative;
 		return this;
 	}
-}
\ No newline at end of file
+}


[2/4] wicket git commit: Make an extra effort to extract an IValidator from ValidatorAdapter (chain). Just in case.

Posted by mg...@apache.org.
Make an extra effort to extract an IValidator from ValidatorAdapter (chain). Just in case.


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/bee1e059
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/bee1e059
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/bee1e059

Branch: refs/heads/master
Commit: bee1e0592cd560f97a011f814679eba2a6b3bb56
Parents: 6f2d227
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Sun Mar 13 17:52:56 2016 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Sun Mar 13 17:52:56 2016 +0100

----------------------------------------------------------------------
 .../main/java/org/apache/wicket/markup/html/HTML5Attributes.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/bee1e059/wicket-core/src/main/java/org/apache/wicket/markup/html/HTML5Attributes.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/HTML5Attributes.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/HTML5Attributes.java
index 718f4ab..5d72686 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/HTML5Attributes.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/HTML5Attributes.java
@@ -80,7 +80,7 @@ public class HTML5Attributes extends Behavior
 
 		for (IValidator<?> validator : input.getValidators())
 		{
-			if (validator instanceof ValidatorAdapter)
+			while (validator instanceof ValidatorAdapter)
 			{
 				validator = ((ValidatorAdapter<?>)validator).getValidator();
 			}
@@ -130,4 +130,4 @@ public class HTML5Attributes extends Behavior
 			}
 		}
 	}
-}
\ No newline at end of file
+}