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, Void>() { diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/include/Include.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/include/Include.java index df90241929..a7d72cdf8b 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/include/Include.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/include/Include.java @@ -225,7 +225,7 @@ public Charset getCharset() * the url * @return the imported contents */ - private final String importUrl(URL url) + private String importUrl(URL url) { return ResourceUtil.readString(new UrlResourceStream(url), getCharset()); } diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AssociatedMarkupSourcingStrategy.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AssociatedMarkupSourcingStrategy.java index a2492cd3ad..a16707d1a2 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AssociatedMarkupSourcingStrategy.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AssociatedMarkupSourcingStrategy.java @@ -134,7 +134,7 @@ public IMarkupFragment getMarkup(final MarkupContainer parent, final Component c * @param markup * @return null, if not found */ - private final IMarkupFragment findStartTag(final IMarkupFragment markup) + private IMarkupFragment findStartTag(final IMarkupFragment markup) { MarkupStream stream = new MarkupStream(markup); @@ -310,7 +310,7 @@ private String getHeaderId(final Component container, final MarkupStream markupS * @param markup * @return the header part for this panel/border or null if it doesn't have a wicket:head tag. */ - private final HeaderPartContainer getHeaderPart(final WebMarkupContainer container, + private HeaderPartContainer getHeaderPart(final WebMarkupContainer container, final String id, final IMarkupFragment markup) { // Create a HtmlHeaderContainer for the header tag found @@ -335,7 +335,7 @@ private final HeaderPartContainer getHeaderPart(final WebMarkupContainer contain * @param associatedMarkupStream * @return index or -1 when done */ - private final int nextHeaderMarkup(final MarkupStream associatedMarkupStream) + private int nextHeaderMarkup(final MarkupStream associatedMarkupStream) { // No associated markup => no header section if (associatedMarkupStream == null) diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java index 87a2d66656..6d52cdea04 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java @@ -110,7 +110,7 @@ public final CharSequence getInput(final int fromPos, final int toPos) * * @throws ParseException */ - private final void skipUntil() throws ParseException + private void skipUntil() throws ParseException { // this is a tag with non-XHTML text as body - skip this until the // skipUntilText is found. diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java index af169a6a81..2a5338db6a 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java @@ -101,7 +101,7 @@ else if (inHead == true) * @param tag * @return true, if id is needed */ - private final boolean needId(final ComponentTag tag) + private boolean needId(final ComponentTag tag) { final String name = tag.getName().toLowerCase(); if (name.equals("script") && tag.getAttributes().containsKey("src") == false) @@ -120,7 +120,7 @@ else if (name.equals("style") && tag.getAttributes().containsKey("href") == fals * * @return The next value */ - private final int nextValue() + private int nextValue() { return counter++; } 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 db5200ba19..e89ac92524 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 @@ -195,7 +195,7 @@ protected boolean analyzeAutolinkCondition(final ComponentTag tag) * @param ref * @return true if ref is not null and does not contain namespace */ - private final boolean checkRef(String ref) + private boolean checkRef(String ref) { return (ref != null) && (!ref.contains(":")); } diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java index 2bde33fef5..f472827e1c 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java @@ -875,7 +875,7 @@ public final Component resolve(final MarkupContainer container, * the component tag * @return A BookmarkablePageLink to handle the href */ - private final Component resolveAutomaticLink(final PathInfo pathInfo, final String id, + private Component resolveAutomaticLink(final PathInfo pathInfo, final String id, final ComponentTag tag) { final MarkupContainer container = pathInfo.getContainer(); diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java b/wicket-core/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java index 18b03f02eb..2f13c531c4 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java @@ -141,7 +141,7 @@ public void run() * * @param code */ - private final void execute(final Runnable code) + private void execute(final Runnable code) { // Temporarily replace the web response with a String response final Response webResponse = getResponse(); diff --git a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java index 063e418c5f..3fcc548178 100644 --- a/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java +++ b/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java @@ -331,7 +331,7 @@ protected void renderHeadInit(IHeaderResponse response) * @throws UnableToDetermineFormatException * if this date picker is unable to determine a format. */ - private final void checkComponentProvidesDateFormat(final Component component) + private void checkComponentProvidesDateFormat(final Component component) { if (getDatePattern() == null) { diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java b/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java index 5c5b0b4538..2dd37ed4f8 100644 --- a/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java +++ b/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java @@ -148,7 +148,7 @@ protected List load() return get(getPageTargetClass()); } - private final void addResources(final AppendingStringBuffer relativePath, final File dir, + private void addResources(final AppendingStringBuffer relativePath, final File dir, List resources) { File[] files = dir.listFiles(); diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanelFactory.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanelFactory.java index bf4bbb8b3d..d743618d4b 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanelFactory.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanelFactory.java @@ -84,7 +84,7 @@ public final BreadCrumbPanel create(final String componentId, * * @return The constructor. */ - private final Constructor getConstructor() + private Constructor getConstructor() { try { diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java index ad08bbf809..136d2cba0e 100644 --- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java +++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java @@ -142,7 +142,7 @@ public void validate(final Form form) /** * @return whether the step this wrapper is part of is the current step */ - private final boolean isActiveStep() + private boolean isActiveStep() { return (wizardModel.getActiveStep().equals(WizardStep.this)); } diff --git a/wicket-util/src/main/java/org/apache/wicket/util/crypt/AbstractCrypt.java b/wicket-util/src/main/java/org/apache/wicket/util/crypt/AbstractCrypt.java index 4d2c7e2273..7e91aa21b4 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/crypt/AbstractCrypt.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/crypt/AbstractCrypt.java @@ -142,7 +142,7 @@ protected abstract byte[] crypt(final byte[] input, final int mode) * byte array to decrypt * @return the decrypted text */ - private final byte[] decryptByteArray(final byte[] encrypted) + private byte[] decryptByteArray(final byte[] encrypted) { try { @@ -163,7 +163,7 @@ private final byte[] decryptByteArray(final byte[] encrypted) * @return the string encrypted * @throws GeneralSecurityException */ - private final byte[] encryptStringToByteArray(final String plainText) + private byte[] encryptStringToByteArray(final String plainText) throws GeneralSecurityException { try diff --git a/wicket-util/src/main/java/org/apache/wicket/util/crypt/SunJceCrypt.java b/wicket-util/src/main/java/org/apache/wicket/util/crypt/SunJceCrypt.java index 2af21f45e3..65036c14a4 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/crypt/SunJceCrypt.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/crypt/SunJceCrypt.java @@ -106,7 +106,7 @@ protected final byte[] crypt(final byte[] input, final int mode) * @throws InvalidKeySpecException * invalid encryption key */ - private final SecretKey generateSecretKey() throws NoSuchAlgorithmException, + private SecretKey generateSecretKey() throws NoSuchAlgorithmException, InvalidKeySpecException { final PBEKeySpec spec = new PBEKeySpec(getKey().toCharArray()); diff --git a/wicket-util/src/main/java/org/apache/wicket/util/io/XmlReader.java b/wicket-util/src/main/java/org/apache/wicket/util/io/XmlReader.java index 1f3a408d05..accc68c799 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/io/XmlReader.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/io/XmlReader.java @@ -134,7 +134,7 @@ public void init() throws IOException * The xmlDecl string * @return The encoding. Null, if not found */ - private final String determineEncoding(final CharSequence string) + private String determineEncoding(final CharSequence string) { // Does the string match the pattern final Matcher matcher = encodingPattern.matcher(string); @@ -172,7 +172,7 @@ private final String determineEncoding(final CharSequence string) * @return true, if <?xml ..?> has been found * @throws IOException */ - private final String getXmlDeclaration(final InputStream in, final int readAheadSize) + private String getXmlDeclaration(final InputStream in, final int readAheadSize) throws IOException { // Max one line