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/19 06:52:10 UTC
[isis] branch master updated: ISIS-2882: remove all Number-ConverterWkt, as we can now use a generic one
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 3efffcb ISIS-2882: remove all Number-ConverterWkt, as we can now use a generic one
3efffcb is described below
commit 3efffcbf3d672c7d3fdff70a83b1ae1aca83ea14
Author: andi-huber <ah...@apache.org>
AuthorDate: Fri Nov 19 07:52:01 2021 +0100
ISIS-2882: remove all Number-ConverterWkt, as we can now use a
generic one
---
.../model/converter/BigDecimalConverterWkt.java | 39 ----------------------
.../model/converter/BigIntegerConverterWkt.java | 38 ---------------------
.../wicket/model/converter/ByteConverterWkt.java | 37 --------------------
.../wicket/model/converter/DoubleConverterWkt.java | 37 --------------------
.../wicket/model/converter/FloatConverterWkt.java | 37 --------------------
.../model/converter/IntegerConverterWkt.java | 37 --------------------
.../wicket/model/converter/LongConverterWkt.java | 37 --------------------
.../wicket/model/converter/ShortConverterWkt.java | 37 --------------------
.../ScalarPanelTextFieldNumericAbstract.java | 2 +-
.../scalars/jdkmath/JavaMathBigDecimalPanel.java | 14 --------
.../scalars/jdkmath/JavaMathBigIntegerPanel.java | 15 ---------
.../ui/components/scalars/primitive/BytePanel.java | 14 --------
.../components/scalars/primitive/DoublePanel.java | 14 --------
.../components/scalars/primitive/FloatPanel.java | 14 --------
.../components/scalars/primitive/IntegerPanel.java | 14 --------
.../ui/components/scalars/primitive/LongPanel.java | 14 --------
.../components/scalars/primitive/ShortPanel.java | 13 --------
.../jdkmath/BigDecimalConverter_roundtrip.java | 16 ++++-----
18 files changed, 9 insertions(+), 420 deletions(-)
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/BigDecimalConverterWkt.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/BigDecimalConverterWkt.java
deleted file mode 100644
index 7eaed08..0000000
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/BigDecimalConverterWkt.java
+++ /dev/null
@@ -1,39 +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.model.converter;
-
-import java.math.BigDecimal;
-
-import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
-
-import lombok.NonNull;
-
-public class BigDecimalConverterWkt
-extends ConverterBasedOnValueSemantics<BigDecimal> {
-
- private static final long serialVersionUID = 1L;
-
- public BigDecimalConverterWkt(
- final @NonNull ObjectFeature objFeature,
- final @NonNull ScalarRepresentation scalarRepresentation) {
- super(objFeature, scalarRepresentation);
- }
-
-}
\ No newline at end of file
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/BigIntegerConverterWkt.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/BigIntegerConverterWkt.java
deleted file mode 100644
index b732f5a..0000000
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/BigIntegerConverterWkt.java
+++ /dev/null
@@ -1,38 +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.model.converter;
-
-import java.math.BigInteger;
-
-import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
-
-import lombok.NonNull;
-
-public class BigIntegerConverterWkt
-extends ConverterBasedOnValueSemantics<BigInteger> {
-
- private static final long serialVersionUID = 1L;
-
- public BigIntegerConverterWkt(@NonNull final ObjectFeature propOrParam,
- @NonNull final ScalarRepresentation scalarRepresentation) {
- super(propOrParam, scalarRepresentation);
- }
-
-}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/ByteConverterWkt.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/ByteConverterWkt.java
deleted file mode 100644
index 3ae5afd..0000000
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/ByteConverterWkt.java
+++ /dev/null
@@ -1,37 +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.model.converter;
-
-import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
-
-import lombok.NonNull;
-
-public class ByteConverterWkt
-extends ConverterBasedOnValueSemantics<Byte> {
-
- private static final long serialVersionUID = 1L;
-
- public ByteConverterWkt(
- final @NonNull ObjectFeature objFeature,
- final @NonNull ScalarRepresentation scalarRepresentation) {
- super(objFeature, scalarRepresentation);
- }
-
-}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/DoubleConverterWkt.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/DoubleConverterWkt.java
deleted file mode 100644
index 7796385..0000000
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/DoubleConverterWkt.java
+++ /dev/null
@@ -1,37 +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.model.converter;
-
-import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
-
-import lombok.NonNull;
-
-public class DoubleConverterWkt
-extends ConverterBasedOnValueSemantics<Double> {
-
- private static final long serialVersionUID = 1L;
-
- public DoubleConverterWkt(
- final @NonNull ObjectFeature objFeature,
- final @NonNull ScalarRepresentation scalarRepresentation) {
- super(objFeature, scalarRepresentation);
- }
-
-}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/FloatConverterWkt.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/FloatConverterWkt.java
deleted file mode 100644
index 3934179..0000000
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/FloatConverterWkt.java
+++ /dev/null
@@ -1,37 +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.model.converter;
-
-import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
-
-import lombok.NonNull;
-
-public class FloatConverterWkt
-extends ConverterBasedOnValueSemantics<Float> {
-
- private static final long serialVersionUID = 1L;
-
- public FloatConverterWkt(
- final @NonNull ObjectFeature objFeature,
- final @NonNull ScalarRepresentation scalarRepresentation) {
- super(objFeature, scalarRepresentation);
- }
-
-}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/IntegerConverterWkt.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/IntegerConverterWkt.java
deleted file mode 100644
index 42e5ec5..0000000
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/IntegerConverterWkt.java
+++ /dev/null
@@ -1,37 +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.model.converter;
-
-import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
-
-import lombok.NonNull;
-
-public class IntegerConverterWkt
-extends ConverterBasedOnValueSemantics<Integer> {
-
- private static final long serialVersionUID = 1L;
-
- public IntegerConverterWkt(
- final @NonNull ObjectFeature objFeature,
- final @NonNull ScalarRepresentation scalarRepresentation) {
- super(objFeature, scalarRepresentation);
- }
-
-}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/LongConverterWkt.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/LongConverterWkt.java
deleted file mode 100644
index 5e9b055..0000000
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/LongConverterWkt.java
+++ /dev/null
@@ -1,37 +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.model.converter;
-
-import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
-
-import lombok.NonNull;
-
-public class LongConverterWkt
-extends ConverterBasedOnValueSemantics<Long> {
-
- private static final long serialVersionUID = 1L;
-
- public LongConverterWkt(
- final @NonNull ObjectFeature objFeature,
- final @NonNull ScalarRepresentation scalarRepresentation) {
- super(objFeature, scalarRepresentation);
- }
-
-}
diff --git a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/ShortConverterWkt.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/ShortConverterWkt.java
deleted file mode 100644
index 200d7d1..0000000
--- a/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/ShortConverterWkt.java
+++ /dev/null
@@ -1,37 +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.model.converter;
-
-import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
-
-import lombok.NonNull;
-
-public class ShortConverterWkt
-extends ConverterBasedOnValueSemantics<Short> {
-
- private static final long serialVersionUID = 1L;
-
- public ShortConverterWkt(
- final @NonNull ObjectFeature objFeature,
- final @NonNull ScalarRepresentation scalarRepresentation) {
- super(objFeature, scalarRepresentation);
- }
-
-}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumericAbstract.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumericAbstract.java
index 321d02e..5c9b5d9 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumericAbstract.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelTextFieldNumericAbstract.java
@@ -32,7 +32,7 @@ import lombok.val;
* Panel for rendering numeric scalars.
*/
public abstract class ScalarPanelTextFieldNumericAbstract<T extends Serializable>
-extends ScalarPanelTextFieldAbstract<T> {
+extends ScalarPanelTextFieldWithValueSemanticsAbstract<T> {
private static final long serialVersionUID = 1L;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java
index 74c7255..dabbb13 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigDecimalPanel.java
@@ -20,16 +20,9 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.jdkmath;
import java.math.BigDecimal;
-import org.apache.wicket.util.convert.IConverter;
-
-import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
-import org.apache.isis.viewer.wicket.model.converter.BigDecimalConverterWkt;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldNumericAbstract;
-import lombok.NonNull;
-
/**
* Panel for rendering scalars of type {@link BigDecimal}.
*/
@@ -43,13 +36,6 @@ extends ScalarPanelTextFieldNumericAbstract<BigDecimal> {
final ScalarModel scalarModel) {
super(id, scalarModel, BigDecimal.class);
}
-
- @Override
- protected IConverter<BigDecimal> getConverter(
- final @NonNull ObjectFeature propOrParam,
- final @NonNull ScalarRepresentation scalarRepresentation) {
- return new BigDecimalConverterWkt(propOrParam, scalarRepresentation);
- }
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
index 5fdeb1f..dc6e5c5 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/JavaMathBigIntegerPanel.java
@@ -20,16 +20,9 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.jdkmath;
import java.math.BigInteger;
-import org.apache.wicket.util.convert.IConverter;
-
-import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
-import org.apache.isis.viewer.wicket.model.converter.BigIntegerConverterWkt;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldNumericAbstract;
-import lombok.NonNull;
-
/**
* Panel for rendering scalars of type {@link BigInteger}.
*/
@@ -41,12 +34,4 @@ extends ScalarPanelTextFieldNumericAbstract<BigInteger> {
public JavaMathBigIntegerPanel(final String id, final ScalarModel scalarModel) {
super(id, scalarModel, BigInteger.class);
}
-
- @Override
- protected IConverter<BigInteger> getConverter(
- final @NonNull ObjectFeature propOrParam,
- final @NonNull ScalarRepresentation scalarRepresentation) {
- return new BigIntegerConverterWkt(propOrParam, scalarRepresentation);
- }
-
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java
index 1fde605..52cf075 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BytePanel.java
@@ -18,16 +18,9 @@
*/
package org.apache.isis.viewer.wicket.ui.components.scalars.primitive;
-import org.apache.wicket.util.convert.IConverter;
-
-import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
-import org.apache.isis.viewer.wicket.model.converter.ByteConverterWkt;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldNumericAbstract;
-import lombok.NonNull;
-
/**
* Panel for rendering scalars of type {@link Byte} or <tt>byte</tt>.
*/
@@ -40,11 +33,4 @@ extends ScalarPanelTextFieldNumericAbstract<Byte> {
super(id, scalarModel, Byte.class);
}
- @Override
- protected IConverter<Byte> getConverter(
- final @NonNull ObjectFeature propOrParam,
- final @NonNull ScalarRepresentation scalarRepresentation) {
- return new ByteConverterWkt(propOrParam, scalarRepresentation);
- }
-
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java
index d280663..e5fdd40 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/DoublePanel.java
@@ -18,16 +18,9 @@
*/
package org.apache.isis.viewer.wicket.ui.components.scalars.primitive;
-import org.apache.wicket.util.convert.IConverter;
-
-import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
-import org.apache.isis.viewer.wicket.model.converter.DoubleConverterWkt;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldNumericAbstract;
-import lombok.NonNull;
-
/**
* Panel for rendering scalars of type {@link Double} or <tt>double</tt>.
*/
@@ -40,11 +33,4 @@ extends ScalarPanelTextFieldNumericAbstract<Double> {
super(id, scalarModel, Double.class);
}
- @Override
- protected IConverter<Double> getConverter(
- final @NonNull ObjectFeature propOrParam,
- final @NonNull ScalarRepresentation scalarRepresentation) {
- return new DoubleConverterWkt(propOrParam, scalarRepresentation);
- }
-
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java
index 73f4bb4..229307e 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/FloatPanel.java
@@ -18,16 +18,9 @@
*/
package org.apache.isis.viewer.wicket.ui.components.scalars.primitive;
-import org.apache.wicket.util.convert.IConverter;
-
-import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
-import org.apache.isis.viewer.wicket.model.converter.FloatConverterWkt;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldNumericAbstract;
-import lombok.NonNull;
-
/**
* Panel for rendering scalars of type {@link Float} or <tt>float</tt>.
*/
@@ -39,11 +32,4 @@ public class FloatPanel extends ScalarPanelTextFieldNumericAbstract<Float> {
super(id, scalarModel, Float.class);
}
- @Override
- protected IConverter<Float> getConverter(
- final @NonNull ObjectFeature propOrParam,
- final @NonNull ScalarRepresentation scalarRepresentation) {
- return new FloatConverterWkt(propOrParam, scalarRepresentation);
- }
-
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java
index a9cbc49..5ba7847 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/IntegerPanel.java
@@ -18,16 +18,9 @@
*/
package org.apache.isis.viewer.wicket.ui.components.scalars.primitive;
-import org.apache.wicket.util.convert.IConverter;
-
-import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
-import org.apache.isis.viewer.wicket.model.converter.IntegerConverterWkt;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldNumericAbstract;
-import lombok.NonNull;
-
/**
* Panel for rendering scalars of type {@link Integer} or <tt>int</tt>.
*/
@@ -39,11 +32,4 @@ public class IntegerPanel extends ScalarPanelTextFieldNumericAbstract<Integer> {
super(id, scalarModel, Integer.class);
}
- @Override
- protected IConverter<Integer> getConverter(
- final @NonNull ObjectFeature propOrParam,
- final @NonNull ScalarRepresentation scalarRepresentation) {
- return new IntegerConverterWkt(propOrParam, scalarRepresentation);
- }
-
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java
index acf9c9d..307468d 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/LongPanel.java
@@ -18,16 +18,9 @@
*/
package org.apache.isis.viewer.wicket.ui.components.scalars.primitive;
-import org.apache.wicket.util.convert.IConverter;
-
-import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
-import org.apache.isis.viewer.wicket.model.converter.LongConverterWkt;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldNumericAbstract;
-import lombok.NonNull;
-
/**
* Panel for rendering scalars of type {@link Long} or <tt>long</tt>.
*/
@@ -40,11 +33,4 @@ extends ScalarPanelTextFieldNumericAbstract<Long> {
super(id, scalarModel, Long.class);
}
- @Override
- protected IConverter<Long> getConverter(
- final @NonNull ObjectFeature propOrParam,
- final @NonNull ScalarRepresentation scalarRepresentation) {
- return new LongConverterWkt(propOrParam, scalarRepresentation);
- }
-
}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java
index bc93afb..7ad2391 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/ShortPanel.java
@@ -18,16 +18,9 @@
*/
package org.apache.isis.viewer.wicket.ui.components.scalars.primitive;
-import org.apache.wicket.util.convert.IConverter;
-
-import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
-import org.apache.isis.viewer.wicket.model.converter.ShortConverterWkt;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelTextFieldNumericAbstract;
-import lombok.NonNull;
-
/**
* Panel for rendering scalars of type {@link Short} or <tt>short</tt>.
*/
@@ -40,10 +33,4 @@ extends ScalarPanelTextFieldNumericAbstract<Short> {
super(id, scalarModel, Short.class);
}
- @Override
- protected IConverter<Short> getConverter(
- final @NonNull ObjectFeature propOrParam,
- final @NonNull ScalarRepresentation scalarRepresentation) {
- return new ShortConverterWkt(propOrParam, scalarRepresentation);
- }
}
diff --git a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverter_roundtrip.java b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverter_roundtrip.java
index d5cb175..74df160 100644
--- a/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverter_roundtrip.java
+++ b/viewers/wicket/ui/src/test/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverter_roundtrip.java
@@ -27,11 +27,6 @@ import org.apache.wicket.util.convert.ConversionException;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
-import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.junit.jupiter.api.Assertions.assertTrue;
-
import org.apache.isis.applib.annotation.DomainObject;
import org.apache.isis.applib.annotation.Property;
import org.apache.isis.applib.services.iactnlayer.InteractionContext;
@@ -42,7 +37,12 @@ import org.apache.isis.core.metamodel.commons.ScalarRepresentation;
import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.valuesemantics.BigDecimalValueSemantics;
import org.apache.isis.core.security._testing.InteractionService_forTesting;
-import org.apache.isis.viewer.wicket.model.converter.BigDecimalConverterWkt;
+import org.apache.isis.viewer.wicket.model.converter.ConverterBasedOnValueSemantics;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import lombok.Getter;
import lombok.Setter;
@@ -177,10 +177,10 @@ class BigDecimalConverter_roundtrip {
private BigDecimal value;
}
- private BigDecimalConverterWkt newConverter(final Class<?> type) {
+ private ConverterBasedOnValueSemantics<BigDecimal> newConverter(final Class<?> type) {
val customerSpec = mmc.getSpecificationLoader().specForTypeElseFail(type);
val prop = customerSpec.getPropertyElseFail("value");
- return new BigDecimalConverterWkt(prop, ScalarRepresentation.EDITING);
+ return new ConverterBasedOnValueSemantics<>(prop, ScalarRepresentation.EDITING);
}
}