You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2016/01/20 22:04:37 UTC
[3/6] incubator-brooklyn git commit: address code review for #1162
address code review for #1162
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/47e2aec2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/47e2aec2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/47e2aec2
Branch: refs/heads/master
Commit: 47e2aec26e10ab2abb24fbc14eeb8895e13c116f
Parents: 1affd4d
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Wed Jan 20 20:53:04 2016 +0000
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Wed Jan 20 20:53:30 2016 +0000
----------------------------------------------------------------------
.../apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java | 2 +-
.../apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/47e2aec2/brooklyn-server/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
----------------------------------------------------------------------
diff --git a/brooklyn-server/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java b/brooklyn-server/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
index c4701c6..789d282 100644
--- a/brooklyn-server/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
+++ b/brooklyn-server/api/src/main/java/org/apache/brooklyn/api/internal/AbstractBrooklynObjectSpec.java
@@ -125,7 +125,7 @@ public abstract class AbstractBrooklynObjectSpec<T,SpecT extends AbstractBrookly
Iterables.addAll(this.tags, tagsToAdd);
return self();
}
- /** replaces the given tags */
+ /** replaces tags with the given */
public SpecT tagsReplace(Iterable<Object> tagsToReplace) {
this.tags.clear();
Iterables.addAll(this.tags, tagsToReplace);
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/47e2aec2/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java
----------------------------------------------------------------------
diff --git a/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java b/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java
index cfa51e3..5ba36b3 100644
--- a/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java
+++ b/brooklyn-server/core/src/main/java/org/apache/brooklyn/core/typereg/AbstractTypePlanTransformer.java
@@ -103,7 +103,7 @@ public abstract class AbstractTypePlanTransformer implements BrooklynTypePlanTra
@Override protected Object visitSpec() {
try {
AbstractBrooklynObjectSpec<?, ?> result = createSpec(type, context);
- // see notes in CampResolver setting catalogItemId; we might need to keep both
+ // see notes on catalogItemIdIfNotNull
result.catalogItemIdIfNotNull(type.getId());
return result;
} catch (Exception e) { throw Exceptions.propagate(e); }