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 2017/12/01 09:18:51 UTC
[isis] branch master updated: ISIS-1784: renames EnumWith and
toFixtureScript to PersonaWith and toBuilderScript
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 03acbe2 ISIS-1784: renames EnumWith and toFixtureScript to PersonaWith and toBuilderScript
03acbe2 is described below
commit 03acbe20d2b6e6346c7b6fcbb7a8f7321067e035
Author: Dan Haywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Dec 1 09:18:06 2017 +0000
ISIS-1784: renames EnumWith and toFixtureScript to PersonaWith and toBuilderScript
---
.../apache/isis/applib/fixturescripts/BuilderScriptAbstract.java | 4 ++--
.../apache/isis/applib/fixturescripts/EnumWithBuilderScript.java | 8 --------
.../org/apache/isis/applib/fixturescripts/FixtureScripts.java | 1 -
.../isis/applib/fixturescripts/PersonaWithBuilderScript.java | 8 ++++++++
.../{EnumWithFinder.java => PersonaWithFinder.java} | 2 +-
5 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/BuilderScriptAbstract.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/BuilderScriptAbstract.java
index 948fb23..5ad0fab 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/BuilderScriptAbstract.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/BuilderScriptAbstract.java
@@ -73,13 +73,13 @@ public abstract class BuilderScriptAbstract<T,F extends BuilderScriptAbstract<T,
public abstract T getObject();
- public <E extends EnumWithBuilderScript<T, F>, T, F extends BuilderScriptAbstract<T,F>> T objectFor(
+ public <E extends PersonaWithBuilderScript<T, F>, T, F extends BuilderScriptAbstract<T,F>> T objectFor(
final E datum,
final FixtureScript.ExecutionContext ec) {
if(datum == null) {
return null;
}
- final F fixtureScript = datum.toFixtureScript();
+ final F fixtureScript = datum.toBuilderScript();
return ec.executeChildT(this, fixtureScript).getObject();
}
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/EnumWithBuilderScript.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/EnumWithBuilderScript.java
deleted file mode 100644
index b2e211b..0000000
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/EnumWithBuilderScript.java
+++ /dev/null
@@ -1,8 +0,0 @@
-package org.apache.isis.applib.fixturescripts;
-
-public interface EnumWithBuilderScript<T, F extends BuilderScriptAbstract<T,F>> {
-
- F toFixtureScript();
-
-}
-
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 bfd73f6..6defa2b 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
@@ -56,7 +56,6 @@ import org.apache.isis.applib.util.ObjectContracts;
*/
public abstract class FixtureScripts extends AbstractService {
-
//region > Specification, nonPersistedObjectsStrategy, multipleExecutionStrategy enums
/**
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/PersonaWithBuilderScript.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/PersonaWithBuilderScript.java
new file mode 100644
index 0000000..f0f8184
--- /dev/null
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/PersonaWithBuilderScript.java
@@ -0,0 +1,8 @@
+package org.apache.isis.applib.fixturescripts;
+
+public interface PersonaWithBuilderScript<T, F extends BuilderScriptAbstract<T,F>> {
+
+ F toBuilderScript();
+
+}
+
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/EnumWithFinder.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/PersonaWithFinder.java
similarity index 81%
rename from core/applib/src/main/java/org/apache/isis/applib/fixturescripts/EnumWithFinder.java
rename to core/applib/src/main/java/org/apache/isis/applib/fixturescripts/PersonaWithFinder.java
index b9ecc3e..a8f0d03 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/EnumWithFinder.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/PersonaWithFinder.java
@@ -2,7 +2,7 @@ package org.apache.isis.applib.fixturescripts;
import org.apache.isis.applib.services.registry.ServiceRegistry2;
-public interface EnumWithFinder<T> {
+public interface PersonaWithFinder<T> {
T findUsing(final ServiceRegistry2 serviceRegistry);
--
To stop receiving notification emails like this one, please contact
['"commits@isis.apache.org" <co...@isis.apache.org>'].