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:13 UTC
[10/13] isis git commit: ISIS-993: further fixes to honour
namedEscaped for property edit prompt.
ISIS-993: further fixes to 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/ce2ea3c5
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/ce2ea3c5
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/ce2ea3c5
Branch: refs/heads/ISIS-993
Commit: ce2ea3c5da907f886768e5a8a8554548322ebd3d
Parents: 0f09648
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Feb 23 21:06:45 2016 +0000
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Tue Feb 23 21:06:45 2016 +0000
----------------------------------------------------------------------
.../property/PropertyEditPromptHeaderPanel.java | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/ce2ea3c5/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPromptHeaderPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPromptHeaderPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPromptHeaderPanel.java
index f62f986..49c91bd 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPromptHeaderPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditPromptHeaderPanel.java
@@ -23,6 +23,8 @@ import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.adapter.mgr.AdapterManager;
+import org.apache.isis.core.metamodel.facets.all.named.NamedFacet;
+import org.apache.isis.core.metamodel.spec.feature.OneToOneAssociation;
import org.apache.isis.viewer.wicket.model.models.EntityModel;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.ComponentType;
@@ -43,12 +45,19 @@ public class PropertyEditPromptHeaderPanel extends PanelAbstract<ScalarModel> {
getComponentFactoryRegistry().addOrReplaceComponent(this, ComponentType.ENTITY_ICON_AND_TITLE, new EntityModel(targetAdapter));
- add(new Label(ID_PROPERTY_NAME, new AbstractReadOnlyModel<String>() {
+ final Label label = new Label(ID_PROPERTY_NAME, new AbstractReadOnlyModel<String>() {
@Override
public String getObject() {
- return model.getPropertyMemento().getProperty().getName();
+ final OneToOneAssociation property = model.getPropertyMemento().getProperty();
+ return property.getName();
}
- }));
+ });
+ final OneToOneAssociation property = model.getPropertyMemento().getProperty();
+ final NamedFacet namedFacet = property.getFacet(NamedFacet.class);
+ if(namedFacet != null) {
+ label.setEscapeModelStrings(namedFacet.escaped());
+ }
+ add(label);
}
}