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:23 UTC
[1/4] git commit: no need static methods to be final
Repository: wicket
Updated Branches:
refs/heads/master 225f9677e -> 4c219b9b2
no need static methods to be final
Intellij IDEA inspections
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/2bd22343
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/2bd22343
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/2bd22343
Branch: refs/heads/master
Commit: 2bd223436bfb8f5993c13f8cbe37d755fec10501
Parents: 225f967
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 27 14:11:23 2014 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 27 14:11:23 2014 +0100
----------------------------------------------------------------------
.../metadata/MetaDataRoleAuthorizationStrategy.java | 16 ++++++++--------
.../org/apache/wicket/RequestListenerInterface.java | 2 +-
.../org/apache/wicket/ajax/json/JSONObject.java | 4 ++--
.../request/handler/EmptyAjaxRequestHandler.java | 2 +-
.../java/org/apache/wicket/markup/MarkupCache.java | 2 +-
.../java/org/apache/wicket/markup/TagUtils.java | 16 ++++++++--------
.../org/apache/wicket/markup/html/MarkupUtil.java | 2 +-
.../wicket/markup/html/form/AutoLabelResolver.java | 2 +-
.../wicket/markup/html/form/FormComponent.java | 4 ++--
.../html/panel/DefaultMarkupSourcingStrategy.java | 2 +-
.../org/apache/wicket/markup/repeater/Item.java | 2 +-
.../wicket/protocol/http/BufferedWebResponse.java | 2 +-
.../http/servlet/AbstractRequestWrapperFactory.java | 8 ++++----
.../org/apache/wicket/response/NullResponse.java | 2 +-
.../org/apache/wicket/util/tester/DiffUtil.java | 4 ++--
.../compref/ComponentReferenceApplication.java | 2 +-
.../autocomplete/StringAutoCompleteRenderer.java | 2 +-
.../ajax/markup/html/modal/ModalWindow.java | 2 +-
.../wicket/extensions/util/encoding/CharSetMap.java | 10 +++++-----
.../extensions/util/encoding/CharSetUtil.java | 4 ++--
.../java/org/apache/wicket/util/file/Files.java | 12 ++++++------
.../java/org/apache/wicket/util/visit/Visits.java | 16 ++++++++--------
22 files changed, 59 insertions(+), 59 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/2bd22343/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java
----------------------------------------------------------------------
diff --git a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java
index 33b39b3..fecf499 100644
--- a/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java
+++ b/wicket-auth-roles/src/main/java/org/apache/wicket/authroles/authorization/strategies/role/metadata/MetaDataRoleAuthorizationStrategy.java
@@ -86,7 +86,7 @@ public class MetaDataRoleAuthorizationStrategy extends AbstractRoleAuthorization
* The comma separated roles that are authorized to create component instances of
* type componentClass
*/
- public static final <T extends Component> void authorize(final Class<T> componentClass,
+ public static <T extends Component> void authorize(final Class<T> componentClass,
final String roles)
{
final Application application = Application.get();
@@ -109,7 +109,7 @@ public class MetaDataRoleAuthorizationStrategy extends AbstractRoleAuthorization
* @param roles
* The comma separated roles to authorize
*/
- public static final void authorize(final Component component, final Action action,
+ public static void authorize(final Component component, final Action action,
final String roles)
{
ActionPermissions permissions = component.getMetaData(ACTION_PERMISSIONS);
@@ -129,7 +129,7 @@ public class MetaDataRoleAuthorizationStrategy extends AbstractRoleAuthorization
* @param componentClass
* The component class
*/
- public static final <T extends Component> void authorizeAll(final Class<T> componentClass)
+ public static <T extends Component> void authorizeAll(final Class<T> componentClass)
{
Application application = Application.get();
InstantiationPermissions authorizedRoles = application.getMetaData(INSTANTIATION_PERMISSIONS);
@@ -147,7 +147,7 @@ public class MetaDataRoleAuthorizationStrategy extends AbstractRoleAuthorization
* @param action
* The action to authorize
*/
- public static final void authorizeAll(final Component component, final Action action)
+ public static void authorizeAll(Component component, final Action action)
{
ActionPermissions permissions = component.getMetaData(ACTION_PERMISSIONS);
if (permissions != null)
@@ -171,7 +171,7 @@ public class MetaDataRoleAuthorizationStrategy extends AbstractRoleAuthorization
* The comma separated list of roles that are no longer to be authorized to create
* instances of type componentClass
*/
- public static final <T extends Component> void unauthorize(final Class<T> componentClass,
+ public static <T extends Component> void unauthorize(final Class<T> componentClass,
final String roles)
{
final InstantiationPermissions permissions = Application.get().getMetaData(
@@ -197,7 +197,7 @@ public class MetaDataRoleAuthorizationStrategy extends AbstractRoleAuthorization
* The comma separated list of roles that are no longer allowed to perform the given
* action
*/
- public static final void unauthorize(final Component component, final Action action,
+ public static void unauthorize(final Component component, final Action action,
final String roles)
{
final ActionPermissions permissions = component.getMetaData(ACTION_PERMISSIONS);
@@ -216,7 +216,7 @@ public class MetaDataRoleAuthorizationStrategy extends AbstractRoleAuthorization
* @param componentClass
* The component class
*/
- public static final <T extends Component> void unauthorizeAll(Class<T> componentClass)
+ public static <T extends Component> void unauthorizeAll(Class<T> componentClass)
{
authorizeAll(componentClass);
authorize(componentClass, NO_ROLE);
@@ -231,7 +231,7 @@ public class MetaDataRoleAuthorizationStrategy extends AbstractRoleAuthorization
* @param action
* the action to authorize
*/
- public static final void unauthorizeAll(final Component component, final Action action)
+ public static void unauthorizeAll(final Component component, final Action action)
{
authorizeAll(component, action);
authorize(component, action, NO_ROLE);
http://git-wip-us.apache.org/repos/asf/wicket/blob/2bd22343/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java b/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
index f40c63f..0eeac52 100644
--- a/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
+++ b/wicket-core/src/main/java/org/apache/wicket/RequestListenerInterface.java
@@ -54,7 +54,7 @@ public class RequestListenerInterface
* @return The RequestListenerInterface object, or null if none is found
*
*/
- public static final RequestListenerInterface forName(final String interfaceName)
+ public static RequestListenerInterface forName(final String interfaceName)
{
return interfaces.get(interfaceName);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/2bd22343/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONObject.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONObject.java b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONObject.java
index 35246d8..ccca7ac 100755
--- a/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONObject.java
+++ b/wicket-core/src/main/java/org/apache/wicket/ajax/json/JSONObject.java
@@ -1545,7 +1545,7 @@ public class JSONObject {
return this.write(writer, 0, 0);
}
- static final Writer writeValue(Writer writer, Object value,
+ static Writer writeValue(Writer writer, Object value,
int indentFactor, int indent) throws JSONException, IOException {
if (value == null || value.equals(null)) {
writer.write("null");
@@ -1578,7 +1578,7 @@ public class JSONObject {
return writer;
}
- static final void indent(Writer writer, int indent) throws IOException {
+ static void indent(Writer writer, int indent) throws IOException {
for (int i = 0; i < indent; i += 1) {
writer.write(' ');
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/2bd22343/wicket-core/src/main/java/org/apache/wicket/core/request/handler/EmptyAjaxRequestHandler.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/EmptyAjaxRequestHandler.java b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/EmptyAjaxRequestHandler.java
index cbddeaf..d19dff3 100644
--- a/wicket-core/src/main/java/org/apache/wicket/core/request/handler/EmptyAjaxRequestHandler.java
+++ b/wicket-core/src/main/java/org/apache/wicket/core/request/handler/EmptyAjaxRequestHandler.java
@@ -48,7 +48,7 @@ public final class EmptyAjaxRequestHandler implements IRequestHandler
*
* @return the singleton instance
*/
- public static final EmptyAjaxRequestHandler getInstance()
+ public static EmptyAjaxRequestHandler getInstance()
{
return instance;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/2bd22343/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 1a80d3c..02bb299 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
@@ -80,7 +80,7 @@ public class MarkupCache implements IMarkupCache
*
* @return The markup cache registered with the {@link Application}
*/
- public final static IMarkupCache get()
+ public static IMarkupCache get()
{
return Application.get().getMarkupSettings().getMarkupFactory().getMarkupCache();
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/2bd22343/wicket-core/src/main/java/org/apache/wicket/markup/TagUtils.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/TagUtils.java b/wicket-core/src/main/java/org/apache/wicket/markup/TagUtils.java
index d1168f2..d75a1c3 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/TagUtils.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/TagUtils.java
@@ -53,7 +53,7 @@ public class TagUtils
*
* @param tag
*/
- public static final boolean isBodyTag(final ComponentTag tag)
+ public static boolean isBodyTag(final ComponentTag tag)
{
return ("body".equalsIgnoreCase(tag.getName()) && (tag.getNamespace() == null));
}
@@ -63,7 +63,7 @@ public class TagUtils
* @param elem
* @return True, if tag name equals '<head ...>'
*/
- public static final boolean isHeadTag(final MarkupElement elem)
+ public static boolean isHeadTag(final MarkupElement elem)
{
if (elem instanceof ComponentTag)
{
@@ -82,7 +82,7 @@ public class TagUtils
* @param i
* @return True if the markup element at index 'i' is a WicketTag
*/
- public static final boolean isWicketTag(final IMarkupFragment markup, final int i)
+ public static boolean isWicketTag(final IMarkupFragment markup, final int i)
{
MarkupElement elem = markup.get(i);
return elem instanceof WicketTag;
@@ -94,7 +94,7 @@ public class TagUtils
* @param i
* @return True if the markup element at index 'i' is a <wicket:extend> tag
*/
- public static final boolean isExtendTag(final IMarkupFragment markup, final int i)
+ public static boolean isExtendTag(final IMarkupFragment markup, final int i)
{
MarkupElement elem = markup.get(i);
if (elem instanceof WicketTag)
@@ -110,7 +110,7 @@ public class TagUtils
* @param elem
* @return True if the current markup element is a <wicket:head> tag
*/
- public static final boolean isWicketHeadTag(final MarkupElement elem)
+ public static boolean isWicketHeadTag(final MarkupElement elem)
{
if (elem instanceof WicketTag)
{
@@ -128,7 +128,7 @@ public class TagUtils
* @param elem
* @return True if the current markup element is a <wicket:header-items> tag
*/
- public static final boolean isWicketHeaderItemsTag(final MarkupElement elem)
+ public static boolean isWicketHeaderItemsTag(final MarkupElement elem)
{
if (elem instanceof WicketTag)
{
@@ -146,7 +146,7 @@ public class TagUtils
* @param elem
* @return True if the current markup element is a <wicket:body> tag
*/
- public static final boolean isWicketBodyTag(final MarkupElement elem)
+ public static boolean isWicketBodyTag(final MarkupElement elem)
{
if (elem instanceof WicketTag)
{
@@ -164,7 +164,7 @@ public class TagUtils
* @param elem
* @return True if the current markup element is a <wicket:border> tag
*/
- public static final boolean isWicketBorderTag(final MarkupElement elem)
+ public static boolean isWicketBorderTag(final MarkupElement elem)
{
if (elem instanceof WicketTag)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/2bd22343/wicket-core/src/main/java/org/apache/wicket/markup/html/MarkupUtil.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/MarkupUtil.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/MarkupUtil.java
index 665dd22..3831ede 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/MarkupUtil.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/MarkupUtil.java
@@ -38,7 +38,7 @@ public class MarkupUtil
* @return True if the Page and all it's Panels, Borders etc. have HTML5 compliant markup. HTML5
* markup is identified by <DOCTYPE html>
*/
- public final static boolean isMarkupHtml5Compliant(final MarkupContainer container)
+ public static boolean isMarkupHtml5Compliant(final MarkupContainer container)
{
Args.notNull(container, "container");
http://git-wip-us.apache.org/repos/asf/wicket/blob/2bd22343/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java
index 94a32ba..34c57c1 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/AutoLabelResolver.java
@@ -182,7 +182,7 @@ public class AutoLabelResolver implements IComponentResolver
return null;
}
- public static final String getLabelIdFor(Component component)
+ public static String getLabelIdFor(Component component)
{
return component.getMarkupId() + "-w-lbl";
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/2bd22343/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
index 660cf53..6cf89c9 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/form/FormComponent.java
@@ -382,7 +382,7 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer impleme
* The visitor to call
* @return the visitor's result
*/
- public static final <R> R visitFormComponentsPostOrder(Component component,
+ public static <R> R visitFormComponentsPostOrder(Component component,
final IVisitor<? extends FormComponent<?>, R> visitor)
{
return Visits.visitPostOrder(component, visitor, new IVisitFilter()
@@ -421,7 +421,7 @@ public abstract class FormComponent<T> extends LabeledWebMarkupContainer impleme
* The visitor to call
* @return the visitor's result
*/
- public static final <R> R visitComponentsPostOrder(Component component,
+ public static <R> R visitComponentsPostOrder(Component component,
final org.apache.wicket.util.visit.IVisitor<Component, R> visitor)
{
Args.notNull(visitor, "visitor");
http://git-wip-us.apache.org/repos/asf/wicket/blob/2bd22343/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java
index 51ddacd..a180dae 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/panel/DefaultMarkupSourcingStrategy.java
@@ -41,7 +41,7 @@ public final class DefaultMarkupSourcingStrategy extends AbstractMarkupSourcingS
*
* @return A singleton of the strategy
*/
- public final static DefaultMarkupSourcingStrategy get()
+ public static DefaultMarkupSourcingStrategy get()
{
return instance;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/2bd22343/wicket-core/src/main/java/org/apache/wicket/markup/repeater/Item.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/repeater/Item.java b/wicket-core/src/main/java/org/apache/wicket/markup/repeater/Item.java
index 3460f7d..70817ba 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/repeater/Item.java
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/repeater/Item.java
@@ -88,7 +88,7 @@ public class Item<T> extends ListItem<T>
/**
* @return static instance of the comparator
*/
- public static final Comparator<Item<?>> getInstance()
+ public static Comparator<Item<?>> getInstance()
{
return instance;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/2bd22343/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java
index 852eac2..4849edb 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/BufferedWebResponse.java
@@ -608,7 +608,7 @@ public class BufferedWebResponse extends WebResponse implements IMetaDataBufferi
actions.add(new FlushAction());
}
- private static final void writeStream(final Response response, ByteArrayOutputStream stream)
+ private static void writeStream(final Response response, ByteArrayOutputStream stream)
{
final boolean copied[] = { false };
try
http://git-wip-us.apache.org/repos/asf/wicket/blob/2bd22343/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/AbstractRequestWrapperFactory.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/AbstractRequestWrapperFactory.java b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/AbstractRequestWrapperFactory.java
index ba5faec..ade968d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/AbstractRequestWrapperFactory.java
+++ b/wicket-core/src/main/java/org/apache/wicket/protocol/http/servlet/AbstractRequestWrapperFactory.java
@@ -97,7 +97,7 @@ public abstract class AbstractRequestWrapperFactory
* @param commaDelimitedPatterns
* @return array of patterns (not <code>null</code>)
*/
- public static final Pattern[] commaDelimitedListToPatternArray(
+ public static Pattern[] commaDelimitedListToPatternArray(
final String commaDelimitedPatterns)
{
String[] patterns = commaDelimitedListToStringArray(commaDelimitedPatterns);
@@ -122,7 +122,7 @@ public abstract class AbstractRequestWrapperFactory
* @param commaDelimitedStrings
* @return array of patterns (non <code>null</code>)
*/
- public static final String[] commaDelimitedListToStringArray(final String commaDelimitedStrings)
+ public static String[] commaDelimitedListToStringArray(final String commaDelimitedStrings)
{
if (Strings.isEmpty(commaDelimitedStrings))
{
@@ -140,7 +140,7 @@ public abstract class AbstractRequestWrapperFactory
* @param stringList
* @return xxx
*/
- public static final String listToCommaDelimitedString(final List<String> stringList)
+ public static String listToCommaDelimitedString(final List<String> stringList)
{
return Strings.join(", ", stringList);
}
@@ -152,7 +152,7 @@ public abstract class AbstractRequestWrapperFactory
* @return Return <code>true</code> if the given <code>str</code> matches at least one of the
* given <code>patterns</code>.
*/
- public static final boolean matchesOne(final String str, final Pattern... patterns)
+ public static boolean matchesOne(final String str, final Pattern... patterns)
{
for (Pattern pattern : patterns)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/2bd22343/wicket-core/src/main/java/org/apache/wicket/response/NullResponse.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/response/NullResponse.java b/wicket-core/src/main/java/org/apache/wicket/response/NullResponse.java
index bfd5d12..fa3bb5a 100644
--- a/wicket-core/src/main/java/org/apache/wicket/response/NullResponse.java
+++ b/wicket-core/src/main/java/org/apache/wicket/response/NullResponse.java
@@ -39,7 +39,7 @@ public class NullResponse extends Response
/**
* @return The one and only instance of NullResponse
*/
- public static final NullResponse getInstance()
+ public static NullResponse getInstance()
{
return instance;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/2bd22343/wicket-core/src/main/java/org/apache/wicket/util/tester/DiffUtil.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/DiffUtil.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/DiffUtil.java
index e29e81a..1d8aa02 100644
--- a/wicket-core/src/main/java/org/apache/wicket/util/tester/DiffUtil.java
+++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/DiffUtil.java
@@ -60,7 +60,7 @@ public final class DiffUtil
* The name of the expected result file to be created
* @throws IOException
*/
- public final static void replaceExpectedResultFile(final String document, final Class<?> clazz,
+ public static void replaceExpectedResultFile(final String document, final Class<?> clazz,
final String file) throws IOException
{
String filename = clazz.getPackage().getName();
@@ -89,7 +89,7 @@ public final class DiffUtil
* @return true, if equal
* @throws IOException
*/
- public static final boolean validatePage(String document, final Class<?> clazz,
+ public static boolean validatePage(String document, final Class<?> clazz,
final String file, boolean failWithAssert) throws IOException
{
Args.notNull(document, "document");
http://git-wip-us.apache.org/repos/asf/wicket/blob/2bd22343/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ComponentReferenceApplication.java
----------------------------------------------------------------------
diff --git a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ComponentReferenceApplication.java b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ComponentReferenceApplication.java
index 4694650..699f28d 100644
--- a/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ComponentReferenceApplication.java
+++ b/wicket-examples/src/main/java/org/apache/wicket/examples/compref/ComponentReferenceApplication.java
@@ -43,7 +43,7 @@ public class ComponentReferenceApplication extends WicketExampleApplication
/**
* @return persons db
*/
- public static final List<Person> getPersons()
+ public static List<Person> getPersons()
{
return personsDB;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/2bd22343/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/StringAutoCompleteRenderer.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/StringAutoCompleteRenderer.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/StringAutoCompleteRenderer.java
index c41706e..5d886d1 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/StringAutoCompleteRenderer.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/autocomplete/StringAutoCompleteRenderer.java
@@ -39,7 +39,7 @@ public final class StringAutoCompleteRenderer extends AbstractAutoCompleteTextRe
* @return the single instance
*/
@SuppressWarnings("unchecked")
- public static final <T> IAutoCompleteRenderer<T> instance()
+ public static <T> IAutoCompleteRenderer<T> instance()
{
return INSTANCE;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/2bd22343/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
index f065818..4a99f43 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/modal/ModalWindow.java
@@ -377,7 +377,7 @@ public class ModalWindow extends Panel
* @param target
* Request target associated with current ajax request.
*/
- public static final void closeCurrent(final AjaxRequestTarget target)
+ public static void closeCurrent(final AjaxRequestTarget target)
{
target.appendJavaScript(getCloseJavacriptInternal());
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/2bd22343/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetMap.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetMap.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetMap.java
index e0ca3b5..15827ae 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetMap.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetMap.java
@@ -129,7 +129,7 @@ public final class CharSetMap
* @throws IOException
* for an incorrect stream.
*/
- protected final static Map<String, String> loadStream(final InputStream input)
+ protected static Map<String, String> loadStream(final InputStream input)
throws IOException
{
return createMap(input);
@@ -162,7 +162,7 @@ public final class CharSetMap
* @throws IOException
* for an incorrect file.
*/
- protected final static Map<String, String> loadFile(final File file) throws IOException
+ protected static Map<String, String> loadFile(final File file) throws IOException
{
return loadStream(new FileInputStream(file));
}
@@ -176,7 +176,7 @@ public final class CharSetMap
* @throws IOException
* for an incorrect file.
*/
- protected final static Map<String, String> loadPath(final String path) throws IOException
+ protected static Map<String, String> loadPath(final String path) throws IOException
{
return loadFile(new File(path));
}
@@ -188,7 +188,7 @@ public final class CharSetMap
* a resource name.
* @return the mappings.
*/
- protected final static Map<String, String> loadResource(final String name)
+ protected static Map<String, String> loadResource(final String name)
{
final InputStream input = CharSetMap.class.getResourceAsStream(name);
if (input != null)
@@ -590,4 +590,4 @@ public final class CharSetMap
mappers.add(MAP_COM, mapper);
mappers.get(MAP_CACHE).clear();
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/wicket/blob/2bd22343/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetUtil.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetUtil.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetUtil.java
index f1f589d..5d1444e 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetUtil.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/encoding/CharSetUtil.java
@@ -59,7 +59,7 @@ public class CharSetUtil
* @param application
* Wicket application object
*/
- private synchronized static final void initialize(final WebApplication application)
+ private synchronized static void initialize(final WebApplication application)
{
if (charSetMap == null)
{
@@ -97,7 +97,7 @@ public class CharSetUtil
* @param cycle
* @return Char set to use for response.
*/
- public final static String getEncoding(final RequestCycle cycle)
+ public static String getEncoding(final RequestCycle cycle)
{
if (charSetMap == null)
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/2bd22343/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java b/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java
index 72af504..9a2204c 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/file/Files.java
@@ -152,7 +152,7 @@ public class Files
* the folder to delete
* @return {@code true} if the folder is deleted successfully.
*/
- public static final boolean removeFolder(final File folder)
+ public static boolean removeFolder(final File folder)
{
if (folder == null)
{
@@ -192,7 +192,7 @@ public class Files
* @return {@code false} if the {@code file} is <em>null</em> or a folder, {@code true} -
* otherwise (i.e. if it is scheduled)
*/
- public static final boolean removeAsync(final File file, final IFileCleaner fileCleaner)
+ public static boolean removeAsync(final File file, final IFileCleaner fileCleaner)
{
if (file == null || file.isDirectory())
{
@@ -217,7 +217,7 @@ public class Files
* @return {@code false} if the {@code folder} is <em>null</em> or a normal file, {@code true} -
* otherwise (i.e. if it is scheduled)
*/
- public static final boolean removeFolderAsync(final File folder, final IFileCleaner fileCleaner)
+ public static boolean removeFolderAsync(final File folder, final IFileCleaner fileCleaner)
{
if (folder == null || folder.isFile())
{
@@ -241,7 +241,7 @@ public class Files
* @return Number of bytes written
* @throws IOException
*/
- public static final int writeTo(final java.io.File file, final InputStream input)
+ public static int writeTo(final java.io.File file, final InputStream input)
throws IOException
{
return writeTo(file, input, 4096);
@@ -282,7 +282,7 @@ public class Files
* @return Number of bytes written
* @throws IOException
*/
- public static final int writeTo(final java.io.File file, final InputStream input,
+ public static int writeTo(final java.io.File file, final InputStream input,
final int bufSize) throws IOException
{
final FileOutputStream out = new FileOutputStream(file);
@@ -305,7 +305,7 @@ public class Files
* to be cleaned
* @return cleaned filename
*/
- public static final String cleanupFilename(final String filename)
+ public static String cleanupFilename(final String filename)
{
String name = filename;
for (int i = 0; i < FILENAME_FORBIDDEN_CHARACTERS.length(); i++)
http://git-wip-us.apache.org/repos/asf/wicket/blob/2bd22343/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java b/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java
index a3f7c7a..562e7d4 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/visit/Visits.java
@@ -65,7 +65,7 @@ public class Visits
* @return return value from the {@code visitor} or {@code null} if none
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
- public static final <S, R> R visit(final Iterable<? super S> container,
+ public static <S, R> R visit(final Iterable<? super S> container,
final IVisitor<S, R> visitor)
{
return (R)visitChildren(new SingletonIterable(container), visitor, IVisitFilter.ANY);
@@ -91,7 +91,7 @@ public class Visits
* @return return value from the {@code visitor} or {@code null} if none
*/
@SuppressWarnings({ "unchecked", "rawtypes" })
- public static final <S, R> R visit(final Iterable<? super S> container,
+ public static <S, R> R visit(final Iterable<? super S> container,
final IVisitor<S, R> visitor, final IVisitFilter filter)
{
return (R)visitChildren(new SingletonIterable(container), visitor, filter);
@@ -116,7 +116,7 @@ public class Visits
* filter used to limit the types of objects that will be visited
* @return return value from the {@code visitor} or {@code null} if none
*/
- public static final <S, R> R visitChildren(final Iterable<? super S> container,
+ public static <S, R> R visitChildren(final Iterable<? super S> container,
final IVisitor<S, R> visitor, final IVisitFilter filter)
{
Visit<R> visit = new Visit<>();
@@ -125,7 +125,7 @@ public class Visits
}
@SuppressWarnings("unchecked")
- private static final <S, R> void visitChildren(final Iterable<? super S> container,
+ private static <S, R> void visitChildren(final Iterable<? super S> container,
final IVisitor<S, R> visitor, final IVisitFilter filter, final Visit<R> visit)
{
Args.notNull(visitor, "visitor");
@@ -186,7 +186,7 @@ public class Visits
* the visitor
* @return return value from the {@code visitor} or {@code null} if none
*/
- public static final <S, R> R visitChildren(final Iterable<? super S> container,
+ public static <S, R> R visitChildren(final Iterable<? super S> container,
final IVisitor<S, R> visitor)
{
return visitChildren(container, visitor, IVisitFilter.ANY);
@@ -210,7 +210,7 @@ public class Visits
* the visitor
* @return return value from the {@code visitor} or {@code null} if none
*/
- public static final <S, R> R visitPostOrder(final S root,
+ public static <S, R> R visitPostOrder(final S root,
final org.apache.wicket.util.visit.IVisitor<S, R> visitor)
{
return visitPostOrder(root, visitor, IVisitFilter.ANY);
@@ -236,7 +236,7 @@ public class Visits
* filter used to limit the types of objects that will be visited
* @return return value from the {@code visitor} or {@code null} if none
*/
- public static final <S, R> R visitPostOrder(final Object root,
+ public static <S, R> R visitPostOrder(final Object root,
final org.apache.wicket.util.visit.IVisitor<S, R> visitor, final IVisitFilter filter)
{
Args.notNull(visitor, "visitor");
@@ -247,7 +247,7 @@ public class Visits
}
@SuppressWarnings("unchecked")
- private static final <S, R> void visitPostOrderHelper(final Object component,
+ private static <S, R> void visitPostOrderHelper(final Object component,
final org.apache.wicket.util.visit.IVisitor<S, R> visitor, final IVisitFilter filter,
final Visit<R> visit)
{
[2/4] git commit: no need private methods to be final
Posted by mg...@apache.org.
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 <?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
[3/4] git commit: Update Spring to 4.0.3
Posted by mg...@apache.org.
Update Spring to 4.0.3
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/73889977
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/73889977
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/73889977
Branch: refs/heads/master
Commit: 73889977282f647f527954a3454ed332d67caaa8
Parents: ed8d125
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 27 14:59:55 2014 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 27 14:59:55 2014 +0100
----------------------------------------------------------------------
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/73889977/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 5cf0e92..39d9706 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
<jacoco.version>0.7.0.201403182114</jacoco.version>
<jetty.version>8.1.14.v20131031</jetty.version>
<jetty9.version>9.0.7.v20131107</jetty9.version>
- <spring.version>4.0.2.RELEASE</spring.version>
+ <spring.version>4.0.3.RELEASE</spring.version>
<servlet-api.version>3.0.1</servlet-api.version>
<maven.javadoc.version>2.9.1</maven.javadoc.version>
<maven.surefire.version>2.12.2</maven.surefire.version>
[4/4] git commit: Minor improvements in Wicket's HTML
Posted by mg...@apache.org.
Minor improvements in Wicket's HTML
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/4c219b9b
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/4c219b9b
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/4c219b9b
Branch: refs/heads/master
Commit: 4c219b9b2f59f3968b2ff456bd46650728115a86
Parents: 7388997
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Thu Mar 27 15:00:31 2014 +0100
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Thu Mar 27 15:00:31 2014 +0100
----------------------------------------------------------------------
.../apache/wicket/markup/html/debug/PageView.html | 4 ++--
.../markup/html/pages/ExceptionErrorPage.html | 16 ++++++++--------
.../org/apache/wicket/devutils/DevUtilsPage.html | 4 ++--
.../wicket/devutils/inspector/LiveSessionsPage.html | 2 +-
.../wicket/devutils/inspector/RequestsPage.html | 2 +-
5 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c219b9b/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageView.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageView.html b/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageView.html
index a4b875f..c7ad02d 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageView.html
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/debug/PageView.html
@@ -16,6 +16,7 @@
limitations under the License.
-->
<html xmlns:wicket="http://wicket.apache.org">
+<head>
<style type="text/css">
body {margin-left : 2em;font-family: 'Lucida Sans', 'Helvetica', 'Sans-serif', 'sans', sans-serif; font-size: 9pt; line-height: 1.8em;}
h1,h2,h3,h4,h5,h6 {color: #E9601A;font-size : -1;}
@@ -26,10 +27,10 @@ pre { border : 1px solid #ddd; margin-left : 2em; }
.resource { color : blue; }
.tablestyle { margin-left : 2em; border : 1px solid #bbb; }
</style>
+</head>
<body>
<wicket:panel>
<h2>Page</h2>
- <ul>
<p><span wicket:id="info">Page</span> | render time: | <span wicket:id="pageRenderDuration">n/a</span>:</p>
<table class="tablestyle">
<thead>
@@ -53,7 +54,6 @@ pre { border : 1px solid #ddd; margin-left : 2em; }
</tr>
</tbody>
</table>
- </ul>
</wicket:panel>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c219b9b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.html
----------------------------------------------------------------------
diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.html b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.html
index 1fe0c78..27960d7 100644
--- a/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.html
+++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/pages/ExceptionErrorPage.html
@@ -21,25 +21,25 @@ td > pre { padding : 10px; }
<body>
<h1>Unexpected RuntimeException</h1>
<table ><tr><td><pre><span wicket:id="exception">message</span></pre></td></tr></table>
-
- <span wicket:id="markupHighlight">
+
+ <div wicket:id="markupHighlight">
<h2>Markup</h2>
<p>
The problem is in "<span class="resource" wicket:id = "resource">resource problem</span>":
</p>
<table><tr><td><pre><span class="markup" wicket:id="markup">markup goes here</span></pre></td></tr></table>
- </span>
-
- <span>
+ </div>
+
+ <div>
<h2>Stacktrace</h2>
<table><tr><td><pre><span class="markup" wicket:id="stacktrace">stacktrace goes here</span></pre></td></tr></table>
- </span>
+ </div>
<p>
<a href="#" wicket:id="displayPageViewLink">display page view</a>
- </p>
+ </p>
<p>
- <span wicket:id = "componentTree"/>
+ <span wicket:id = "componentTree"></span>
</p>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c219b9b/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html b/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html
index da7add2..98a45ee 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/DevUtilsPage.html
@@ -68,9 +68,9 @@ h1 img {
<title>Requests Page</title>
</head>
<body>
- <div wicket:id="debug" />
+ <div wicket:id="debug"></div>
<wicket:child />
<br />
<br />
</body>
-</html>
\ No newline at end of file
+</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c219b9b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.html
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.html b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.html
index f7adf7a..94dd964 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.html
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/LiveSessionsPage.html
@@ -52,7 +52,7 @@
<td wicket:id="sessionSize" align="right"></td>
</tr>
</table>
- <span wicket:id="navigator"/>
+ <span wicket:id="navigator"></span>
</wicket:extend>
</body>
</html>
http://git-wip-us.apache.org/repos/asf/wicket/blob/4c219b9b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.html
----------------------------------------------------------------------
diff --git a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.html b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.html
index 7b3e6e7..9cef06f 100644
--- a/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.html
+++ b/wicket-devutils/src/main/java/org/apache/wicket/devutils/inspector/RequestsPage.html
@@ -58,7 +58,7 @@
<td wicket:id="sessionSize"></td>
</tr>
</table>
- <span wicket:id="navigator"/>
+ <span wicket:id="navigator"></span>
</wicket:extend>
</body>
</html>