isis-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From danhayw...@apache.org
Subject [isis] 04/06: ISIS-2222: removes title property for ActionLayout and PropertyLayout VM's
Date Wed, 01 Jul 2020 06:04:49 GMT
This is an automated email from the ASF dual-hosted git repository.

danhaywood pushed a commit to branch ISIS-2222
in repository https://gitbox.apache.org/repos/asf/isis.git

commit 24eed518a589e6afdfb9d0c79406f4228adce209
Author: danhaywood <dan@haywood-associates.co.uk>
AuthorDate: Wed Jul 1 06:30:53 2020 +0100

    ISIS-2222: removes title property for ActionLayout and PropertyLayout VM's
---
 .../dom/ActionLayout/position/ActionLayoutPositionVm.java  |  2 +-
 .../position/ActionLayoutPositionVm.layout.xml             |  2 +-
 .../promptStyle/ActionLayoutPromptStyleVm.java             |  8 +++-----
 .../promptStyle/ActionLayoutPromptStyleVm.layout.xml       |  3 +--
 .../PropertyLayout/cssClass/PropertyLayoutCssClassVm.java  | 14 +++-----------
 .../cssClass/PropertyLayoutCssClassVm.layout.xml           |  6 ++----
 .../dom/PropertyLayout/named/PropertyLayoutNamedVm.java    | 12 ++----------
 .../PropertyLayout/named/PropertyLayoutNamedVm.layout.xml  |  5 +----
 .../domain/src/main/resources/static/css/application.css   |  7 +++++++
 9 files changed, 21 insertions(+), 38 deletions(-)

diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm.java
b/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm.java
index 271d788..18f7f8e 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm.java
@@ -48,7 +48,7 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 public class ActionLayoutPositionVm implements HasAsciiDocDescription {
 
     public String title() {
-        return "Demonstrates: ActionLayout#position";
+        return "ActionLayout#position";
     }
 
     @Property(optionality = Optionality.OPTIONAL)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm.layout.xml
b/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm.layout.xml
index 8580ed6..298cb05 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/position/ActionLayoutPositionVm.layout.xml
@@ -41,7 +41,7 @@
 			<cpt:fieldSet name="Description" id="description" >
 				<cpt:action id="clearHints" position="PANEL" />
 				<cpt:action id="downloadLayoutXml"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="rebuildMetamodel"  position="PANEL"/>
+				<cpt:action id="rebuildMetamodel"  position="PANEL_DROPDOWN"/>
 				<cpt:action id="downloadMetamodelXml"  position="PANEL_DROPDOWN"/>
 				<cpt:action id="inspectMetamodel"  position="PANEL_DROPDOWN"/>
 				<cpt:action id="downloadJdoMetadata"  position="PANEL_DROPDOWN"/>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.java
b/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.java
index 5d9ece0..f52323f 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.java
@@ -48,13 +48,11 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 )
 public class ActionLayoutPromptStyleVm implements HasAsciiDocDescription {
 
-//end::class[]
-    public ActionLayoutPromptStyleVm() {
-        this.title = "ActionLayout#promptStyle";
+    public String title() {
+        return "ActionLayout#promptStyle";
     }
 
-//tag::class[]
-    @Title(prepend = "Demonstrates: ")
+    @Title
     @Property(editing = Editing.DISABLED)
     @MemberOrder(name = "general", sequence = "1")
     @XmlElement(required = true)
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.layout.xml
b/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.layout.xml
index c9cadf5..d342fa6 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/ActionLayout/promptStyle/ActionLayoutPromptStyleVm.layout.xml
@@ -17,7 +17,6 @@
 
 	<bs3:row>
 		<bs3:col span="6">
-			<cpt:fieldSet name="General" id="general"/>
 			<cpt:fieldSet name="Annotated" id="annotated"/>
 			<cpt:fieldSet name="Layout" id="layout">
 				<cpt:property id="readOnlyProperty3">
@@ -38,7 +37,7 @@
 			<cpt:fieldSet name="Description" id="description" >
 				<cpt:action id="clearHints" position="PANEL" />
 				<cpt:action id="downloadLayoutXml"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="rebuildMetamodel"  position="PANEL"/>
+				<cpt:action id="rebuildMetamodel"  position="PANEL_DROPDOWN"/>
 				<cpt:action id="downloadMetamodelXml"  position="PANEL_DROPDOWN"/>
 				<cpt:action id="inspectMetamodel"  position="PANEL_DROPDOWN"/>
 				<cpt:action id="downloadJdoMetadata"  position="PANEL_DROPDOWN"/>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/cssClass/PropertyLayoutCssClassVm.java
b/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/cssClass/PropertyLayoutCssClassVm.java
index 9097e17..9f6ebd9 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/cssClass/PropertyLayoutCssClassVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/cssClass/PropertyLayoutCssClassVm.java
@@ -51,18 +51,10 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 )
 public class PropertyLayoutCssClassVm implements HasAsciiDocDescription {
 
-//end::class[]
-    public PropertyLayoutCssClassVm() {
-        this.title = "PropertyLayout#cssClass";
+    public String title() {
+        return "PropertyLayout#cssClass";
     }
 
-//tag::class[]
-    @Title
-    @Property(editing = Editing.DISABLED)
-    @XmlElement(required = true)
-    @Getter @Setter
-    private String title;
-
     @Property(optionality = Optionality.OPTIONAL)
     @PropertyLayout(cssClass = "red", describedAs = "@PropertyLayout(cssClass=\"red\")",
hidden = Where.ALL_TABLES)
     @MemberOrder(name = "properties", sequence = "1")
@@ -71,7 +63,7 @@ public class PropertyLayoutCssClassVm implements HasAsciiDocDescription
{
     private String propertyUsingAnnotation;
 
     @Property(optionality = Optionality.OPTIONAL)
-    @PropertyLayout(describedAs = "<cpt:property id=\"...\" cssClass=\"red\")/>", hidden
= Where.ALL_TABLES)
+    @PropertyLayout(describedAs = "<cpt:property id=\"...\" cssClass=\"red\"/>", hidden
= Where.ALL_TABLES)
     @MemberOrder(name = "properties", sequence = "2")
     @XmlElement(required = false)
     @Getter @Setter
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/cssClass/PropertyLayoutCssClassVm.layout.xml
b/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/cssClass/PropertyLayoutCssClassVm.layout.xml
index 01f28a1..ed44cde 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/cssClass/PropertyLayoutCssClassVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/cssClass/PropertyLayoutCssClassVm.layout.xml
@@ -8,6 +8,7 @@
 	<bs3:row>
 		<bs3:col span="10" unreferencedActions="true">
 			<cpt:domainObject />
+			<cpt:action id="rebuildMetamodel"  position="PANEL"/>
 		</bs3:col>
 		<bs3:col span="2">
 			<cpt:fieldSet name="" id="sources" />
@@ -16,9 +17,6 @@
 
 	<bs3:row>
 		<bs3:col span="6">
-			<cpt:fieldSet name="General" id="general">
-				<cpt:property id="title" />
-			</cpt:fieldSet>
 			<cpt:fieldSet name="Properties" id="properties">
 				<cpt:property id="cssClassUsingLayoutProperty" cssClass="red"/>
 			</cpt:fieldSet>
@@ -30,7 +28,7 @@
 			<cpt:fieldSet name="Description" id="description" >
 				<cpt:action id="clearHints" position="PANEL" />
 				<cpt:action id="downloadLayoutXml"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="rebuildMetamodel"  position="PANEL"/>
+				<cpt:action id="rebuildMetamodel" position="PANEL_DROPDOWN"/>
 				<cpt:action id="downloadMetamodelXml"  position="PANEL_DROPDOWN"/>
 				<cpt:action id="inspectMetamodel"  position="PANEL_DROPDOWN"/>
 				<cpt:action id="downloadJdoMetadata"  position="PANEL_DROPDOWN"/>
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/named/PropertyLayoutNamedVm.java
b/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/named/PropertyLayoutNamedVm.java
index 671a504..c057af4 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/named/PropertyLayoutNamedVm.java
+++ b/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/named/PropertyLayoutNamedVm.java
@@ -50,18 +50,10 @@ import demoapp.dom._infra.asciidocdesc.HasAsciiDocDescription;
 )
 public class PropertyLayoutNamedVm implements HasAsciiDocDescription {
 
-//end::class[]
-    public PropertyLayoutNamedVm() {
-        this.title = "PropertyLayout#named";
+    public String title() {
+        return "PropertyLayout#named";
     }
 
-//tag::class[]
-    @Title
-    @Property(editing = Editing.DISABLED)
-    @XmlElement(required = true)
-    @Getter @Setter
-    private String title;
-
     @Property(optionality = Optionality.OPTIONAL)
     @PropertyLayout(named = "Named using annotation", describedAs = "@PropertyLayout(named=
\"Named using annotation\")", hidden = Where.ALL_TABLES)
     @MemberOrder(name = "named", sequence = "1")
diff --git a/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/named/PropertyLayoutNamedVm.layout.xml
b/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/named/PropertyLayoutNamedVm.layout.xml
index 118adab..265a0e8 100644
--- a/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/named/PropertyLayoutNamedVm.layout.xml
+++ b/examples/demo/domain/src/main/java/demoapp/dom/PropertyLayout/named/PropertyLayoutNamedVm.layout.xml
@@ -17,9 +17,6 @@
 
 	<bs3:row>
 		<bs3:col span="6">
-			<cpt:fieldSet name="General" id="general">
-				<cpt:property id="title" />
-			</cpt:fieldSet>
 			<cpt:fieldSet name="Named" id="named">
 				<cpt:property id="propertyUsingAnnotation"/>
 				<cpt:property id="propertyUsingLayout">
@@ -34,7 +31,7 @@
 			<cpt:fieldSet name="Description" id="description" >
 				<cpt:action id="clearHints" position="PANEL" />
 				<cpt:action id="downloadLayoutXml"  position="PANEL_DROPDOWN"/>
-				<cpt:action id="rebuildMetamodel"  position="PANEL"/>
+				<cpt:action id="rebuildMetamodel" position="PANEL_DROPDOWN"/>
 				<cpt:action id="downloadMetamodelXml"  position="PANEL_DROPDOWN"/>
 				<cpt:action id="inspectMetamodel"  position="PANEL_DROPDOWN"/>
 				<cpt:action id="downloadJdoMetadata"  position="PANEL_DROPDOWN"/>
diff --git a/examples/demo/domain/src/main/resources/static/css/application.css b/examples/demo/domain/src/main/resources/static/css/application.css
index 8c17512..3af478c 100644
--- a/examples/demo/domain/src/main/resources/static/css/application.css
+++ b/examples/demo/domain/src/main/resources/static/css/application.css
@@ -6,6 +6,13 @@
 }
 
 /*
+ * Demonstrates use of @PropertyLayout(cssClass='red')
+ */
+.property.blue label {
+    color: dodgerblue;
+}
+
+/*
  * admonitionblock styles (ie, NOTE: TIP: CAUTION: IMPORTANT: WARNING:)
  * (taken from asciidoctor.css)
  */


Mime
View raw message