Updated Branches: refs/heads/master 442932d4e -> af6e5eda6
WICKET-5277 PropertiesFactory - customizable properties loading Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/af6e5eda Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/af6e5eda Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/af6e5eda Branch: refs/heads/master Commit: af6e5eda6337c85d2de13e54a45ac29309b9eb07 Parents: 442932d Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Authored: Tue Jul 23 12:31:12 2013 +0300 Committer: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Committed: Tue Jul 23 12:31:12 2013 +0300 ---------------------------------------------------------------------- .../java/org/apache/wicket/resource/PropertiesFactory.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/af6e5eda/wicket-core/src/main/java/org/apache/wicket/resource/PropertiesFactory.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/resource/PropertiesFactory.java b/wicket-core/src/main/java/org/apache/wicket/resource/PropertiesFactory.java index efaa937..fdae13d 100644 --- a/wicket-core/src/main/java/org/apache/wicket/resource/PropertiesFactory.java +++ b/wicket-core/src/main/java/org/apache/wicket/resource/PropertiesFactory.java @@ -201,7 +201,7 @@ public class PropertiesFactory implements IPropertiesFactory * @param resourceStream * @return properties */ - private ValueMap loadFromLoader(final IPropertiesLoader loader, + protected ValueMap loadFromLoader(final IPropertiesLoader loader, final IResourceStream resourceStream) { if (log.isInfoEnabled()) @@ -257,7 +257,7 @@ public class PropertiesFactory implements IPropertiesFactory * @param resourceStream * @param watcher */ - private void addToWatcher(final String path, final IResourceStream resourceStream, + protected void addToWatcher(final String path, final IResourceStream resourceStream, final IModificationWatcher watcher) { watcher.add(resourceStream, new IChangeListener() @@ -298,4 +298,4 @@ public class PropertiesFactory implements IPropertiesFactory { return propertiesCache; } -} \ No newline at end of file +}
