Repository: incubator-tamaya Updated Branches: refs/heads/master 7c98c75e3 -> 36c8ac241
Fixed some minor formatting issues. Project: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/commit/36c8ac24 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/tree/36c8ac24 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tamaya/diff/36c8ac24 Branch: refs/heads/master Commit: 36c8ac24111dfac3fbfa203e730eae181060dbe1 Parents: 7c98c75 Author: Oliver B. Fischer <[email protected]> Authored: Sun Dec 4 16:29:10 2016 +0100 Committer: Oliver B. Fischer <[email protected]> Committed: Sun Dec 4 16:29:10 2016 +0100 ---------------------------------------------------------------------- .../tamaya/core/internal/DefaultConfigurationContext.java | 5 ++++- .../apache/tamaya/core/propertysource/BasePropertySource.java | 2 +- .../apache/tamaya/core/propertysource/CLIPropertySource.java | 4 ++-- 3 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/36c8ac24/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java b/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java index 7a65fa5..280793a 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java +++ b/code/core/src/main/java/org/apache/tamaya/core/internal/DefaultConfigurationContext.java @@ -36,11 +36,13 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import java.util.logging.Logger; /** - * Default Implementation of a simple ConfigurationContext. + * Default implementation of a simple ConfigurationContext. */ public class DefaultConfigurationContext implements ConfigurationContext { + /** The logger used. */ private final static Logger LOG = Logger.getLogger(DefaultConfigurationContext.class.getName()); + /** * Cubcomponent handling {@link org.apache.tamaya.spi.PropertyConverter} instances. */ @@ -66,6 +68,7 @@ public class DefaultConfigurationContext implements ConfigurationContext { * Lock for internal synchronization. */ private final ReentrantReadWriteLock propertySourceLock = new ReentrantReadWriteLock(); + /** * Lock for internal synchronization. */ http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/36c8ac24/code/core/src/main/java/org/apache/tamaya/core/propertysource/BasePropertySource.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/propertysource/BasePropertySource.java b/code/core/src/main/java/org/apache/tamaya/core/propertysource/BasePropertySource.java index ff0622b..75c4893 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/propertysource/BasePropertySource.java +++ b/code/core/src/main/java/org/apache/tamaya/core/propertysource/BasePropertySource.java @@ -31,7 +31,7 @@ import java.util.logging.Logger; * Abstract {@link org.apache.tamaya.spi.PropertySource} that allows to set a default ordinal that will be used, if no * ordinal is provided with the config. */ -public abstract class BasePropertySource implements PropertySource{ +public abstract class BasePropertySource implements PropertySource { /** default ordinal that will be used, if no ordinal is provided with the config. */ private int defaultOrdinal; /** Used if the ordinal has been set explicitly. */ http://git-wip-us.apache.org/repos/asf/incubator-tamaya/blob/36c8ac24/code/core/src/main/java/org/apache/tamaya/core/propertysource/CLIPropertySource.java ---------------------------------------------------------------------- diff --git a/code/core/src/main/java/org/apache/tamaya/core/propertysource/CLIPropertySource.java b/code/core/src/main/java/org/apache/tamaya/core/propertysource/CLIPropertySource.java index 87bbceb..12e4932 100644 --- a/code/core/src/main/java/org/apache/tamaya/core/propertysource/CLIPropertySource.java +++ b/code/core/src/main/java/org/apache/tamaya/core/propertysource/CLIPropertySource.java @@ -35,8 +35,8 @@ public class CLIPropertySource extends BasePropertySource{ /** The map of parsed main arguments. */ private static Map<String,String> mainArgs; - /** Initializes the initial state. */ - static{ + /* Initializes the initial state. */ + static { initMainArgs(args); }
