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/07 11:24:02 UTC
[isis] branch master updated: ISIS-2877: don't require value types to implement Serializable
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 b848908 ISIS-2877: don't require value types to implement Serializable
b848908 is described below
commit b8489088b20ec41a2d748b75d09ac2a633a3ab3a
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Mar 7 12:23:54 2022 +0100
ISIS-2877: don't require value types to implement Serializable
---
.../viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java | 3 ++-
.../wicket/ui/components/scalars/ScalarPanelTextFieldAbstract.java | 3 +--
.../wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java | 4 +---
.../ui/components/scalars/ScalarPanelTextFieldWithComposite.java | 4 +---
.../components/scalars/ScalarPanelTextFieldWithTemporalPicker.java | 3 +--
.../components/scalars/ScalarPanelTextFieldWithValueSemantics.java | 4 +---
.../wicket/ui/components/scalars/markup/MarkupPanelFactories.java | 6 +++---
.../markup/{ParentedMarkupPanel.java => ScalarMarkupPanel.java} | 6 ++----
8 files changed, 12 insertions(+), 21 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 e619dc9..380d0b8 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
@@ -73,13 +73,14 @@ import org.apache.isis.viewer.wicket.ui.util.Tooltips;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
import org.apache.isis.viewer.wicket.ui.util.Wkt.EventTopic;
-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
import lombok.Getter;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.val;
import lombok.experimental.Accessors;
+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
+
public abstract class ScalarPanelAbstract
extends PanelAbstract<ManagedObject, ScalarModel>
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 11555f7..ce95934 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
@@ -18,7 +18,6 @@
*/
package org.apache.isis.viewer.wicket.ui.components.scalars;
-import java.io.Serializable;
import java.util.Locale;
import java.util.Optional;
@@ -59,7 +58,7 @@ import lombok.val;
* <p>
* This implementation is for panels that use a textfield/text area.
*/
-public abstract class ScalarPanelTextFieldAbstract<T extends Serializable>
+public abstract class ScalarPanelTextFieldAbstract<T>
extends ScalarPanelFormFieldAbstract<T> {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
index a8cf711..b70e3d2 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumeric.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.viewer.wicket.ui.components.scalars;
-import java.io.Serializable;
-
import org.apache.wicket.Component;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
@@ -31,7 +29,7 @@ import lombok.val;
/**
* Panel for rendering numeric scalars.
*/
-public class ScalarPanelTextFieldNumeric<T extends Serializable>
+public class ScalarPanelTextFieldNumeric<T>
extends ScalarPanelTextFieldWithValueSemantics<T> {
private static final long serialVersionUID = 1L;
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 2b54c3c..576521e 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
@@ -18,11 +18,9 @@
*/
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>
+public class ScalarPanelTextFieldWithComposite<T>
extends ScalarPanelTextFieldWithValueSemantics<T> {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithTemporalPicker.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithTemporalPicker.java
index 66f8f35..30226b3 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithTemporalPicker.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldWithTemporalPicker.java
@@ -18,7 +18,6 @@
*/
package org.apache.isis.viewer.wicket.ui.components.scalars;
-import java.io.Serializable;
import java.util.Optional;
import org.apache.wicket.markup.html.form.TextField;
@@ -31,7 +30,7 @@ import org.apache.isis.viewer.wicket.ui.components.scalars.datepicker.TextFieldW
/**
* Panel for rendering scalars representing dates, along with a date picker.
*/
-public class ScalarPanelTextFieldWithTemporalPicker<T extends Serializable>
+public class ScalarPanelTextFieldWithTemporalPicker<T>
extends ScalarPanelTextFieldWithValueSemantics<T> {
private static final long serialVersionUID = 1L;
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 a9a5230..fc7888b 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
@@ -18,8 +18,6 @@
*/
package org.apache.isis.viewer.wicket.ui.components.scalars;
-import java.io.Serializable;
-
import org.apache.wicket.util.convert.IConverter;
import org.apache.isis.applib.value.semantics.ValueSemanticsProvider;
@@ -35,7 +33,7 @@ import lombok.NonNull;
* where the scalar (parameter or property) is a value-type,
* using conversion that is backed by a {@link ValueSemanticsProvider}.
*/
-public class ScalarPanelTextFieldWithValueSemantics<T extends Serializable>
+public class ScalarPanelTextFieldWithValueSemantics<T>
extends ScalarPanelTextFieldAbstract<T> {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java
index 32c3e4c..9b4a183 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/MarkupPanelFactories.java
@@ -33,7 +33,7 @@ import org.apache.isis.viewer.wicket.ui.ComponentFactoryAbstract;
import lombok.val;
/**
- * {@link ComponentFactory} for {@link ParentedMarkupPanel}.
+ * {@link ComponentFactory} for {@link ScalarMarkupPanel}.
*/
public class MarkupPanelFactories {
@@ -57,7 +57,7 @@ public class MarkupPanelFactories {
private final Class<T> valueType;
public ParentedAbstract(final Class<T> valueType) {
- super(ComponentType.SCALAR_NAME_AND_VALUE, ParentedMarkupPanel.class);
+ super(ComponentType.SCALAR_NAME_AND_VALUE, ScalarMarkupPanel.class);
this.valueType = valueType;
}
@@ -77,7 +77,7 @@ public class MarkupPanelFactories {
@Override
public final Component createComponent(final String id, final IModel<?> model) {
- return new ParentedMarkupPanel<T>(id, (ScalarModel) model, valueType, this::newMarkupComponent);
+ return new ScalarMarkupPanel<T>(id, (ScalarModel) model, valueType, this::newMarkupComponent);
}
protected abstract MarkupComponent newMarkupComponent(String id, ScalarModel model);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/ParentedMarkupPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/ScalarMarkupPanel.java
similarity index 94%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/ParentedMarkupPanel.java
rename to viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/ScalarMarkupPanel.java
index 0f4d912..060e304 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/ParentedMarkupPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/markup/ScalarMarkupPanel.java
@@ -18,8 +18,6 @@
*/
package org.apache.isis.viewer.wicket.ui.components.scalars.markup;
-import java.io.Serializable;
-
import org.apache.wicket.Component;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
@@ -29,13 +27,13 @@ import org.apache.isis.viewer.wicket.ui.components.scalars.TextFieldVariant;
/**
* Panel for rendering scalars of type {@link org.apache.isis.applib.value.Markup}.
*/
-public class ParentedMarkupPanel<T extends Serializable>
+public class ScalarMarkupPanel<T>
extends ScalarPanelTextFieldWithValueSemantics<T> {
private static final long serialVersionUID = 1L;
private final transient MarkupComponentFactory<ScalarModel> markupComponentFactory;
- public ParentedMarkupPanel(
+ public ScalarMarkupPanel(
final String id,
final ScalarModel scalarModel,
final Class<T> valueType,