You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by ah...@apache.org on 2022/03/20 18:43:17 UTC
[isis] branch master updated: ISIS-2877: revert some of the prev. renaming stuff
This is an automated email from the ASF dual-hosted git repository.
ahuber pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
The following commit(s) were added to refs/heads/master by this push:
new 601df49 ISIS-2877: revert some of the prev. renaming stuff
601df49 is described below
commit 601df49b32e25547be1efb810d980ce9c377fbf9
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Mar 20 19:43:05 2022 +0100
ISIS-2877: revert some of the prev. renaming stuff
---
.../components/scalars/ScalarFragmentFactory.java | 14 +---
.../ui/components/scalars/ScalarPanelAbstract.java | 92 +++++++++++-----------
.../scalars/ScalarPanelFormFieldAbstract.java | 10 +--
.../scalars/ScalarPanelSelectAbstract.java | 4 +-
.../blobclob/IsisBlobOrClobPanelAbstract.java | 8 +-
.../scalars/reference/ReferencePanel.java | 10 +--
.../valuechoices/ValueChoicesSelect2Panel.java | 12 +--
.../ui/components/tree/ParentedTreePanel.java | 12 +--
8 files changed, 78 insertions(+), 84 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarFragmentFactory.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarFragmentFactory.java
index 14db6ea..3318aaf 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarFragmentFactory.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarFragmentFactory.java
@@ -42,9 +42,9 @@ import lombok.experimental.UtilityClass;
public class ScalarFragmentFactory {
@RequiredArgsConstructor
- public static enum FragmentContainer {
- SCALAR_IF_OUTPUT("scalarIfCompact"),
- SCALAR_IF_INPUT("scalarIfRegular"),
+ public static enum FrameFragment {
+ COMPACT("scalarIfCompact"),
+ REGULAR("scalarIfRegular"),
;
@Getter
private final String containerId;
@@ -55,9 +55,6 @@ public class ScalarFragmentFactory {
// -- OUTPUT FRAGMENTS
- @Deprecated
- private static final String ID_SCALAR_IF_COMPACT = "scalarIfCompact";
-
@RequiredArgsConstructor
public static enum CompactFragment {
CHECKBOX("fragment-compact-checkbox"),
@@ -66,15 +63,12 @@ public class ScalarFragmentFactory {
private final String fragmentId;
public Fragment createFragment(final MarkupContainer container) {
return Wkt.fragmentAdd(
- container, ID_SCALAR_IF_COMPACT, fragmentId);
+ container, FrameFragment.COMPACT.getContainerId(), fragmentId);
}
}
// INPUT FRAGMENTS
- @Deprecated
- private static final String ID_SCALAR_IF_REGULAR = "scalarIfRegular";
-
@RequiredArgsConstructor
public static enum InputFragment {
TEXT("fragment-input-text"),
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
index 01dd7ab..26e8c2e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
@@ -62,7 +62,7 @@ import org.apache.isis.viewer.wicket.ui.components.actionmenu.entityactions.Link
import org.apache.isis.viewer.wicket.ui.components.property.PropertyEditFormPanel;
import org.apache.isis.viewer.wicket.ui.components.property.PropertyEditPanel;
import org.apache.isis.viewer.wicket.ui.components.propertyheader.PropertyEditPromptHeaderPanel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.FragmentContainer;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.FrameFragment;
import org.apache.isis.viewer.wicket.ui.components.scalars.blobclob.IsisBlobOrClobPanelAbstract;
import org.apache.isis.viewer.wicket.ui.components.scalars.primitive.BooleanPanel;
import org.apache.isis.viewer.wicket.ui.components.scalars.reference.ReferencePanel;
@@ -211,30 +211,30 @@ implements ScalarModelSubscriber {
@Getter @Accessors(fluent = true)
private final ScalarModel scalarModel;
- // -- OUTPUT FORMAT
+ // -- COMPACT FRAME
- private Component componentIfOutput;
- protected final Component getComponentForOutput() { return componentIfOutput; }
+ private Component frameIfCompact;
+ protected final Component getCompactFrame() { return frameIfCompact; }
/**
- * Builds the component to render the model when in OUTPUT format.
- * <p>Is added to {@link #getScalarInputOutputContainer()}.
+ * Builds the component to render the model when in COMPACT form.
+ * <p>Is added to {@link #getScalarFrameContainer()}.
*/
- protected abstract Component createComponentForOutput();
+ protected abstract Component createCompactFrame();
// -- INPUT FORMAT
- private MarkupContainer componentIfInput;
- protected final MarkupContainer getComponentForInput() { return componentIfInput; }
+ private MarkupContainer frameIfRegular;
+ protected final MarkupContainer getRegularFrame() { return frameIfRegular; }
/**
- * Builds the component to render the model when in INPUT format.
- * <p>Is added to {@link #getScalarInputOutputContainer()}.
+ * Builds the component to render the model when in REGULAR format.
+ * <p>Is added to {@link #getScalarFrameContainer()}.
*/
- protected abstract MarkupContainer createComponentForInput();
+ protected abstract MarkupContainer createRegularFrame();
// --
- private WebMarkupContainer scalarInputOutputContainer;
- protected final WebMarkupContainer getScalarInputOutputContainer() { return scalarInputOutputContainer; }
+ private WebMarkupContainer scalarFrameContainer;
+ protected final WebMarkupContainer getScalarFrameContainer() { return scalarFrameContainer; }
/**
* Used by most subclasses
@@ -316,34 +316,34 @@ implements ScalarModelSubscriber {
*/
private void buildGui() {
- scalarInputOutputContainer = Wkt.containerAdd(this, ID_SCALAR_TYPE_CONTAINER);
- Wkt.cssAppend(scalarInputOutputContainer, getCssClassName());
+ scalarFrameContainer = Wkt.containerAdd(this, ID_SCALAR_TYPE_CONTAINER);
+ Wkt.cssAppend(scalarFrameContainer, getCssClassName());
switch(scalarModel.getRenderingHint()) {
case REGULAR:
- componentIfInput = createComponentForInput();
- componentIfOutput = createShallowComponentForOutput();
- componentIfInput.setVisible(true);
- componentIfOutput.setVisible(false);
- componentIfInput.setOutputMarkupId(true); // enable as AJAX target
+ frameIfRegular = createRegularFrame();
+ frameIfCompact = createShallowComponentForCompact();
+ frameIfRegular.setVisible(true);
+ frameIfCompact.setVisible(false);
+ frameIfRegular.setOutputMarkupId(true); // enable as AJAX target
- scalarInputOutputContainer.addOrReplace(componentIfOutput, componentIfInput,
+ scalarFrameContainer.addOrReplace(frameIfCompact, frameIfRegular,
scalarIfRegularInlinePromptForm = createInlinePromptForm());
val associatedLinksAndLabels = associatedLinksAndLabels();
- addPositioningCssTo(componentIfInput, associatedLinksAndLabels);
- addActionLinksBelowAndRight(componentIfInput, associatedLinksAndLabels);
+ addPositioningCssTo(frameIfRegular, associatedLinksAndLabels);
+ addActionLinksBelowAndRight(frameIfRegular, associatedLinksAndLabels);
- addFeedbackOnlyTo(componentIfInput, getValidationFeedbackReceiver());
+ addFeedbackOnlyTo(frameIfRegular, getValidationFeedbackReceiver());
break;
default:
- componentIfInput = createShallowComponentForInput();
- componentIfOutput = createComponentForOutput();
- componentIfInput.setVisible(false);
- componentIfOutput.setVisible(true);
+ frameIfRegular = createShallowComponentForRegular();
+ frameIfCompact = createCompactFrame();
+ frameIfRegular.setVisible(false);
+ frameIfCompact.setVisible(true);
- scalarInputOutputContainer.addOrReplace(componentIfOutput, componentIfInput,
+ scalarFrameContainer.addOrReplace(frameIfCompact, frameIfRegular,
scalarIfRegularInlinePromptForm = createInlinePromptForm());
break;
@@ -352,7 +352,7 @@ implements ScalarModelSubscriber {
val inlinePromptConfig = getInlinePromptConfig();
if(inlinePromptConfig.isSupported()) {
- componentIfInput
+ frameIfRegular
.add(inlinePromptLink = createInlinePromptLink());
// even if this particular scalarModel (property) is not configured for inline edits,
@@ -360,8 +360,8 @@ implements ScalarModelSubscriber {
scalarModel.setInlinePromptContext(
new InlinePromptContext(
scalarModel,
- scalarInputOutputContainer,
- componentIfInput, scalarIfRegularInlinePromptForm));
+ scalarFrameContainer,
+ frameIfRegular, scalarIfRegularInlinePromptForm));
// start off assuming that neither the property nor any of the associated actions
// are using inline prompts
@@ -427,20 +427,20 @@ implements ScalarModelSubscriber {
.collect(Can.toCan());
}
/**
- * Builds the hidden INPUT component when in OUTPUT format.
- * <p>Is added to {@link #getScalarInputOutputContainer()}.
+ * Builds the hidden REGULAR component when in COMPACT format.
+ * <p>Is added to {@link #getScalarFrameContainer()}.
*/
- protected MarkupContainer createShallowComponentForInput() {
- return FragmentContainer.SCALAR_IF_INPUT
+ protected MarkupContainer createShallowComponentForRegular() {
+ return FrameFragment.REGULAR
.createComponent(Wkt::container); // empty component;
}
/**
- * Builds the hidden OUTPUT component when in INPUT format.
- * <p>Is added to {@link #getScalarInputOutputContainer()}.
+ * Builds the hidden COMPACT component when in REGULAR format.
+ * <p>Is added to {@link #getScalarFrameContainer()}.
*/
- protected Component createShallowComponentForOutput() {
- return FragmentContainer.SCALAR_IF_OUTPUT
+ protected Component createShallowComponentForCompact() {
+ return FrameFragment.COMPACT
.createComponent(Wkt::container); // empty component;
}
@@ -659,10 +659,10 @@ implements ScalarModelSubscriber {
switchFormForInlinePrompt(target);
- getComponentForInput().setVisible(false);
+ getRegularFrame().setVisible(false);
scalarIfRegularInlinePromptForm.setVisible(true);
- target.add(scalarInputOutputContainer);
+ target.add(scalarFrameContainer);
Wkt.focusOnMarkerAttribute(scalarIfRegularInlinePromptForm, target);
}
@@ -670,7 +670,7 @@ implements ScalarModelSubscriber {
private void switchFormForInlinePrompt(final AjaxRequestTarget target) {
scalarIfRegularInlinePromptForm = (PropertyEditFormPanel) getComponentFactoryRegistry()
.addOrReplaceComponent(
- scalarInputOutputContainer,
+ scalarFrameContainer,
ID_SCALAR_IF_REGULAR_INLINE_PROMPT_FORM,
ComponentType.PROPERTY_EDIT_FORM,
scalarModel);
@@ -691,12 +691,12 @@ implements ScalarModelSubscriber {
protected WebMarkupContainer addEditPropertyIf(final boolean condition) {
if(condition) {
- val editProperty = Wkt.containerAdd(componentIfInput, ID_EDIT_PROPERTY);
+ val editProperty = Wkt.containerAdd(frameIfRegular, ID_EDIT_PROPERTY);
Wkt.behaviorAddOnClick(editProperty, this::onPropertyEditClick);
WktTooltips.addTooltip(editProperty, "edit");
return editProperty;
} else {
- WktComponents.permanentlyHide(componentIfInput, ID_EDIT_PROPERTY);
+ WktComponents.permanentlyHide(frameIfRegular, ID_EDIT_PROPERTY);
return null;
}
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.java
index a3232d7..fcce6f2 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelFormFieldAbstract.java
@@ -38,7 +38,7 @@ import org.apache.isis.core.runtime.context.IsisAppCommonContext;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.model.util.CommonContextUtils;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.CompactFragment;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.FragmentContainer;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.FrameFragment;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.InputFragment;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
@@ -80,7 +80,7 @@ extends ScalarPanelAbstract {
// -- REGULAR
@Override
- protected final MarkupContainer createComponentForInput() {
+ protected final MarkupContainer createRegularFrame() {
val scalarModel = scalarModel();
val friendlyNameModel = Model.of(scalarModel.getFriendlyName());
@@ -88,7 +88,7 @@ extends ScalarPanelAbstract {
formComponent = createFormComponent(ID_SCALAR_VALUE, scalarModel);
formComponent.setLabel(friendlyNameModel);
- val formGroup = FragmentContainer.SCALAR_IF_INPUT
+ val formGroup = FrameFragment.REGULAR
.createComponent(id->new FormGroup(id, formComponent));
formGroup.add(formComponent);
@@ -110,8 +110,8 @@ extends ScalarPanelAbstract {
// -- COMPACT
@Override
- protected final Component createComponentForOutput() {
- return FragmentContainer.SCALAR_IF_OUTPUT
+ protected final Component createCompactFrame() {
+ return FrameFragment.COMPACT
.createComponent(this::createComponentForOutput);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java
index af57b9b..015d414 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelSelectAbstract.java
@@ -34,7 +34,7 @@ import org.wicketstuff.select2.ChoiceProvider;
import org.apache.isis.core.metamodel.objectmanager.memento.ObjectMemento;
import org.apache.isis.viewer.common.model.feature.ParameterUiModel;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.FragmentContainer;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.FrameFragment;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.Select2;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.ObjectAdapterMementoProviderAbstract;
@@ -77,7 +77,7 @@ extends ScalarPanelAbstract {
select2.asComponent().setOutputMarkupId(true);
select2.setLabel(friendlyNameModel);
- final FormGroup formGroup = FragmentContainer.SCALAR_IF_INPUT
+ final FormGroup formGroup = FrameFragment.REGULAR
.createComponent(id->new FormGroup(id, formComponent));
formGroup.add(formComponent);
formGroup.addOrReplace(createScalarNameLabel(ID_SCALAR_NAME, friendlyNameModel));
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java
index 0ac9317..0e4da16 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/blobclob/IsisBlobOrClobPanelAbstract.java
@@ -107,8 +107,8 @@ extends ScalarPanelFormFieldAbstract<T> {
// //////////////////////////////////////
@Override
- protected MarkupContainer createShallowComponentForInput() {
- val shallowRegular = super.createShallowComponentForInput();
+ protected MarkupContainer createShallowComponentForRegular() {
+ val shallowRegular = super.createShallowComponentForRegular();
WktComponents.permanentlyHide(shallowRegular,
ID_IMAGE, ID_SCALAR_NAME, ID_SCALAR_VALUE, ID_FEEDBACK,
ID_ASSOCIATED_ACTION_LINKS_BELOW, ID_ASSOCIATED_ACTION_LINKS_RIGHT);
@@ -169,7 +169,7 @@ extends ScalarPanelFormFieldAbstract<T> {
final String disabledReason,
final Optional<AjaxRequestTarget> target) {
- final MarkupContainer formComponent = getComponentForInput();
+ final MarkupContainer formComponent = getRegularFrame();
setRenderModeOn(formComponent, renderMode, disabledReason, target);
final Component scalarValueComponent = formComponent.get(ID_SCALAR_VALUE);
@@ -240,7 +240,7 @@ extends ScalarPanelFormFieldAbstract<T> {
final ScalarRenderMode renderMode,
final Optional<AjaxRequestTarget> target) {
- final MarkupContainer formComponent = getComponentForInput();
+ final MarkupContainer formComponent = getRegularFrame();
final AjaxLink<Void> ajaxLink = Wkt.linkAdd(formComponent, ID_SCALAR_IF_REGULAR_CLEAR, ajaxTarget->{
setEnabled(false);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
index 5085f1c..89b8123 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
@@ -38,7 +38,7 @@ import org.apache.isis.viewer.common.model.object.ObjectUiModel.HasRenderingHint
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelSelectAbstract;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.FragmentContainer;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.FrameFragment;
import org.apache.isis.viewer.wicket.ui.components.widgets.bootstrap.FormGroup;
import org.apache.isis.viewer.wicket.ui.components.widgets.entitysimplelink.EntityLinkSimplePanel;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.Select2;
@@ -80,7 +80,7 @@ public class ReferencePanel extends ScalarPanelSelectAbstract {
// First called as a side-effect of {@link #beforeRender()}
@Override
- protected Component createComponentForOutput() {
+ protected Component createCompactFrame() {
this.isOutputFormat = true;
@@ -93,7 +93,7 @@ public class ReferencePanel extends ScalarPanelSelectAbstract {
entityLinkOutputFormat.setOutputMarkupId(true);
entityLinkOutputFormat.setLabel(Model.of(name));
- val labelIfOutput = FragmentContainer.SCALAR_IF_OUTPUT
+ val labelIfOutput = FrameFragment.COMPACT
.createComponent(WebMarkupContainer::new);
labelIfOutput.add(entityLinkOutputFormat);
@@ -103,7 +103,7 @@ public class ReferencePanel extends ScalarPanelSelectAbstract {
// First called as a side-effect of {@link #beforeRender()}
@Override
- protected FormGroup createComponentForInput() {
+ protected FormGroup createRegularFrame() {
this.entityLink = new EntityLinkSelect2Panel(ComponentType.ENTITY_LINK.getId(), this);
@@ -218,7 +218,7 @@ public class ReferencePanel extends ScalarPanelSelectAbstract {
val adapter = scalarModel.getObject();
// syncLinkWithInput
- final MarkupContainer componentForRegular = getComponentForInput();
+ final MarkupContainer componentForRegular = getRegularFrame();
if(componentForRegular != null) {
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
index f3d72ea..6ae5cc9 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/valuechoices/ValueChoicesSelect2Panel.java
@@ -32,7 +32,7 @@ import org.apache.isis.commons.internal.base._Strings;
import org.apache.isis.core.metamodel.objectmanager.memento.ObjectMemento;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelSelectAbstract;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.FragmentContainer;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.FrameFragment;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.Select2;
import org.apache.isis.viewer.wicket.ui.components.widgets.select2.providers.ObjectAdapterMementoProviderForValueChoices;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
@@ -54,14 +54,14 @@ extends ScalarPanelSelectAbstract {
// --
@Override
- protected Component createComponentForOutput() {
+ protected Component createCompactFrame() {
isOutputFormat = true;
- return FragmentContainer.SCALAR_IF_OUTPUT
+ return FrameFragment.COMPACT
.createComponent(id->Wkt.label(id, "placeholder"));
}
@Override
- protected MarkupContainer createComponentForInput() {
+ protected MarkupContainer createRegularFrame() {
if(select2 == null) {
this.select2 = createSelect2(ID_SCALAR_VALUE);
} else {
@@ -111,7 +111,7 @@ extends ScalarPanelSelectAbstract {
}
private void clearTitleAttribute() {
- val target = getComponentForInput();
+ val target = getRegularFrame();
WktTooltips.clearTooltip(target);
}
@@ -120,7 +120,7 @@ extends ScalarPanelSelectAbstract {
clearTitleAttribute();
return;
}
- val target = getComponentForInput();
+ val target = getRegularFrame();
WktTooltips.addTooltip(target, titleAttribute);
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/ParentedTreePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/ParentedTreePanel.java
index b5e6ef6..1d6286c 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/ParentedTreePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/tree/ParentedTreePanel.java
@@ -22,7 +22,7 @@ import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.FragmentContainer;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory.FrameFragment;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
import lombok.val;
@@ -40,14 +40,14 @@ extends ScalarPanelAbstract {
}
@Override
- protected MarkupContainer createComponentForInput() {
- return FragmentContainer.SCALAR_IF_INPUT
+ protected MarkupContainer createRegularFrame() {
+ return FrameFragment.REGULAR
.createComponent(this::createTreeComponent);
}
@Override
- protected MarkupContainer createComponentForOutput() {
- return FragmentContainer.SCALAR_IF_OUTPUT
+ protected MarkupContainer createCompactFrame() {
+ return FrameFragment.COMPACT
.createComponent(this::createTreeComponent);
}
@@ -64,7 +64,7 @@ extends ScalarPanelAbstract {
// -- HELPER
private MarkupContainer createTreeComponent(final String id) {
- val container = getScalarInputOutputContainer();
+ val container = getScalarFrameContainer();
val scalarModel = scalarModel();
val tree = IsisToWicketTreeAdapter.adapt(id, scalarModel);
container.add(tree);