Repository: wicket Updated Branches: refs/heads/wicket-7.x 348462994 -> ab461d5d2
Minor improvements Use Args.notNull(). Fix typos in comments. Remove useless javadoc Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ab461d5d Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ab461d5d Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ab461d5d Branch: refs/heads/wicket-7.x Commit: ab461d5d2da53d3aec2852925dca72a9bebdfb08 Parents: 3484629 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Tue Jun 13 21:21:13 2017 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Tue Jun 13 21:21:13 2017 +0200 ---------------------------------------------------------------------- .../main/java/org/apache/wicket/Localizer.java | 4 ++-- .../loader/ClassStringResourceLoader.java | 18 +++------------- .../loader/ComponentStringResourceLoader.java | 4 ---- .../loader/InitializerStringResourceLoader.java | 22 ++++++-------------- .../loader/NestedStringResourceLoader.java | 9 ++++---- .../loader/PackageStringResourceLoader.java | 14 ++----------- .../loader/ValidatorStringResourceLoader.java | 8 ------- 7 files changed, 18 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/ab461d5d/wicket-core/src/main/java/org/apache/wicket/Localizer.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/Localizer.java b/wicket-core/src/main/java/org/apache/wicket/Localizer.java index 17c86ef..2c7c038 100644 --- a/wicket-core/src/main/java/org/apache/wicket/Localizer.java +++ b/wicket-core/src/main/java/org/apache/wicket/Localizer.java @@ -232,7 +232,7 @@ public class Localizer String value = getStringIgnoreSettings(key, component, model, locale, style, null); // If a property value has been found, or a default value was given, - // than replace the placeholder and we are done + // then replace the placeholder and we are done if (value != null) { return value; @@ -416,7 +416,7 @@ public class Localizer } // If a property value has been found, or a default value was given, - // than replace the placeholder and we are done + // then replace the placeholder and we are done if (value != null) { return substitutePropertyExpressions(component, value, model); http://git-wip-us.apache.org/repos/asf/wicket/blob/ab461d5d/wicket-core/src/main/java/org/apache/wicket/resource/loader/ClassStringResourceLoader.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/loader/ClassStringResourceLoader.java b/wicket-core/src/main/java/org/apache/wicket/resource/loader/ClassStringResourceLoader.java index 57fb235..1658e13 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/loader/ClassStringResourceLoader.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/loader/ClassStringResourceLoader.java @@ -20,7 +20,7 @@ import java.lang.ref.WeakReference; import java.util.Locale; import org.apache.wicket.Component; - +import org.apache.wicket.util.lang.Args; /** * This string resource loader attempts to find a single resource bundle that has the same name and @@ -46,18 +46,10 @@ public class ClassStringResourceLoader extends ComponentStringResourceLoader */ public ClassStringResourceLoader(final Class<?> clazz) { - if (clazz == null) - { - throw new IllegalArgumentException("Parameter 'clazz' must not be null"); - } + Args.notNull(clazz, "clazz"); clazzRef = new WeakReference<Class<?>>(clazz); } - /** - * - * @see org.apache.wicket.resource.loader.ComponentStringResourceLoader#loadStringResource(java.lang.Class, - * java.lang.String, java.util.Locale, java.lang.String, java.lang.String) - */ @Override public String loadStringResource(final Class<?> clazz, final String key, final Locale locale, final String style, final String variation) @@ -65,10 +57,6 @@ public class ClassStringResourceLoader extends ComponentStringResourceLoader return super.loadStringResource(clazzRef.get(), key, locale, style, variation); } - /** - * @see org.apache.wicket.resource.loader.ComponentStringResourceLoader#loadStringResource(org.apache.wicket.Component, - * String, java.util.Locale, String, String) - */ @Override public String loadStringResource(final Component component, final String key, final Locale locale, final String style, final String variation) @@ -79,4 +67,4 @@ public class ClassStringResourceLoader extends ComponentStringResourceLoader } return super.loadStringResource(component, key, locale, style, variation); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/wicket/blob/ab461d5d/wicket-core/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java b/wicket-core/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java index 834b9a5..27cc2e5 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/loader/ComponentStringResourceLoader.java @@ -108,10 +108,6 @@ public class ComponentStringResourceLoader implements IStringResourceLoader { } - /** - * @see org.apache.wicket.resource.loader.IStringResourceLoader#loadStringResource(java.lang.Class, - * java.lang.String, java.util.Locale, java.lang.String, java.lang.String) - */ @Override public String loadStringResource(Class<?> clazz, final String key, final Locale locale, final String style, final String variation) http://git-wip-us.apache.org/repos/asf/wicket/blob/ab461d5d/wicket-core/src/main/java/org/apache/wicket/resource/loader/InitializerStringResourceLoader.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/loader/InitializerStringResourceLoader.java b/wicket-core/src/main/java/org/apache/wicket/resource/loader/InitializerStringResourceLoader.java index 4e4c84c..c9fd6b5 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/loader/InitializerStringResourceLoader.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/loader/InitializerStringResourceLoader.java @@ -16,13 +16,12 @@ */ package org.apache.wicket.resource.loader; -import java.util.List; -import java.util.Locale; - import org.apache.wicket.Component; import org.apache.wicket.IInitializer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import org.apache.wicket.util.lang.Args; + +import java.util.List; +import java.util.Locale; /** @@ -41,7 +40,7 @@ import org.slf4j.LoggerFactory; */ public class InitializerStringResourceLoader extends ComponentStringResourceLoader { - private List<IInitializer> initializers; + private final List<IInitializer> initializers; /** * Create and initialize the resource loader. @@ -51,14 +50,9 @@ public class InitializerStringResourceLoader extends ComponentStringResourceLoad */ public InitializerStringResourceLoader(List<IInitializer> initializers) { - this.initializers = initializers; + this.initializers = Args.notNull(initializers, "initializers"); } - /** - * - * @see org.apache.wicket.resource.loader.ComponentStringResourceLoader#loadStringResource(java.lang.Class, - * java.lang.String, java.util.Locale, java.lang.String, java.lang.String) - */ @Override public String loadStringResource(Class<?> clazz, final String key, final Locale locale, final String style, final String variation) @@ -78,10 +72,6 @@ public class InitializerStringResourceLoader extends ComponentStringResourceLoad return null; } - /** - * @see org.apache.wicket.resource.loader.ComponentStringResourceLoader#loadStringResource(org.apache.wicket.Component, - * java.lang.String, java.util.Locale, java.lang.String, java.lang.String) - */ @Override public String loadStringResource(final Component component, final String key, final Locale locale, final String style, final String variation) http://git-wip-us.apache.org/repos/asf/wicket/blob/ab461d5d/wicket-core/src/main/java/org/apache/wicket/resource/loader/NestedStringResourceLoader.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/loader/NestedStringResourceLoader.java b/wicket-core/src/main/java/org/apache/wicket/resource/loader/NestedStringResourceLoader.java index e47a8be..e84d783 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/loader/NestedStringResourceLoader.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/loader/NestedStringResourceLoader.java @@ -27,6 +27,7 @@ import java.util.regex.Pattern; import org.apache.wicket.Application; import org.apache.wicket.Component; import org.apache.wicket.settings.ResourceSettings; +import org.apache.wicket.util.lang.Args; import org.apache.wicket.util.string.AppendingStringBuffer; /** @@ -50,11 +51,11 @@ import org.apache.wicket.util.string.AppendingStringBuffer; */ public class NestedStringResourceLoader implements IStringResourceLoader { - private Pattern pattern; + private final Pattern pattern; - private List<IStringResourceLoader> loaders; + private final List<IStringResourceLoader> loaders; - private ResourceSettings resourceSettings; + private final ResourceSettings resourceSettings; /** * Creates a nested string resource loader @@ -68,7 +69,7 @@ public class NestedStringResourceLoader implements IStringResourceLoader public NestedStringResourceLoader(List<IStringResourceLoader> loaders, Pattern pattern) { this.loaders = new ArrayList<>(loaders); - this.pattern = pattern; + this.pattern = Args.notNull(pattern, "pattern"); this.resourceSettings = Application.get().getResourceSettings(); } http://git-wip-us.apache.org/repos/asf/wicket/blob/ab461d5d/wicket-core/src/main/java/org/apache/wicket/resource/loader/PackageStringResourceLoader.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/loader/PackageStringResourceLoader.java b/wicket-core/src/main/java/org/apache/wicket/resource/loader/PackageStringResourceLoader.java index 61b6a8b..9b943cc 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/loader/PackageStringResourceLoader.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/loader/PackageStringResourceLoader.java @@ -16,14 +16,12 @@ */ package org.apache.wicket.resource.loader; -import java.util.Locale; - import org.apache.wicket.core.util.resource.locator.IResourceNameIterator; import org.apache.wicket.resource.IPropertiesFactory; import org.apache.wicket.resource.Properties; import org.apache.wicket.util.string.Strings; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; + +import java.util.Locale; /** @@ -44,9 +42,6 @@ import org.slf4j.LoggerFactory; */ public class PackageStringResourceLoader extends ComponentStringResourceLoader { - /** Log. */ - private static final Logger log = LoggerFactory.getLogger(PackageStringResourceLoader.class); - /** The name (without extension) of the properties file */ private String filename = "wicket-package"; @@ -57,11 +52,6 @@ public class PackageStringResourceLoader extends ComponentStringResourceLoader { } - /** - * - * @see org.apache.wicket.resource.loader.ComponentStringResourceLoader#loadStringResource(java.lang.Class, - * java.lang.String, java.util.Locale, java.lang.String, java.lang.String) - */ @Override public String loadStringResource(Class<?> clazz, final String key, final Locale locale, final String style, final String variation) http://git-wip-us.apache.org/repos/asf/wicket/blob/ab461d5d/wicket-core/src/main/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoader.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoader.java b/wicket-core/src/main/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoader.java index da92f0c..f5d4000 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoader.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/loader/ValidatorStringResourceLoader.java @@ -48,10 +48,6 @@ public class ValidatorStringResourceLoader extends ComponentStringResourceLoader { } - /** - * @see org.apache.wicket.resource.loader.ComponentStringResourceLoader#loadStringResource(java.lang.Class, - * java.lang.String, java.util.Locale, java.lang.String, java.lang.String) - */ @Override public String loadStringResource(Class<?> clazz, final String key, final Locale locale, final String style, final String variation) @@ -67,10 +63,6 @@ public class ValidatorStringResourceLoader extends ComponentStringResourceLoader return super.loadStringResource(clazz, key, locale, style, variation); } - /** - * @see org.apache.wicket.resource.loader.ComponentStringResourceLoader#loadStringResource(org.apache.wicket.Component, - * java.lang.String, java.util.Locale, java.lang.String, java.lang.String) - */ @Override public String loadStringResource(final Component component, final String key, final Locale locale, final String style, final String variation)
