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:37 UTC
[isis] 01/36: ISIS-2264: removes unused methods for
IsisConfiguration / Money
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 4eb02b40b17b8e85aa44821a251b20beeb265e85
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Thu Jan 16 22:38:38 2020 +0100
ISIS-2264: removes unused methods for IsisConfiguration / Money
---
.../main/java/org/apache/isis/core/config/IsisConfiguration.java | 8 +-------
.../metamodel/facets/value/money/MoneyValueSemanticsProvider.java | 4 ----
2 files changed, 1 insertion(+), 11 deletions(-)
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 1939625..ddfb5f6 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
@@ -1207,15 +1207,9 @@ public class IsisConfiguration {
private final Money money = new Money();
@Data
public static class Money {
-
private Optional<String> currency = Optional.empty();
-
- public String getCurrencyOrElse(String fallback) {
- return getCurrency().filter(_Strings::isNotEmpty).orElse(fallback);
- }
}
-
-
+
}
private final Extensions extensions = new Extensions();
diff --git a/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/money/MoneyValueSemanticsProvider.java b/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/money/MoneyValueSemanticsProvider.java
index 1a1c424..75cf126 100644
--- a/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/money/MoneyValueSemanticsProvider.java
+++ b/legacy/extensions/core/metamodel/src/main/java/org/apache/isis/legacy/metamodel/facets/value/money/MoneyValueSemanticsProvider.java
@@ -60,10 +60,6 @@ implements MoneyValueFacet {
LOCAL_CURRENCY_CODE = getDefaultCurrencyCode();
}
- static final boolean isAPropertyDefaultFacet() {
- return PropertyDefaultFacet.class.isAssignableFrom(MoneyValueSemanticsProvider.class);
- }
-
private static String getDefaultCurrencyCode() {
try {
return DEFAULT_CURRENCY_FORMAT.getCurrency().getCurrencyCode();