Changes lots for groovy classes to java Changes core:brooklyn.entity.basic and brooklyn.entity.group, as well as brooklyn.policy.basic.
Also goes through some groovy code making it "more java-like" by adding semi-colons etc to policy:brooklyn.policy.* code (amongst others), ready for a big refactor to Java. Project: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/commit/d23bc5b5 Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/tree/d23bc5b5 Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-ui/diff/d23bc5b5 Branch: refs/heads/0.4.0 Commit: d23bc5b594d932c55a251ac76ec2f90fb89c851b Parents: e3166be Author: Aled Sage <[email protected]> Authored: Tue May 29 10:09:44 2012 +0100 Committer: Aled Sage <[email protected]> Committed: Tue May 29 11:35:03 2012 +0100 ---------------------------------------------------------------------- .../utils/brooklyn/web/console/TestWebApplication.groovy | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-ui/blob/d23bc5b5/usage/web-console/grails-app/utils/brooklyn/web/console/TestWebApplication.groovy ---------------------------------------------------------------------- diff --git a/usage/web-console/grails-app/utils/brooklyn/web/console/TestWebApplication.groovy b/usage/web-console/grails-app/utils/brooklyn/web/console/TestWebApplication.groovy index 6e57aea..f484c74 100644 --- a/usage/web-console/grails-app/utils/brooklyn/web/console/TestWebApplication.groovy +++ b/usage/web-console/grails-app/utils/brooklyn/web/console/TestWebApplication.groovy @@ -139,8 +139,10 @@ private class TestWebApplication extends AbstractApplication { "Direct children of this group"), DataRate: new BasicAttributeSensor<String>(String.class, "DataRate")]) } - TestGroupEntity addOwnedChild(Entity child) { - super.addOwnedChild(child) + public Entity addOwnedChild(Entity child) { + // TODO using super.addOwnedChild gives StackOverflowException. Sounds similar to http://jira.codehaus.org/browse/GROOVY-5385, + // except that changing the return type to match super's doesn't fix it... + child.setOwner(this) setAttribute(getSensor("Children"), ownedChildren.size()) return this }
