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/21 16:28:43 UTC
[isis] branch master updated: ISIS-2877: removal of TextFieldVariant
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 6f6f105 ISIS-2877: removal of TextFieldVariant
6f6f105 is described below
commit 6f6f10572208bec39650c9882da3b9bfa7380100
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Mar 21 17:28:34 2022 +0100
ISIS-2877: removal of TextFieldVariant
---
.../ui/components/scalars/ScalarPanelAbstract.java | 10 +++++---
.../scalars/ScalarPanelTextFieldAbstract.java | 29 ++++++----------------
.../ScalarPanelTextFieldTextualAbstract.java | 5 ----
.../scalars/ScalarPanelTextFieldWithComposite.java | 8 ++----
.../ScalarPanelTextFieldWithValueSemantics.java | 8 ------
.../ui/components/scalars/TextFieldVariant.java | 27 --------------------
.../scalars/markup/ScalarMarkupPanel.java | 9 ++-----
.../scalars/string/MultiLineStringPanel.java | 10 ++++++--
8 files changed, 25 insertions(+), 81 deletions(-)
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 aab6e33..8197099 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
@@ -138,9 +138,7 @@ implements ScalarModelSubscriber {
@Getter
private final ImmutableEnumSet<FormatModifier> formatModifiers;
- protected EnumSet<FormatModifier> createFormatModifiers(final ScalarModel scalarModel) {
- return EnumSet.noneOf(FormatModifier.class);
- }
+ protected void setupFormatModifiers(final EnumSet<FormatModifier> modifiers) {}
// -- COMPACT FRAME
@@ -182,7 +180,11 @@ implements ScalarModelSubscriber {
protected ScalarPanelAbstract(final String id, final ScalarModel scalarModel) {
super(id, scalarModel);
this.scalarModel = scalarModel;
- this.formatModifiers = ImmutableEnumSet.from(createFormatModifiers(scalarModel));
+
+ val formatModifiers = EnumSet.noneOf(FormatModifier.class);
+ setupFormatModifiers(formatModifiers);
+
+ this.formatModifiers = ImmutableEnumSet.from(formatModifiers);
}
// -- INIT
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
index c7e78e2..46538a5 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java
@@ -43,8 +43,6 @@ import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarFragmentFactory
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
-import lombok.AccessLevel;
-import lombok.Getter;
import lombok.NonNull;
import lombok.val;
@@ -65,23 +63,11 @@ extends ScalarPanelFormFieldAbstract<T> {
private AbstractTextComponent<T> formField;
- @Getter(value = AccessLevel.PROTECTED)
- private TextFieldVariant textFieldVariant;
-
protected ScalarPanelTextFieldAbstract(
final String id,
final ScalarModel scalarModel,
final Class<T> type) {
- this(id, scalarModel, type, TextFieldVariant.SINGLE_LINE);
- }
-
- protected ScalarPanelTextFieldAbstract(
- final String id,
- final ScalarModel scalarModel,
- final Class<T> type,
- final TextFieldVariant textFieldVariant) {
super(id, scalarModel, type);
- this.textFieldVariant = textFieldVariant;
}
// -- CONVERSION
@@ -107,12 +93,11 @@ extends ScalarPanelFormFieldAbstract<T> {
*/
protected AbstractTextComponent<T> createTextField(final String id) {
val converter = getConverter(scalarModel());
- val formFieldComponent = getTextFieldVariant().isSingleLine()
- ? Wkt.textFieldWithConverter(
+ return getFormatModifiers().contains(FormatModifier.MULITLINE)
+ ? Wkt.textAreaWithConverter(
id, unwrappedModel(), type, converter)
- : Wkt.textAreaWithConverter(
+ : Wkt.textFieldWithConverter(
id, unwrappedModel(), type, converter);
- return formFieldComponent;
}
protected final IModel<T> unwrappedModel() {
@@ -131,14 +116,14 @@ extends ScalarPanelFormFieldAbstract<T> {
@Override
protected Optional<InputFragment> getInputFragmentType() {
- return Optional.of(getTextFieldVariant().isSingleLine()
- ? InputFragment.TEXT
- : InputFragment.TEXTAREA);
+ return Optional.of(getFormatModifiers().contains(FormatModifier.MULITLINE)
+ ? InputFragment.TEXTAREA
+ : InputFragment.TEXT);
}
@Override
protected String obtainInlinePromptLinkCssIfAny() {
- return getTextFieldVariant().isSingleLine()
+ return !getFormatModifiers().contains(FormatModifier.MULITLINE)
? super.obtainInlinePromptLinkCssIfAny()
/* Most other components require 'form-control form-control-sm' on the owning inline prompt link.
* For TextArea, however, this instead appears on the TextArea itself.
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldTextualAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldTextualAbstract.java
index 55593c0..7027392 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldTextualAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldTextualAbstract.java
@@ -41,11 +41,6 @@ extends ScalarPanelTextFieldAbstract<String> {
super(id, scalarModel, String.class);
}
- protected ScalarPanelTextFieldTextualAbstract(
- final String id, final ScalarModel scalarModel, final TextFieldVariant textFieldVariant) {
- super(id, scalarModel, String.class, textFieldVariant);
- }
-
@Override
protected final IConverter<String> getConverter(
final @NonNull ObjectFeature propOrParam,
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithComposite.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithComposite.java
index 73e82b5..637ba51 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithComposite.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithComposite.java
@@ -25,8 +25,6 @@ import org.apache.wicket.Component;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.markup.MarkupComponent;
-import lombok.val;
-
public class ScalarPanelTextFieldWithComposite<T>
extends ScalarPanelTextFieldWithValueSemantics<T> {
@@ -37,14 +35,12 @@ extends ScalarPanelTextFieldWithValueSemantics<T> {
final ScalarModel scalarModel,
final Class<T> valueType) {
- super(id, scalarModel, valueType, TextFieldVariant.MULTI_LINE);
+ super(id, scalarModel, valueType);
}
@Override
- protected EnumSet<FormatModifier> createFormatModifiers(final ScalarModel scalarModel) {
- val modifiers = super.createFormatModifiers(scalarModel);
+ protected void setupFormatModifiers(final EnumSet<FormatModifier> modifiers) {
modifiers.add(FormatModifier.COMPOSITE);
- return modifiers;
}
@Override
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithValueSemantics.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithValueSemantics.java
index fc7888b..f1b660e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithValueSemantics.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithValueSemantics.java
@@ -45,14 +45,6 @@ extends ScalarPanelTextFieldAbstract<T> {
super(id, scalarModel, type);
}
- public ScalarPanelTextFieldWithValueSemantics(
- final String id,
- final ScalarModel scalarModel,
- final Class<T> type,
- final TextFieldVariant textFieldVariant) {
- super(id, scalarModel, type, textFieldVariant);
- }
-
@Override
protected final IConverter<T> getConverter(
final @NonNull ObjectFeature propOrParam,
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldVariant.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldVariant.java
deleted file mode 100644
index 87492f8..0000000
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldVariant.java
+++ /dev/null
@@ -1,27 +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;
-
-@Deprecated //use FormatModifier instead
-public enum TextFieldVariant {
- SINGLE_LINE,
- MULTI_LINE;
- public boolean isSingleLine() { return this==SINGLE_LINE; }
- public boolean isMultiLine() { return this==MULTI_LINE; }
-}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/ScalarMarkupPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/ScalarMarkupPanel.java
index ebe02ec..0464805 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/ScalarMarkupPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/ScalarMarkupPanel.java
@@ -24,9 +24,6 @@ import org.apache.wicket.Component;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldWithValueSemantics;
-import org.apache.isis.viewer.wicket.ui.components.scalars.TextFieldVariant;
-
-import lombok.val;
/**
* Panel for rendering scalars of type {@link org.apache.isis.applib.value.Markup}.
@@ -43,16 +40,14 @@ extends ScalarPanelTextFieldWithValueSemantics<T> {
final Class<T> valueType,
final MarkupComponentFactory<ScalarModel> markupComponentFactory) {
- super(id, scalarModel, valueType, TextFieldVariant.MULTI_LINE);
+ super(id, scalarModel, valueType);
this.markupComponentFactory = markupComponentFactory;
}
@Override
- protected EnumSet<FormatModifier> createFormatModifiers(final ScalarModel scalarModel) {
- val modifiers = super.createFormatModifiers(scalarModel);
+ protected void setupFormatModifiers(final EnumSet<FormatModifier> modifiers) {
modifiers.add(FormatModifier.MARKUP);
modifiers.add(FormatModifier.MULITLINE);
- return modifiers;
}
@Override
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
index ee9b308..08c55c4 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/string/MultiLineStringPanel.java
@@ -18,9 +18,10 @@
*/
package org.apache.isis.viewer.wicket.ui.components.scalars.string;
+import java.util.EnumSet;
+
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldTextualAbstract;
-import org.apache.isis.viewer.wicket.ui.components.scalars.TextFieldVariant;
/**
* Panel for rendering MultiLine scalars of type String
@@ -31,7 +32,12 @@ extends ScalarPanelTextFieldTextualAbstract {
private static final long serialVersionUID = 1L;
public MultiLineStringPanel(final String id, final ScalarModel scalarModel) {
- super(id, scalarModel, TextFieldVariant.MULTI_LINE);
+ super(id, scalarModel);
+ }
+
+ @Override
+ protected void setupFormatModifiers(final EnumSet<FormatModifier> modifiers) {
+ modifiers.add(FormatModifier.MULITLINE);
}
}