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/05/19 09:17:56 UTC
[1/4] wicket git commit: WICKET-5906 Move StringResourceModel to a
fluid API
Repository: wicket
Updated Branches:
refs/heads/master 0a1024b1a -> 31f3acb0d
WICKET-5906 Move StringResourceModel to a fluid API
This commit breaks the API late in the release cycle of 7 but
changes made to the constructors of StringResourceModel made
some usages silently failing.
We decided in favor of breaking the API to raise compilation
errors so that users can fix their code.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f3914dd1
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f3914dd1
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f3914dd1
Branch: refs/heads/master
Commit: f3914dd107cf7563eefc20aaa56cd75b4107410a
Parents: 0a1024b
Author: Guillaume Smet <gu...@gmail.com>
Authored: Fri May 15 15:29:52 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue May 19 10:13:34 2015 +0300
----------------------------------------------------------------------
.../markup/html/form/AutoLabelTextResolver.java | 2 +-
.../wicket/model/StringResourceModel.java | 116 ++++++++-----------
.../wicket/model/StringResourceModelTest.java | 43 ++++---
.../resource/loader/PropertiesResolverTest.java | 2 +-
4 files changed, 71 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/f3914dd1/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelTextResolver.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelTextResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelTextResolver.java
index d76688e..eba42ce 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelTextResolver.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelTextResolver.java
@@ -196,7 +196,7 @@ public class AutoLabelTextResolver implements IComponentResolver
String text = labeled.getString(resourceKey);
if (!Strings.isEmpty(text))
{
- return new StringResourceModel(resourceKey, labeled, null);
+ return new StringResourceModel(resourceKey, labeled);
}
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/f3914dd1/wicket-core/src/main/java/org/apache/wicket/model/StringResourceModel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/model/StringResourceModel.java b/wicket-core/src/main/java/org/apache/wicket/model/StringResourceModel.java
index 4a9d36b..9faec98 100644
--- a/wicket-core/src/main/java/org/apache/wicket/model/StringResourceModel.java
+++ b/wicket-core/src/main/java/org/apache/wicket/model/StringResourceModel.java
@@ -26,6 +26,7 @@ import org.apache.wicket.Localizer;
import org.apache.wicket.Session;
import org.apache.wicket.core.util.string.interpolator.PropertyVariableInterpolator;
import org.apache.wicket.resource.loader.ComponentStringResourceLoader;
+import org.apache.wicket.util.lang.Args;
import org.apache.wicket.util.string.Strings;
@@ -185,20 +186,20 @@ public class StringResourceModel extends LoadableDetachableModel<String>
{
private static final long serialVersionUID = 1L;
- /** The wrapped model. */
- private final IModel<?> model;
-
- /** Optional parameters. */
- private final Object[] parameters;
+ /** The key of message to get. */
+ private final String resourceKey;
/** The relative component used for lookups. */
private final Component component;
- /** The key of message to get. */
- private final String resourceKey;
+ /** The wrapped model. */
+ private IModel<?> model;
+
+ /** Optional parameters. */
+ private Object[] parameters;
/** The default value of the message. */
- private final IModel<String> defaultValue;
+ private IModel<String> defaultValue;
@Override
public IWrapModel<String> wrapOnAssignment(Component component)
@@ -275,11 +276,6 @@ public class StringResourceModel extends LoadableDetachableModel<String>
* not be obtained from resource bundles that are held relative to a particular component or
* page. However, for application that use only global resources then this parameter may be
* null.
- * <p>
- * The model parameter is also optional and only needs to be supplied if value substitutions are
- * to take place on either the resource key or the actual resource strings.
- * <p>
- * The parameters parameter is also optional and is used for substitutions.
*
* @param resourceKey
* The resource key for this string resource
@@ -287,13 +283,14 @@ public class StringResourceModel extends LoadableDetachableModel<String>
* The component that the resource is relative to
* @param model
* The model to use for property substitutions
- * @param parameters
- * The parameters to substitute using a Java MessageFormat object
*/
- public StringResourceModel(final String resourceKey, final Component component,
- final IModel<?> model, final Object... parameters)
+ public StringResourceModel(final String resourceKey, final Component component, IModel<?> model)
{
- this(resourceKey, component, model, null, parameters);
+ Args.notNull(resourceKey, "resource key");
+
+ this.resourceKey = resourceKey;
+ this.component = component;
+ this.model = model;
}
/**
@@ -303,82 +300,67 @@ public class StringResourceModel extends LoadableDetachableModel<String>
* not be obtained from resource bundles that are held relative to a particular component or
* page. However, for application that use only global resources then this parameter may be
* null.
- * <p>
- * The model parameter is also optional and only needs to be supplied if value substitutions are
- * to take place on either the resource key or the actual resource strings.
- * <p>
- * The parameters parameter is also optional and is used for substitutions.
*
* @param resourceKey
* The resource key for this string resource
* @param component
* The component that the resource is relative to
- * @param model
- * The model to use for property substitutions
+ */
+ public StringResourceModel(final String resourceKey, final Component component)
+ {
+ this(resourceKey, component, null);
+ }
+
+ /**
+ * Creates a new string resource model using the supplied parameter.
+ *
+ * @param resourceKey
+ * The resource key for this string resource
+ */
+ public StringResourceModel(final String resourceKey)
+ {
+ this(resourceKey, null, null);
+ }
+
+ /**
+ * Sets the default value if the resource key is not found.
+ *
* @param defaultValue
* The default value if the resource key is not found.
- * @param parameters
- * The parameters to substitute using a Java MessageFormat object
+ * @return this for chaining
*/
- public StringResourceModel(final String resourceKey, final Component component,
- final IModel<?> model, final IModel<String> defaultValue, final Object... parameters)
+ public StringResourceModel setDefaultValue(final IModel<String> defaultValue)
{
- if (resourceKey == null)
- {
- throw new IllegalArgumentException("Resource key must not be null");
- }
- this.resourceKey = resourceKey;
- this.component = component;
- this.model = model;
this.defaultValue = defaultValue;
- this.parameters = parameters;
+ return this;
}
/**
- * Creates a new string resource model using the supplied parameters.
- * <p>
- * The model parameter is also optional and only needs to be supplied if value substitutions are
- * to take place on either the resource key or the actual resource strings.
- * <p>
- * The parameters parameter is also optional and is used for substitutions.
+ * Sets the model used for property substitutions.
*
- * @param resourceKey
- * The resource key for this string resource
* @param model
* The model to use for property substitutions
- * @param parameters
- * The parameters to substitute using a Java MessageFormat object
+ * @return this for chaining
*/
- public StringResourceModel(final String resourceKey, final IModel<?> model,
- final Object... parameters)
+ public StringResourceModel setModel(final IModel<?> model)
{
- this(resourceKey, null, model, null, parameters);
+ this.model = model;
+ return this;
}
/**
- * Creates a new string resource model using the supplied parameters.
- * <p>
- * The model parameter is also optional and only needs to be supplied if value substitutions are
- * to take place on either the resource key or the actual resource strings.
- * <p>
- * The parameters parameter is also optional and is used for substitutions.
+ * Sets the parameters used for substitution.
*
- * @param resourceKey
- * The resource key for this string resource
- * @param model
- * The model to use for property substitutions
* @param parameters
- * The parameters to substitute using a Java MessageFormat object
- * @param defaultValue
- * The default value if the resource key is not found.
+ * The parameters to substitute using a Java MessageFormat object
+ * @return this for chaining
*/
- public StringResourceModel(final String resourceKey, final IModel<?> model,
- final IModel<String> defaultValue, final Object... parameters)
+ public StringResourceModel setParameters(Object... parameters)
{
- this(resourceKey, null, model, defaultValue, parameters);
+ this.parameters = parameters;
+ return this;
}
-
/**
* Gets the localizer that is being used by this string resource model.
*
http://git-wip-us.apache.org/repos/asf/wicket/blob/f3914dd1/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
index f3283d1..e71f8ec 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/StringResourceModelTest.java
@@ -21,7 +21,6 @@ import java.text.MessageFormat;
import java.util.Calendar;
import java.util.Locale;
-import org.apache.wicket.Component;
import org.apache.wicket.Session;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.WebPage;
@@ -58,7 +57,7 @@ public class StringResourceModelTest extends WicketTestCase
@Test
public void getSimpleResource()
{
- StringResourceModel model = new StringResourceModel("simple.text", page, null);
+ StringResourceModel model = new StringResourceModel("simple.text", page);
assertEquals("Text should be as expected", "Simple text", model.getString());
assertEquals("Text should be as expected", "Simple text", model.getObject());
}
@@ -68,13 +67,13 @@ public class StringResourceModelTest extends WicketTestCase
public void getWrappedOnAssignmentResource()
{
Label label1 = new Label("resourceModelWithComponent", new StringResourceModel(
- "wrappedOnAssignment.text", page, null));
+ "wrappedOnAssignment.text", page));
page.add(label1);
assertEquals("Text should be as expected", "Non-wrapped text",
label1.getDefaultModelObject());
Label label2 = new Label("resourceModelWithoutComponent", new StringResourceModel(
- "wrappedOnAssignment.text", (Component)null, null));
+ "wrappedOnAssignment.text"));
page.add(label2);
assertEquals("Text should be as expected", "Wrapped text",
label2.getDefaultModelObject());
@@ -84,15 +83,14 @@ public class StringResourceModelTest extends WicketTestCase
@Test(expected = IllegalArgumentException.class)
public void nullResourceKey()
{
- new StringResourceModel(null, page, null);
+ new StringResourceModel(null, page);
}
/** */
@Test
public void getSimpleResourceWithKeySubstitution()
{
- StringResourceModel model = new StringResourceModel("weather.${currentStatus}", page,
- wsModel);
+ StringResourceModel model = new StringResourceModel("weather.${currentStatus}", page, wsModel);
assertEquals("Text should be as expected", "It's sunny, wear sunscreen",
model.getString());
ws.setCurrentStatus("raining");
@@ -110,8 +108,7 @@ public class StringResourceModelTest extends WicketTestCase
// German uses comma (,) as decimal separator
Session.get().setLocale(Locale.GERMAN);
- StringResourceModel model = new StringResourceModel("weather.${currentTemperature}", page,
- wsModel);
+ StringResourceModel model = new StringResourceModel("weather.${currentTemperature}", page, wsModel);
assertEquals("Text should be as expected", "Twenty-five dot seven",
model.getString());
}
@@ -137,9 +134,9 @@ public class StringResourceModelTest extends WicketTestCase
@Test
public void substitutedPropertyAndParameterResource()
{
- StringResourceModel model = new StringResourceModel("weather.mixed", page, wsModel,
- new PropertyModel<Double>(wsModel, "currentTemperature"), new PropertyModel<String>(
- wsModel, "units"));
+ StringResourceModel model = new StringResourceModel("weather.mixed", page).setModel(wsModel)
+ .setParameters(new PropertyModel<Double>(wsModel, "currentTemperature"),
+ new PropertyModel<String>(wsModel, "units"));
MessageFormat format = new MessageFormat(
"Weather station \"Europe''s main weather station\" reports that the temperature is {0} {1}",
tester.getSession().getLocale());
@@ -162,9 +159,10 @@ public class StringResourceModelTest extends WicketTestCase
MessageFormat format = new MessageFormat(
"The report for {0,date,medium}, shows the temperature as {2,number,###.##} {3} and the weather to be {1}",
page.getLocale());
- StringResourceModel model = new StringResourceModel("weather.detail", page, wsModel,
- cal.getTime(), "${currentStatus}", new PropertyModel<Double>(wsModel,
- "currentTemperature"), new PropertyModel<String>(wsModel, "units"));
+ StringResourceModel model = new StringResourceModel("weather.detail", page).setModel(wsModel)
+ .setParameters(cal.getTime(), "${currentStatus}",
+ new PropertyModel<Double>(wsModel, "currentTemperature"),
+ new PropertyModel<String>(wsModel, "units"));
String expected = format.format(new Object[] { cal.getTime(), "sunny", 25.7, "\u00B0C" });
assertEquals("Text should be as expected", expected, model.getString());
ws.setCurrentStatus("raining");
@@ -178,7 +176,7 @@ public class StringResourceModelTest extends WicketTestCase
public void substitutionParametersResourceWithSingleQuote()
{
tester.getSession().setLocale(Locale.ENGLISH);
- StringResourceModel model = new StringResourceModel("with.quote", page, null, 10, 20);
+ StringResourceModel model = new StringResourceModel("with.quote", page).setParameters(10, 20);
assertEquals("2010.00", model.getString());
}
@@ -188,12 +186,11 @@ public class StringResourceModelTest extends WicketTestCase
{
tester.getSession().setLocale(Locale.ENGLISH);
- StringResourceModel model = new StringResourceModel("with.quote.and.no.substitution", page,
- null, (Object[])null);
+ StringResourceModel model = new StringResourceModel("with.quote.and.no.substitution", page);
assertEquals("Let's play in the rain!", model.getString());
- model = new StringResourceModel("with.quote.substitution", page, null,
- new Object[] { "rain!" });
+ model = new StringResourceModel("with.quote.substitution", page)
+ .setParameters(new Object[] { "rain!" });
assertEquals("Let's play in the rain!", model.getString());
}
@@ -201,7 +198,7 @@ public class StringResourceModelTest extends WicketTestCase
@Test(expected = UnsupportedOperationException.class)
public void setObject()
{
- StringResourceModel model = new StringResourceModel("simple.text", page, null);
+ StringResourceModel model = new StringResourceModel("simple.text", page);
model.setObject("Some value");
}
@@ -255,7 +252,7 @@ public class StringResourceModelTest extends WicketTestCase
nullOnDetachModel.setObject(ws);
Label label2 = new Label("resourceModelWithoutComponent", new StringResourceModel(
- "wrappedOnAssignment.text", nullOnDetachModel));
+ "wrappedOnAssignment.text").setModel(nullOnDetachModel));
page.add(label2);
label2.getDefaultModelObject();
label2.detach();
@@ -268,7 +265,7 @@ public class StringResourceModelTest extends WicketTestCase
@Test
public void detachEvenNotAttached() {
Wicket5176Model wrappedModel = new Wicket5176Model();
- StringResourceModel stringResourceModel = new StringResourceModel("test", (Component) null, wrappedModel);
+ StringResourceModel stringResourceModel = new StringResourceModel("test").setModel(wrappedModel);
assertFalse(stringResourceModel.isAttached());
assertTrue(wrappedModel.isAttached());
stringResourceModel.detach();
http://git-wip-us.apache.org/repos/asf/wicket/blob/f3914dd1/wicket-core/src/test/java/org/apache/wicket/resource/loader/PropertiesResolverTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/resource/loader/PropertiesResolverTest.java b/wicket-core/src/test/java/org/apache/wicket/resource/loader/PropertiesResolverTest.java
index 8c5c6a9..bcd718c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/resource/loader/PropertiesResolverTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/resource/loader/PropertiesResolverTest.java
@@ -121,7 +121,7 @@ public class PropertiesResolverTest extends Assert
private String lookup(String key, Component anchor)
{
- return new StringResourceModel(key, anchor, null, (String)null).getString();
+ return new StringResourceModel(key, anchor).getString();
}
}
[2/4] wicket git commit: WICKET-5904 NPE after editing a markup file
in debug mode
Posted by mg...@apache.org.
WICKET-5904 NPE after editing a markup file in debug mode
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b6563518
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b6563518
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b6563518
Branch: refs/heads/master
Commit: b65635188d73e3e46d4523b7643fa4ddcc509ca0
Parents: f3914dd
Author: Andrea Del Bene <ad...@apache.org>
Authored: Sat May 16 17:14:45 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue May 19 10:14:46 2015 +0300
----------------------------------------------------------------------
.../org/apache/wicket/markup/parser/AbstractMarkupFilter.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/b6563518/wicket-core/src/main/java/org/apache/wicket/markup/parser/AbstractMarkupFilter.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/AbstractMarkupFilter.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/AbstractMarkupFilter.java
index 9969c4b..db53a77 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/AbstractMarkupFilter.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/AbstractMarkupFilter.java
@@ -43,13 +43,13 @@ public abstract class AbstractMarkupFilter implements IMarkupFilter
/** The next MarkupFilter in the chain */
private IMarkupFilter parent;
-
+
/** A key for a request-relative counter (see {@link #getRequestUniqueId()}) **/
private final static MetaDataKey<AtomicInteger> REQUEST_COUNTER_KEY = new MetaDataKey<AtomicInteger>()
{
private static final long serialVersionUID = 1L;
};
-
+
/**
* Construct.
*/
@@ -194,7 +194,7 @@ public abstract class AbstractMarkupFilter implements IMarkupFilter
}
return wicketNamespace;
}
-
+
/**
* Returns an id using a request-relative counter. This can be
* useful for autocomponent tags that need to get a tag id.
[4/4] wicket git commit: WICKET-5906 Use default on missing resource
does not work
Posted by mg...@apache.org.
WICKET-5906 Use default on missing resource does not work
Fix API breaks in wicket-extensions and wicket-examples
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/31f3acb0
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/31f3acb0
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/31f3acb0
Branch: refs/heads/master
Commit: 31f3acb0d01af7be11a85c8e611c420180f77924
Parents: dd9e5e6
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Tue May 19 10:11:41 2015 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue May 19 10:17:17 2015 +0300
----------------------------------------------------------------------
.../org/apache/wicket/examples/compref/LabelPage.java | 10 +++++-----
.../org/apache/wicket/extensions/rating/RatingPanel.java | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/31f3acb0/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.java
index 47007d5..e901790 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/LabelPage.java
@@ -39,7 +39,7 @@ public class LabelPage extends WicketExamplePage
// add a static label
add(new Label("staticLabel", "static text"));
- // add a dynamic label. For this example, we create an annonymous
+ // add a dynamic label. For this example, we create an anonymous
// subclass
// of Model (just because it is less work then directly implementing
// IModel)
@@ -60,13 +60,13 @@ public class LabelPage extends WicketExamplePage
// for
// parameter substitution.
StringResourceModel stringResourceModel = new StringResourceModel("label.current.locale",
- this, null, getLocale());
+ this).setParameters(getLocale());
add(new Label("resourceLabel", stringResourceModel));
// and here we add a label that contains markup. Normally, this markup
// would be converted
- // to HTML escape characters so that e.g. a & really dislays as that
- // literal char wihout
+ // to HTML escape characters so that e.g. a & really displays as that
+ // literal char without
// our browser trying to resolve it to an HTML entity. But it this case
// we actually want
// our browser to interpret it as real markup, so we set the
@@ -91,4 +91,4 @@ public class LabelPage extends WicketExamplePage
add(new ExplainPanel(html, code));
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/31f3acb0/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java
index 127a386..4b4753b 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/rating/RatingPanel.java
@@ -362,12 +362,12 @@ public abstract class RatingPanel extends Panel
if (nrOfVotes == null)
{
Object[] parameters = new Object[] { rating };
- model = new StringResourceModel("rating.simple", this, null, parameters);
+ model = new StringResourceModel("rating.simple", this).setParameters(parameters);
}
else
{
Object[] parameters = new Object[] { rating, nrOfVotes };
- model = new StringResourceModel("rating.complete", this, null, parameters);
+ model = new StringResourceModel("rating.complete", this).setParameters(parameters);
}
return new Label(id, model);
}
[3/4] wicket git commit: WICKET-5908 A new HtmlHeaderContainer is
added each time a page instance is rendered
Posted by mg...@apache.org.
WICKET-5908 A new HtmlHeaderContainer is added each time a page instance is rendered
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/dd9e5e69
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/dd9e5e69
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/dd9e5e69
Branch: refs/heads/master
Commit: dd9e5e6907e721b461881fd04873e2bec8b0dc96
Parents: b656351
Author: Andrea Del Bene <“adelbene@apache.org”>
Authored: Mon May 18 13:40:19 2015 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Tue May 19 10:17:17 2015 +0300
----------------------------------------------------------------------
.../wicket/markup/parser/filter/HtmlHeaderSectionHandler.java | 2 +-
.../org/apache/wicket/markup/resolver/HtmlHeaderResolver.java | 2 +-
.../wicket/markup/html/autocomponent/AutoComponentsPage.java | 3 +--
.../html/autocomponent/AutocomponetsGenerationTest.java | 5 ++---
.../apache/wicket/markup/parser/filter/HeaderSectionTest.java | 7 +------
5 files changed, 6 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/dd9e5e69/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandler.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandler.java
index da416eb..0ea0002 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandler.java
@@ -62,7 +62,7 @@ public final class HtmlHeaderSectionHandler extends AbstractMarkupFilter
/** True if </head> has been found already */
private boolean foundClosingHead = false;
-
+
/** True if </wicket:header-items> has been found already */
private boolean foundHeaderItemsTag = false;
http://git-wip-us.apache.org/repos/asf/wicket/blob/dd9e5e69/wicket-core/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
index 2450704..5b84703 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/HtmlHeaderResolver.java
@@ -172,7 +172,7 @@ public class HtmlHeaderResolver implements IComponentResolver
{
htmlHeaderContainer = newHtmlHeaderContainer(id);
}
-
+
return htmlHeaderContainer;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/dd9e5e69/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutoComponentsPage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutoComponentsPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutoComponentsPage.java
index e9f0786..ae6382f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutoComponentsPage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutoComponentsPage.java
@@ -21,9 +21,8 @@ import org.apache.wicket.markup.html.basic.Label;
/**
* Page containing only autocomponents (header, enclosures, img tags, etc...)
- *
- * @author andrea del bene
*
+ * @author andrea del bene
*/
public class AutoComponentsPage extends WebPage
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/dd9e5e69/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutocomponetsGenerationTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutocomponetsGenerationTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutocomponetsGenerationTest.java
index cee6b23..ef5843a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutocomponetsGenerationTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutocomponetsGenerationTest.java
@@ -18,6 +18,7 @@ package org.apache.wicket.markup.html.autocomponent;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.IMarkupCache;
+import org.apache.wicket.markup.html.internal.HtmlHeaderContainer;
import org.junit.Test;
/*
@@ -32,7 +33,7 @@ public class AutocomponetsGenerationTest extends WicketTestCase
{
AutoComponentsPage autoComponentsPage = new AutoComponentsPage();
tester.startPage(autoComponentsPage);
-
+
int childrenNumber = tester.getLastRenderedPage().size();
//clean markup cache and render the same page instance again
@@ -43,7 +44,5 @@ public class AutocomponetsGenerationTest extends WicketTestCase
//the number of child components must not have been changed
assertEquals(childrenNumber, tester.getLastRenderedPage().size());
-
}
-
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/dd9e5e69/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java
index 0908f0c..3824a4d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java
@@ -20,9 +20,6 @@ import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.MarkupException;
import org.junit.Test;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* Simple application that demonstrates the mock http application code (and checks that it is
@@ -32,8 +29,6 @@ import org.slf4j.LoggerFactory;
*/
public class HeaderSectionTest extends WicketTestCase
{
- private static final Logger log = LoggerFactory.getLogger(HeaderSectionTest.class);
-
/**
* @throws Exception
*/
@@ -222,7 +217,7 @@ public class HeaderSectionTest extends WicketTestCase
{
executeTest(HeaderSectionPage_20.class, "HeaderSectionPageExpectedResult_20.html");
}
-
+
/**
* https://issues.apache.org/jira/browse/WICKET-5908
*/