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 2014/10/27 16:09:48 UTC
[4/4] git commit: ISIS-537 Implement the view logic for @LabelAt
annotation
ISIS-537 Implement the view logic for @LabelAt annotation
https://trello.com/c/XGafV5wV/30-position-fields-either-above-or-to-left-isis-703
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/a9046e5f
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/a9046e5f
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/a9046e5f
Branch: refs/heads/master
Commit: a9046e5f5a96ded79dd6e201dff347af62717ad3
Parents: b9ee597
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Oct 27 16:49:39 2014 +0200
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Oct 27 15:00:39 2014 +0000
----------------------------------------------------------------------
.../actions/ActionParametersFormPanel.html | 2 +-
.../entity/properties/EntityPropertiesForm.java | 2 +-
.../components/scalars/ScalarPanelAbstract.java | 36 ++++++++++++++++++++
.../scalars/ScalarPanelTextFieldAbstract.java | 5 +--
.../isisapplib/IsisBlobOrClobPanelAbstract.java | 6 ++--
.../scalars/primitive/BooleanPanel.html | 2 +-
.../scalars/primitive/BooleanPanel.java | 2 ++
.../scalars/reference/ReferencePanel.java | 5 +--
.../valuechoices/ValueChoicesSelect2Panel.html | 2 +-
.../valuechoices/ValueChoicesSelect2Panel.java | 2 ++
.../wicket/ui/pages/bootstrap-overrides.css | 32 +++++++++++------
...abelAtFacetOnParameterAnnotationFactory.java | 4 +--
.../LabelAtFacetOnPropertyFactory.java | 6 ----
13 files changed, 75 insertions(+), 31 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/a9046e5f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
index 9a3a92f..2beb8bc 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionParametersFormPanel.html
@@ -21,7 +21,7 @@
<body>
<wicket:panel>
<div class="actionParametersForm inputForm">
- <form wicket:id="inputForm" method="post" class="form-inline">
+ <form wicket:id="inputForm" method="post" class="form-horizontal">
<fieldset class="inputFormTable parameters">
<div wicket:id="parameters" class="parameter">
<div wicket:id="scalarNameAndValue">[scalar]</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/a9046e5f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
index f7e1d28..6c8d1b4 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/entity/properties/EntityPropertiesForm.java
@@ -264,7 +264,7 @@ public class EntityPropertiesForm extends FormAbstract<ObjectAdapter> {
protected void onComponentTag(ComponentTag tag) {
super.onComponentTag(tag);
- Attributes.addClass(tag, "form-inline");
+ Attributes.addClass(tag, "form-horizontal");
}
abstract class AjaxButtonWithOnError extends AjaxButton {
http://git-wip-us.apache.org/repos/asf/isis/blob/a9046e5f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index 853c4c2..9f1e4b5 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -25,6 +25,7 @@ import java.util.List;
import com.google.common.collect.Lists;
+import org.apache.wicket.AttributeModifier;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -33,6 +34,7 @@ import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.feedback.ComponentFeedbackMessageFilter;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.LabeledWebMarkupContainer;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.model.Model;
@@ -40,6 +42,7 @@ import org.apache.wicket.model.Model;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.core.metamodel.facets.members.cssclass.CssClassFacet;
+import org.apache.isis.core.metamodel.facets.propparam.labelat.LabelAtFacet;
import org.apache.isis.core.runtime.system.DeploymentType;
import org.apache.isis.core.runtime.system.context.IsisContext;
import org.apache.isis.viewer.wicket.model.links.LinkAndLabel;
@@ -332,6 +335,39 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp
protected void onBeforeRenderWhenEnabled() {
}
+ /**
+ * Applies the {@literal @}{@link org.apache.isis.applib.annotation.LabelAt LabelAt} facet
+ *
+ * @param scalarName The label for the input
+ * @param formGroup The form group element
+ */
+ protected void applyLabelAtRule(Label scalarName, MarkupContainer formGroup) {
+
+ final LabelAtFacet facet = getModel().getFacet(LabelAtFacet.class);
+
+ // TODO mgrigorov: Remove this. It is for debugging
+ scalarName.add(new AttributeModifier("title", "labelAt=" + (facet != null? facet.value(): "(null)")));
+
+ if (facet != null) {
+ switch (facet.value()) {
+ case LEFT:
+ formGroup.add(new CssClassAppender("label-left"));
+ break;
+ case NONE:
+ scalarName.setVisible(false);
+ break;
+ case TOP:
+ formGroup.add(new CssClassAppender("label-top"));
+ break;
+ default:
+ break;
+
+ }
+ } else {
+ formGroup.add(new CssClassAppender("label-left"));
+ }
+ }
+
// //////////////////////////////////////
private final List<ScalarModelSubscriber> subscribers = Lists.newArrayList();
http://git-wip-us.apache.org/repos/asf/isis/blob/a9046e5f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
index 827d7f7..d17404d 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
@@ -35,7 +35,6 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.isis.core.metamodel.facets.SingleIntValueFacet;
-import org.apache.isis.core.metamodel.facets.propparam.labelat.LabelAtFacet;
import org.apache.isis.core.metamodel.facets.propparam.maxlen.MaxLengthFacet;
import org.apache.isis.core.metamodel.facets.objpropparam.typicallen.TypicalLengthFacet;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
@@ -101,9 +100,7 @@ public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> exten
final Label scalarName = new Label(ID_SCALAR_NAME, getRendering().getLabelCaption(textField));
- final LabelAtFacet facet = getModel().getFacet(LabelAtFacet.class);
- scalarName.add(new AttributeModifier("title", "labelAt=" + (facet != null? facet.value(): "(null)")));
-
+ applyLabelAtRule(scalarName, labelIfRegular);
if(getModel().isRequired()) {
final String label = scalarName.getDefaultModelObjectAsString();
http://git-wip-us.apache.org/repos/asf/isis/blob/a9046e5f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
index 1132dd3..6cacd86 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
@@ -74,7 +74,7 @@ public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType> e
private FileUploadField fileUploadField;
protected enum InputFieldVisibility {
- VISIBLE, NOT_VISIBLE;
+ VISIBLE, NOT_VISIBLE
}
@Override
@@ -88,6 +88,8 @@ public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType> e
final Label scalarName = new Label(ID_SCALAR_NAME, getModel().getName());
labelIfRegular.add(scalarName);
+ applyLabelAtRule(scalarName, labelIfRegular);
+
wicketImage = asWicketImage(ID_IMAGE);
if(wicketImage != null) {
wicketImage.setOutputMarkupId(true);
@@ -223,7 +225,7 @@ public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType> e
MarkupContainer formComponent = (MarkupContainer) getComponentForRegular();
formComponent.get(ID_SCALAR_VALUE).setVisible(visibility == InputFieldVisibility.VISIBLE);
- Label fileNameLabel = updateFileNameLabel(ID_FILE_NAME, formComponent);
+ updateFileNameLabel(ID_FILE_NAME, formComponent);
// the visibility of download link is intentionally 'backwards';
// if in edit mode then do NOT show
http://git-wip-us.apache.org/repos/asf/isis/blob/a9046e5f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
index 1ecc4c1..146714b 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
@@ -26,7 +26,7 @@
<wicket:panel>
<div class="booleanPanel scalarNameAndValueComponentType">
<div class="form-group" wicket:id="scalarIfRegular">
- <label wicket:id="scalarName" class="scalarName">[Label text]</label>
+ <label wicket:id="scalarName" class="scalarName control-label">[Label text]</label>
<span class="scalarValueWrapper">
<input type="checkbox" name="scalarValue" class="form-control scalarValue" wicket:id="scalarValue" />
<span wicket:id="feedback" class="help-block"></span>
http://git-wip-us.apache.org/repos/asf/isis/blob/a9046e5f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
index e759d90..7e72963 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
@@ -78,6 +78,8 @@ public class BooleanPanel extends ScalarPanelAbstract {
final Label scalarName = new Label(ID_SCALAR_NAME, getRendering().getLabelCaption(checkBox));
labelIfRegular.add(scalarName);
+ applyLabelAtRule(scalarName, labelIfRegular);
+
addOrReplace(labelIfRegular);
addFeedbackTo(labelIfRegular, checkBox);
http://git-wip-us.apache.org/repos/asf/isis/blob/a9046e5f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
index 47664c4..87ca557 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
@@ -32,7 +32,6 @@ import org.apache.wicket.MarkupContainer;
import org.apache.wicket.behavior.Behavior;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.form.FormComponentLabel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.validation.IValidatable;
@@ -127,7 +126,9 @@ public class ReferencePanel extends ScalarPanelAbstract {
final Label scalarName = new Label(ID_SCALAR_NAME, getRendering().getLabelCaption(entityLink));
labelIfRegular.add(scalarName);
-
+
+ applyLabelAtRule(scalarName, labelIfRegular);
+
addOrReplace(labelIfRegular);
addFeedbackTo(labelIfRegular, entityLink);
http://git-wip-us.apache.org/repos/asf/isis/blob/a9046e5f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
index 7c1ec3e..cd66939 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.html
@@ -26,7 +26,7 @@
<wicket:panel>
<div class="valueChoicesSelect2Panel scalarNameAndValueComponentType">
<div class="form-group" wicket:id="scalarIfRegular">
- <label wicket:id="scalarName" class="scalarName">[Label text]</label>
+ <label wicket:id="scalarName" class="scalarName control-label">[Label text]</label>
<div class="scalarValueWrapper">
<div class="choicesPlaceholder">
<input wicket:id="scalarValue" type="hidden" class="choices form-control select2-remote" style="width: 99.9%;"/>
http://git-wip-us.apache.org/repos/asf/isis/blob/a9046e5f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
index 026ad5c..b5a1529 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2Panel.java
@@ -82,6 +82,8 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
final Label scalarName = new Label(ID_SCALAR_NAME, getRendering().getLabelCaption(select2Field));
labelIfRegular.addOrReplace(scalarName);
+ applyLabelAtRule(scalarName, labelIfRegular);
+
addFeedbackTo(labelIfRegular, select2Field);
addAdditionalLinksTo(labelIfRegular);
http://git-wip-us.apache.org/repos/asf/isis/blob/a9046e5f/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
index 45e322f..feae417 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
@@ -83,46 +83,58 @@ th > a > div > strong {
}
/* Labels on the left START */
-.form-inline .form-group {
+div.label-left.form-group {
width: 100%;
}
-.form-inline label {
+div.label-left label.control-label {
width: 30%;
float: left;
padding-top: 9px;
+ padding-left: 10px;
+ text-align: justify;
+}
+
+div.label-top label.control-label {
+ padding-left: 10px;
}
-.form-inline .scalarValueWrapper {
+div.label-left .scalarValueWrapper {
width: 70%;
float: right;
}
-.form-inline .scalarValueWrapper .form-control {
+div.label-top .scalarValueWrapper {
+ width: 99%;
+ display: block;
+ padding-left: 8px;
+ padding-right: 18px;
+}
+
+div.label-left .scalarValueWrapper .form-control {
width: 100%;
}
-.form-inline .scalarValueWrapper .form-control.file-caption {
+div.label-left .scalarValueWrapper .form-control.file-caption {
width: 69%;
}
-.form-inline .scalarValueWrapper .file-input .input-group-btn {
+div.label-left .scalarValueWrapper .file-input .input-group-btn {
display: inline;
}
-.form-inline .scalarValueWrapper .input-group {
+div.label-left .scalarValueWrapper .input-group {
width: 100%;
}
-.form-inline .scalarValueWrapper .input-group .input-group-addon {
+div.label-left .scalarValueWrapper .input-group .input-group-addon {
width: 1%;
}
-.form-inline .choicesPlaceholder {
+div.label-left .choicesPlaceholder {
display: inline-block;
width: 100%;
vertical-align: -webkit-baseline-middle;
vertical-align: middle;
}
-
/* Labels on the right END */
http://git-wip-us.apache.org/repos/asf/isis/blob/a9046e5f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/labelat/annotation/LabelAtFacetOnParameterAnnotationFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/labelat/annotation/LabelAtFacetOnParameterAnnotationFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/labelat/annotation/LabelAtFacetOnParameterAnnotationFactory.java
index 248581a..22622d73 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/labelat/annotation/LabelAtFacetOnParameterAnnotationFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/param/labelat/annotation/LabelAtFacetOnParameterAnnotationFactory.java
@@ -41,9 +41,7 @@ public class LabelAtFacetOnParameterAnnotationFactory extends FacetFactoryAbstra
// ignore
return;
}
- if (!Annotations.isString(parameterTypes[processParameterContext.getParamNum()])) {
- return;
- }
+
final Annotation[] parameterAnnotations = Annotations.getParameterAnnotations(processParameterContext.getMethod())[processParameterContext.getParamNum()];
for (final Annotation parameterAnnotation : parameterAnnotations) {
if (parameterAnnotation instanceof LabelAt) {
http://git-wip-us.apache.org/repos/asf/isis/blob/a9046e5f/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/labelat/annotation/LabelAtFacetOnPropertyFactory.java
----------------------------------------------------------------------
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/labelat/annotation/LabelAtFacetOnPropertyFactory.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/labelat/annotation/LabelAtFacetOnPropertyFactory.java
index 7d55829..cae5970 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/labelat/annotation/LabelAtFacetOnPropertyFactory.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/properties/labelat/annotation/LabelAtFacetOnPropertyFactory.java
@@ -60,13 +60,7 @@ public class LabelAtFacetOnPropertyFactory extends FacetFactoryAbstract implemen
}
private static LabelAtFacetOnPropertyAnnotation createFromAnnotationIfPossible(final ProcessMethodContext processMethodContext) {
- final Class<?> returnType = processMethodContext.getMethod().getReturnType();
- if (!Annotations.isString(returnType)) {
- return null;
- }
final LabelAt annotation = Annotations.getAnnotation(processMethodContext.getMethod(), LabelAt.class);
return (annotation != null) ? new LabelAtFacetOnPropertyAnnotation(annotation.value(), processMethodContext.getFacetHolder()) : null;
}
-
-
}