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/01/07 00:18:43 UTC

[13/50] [abbrv] isis git commit: ISIS-995: read "namedEscaped" from xxx.layout.json.

ISIS-995: read "namedEscaped" from xxx.layout.json.

Also, honour escape setting for column headers and for collection panel name.


Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/94529f19
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/94529f19
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/94529f19

Branch: refs/heads/ISIS-970
Commit: 94529f19bef246cadc667344873b382f16c751e6
Parents: c9ed08a
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Jan 5 21:54:03 2015 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Jan 5 21:58:06 2015 +0000

----------------------------------------------------------------------
 .../CollectionContentsAsAjaxTablePanel.java     |   9 +-
 .../columns/ObjectAdapterPropertyColumn.java    |  17 ++-
 .../collections/EntityCollectionsPanel.java     |   4 +
 .../layoutmetadata/ActionLayoutFacetRepr.java   |   1 +
 .../CollectionLayoutFacetRepr.java              |   1 +
 .../json/LayoutMetadataReaderFromJson.java      |  12 ++
 .../json/ExampleDomainObject.layout.json        | 142 +++++++++----------
 .../src/main/java/dom/todo/ToDoItem.layout.json |  11 +-
 8 files changed, 122 insertions(+), 75 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/isis/blob/94529f19/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
index b4a3b02..70abf52 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.java
@@ -36,6 +36,7 @@ import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
 import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager.ConcurrencyChecking;
 import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
 import org.apache.isis.core.metamodel.facets.all.hide.HiddenFacet;
+import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.Contributed;
 import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
@@ -193,9 +194,15 @@ public class CollectionContentsAsAjaxTablePanel extends PanelAbstract<EntityColl
     }
 
     private ObjectAdapterPropertyColumn createObjectAdapterPropertyColumn(final ObjectAssociation property) {
-        return new ObjectAdapterPropertyColumn(Model.of(property.getName()), property.getId(), property.getId());
+
+        final NamedFacet facet = property.getFacet(NamedFacet.class);
+        final boolean escaped = facet == null || facet.escaped();
+
+        return new ObjectAdapterPropertyColumn(Model.of(property.getName()), property.getId(), property.getId(), escaped);
     }
 
+
+
     @Override
     protected void onModelChanged() {
         buildGui();

http://git-wip-us.apache.org/repos/asf/isis/blob/94529f19/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
index 05adc9c..eb07ad6 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/columns/ObjectAdapterPropertyColumn.java
@@ -21,6 +21,7 @@ package org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable
 
 import org.apache.wicket.Component;
 import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.markup.html.basic.Label;
 import org.apache.wicket.markup.repeater.Item;
 import org.apache.wicket.model.IModel;
 
@@ -49,12 +50,26 @@ public final class ObjectAdapterPropertyColumn extends ColumnAbstract<ObjectAdap
     private static final long serialVersionUID = 1L;
 
     private final String propertyExpression;
+    private final boolean escaped;
 
-    public ObjectAdapterPropertyColumn(final IModel<String> columnNameModel, final String sortProperty, final String propertyName) {
+    public ObjectAdapterPropertyColumn(
+            final IModel<String> columnNameModel,
+            final String sortProperty,
+            final String propertyName,
+            final boolean escaped) {
         super(columnNameModel, sortProperty);
         this.propertyExpression = propertyName;
+        this.escaped = escaped;
     }
 
+    public Component getHeader(final String componentId)
+    {
+        final Label label = new Label(componentId, getDisplayModel());
+        label.setEscapeModelStrings(escaped);
+        return label;
+    }
+
+
     @Override
     public void populateItem(final Item<ICellPopulator<ObjectAdapter>> cellItem, final String componentId, final IModel<ObjectAdapter> rowModel) {
         final Component component = createComponent(componentId, rowModel);

http://git-wip-us.apache.org/repos/asf/isis/blob/94529f19/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java
index 90a46ce..7d35b91 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/collections/EntityCollectionsPanel.java
@@ -29,6 +29,7 @@ import org.apache.isis.applib.annotation.Where;
 import org.apache.isis.applib.filter.Filter;
 import org.apache.isis.applib.filter.Filters;
 import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
 import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
 import org.apache.isis.core.metamodel.spec.ObjectSpecification;
 import org.apache.isis.core.metamodel.spec.feature.Contributed;
@@ -119,6 +120,9 @@ public class EntityCollectionsPanel extends PanelAbstract<EntityModel> {
         fieldset.addOrReplace(collectionPanel);
 
         Label labelComponent = collectionPanel.createLabel(ID_COLLECTION_NAME, association.getName());
+        final NamedFacet namedFacet = association.getFacet(NamedFacet.class);
+        labelComponent.setEscapeModelStrings(namedFacet == null || namedFacet.escaped());
+
         final String description = association.getDescription();
         if(description != null) {
             labelComponent.add(new AttributeAppender("title", Model.of(description)));

http://git-wip-us.apache.org/repos/asf/isis/blob/94529f19/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/ActionLayoutFacetRepr.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/ActionLayoutFacetRepr.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/ActionLayoutFacetRepr.java
index 73702af..d5a9123 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/ActionLayoutFacetRepr.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/ActionLayoutFacetRepr.java
@@ -27,6 +27,7 @@ public class ActionLayoutFacetRepr {
     public String describedAs;
     public Where hidden;
     public String named;
+    public boolean namedEscaped = true;
     public ActionLayout.Position position;
     public boolean prototype;
 }

http://git-wip-us.apache.org/repos/asf/isis/blob/94529f19/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/CollectionLayoutFacetRepr.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/CollectionLayoutFacetRepr.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/CollectionLayoutFacetRepr.java
index ed5ab80..cf1bd84 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/CollectionLayoutFacetRepr.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/CollectionLayoutFacetRepr.java
@@ -26,6 +26,7 @@ public class CollectionLayoutFacetRepr {
     public String describedAs;
     public Where hidden;
     public String named;
+    public boolean namedEscaped = true;
     public int paged;
     public CollectionLayout.RenderType render;
     public String sortedBy;

http://git-wip-us.apache.org/repos/asf/isis/blob/94529f19/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java
index 0d95421..0fbe337 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/layoutmetadata/json/LayoutMetadataReaderFromJson.java
@@ -197,6 +197,10 @@ public class LayoutMetadataReaderFromJson implements LayoutMetadataReader {
                 }
                 //
                 {
+                    props.setProperty("member." + memberName + ".propertyLayout.namedEscaped", ""+propertyLayout.namedEscaped);
+                }
+                //
+                {
                     props.setProperty("member." + memberName + ".propertyLayout.renderedAsDayBefore", "" + propertyLayout.renderedAsDayBefore);
                 }
                 if(propertyLayout.typicalLength > 0) {
@@ -219,6 +223,10 @@ public class LayoutMetadataReaderFromJson implements LayoutMetadataReader {
                 if(collectionLayout.named != null) {
                     props.setProperty("member." + memberName + ".collectionLayout.named", collectionLayout.named);
                 }
+                //
+                {
+                    props.setProperty("member." + memberName + ".collectionLayout.namedEscaped", ""+collectionLayout.namedEscaped);
+                }
                 if(collectionLayout.paged > 0) {
                     props.setProperty("member." + memberName + ".collectionLayout.paged", "" + collectionLayout.paged);
                 }
@@ -338,6 +346,10 @@ public class LayoutMetadataReaderFromJson implements LayoutMetadataReader {
             if(actionLayout.named != null) {
                 props.setProperty(prefix + "." + actionName + ".actionLayout.named", actionLayout.named);
             }
+            //
+            {
+                props.setProperty(prefix + "." + actionName + ".actionLayout.namedEscaped", ""+actionLayout.namedEscaped);
+            }
             if(actionLayout.position != null) {
                 props.setProperty(prefix + "." + actionName + ".actionLayout.position", ""+actionLayout.position);
             }

http://git-wip-us.apache.org/repos/asf/isis/blob/94529f19/core/metamodel/src/test/resources/org/apache/isis/core/metamodel/layoutmetadata/json/ExampleDomainObject.layout.json
----------------------------------------------------------------------
diff --git a/core/metamodel/src/test/resources/org/apache/isis/core/metamodel/layoutmetadata/json/ExampleDomainObject.layout.json b/core/metamodel/src/test/resources/org/apache/isis/core/metamodel/layoutmetadata/json/ExampleDomainObject.layout.json
index eb580c3..eef29fb 100644
--- a/core/metamodel/src/test/resources/org/apache/isis/core/metamodel/layoutmetadata/json/ExampleDomainObject.layout.json
+++ b/core/metamodel/src/test/resources/org/apache/isis/core/metamodel/layoutmetadata/json/ExampleDomainObject.layout.json
@@ -15,51 +15,51 @@
  *  limitations under the License.
  */
 {
-    columns: [
+    "columns": [
     {
-        span: 3,
-        memberGroups: {
-            General: {
-                members: {
-                    description: {
-                        typicalLength: {
-                            value: 50
+        "span": 3,
+        "memberGroups": {
+            "General": {
+                "members": {
+                    "description": {
+                        "typicalLength": {
+                            "value": 50
                         }
                     },
-                    category: {},
-                    complete: {
-                        actions: {
-                            completed: {
-                                named: { value: "Done" },
-                                describedAs: {
-                                    value: "Mark this todo item as having been completed"
+                    "category": {},
+                    "complete": {
+                        "actions": {
+                            "completed": {
+                                "named": { "value": "Done" },
+                                "describedAs": {
+                                    "value": "Mark this todo item as having been completed"
                                 }
                             },
-                            notYetCompleted: {}
+                            "notYetCompleted": {}
                         },
-                        propertyLayout: {
-                            named: "the name of complete property"
+                        "propertyLayout": {
+                            "named": "the name of complete property"
                         },
-			            describedAs: {
-			                value: "Whether this todo item has been completed"
-			            },
-                        cssClass: { value: "x-highlight" },
-                        disabled: {
-                            where: ANYWHERE,
-                            when: ALWAYS
+                        "describedAs": {
+                            "value": "Whether this todo item has been completed"
+                        },
+                        "cssClass": { "value": "x-highlight" },
+                        "disabled": {
+                            "where": "ANYWHERE",
+                            "when": "ALWAYS"
                         }
                     }
                 }
             },
-            Misc: {
-                members: {
-                    versionSequence: {
-                        hidden: {
-                            where: ALL_TABLES,
-                            when: ALWAYS 
+            "Misc": {
+                "members": {
+                    "versionSequence": {
+                        "hidden": {
+                            "where": "ALL_TABLES",
+                            "when": "ALWAYS"
                         },
-                        propertyLayout: {
-                            namedEscaped: false
+                        "propertyLayout": {
+                            "namedEscaped": false
                         }
                     }
                 }
@@ -67,69 +67,69 @@
         }
     },
     {
-        span: 4,
-        memberGroups: {
-            Detail: {
-                members: {
-                    dueBy: {
-                        actions: {
-                            dueBy: {
-                                cssClass: { value: "x-key2" }
+        "span": 4,
+        "memberGroups": {
+            "Detail": {
+                "members": {
+                    "dueBy": {
+                        "actions": {
+                            "dueBy": {
+                                "cssClass": { "value": "x-key2" }
                             }
                         },
-                        cssClass: { value: "x-key" }
+                        "cssClass": { "value": "x-key" }
                     },
-                    cost: {
-                        actions: {
-                            updateCost:{}
+                    "cost": {
+                        "actions": {
+                            "updateCost":{}
                         }
                     },
-                    notes: {
-                        multiLine: {
-                            numberOfLines: 5
+                    "notes": {
+                        "multiLine": {
+                            "numberOfLines": 5
                         }
                     },
-                    attachment: {}
+                    "attachment": {}
                 }
             }
         }
     },
     {
-        span: 0
+        "span": 0
     },
     {
-        span: 5,
-        collections: {
-            dependencies: {
-                actions: {
-                    add:{},
-                    remove: {
-                        cssClass: { value: "x-caution" }
+        "span": 5,
+        "collections": {
+            "dependencies": {
+                "actions": {
+                    "add":{},
+                    "remove": {
+                        "cssClass": { "value": "x-caution" }
                     }
                 },
-                paged: {
-                    value: 5
+                "paged": {
+                    "value": 5
                 },
-                render: {}
+                "render": {}
             },
-            similarItems: {
-                render: {
-                    value: LAZILY
+            "similarItems": {
+                "render": {
+                    "value": "LAZILY"
                 }
             }
         }
     }
     ],
-    actions: {
-        delete: {
-            cssClass: { value: "x-caution" }
+    "actions": {
+        "delete": {
+            "cssClass": { "value": "x-caution" }
         },
-        duplicate: {
-            named: {
-                value: "Clone"
+        "duplicate": {
+            "named": {
+                "value": "Clone"
             },
-            describedAs: {
-                value: "Create a new todo item from this one"
+            "describedAs": {
+                "value": "Create a new todo item from this one"
             }
         }
     }

http://git-wip-us.apache.org/repos/asf/isis/blob/94529f19/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.layout.json
----------------------------------------------------------------------
diff --git a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.layout.json b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.layout.json
index 1820be7..cda5fdc 100644
--- a/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.layout.json
+++ b/example/application/todoapp/dom/src/main/java/dom/todo/ToDoItem.layout.json
@@ -57,7 +57,10 @@
                     },
                     "complete": {
                         "propertyLayout": {
-                            "describedAs": "Whether this todo item has been completed"
+                            "named": "Whether this todo item has been <i>completed</i> or not.",
+                            "namedEscaped": false,
+                            "describedAs": "Whether this todo item has been completed, or not.",
+                            "labelPosition": "LEFT"
                         },
                         "actions": {
                             "completed": {
@@ -165,7 +168,9 @@
         "collections": {
             "dependencies": {
                 "collectionLayout": {
-                    "describedAs": "ToDo items that must be completed before this one",
+                    "named": "Todo items that are <i>dependencies</i> of this item.",
+                    "namedEscaped": false,
+                    "describedAs": "Todo items that must be completed before this one",
                     "paged": 5,
                     "render": "EAGERLY"
                 },
@@ -187,6 +192,8 @@
             },
             "similarTo": {
                 "collectionLayout": {
+                    "named": "Todo items that are <i>similar to</i> this one",
+                    "namedEscaped": false,
                     "paged": 3,
                     "render": "LAZILY"
                 },