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 2017/04/27 12:32:57 UTC
[11/35] isis git commit: ISIS-1603: makes the subclasses of
ScalarPanelAbstract a little more consistent with each other
ISIS-1603: makes the subclasses of ScalarPanelAbstract a little more consistent with each other
specifically, all now have scalarTypeContainer as the outermost
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/6a9e95a5
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/6a9e95a5
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/6a9e95a5
Branch: refs/heads/ISIS-1603
Commit: 6a9e95a5f5cba697d3c94441f963689d1f52fc7d
Parents: c1b8f47
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Tue Apr 25 20:22:09 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Thu Apr 27 13:26:39 2017 +0100
----------------------------------------------------------------------
.../components/scalars/ScalarPanelAbstract.java | 15 +++
.../scalars/ScalarPanelAbstract2.html | 84 ------------
.../scalars/ScalarPanelAbstract2.java | 130 -------------------
.../scalars/ScalarPanelTextAbstract.html | 87 +++++++++++++
.../scalars/ScalarPanelTextAbstract.java | 126 ++++++++++++++++++
.../scalars/ScalarPanelTextFieldAbstract.java | 14 +-
.../isisapplib/IsisBlobOrClobPanelAbstract.html | 27 +++-
.../isisapplib/IsisBlobOrClobPanelAbstract.java | 5 +-
.../scalars/primitive/BooleanPanel.html | 35 ++++-
.../scalars/primitive/BooleanPanel.java | 4 +-
.../BooleanPanel_labelRightPosition.html | 27 +++-
.../scalars/reference/ReferencePanel.html | 53 ++++++--
.../scalars/reference/ReferencePanel.java | 14 +-
.../valuechoices/ValueChoicesSelect2Panel.html | 49 ++++++-
.../valuechoices/ValueChoicesSelect2Panel.java | 8 +-
15 files changed, 416 insertions(+), 262 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/6a9e95a5/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index 50f5442..db7e5c2 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -62,6 +62,8 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp
private static final long serialVersionUID = 1L;
+ protected static final String ID_SCALAR_TYPE_CONTAINER = "scalarTypeContainer";
+
protected static final String ID_SCALAR_IF_COMPACT = "scalarIfCompact";
protected static final String ID_SCALAR_IF_REGULAR = "scalarIfRegular";
protected static final String ID_SCALAR_NAME = "scalarName";
@@ -80,6 +82,8 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp
protected Component scalarIfCompact;
protected Component scalarIfRegular;
+ protected WebMarkupContainer scalarTypeContainer;
+
public ScalarPanelAbstract(final String id, final ScalarModel scalarModel) {
super(id, scalarModel);
this.scalarModel = scalarModel;
@@ -88,6 +92,17 @@ public abstract class ScalarPanelAbstract extends PanelAbstract<ScalarModel> imp
// ///////////////////////////////////////////////////////////////////
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ scalarTypeContainer = new WebMarkupContainer(ID_SCALAR_TYPE_CONTAINER);
+ scalarTypeContainer.setOutputMarkupId(true);
+ addOrReplace(scalarTypeContainer);
+
+ }
+
@Override
protected void onBeforeRender() {
http://git-wip-us.apache.org/repos/asf/isis/blob/6a9e95a5/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.html
deleted file mode 100644
index 6238772..0000000
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.html
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
--->
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml"
- xmlns:wicket="http://wicket.apache.org"
- xml:lang="en"
- lang="en">
- <body>
- <wicket:panel>
- <div wicket:id="scalarTypeContainer"
- class="scalarNameAndValueComponentType" >
-
- <div wicket:id="scalarIfRegular"
- class="form-group" >
-
- <label wicket:id="scalarName"
- class="scalarName control-label"
- >[Label text]</label>
-
- <span class="scalarValueWrapper">
- <div class="scalarPlaceholder">
- <span class="scalarValueInput">
- <span class="editing">
- <wicket:child/>
- <a wicket:id="editProperty"
- href="#"
- class="edit fa fa-pencil-square-o"></a>
- <a
- href="#"
- name="scalarValueEditInline"
- class="form-control input-sm scalarValueEditInline"
- wicket:id="scalarValueEditInline">
- <span wicket:id="scalarValueEditInlineLabel"></span>
- </a>
- </span>
- </span>
-
- <span wicket:id="associatedActionLinksRight"
- class="associatedActionLinksRight"
- >[drop down]</span>
- </div>
- <span wicket:id="feedback" class="help-block"></span>
- <span wicket:id="associatedActionLinksBelow"></span>
- </span>
- <div class="clearfix"></div>
-
- </div>
-
- <div wicket:id="scalarIfRegularInlineEditForm" class="inlineEditForm" >
- <div><span>property edit form</span></div>
- </div>
-
- <wicket:container wicket:id="scalarIfCompact"></wicket:container>
- </div>
-
- <wicket:fragment wicket:id="compactAsInputCheckbox">
- <input wicket:id="scalarIfCompact"
- type="checkbox"
- class="form-control" />
- </wicket:fragment>
-
- <wicket:fragment wicket:id="compactAsSpan">
- <span wicket:id="scalarIfCompact"></span>
- </wicket:fragment>
- </wicket:panel>
- </body>
-</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/6a9e95a5/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
deleted file mode 100644
index 7b37a52..0000000
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract2.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.isis.viewer.wicket.ui.components.scalars;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxEventBehavior;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.panel.Fragment;
-
-import org.apache.isis.applib.annotation.PromptStyle;
-import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.viewer.wicket.ui.ComponentType;
-import org.apache.isis.viewer.wicket.ui.components.property.PropertyEditFormExecutor;
-import org.apache.isis.viewer.wicket.ui.components.property.PropertyEditFormPanel;
-import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
-
-/**
- * Adapter for {@link PanelAbstract panel}s that use a {@link ScalarModel} as
- * their backing model.
- *
- * <p>
- * Supports the concept of being {@link Rendering#COMPACT} (eg within a table) or
- * {@link Rendering#REGULAR regular} (eg within a form).
- */
-public abstract class ScalarPanelAbstract2 extends ScalarPanelAbstract {
-
- private static final long serialVersionUID = 1L;
-
- protected static final String ID_SCALAR_TYPE_CONTAINER = "scalarTypeContainer";
-
-
- protected static final String ID_SCALAR_VALUE_EDIT_INLINE = "scalarValueEditInline";
- protected static final String ID_SCALAR_VALUE_EDIT_INLINE_LABEL = "scalarValueEditInlineLabel";
-
- protected static final String ID_SCALAR_IF_REGULAR_INLINE_EDIT_FORM = "scalarIfRegularInlineEditForm";
-
-
- public enum CompactType {
- INPUT_CHECKBOX,
- SPAN
- }
-
-
- protected WebMarkupContainer scalarTypeContainer;
- protected WebMarkupContainer scalarIfRegularInlineEditForm;
- protected WebMarkupContainer editInlineLink;
-
-
- public ScalarPanelAbstract2(final String id, final ScalarModel scalarModel) {
- super(id, scalarModel);
- }
-
- protected Fragment getCompactFragment(CompactType type) {
- Fragment compactFragment;
- switch (type) {
- case INPUT_CHECKBOX:
- compactFragment = new Fragment("scalarIfCompact", "compactAsInputCheckbox", ScalarPanelAbstract2.this);
- break;
- case SPAN:
- default:
- compactFragment = new Fragment("scalarIfCompact", "compactAsSpan", ScalarPanelAbstract2.this);
- break;
- }
- return compactFragment;
- }
-
-
-
-
- protected void configureInlineEditCallback() {
-
- final PromptStyle editStyle = this.scalarModel.getPromptStyle();
- if(editStyle == PromptStyle.INLINE) {
-
- if(editInlineLink != null) {
- editInlineLink.add(new AjaxEventBehavior("click") {
- @Override
- protected void onEvent(final AjaxRequestTarget target) {
-
- scalarModel.toEditMode();
-
- // dynamically update the edit form.
- final PropertyEditFormExecutor formExecutor =
- new PropertyEditFormExecutor(ScalarPanelAbstract2.this, scalarModel);
- scalarModel.setFormExecutor(formExecutor);
- scalarModel.setInlinePromptContext(
- new ScalarModel.InlinePromptContext(scalarIfRegular, scalarIfRegularInlineEditForm));
-
- scalarIfRegularInlineEditForm = (PropertyEditFormPanel) getComponentFactoryRegistry().addOrReplaceComponent(
- scalarTypeContainer, ID_SCALAR_IF_REGULAR_INLINE_EDIT_FORM, ComponentType.PROPERTY_EDIT_FORM, scalarModel);
-
-
- scalarIfRegular.setVisible(false);
- scalarIfRegularInlineEditForm.setVisible(true);
-
- target.add(scalarTypeContainer);
- }
-
- @Override
- public boolean isEnabled(final Component component) {
- return true;
- }
- });
- }
- }
- }
-
-
-
-
-
-}
http://git-wip-us.apache.org/repos/asf/isis/blob/6a9e95a5/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextAbstract.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextAbstract.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextAbstract.html
new file mode 100644
index 0000000..9fd6bda
--- /dev/null
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextAbstract.html
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:wicket="http://wicket.apache.org"
+ xml:lang="en"
+ lang="en">
+ <body>
+ <wicket:panel>
+ <div class="scalarNameAndValueComponentType"
+ wicket:id="scalarTypeContainer">
+
+ <div class="form-group"
+ wicket:id="scalarIfRegular">
+
+ <label class="scalarName control-label"
+ wicket:id="scalarName"
+ >[Label text]</label>
+
+ <span class="scalarValueWrapper">
+ <div class="scalarPlaceholder">
+
+ <span class="scalarValueInput">
+ <span class="editing">
+
+ <a href="#"
+ name="scalarValueEditInline"
+ class="form-control input-sm scalarValueEditInline"
+ wicket:id="scalarValueEditInline">
+ <span wicket:id="scalarValueEditInlineLabel"></span>
+ </a>
+
+ <wicket:child/>
+
+ <a href="#"
+ class="edit fa fa-pencil-square-o"
+ wicket:id="editProperty"></a>
+ </span>
+ </span>
+
+ <span class="associatedActionLinksRight"
+ wicket:id="associatedActionLinksRight"
+ >[drop down]</span>
+ </div>
+ <span wicket:id="feedback" class="help-block"></span>
+ <span wicket:id="associatedActionLinksBelow"></span>
+ </span>
+ <div class="clearfix"></div>
+ </div>
+
+ <div class="inlineEditForm"
+ wicket:id="scalarIfRegularInlineEditForm" >
+ <div><span>property edit form</span></div>
+ </div>
+
+ <wicket:container wicket:id="scalarIfCompact"></wicket:container>
+ </div>
+
+ <wicket:fragment wicket:id="compactAsInputCheckbox">
+ <input wicket:id="scalarIfCompact"
+ type="checkbox"
+ class="form-control" />
+ </wicket:fragment>
+
+ <wicket:fragment wicket:id="compactAsSpan">
+ <span wicket:id="scalarIfCompact"></span>
+ </wicket:fragment>
+ </wicket:panel>
+ </body>
+</html>
http://git-wip-us.apache.org/repos/asf/isis/blob/6a9e95a5/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextAbstract.java
new file mode 100644
index 0000000..b310d49
--- /dev/null
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextAbstract.java
@@ -0,0 +1,126 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.isis.viewer.wicket.ui.components.scalars;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxEventBehavior;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.panel.Fragment;
+
+import org.apache.isis.applib.annotation.PromptStyle;
+import org.apache.isis.viewer.wicket.model.models.ScalarModel;
+import org.apache.isis.viewer.wicket.ui.ComponentType;
+import org.apache.isis.viewer.wicket.ui.components.property.PropertyEditFormExecutor;
+import org.apache.isis.viewer.wicket.ui.components.property.PropertyEditFormPanel;
+import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
+
+/**
+ * Adapter for {@link PanelAbstract panel}s that use a {@link ScalarModel} as
+ * their backing model.
+ *
+ * <p>
+ * Supports the concept of being {@link Rendering#COMPACT} (eg within a table) or
+ * {@link Rendering#REGULAR regular} (eg within a form).
+ */
+public abstract class ScalarPanelTextAbstract extends ScalarPanelAbstract {
+
+ private static final long serialVersionUID = 1L;
+
+ protected static final String ID_SCALAR_VALUE_EDIT_INLINE = "scalarValueEditInline";
+ protected static final String ID_SCALAR_VALUE_EDIT_INLINE_LABEL = "scalarValueEditInlineLabel";
+
+ protected static final String ID_SCALAR_IF_REGULAR_INLINE_EDIT_FORM = "scalarIfRegularInlineEditForm";
+
+
+ public enum CompactType {
+ INPUT_CHECKBOX,
+ SPAN
+ }
+
+
+ protected WebMarkupContainer scalarIfRegularInlineEditForm;
+ protected WebMarkupContainer editInlineLink;
+
+
+ public ScalarPanelTextAbstract(final String id, final ScalarModel scalarModel) {
+ super(id, scalarModel);
+ }
+
+ protected Fragment getCompactFragment(CompactType type) {
+ Fragment compactFragment;
+ switch (type) {
+ case INPUT_CHECKBOX:
+ compactFragment = new Fragment("scalarIfCompact", "compactAsInputCheckbox", ScalarPanelTextAbstract.this);
+ break;
+ case SPAN:
+ default:
+ compactFragment = new Fragment("scalarIfCompact", "compactAsSpan", ScalarPanelTextAbstract.this);
+ break;
+ }
+ return compactFragment;
+ }
+
+
+
+
+ protected void configureInlineEditCallback() {
+
+ final PromptStyle editStyle = this.scalarModel.getPromptStyle();
+ if(editStyle == PromptStyle.INLINE) {
+
+ if(editInlineLink != null) {
+ editInlineLink.add(new AjaxEventBehavior("click") {
+ @Override
+ protected void onEvent(final AjaxRequestTarget target) {
+
+ scalarModel.toEditMode();
+
+ // dynamically update the edit form.
+ final PropertyEditFormExecutor formExecutor =
+ new PropertyEditFormExecutor(ScalarPanelTextAbstract.this, scalarModel);
+ scalarModel.setFormExecutor(formExecutor);
+ scalarModel.setInlinePromptContext(
+ new ScalarModel.InlinePromptContext(scalarIfRegular, scalarIfRegularInlineEditForm));
+
+ scalarIfRegularInlineEditForm = (PropertyEditFormPanel) getComponentFactoryRegistry().addOrReplaceComponent(
+ scalarTypeContainer, ID_SCALAR_IF_REGULAR_INLINE_EDIT_FORM, ComponentType.PROPERTY_EDIT_FORM, scalarModel);
+
+
+ scalarIfRegular.setVisible(false);
+ scalarIfRegularInlineEditForm.setVisible(true);
+
+ target.add(scalarTypeContainer);
+ }
+
+ @Override
+ public boolean isEnabled(final Component component) {
+ return true;
+ }
+ });
+ }
+ }
+ }
+
+
+
+
+
+}
http://git-wip-us.apache.org/repos/asf/isis/blob/6a9e95a5/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
index de9bfdd..eb427c7 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
@@ -57,7 +57,7 @@ import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
* Adapter for {@link ScalarPanelAbstract scalar panel}s that are implemented
* using a simple {@link TextField}.
*/
-public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> extends ScalarPanelAbstract2 {
+public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> extends ScalarPanelTextAbstract {
private static final long serialVersionUID = 1L;
@@ -82,17 +82,19 @@ public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> exten
this.cls = cls;
}
+ // ///////////////////////////////////////////////////////////////////
+
@Override
protected void onInitialize() {
super.onInitialize();
- scalarTypeContainer = new WebMarkupContainer(ID_SCALAR_TYPE_CONTAINER);
- scalarTypeContainer.setOutputMarkupId(true);
scalarTypeContainer.add(new CssClassAppender(getScalarPanelType()));
- addOrReplace(scalarTypeContainer);
-
}
+ protected abstract IModel<String> getScalarPanelType();
+
+ // ///////////////////////////////////////////////////////////////////
+
AbstractTextComponent<T> getTextField() {
return textField;
@@ -201,8 +203,6 @@ public abstract class ScalarPanelTextFieldAbstract<T extends Serializable> exten
return scalarIfRegularFormGroup;
}
- protected abstract IModel<String> getScalarPanelType();
-
private void addReplaceDisabledTagWithReadonlyTagBehaviourIfRequired(final Component component) {
if(!getSettings().isReplaceDisabledTagWithReadonlyTag()) {
return;
http://git-wip-us.apache.org/repos/asf/isis/blob/6a9e95a5/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
index cc19d87..48ae678 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.html
@@ -20,13 +20,25 @@
<html xmlns:wicket="http://wicket.apache.org">
<body>
<wicket:panel>
- <div class="isisBlobPanel scalarNameAndValueComponentType">
- <div class="form-group" wicket:id="scalarIfRegular">
- <label wicket:id="scalarName" class="scalarName control-label">[Label text]</label>
+
+ <div class="scalarNameAndValueComponentType isisBlobPanel"
+ wicket:id="scalarTypeContainer"
+ >
+
+ <div class="form-group"
+ wicket:id="scalarIfRegular">
+
+ <label class="scalarName control-label"
+ wicket:id="scalarName"
+ >[Label text]</label>
+
<span class="scalarValueWrapper">
+
<div class="scalarPlaceholder">
+
<span class="scalarValueInput">
<span class="editing">
+
<img class="scalarImage text-center" width="200px" wicket:id="scalarImage"/>
<span class="scalarValue text-right">
@@ -38,10 +50,15 @@
<a class="download btn btn-sm btn-primary" wicket:id="scalarIfRegularDownload"><span class="downloadTitle">Download</span></a>
<span class="fileName" wicket:id="fileName">[filename]</span><span> </span>
</span>
- <a wicket:id="editProperty" href="#" class="edit fa fa-pencil-square-o"/>
+
+ <a href="#"
+ class="edit fa fa-pencil-square-o"
+ wicket:id="editProperty" ></a>
</span>
</span>
- <span wicket:id="associatedActionLinksRight" class="associatedActionLinksRight">[drop down]</span>
+ <span class="associatedActionLinksRight"
+ wicket:id="associatedActionLinksRight"
+ >[drop down]</span>
</div>
<span wicket:id="feedback" class="help-block"></span>
<span wicket:id="associatedActionLinksBelow"></span>
http://git-wip-us.apache.org/repos/asf/isis/blob/6a9e95a5/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
index 0c69b8f..2ec3fb8 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/isisapplib/IsisBlobOrClobPanelAbstract.java
@@ -114,7 +114,7 @@ public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType> e
updateFileNameLabel(ID_FILE_NAME, scalarIfRegularFormGroup);
updateDownloadLink(ID_SCALAR_IF_REGULAR_DOWNLOAD, scalarIfRegularFormGroup);
- addOrReplace(scalarIfRegularFormGroup);
+ scalarTypeContainer.addOrReplace(scalarIfRegularFormGroup);
addFeedbackOnlyTo(scalarIfRegularFormGroup, fileUploadField);
addEditPropertyTo(scalarIfRegularFormGroup);
@@ -178,7 +178,8 @@ public abstract class IsisBlobOrClobPanelAbstract<T extends NamedWithMimeType> e
if(downloadLink != null) {
updateFileNameLabel("fileNameIfCompact", downloadLink);
}
- addOrReplace(scalarIfCompact);
+
+ scalarTypeContainer.addOrReplace(scalarIfCompact);
return scalarIfCompact;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6a9e95a5/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
index 2b4af5f..f2f3586 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.html
@@ -24,25 +24,46 @@
lang="en">
<body>
<wicket:panel>
- <div class="booleanPanel scalarNameAndValueComponentType">
- <div class="form-group" wicket:id="scalarIfRegular">
- <label wicket:id="scalarName" class="scalarName control-label">[Label text]</label>
+ <div class="scalarNameAndValueComponentType booleanPanel"
+ wicket:id="scalarTypeContainer"
+ >
+ <div class="form-group"
+ wicket:id="scalarIfRegular">
+
+ <label class="scalarName control-label"
+ wicket:id="scalarName"
+ >[Label text]</label>
+
<span class="scalarValueWrapper">
+
<div class="scalarPlaceholder">
+
<span class="scalarValueInput">
<span class="editing">
- <input type="checkbox" name="scalarValue" class="scalarValue" wicket:id="scalarValue" />
- <a wicket:id="editProperty" href="#" class="edit fa fa-pencil-square-o"/>
+
+ <input type="checkbox"
+ name="scalarValue"
+ class="scalarValue"
+ wicket:id="scalarValue" />
+
+ <a href="#"
+ class="edit fa fa-pencil-square-o"
+ wicket:id="editProperty" ></a>
</span>
</span>
- <span wicket:id="associatedActionLinksRight" class="associatedActionLinksRight"></span>
+ <span class="associatedActionLinksRight"
+ wicket:id="associatedActionLinksRight"
+ >[drop down]</span>
</div>
<span wicket:id="feedback" class="help-block"></span>
<span wicket:id="associatedActionLinksBelow"></span>
</span>
<div class="clearfix"/>
</div>
- <input type="checkbox" wicket:id="scalarIfCompact" />
+
+ <input type="checkbox"
+ wicket:id="scalarIfCompact" />
+
</div>
<div class="clearfix"/>
</wicket:panel>
http://git-wip-us.apache.org/repos/asf/isis/blob/6a9e95a5/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
index 78e2a21..c461786 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
@@ -94,7 +94,7 @@ public class BooleanPanel extends ScalarPanelAbstract {
addPositioningCssTo(scalarIfRegularFormGroup, entityActions);
- addOrReplace(scalarIfRegularFormGroup);
+ scalarTypeContainer.addOrReplace(scalarIfRegularFormGroup);
addFeedbackOnlyTo(scalarIfRegularFormGroup, checkBox);
addEditPropertyTo(scalarIfRegularFormGroup);
@@ -113,7 +113,7 @@ public class BooleanPanel extends ScalarPanelAbstract {
@Override
protected Component addComponentForCompact() {
final CheckBoxX component = createCheckBox(ID_SCALAR_IF_COMPACT);
- addOrReplace(component);
+ scalarTypeContainer.addOrReplace(component);
return component;
}
http://git-wip-us.apache.org/repos/asf/isis/blob/6a9e95a5/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel_labelRightPosition.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel_labelRightPosition.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel_labelRightPosition.html
index c64ff87..fcc06b1 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel_labelRightPosition.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel_labelRightPosition.html
@@ -24,16 +24,33 @@
lang="en">
<body>
<wicket:panel>
- <div class="booleanPanel scalarNameAndValueComponentType">
- <div class="form-group" wicket:id="scalarIfRegular">
+ <div class="scalarNameAndValueComponentType booleanPanel"
+ wicket:id="scalarTypeContainer"
+ >
+
+ <div class="form-group"
+ wicket:id="scalarIfRegular">
+
<div class="scalarValueWrapper">
- <input type="checkbox" name="scalarValue" class="scalarValue" wicket:id="scalarValue" /> <label wicket:id="scalarName" class="scalarName control-label">[Label text]</label>
+
+ <input type="checkbox"
+ name="scalarValue"
+ class="scalarValue"
+ wicket:id="scalarValue" />
+
+ <label class="scalarName control-label"
+ wicket:id="scalarName"
+ >[Label text]</label>
+
<span wicket:id="feedback" class="help-block"></span>
<span wicket:id="associatedActionLinksBelow"></span>
</div>
- <span wicket:id="associatedActionLinksRight"></span>
+ <span wicket:id="associatedActionLinksRight"
+ >[drop down]</span>
</div>
- <input type="checkbox" wicket:id="scalarIfCompact" />
+
+ <input type="checkbox"
+ wicket:id="scalarIfCompact"/>
</div>
</wicket:panel>
</body>
http://git-wip-us.apache.org/repos/asf/isis/blob/6a9e95a5/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
index c67d982..d6ffdad 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.html
@@ -24,33 +24,70 @@
lang="en">
<body>
<wicket:panel>
- <div class="referencePanel scalarNameAndValueComponentType">
- <div class="form-group" wicket:id="scalarIfRegular">
- <label wicket:id="scalarName" class="scalarName control-label">[Label text]</label>
+ <div class="scalarNameAndValueComponentType referencePanel"
+ wicket:id="scalarTypeContainer"
+ >
+
+ <div class="form-group"
+ wicket:id="scalarIfRegular">
+
+ <label class="scalarName control-label"
+ wicket:id="scalarName"
+ >[Label text]</label>
+
<span class="scalarValueWrapper">
+
<div class="scalarPlaceholder entityLinkSelect2Panel entityLinkComponentType">
+
<span class="entityLink wrapper">
+
<span class="scalarValueInput">
<span class="editing">
+
+ <wicket:remove>
+ <a href="#"
+ name="scalarValueEditInline"
+ class="form-control input-sm scalarValueEditInline"
+ xwicket:id="scalarValueEditInline">
+ <span xwicket:id="scalarValueEditInlineLabel"></span>
+ </a>
+ </wicket:remove>
+
<span class="autoCompletePlaceholder">
<span wicket:id="entityLink">link or drop down</span>
<span wicket:id="entityIconAndTitle">[icon and title]</span>
</span>
<span wicket:id="entityTitleIfNull">(none)</span>
- <a wicket:id="editProperty" href="#" class="edit fa fa-pencil-square-o"/>
+
+ <a href="#"
+ class="edit fa fa-pencil-square-o"
+ wicket:id="editProperty"></a>
</span>
</span>
</span>
- <span wicket:id="associatedActionLinksRight" class="associatedActionLinksRight"></span>
+ <span class="associatedActionLinksRight"
+ wicket:id="associatedActionLinksRight"
+ >[drop down]</span>
</div>
<span wicket:id="feedback" class="help-block"></span>
<span wicket:id="associatedActionLinksBelow"></span>
</span>
- <div class="clearfix"/>
+ <div class="clearfix"></div>
</div>
- <div wicket:id="scalarIfCompact" class="scalarIfCompact">
+
+ <wicket:remove>
+ <div class="inlineEditForm"
+ xwicket:id="scalarIfRegularInlineEditForm" >
+ <div><span>property edit form</span></div>
+ </div>
+ </wicket:remove>
+
+ <div class="scalarIfCompact"
+ wicket:id="scalarIfCompact" >
<div class="scalarValue">
- <div class="entityLink" wicket:id="entityLink">[property or parameter value]</div>
+ <div class="entityLink"
+ wicket:id="entityLink"
+ >[property or parameter value]</div>
</div>
</div>
</div>
http://git-wip-us.apache.org/repos/asf/isis/blob/6a9e95a5/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
index 435312b..d600e78 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
@@ -77,6 +77,11 @@ public class ReferencePanel extends ScalarPanelAbstract implements PanelWithChoi
private static final String ID_AUTO_COMPLETE = "autoComplete";
private static final String ID_ENTITY_ICON_TITLE = "entityIconAndTitle";
+ private static final String ID_SCALAR_VALUE_EDIT_INLINE = "scalarValueEditInline";
+ private static final String ID_SCALAR_VALUE_EDIT_INLINE_LABEL = "scalarValueEditInlineLabel";
+
+ private static final String ID_SCALAR_IF_REGULAR_INLINE_EDIT_FORM = "scalarIfRegularInlineEditForm";
+
/**
* Determines the behaviour of dependent choices for the dependent; either to autoselect the first available choice, or to select none.
*/
@@ -89,6 +94,9 @@ public class ReferencePanel extends ScalarPanelAbstract implements PanelWithChoi
private EntityLinkSimplePanel entitySimpleLink;
+ protected WebMarkupContainer scalarIfRegularInlineEditForm;
+ protected WebMarkupContainer editInlineLink;
+
public ReferencePanel(final String id, final ScalarModel scalarModel) {
super(id, scalarModel);
}
@@ -112,8 +120,8 @@ public class ReferencePanel extends ScalarPanelAbstract implements PanelWithChoi
final WebMarkupContainer labelIfCompact = new WebMarkupContainer(ID_SCALAR_IF_COMPACT);
labelIfCompact.add(entitySimpleLink);
-
- addOrReplace(labelIfCompact);
+
+ scalarTypeContainer.addOrReplace(labelIfCompact);
return labelIfCompact;
}
@@ -159,7 +167,7 @@ public class ReferencePanel extends ScalarPanelAbstract implements PanelWithChoi
addPositioningCssTo(scalarIfRegularFormGroup, entityActions);
- addOrReplace(scalarIfRegularFormGroup);
+ scalarTypeContainer.addOrReplace(scalarIfRegularFormGroup);
addFeedbackOnlyTo(scalarIfRegularFormGroup, select2.component()); // this is a placeholder; when select2.component() is available, we use that instead
addEditPropertyTo(scalarIfRegularFormGroup);
http://git-wip-us.apache.org/repos/asf/isis/blob/6a9e95a5/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.html
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.html b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.html
index 26b41c7..c102463 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.html
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.html
@@ -24,26 +24,61 @@
lang="en">
<body>
<wicket:panel>
- <div class="valueChoicesSelect2Panel scalarNameAndValueComponentType">
- <div class="form-group" wicket:id="scalarIfRegular">
- <label wicket:id="scalarName" class="scalarName control-label">[Label text]</label>
+ <div class="scalarNameAndValueComponentType valueChoicesSelect2Panel "
+ wicket:id="scalarTypeContainer"
+ >
+ <div class="form-group"
+ wicket:id="scalarIfRegular">
+
+ <label class="scalarName control-label"
+ wicket:id="scalarName"
+ >[Label text]</label>
<span class="scalarValueWrapper">
<div class="scalarPlaceholder">
+
<span class="scalarValueInput">
<span class="editing">
- <select wicket:id="scalarValue" class="choices input-sm select2-remote" style="width: 99.8%;"></select>
- <a wicket:id="editProperty" href="#" class="edit fa fa-pencil-square-o"/>
+
+ <wicket:remove>
+ <a href="#"
+ name="scalarValueEditInline"
+ class="form-control input-sm scalarValueEditInline"
+ xwicket:id="scalarValueEditInline">
+ <span xwicket:id="scalarValueEditInlineLabel"></span>
+ </a>
+ </wicket:remove>
+
+ <select class="choices input-sm select2-remote"
+ style="width: 99.8%;"
+ wicket:id="scalarValue"
+ ></select>
+ <a href="#"
+ class="edit fa fa-pencil-square-o"
+ wicket:id="editProperty"></a>
</span>
</span>
- <span wicket:id="associatedActionLinksRight" class="associatedActionLinksRight"></span>
+ <span class="associatedActionLinksRight"
+ wicket:id="associatedActionLinksRight"
+ >[drop down]</span>
</div>
<span wicket:id="feedback" class="help-block"></span>
<span wicket:id="associatedActionLinksBelow"></span>
</span>
<div class="clearfix"></div>
</div>
- <span wicket:id="scalarIfCompact"></span>
+
+
+ <wicket:remove>
+ <div class="inlineEditForm"
+ xwicket:id="scalarIfRegularInlineEditForm" >
+ <div><span>property edit form</span></div>
+ </div>
+ </wicket:remove>
+
+
+ <span class="scalarIfCompact"
+ wicket:id="scalarIfCompact"></span>
</div>
</wicket:panel>
</body>
http://git-wip-us.apache.org/repos/asf/isis/blob/6a9e95a5/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
index 4c1c2c6..429df19 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
@@ -27,6 +27,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxRequestTarget;
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.model.IModel;
import org.apache.wicket.model.Model;
@@ -56,6 +57,9 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
private Select2 select2;
private ObjectAdapterMemento pending;
+ protected WebMarkupContainer scalarIfRegularInlineEditForm;
+ protected WebMarkupContainer editInlineLink;
+
public ValueChoicesSelect2Panel(final String id, final ScalarModel scalarModel) {
super(id, scalarModel);
pending = scalarModel.getObjectAdapterMemento();
@@ -87,7 +91,7 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
scalarIfRegularFormGroup.add(new CssClassAppender("mandatory"));
}
- addOrReplace(scalarIfRegularFormGroup);
+ scalarTypeContainer.addOrReplace(scalarIfRegularFormGroup);
final Label scalarName = new Label(ID_SCALAR_NAME, getRendering().getLabelCaption(select2.component()));
if(getModel().isRequired()) {
@@ -153,7 +157,7 @@ public class ValueChoicesSelect2Panel extends ScalarPanelAbstract implements Sca
@Override
protected Component addComponentForCompact() {
final Label labelIfCompact = new Label(ID_SCALAR_IF_COMPACT, getModel().getObjectAsString());
- addOrReplace(labelIfCompact);
+ scalarTypeContainer.addOrReplace(labelIfCompact);
return labelIfCompact;
}