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 2021/04/13 22:31:45 UTC
[isis-app-helloworld] branch jdo updated: simplifying layouts
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch jdo
in repository https://gitbox.apache.org/repos/asf/isis-app-helloworld.git
The following commit(s) were added to refs/heads/jdo by this push:
new bbe4ecf simplifying layouts
bbe4ecf is described below
commit bbe4ecf9e0f1b6ca293b23122b6f45f2b3e70e3f
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Tue Apr 13 23:30:58 2021 +0100
simplifying layouts
---
.../modules/hello/dom/hwo/HelloWorldObject.java | 7 ++-
.../hello/dom/hwo/HelloWorldObject.layout.xml | 19 ++----
src/main/resources/menubars.layout.xml | 72 +++++-----------------
3 files changed, 27 insertions(+), 71 deletions(-)
diff --git a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
index 5ccce46..3c9127f 100644
--- a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
+++ b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.java
@@ -12,8 +12,10 @@ import org.apache.isis.applib.annotation.ActionLayout;
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.DomainObjectLayout;
import org.apache.isis.applib.annotation.MemberOrder;
+import org.apache.isis.applib.annotation.PropertyLayout;
import org.apache.isis.applib.annotation.Publishing;
import org.apache.isis.applib.annotation.SemanticsOf;
+import org.apache.isis.applib.annotation.Where;
import org.apache.isis.applib.services.message.MessageService;
import org.apache.isis.applib.services.repository.RepositoryService;
import org.apache.isis.applib.services.title.TitleService;
@@ -60,6 +62,7 @@ public class HelloWorldObject implements Comparable<HelloWorldObject> {
@Notes
@MemberOrder(name = "details", sequence = "1")
private String notes;
+ @PropertyLayout(multiLine = 10, hidden = Where.ALL_TABLES)
public String getNotes() {
return notes;
}
@@ -67,11 +70,13 @@ public class HelloWorldObject implements Comparable<HelloWorldObject> {
this.notes = notes;
}
+
@Action(
semantics = SemanticsOf.IDEMPOTENT,
executionPublishing = Publishing.ENABLED,
associateWith = "name"
)
+ @ActionLayout(describedAs = "Updates the object's name")
public HelloWorldObject updateName(
@Name final String name) {
setName(name);
@@ -83,7 +88,7 @@ public class HelloWorldObject implements Comparable<HelloWorldObject> {
@Action(semantics = SemanticsOf.NON_IDEMPOTENT_ARE_YOU_SURE, associateWith = "name")
- @ActionLayout(position = ActionLayout.Position.PANEL)
+ @ActionLayout(position = ActionLayout.Position.PANEL, describedAs = "Deletes this object from the persistent datastore")
public void delete() {
final String title = titleService.titleOf(this);
messageService.informUser(String.format("'%s' deleted", title));
diff --git a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.layout.xml b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.layout.xml
index abe9b03..ec42d19 100644
--- a/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.layout.xml
+++ b/src/main/java/domainapp/modules/hello/dom/hwo/HelloWorldObject.layout.xml
@@ -14,39 +14,28 @@
<bs3:tab name="Identity">
<bs3:row>
<bs3:col span="12">
- <c:fieldSet name="Identity" id="identity">
- <c:action id="delete">
- <c:describedAs>Deletes this object from the persistent datastore</c:describedAs>
- </c:action>
- <c:property id="name" namedEscaped="true">
- <c:action id="updateName">
- <c:describedAs>Updates the object's name</c:describedAs>
- </c:action>
- </c:property>
- </c:fieldSet>
+ <c:fieldSet name="Identity"/>
</bs3:col>
</bs3:row>
</bs3:tab>
<bs3:tab name="Other">
<bs3:row>
<bs3:col span="12">
- <c:fieldSet name="Other" id="other" unreferencedProperties="true"/>
+ <c:fieldSet name="Other" unreferencedProperties="true"/>
</bs3:col>
</bs3:row>
</bs3:tab>
<bs3:tab name="Metadata">
<bs3:row>
<bs3:col span="12">
- <c:fieldSet name="Metadata" id="metadata"/>
+ <c:fieldSet name="Metadata"/>
</bs3:col>
</bs3:row>
</bs3:tab>
</bs3:tabGroup>
</bs3:col>
<bs3:col span="12">
- <c:fieldSet name="" id="details">
- <c:property id="notes" namedEscaped="true" multiLine="10" hidden="ALL_TABLES"/>
- </c:fieldSet>
+ <c:fieldSet name="" id="details"/>
</bs3:col>
</bs3:row>
</bs3:col>
diff --git a/src/main/resources/menubars.layout.xml b/src/main/resources/menubars.layout.xml
index 5235c5d..8d714b9 100644
--- a/src/main/resources/menubars.layout.xml
+++ b/src/main/resources/menubars.layout.xml
@@ -4,15 +4,9 @@
<mb3:menu>
<mb3:named>Hello World Objects</mb3:named>
<mb3:section>
- <mb3:serviceAction objectType="hello.HelloWorldObjects" id="create">
- <cpt:named>Create</cpt:named>
- </mb3:serviceAction>
- <mb3:serviceAction objectType="hello.HelloWorldObjects" id="findByName">
- <cpt:named>Find By Name</cpt:named>
- </mb3:serviceAction>
- <mb3:serviceAction objectType="hello.HelloWorldObjects" id="listAll">
- <cpt:named>List All</cpt:named>
- </mb3:serviceAction>
+ <mb3:serviceAction objectType="hello.HelloWorldObjects" id="create"/>
+ <mb3:serviceAction objectType="hello.HelloWorldObjects" id="findByName"/>
+ <mb3:serviceAction objectType="hello.HelloWorldObjects" id="listAll"/>
</mb3:section>
</mb3:menu>
<mb3:menu unreferencedActions="true">
@@ -24,57 +18,31 @@
<mb3:named>Prototyping</mb3:named>
<mb3:section>
<mb3:named>Layouts</mb3:named>
- <mb3:serviceAction objectType="isis.applib.LayoutServiceMenu" id="downloadLayouts">
- <cpt:named>Download Object Layouts (ZIP)</cpt:named>
- </mb3:serviceAction>
- <mb3:serviceAction objectType="isis.applib.LayoutServiceMenu" id="downloadMenuBarsLayout">
- <cpt:named>Download Menu Bars Layout (XML)</cpt:named>
- </mb3:serviceAction>
+ <mb3:serviceAction objectType="isis.applib.LayoutServiceMenu" id="downloadLayouts"/>
+ <mb3:serviceAction objectType="isis.applib.LayoutServiceMenu" id="downloadMenuBarsLayout"/>
</mb3:section>
<mb3:section>
<mb3:named>Meta Model</mb3:named>
- <mb3:serviceAction objectType="isis.applib.MetaModelServiceMenu" id="downloadMetaModelXml">
- <cpt:named>Download Meta Model (XML)</cpt:named>
- </mb3:serviceAction>
- <mb3:serviceAction objectType="isis.applib.MetaModelServiceMenu" id="downloadMetaModelCsv">
- <cpt:named>Download Meta Model (CSV)</cpt:named>
- </mb3:serviceAction>
+ <mb3:serviceAction objectType="isis.applib.MetaModelServiceMenu" id="downloadMetaModelXml"/>
+ <mb3:serviceAction objectType="isis.applib.MetaModelServiceMenu" id="downloadMetaModelCsv"/>
</mb3:section>
<mb3:section>
<mb3:named>Persistence</mb3:named>
- <mb3:serviceAction objectType="isis.persistence.jdo.JdoMetamodelMenu" id="downloadMetamodels">
- <cpt:named>Download JDO Metamodels (ZIP)</cpt:named>
- </mb3:serviceAction>
- <mb3:serviceAction objectType="isis.ext.h2Console.H2ManagerMenu" id="openH2Console">
- <cpt:named>H2 Console</cpt:named>
- </mb3:serviceAction>
+ <mb3:serviceAction objectType="isis.persistence.jdo.JdoMetamodelMenu" id="downloadMetamodels"/>
+ <mb3:serviceAction objectType="isis.ext.h2Console.H2ManagerMenu" id="openH2Console"/>
</mb3:section>
<mb3:section>
<mb3:named>REST API</mb3:named>
- <mb3:serviceAction objectType="isis.applib.SwaggerServiceMenu" id="openSwaggerUi">
- <cpt:named>Open Swagger Ui</cpt:named>
- </mb3:serviceAction>
- <mb3:serviceAction objectType="isis.applib.SwaggerServiceMenu" id="openRestApi">
- <cpt:named>Open Rest Api</cpt:named>
- </mb3:serviceAction>
- <mb3:serviceAction objectType="isis.applib.SwaggerServiceMenu" id="downloadSwaggerSchemaDefinition">
- <cpt:named>Download Swagger Schema Definition</cpt:named>
- </mb3:serviceAction>
+ <mb3:serviceAction objectType="isis.applib.SwaggerServiceMenu" id="openSwaggerUi"/>
+ <mb3:serviceAction objectType="isis.applib.SwaggerServiceMenu" id="openRestApi"/>
+ <mb3:serviceAction objectType="isis.applib.SwaggerServiceMenu" id="downloadSwaggerSchemaDefinition"/>
</mb3:section>
<mb3:section>
- <mb3:named>Translations</mb3:named>
- <mb3:serviceAction objectType="isis.applib.TranslationServicePoMenu" id="downloadTranslations">
- <cpt:named>Download Translations</cpt:named>
- </mb3:serviceAction>
- <mb3:serviceAction objectType="isis.applib.TranslationServicePoMenu" id="resetTranslationCache">
- <cpt:named>Clear translation cache</cpt:named>
- </mb3:serviceAction>
- <mb3:serviceAction objectType="isis.applib.TranslationServicePoMenu" id="switchToReadingTranslations">
- <cpt:named>Switch To Reading Translations</cpt:named>
- </mb3:serviceAction>
- <mb3:serviceAction objectType="isis.applib.TranslationServicePoMenu" id="switchToWritingTranslations">
- <cpt:named>Switch To Writing Translations</cpt:named>
- </mb3:serviceAction>
+ <mb3:named>i18n</mb3:named>
+ <mb3:serviceAction objectType="isis.applib.TranslationServicePoMenu" id="downloadTranslations"/>
+ <mb3:serviceAction objectType="isis.applib.TranslationServicePoMenu" id="resetTranslationCache"/>
+ <mb3:serviceAction objectType="isis.applib.TranslationServicePoMenu" id="switchToReadingTranslations"/>
+ <mb3:serviceAction objectType="isis.applib.TranslationServicePoMenu" id="switchToWritingTranslations"/>
</mb3:section>
</mb3:menu>
</mb3:secondary>
@@ -86,12 +54,6 @@
<mb3:serviceAction objectType="isis.applib.ConfigurationMenu" id="configuration"/>
</mb3:section>
<mb3:section>
- <mb3:named>Impersonate User</mb3:named>
- <mb3:serviceAction objectType="isis.applib.ImpersonateMenu" id="impersonate"/>
- <mb3:serviceAction objectType="isis.applib.ImpersonateMenu" id="impersonateWithRoles"/>
- <mb3:serviceAction objectType="isis.applib.ImpersonateMenu" id="stopImpersonating"/>
- </mb3:section>
- <mb3:section>
<mb3:serviceAction objectType="isis.security.LogoutMenu" id="logout">
<cpt:named>Logout</cpt:named>
</mb3:serviceAction>