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 2019/09/27 16:28:46 UTC
[isis] 05/05: ISIS-2086: refactors
isis.viewer.wicket.maxTitleLengthInTables (and 2 related) to type-safe
config
This is an automated email from the ASF dual-hosted git repository.
danhaywood pushed a commit to branch ISIS-2086
in repository https://gitbox.apache.org/repos/asf/isis.git
commit 1c3007d26813042434601a7d71a67cd183d65046
Author: danhaywood <da...@haywood-associates.co.uk>
AuthorDate: Fri Sep 27 17:27:58 2019 +0100
ISIS-2086: refactors isis.viewer.wicket.maxTitleLengthInTables (and 2 related) to type-safe config
---
.../java/org/apache/isis/config/IsisConfiguration.java | 18 ++++++++++++++++++
.../viewer/settings/WicketViewerSettingsDefault.java | 6 +++---
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
index 5d995c7..93255ac 100644
--- a/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
+++ b/core/config/src/main/java/org/apache/isis/config/IsisConfiguration.java
@@ -131,6 +131,24 @@ public class IsisConfiguration {
private PromptStyle promptStyle = PromptStyle.INLINE;
private boolean showFooter = true;
+
+ private int maxTitleLengthInTables = 12;
+
+ private Integer maxTitleLengthInParentedTables;
+ public int getMaxTitleLengthInParentedTables() {
+ return maxTitleLengthInParentedTables != null ? maxTitleLengthInParentedTables : getMaxTitleLengthInTables();
+ }
+ public void setMaxTitleLengthInParentedTables(final int val) {
+ maxTitleLengthInParentedTables = val;
+ }
+
+ private Integer maxTitleLengthInStandaloneTables;
+ public int getMaxTitleLengthInStandaloneTables() {
+ return maxTitleLengthInStandaloneTables != null ? maxTitleLengthInStandaloneTables : getMaxTitleLengthInTables();
+ }
+ public void setMaxTitleLengthInStandaloneTables(final int val) {
+ maxTitleLengthInStandaloneTables = val;
+ }
}
}
diff --git a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
index b642043..f0e3630 100644
--- a/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
+++ b/core/viewer-wicket/impl/src/main/java/org/apache/isis/viewer/wicket/viewer/settings/WicketViewerSettingsDefault.java
@@ -42,19 +42,19 @@ public class WicketViewerSettingsDefault implements WicketViewerSettings {
@Override
public int getMaxTitleLengthInStandaloneTables() {
- return getConfigurationLegacy().getInteger("isis.viewer.wicket.maxTitleLengthInStandaloneTables", getMaxTitleLengthInTables());
+ return getConfiguration().getViewer().getWicket().getMaxTitleLengthInStandaloneTables();
}
@Override
public int getMaxTitleLengthInParentedTables() {
- return getConfigurationLegacy().getInteger("isis.viewer.wicket.maxTitleLengthInParentedTables", getMaxTitleLengthInTables());
+ return getConfiguration().getViewer().getWicket().getMaxTitleLengthInParentedTables();
}
/**
* Fallback for either {@link #getMaxTitleLengthInParentedTables()} and {@link #getMaxTitleLengthInParentedTables()}
*/
private int getMaxTitleLengthInTables() {
- return getConfigurationLegacy().getInteger("isis.viewer.wicket.maxTitleLengthInTables", 12);
+ return getConfiguration().getViewer().getWicket().getMaxTitleLengthInTables();
}
@Override