You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2020/01/17 01:11:45 UTC
[isis] 09/36: ISIS-2264: isis.value.format["float"] ->
isis.value-types.java-lang.float.format
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 21ff60a863eba15292677671a77ddcbb5116eef6
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 16 23:19:35 2020 +0100
ISIS-2264: isis.value.format["float"] -> isis.value-types.java-lang.float.format
---
.../toc/modules/mignotes/pages/migrating-to-2.0.0.adoc | 4 ++++
.../main/java/org/apache/isis/core/config/IsisConfiguration.java | 9 ++++++++-
.../facets/value/floats/FloatValueSemanticsProviderAbstract.java | 9 ++++++++-
3 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/antora/components/toc/modules/mignotes/pages/migrating-to-2.0.0.adoc b/antora/components/toc/modules/mignotes/pages/migrating-to-2.0.0.adoc
index d140d66..738cf54 100644
--- a/antora/components/toc/modules/mignotes/pages/migrating-to-2.0.0.adoc
+++ b/antora/components/toc/modules/mignotes/pages/migrating-to-2.0.0.adoc
@@ -636,6 +636,10 @@ isis.value-types. +
|isis.value-types. +
{nbsp}{nbsp}java-lang.double.format
+|isis.value.format["float"]
+|isis.value-types. +
+{nbsp}{nbsp}java-lang.float.format
+
|
|
diff --git a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
index 0de4d0e..5242b75 100644
--- a/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/core/config/IsisConfiguration.java
@@ -1197,6 +1197,13 @@ public class IsisConfiguration {
public static class Double {
private String format;
}
+
+ // capitalized to avoid clash with keyword
+ private final Float Float = new Float();
+ @Data
+ public static class Float {
+ private String format;
+ }
}
private final JavaMath javaMath = new JavaMath();
@@ -1267,7 +1274,7 @@ public class IsisConfiguration {
TIMESTAMP,
TIME,
- FLOAT, LONG, SHORT,
+ LONG, SHORT,
PERCENTAGE
}
diff --git a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java
index 9fd5d11..6087bd3 100644
--- a/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java
+++ b/core/metamodel/src/main/java/org/apache/isis/core/metamodel/facets/value/floats/FloatValueSemanticsProviderAbstract.java
@@ -22,9 +22,11 @@ package org.apache.isis.core.metamodel.facets.value.floats;
import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.text.ParseException;
+import java.util.Locale;
import java.util.Map;
import org.apache.isis.core.config.IsisConfiguration.Value.FormatIdentifier;
+import org.apache.isis.core.metamodel.commons.LocaleUtil;
import org.apache.isis.core.metamodel.facetapi.Facet;
import org.apache.isis.core.metamodel.facetapi.FacetHolder;
import org.apache.isis.core.metamodel.facets.object.parseable.TextEntryParseException;
@@ -48,9 +50,14 @@ implements FloatingPointValueFacet {
public FloatValueSemanticsProviderAbstract(final FacetHolder holder, final Class<Float> adaptedClass) {
super(type(), holder, adaptedClass, TYPICAL_LENGTH, MAX_LENGTH, Immutability.IMMUTABLE, EqualByContent.HONOURED, DEFAULT_VALUE);
- format = determineNumberFormat(FormatIdentifier.FLOAT);
+ final String formatRequired = getConfiguration().getValueTypes().getJavaLang().getFloat().getFormat();
+
+ format = formatRequired != null
+ ? new DecimalFormat(formatRequired)
+ : NumberFormat.getNumberInstance(getConfiguration().getCore().getRuntime().getLocale().map(LocaleUtil::findLocale).orElse(Locale.getDefault()));
}
+
// //////////////////////////////////////////////////////////////////
// Parser
// //////////////////////////////////////////////////////////////////