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 2016/02/24 00:40:11 UTC
[08/13] isis git commit: ISIS-993: honour namedEscaped for property
edit prompt.
ISIS-993: honour namedEscaped for property edit prompt.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/1841a12b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/1841a12b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/1841a12b
Branch: refs/heads/ISIS-993
Commit: 1841a12bb02fa30e6223eb65202c8dd2c9e07571
Parents: 5c2b07d
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Feb 23 20:02:51 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Feb 23 20:02:51 2016 +0000
----------------------------------------------------------------------
.../actionprompt/ActionPromptHeaderPanel.java | 18 +++++++++++++++---
.../ui/components/property/PropertyEditPanel.java | 15 ++++++++++++---
2 files changed, 27 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/1841a12b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java
index a18f658..b5fbf72 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptHeaderPanel.java
@@ -21,6 +21,8 @@ package org.apache.isis.viewer.wicket.ui.components.actionprompt;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
+import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
+import org.apache.isis.core.metamodel.spec.feature.ObjectAction;
import org.apache.isis.viewer.wicket.model.models.ActionModel;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
@@ -40,12 +42,22 @@ public class ActionPromptHeaderPanel extends PanelAbstract<ActionModel> {
getComponentFactoryRegistry().addOrReplaceComponent(this, ComponentType.ENTITY_ICON_AND_TITLE, new EntityModel(targetAdapter));
- add(new Label(ID_ACTION_NAME, new AbstractReadOnlyModel<String>() {
+
+ final Label label = new Label(ID_ACTION_NAME, new AbstractReadOnlyModel<String>() {
@Override
public String getObject() {
- return model.getActionMemento().getAction().getName();
+ final ObjectAction action = model.getActionMemento().getAction();
+ return action.getName();
}
- }));
+ });
+
+ final ObjectAction action = model.getActionMemento().getAction();
+ NamedFacet namedFacet = action.getFacet(NamedFacet.class);
+ if (namedFacet != null) {
+ label.setEscapeModelStrings(namedFacet.escaped());
+ }
+
+ add(label);
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/1841a12b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
index 54043fc..0617a9a 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPanel.java
@@ -37,9 +37,10 @@ import org.apache.isis.core.commons.authentication.MessageBroker;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
import org.apache.isis.core.metamodel.adapter.version.ConcurrencyException;
+import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.core.runtime.system.transaction.IsisTransactionManager;
-import org.apache.isis.viewer.wicket.model.models.ActionPrompt;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.model.models.ExecutingPanel;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
@@ -102,8 +103,16 @@ public class PropertyEditPanel extends PanelAbstract<ScalarModel>
getComponentFactoryRegistry().addOrReplaceComponent(this, ComponentType.PROPERTY_EDIT_FORM, getScalarModel());
getComponentFactoryRegistry().addOrReplaceComponent(header, ComponentType.ENTITY_ICON_AND_TITLE, new EntityModel(targetAdapter));
- final String propertyName = getScalarModel().getPropertyMemento().getProperty().getName();
- header.add(new Label(ID_PROPERTY_NAME, Model.of(propertyName)));
+ final OneToOneAssociation property = getScalarModel().getPropertyMemento().getProperty();
+ final String propertyName = property.getName();
+ final Label label = new Label(ID_PROPERTY_NAME, Model.of(propertyName));
+
+ NamedFacet namedFacet = property.getFacet(NamedFacet.class);
+ if (namedFacet != null) {
+ label.setEscapeModelStrings(namedFacet.escaped());
+ }
+
+ header.add(label);
} catch (final ConcurrencyException ex) {