Consistently name Energy4Java instances `polygene` For consistency in documentation snippets and code
Project: http://git-wip-us.apache.org/repos/asf/polygene-java/repo Commit: http://git-wip-us.apache.org/repos/asf/polygene-java/commit/9042a31d Tree: http://git-wip-us.apache.org/repos/asf/polygene-java/tree/9042a31d Diff: http://git-wip-us.apache.org/repos/asf/polygene-java/diff/9042a31d Branch: refs/heads/develop Commit: 9042a31d510c8d9cff5e602b52ecc4c4097bcbe5 Parents: 3fe1108 Author: Paul Merlin <[email protected]> Authored: Mon May 22 19:55:18 2017 +0200 Committer: Paul Merlin <[email protected]> Committed: Mon May 22 19:55:18 2017 +0200 ---------------------------------------------------------------------- .../bootstrap/ApplicationAssemblerTest.java | 6 ++-- .../runtime/structure/MixinVisibilityTest.java | 32 ++++++++++---------- .../polygene/runtime/structure/ModuleTest.java | 4 +-- .../PrivateCompositeVisibilityTest.java | 4 +-- .../runtime/structure/StructureTest.java | 8 ++--- .../unitofwork/PrivateEntityUnitOfWorkTest.java | 4 +-- .../polygene/library/rdf/Model2XMLTest.java | 4 +-- .../PolygeneApplicationFactoryBean.java | 4 +-- .../apache/polygene/sample/forum/web/Main.java | 4 +-- .../java/org/apache/polygene/envisage/Main.java | 4 +-- .../envisage/school/EnvisageSchoolSample.java | 4 +-- 11 files changed, 39 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9042a31d/core/runtime/src/test/java/org/apache/polygene/bootstrap/ApplicationAssemblerTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/bootstrap/ApplicationAssemblerTest.java b/core/runtime/src/test/java/org/apache/polygene/bootstrap/ApplicationAssemblerTest.java index f924408..eb58551 100644 --- a/core/runtime/src/test/java/org/apache/polygene/bootstrap/ApplicationAssemblerTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/bootstrap/ApplicationAssemblerTest.java @@ -41,9 +41,9 @@ public class ApplicationAssemblerTest public void testApplicationAssembler() throws AssemblyException { - Energy4Java is = new Energy4Java(); + Energy4Java polygene = new Energy4Java(); - ApplicationDescriptor model = is.newApplicationModel( new ApplicationAssembler() + ApplicationDescriptor model = polygene.newApplicationModel( new ApplicationAssembler() { @Override public ApplicationAssembly assemble( ApplicationAssemblyFactory applicationFactory ) @@ -98,7 +98,7 @@ public class ApplicationAssemblerTest return true; } } ); - model.newInstance( is.spi() ); + model.newInstance( polygene.spi() ); } interface TestService http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9042a31d/core/runtime/src/test/java/org/apache/polygene/runtime/structure/MixinVisibilityTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/structure/MixinVisibilityTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/structure/MixinVisibilityTest.java index eaf9794..f64cf1e 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/structure/MixinVisibilityTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/structure/MixinVisibilityTest.java @@ -49,7 +49,7 @@ public class MixinVisibilityTest public void testMixinInModuleIsVisible() throws Exception { - Energy4Java boot = new Energy4Java(); + Energy4Java polygene = new Energy4Java(); Assembler[][][] assemblers = new Assembler[][][] { { // Layer @@ -68,7 +68,7 @@ public class MixinVisibilityTest } }; - Application app = boot.newApplication( new ApplicationAssemblerAdapter( assemblers ) + Application app = polygene.newApplication( new ApplicationAssemblerAdapter( assemblers ) { } ); app.activate(); @@ -81,7 +81,7 @@ public class MixinVisibilityTest public void testMultipleMixinsInModuleWillFail() throws Exception { - Energy4Java boot = new Energy4Java(); + Energy4Java polygene = new Energy4Java(); Assembler[][][] assemblers = new Assembler[][][] { { // Layer @@ -100,7 +100,7 @@ public class MixinVisibilityTest } }; - Application app = boot.newApplication( new ApplicationAssemblerAdapter( assemblers ) + Application app = polygene.newApplication( new ApplicationAssemblerAdapter( assemblers ) { } ); app.activate(); @@ -113,7 +113,7 @@ public class MixinVisibilityTest public void testMixinInLayerIsNotVisible() throws Exception { - Energy4Java boot = new Energy4Java(); + Energy4Java polygene = new Energy4Java(); Assembler[][][] assemblers = new Assembler[][][] { { // Layer @@ -142,7 +142,7 @@ public class MixinVisibilityTest } }; - Application app = boot.newApplication( new ApplicationAssemblerAdapter( assemblers ) + Application app = polygene.newApplication( new ApplicationAssemblerAdapter( assemblers ) { } ); app.activate(); @@ -155,7 +155,7 @@ public class MixinVisibilityTest public void testMixinInLayerIsVisible() throws Exception { - Energy4Java boot = new Energy4Java(); + Energy4Java polygene = new Energy4Java(); Assembler[][][] assemblers = new Assembler[][][] { { // Layer @@ -184,7 +184,7 @@ public class MixinVisibilityTest } }; - Application app = boot.newApplication( new ApplicationAssemblerAdapter( assemblers ) + Application app = polygene.newApplication( new ApplicationAssemblerAdapter( assemblers ) { } ); app.activate(); @@ -197,7 +197,7 @@ public class MixinVisibilityTest public void testMultipleMixinsInLayerWillFailSameModule() throws Exception { - Energy4Java boot = new Energy4Java(); + Energy4Java polygene = new Energy4Java(); Assembler[][][] assemblers = new Assembler[][][] { { // Layer @@ -227,7 +227,7 @@ public class MixinVisibilityTest } }; - Application app = boot.newApplication( new ApplicationAssemblerAdapter( assemblers ) + Application app = polygene.newApplication( new ApplicationAssemblerAdapter( assemblers ) { } ); app.activate(); @@ -240,7 +240,7 @@ public class MixinVisibilityTest public void testMultipleMixinsInLayerWillFailDiffModule() throws Exception { - Energy4Java boot = new Energy4Java(); + Energy4Java polygene = new Energy4Java(); Assembler[][][] assemblers = new Assembler[][][] { { // Layer @@ -280,7 +280,7 @@ public class MixinVisibilityTest } }; - Application app = boot.newApplication( new ApplicationAssemblerAdapter( assemblers ) + Application app = polygene.newApplication( new ApplicationAssemblerAdapter( assemblers ) { } ); app.activate(); @@ -295,7 +295,7 @@ public class MixinVisibilityTest throws Exception { - Energy4Java boot = new Energy4Java(); + Energy4Java polygene = new Energy4Java(); Assembler[][][] assemblers = new Assembler[][][] { { // Layer 1 @@ -326,7 +326,7 @@ public class MixinVisibilityTest } }; - Application app = boot.newApplication( new ApplicationAssemblerAdapter( assemblers ) + Application app = polygene.newApplication( new ApplicationAssemblerAdapter( assemblers ) { } ); app.activate(); @@ -339,7 +339,7 @@ public class MixinVisibilityTest public void testMixinInLowerLayerIsVisible() throws Exception { - Energy4Java boot = new Energy4Java(); + Energy4Java polygene = new Energy4Java(); Assembler[][][] assemblers = new Assembler[][][] { { // Layer 1 @@ -370,7 +370,7 @@ public class MixinVisibilityTest } }; - Application app = boot.newApplication( new ApplicationAssemblerAdapter( assemblers ) + Application app = polygene.newApplication( new ApplicationAssemblerAdapter( assemblers ) { } ); app.activate(); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9042a31d/core/runtime/src/test/java/org/apache/polygene/runtime/structure/ModuleTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/structure/ModuleTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/structure/ModuleTest.java index aeb9fb7..83897e4 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/structure/ModuleTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/structure/ModuleTest.java @@ -47,8 +47,8 @@ public class ModuleTest public Application givenFixture1() throws AssemblyException { - Energy4Java boot = new Energy4Java(); - return boot.newApplication( new ApplicationAssembler() + Energy4Java polygene = new Energy4Java(); + return polygene.newApplication( new ApplicationAssembler() { public ApplicationAssembly assemble( ApplicationAssemblyFactory applicationFactory ) throws AssemblyException http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9042a31d/core/runtime/src/test/java/org/apache/polygene/runtime/structure/PrivateCompositeVisibilityTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/structure/PrivateCompositeVisibilityTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/structure/PrivateCompositeVisibilityTest.java index 8991605..0c21195 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/structure/PrivateCompositeVisibilityTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/structure/PrivateCompositeVisibilityTest.java @@ -43,7 +43,7 @@ public class PrivateCompositeVisibilityTest public void testPrivateCompositeVisibility() throws Exception { - Energy4Java boot = new Energy4Java(); + Energy4Java polygene = new Energy4Java(); Assembler[][][] assemblers = new Assembler[][][] { { // Layer @@ -55,7 +55,7 @@ public class PrivateCompositeVisibilityTest } } }; - Application app = boot.newApplication( new ApplicationAssemblerAdapter( assemblers ) + Application app = polygene.newApplication( new ApplicationAssemblerAdapter( assemblers ) { } ); app.activate(); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9042a31d/core/runtime/src/test/java/org/apache/polygene/runtime/structure/StructureTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/structure/StructureTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/structure/StructureTest.java index 5dec9df..e43f752 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/structure/StructureTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/structure/StructureTest.java @@ -41,8 +41,8 @@ public class StructureTest public void createApplicationUsingApplicationAssembly() throws AssemblyException { - Energy4Java boot = new Energy4Java(); - boot.newApplication( new ApplicationAssembler() + Energy4Java polygene = new Energy4Java(); + polygene.newApplication( new ApplicationAssembler() { public ApplicationAssembly assemble( ApplicationAssemblyFactory applicationFactory ) throws AssemblyException @@ -67,7 +67,7 @@ public class StructureTest public void createApplicationUsingArrayOfAssemblers() throws AssemblyException { - Energy4Java boot = new Energy4Java(); + Energy4Java polygene = new Energy4Java(); Assembler[][][] assemblers = new Assembler[][][] { { // User Interface layer @@ -92,7 +92,7 @@ public class StructureTest } }; - boot.newApplication( new ApplicationAssemblerAdapter( assemblers ) + polygene.newApplication( new ApplicationAssemblerAdapter( assemblers ) { } ); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9042a31d/core/runtime/src/test/java/org/apache/polygene/runtime/unitofwork/PrivateEntityUnitOfWorkTest.java ---------------------------------------------------------------------- diff --git a/core/runtime/src/test/java/org/apache/polygene/runtime/unitofwork/PrivateEntityUnitOfWorkTest.java b/core/runtime/src/test/java/org/apache/polygene/runtime/unitofwork/PrivateEntityUnitOfWorkTest.java index 21fbe92..630ccca 100644 --- a/core/runtime/src/test/java/org/apache/polygene/runtime/unitofwork/PrivateEntityUnitOfWorkTest.java +++ b/core/runtime/src/test/java/org/apache/polygene/runtime/unitofwork/PrivateEntityUnitOfWorkTest.java @@ -62,8 +62,8 @@ public class PrivateEntityUnitOfWorkTest { System.setProperty( "polygene.compacttrace", "off" ); - Energy4Java is = new Energy4Java(); - Application app = is.newApplication( + Energy4Java polygene = new Energy4Java(); + Application app = polygene.newApplication( applicationFactory -> applicationFactory.newApplicationAssembly( new Assembler[][][]{ { http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9042a31d/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/Model2XMLTest.java ---------------------------------------------------------------------- diff --git a/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/Model2XMLTest.java b/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/Model2XMLTest.java index 4b5b542..3e652d5 100644 --- a/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/Model2XMLTest.java +++ b/libraries/rdf/src/test/java/org/apache/polygene/library/rdf/Model2XMLTest.java @@ -41,8 +41,8 @@ public class Model2XMLTest @Test public void testModel2XML() throws AssemblyException, TransformerException { - Energy4Java is = new Energy4Java( ); - ApplicationDescriptor model = is.newApplicationModel( new ApplicationAssembler() + Energy4Java polygene = new Energy4Java( ); + ApplicationDescriptor model = polygene.newApplicationModel( new ApplicationAssembler() { @Override public ApplicationAssembly assemble( ApplicationAssemblyFactory applicationFactory ) throws AssemblyException http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9042a31d/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/application/PolygeneApplicationFactoryBean.java ---------------------------------------------------------------------- diff --git a/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/application/PolygeneApplicationFactoryBean.java b/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/application/PolygeneApplicationFactoryBean.java index cbca71e..db1d623 100644 --- a/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/application/PolygeneApplicationFactoryBean.java +++ b/libraries/spring/src/main/java/org/apache/polygene/library/spring/bootstrap/internal/application/PolygeneApplicationFactoryBean.java @@ -84,10 +84,10 @@ public final class PolygeneApplicationFactoryBean private Application createApplication() { - Energy4Java energy4Java = new Energy4Java(); + Energy4Java polygene = new Energy4Java(); try { - return energy4Java.newApplication( + return polygene.newApplication( factory -> { ApplicationAssembly applicationAssembly = factory.newApplicationAssembly(); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9042a31d/samples/forum/src/test/java/org/apache/polygene/sample/forum/web/Main.java ---------------------------------------------------------------------- diff --git a/samples/forum/src/test/java/org/apache/polygene/sample/forum/web/Main.java b/samples/forum/src/test/java/org/apache/polygene/sample/forum/web/Main.java index 102da80..f10653f 100644 --- a/samples/forum/src/test/java/org/apache/polygene/sample/forum/web/Main.java +++ b/samples/forum/src/test/java/org/apache/polygene/sample/forum/web/Main.java @@ -38,11 +38,11 @@ public class Main public static void main( String[] args ) throws Exception { - Energy4Java is = new Energy4Java( ); + Energy4Java polygene = new Energy4Java( ); Server server = new Server( Protocol.HTTP, 8888 ); - Application app = is.newApplication( new ForumAssembler(), new MetadataService() ); + Application app = polygene.newApplication( new ForumAssembler(), new MetadataService() ); app.activate(); http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9042a31d/tools/envisage/src/main/java/org/apache/polygene/envisage/Main.java ---------------------------------------------------------------------- diff --git a/tools/envisage/src/main/java/org/apache/polygene/envisage/Main.java b/tools/envisage/src/main/java/org/apache/polygene/envisage/Main.java index 27521ce..96a4e3a 100644 --- a/tools/envisage/src/main/java/org/apache/polygene/envisage/Main.java +++ b/tools/envisage/src/main/java/org/apache/polygene/envisage/Main.java @@ -38,9 +38,9 @@ public class Main Class applicationAssemblerClass = Class.forName( applicationAssemblerName ); ApplicationAssembler assembler = (ApplicationAssembler) applicationAssemblerClass.newInstance(); - Energy4Java energy4Java = new Energy4Java(); + Energy4Java polygene = new Energy4Java(); - ApplicationDescriptor application = energy4Java.newApplicationModel( assembler ); + ApplicationDescriptor application = polygene.newApplicationModel( assembler ); new Envisage().run( application ); } http://git-wip-us.apache.org/repos/asf/polygene-java/blob/9042a31d/tools/envisage/src/test/java/org/apache/polygene/envisage/school/EnvisageSchoolSample.java ---------------------------------------------------------------------- diff --git a/tools/envisage/src/test/java/org/apache/polygene/envisage/school/EnvisageSchoolSample.java b/tools/envisage/src/test/java/org/apache/polygene/envisage/school/EnvisageSchoolSample.java index 9dbefcc..66fcec8 100644 --- a/tools/envisage/src/test/java/org/apache/polygene/envisage/school/EnvisageSchoolSample.java +++ b/tools/envisage/src/test/java/org/apache/polygene/envisage/school/EnvisageSchoolSample.java @@ -30,9 +30,9 @@ public class EnvisageSchoolSample // START SNIPPET: envisage public static void main( String[] args ) { - Energy4Java energy4Java = new Energy4Java(); + Energy4Java polygene = new Energy4Java(); ApplicationAssembler assembler = new SchoolAssembler(); - ApplicationDescriptor descriptor = energy4Java.newApplicationModel( assembler ); + ApplicationDescriptor descriptor = polygene.newApplicationModel( assembler ); new Envisage().run( descriptor ); } // END SNIPPET: envisage
