You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2024/06/28 15:11:25 UTC
(wicket) branch master updated: WICKET-7116 Spelling corrections, and made the case of headings in the user guide consistent.
This is an automated email from the ASF dual-hosted git repository.
adelbene pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
The following commit(s) were added to refs/heads/master by this push:
new b7d8ba2cae WICKET-7116 Spelling corrections, and made the case of headings in the user guide consistent.
b7d8ba2cae is described below
commit b7d8ba2caeca63bc7f791a6d8555410cba236895
Author: Johan Stuyts <j....@javathinker.com>
AuthorDate: Thu Jun 27 18:48:02 2024 +0200
WICKET-7116 Spelling corrections, and made the case of headings in the user guide consistent.
---
.../html/SingleNestedTransparentContainerPage.java | 2 +-
.../html/TransparentWebMarkupContainerTest.java | 9 +++---
.../html/autocomponent/AutoComponentsBorder.html | 2 +-
...Test.java => AutoComponentsGenerationTest.java} | 10 +++----
.../html/autocomponent/AutoComponentsPage.java | 2 +-
.../wicket/markup/html/internal/EnclosureTest.java | 6 ++--
.../wicket/queueing/ComponentQueueingTest.java | 2 +-
.../src/main/java/org/apache/wicket/Component.java | 2 +-
.../java/org/apache/wicket/MarkupContainer.java | 4 +--
.../markup/html/basic/EnclosureContainer.java | 4 +--
.../wicket/markup/html/image/ExternalImage.java | 10 +++----
.../wicket/markup/html/image/ExternalSource.java | 2 +-
.../org/apache/wicket/markup/html/image/Image.java | 10 +++----
.../apache/wicket/markup/html/image/Source.java | 2 +-
.../wicket/markup/html/internal/Enclosure.java | 2 +-
.../wicket/markup/html/media/MediaComponent.java | 8 ++---
.../wicket/markup/parser/AbstractMarkupFilter.java | 2 +-
.../parser/filter/RelativePathPrefixHandler.java | 2 +-
.../markup/parser/filter/WicketLinkTagHandler.java | 2 +-
.../protocol/http/IResourceIsolationPolicy.java | 2 +-
.../org/apache/wicket/util/tester/FormTester.java | 2 +-
.../componentQueueing/componentQueueing_1.adoc | 8 ++---
.../src/main/asciidoc/forms2/forms2_11.adoc | 2 +-
.../src/main/asciidoc/forms2/forms2_12.adoc | 2 +-
.../main/asciidoc/internals/autocomponents.adoc | 4 +--
.../main/asciidoc/keepControl/keepControl_9.adoc | 4 +--
.../src/main/asciidoc/maven/maven_2.adoc | 2 +-
.../main/asciidoc/modelsforms/modelsforms_2.adoc | 2 +-
.../main/asciidoc/modelsforms/modelsforms_8.adoc | 2 +-
.../src/main/asciidoc/repeaters/repeaters_4.adoc | 2 +-
wicket-user-guide/src/main/asciidoc/single.adoc | 34 +++++++++++-----------
31 files changed, 74 insertions(+), 75 deletions(-)
diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/SingleNestedTransparentContainerPage.java b/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/SingleNestedTransparentContainerPage.java
index 3a514a5773..79c2b73400 100644
--- a/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/SingleNestedTransparentContainerPage.java
+++ b/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/SingleNestedTransparentContainerPage.java
@@ -41,7 +41,7 @@ public class SingleNestedTransparentContainerPage extends WebPage
// The src attribute of the image tag inside this WebMarkupContainer is
// essential in triggering this bug. This causes Wicket to insert an
- // autocomponent (also a TransparentWebMarkupContainer)
+ // auto component (also a TransparentWebMarkupContainer)
add(new WebMarkupContainer("group"));
// if you add this TransparentWebMarkupContainer as first component in
diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/TransparentWebMarkupContainerTest.java b/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/TransparentWebMarkupContainerTest.java
index 7c8fb2aed4..a270858585 100644
--- a/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/TransparentWebMarkupContainerTest.java
+++ b/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/TransparentWebMarkupContainerTest.java
@@ -38,7 +38,6 @@ import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.mock.MockPageManager;
import org.apache.wicket.page.IManageablePage;
import org.apache.wicket.page.IPageManager;
-import org.apache.wicket.pageStore.IPageContext;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
@@ -247,7 +246,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase
@Test
void updateAjaxUpdateOfTransparentContainer() throws Exception
{
- TestEmbeddedAjaxComponet page = new TestEmbeddedAjaxComponet();
+ TestEmbeddedAjaxComponent page = new TestEmbeddedAjaxComponent();
tester.startPage(page);
assertEquals(2, page.renderHeadCount);
@@ -258,7 +257,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase
@Test
void updateAjaxUpdateOfContainerWithTransparentContainer() throws Exception
{
- TestEmbeddedAjaxComponet page = new TestEmbeddedAjaxComponet();
+ TestEmbeddedAjaxComponent page = new TestEmbeddedAjaxComponent();
tester.startPage(page);
assertEquals(2, page.renderHeadCount);
@@ -386,14 +385,14 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase
}
}
- public static class TestEmbeddedAjaxComponet extends WebPage implements IMarkupResourceStreamProvider
+ public static class TestEmbeddedAjaxComponent extends WebPage implements IMarkupResourceStreamProvider
{
private static final long serialVersionUID = 1L;
int renderHeadCount = 0;
/** */
- TestEmbeddedAjaxComponet()
+ TestEmbeddedAjaxComponent()
{
final WebMarkupContainer container = new WebMarkupContainer("container");
container.setOutputMarkupId(true);
diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/autocomponent/AutoComponentsBorder.html b/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/autocomponent/AutoComponentsBorder.html
index 5c3706e6a6..3310218c99 100644
--- a/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/autocomponent/AutoComponentsBorder.html
+++ b/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/autocomponent/AutoComponentsBorder.html
@@ -1,4 +1,4 @@
<wicket:border>
- <img src="img/relative_path_autocomponent.png">
+ <img src="img/relative_path_auto_component.png">
<wicket:body/>
</wicket:border>
\ No newline at end of file
diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/autocomponent/AutocomponetsGenerationTest.java b/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/autocomponent/AutoComponentsGenerationTest.java
similarity index 89%
rename from wicket-core-tests/src/test/java/org/apache/wicket/markup/html/autocomponent/AutocomponetsGenerationTest.java
rename to wicket-core-tests/src/test/java/org/apache/wicket/markup/html/autocomponent/AutoComponentsGenerationTest.java
index b26c4148e5..6e7292cc25 100644
--- a/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/autocomponent/AutocomponetsGenerationTest.java
+++ b/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/autocomponent/AutoComponentsGenerationTest.java
@@ -24,7 +24,7 @@ import org.apache.wicket.markup.IMarkupCache;
import org.apache.wicket.util.tester.WicketTestCase;
import org.junit.jupiter.api.Test;
-class AutocomponetsGenerationTest extends WicketTestCase
+class AutoComponentsGenerationTest extends WicketTestCase
{
/*
@@ -32,7 +32,7 @@ class AutocomponetsGenerationTest extends WicketTestCase
* and for https://issues.apache.org/jira/browse/WICKET-5908
*/
@Test
- void autocomponetsNumberDoesntChange()
+ void autoComponentsNumberDoesntChange()
{
AutoComponentsPage autoComponentsPage = new AutoComponentsPage();
tester.startPage(autoComponentsPage);
@@ -53,13 +53,13 @@ class AutocomponetsGenerationTest extends WicketTestCase
* Test for https://issues.apache.org/jira/browse/WICKET-6116
*/
@Test
- void borderResolvesAutocomponents() throws Exception
+ void borderResolvesAutoComponents() throws Exception
{
AutoComponentsBorder border = new AutoComponentsBorder("id");
ComponentRenderer.renderComponent(border);
- //we expect to have a body container and an autocomponent for <img> tag
+ //we expect to have a body container and an auto component for <img> tag
assertEquals(2, border.size());
//let's render the same border again
@@ -79,7 +79,7 @@ class AutocomponetsGenerationTest extends WicketTestCase
tester.startPage(page);
- //render page again. Autocomponents must have the same id
+ //render page again. Auto components must have the same id
tester.startPage(page);
}
}
diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/autocomponent/AutoComponentsPage.java b/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/autocomponent/AutoComponentsPage.java
index ae6382fe0a..77730bd0a5 100644
--- a/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/autocomponent/AutoComponentsPage.java
+++ b/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/autocomponent/AutoComponentsPage.java
@@ -20,7 +20,7 @@ import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.markup.html.basic.Label;
/**
- * Page containing only autocomponents (header, enclosures, img tags, etc...)
+ * Page containing only auto components (header, enclosures, img tags, etc...)
*
* @author andrea del bene
*/
diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java b/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java
index b6cebc28e7..878c500f55 100644
--- a/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java
+++ b/wicket-core-tests/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java
@@ -200,7 +200,7 @@ class EnclosureTest extends WicketTestCase
page.reset();
page.get("form:label").setVisible(false);
executePage(page, "EnclosurePageExpectedResult_9-1.html");
- // It should be FALSE, but because of auto-component etc. it doesn't
+ // It should be FALSE, but because of auto component etc. it doesn't
// assertFalse(page.inputOnBeforeRender);
assertTrue(page.inputOnBeforeRender);
assertFalse(page.inputValidate);
@@ -274,10 +274,10 @@ class EnclosureTest extends WicketTestCase
tester.submitForm("form");
tester.assertRenderedPage(clazz);
assertResultPage("EnclosurePageExpectedResult_9-2-1.html");
- // It should be FALSE, but because of auto-component etc. it doesn't
+ // It should be FALSE, but because of auto component etc. it doesn't
// assertFalse(page.inputOnBeforeRender);
assertTrue(page.inputOnBeforeRender);
- // It should be FALSE, but because of auto-component etc. it doesn't
+ // It should be FALSE, but because of auto component etc. it doesn't
// assertFalse(page.inputValidate);
assertTrue(page.inputValidate);
assertFalse(page.labelOnBeforeRender);
diff --git a/wicket-core-tests/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java b/wicket-core-tests/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java
index e3f90b4277..ac6b07aed2 100644
--- a/wicket-core-tests/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java
+++ b/wicket-core-tests/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java
@@ -634,7 +634,7 @@ class ComponentQueueingTest extends WicketTestCase
}
/**
- * Test autocomponent inside not-queue region
+ * Test auto component inside not-queue region
*/
@Test
void autosInsideNotQueueRegion()
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 5b695089bd..371fbc9a70 100644
--- a/wicket-core/src/main/java/org/apache/wicket/Component.java
+++ b/wicket-core/src/main/java/org/apache/wicket/Component.java
@@ -780,7 +780,7 @@ public abstract class Component
/**
* Set the markup for the component. Note that the component's markup variable is transient and
- * thus must only be used for one render cycle. E.g. auto-component are using it. You may also
+ * thus must only be used for one render cycle. E.g. auto components are using it. You may also
* it if you subclassed getMarkup().
*
* @param markup
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 fbd83ea012..ad876b36e6 100644
--- a/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/MarkupContainer.java
@@ -308,7 +308,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
// Add the child to the parent.
// Arguably child.setParent() can be used as well. It connects the child to the parent and
- // that's all what most auto-components need. Unfortunately child.onDetach() will not / can
+ // that's all what most auto components need. Unfortunately child.onDetach() will not / can
// not be invoked, since the parent doesn't known its one of his children. Hence we need to
// properly add it.
children_remove(component.getId());
@@ -1958,7 +1958,7 @@ public abstract class MarkupContainer extends Component implements Iterable<Comp
// dequeue
child = dequeue.findComponentToDequeue(tag);
- //if tag has an autocomponent factory let's use it
+ //if tag has an auto component factory let's use it
if (child == null && tag.getAutoComponentFactory() != null)
{
IAutoComponentFactory autoComponentFactory = tag.getAutoComponentFactory();
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/basic/EnclosureContainer.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/basic/EnclosureContainer.java
index 32b7fb41f2..5b9f90b7b0 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/basic/EnclosureContainer.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/basic/EnclosureContainer.java
@@ -24,14 +24,14 @@ import org.apache.wicket.util.lang.Args;
/**
* <code><wicket:enclosure></code> is nice and prevents that users have to add boilerplate to
* their application. But it is not without problems. The child components are children in the
- * markup, but the auto-component generated for the enclosure tag will not magically re-parent the
+ * markup, but the auto component generated for the enclosure tag will not magically re-parent the
* child components. Thus, the markup hierarchy and the component hierarchy will be out of sync. The
* automatically created enclosure container will be created alongside its "children" with both
* attached to the very same parent container. That leads to a tricky situation since e.g.
* <code>onBeforeRender()</code> will be called for enclosure children even if the enclosure is made
* invisible by it controlling child.
* <p>
- * On top auto-components cannot keep any state. A new instance is created during each render
+ * On top auto components cannot keep any state. A new instance is created during each render
* process and automatically deleted at the end. That implies that we cannot prevent
* <code>validation()</code> from being called, since validation() is called before the actual
* render process has started.
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ExternalImage.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ExternalImage.java
index bcde8ce8d0..a700374faf 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ExternalImage.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ExternalImage.java
@@ -51,7 +51,7 @@ public class ExternalImage extends WebComponent
private List<String> sizes = null;
/**
- * Cross origin settings
+ * Cross-origin settings
*/
private CrossOrigin crossOrigin = null;
@@ -280,11 +280,11 @@ public class ExternalImage extends WebComponent
}
/**
- * Gets the cross origin settings
+ * Gets the cross-origin settings
*
* @see org.apache.wicket.markup.html.image.Image#setCrossOrigin(CrossOrigin)
*
- * @return the cross origins settings
+ * @return the cross-origins settings
*/
public CrossOrigin getCrossOrigin()
{
@@ -292,11 +292,11 @@ public class ExternalImage extends WebComponent
}
/**
- * Sets the cross origin settings
+ * Sets the cross-origin settings
*
* @see org.apache.wicket.markup.html.image.Image#setCrossOrigin(CrossOrigin)
* @param crossOrigin
- * the cross origins settings to set
+ * the cross-origins settings to set
*/
public void setCrossOrigin(CrossOrigin crossOrigin)
{
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ExternalSource.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ExternalSource.java
index d97c90f8ff..05217a0fab 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ExternalSource.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/ExternalSource.java
@@ -116,7 +116,7 @@ public class ExternalSource extends ExternalImage
* Unsupported for source tag
*/
@Override
- public void setCrossOrigin(CrossOrigin crossorigin)
+ public void setCrossOrigin(CrossOrigin crossOrigin)
{
throw new UnsupportedOperationException(
"It is not allowed to set the crossorigin attribute for source tag");
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java
index c6e625b15b..6d6697311d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Image.java
@@ -66,7 +66,7 @@ public class Image extends WebComponent implements IRequestListener
private List<String> sizes = null;
/**
- * Cross origin settings
+ * Cross-origin settings
*/
private CrossOrigin crossOrigin = null;
@@ -562,11 +562,11 @@ public class Image extends WebComponent implements IRequestListener
}
/**
- * Gets the cross origin settings
+ * Gets the cross-origin settings
*
* @see #setCrossOrigin(CrossOrigin)
*
- * @return the cross origins settings
+ * @return the cross-origins settings
*/
public CrossOrigin getCrossOrigin()
{
@@ -574,7 +574,7 @@ public class Image extends WebComponent implements IRequestListener
}
/**
- * Sets the cross origin settings<br>
+ * Sets the cross-origin settings<br>
* <br>
*
* <b>ANONYMOUS</b>: Cross-origin CORS requests for the element will not have the credentials
@@ -588,7 +588,7 @@ public class Image extends WebComponent implements IRequestListener
* when the attribute is omitted, is the No CORS state
*
* @param crossOrigin
- * the cross origins settings to set
+ * the cross-origins settings to set
*/
public void setCrossOrigin(CrossOrigin crossOrigin)
{
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Source.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Source.java
index 411d0a15d7..ad57ab99b2 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Source.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/image/Source.java
@@ -161,7 +161,7 @@ public class Source extends Image
* Unsupported for source tag
*/
@Override
- public void setCrossOrigin(CrossOrigin crossorigin)
+ public void setCrossOrigin(CrossOrigin crossOrigin)
{
throw new UnsupportedOperationException(
"It is not allowed to set the crossorigin attribute for source tag");
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java
index 1daa4c74dc..163b4ddf7c 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/internal/Enclosure.java
@@ -67,7 +67,7 @@ import org.apache.wicket.util.string.Strings;
* }
* </pre>
* <p>
- * Please note that since a transparent auto-component is created for the tag, the markup and the
+ * Please note that since a transparent auto component is created for the tag, the markup and the
* component hierarchy will not be in sync which leads to subtle differences if your code relies on
* onBeforeRender() and validate() being called for the children inside the enclosure tag. E.g. it
* might happen that onBeforeRender() and validate() gets called on invisible components. In doubt,
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaComponent.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaComponent.java
index 069af58794..b68ad85695 100755
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaComponent.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/media/MediaComponent.java
@@ -584,11 +584,11 @@ public abstract class MediaComponent extends WebMarkupContainer
}
/**
- * Gets the cross origin settings
+ * Gets the cross-origin settings
*
* @see #setCrossOrigin(Cors)
*
- * @return the cross origins settings
+ * @return the cross-origins settings
*/
public Cors getCrossOrigin()
{
@@ -596,7 +596,7 @@ public abstract class MediaComponent extends WebMarkupContainer
}
/**
- * Sets the cross origin settings<br>
+ * Sets the cross-origin settings<br>
* <br>
*
* <b>ANONYMOUS</b>: Cross-origin CORS requests for the element will not have the credentials
@@ -610,7 +610,7 @@ public abstract class MediaComponent extends WebMarkupContainer
* when the attribute is omitted, is the No CORS state
*
* @param crossOrigin
- * the cross origins settings to set
+ * the cross-origins settings to set
*/
public void setCrossOrigin(Cors crossOrigin)
{
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 3700470ad4..5eb6bf16a3 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
@@ -208,7 +208,7 @@ public abstract class AbstractMarkupFilter implements IMarkupFilter
* Returns an id using the request-relative counter associated with the
* underlying {@link org.apache.wicket.markup.MarkupResourceStream}'s owner container
* (see {@link org.apache.wicket.markup.MarkupResourceStream#getContainerInfo()}).
- * This can be useful for autocomponent tags that need to get a tag id.
+ * This can be useful for auto component tags that need to get a tag id.
*
* @return
* the request-relative id
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java
index 554df3edb0..ec354edf5b 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/RelativePathPrefixHandler.java
@@ -137,7 +137,7 @@ public final class RelativePathPrefixHandler extends AbstractMarkupFilter
String wicketIdAttr = getWicketNamespace() + ":" + "id";
- // Don't touch any wicket:id component and any auto-components
+ // Don't touch any wicket:id component and any auto components
if ((tag instanceof WicketTag) || (tag.isAutolinkEnabled() == true)
|| (tag.getAttributes().get(wicketIdAttr) != null))
{
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java
index e01b199c60..fb27e6ef9d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java
@@ -168,7 +168,7 @@ public class WicketLinkTagHandler extends AbstractMarkupFilter implements ICompo
*
* @param tag
* The current tag being parsed
- * @return If true, tag will become auto-component
+ * @return If true, tag will become auto component
*/
protected boolean analyzeAutolinkCondition(final ComponentTag tag)
{
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/IResourceIsolationPolicy.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/IResourceIsolationPolicy.java
index 7c324a36ce..fb5de31218 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/IResourceIsolationPolicy.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/IResourceIsolationPolicy.java
@@ -24,7 +24,7 @@ import org.apache.wicket.request.component.IRequestablePage;
/**
* Interface for the resource isolation policies.
* <p>
- * Resource isolation policies are designed to protect against cross origin attacks.
+ * Resource isolation policies are designed to protect against cross-origin attacks.
* <p>
* See {@link FetchMetadataResourceIsolationPolicy} for the default implementation used
* by {@link ResourceIsolationRequestCycleListener}.
diff --git a/wicket-tester/src/main/java/org/apache/wicket/util/tester/FormTester.java b/wicket-tester/src/main/java/org/apache/wicket/util/tester/FormTester.java
index b01326a3a0..d06503a624 100644
--- a/wicket-tester/src/main/java/org/apache/wicket/util/tester/FormTester.java
+++ b/wicket-tester/src/main/java/org/apache/wicket/util/tester/FormTester.java
@@ -60,7 +60,7 @@ import org.apache.wicket.util.visit.IVisitor;
*/
public class FormTester
{
- private static final String NO_FORM_FOR_PATH = "No Form componet found for path '%s'. Check if path value is correct and "
+ private static final String NO_FORM_FOR_PATH = "No Form component found for path '%s'. Check if path value is correct and "
+ "if form component is visible and active.";
/**
diff --git a/wicket-user-guide/src/main/asciidoc/componentQueueing/componentQueueing_1.adoc b/wicket-user-guide/src/main/asciidoc/componentQueueing/componentQueueing_1.adoc
index 6aa2c59567..be0e258140 100644
--- a/wicket-user-guide/src/main/asciidoc/componentQueueing/componentQueueing_1.adoc
+++ b/wicket-user-guide/src/main/asciidoc/componentQueueing/componentQueueing_1.adoc
@@ -53,16 +53,16 @@ There are a couple of reasons:
We will examine these below.
-=== Markup Id Ambiguities
+=== Markup ID ambiguities
In the example above we have a form that collects the name of a customer along with the name of their child and the child’s date of birth. We mapped the name of the customer and child to form components with wicket ids _first_ and _last_. If we were to add all the components to the same parent we would get an error because we cannot have two components with the same wicket id under the same parent (two components with id _first_ and two with id _last_).
Without hierarchy in Java we would have to make sure that all wicket ids in a markup file are unique, no small feat in a non-trivial page or panel. But, with hierarchy on the Java side we just have to make sure that no parent has two children with the same id, which is trivial.
-=== Inheriting State From Parents
+=== Inheriting state from parents
Suppose we wanted to hide form fields related to the child in the example above when certain conditions are met. Without hierarchy we would have to modify the _first_, _last_, and _dob_ fields to implement the visibility check. Worse, whenever we would add a new child related field we would have to remember to implement the same check; this is a maintenance headache. With hierarchy this is easy, simply hide the parent container and all children will be hidden as well — the code lives in [...]
-=== Pain Points of the Java-Side Hierarchy
+=== Pain points of the Java-side hierarchy
While undeniably useful, the Java-side hierarchy can be a pain to maintain. It is very common to get requests to change things because the designer needs to wrap some components in a _div_ with a dynamic style or class attribute. Essentially we want to go from:
@@ -113,7 +113,7 @@ Another common change is to tweak the nesting of markup tags. This is something
In large pages with a lot of components these kinds of simple changes tend to cause a lot of annoyance for the developers.
-=== Component Queueing To The Rescue
+=== Component queueing to the rescue
The idea behind component queueing is simple: instead of adding components to their parents directly, the developer can queue them in any ancestor and have Wicket automatically ‘dequeue’ them to the correct parent using the hierarchy defined in the markup. This will give us the best of both worlds: the developer only has to define the hierarchy once in markup, and have it automatically constructed in Java land.
diff --git a/wicket-user-guide/src/main/asciidoc/forms2/forms2_11.adoc b/wicket-user-guide/src/main/asciidoc/forms2/forms2_11.adoc
index 8f46f3e52a..0668b7e2b2 100644
--- a/wicket-user-guide/src/main/asciidoc/forms2/forms2_11.adoc
+++ b/wicket-user-guide/src/main/asciidoc/forms2/forms2_11.adoc
@@ -147,7 +147,7 @@ form.add(new CheckBoxMultipleChoice("checkGroup", new ListModel<String>(new Arra
image::./img/grouped-checkbox2.png[]
-=== How to implement a "Select all" checkbox
+=== How to implement a "select all" checkbox
A nice feature we can offer to users when we have a group of checkboxes is a “special” checkbox which selects/unselects all the other options of the group:
diff --git a/wicket-user-guide/src/main/asciidoc/forms2/forms2_12.adoc b/wicket-user-guide/src/main/asciidoc/forms2/forms2_12.adoc
index 250f346b7a..fc87a493eb 100644
--- a/wicket-user-guide/src/main/asciidoc/forms2/forms2_12.adoc
+++ b/wicket-user-guide/src/main/asciidoc/forms2/forms2_12.adoc
@@ -35,7 +35,7 @@ This component must be bound to a <select> tag but the attribute multiple="multi
The number of visible rows can be set with the setMaxRows(int maxRows) method.
-=== Component Palette
+=== Component palette
While multiple choice list solves the problem of handling a big number of multiple choices, it is not much intuitive for end users. That's why desktop GUIs have introduced a more complex component which can be generally referred to as multi select transfer component (it doesn't have an actual official name):
diff --git a/wicket-user-guide/src/main/asciidoc/internals/autocomponents.adoc b/wicket-user-guide/src/main/asciidoc/internals/autocomponents.adoc
index 7c6198fda7..5458ca6407 100644
--- a/wicket-user-guide/src/main/asciidoc/internals/autocomponents.adoc
+++ b/wicket-user-guide/src/main/asciidoc/internals/autocomponents.adoc
@@ -46,7 +46,7 @@ Usually we won't need to change the default configuration of _IMarkupFiltersS_,
Even if Wicket encourages developers to use just standard HTML in their markup code, in this guide we have seen a number of "special" tags (those starting with _wicket:_) that help us for specific tasks (e.g. _wicket:enclosure_ tag). Wicket handles most of these tags creating a corresponding special component called _auto_ component. This kind of components are resolved in two steps:
1. first their tag is identified by a _IMarkupFilters_ which also takes care of assigning a unique tag id.
-2. then during rendering phase when an auto-component is found a new component is created for it using one of the registered _org.apache.wicket.markup.resolver.IComponentResolver_:
+2. then during rendering phase when an auto component is found a new component is created for it using one of the registered _org.apache.wicket.markup.resolver.IComponentResolver_:
[source,java]
----
@@ -77,5 +77,5 @@ Application.get()
.getComponentResolvers()
----
-NOTE: An internal utility class named _org.apache.wicket.markup.resolver.ComponentResolvers_ is also available to resolve autocomponents for the current markup tag.
+NOTE: An internal utility class named _org.apache.wicket.markup.resolver.ComponentResolvers_ is also available to resolve auto components for the current markup tag.
diff --git a/wicket-user-guide/src/main/asciidoc/keepControl/keepControl_9.adoc b/wicket-user-guide/src/main/asciidoc/keepControl/keepControl_9.adoc
index 1d12dfdf54..c8577d81a9 100644
--- a/wicket-user-guide/src/main/asciidoc/keepControl/keepControl_9.adoc
+++ b/wicket-user-guide/src/main/asciidoc/keepControl/keepControl_9.adoc
@@ -37,6 +37,6 @@ _child_ attribute supports also nested components with a colon-separated path:
</wicket:enclosure>
----
-WARNING: _<wicket:enclosure>_ is nice and prevents that users have to add boilerplate to their application. But it is not without problems. The child components are children in the markup, but the auto-component generated for the enclosure tag will not magically re-parent the child components. Thus the markup hierarchy and the component hierarchy will be out of sync. The automatically created enclosure container will be created along side its "children" with both attached to the very sam [...]
-On top auto-components cannot keep any state. A new instance is created during each render process and automatically deleted at the end. That implies that we cannot prevent _validation()_ from being called, since _validation()_ is called before the actual render process has started.
+WARNING: _<wicket:enclosure>_ is nice and prevents that users have to add boilerplate to their application. But it is not without problems. The child components are children in the markup, but the auto component generated for the enclosure tag will not magically re-parent the child components. Thus the markup hierarchy and the component hierarchy will be out of sync. The automatically created enclosure container will be created along side its "children" with both attached to the very sam [...]
+On top auto components cannot keep any state. A new instance is created during each render process and automatically deleted at the end. That implies that we cannot prevent _validation()_ from being called, since _validation()_ is called before the actual render process has started.
Where any of these problems apply, you may replace the tag and manually add a https://ci.apache.org/projects/wicket/apidocs/9.x/org/apache/wicket/markup/html/basic/EnclosureContainer.html[EnclosureContainer] which basically does the same. But instead of adding the children to the Page, Panel, whatever, you must add the children to this container in order to keep the component hierarchy in sync.
diff --git a/wicket-user-guide/src/main/asciidoc/maven/maven_2.adoc b/wicket-user-guide/src/main/asciidoc/maven/maven_2.adoc
index 5de0a7aaaa..cacd36d987 100644
--- a/wicket-user-guide/src/main/asciidoc/maven/maven_2.adoc
+++ b/wicket-user-guide/src/main/asciidoc/maven/maven_2.adoc
@@ -99,7 +99,7 @@ image::./img/eclipse-maven-select.png[]
Once the project has been imported into Eclipse, we are free to use our favourite plug-ins to run it or debug it (like for example https://github.com/xzer/run-jetty-run/[run-jetty-run]).
-=== Speeding up development with plugins.
+=== Speeding up development with plugins
Now that we have our project loaded into our IDE we could start coding our components directly by hand. However it would be a shame to not leverage the free and good Wicket plugins available for our IDE. The following is a brief overview of the most widely used plugins for each of the three main IDEs considered so far.
diff --git a/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_2.adoc b/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_2.adoc
index 5685934b1e..82b8b40eb8 100644
--- a/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_2.adoc
+++ b/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_2.adoc
@@ -22,7 +22,7 @@ default void setObject(final T object)
This means that models obtained using _IModel_ as lambda expressions are _read-only_. When we work with forms we need to use a model that support also data storing. In the next paragraph we will see a couple of models shipped with Wicket that allow us to easily use JavaBeans as backing objects.
-=== Lambda Goodies
+=== Lambda goodies
Most of the default methods we find in _IModel_ are meant to leverage Lambda expressions to transform model object. The following is a short reference for such methods:
diff --git a/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_8.adoc b/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_8.adoc
index af646c9f8c..348ad5b5e7 100644
--- a/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_8.adoc
+++ b/wicket-user-guide/src/main/asciidoc/modelsforms/modelsforms_8.adoc
@@ -14,7 +14,7 @@ public class ComponentTwoModels extends Component{
private IModel<Bee> beeModel;
- public ComponetTwoModels(String id, IModel<Foo> fooModel, IModel<Bee> beeModel) {
+ public ComponentTwoModels(String id, IModel<Foo> fooModel, IModel<Bee> beeModel) {
super(id, fooModel);
this.beeModel = beeModel;
}
diff --git a/wicket-user-guide/src/main/asciidoc/repeaters/repeaters_4.adoc b/wicket-user-guide/src/main/asciidoc/repeaters/repeaters_4.adoc
index c641032c1b..546ffbb242 100644
--- a/wicket-user-guide/src/main/asciidoc/repeaters/repeaters_4.adoc
+++ b/wicket-user-guide/src/main/asciidoc/repeaters/repeaters_4.adoc
@@ -114,5 +114,5 @@ The data of a single country (ISO code, name, long name, capital and population)
To explore the other pageable repeaters shipped with Wicket you can visit the {wicket_examples_url}/repeater[examples site] where you can find live examples of these components.
-NOTE: Wicket provides also component PageableListView which is a sublcass of ListView that implements interface IPageable, hence it can be considered a pageable repeater even if it doesn't use interface IDataProvider as data source.
+NOTE: Wicket provides also component PageableListView which is a subclass of ListView that implements interface IPageable, hence it can be considered a pageable repeater even if it doesn't use interface IDataProvider as data source.
diff --git a/wicket-user-guide/src/main/asciidoc/single.adoc b/wicket-user-guide/src/main/asciidoc/single.adoc
index ffcf55d0d8..f9083e8a16 100644
--- a/wicket-user-guide/src/main/asciidoc/single.adoc
+++ b/wicket-user-guide/src/main/asciidoc/single.adoc
@@ -203,7 +203,7 @@ include::requestProcessing/requestProcessing_2.adoc[leveloffset=+1]
include::requestProcessing/requestProcessing_3.adoc[leveloffset=+1]
-=== Session Class
+=== Session class
include::requestProcessing/requestProcessing_4.adoc[leveloffset=+1]
@@ -351,15 +351,15 @@ include::forms2/forms2_13.adoc[leveloffset=+1]
include::repeaters.adoc[]
-=== The RepeatingView Component
+=== The RepeatingView component
include::repeaters/repeaters_1.adoc[leveloffset=+1]
-=== The ListView Component
+=== The ListView component
include::repeaters/repeaters_2.adoc[leveloffset=+1]
-=== The RefreshingView Component
+=== The RefreshingView component
include::repeaters/repeaters_3.adoc[leveloffset=+1]
@@ -415,7 +415,7 @@ include::i18n/i18n_3.adoc[leveloffset=+1]
include::i18n/i18n_4.adoc[leveloffset=+1]
-=== Internationalization and Models
+=== Internationalization and models
include::i18n/i18n_5.adoc[leveloffset=+1]
@@ -663,15 +663,15 @@ include::security/security_5.adoc[leveloffset=+1]
include::security/security_6.adoc[leveloffset=+1]
-=== Cross Origin Isolation with COOP and COEP
+=== Cross-origin isolation with COOP and COEP
include::security/security_10.adoc[leveloffset=+1]
-=== Package Resource Guard
+=== Package resource guard
include::security/security_7.adoc[leveloffset=+1]
-=== External Security Checks
+=== External security checks
include::security/security_8.adoc[leveloffset=+1]
@@ -715,7 +715,7 @@ include::testingspring/testingspring_2.adoc[leveloffset=+1]
include::testingspring/testingspring_3.adoc[leveloffset=+1]
-== Wicket Best Practices
+== Wicket best practices
include::bestpractices.adoc[]
@@ -779,7 +779,7 @@ include::bestpractices/bestpractices_14.adoc[leveloffset=+1]
include::bestpractices/bestpractices_15.adoc[leveloffset=+1]
-=== The argument "Bad documentation"
+=== The argument "bad documentation"
include::bestpractices/bestpractices_16.adoc[leveloffset=+1]
@@ -787,7 +787,7 @@ include::bestpractices/bestpractices_16.adoc[leveloffset=+1]
include::bestpractices/bestpractices_17.adoc[leveloffset=+1]
-== Wicket Internals
+== Wicket internals
include::internals.adoc[]
@@ -795,23 +795,23 @@ include::internals.adoc[]
include::internals/pagestoring.adoc[leveloffset=+1]
-=== Markup parsing and Autocomponents
+=== Markup parsing and auto components
include::internals/autocomponents.adoc[leveloffset=+1]
-== Wicket HTTP/2 Support (Experimental)
+== Wicket HTTP/2 support (experimental)
include::http2push.adoc[]
-=== Example Usage
+=== Example usage
include::http2push/http2push_1.adoc[leveloffset=+3]
-=== Create server specific http/2 push support
+=== Create server specific HTTP/2 push support
include::http2push/http2push_2.adoc[leveloffset=+3]
-== Wicket Metrics Monitoring (Experimental)
+== Wicket metrics monitoring (experimental)
include::monitoring.adoc[]
@@ -878,7 +878,7 @@ include::wicketstuff/wicketstuff_6.adoc[leveloffset=+1]
include::wicketstuff/wicketstuff_7.adoc[leveloffset=+1]
[appendix]
-== Lost In Redirection With Apache Wicket
+== Lost in redirection with Apache Wicket
include::redirects.adoc[]