You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by al...@apache.org on 2015/02/18 12:32:11 UTC
[6/9] incubator-brooklyn git commit: Config refactor: minor fixes to
javadoc
Config refactor: minor fixes to javadoc
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/7a4e46b3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/7a4e46b3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/7a4e46b3
Branch: refs/heads/master
Commit: 7a4e46b3ed771f204ba8ca1f10c9d4a6f92d886c
Parents: b944f83
Author: Aled Sage <al...@gmail.com>
Authored: Wed Feb 18 11:02:09 2015 +0000
Committer: Aled Sage <al...@gmail.com>
Committed: Wed Feb 18 11:02:35 2015 +0000
----------------------------------------------------------------------
api/src/main/java/brooklyn/entity/trait/Configurable.java | 2 +-
core/src/main/java/brooklyn/location/basic/LocationInternal.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7a4e46b3/api/src/main/java/brooklyn/entity/trait/Configurable.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/brooklyn/entity/trait/Configurable.java b/api/src/main/java/brooklyn/entity/trait/Configurable.java
index 84f1922..2f49014 100644
--- a/api/src/main/java/brooklyn/entity/trait/Configurable.java
+++ b/api/src/main/java/brooklyn/entity/trait/Configurable.java
@@ -47,7 +47,7 @@ public interface Configurable {
public interface ConfigurationSupport {
/**
- * Gets the given configuration value for this entity, in the following order of preference:
+ * Gets the given configuration value for this entity, in the following order of precedence:
* <ol>
* <li> value (including null) explicitly set on the entity
* <li> value (including null) explicitly set on an ancestor (inherited)
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/7a4e46b3/core/src/main/java/brooklyn/location/basic/LocationInternal.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/location/basic/LocationInternal.java b/core/src/main/java/brooklyn/location/basic/LocationInternal.java
index f54d0f1..3d9bc5d 100644
--- a/core/src/main/java/brooklyn/location/basic/LocationInternal.java
+++ b/core/src/main/java/brooklyn/location/basic/LocationInternal.java
@@ -72,7 +72,8 @@ public interface LocationInternal extends BrooklynObjectInternal, Location {
/**
* Returns all config, including that inherited from parents.
- * TODO this method does not respect {@link ConfigInheritance} and so usage is discouraged.
+ *
+ * This method does not respect {@link ConfigInheritance} and so usage is discouraged.
*
* @deprecated since 0.7.0; use {@link #config()}, such as {@code ((LocationInternal)location).config().getBag()}
*/