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 19b8b82e89..c7d38f1028 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Component.java +++ b/wicket-core/src/main/java/org/apache/wicket/Component.java @@ -909,7 +909,7 @@ public final void afterRender() /** * */ - private final void internalBeforeRender() + private void internalBeforeRender() { configure(); @@ -1399,7 +1399,7 @@ public final Localizer getLocalizer() * * @return first component tag */ - private final ComponentTag getMarkupTag() + private ComponentTag getMarkupTag() { IMarkupFragment markup = getMarkup(); if (markup != null) @@ -2353,7 +2353,7 @@ public final void render() /** * Performs a render of this component as part of a Page level render process. */ - private final void internalRender() + private void internalRender() { // Make sure there is a markup available for the Component IMarkupFragment markup = getMarkup(); diff --git a/wicket-core/src/main/java/org/apache/wicket/application/WildcardMatcherHelper.java b/wicket-core/src/main/java/org/apache/wicket/application/WildcardMatcherHelper.java index a1edc2da89..c357321bd5 100644 --- a/wicket-core/src/main/java/org/apache/wicket/application/WildcardMatcherHelper.java +++ b/wicket-core/src/main/java/org/apache/wicket/application/WildcardMatcherHelper.java @@ -372,7 +372,7 @@ private boolean match() /** * Scan a possible common suffix */ - private final void scanLiteralPrefix() + private void scanLiteralPrefix() { // scan a common literal suffix while (ipat < lpat && @@ -401,7 +401,7 @@ private final void scanLiteralPrefix() * * @return Whether the all the mentioned characters match each other */ - private final boolean strncmp(final char[] a1, final int o1, final char[] a2, final int o2, + private boolean strncmp(final char[] a1, final int o1, final char[] a2, final int o2, final int l) { int i = 0; @@ -414,7 +414,7 @@ private final boolean strncmp(final char[] a1, final int o1, final char[] a2, fi return i == l; } - private final boolean checkEnds(final int sipat, final boolean isSingleStart) + private boolean checkEnds(final int sipat, final boolean isSingleStart) { // if the remaining length of the string isn't the same as that found in the pattern // we do not match diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/MarkupCache.java b/wicket-core/src/main/java/org/apache/wicket/markup/MarkupCache.java index 02bb299032..3526dc6985 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/MarkupCache.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/MarkupCache.java @@ -432,7 +432,7 @@ protected Markup getMarkupFromCache(final String cacheKey, final MarkupContainer * reloaded. Whatever is in the cache, it will be ignored * @return The markup. Markup.NO_MARKUP, if not found. */ - private final Markup loadMarkup(final MarkupContainer container, + private Markup loadMarkup(final MarkupContainer container, final MarkupResourceStream markupResourceStream, final boolean enforceReload) { String cacheKey = markupResourceStream.getCacheKey(); @@ -486,7 +486,7 @@ private final Markup loadMarkup(final MarkupContainer container, * reloaded. Whatever is in the cache, it will be ignored * @return The markup in the stream */ - private final Markup loadMarkupAndWatchForChanges(final MarkupContainer container, + private Markup loadMarkupAndWatchForChanges(final MarkupContainer container, final MarkupResourceStream markupResourceStream, final boolean enforceReload) { // @TODO the following code sequence looks very much like in loadMarkup. Can it be diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/MarkupFragment.java b/wicket-core/src/main/java/org/apache/wicket/markup/MarkupFragment.java index 35c434fadb..bab14ffeb2 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/MarkupFragment.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/MarkupFragment.java @@ -191,7 +191,7 @@ public final int size() /** * @return The parent markup. Null if that is a a markup file. */ - private final IMarkupFragment getParentMarkup() + private IMarkupFragment getParentMarkup() { return markup; } diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java index f60fc8a3cb..1c4a1ec63f 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java @@ -490,7 +490,7 @@ public IMarkupFragment getMarkup() * @param name * @return null, if not found */ - private final IMarkupFragment findByName(final IMarkupFragment markup, final String name) + private IMarkupFragment findByName(final IMarkupFragment markup, final String name) { Args.notEmpty(name, "name"); diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java index 8386d2abcc..b54d995a25 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java @@ -1772,7 +1772,7 @@ protected final void updateFormComponentModels() * * @see #updateFormComponentModels() */ - private final void updateNestedFormComponentModels() + private void updateNestedFormComponentModels() { visitChildren(Form.class, new IVisitor