:tutorials:composites refine snippets
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/1a1d6443 Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/1a1d6443 Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/1a1d6443 Branch: refs/heads/develop Commit: 1a1d64437af0b86a3a246e03090dba15b21c4ca4 Parents: 698fd1a Author: Paul Merlin <[email protected]> Authored: Mon May 15 09:33:23 2017 +0200 Committer: Paul Merlin <[email protected]> Committed: Mon May 15 09:33:23 2017 +0200 ---------------------------------------------------------------------- tutorials/composites/src/docs/step2.txt | 2 +- tutorials/composites/src/docs/step3.txt | 2 +- .../tutorials/composites/tutorial10/HelloWorldComposite.java | 2 -- .../tutorials/composites/tutorial3/HelloWorldComposite.java | 3 +-- .../tutorials/composites/tutorial4/HelloWorldComposite.java | 4 +--- .../tutorials/composites/tutorial5/HelloWorldComposite.java | 4 +--- .../tutorials/composites/tutorial6/HelloWorldComposite.java | 4 +--- .../tutorials/composites/tutorial7/HelloWorldComposite.java | 3 +-- .../tutorials/composites/tutorial8/HelloWorldComposite.java | 3 +-- .../tutorials/composites/tutorial9/HelloWorldComposite.java | 3 +-- 10 files changed, 9 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/1a1d6443/tutorials/composites/src/docs/step2.txt ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/docs/step2.txt b/tutorials/composites/src/docs/step2.txt index b649b0b..a05c22e 100644 --- a/tutorials/composites/src/docs/step2.txt +++ b/tutorials/composites/src/docs/step2.txt @@ -34,7 +34,7 @@ checks in the Mixin. If a null value is passed in an exception will be thrown by Steps for this tutorial: -- Create an interface that extends the domain interface +HelloWorld+ and +org.apache.polygene.api.composite.TransientComposite+. +- Create an interface that extends the domain interface +HelloWorld+. - Add a @Mixins annotation to it with the name of the Mixin as argument. == Solution == http://git-wip-us.apache.org/repos/asf/polygene-java/blob/1a1d6443/tutorials/composites/src/docs/step3.txt ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/docs/step3.txt b/tutorials/composites/src/docs/step3.txt index 61540b0..214ba47 100644 --- a/tutorials/composites/src/docs/step3.txt +++ b/tutorials/composites/src/docs/step3.txt @@ -31,7 +31,7 @@ Steps for this tutorial: - Refactor the Mixin into one which implement the behaviour interface and one which implements the state interface. Use the @This injection annotation to allow the behaviour to access the state. - Add a @Mixins annotations on the behaviour and state interfaces which declare the Mixins as default implementations. -- Remove the @Mixins annotation from the TransientComposite interface. +- Remove the @Mixins annotation from the HelloWorldComposite interface. == Solution == http://git-wip-us.apache.org/repos/asf/polygene-java/blob/1a1d6443/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial10/HelloWorldComposite.java ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial10/HelloWorldComposite.java b/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial10/HelloWorldComposite.java index bac7b0d..fe5a838 100644 --- a/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial10/HelloWorldComposite.java +++ b/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial10/HelloWorldComposite.java @@ -19,7 +19,6 @@ */ package org.apache.polygene.tutorials.composites.tutorial10; -import org.apache.polygene.api.composite.TransientComposite; import org.apache.polygene.api.mixin.Mixins; // START SNIPPET: solution @@ -34,7 +33,6 @@ import org.apache.polygene.api.mixin.Mixins; */ @Mixins( { HelloWorldMixin.class } ) public interface HelloWorldComposite - extends TransientComposite { String say(); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/1a1d6443/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial3/HelloWorldComposite.java ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial3/HelloWorldComposite.java b/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial3/HelloWorldComposite.java index 2204edc..a8031b0 100644 --- a/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial3/HelloWorldComposite.java +++ b/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial3/HelloWorldComposite.java @@ -19,7 +19,6 @@ */ package org.apache.polygene.tutorials.composites.tutorial3; -import org.apache.polygene.api.composite.TransientComposite; import org.apache.polygene.api.mixin.Mixins; // START SNIPPET: solution @@ -32,7 +31,7 @@ import org.apache.polygene.api.mixin.Mixins; */ @Mixins( HelloWorldMixin.class ) public interface HelloWorldComposite - extends HelloWorld, TransientComposite + extends HelloWorld { } // END SNIPPET: solution http://git-wip-us.apache.org/repos/asf/polygene-java/blob/1a1d6443/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial4/HelloWorldComposite.java ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial4/HelloWorldComposite.java b/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial4/HelloWorldComposite.java index 2dfa211..4dcdfc7 100644 --- a/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial4/HelloWorldComposite.java +++ b/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial4/HelloWorldComposite.java @@ -19,8 +19,6 @@ */ package org.apache.polygene.tutorials.composites.tutorial4; -import org.apache.polygene.api.composite.TransientComposite; - // START SNIPPET: solution /** @@ -34,7 +32,7 @@ import org.apache.polygene.api.composite.TransientComposite; * </p> */ public interface HelloWorldComposite - extends HelloWorld, TransientComposite + extends HelloWorld { } // END SNIPPET: solution http://git-wip-us.apache.org/repos/asf/polygene-java/blob/1a1d6443/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial5/HelloWorldComposite.java ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial5/HelloWorldComposite.java b/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial5/HelloWorldComposite.java index 2ef921d..6ba4066 100644 --- a/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial5/HelloWorldComposite.java +++ b/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial5/HelloWorldComposite.java @@ -19,8 +19,6 @@ */ package org.apache.polygene.tutorials.composites.tutorial5; -import org.apache.polygene.api.composite.TransientComposite; - /** * This Composite interface declares transitively * all the Fragments of the HelloWorld composite. @@ -32,6 +30,6 @@ import org.apache.polygene.api.composite.TransientComposite; * </p> */ public interface HelloWorldComposite - extends HelloWorld, TransientComposite + extends HelloWorld { } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/1a1d6443/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial6/HelloWorldComposite.java ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial6/HelloWorldComposite.java b/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial6/HelloWorldComposite.java index 99abf7a..7a1ee5a 100644 --- a/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial6/HelloWorldComposite.java +++ b/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial6/HelloWorldComposite.java @@ -19,8 +19,6 @@ */ package org.apache.polygene.tutorials.composites.tutorial6; -import org.apache.polygene.api.composite.TransientComposite; - /** * This Composite interface declares transitively * all the Fragments of the HelloWorld composite. @@ -32,6 +30,6 @@ import org.apache.polygene.api.composite.TransientComposite; * </p> */ public interface HelloWorldComposite - extends HelloWorld, TransientComposite + extends HelloWorld { } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/1a1d6443/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial7/HelloWorldComposite.java ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial7/HelloWorldComposite.java b/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial7/HelloWorldComposite.java index 4053785..0366986 100644 --- a/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial7/HelloWorldComposite.java +++ b/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial7/HelloWorldComposite.java @@ -19,7 +19,6 @@ */ package org.apache.polygene.tutorials.composites.tutorial7; -import org.apache.polygene.api.composite.TransientComposite; import org.apache.polygene.api.mixin.Mixins; import org.apache.polygene.api.sideeffect.SideEffects; @@ -35,7 +34,7 @@ import org.apache.polygene.api.sideeffect.SideEffects; @Mixins( { HelloWorldBehaviourMixin.class, HelloWorldStateMixin.class } ) @SideEffects( HelloWorldBehaviourSideEffect.class ) public interface HelloWorldComposite - extends HelloWorld, TransientComposite + extends HelloWorld { } // END SNIPPET: solution http://git-wip-us.apache.org/repos/asf/polygene-java/blob/1a1d6443/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial8/HelloWorldComposite.java ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial8/HelloWorldComposite.java b/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial8/HelloWorldComposite.java index 71fca46..fa58aa7 100644 --- a/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial8/HelloWorldComposite.java +++ b/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial8/HelloWorldComposite.java @@ -19,7 +19,6 @@ */ package org.apache.polygene.tutorials.composites.tutorial8; -import org.apache.polygene.api.composite.TransientComposite; import org.apache.polygene.api.mixin.Mixins; // START SNIPPET: solution @@ -30,7 +29,7 @@ import org.apache.polygene.api.mixin.Mixins; */ @Mixins( { HelloWorldBehaviourMixin.class, HelloWorldStateMixin.class } ) public interface HelloWorldComposite - extends HelloWorldBehaviour, HelloWorldState, TransientComposite + extends HelloWorldBehaviour, HelloWorldState { } // END SNIPPET: solution http://git-wip-us.apache.org/repos/asf/polygene-java/blob/1a1d6443/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial9/HelloWorldComposite.java ---------------------------------------------------------------------- diff --git a/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial9/HelloWorldComposite.java b/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial9/HelloWorldComposite.java index 395631e..7654316 100644 --- a/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial9/HelloWorldComposite.java +++ b/tutorials/composites/src/main/java/org/apache/polygene/tutorials/composites/tutorial9/HelloWorldComposite.java @@ -19,7 +19,6 @@ */ package org.apache.polygene.tutorials.composites.tutorial9; -import org.apache.polygene.api.composite.TransientComposite; import org.apache.polygene.api.mixin.Mixins; // START SNIPPET: solution @@ -35,7 +34,7 @@ import org.apache.polygene.api.mixin.Mixins; */ @Mixins( { HelloWorldBehaviourMixin.class, GenericPropertyMixin.class } ) public interface HelloWorldComposite - extends HelloWorldBehaviour, HelloWorldState, TransientComposite + extends HelloWorldBehaviour, HelloWorldState { } // END SNIPPET: solution
