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/15 09:15:46 UTC
[isis] branch master updated: ISIS-2882: replaces IConverter based on ValueSemantics
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 c3be3b7 ISIS-2882: replaces IConverter<Byte> based on ValueSemantics
c3be3b7 is described below
commit c3be3b71cadf303d1e93b047878de11551e12d95
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Nov 15 10:15:37 2021 +0100
ISIS-2882: replaces IConverter<Byte> based on ValueSemantics
---
.../model/converter/BigDecimalConverterWkt.java} | 9 ++++----
.../wicket/model/converter/ByteConverterWkt.java} | 24 +++++-----------------
.../converter}/ConverterBasedOnValueSemantics.java | 2 +-
.../scalars/jdkmath/JavaMathBigDecimalPanel.java | 3 ++-
.../ui/components/scalars/primitive/BytePanel.java | 4 ++--
.../jdkmath/BigDecimalConverter_roundtrip.java | 5 +++--
6 files changed, 17 insertions(+), 30 deletions(-)
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterForFeature.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/BigDecimalConverterWkt.java
similarity index 83%
copy from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterForFeature.java
copy to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/BigDecimalConverterWkt.java
index 0fea23a..eb0357a 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterForFeature.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/BigDecimalConverterWkt.java
@@ -16,28 +16,27 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.wicket.ui.components.scalars.jdkmath;
+package org.apache.isis.viewer.wicket.model.converter;
import java.math.BigDecimal;
import org.apache.isis.core.metamodel.facets.object.value.ValueRepresentation;
import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ConverterBasedOnValueSemantics;
import lombok.NonNull;
-public class BigDecimalConverterForFeature
+public class BigDecimalConverterWkt
extends ConverterBasedOnValueSemantics<BigDecimal> {
private static final long serialVersionUID = 1L;
- public BigDecimalConverterForFeature(
+ public BigDecimalConverterWkt(
final @NonNull ScalarModel scalarModel) {
super(scalarModel);
}
- public BigDecimalConverterForFeature(
+ public BigDecimalConverterWkt(
final @NonNull ObjectFeature objFeature,
final @NonNull ValueRepresentation valueRepresentation) {
super(objFeature, valueRepresentation);
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterForFeature.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/ByteConverterWkt.java
similarity index 55%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterForFeature.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/ByteConverterWkt.java
index 0fea23a..b8dc3bf 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/jdkmath/BigDecimalConverterForFeature.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/ByteConverterWkt.java
@@ -16,31 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.wicket.ui.components.scalars.jdkmath;
+package org.apache.isis.viewer.wicket.model.converter;
-import java.math.BigDecimal;
-
-import org.apache.isis.core.metamodel.facets.object.value.ValueRepresentation;
-import org.apache.isis.core.metamodel.spec.feature.ObjectFeature;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ConverterBasedOnValueSemantics;
-
-import lombok.NonNull;
-public class BigDecimalConverterForFeature
-extends ConverterBasedOnValueSemantics<BigDecimal> {
+public class ByteConverterWkt
+extends ConverterBasedOnValueSemantics<Byte> {
private static final long serialVersionUID = 1L;
- public BigDecimalConverterForFeature(
- final @NonNull ScalarModel scalarModel) {
+ public ByteConverterWkt(final ScalarModel scalarModel) {
super(scalarModel);
}
- public BigDecimalConverterForFeature(
- final @NonNull ObjectFeature objFeature,
- final @NonNull ValueRepresentation valueRepresentation) {
- super(objFeature, valueRepresentation);
- }
-
-}
\ No newline at end of file
+}
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ConverterBasedOnValueSemantics.java b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/ConverterBasedOnValueSemantics.java
similarity index 99%
rename from viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ConverterBasedOnValueSemantics.java
rename to viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/ConverterBasedOnValueSemantics.java
index 044b0a1..bc693c2 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ConverterBasedOnValueSemantics.java
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/ConverterBasedOnValueSemantics.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.wicket.ui.components.scalars;
+package org.apache.isis.viewer.wicket.model.converter;
import java.util.Locale;
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 25c673b..edc800d 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
@@ -23,6 +23,7 @@ import java.math.BigDecimal;
import org.apache.wicket.markup.html.form.AbstractTextComponent;
import org.apache.wicket.util.convert.IConverter;
+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.ScalarPanelTextFieldNumeric;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
@@ -55,7 +56,7 @@ extends ScalarPanelTextFieldNumeric<BigDecimal> {
@Override
protected IConverter<BigDecimal> getConverter(final ScalarModel scalarModel) {
- return new BigDecimalConverterForFeature(scalarModel);
+ return new BigDecimalConverterWkt(scalarModel);
}
}
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 27a5faf..5f112d5 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
@@ -20,8 +20,8 @@ package org.apache.isis.viewer.wicket.ui.components.scalars.primitive;
import org.apache.wicket.markup.html.form.AbstractTextComponent;
import org.apache.wicket.util.convert.IConverter;
-import org.apache.wicket.util.convert.converter.ByteConverter;
+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.ScalarPanelTextFieldNumeric;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
@@ -51,6 +51,6 @@ extends ScalarPanelTextFieldNumeric<Byte> {
@Override
protected IConverter<Byte> getConverter(final ScalarModel scalarModel) {
- return ByteConverter.INSTANCE;
+ return new ByteConverterWkt(scalarModel);
}
}
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 530b032..96f73b8 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
@@ -42,6 +42,7 @@ import org.apache.isis.core.metamodel.context.MetaModelContext;
import org.apache.isis.core.metamodel.facets.object.value.ValueRepresentation;
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 lombok.Getter;
import lombok.Setter;
@@ -176,10 +177,10 @@ class BigDecimalConverter_roundtrip {
private BigDecimal value;
}
- private BigDecimalConverterForFeature newConverter(final Class<?> type) {
+ private BigDecimalConverterWkt newConverter(final Class<?> type) {
val customerSpec = mmc.getSpecificationLoader().specForTypeElseFail(type);
val prop = customerSpec.getPropertyElseFail("value");
- return new BigDecimalConverterForFeature(prop, ValueRepresentation.EDITING);
+ return new BigDecimalConverterWkt(prop, ValueRepresentation.EDITING);
}
}