You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2015/08/13 15:02:44 UTC
[2/2] isis git commit: ISIS-1173: making additional methods of
FixtureScripts public so can be invoked programmatically.
ISIS-1173: making additional methods of FixtureScripts public so can be invoked programmatically.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/04b3f0ec
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/04b3f0ec
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/04b3f0ec
Branch: refs/heads/master
Commit: 04b3f0ec81a65f58561855b1c8c69c4d13177e6f
Parents: 9ebdbfc
Author: Jeroen van der Wal <je...@stromboli.it>
Authored: Thu Aug 13 14:24:05 2015 +0200
Committer: Jeroen van der Wal <je...@stromboli.it>
Committed: Thu Aug 13 14:24:05 2015 +0200
----------------------------------------------------------------------
.../applib/fixturescripts/FixtureScripts.java | 23 ++++++++++----------
1 file changed, 12 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/04b3f0ec/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScripts.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScripts.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScripts.java
index e8c2292..600faeb 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScripts.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/FixtureScripts.java
@@ -246,7 +246,8 @@ public abstract class FixtureScripts extends AbstractService {
//region > fixtureScriptList (lazily built)
private List<FixtureScript> fixtureScriptList;
- private List<FixtureScript> getFixtureScriptList() {
+ @Programmatic
+ public List<FixtureScript> getFixtureScriptList() {
if(fixtureScriptList == null) {
fixtureScriptList = findAndInstantiateFixtureScripts();
}
@@ -372,6 +373,16 @@ public abstract class FixtureScripts extends AbstractService {
}
return null;
}
+
+ @Programmatic
+ public FixtureScript.ExecutionContext newExecutionContext(final String parameters) {
+ final ExecutionParameters executionParameters =
+ executionParametersService != null
+ ? executionParametersService.newExecutionParameters(parameters)
+ : new ExecutionParameters(parameters);
+ return FixtureScript.ExecutionContext.create(executionParameters, this);
+ }
+
//endregion
//region > hooks
@@ -389,16 +400,6 @@ public abstract class FixtureScripts extends AbstractService {
return null;
}
- /**
- * Optional hook.
- */
- protected FixtureScript.ExecutionContext newExecutionContext(final String parameters) {
- final ExecutionParameters executionParameters =
- executionParametersService != null
- ? executionParametersService.newExecutionParameters(parameters)
- : new ExecutionParameters(parameters);
- return FixtureScript.ExecutionContext.create(executionParameters, this);
- }
//endregion