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 2019/01/11 09:32:18 UTC
[isis] 03/03: ISIS-2072: renames SimpleObjectMenu to SimpleObjects
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
commit 26c2e61e49fd2bb769549e545d9e7c1c2d6a5902
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Jan 11 09:28:06 2019 +0000
ISIS-2072: renames SimpleObjectMenu to SimpleObjects
---
.../java/domainapp/application/manifest/menubars.layout.xml | 6 +++---
.../java/domainapp/modules/simple/dom/impl/SimpleObjects.java | 7 ++++---
...ObjectMenu_IntegTest.java => SimpleObjects_IntegTest.java} | 11 ++++++-----
.../{SimpleObjectMenuGlue.java => SimpleObjectsGlue.java} | 2 +-
4 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/menubars.layout.xml b/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/menubars.layout.xml
index a2fe922..5b80dc9 100644
--- a/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/menubars.layout.xml
+++ b/example/application/simpleapp/application/src/main/java/domainapp/application/manifest/menubars.layout.xml
@@ -22,13 +22,13 @@
<mb3:menu>
<mb3:named>Simple Objects</mb3:named>
<mb3:section>
- <mb3:serviceAction objectType="simple.SimpleObjectMenu" id="create">
+ <mb3:serviceAction objectType="simple.SimpleObjects" id="create">
<cpt:named>Create</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="simple.SimpleObjectMenu" id="findByName">
+ <mb3:serviceAction objectType="simple.SimpleObjects" id="findByName">
<cpt:named>Find By Name</cpt:named>
</mb3:serviceAction>
- <mb3:serviceAction objectType="simple.SimpleObjectMenu" id="listAll">
+ <mb3:serviceAction objectType="simple.SimpleObjects" id="listAll">
<cpt:named>List All</cpt:named>
</mb3:serviceAction>
</mb3:section>
diff --git a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
index 5aa77cf..3695151 100644
--- a/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
+++ b/example/application/simpleapp/module-simple/src/main/java/domainapp/modules/simple/dom/impl/SimpleObjects.java
@@ -31,6 +31,7 @@ import org.apache.isis.applib.annotation.MemberOrder;
import org.apache.isis.applib.annotation.NatureOfService;
import org.apache.isis.applib.annotation.ParameterLayout;
import org.apache.isis.applib.annotation.Programmatic;
+import org.apache.isis.applib.annotation.PromptStyle;
import org.apache.isis.applib.annotation.SemanticsOf;
import org.apache.isis.applib.services.eventbus.ActionDomainEvent;
import org.apache.isis.applib.services.jdosupport.IsisJdoSupport;
@@ -38,11 +39,10 @@ import org.apache.isis.applib.services.repository.RepositoryService;
@DomainService(
nature = NatureOfService.VIEW_MENU_ONLY,
- objectType = "simple.SimpleObjectMenu",
+ objectType = "simple.SimpleObjects",
repositoryFor = SimpleObject.class
)
@DomainServiceLayout(
- named = "Simple Objects",
menuOrder = "10"
)
public class SimpleObjects {
@@ -56,7 +56,7 @@ public class SimpleObjects {
@Action(semantics = SemanticsOf.SAFE)
- @ActionLayout(bookmarking = BookmarkPolicy.AS_ROOT)
+ @ActionLayout(bookmarking = BookmarkPolicy.AS_ROOT, promptStyle = PromptStyle.DIALOG_SIDEBAR)
@MemberOrder(sequence = "2")
public List<SimpleObject> findByName(
@ParameterLayout(named="Name")
@@ -93,6 +93,7 @@ public class SimpleObjects {
public static class CreateDomainEvent extends ActionDomainEvent<SimpleObjects> {}
@Action(domainEvent = CreateDomainEvent.class)
+ @ActionLayout(promptStyle = PromptStyle.DIALOG_MODAL)
@MemberOrder(sequence = "3")
public SimpleObject create(
@ParameterLayout(named="Name")
diff --git a/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjectMenu_IntegTest.java b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
similarity index 94%
rename from example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjectMenu_IntegTest.java
rename to example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
index 02ab891..4300580 100644
--- a/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjectMenu_IntegTest.java
+++ b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/integtests/tests/SimpleObjects_IntegTest.java
@@ -36,9 +36,12 @@ import domainapp.modules.simple.fixture.SimpleObject_persona;
import domainapp.modules.simple.integtests.SimpleModuleIntegTestAbstract;
import static org.assertj.core.api.Assertions.assertThat;
-public class SimpleObjectMenu_IntegTest extends SimpleModuleIntegTestAbstract {
+public class SimpleObjects_IntegTest extends SimpleModuleIntegTestAbstract {
- public static class ListAll extends SimpleObjectMenu_IntegTest {
+ @Inject
+ SimpleObjects menu;
+
+ public static class ListAll extends SimpleObjects_IntegTest {
@Test
public void happyCase() {
@@ -65,7 +68,7 @@ public class SimpleObjectMenu_IntegTest extends SimpleModuleIntegTestAbstract {
}
}
- public static class Create extends SimpleObjectMenu_IntegTest {
+ public static class Create extends SimpleObjects_IntegTest {
@Test
public void happyCase() {
@@ -113,7 +116,5 @@ public class SimpleObjectMenu_IntegTest extends SimpleModuleIntegTestAbstract {
}
}
- @Inject
- SimpleObjects menu;
}
\ No newline at end of file
diff --git a/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/specglue/SimpleObjectMenuGlue.java b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/specglue/SimpleObjectsGlue.java
similarity index 96%
rename from example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/specglue/SimpleObjectMenuGlue.java
rename to example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/specglue/SimpleObjectsGlue.java
index cfa78b7..cba8ae0 100644
--- a/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/specglue/SimpleObjectMenuGlue.java
+++ b/example/application/simpleapp/module-simple/src/test/java/domainapp/modules/simple/specglue/SimpleObjectsGlue.java
@@ -30,7 +30,7 @@ import domainapp.modules.simple.dom.impl.SimpleObjects;
import static org.hamcrest.CoreMatchers.is;
import static org.junit.Assert.assertThat;
-public class SimpleObjectMenuGlue extends CukeGlueAbstract2 {
+public class SimpleObjectsGlue extends CukeGlueAbstract2 {
@Given("^there are.* (\\d+) simple objects$")
public void there_are_N_simple_objects(int n) throws Throwable {