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 2015/04/29 15:04:20 UTC
[1/2] wicket git commit: Remove redundant 'public' modifiers in an
interface
Repository: wicket
Updated Branches:
refs/heads/master e7059b7d1 -> 042a55dc6
Remove redundant 'public' modifiers in an interface
(cherry picked from commit 19e9a7632f5e635ba3b9276bb7ca794631597789)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/7877b7c0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/7877b7c0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/7877b7c0
Branch: refs/heads/master
Commit: 7877b7c0400aa8d1dcb06c6e15f0f8093b1f2a34
Parents: e7059b7
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Apr 29 16:03:31 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Apr 29 16:03:59 2015 +0300
----------------------------------------------------------------------
.../org/apache/wicket/markup/head/IHeaderResponse.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/7877b7c0/wicket-core/src/main/java/org/apache/wicket/markup/head/IHeaderResponse.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/head/IHeaderResponse.java b/wicket-core/src/main/java/org/apache/wicket/markup/head/IHeaderResponse.java
index e5f9c15..a297f87 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/head/IHeaderResponse.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/head/IHeaderResponse.java
@@ -38,7 +38,7 @@ public interface IHeaderResponse extends Closeable
* @param item
* The item to render.
*/
- public void render(HeaderItem item);
+ void render(HeaderItem item);
/**
* Marks the given object as rendered. The object can be anything (string, resource reference,
@@ -48,7 +48,7 @@ public interface IHeaderResponse extends Closeable
* @param object
* object to be marked as rendered.
*/
- public void markRendered(Object object);
+ void markRendered(Object object);
/**
* Returns whether the given object has been marked as rendered.
@@ -65,7 +65,7 @@ public interface IHeaderResponse extends Closeable
* Object that is queried to be rendered
* @return Whether the object has been marked as rendered during the request
*/
- public boolean wasRendered(Object object);
+ boolean wasRendered(Object object);
/**
* Returns the response that can be used to write arbitrary text to the head section.
@@ -75,14 +75,14 @@ public interface IHeaderResponse extends Closeable
*
* @return Response
*/
- public Response getResponse();
+ Response getResponse();
/**
* Mark Header rendering is completed and subsequent usage will be ignored. If some kind of
* buffering is used internally, this action will mark that the contents has to be flushed out.
*/
@Override
- public void close();
+ void close();
/**
* @return if header rendering is completed and subsequent usage will be ignored
[2/2] wicket git commit: WICKET-5895 validateHeaders fails to detect
missing head/body (regression)
Posted by mg...@apache.org.
WICKET-5895 validateHeaders fails to detect missing head/body (regression)
(cherry picked from commit 008cdad4766d9e355c078e8a8a4285e11e20e97a)
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/042a55dc
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/042a55dc
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/042a55dc
Branch: refs/heads/master
Commit: 042a55dc6fc5c7669a3c110a60eac9add94323af
Parents: 7877b7c
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Apr 29 16:03:21 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Apr 29 16:04:11 2015 +0300
----------------------------------------------------------------------
.../org/apache/wicket/markup/html/WebPage.java | 40 ++++++++++++++------
1 file changed, 28 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/042a55dc/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 d1aeea2..05feebb 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
@@ -19,6 +19,7 @@ package org.apache.wicket.markup.html;
import org.apache.wicket.Component;
import org.apache.wicket.Page;
import org.apache.wicket.markup.MarkupType;
+import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.parser.filter.HtmlHeaderSectionHandler;
@@ -264,24 +265,22 @@ public class WebPage extends Page
header = new HtmlHeaderContainer(HtmlHeaderSectionHandler.HEADER_ID);
add(header);
- Response orgResponse = getRequestCycle().getResponse();
+ RequestCycle requestCycle = getRequestCycle();
+ Response orgResponse = requestCycle.getResponse();
try
{
- final StringResponse response = new StringResponse();
- getRequestCycle().setResponse(response);
+ StringResponse tempResponse = new StringResponse();
+ requestCycle.setResponse(tempResponse);
// Render all header sections of all components on the page
AbstractHeaderRenderStrategy.get().renderHeader(header, null, getPage());
- response.close();
- if (response.getBuffer().length() > 0)
+ IHeaderResponse headerResponse = header.getHeaderResponse();
+ headerResponse.close();
+ CharSequence collectedHeaderOutput = tempResponse.getBuffer();
+ if (collectedHeaderOutput.length() > 0)
{
- // @TODO it is not yet working properly. JDo to fix it
- log.error("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^");
- log.error("You probably forgot to add a <body> or <head> tag to your markup since no Header Container was \n" +
- "found but components were found which want to write to the <head> section.\n" +
- response.getBuffer());
- log.error("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^");
+ reportMissingHead(collectedHeaderOutput);
}
}
catch (Exception e)
@@ -292,12 +291,29 @@ public class WebPage extends Page
finally
{
this.remove(header);
- getRequestCycle().setResponse(orgResponse);
+ requestCycle.setResponse(orgResponse);
}
}
}
/**
+ * Reports an error that there is no <head> and/or <body> in the page and
+ * there is no where to write the header response.
+ *
+ * @param collectedHeaderOutput
+ * The collected response that should have been written to the <head>
+ * @see #validateHeaders()
+ */
+ protected void reportMissingHead(final CharSequence collectedHeaderOutput)
+ {
+ log.error("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^");
+ log.error("You probably forgot to add a <body> or <head> tag to your markup since no Header Container was \n" +
+ "found but components were found which want to write to the <head> section.\n" +
+ collectedHeaderOutput);
+ log.error("^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^");
+ }
+
+ /**
* Creates and returns a bookmarkable link to this application's home page.
*
* @param id