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:30:48 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 795fbb2 ISIS-2882: replaces IConverter<Float/Double> based on ValueSemantics
795fbb2 is described below
commit 795fbb2a4b11b343650cbed9998c0af0da684d4b
Author: Andi Huber <ah...@apache.org>
AuthorDate: Mon Nov 15 10:30:18 2021 +0100
ISIS-2882: replaces IConverter<Float/Double> based on
ValueSemantics
---
.../wicket/model/converter/DoubleConverterWkt.java | 32 ++++++++++++++++++++++
.../wicket/model/converter/FloatConverterWkt.java | 32 ++++++++++++++++++++++
.../components/scalars/primitive/DoublePanel.java | 4 +--
.../components/scalars/primitive/FloatPanel.java | 4 +--
4 files changed, 68 insertions(+), 4 deletions(-)
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
new file mode 100644
index 0000000..bbe1fb2
--- /dev/null
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/DoubleConverterWkt.java
@@ -0,0 +1,32 @@
+/*
+ * 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.viewer.wicket.model.models.ScalarModel;
+
+public class DoubleConverterWkt
+extends ConverterBasedOnValueSemantics<Double> {
+
+ private static final long serialVersionUID = 1L;
+
+ public DoubleConverterWkt(final ScalarModel scalarModel) {
+ super(scalarModel);
+ }
+
+}
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
new file mode 100644
index 0000000..bae486b
--- /dev/null
+++ b/viewers/wicket/model/src/main/java/org/apache/isis/viewer/wicket/model/converter/FloatConverterWkt.java
@@ -0,0 +1,32 @@
+/*
+ * 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.viewer.wicket.model.models.ScalarModel;
+
+public class FloatConverterWkt
+extends ConverterBasedOnValueSemantics<Float> {
+
+ private static final long serialVersionUID = 1L;
+
+ public FloatConverterWkt(final ScalarModel scalarModel) {
+ super(scalarModel);
+ }
+
+}
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 084b7f6..c7108dd 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
@@ -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.DoubleConverter;
+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.ScalarPanelTextFieldNumeric;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
@@ -50,7 +50,7 @@ public class DoublePanel extends ScalarPanelTextFieldNumeric<Double> {
@Override
protected IConverter<Double> getConverter(final ScalarModel scalarModel) {
- return DoubleConverter.INSTANCE;
+ return new DoubleConverterWkt(scalarModel);
}
}
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 41ad6ac..17532e6 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
@@ -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.FloatConverter;
+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.ScalarPanelTextFieldNumeric;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
@@ -50,7 +50,7 @@ public class FloatPanel extends ScalarPanelTextFieldNumeric<Float> {
@Override
protected IConverter<Float> getConverter(final ScalarModel scalarModel) {
- return FloatConverter.INSTANCE;
+ return new FloatConverterWkt(scalarModel);
}
}