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 2014/03/27 15:01:24 UTC

[2/4] git commit: no need private methods to be final

no need private methods to be final

IDEA inspections


Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ed8d1258
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ed8d1258
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ed8d1258

Branch: refs/heads/master
Commit: ed8d1258740c859a3f00c08d395366e09198b6fa
Parents: 2bd2234
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 27 14:12:55 2014 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 27 14:12:55 2014 +0100

----------------------------------------------------------------------
 wicket-core/src/main/java/org/apache/wicket/Component.java     | 6 +++---
 .../org/apache/wicket/application/WildcardMatcherHelper.java   | 6 +++---
 .../src/main/java/org/apache/wicket/markup/MarkupCache.java    | 4 ++--
 .../src/main/java/org/apache/wicket/markup/MarkupFragment.java | 2 +-
 .../main/java/org/apache/wicket/markup/html/border/Border.java | 2 +-
 .../src/main/java/org/apache/wicket/markup/html/form/Form.java | 2 +-
 .../java/org/apache/wicket/markup/html/include/Include.java    | 2 +-
 .../markup/html/panel/AssociatedMarkupSourcingStrategy.java    | 6 +++---
 .../java/org/apache/wicket/markup/parser/XmlPullParser.java    | 2 +-
 .../wicket/markup/parser/filter/HeadForceTagIdHandler.java     | 4 ++--
 .../wicket/markup/parser/filter/WicketLinkTagHandler.java      | 2 +-
 .../org/apache/wicket/markup/resolver/AutoLinkResolver.java    | 2 +-
 .../markup/transformer/AbstractOutputTransformerContainer.java | 2 +-
 .../org/apache/wicket/extensions/yui/calendar/DatePicker.java  | 2 +-
 .../java/org/apache/wicket/examples/source/SourcesPage.java    | 2 +-
 .../extensions/breadcrumb/panel/BreadCrumbPanelFactory.java    | 2 +-
 .../java/org/apache/wicket/extensions/wizard/WizardStep.java   | 2 +-
 .../main/java/org/apache/wicket/util/crypt/AbstractCrypt.java  | 4 ++--
 .../main/java/org/apache/wicket/util/crypt/SunJceCrypt.java    | 2 +-
 .../src/main/java/org/apache/wicket/util/io/XmlReader.java     | 4 ++--
 20 files changed, 30 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/ed8d1258/wicket-core/src/main/java/org/apache/wicket/Component.java
----------------------------------------------------------------------
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 19b8b82..c7d38f1 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 abstract class Component
 	/**
 	 * 
 	 */
-	private final void internalBeforeRender()
+	private void internalBeforeRender()
 	{
 		configure();
 
@@ -1399,7 +1399,7 @@ public abstract class Component
 	 * 
 	 * @return first component tag
 	 */
-	private final ComponentTag getMarkupTag()
+	private ComponentTag getMarkupTag()
 	{
 		IMarkupFragment markup = getMarkup();
 		if (markup != null)
@@ -2353,7 +2353,7 @@ public abstract class Component
 	/**
 	 * 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();

http://git-wip-us.apache.org/repos/asf/wicket/blob/ed8d1258/wicket-core/src/main/java/org/apache/wicket/application/WildcardMatcherHelper.java
----------------------------------------------------------------------
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 a1edc2d..c357321 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 @@ public class WildcardMatcherHelper
 		/**
 		 * Scan a possible common suffix
 		 */
-		private final void scanLiteralPrefix()
+		private void scanLiteralPrefix()
 		{
 			// scan a common literal suffix
 			while (ipat < lpat &&
@@ -401,7 +401,7 @@ public class WildcardMatcherHelper
 		 * 
 		 * @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 @@ public class WildcardMatcherHelper
 			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

http://git-wip-us.apache.org/repos/asf/wicket/blob/ed8d1258/wicket-core/src/main/java/org/apache/wicket/markup/MarkupCache.java
----------------------------------------------------------------------
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 02bb299..3526dc6 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 @@ public class MarkupCache implements IMarkupCache
 	 *            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 @@ public class MarkupCache implements IMarkupCache
 	 *            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

http://git-wip-us.apache.org/repos/asf/wicket/blob/ed8d1258/wicket-core/src/main/java/org/apache/wicket/markup/MarkupFragment.java
----------------------------------------------------------------------
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 35c434f..bab14ff 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 class MarkupFragment implements IMarkupFragment
 	/**
 	 * @return The parent markup. Null if that is a a markup file.
 	 */
-	private final IMarkupFragment getParentMarkup()
+	private IMarkupFragment getParentMarkup()
 	{
 		return markup;
 	}

http://git-wip-us.apache.org/repos/asf/wicket/blob/ed8d1258/wicket-core/src/main/java/org/apache/wicket/markup/html/border/Border.java
----------------------------------------------------------------------
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 f60fc8a..1c4a1ec 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 abstract class Border extends WebMarkupContainer implements IComponentRes
 		 * @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");
 

http://git-wip-us.apache.org/repos/asf/wicket/blob/ed8d1258/wicket-core/src/main/java/org/apache/wicket/markup/html/form/Form.java
----------------------------------------------------------------------
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 8386d2a..b54d995 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 @@ public class Form<T> extends WebMarkupContainer implements IFormSubmitListener,
 	 * 
 	 * @see #updateFormComponentModels()
 	 */
-	private final void updateNestedFormComponentModels()
+	private void updateNestedFormComponentModels()
 	{
 		visitChildren(Form.class, new IVisitor<Form<?>, Void>()
 		{

http://git-wip-us.apache.org/repos/asf/wicket/blob/ed8d1258/wicket-core/src/main/java/org/apache/wicket/markup/html/include/Include.java
----------------------------------------------------------------------
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 df90241..a7d72cd 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 class Include extends WebComponent
 	 *            the url
 	 * @return the imported contents
 	 */
-	private final String importUrl(URL url)
+	private String importUrl(URL url)
 	{
 		return ResourceUtil.readString(new UrlResourceStream(url), getCharset());
 	}

http://git-wip-us.apache.org/repos/asf/wicket/blob/ed8d1258/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/AssociatedMarkupSourcingStrategy.java
----------------------------------------------------------------------
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 a2492cd3..a16707d 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 abstract class AssociatedMarkupSourcingStrategy extends AbstractMarkupSou
 	 * @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 @@ public abstract class AssociatedMarkupSourcingStrategy extends AbstractMarkupSou
 	 * @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 @@ public abstract class AssociatedMarkupSourcingStrategy extends AbstractMarkupSou
 	 * @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)

http://git-wip-us.apache.org/repos/asf/wicket/blob/ed8d1258/wicket-core/src/main/java/org/apache/wicket/markup/parser/XmlPullParser.java
----------------------------------------------------------------------
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 87a2d66..6d52cde 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 class XmlPullParser implements IXmlPullParser
 	 * 
 	 * @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.

http://git-wip-us.apache.org/repos/asf/wicket/blob/ed8d1258/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/HeadForceTagIdHandler.java
----------------------------------------------------------------------
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 af169a6..2a5338d 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 @@ public class HeadForceTagIdHandler extends AbstractMarkupFilter
 	 * @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 @@ public class HeadForceTagIdHandler extends AbstractMarkupFilter
 	 * 
 	 * @return The next value
 	 */
-	private final int nextValue()
+	private int nextValue()
 	{
 		return counter++;
 	}

http://git-wip-us.apache.org/repos/asf/wicket/blob/ed8d1258/wicket-core/src/main/java/org/apache/wicket/markup/parser/filter/WicketLinkTagHandler.java
----------------------------------------------------------------------
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 db5200b..e89ac92 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 @@ public class WicketLinkTagHandler extends AbstractMarkupFilter implements ICompo
 	 * @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(":"));
 	}

http://git-wip-us.apache.org/repos/asf/wicket/blob/ed8d1258/wicket-core/src/main/java/org/apache/wicket/markup/resolver/AutoLinkResolver.java
----------------------------------------------------------------------
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 2bde33f..f472827 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 class AutoLinkResolver implements IComponentResolver
 	 *            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();

http://git-wip-us.apache.org/repos/asf/wicket/blob/ed8d1258/wicket-core/src/main/java/org/apache/wicket/markup/transformer/AbstractOutputTransformerContainer.java
----------------------------------------------------------------------
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 18b03f0..2f13c53 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 abstract class AbstractOutputTransformerContainer extends MarkupContainer
 	 * 
 	 * @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();

http://git-wip-us.apache.org/repos/asf/wicket/blob/ed8d1258/wicket-datetime/src/main/java/org/apache/wicket/extensions/yui/calendar/DatePicker.java
----------------------------------------------------------------------
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 063e418..3fcc548 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 @@ public class DatePicker extends Behavior
 	 * @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)
 		{

http://git-wip-us.apache.org/repos/asf/wicket/blob/ed8d1258/wicket-examples/src/main/java/org/apache/wicket/examples/source/SourcesPage.java
----------------------------------------------------------------------
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 5c5b0b4..2dd37ed 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 @@ public class SourcesPage extends WebPage
 			return get(getPageTargetClass());
 		}
 
-		private final void addResources(final AppendingStringBuffer relativePath, final File dir,
+		private void addResources(final AppendingStringBuffer relativePath, final File dir,
 			List<String> resources)
 		{
 			File[] files = dir.listFiles();

http://git-wip-us.apache.org/repos/asf/wicket/blob/ed8d1258/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/panel/BreadCrumbPanelFactory.java
----------------------------------------------------------------------
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 bf4bbb8..d743618 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 class BreadCrumbPanelFactory implements IBreadCrumbPanelFactory
 	 * 
 	 * @return The constructor.
 	 */
-	private final Constructor<? extends BreadCrumbPanel> getConstructor()
+	private Constructor<? extends BreadCrumbPanel> getConstructor()
 	{
 		try
 		{

http://git-wip-us.apache.org/repos/asf/wicket/blob/ed8d1258/wicket-extensions/src/main/java/org/apache/wicket/extensions/wizard/WizardStep.java
----------------------------------------------------------------------
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 ad08bbf..136d2cb 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 class WizardStep extends Panel implements IWizardStep
 		/**
 		 * @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));
 		}

http://git-wip-us.apache.org/repos/asf/wicket/blob/ed8d1258/wicket-util/src/main/java/org/apache/wicket/util/crypt/AbstractCrypt.java
----------------------------------------------------------------------
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 4d2c7e2..7e91aa2 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 @@ public abstract class AbstractCrypt implements ICrypt
 	 *            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 @@ public abstract class AbstractCrypt implements ICrypt
 	 * @return the string encrypted
 	 * @throws GeneralSecurityException
 	 */
-	private final byte[] encryptStringToByteArray(final String plainText)
+	private byte[] encryptStringToByteArray(final String plainText)
 		throws GeneralSecurityException
 	{
 		try

http://git-wip-us.apache.org/repos/asf/wicket/blob/ed8d1258/wicket-util/src/main/java/org/apache/wicket/util/crypt/SunJceCrypt.java
----------------------------------------------------------------------
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 2af21f4..65036c1 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 @@ public class SunJceCrypt extends AbstractCrypt
 	 * @throws InvalidKeySpecException
 	 *             invalid encryption key
 	 */
-	private final SecretKey generateSecretKey() throws NoSuchAlgorithmException,
+	private SecretKey generateSecretKey() throws NoSuchAlgorithmException,
 		InvalidKeySpecException
 	{
 		final PBEKeySpec spec = new PBEKeySpec(getKey().toCharArray());

http://git-wip-us.apache.org/repos/asf/wicket/blob/ed8d1258/wicket-util/src/main/java/org/apache/wicket/util/io/XmlReader.java
----------------------------------------------------------------------
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 1f3a408..accc68c 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 final class XmlReader extends Reader
 	 *            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 <?xml .. ?> pattern
 		final Matcher matcher = encodingPattern.matcher(string);
@@ -172,7 +172,7 @@ public final class XmlReader extends Reader
 	 * @return true, if &lt;?xml ..?&gt; 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