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 2022/01/09 12:56:39 UTC
[isis] branch master updated: ISIS-2856: IsisWicketThemeSupport is Spring managed (remove theme provider config)
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 afb0ee4 ISIS-2856: IsisWicketThemeSupport is Spring managed (remove theme provider config)
afb0ee4 is described below
commit afb0ee4e3a6233c47c098eccaafb3d46a124390f
Author: Andi Huber <ah...@apache.org>
AuthorDate: Sun Jan 9 13:56:31 2022 +0100
ISIS-2856: IsisWicketThemeSupport is Spring managed (remove theme
provider config)
---
.../modules/ROOT/pages/2021/2.0.0-M7/mignotes.adoc | 3 +++
.../apache/isis/core/config/IsisConfiguration.java | 11 ++------
.../themepicker/IsisWicketThemeSupport.java | 29 ----------------------
3 files changed, 5 insertions(+), 38 deletions(-)
diff --git a/antora/components/relnotes/modules/ROOT/pages/2021/2.0.0-M7/mignotes.adoc b/antora/components/relnotes/modules/ROOT/pages/2021/2.0.0-M7/mignotes.adoc
index d04dd31..7c021e4 100644
--- a/antora/components/relnotes/modules/ROOT/pages/2021/2.0.0-M7/mignotes.adoc
+++ b/antora/components/relnotes/modules/ROOT/pages/2021/2.0.0-M7/mignotes.adoc
@@ -72,6 +72,9 @@ Following configuration options changed:
`isis.core.meta-model.introspector.policy=ANNOTATION_REQUIRED`
+| `isis.viewer.wicket.themes.provider` (removed)
+| implement custom `IsisWicketThemeSupport` instead
+
| `isis.legacy.value-types.percentage` (removed)
| no replacement
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 ed09997..d82b0a0 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
@@ -56,9 +56,9 @@ import org.apache.isis.applib.IsisModuleApplib;
import org.apache.isis.applib.annotations.ActionLayout;
import org.apache.isis.applib.annotations.DomainObject;
import org.apache.isis.applib.annotations.DomainService;
+import org.apache.isis.applib.annotations.Introspection.IntrospectionPolicy;
import org.apache.isis.applib.annotations.LabelPosition;
import org.apache.isis.applib.annotations.PromptStyle;
-import org.apache.isis.applib.annotations.Introspection.IntrospectionPolicy;
import org.apache.isis.applib.services.i18n.Mode;
import org.apache.isis.applib.services.iactn.Execution;
import org.apache.isis.applib.services.publishing.spi.EntityChangesSubscriber;
@@ -69,7 +69,7 @@ import org.apache.isis.applib.services.userui.UserMenu;
import org.apache.isis.applib.value.semantics.TemporalValueSemantics.TemporalEditingPattern;
import org.apache.isis.commons.internal.base._NullSafe;
import org.apache.isis.commons.internal.context._Context;
-import org.apache.isis.core.config.IsisConfiguration.Core;
+import org.apache.isis.core.config.IsisConfiguration.Viewer;
import org.apache.isis.core.config.metamodel.facets.DefaultViewConfiguration;
import org.apache.isis.core.config.metamodel.facets.EditingObjectsConfiguration;
import org.apache.isis.core.config.metamodel.facets.PublishingPolicies.ActionPublishingPolicy;
@@ -2441,13 +2441,6 @@ public class IsisConfiguration {
private String initial = "Flatly";
/**
- * Specifies an implementation of <code>org.apache.isis.viewer.wicket.ui.components.widgets.themepicker.IsisWicketThemeSupport</code>
- *
- */
- @NotEmpty @NotNull
- private String provider = "org.apache.isis.viewer.wicket.ui.components.widgets.themepicker.IsisWicketThemeSupportDefault";
-
- /**
* Whether the theme chooser widget should be available in the footer.
*/
private boolean showChooser = false;
diff --git a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java
index a386bb1..f6103a1 100644
--- a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java
+++ b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/themepicker/IsisWicketThemeSupport.java
@@ -20,11 +20,6 @@ package org.apache.isis.viewer.wicket.ui.components.widgets.themepicker;
import java.util.List;
-import org.apache.isis.commons.internal.factory._InstanceUtil;
-import org.apache.isis.core.config.IsisConfiguration;
-
-import lombok.val;
-
import de.agilecoders.wicket.core.settings.ThemeProvider;
/**
@@ -37,28 +32,4 @@ public interface IsisWicketThemeSupport {
ThemeProvider getThemeProvider();
List<String> getEnabledThemeNames();
- // -- FACTORY
-
- @Deprecated
- static IsisWicketThemeSupport createInstanceFromConfig(IsisConfiguration configuration) {
-
- val themeSupportClassName = configuration.getViewer().getWicket().getThemes().getProvider();
-
- try {
-
- val themeSupport = (IsisWicketThemeSupport) _InstanceUtil.createInstance(themeSupportClassName);
- return themeSupport;
-
- } catch (Exception e) {
-
- val log = org.apache.logging.log4j.LogManager.getLogger(IsisWicketThemeSupport.class);
- log.warn("Could not instantiate configured theme support class '{}', defaulting to '{}'",
- themeSupportClassName,
- IsisWicketThemeSupportDefault.class.getName());
- }
-
- return (IsisWicketThemeSupport) _InstanceUtil.createInstance(IsisWicketThemeSupportDefault.class);
- }
-
-
}