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 2014/05/13 09:12:56 UTC
git commit: ISIS-776: more FixtureScript API simplifications
Repository: isis
Updated Branches:
refs/heads/master 0a24c846d -> 1b1f9ff68
ISIS-776: more FixtureScript API simplifications
adding no-arg constructors for SimpleFixtureScript and CompositeFixtureScript
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1b1f9ff6
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1b1f9ff6
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1b1f9ff6
Branch: refs/heads/master
Commit: 1b1f9ff6878cc353545b4acab786b5c5adbcc504
Parents: 0a24c84
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue May 13 08:06:19 2014 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue May 13 08:06:19 2014 +0100
----------------------------------------------------------------------
.../applib/fixturescripts/CompositeFixtureScript.java | 13 +++++++++++++
.../applib/fixturescripts/SimpleFixtureScript.java | 12 ++++++++++++
2 files changed, 25 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/1b1f9ff6/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/CompositeFixtureScript.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/CompositeFixtureScript.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/CompositeFixtureScript.java
index 776c931..c60ac3f 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/CompositeFixtureScript.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/CompositeFixtureScript.java
@@ -23,6 +23,7 @@ import java.util.List;
import com.google.common.collect.Lists;
import org.apache.isis.applib.annotation.Named;
+import org.apache.isis.applib.fixturescripts.FixtureScript.Discoverability;
@Named("Composite Script")
public abstract class CompositeFixtureScript extends FixtureScript {
@@ -32,6 +33,18 @@ public abstract class CompositeFixtureScript extends FixtureScript {
}
/**
+ * Initializes a {@link Discoverability#DISCOVERABLE} fixture, with
+ * {@link #getFriendlyName()} and {@link #getLocalName()} derived from the class name.
+ *
+ * <p>
+ * Use {@link #setDiscoverability(Discoverability)} to override.
+ */
+ public CompositeFixtureScript() {
+ this(null, null);
+ }
+
+
+ /**
* Initializes a {@link Discoverability#DISCOVERABLE} fixture.
*
* <p>
http://git-wip-us.apache.org/repos/asf/isis/blob/1b1f9ff6/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/SimpleFixtureScript.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/SimpleFixtureScript.java b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/SimpleFixtureScript.java
index c085d55..ff28d92 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/SimpleFixtureScript.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/fixturescripts/SimpleFixtureScript.java
@@ -20,6 +20,7 @@ package org.apache.isis.applib.fixturescripts;
import org.apache.isis.applib.annotation.Named;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.fixturescripts.FixtureScript.Discoverability;
@Named("Simple Script")
public abstract class SimpleFixtureScript extends FixtureScript {
@@ -29,6 +30,17 @@ public abstract class SimpleFixtureScript extends FixtureScript {
}
/**
+ * Initializes a {@link Discoverability#NON_DISCOVERABLE} fixture, with
+ * {@link #getFriendlyName()} and {@link #getLocalName()} derived from the class name.
+ *
+ * <p>
+ * Use {@link #setDiscoverability(Discoverability)} to override.
+ */
+ public SimpleFixtureScript() {
+ this(null, null);
+ }
+
+ /**
* Initializes a {@link Discoverability#NON_DISCOVERABLE} fixture.
*
* <p>