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/04 14:41:53 UTC
[isis] branch master updated: ISIS-2877: adds ScalarPanelTextFieldWithComposite (stub)
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 7491004 ISIS-2877: adds ScalarPanelTextFieldWithComposite (stub)
7491004 is described below
commit 7491004d318f60a70d193144310a0ecb7161fba5
Author: Andi Huber <ah...@apache.org>
AuthorDate: Fri Mar 4 15:41:28 2022 +0100
ISIS-2877: adds ScalarPanelTextFieldWithComposite (stub)
---
.../value/semantics/ValueSemanticsProvider.java | 4 +++
.../ui/components/scalars/ScalarPanelAbstract.java | 3 +-
.../scalars/ScalarPanelTextFieldWithComposite.java | 38 ++++++++++++++++++++++
.../wicket/ui/panels/PromptFormAbstract.java | 1 -
.../ComponentFactoryRegistrarDefault.java | 25 ++++++++++++++
5 files changed, 68 insertions(+), 3 deletions(-)
diff --git a/api/applib/src/main/java/org/apache/isis/applib/value/semantics/ValueSemanticsProvider.java b/api/applib/src/main/java/org/apache/isis/applib/value/semantics/ValueSemanticsProvider.java
index 5185d25..702cebc 100644
--- a/api/applib/src/main/java/org/apache/isis/applib/value/semantics/ValueSemanticsProvider.java
+++ b/api/applib/src/main/java/org/apache/isis/applib/value/semantics/ValueSemanticsProvider.java
@@ -137,4 +137,8 @@ public interface ValueSemanticsProvider<T> {
|| getSchemaValueType().name().contains("TIME");
}
+ default boolean isCompositeType() {
+ return getSchemaValueType()==ValueType.COMPOSITE;
+ }
+
}
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 80d1863..d63b8d7 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
@@ -369,8 +369,7 @@ implements ScalarModelSubscriber {
val componentToHideRef = _Refs.<Component>objectRef(inlinePromptLink);
- if (scalarModel.getPromptStyle().isInline()
- && scalarModel.canEnterEditMode()) {
+ if (scalarModel.getPromptStyle().isInline()) {
// we configure the prompt link if _this_ property is configured for inline edits...
Wkt.behaviorAddOnClick(inlinePromptLink, this::onPropertyInlineEditClick);
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
new file mode 100644
index 0000000..2b54c3c
--- /dev/null
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithComposite.java
@@ -0,0 +1,38 @@
+/*
+ * 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 java.io.Serializable;
+
+import org.apache.isis.viewer.wicket.model.models.ScalarModel;
+
+public class ScalarPanelTextFieldWithComposite<T extends Serializable>
+extends ScalarPanelTextFieldWithValueSemantics<T> {
+
+ private static final long serialVersionUID = 1L;
+
+ public ScalarPanelTextFieldWithComposite(
+ final String id,
+ final ScalarModel scalarModel,
+ final Class<T> valueType) {
+
+ super(id, scalarModel, valueType, TextFieldVariant.MULTI_LINE);
+ }
+
+}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormAbstract.java
index 78ac14c..07f70dc 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/panels/PromptFormAbstract.java
@@ -31,7 +31,6 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.model.IModel;
-import org.apache.isis.commons.internal.base._Casts;
import org.apache.isis.commons.internal.base._Either;
import org.apache.isis.commons.internal.collections._Lists;
import org.apache.isis.commons.internal.debug._Probe;
diff --git a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
index cf89790..856fb12 100644
--- a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
+++ b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
@@ -63,6 +63,7 @@ import org.apache.isis.viewer.wicket.ui.components.property.PropertyEditFormPane
import org.apache.isis.viewer.wicket.ui.components.property.PropertyEditPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.scalars.ComponentFactoryScalarAbstract;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldNumeric;
+import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldWithComposite;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldWithTemporalPicker;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldWithValueSemantics;
import org.apache.isis.viewer.wicket.ui.components.scalars.blobclob.IsisBlobPanelFactory;
@@ -295,6 +296,10 @@ public class ComponentFactoryRegistrarDefault implements ComponentFactoryRegistr
return createScalarPanelUsingTemporalPicker(valueSemantics.getCorrespondingClass());
}
+ if(valueSemantics.isCompositeType()) {
+ return createScalarPanelForComposite(valueSemantics.getCorrespondingClass());
+ }
+
return createScalarPanelUsingTextField(valueSemantics.getCorrespondingClass());
}
@@ -356,6 +361,26 @@ public class ComponentFactoryRegistrarDefault implements ComponentFactoryRegistr
};
}
+ public static <T extends Serializable> ComponentFactoryScalarAbstract
+ createScalarPanelForComposite(final Class<T> valueTypeClass) {
+
+ // assuming there is no primitive temporal type
+ val valueTypeClasses = Can.<Class<?>>ofSingleton(valueTypeClass);
+
+ return new ComponentFactoryScalarAbstract(
+ ScalarPanelTextFieldWithComposite.class,
+ valueTypeClasses) {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Component createComponent(final String id, final ScalarModel scalarModel) {
+ return new ScalarPanelTextFieldWithComposite<T>(id, scalarModel, valueTypeClass);
+ }
+
+ };
+ }
+
// -- HELPER
private static Can<Class<?>> withPrimitiveVariant(final @NonNull Class<?> valueTypeClass) {