Oscar Scholten pushed to branch feature/REPO-1525 at cms-community / hippo-repository
Commits: 5fd696cf by Oscar Scholten at 2016-07-21T12:36:46+02:00 REPO-1525 removing getKeys and getParent from ResourceBundle as those can be kept internal - - - - - 2 changed files: - api/src/main/java/org/onehippo/repository/l10n/ResourceBundle.java - engine/src/main/java/org/onehippo/repository/l10n/ResourceBundleLoader.java Changes: ===================================== api/src/main/java/org/onehippo/repository/l10n/ResourceBundle.java ===================================== --- a/api/src/main/java/org/onehippo/repository/l10n/ResourceBundle.java +++ b/api/src/main/java/org/onehippo/repository/l10n/ResourceBundle.java @@ -15,9 +15,7 @@ */ package org.onehippo.repository.l10n; -import java.util.Collections; import java.util.Locale; -import java.util.Set; /** * A {@link ResourceBundle} is a set of Strings identified by keys @@ -50,14 +48,6 @@ public interface ResourceBundle { */ String getString(String key); - default Set<String> getKeys() { - return Collections.emptySet(); - } - - default ResourceBundle getParent() { - return null; - } - default java.util.ResourceBundle toJavaResourceBundle() { return null; } ===================================== engine/src/main/java/org/onehippo/repository/l10n/ResourceBundleLoader.java ===================================== --- a/engine/src/main/java/org/onehippo/repository/l10n/ResourceBundleLoader.java +++ b/engine/src/main/java/org/onehippo/repository/l10n/ResourceBundleLoader.java @@ -64,8 +64,8 @@ class ResourceBundleLoader { } } - private ResourceBundle resolveParent(ResourceBundleImpl bundle) { - ResourceBundle result = null; + private ResourceBundleImpl resolveParent(ResourceBundleImpl bundle) { + ResourceBundleImpl result = null; for (ResourceBundleImpl parent : bundles.values()) { if (parent == bundle) { continue; @@ -146,12 +146,12 @@ class ResourceBundleLoader { } private static class ResourceBundleDecorator extends java.util.ResourceBundle { - private ResourceBundle repositoryResourceBundle; + private ResourceBundleImpl repositoryResourceBundle; - public ResourceBundleDecorator(ResourceBundle repositoryResourceBundle) { + public ResourceBundleDecorator(ResourceBundleImpl repositoryResourceBundle) { this.repositoryResourceBundle = repositoryResourceBundle; - final ResourceBundle parent = repositoryResourceBundle.getParent(); + final ResourceBundleImpl parent = repositoryResourceBundle.getParent(); if (parent != null) { setParent(new ResourceBundleDecorator(parent)); } @@ -172,7 +172,7 @@ class ResourceBundleLoader { private final String name; private final Locale locale; private final Map<String, String> strings = new HashMap<>(); - private ResourceBundle parent; + private ResourceBundleImpl parent; private ResourceBundleImpl(final String name, final Locale locale) { this.name = name; @@ -202,16 +202,6 @@ class ResourceBundleLoader { } @Override - public Set<String> getKeys() { - return strings.keySet(); - } - - @Override - public ResourceBundle getParent() { - return parent; - } - - @Override public java.util.ResourceBundle toJavaResourceBundle() { return new ResourceBundleDecorator(this); } @@ -224,7 +214,15 @@ class ResourceBundleLoader { return new ResourceBundleKey(name, locale); } - private void setParent(ResourceBundle parent) { + private Set<String> getKeys() { + return strings.keySet(); + } + + private ResourceBundleImpl getParent() { + return parent; + } + + private void setParent(ResourceBundleImpl parent) { this.parent = parent; } View it on GitLab: https://code.onehippo.org/cms-community/hippo-repository/commit/5fd696cf139441a542935b23ff633e3f9bfe719e
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn