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 2021/11/18 09:07:19 UTC
[isis] branch master updated: ISIS-2882: remove superfluous TextFieldStringModel
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 4180d20 ISIS-2882: remove superfluous TextFieldStringModel
4180d20 is described below
commit 4180d20092b6affe74ba0f8015b4a0432ccc7424
Author: Andi Huber <ah...@apache.org>
AuthorDate: Thu Nov 18 10:07:10 2021 +0100
ISIS-2882: remove superfluous TextFieldStringModel
---
.../components/scalars/TextFieldStringModel.java | 44 ----------------------
.../ui/components/scalars/TextFieldValueModel.java | 6 +--
.../scalars/string/MultiLineStringPanel.java | 4 +-
3 files changed, 4 insertions(+), 50 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldStringModel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldStringModel.java
deleted file mode 100644
index 3f0409e..0000000
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldStringModel.java
+++ /dev/null
@@ -1,44 +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.model.Model;
-
-public class TextFieldStringModel extends Model<String> {
- private static final long serialVersionUID = 1L;
- private final TextFieldValueModel.ScalarModelProvider scalarModelProvider;
-
- public TextFieldStringModel(final TextFieldValueModel.ScalarModelProvider scalarModelProvider) {
- this.scalarModelProvider = scalarModelProvider;
- }
-
- @Override
- public String getObject() {
- return scalarModelProvider.getModel().getObjectAsString();
- }
-
- @Override
- public void setObject(final String object) {
- if (object == null) {
- scalarModelProvider.getModel().setObject(null);
- } else {
- scalarModelProvider.getModel().setObjectAsString(object);
- }
- }
-}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldValueModel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldValueModel.java
index e8423eb..340b7c6 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldValueModel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/TextFieldValueModel.java
@@ -30,7 +30,7 @@ import lombok.val;
/**
* For custom {@link ScalarPanelTextFieldAbstract}s to use as the {@link Model}
- * of their {@link TextField} (as constructed in {@link ScalarPanelTextFieldAbstract#createTextFieldForRegular(String)}).
+ * of their {@link TextField} (as constructed in {@link ScalarPanelTextFieldAbstract#createTextField(String)}).
*/
public class TextFieldValueModel<T extends Serializable> extends Model<T> {
@@ -42,7 +42,7 @@ public class TextFieldValueModel<T extends Serializable> extends Model<T> {
private final ScalarModelProvider scalarModelProvider;
- public TextFieldValueModel(ScalarModelProvider scalarModelProvider) {
+ public TextFieldValueModel(final ScalarModelProvider scalarModelProvider) {
this.scalarModelProvider = scalarModelProvider;
}
@@ -54,7 +54,7 @@ public class TextFieldValueModel<T extends Serializable> extends Model<T> {
}
@SuppressWarnings("unchecked")
- private T asT(ManagedObject objectAdapter) {
+ private T asT(final ManagedObject objectAdapter) {
return (T) (objectAdapter != null? objectAdapter.getPojo(): null);
}
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 593ef50..df3dc23 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
@@ -30,7 +30,6 @@ import org.apache.isis.core.metamodel.facets.objectvalue.maxlen.MaxLengthFacet;
import org.apache.isis.core.metamodel.facets.objectvalue.multiline.MultiLineFacet;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldParseableAbstract;
-import org.apache.isis.viewer.wicket.ui.components.scalars.TextFieldStringModel;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
import lombok.val;
@@ -49,8 +48,7 @@ extends ScalarPanelTextFieldParseableAbstract {
@Override
protected AbstractTextComponent<String> createTextField(final String id) {
- val model = new TextFieldStringModel(this);
- val textArea = new TextArea<String>(id, model);
+ val textArea = new TextArea<String>(id, newTextFieldValueModel());
setRowsAndMaxLengthAttributesOn(textArea);
return textArea;
}