tamaya-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anat...@apache.org
Subject incubator-tamaya git commit: Updated doc.
Date Tue, 15 Mar 2016 00:49:09 GMT
Repository: incubator-tamaya
Updated Branches:
  refs/heads/master f9adf5930 -> 5e4d9ef4a


Updated doc.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/5e4d9ef4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/5e4d9ef4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/5e4d9ef4

Branch: refs/heads/master
Commit: 5e4d9ef4a59bea01120de7dae05559569bc48710
Parents: f9adf59
Author: anatole <anatole@apache.org>
Authored: Tue Mar 15 01:48:52 2016 +0100
Committer: anatole <anatole@apache.org>
Committed: Tue Mar 15 01:48:52 2016 +0100

----------------------------------------------------------------------
 docs/src/main/asciidoc/API.adoc | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/5e4d9ef4/docs/src/main/asciidoc/API.adoc
----------------------------------------------------------------------
diff --git a/docs/src/main/asciidoc/API.adoc b/docs/src/main/asciidoc/API.adoc
index c00a47d..be3cc38 100644
--- a/docs/src/main/asciidoc/API.adoc
+++ b/docs/src/main/asciidoc/API.adoc
@@ -193,6 +193,8 @@ public interface Configuration{
     // extension points
     Configuration with(ConfigOperator operator);
     <T> T query(ConfigQuery<T> query);
+
+    ConfigurationContext getContext();
 }
 --------------------------------------------
 
@@ -462,13 +464,12 @@ public interface PropertyValueCombinationPolicy{
 ==== The Configuration Context
 
 A +Configuration+ is basically based on a so called +ConfigurationContext+, which is
-managed by the +ConfigurationProvider+. Similarly the current +ConfigurationContext+ can
be accessed from the
-+ConfigurationProvider+ singleton:
+accessible from +Configuration.getContext()+:
 
 [source,java]
 .Accessing the current +ConfigurationContext+
 --------------------------------------------
-ConfigurationContext context = ConfigurationProvider.getConfigurationContext();
+ConfigurationContext context = ConfigurationProvider.getConfiguration().getContext();
 --------------------------------------------
 
 The +ConfigurationContext+ provides access to the internal building blocks that determine
the final +Configuration+:
@@ -511,7 +512,7 @@ accessed either
 [source,java]
 .Accessing a +ConfigurationContextBuilder+
 --------------------------------------------
-ConfigurationContextBuilder preinitializedContextBuilder = ConfigurationProvider.getConfigurationContext().toBuilder();
+ConfigurationContextBuilder preinitializedContextBuilder = ConfigurationProvider.getConfiguration().getContext().toBuilder();
 ConfigurationContextBuilder emptyContextBuilder = ConfigurationProvider.getConfigurationContextBuilder();
 --------------------------------------------
 
@@ -520,7 +521,8 @@ With such a builder a new +ConfigurationContext+ can be created and then
applied
 [source,java]
 .Creating and applying a new +ConfigurationContext+
 --------------------------------------------
-ConfigurationContextBuilder preinitializedContextBuilder = ConfigurationProvider.getConfigurationContext().toBuilder();
+ConfigurationContextBuilder preinitializedContextBuilder = ConfigurationProvider.getConfiguration().getContext()
+                                                           .toBuilder();
 ConfigurationContext context = preinitializedContextBuilder.addPropertySources(new MyPropertySource())
                                                            .addPropertyFilter(new MyFilter()).build();
 ConfigurationProvider.setConfigurationContext(context);


Mime
View raw message