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/07/29 07:58:24 UTC
[1/2] isis git commit: ISIS-1173: menu separators were not appearing
correctly on prototyping menu when the FixtureScriptsSpecificationProvider in
use
Repository: isis
Updated Branches:
refs/heads/master 6dd04ac12 -> ceddc2c5b
ISIS-1173: menu separators were not appearing correctly on prototyping menu when the FixtureScriptsSpecificationProvider in use
Possibly an interaction with fix for ISIS-1175, or more likely just as result of missing annotations in the fallback FixtureScriptsDefault.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1bdd35c7
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1bdd35c7
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1bdd35c7
Branch: refs/heads/master
Commit: 1bdd35c7ae717869b68ab5628d39cba88be0fd90
Parents: 6dd04ac
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 29 06:45:05 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 29 06:45:05 2015 +0100
----------------------------------------------------------------------
.../services/fixturespec/FixtureScriptsDefault.java | 10 +++++++++-
.../runtime/systemusinginstallers/IsisSystemAbstract.java | 3 ++-
2 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/1bdd35c7/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
----------------------------------------------------------------------
diff --git a/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java b/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
index f97e255..d807723 100644
--- a/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
+++ b/core/applib/src/main/java/org/apache/isis/applib/services/fixturespec/FixtureScriptsDefault.java
@@ -60,7 +60,7 @@ import org.apache.isis.applib.fixturescripts.FixtureScripts;
@DomainServiceLayout(
named="Prototyping",
menuBar = DomainServiceLayout.MenuBar.SECONDARY,
- menuOrder = "500"
+ menuOrder = "500.10"
)
public class FixtureScriptsDefault extends FixtureScripts {
@@ -87,6 +87,10 @@ public class FixtureScriptsDefault extends FixtureScripts {
//region > runFixtureScript (using choices as the drop-down policy)
+ @Action(
+ restrictTo = RestrictTo.PROTOTYPING
+ )
+ @MemberOrder(sequence="10")
@Override
public List<FixtureResult> runFixtureScript(
final FixtureScript fixtureScript,
@@ -137,9 +141,13 @@ public class FixtureScriptsDefault extends FixtureScripts {
//endregion
//region > runFixtureScript (using autoComplete as drop-down policy)
+ @Action(
+ restrictTo = RestrictTo.PROTOTYPING
+ )
@ActionLayout(
named = "Run Fixture Script"
)
+ @MemberOrder(sequence="10")
public List<FixtureResult> runFixtureScriptWithAutoComplete(
final FixtureScript fixtureScript,
@ParameterLayout(
http://git-wip-us.apache.org/repos/asf/isis/blob/1bdd35c7/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisSystemAbstract.java
----------------------------------------------------------------------
diff --git a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisSystemAbstract.java b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisSystemAbstract.java
index f4c2a16..53981a7 100644
--- a/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisSystemAbstract.java
+++ b/core/runtime/src/main/java/org/apache/isis/core/runtime/systemusinginstallers/IsisSystemAbstract.java
@@ -179,7 +179,8 @@ public abstract class IsisSystemAbstract extends IsisSystemFixturesHookAbstract
final List<Object> services = obtainServices();
if(!contains(services, FixtureScripts.class)) {
- services.add(new FixtureScriptsDefault());
+ // add to beginning so that appears at top of prototyping menu.
+ services.add(0, new FixtureScriptsDefault());
}
// bind metamodel to the (runtime) framework
[2/2] isis git commit: ISIS-1179: only call defaultXxx(...) once for
action parameters.
Posted by da...@apache.org.
ISIS-1179: only call defaultXxx(...) once for action parameters.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/ceddc2c5
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ceddc2c5
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ceddc2c5
Branch: refs/heads/master
Commit: ceddc2c5b38b449b9f9b0ba7fbc2eec593278447
Parents: 1bdd35c
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Wed Jul 29 06:49:13 2015 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Wed Jul 29 06:49:13 2015 +0100
----------------------------------------------------------------------
.../viewer/wicket/model/models/ScalarModel.java | 21 +++++++++++++++++---
1 file changed, 18 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/ceddc2c5/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
index f3d3310..992aef9 100644
--- a/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
+++ b/core/viewer-wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/models/ScalarModel.java
@@ -232,6 +232,11 @@ public class ScalarModel extends EntityModel implements LinksProvider {
}
@Override
+ public void init(final ScalarModel scalarModel) {
+ reset(scalarModel);
+ }
+
+ @Override
public void reset(ScalarModel scalarModel) {
final OneToOneAssociation property = scalarModel.propertyMemento.getProperty();
final ObjectAdapter associatedAdapter = property.get(scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.CHECK));
@@ -387,6 +392,11 @@ public class ScalarModel extends EntityModel implements LinksProvider {
}
@Override
+ public void init(final ScalarModel scalarModel) {
+ // no-op
+ }
+
+ @Override
public void reset(ScalarModel scalarModel) {
final ObjectActionParameter actionParameter = scalarModel.parameterMemento.getActionParameter();
final ObjectAdapter defaultAdapter = actionParameter.getDefault(scalarModel.parentObjectAdapterMemento.getObjectAdapter(ConcurrencyChecking.NO_CHECK));
@@ -442,6 +452,7 @@ public class ScalarModel extends EntityModel implements LinksProvider {
public abstract int getTypicalLength(ScalarModel scalarModel);
+ public abstract void init(ScalarModel scalarModel);
public abstract void reset(ScalarModel scalarModel);
@@ -472,7 +483,7 @@ public class ScalarModel extends EntityModel implements LinksProvider {
this.parentObjectAdapterMemento = parentObjectAdapterMemento;
this.parameterMemento = apm;
- reset();
+ init();
setMode(Mode.EDIT);
}
@@ -486,15 +497,19 @@ public class ScalarModel extends EntityModel implements LinksProvider {
this.parentObjectAdapterMemento = parentObjectAdapterMemento;
this.propertyMemento = pm;
- reset();
+ init();
setObject(parentObjectAdapterMemento);
setMode(Mode.VIEW);
}
+ private void init() {
+ kind.init(this);
+ }
+
public void reset() {
kind.reset(this);
}
-
+
public ObjectAdapterMemento getParentObjectAdapterMemento() {
return parentObjectAdapterMemento;
}