[isis] branch master updated: ISIS-3172: simplify and harden prev. commit

[ahuber]

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 88466bfe7d ISIS-3172: simplify and harden prev. commit
88466bfe7d is described below

commit 88466bfe7d34d7b68a65fb28ee875dfd84cfe745
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Wed Aug 24 19:53:10 2022 +0200

    ISIS-3172: simplify and harden prev. commit
---
 .../viewer/wicketapp/config/WicketViewerXray.java  | 25 ++++++++++------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git 
a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/config/WicketViewerXray.java
 
b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/config/WicketViewerXray.java
index 9d7c8c6ad8..4d2c6242f9 100644
--- 
a/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/config/WicketViewerXray.java
+++ 
b/viewers/wicket/viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/wicketapp/config/WicketViewerXray.java
@@ -18,18 +18,18 @@
  */
 package org.apache.isis.viewer.wicket.viewer.wicketapp.config;
 
-import org.springframework.beans.factory.InitializingBean;
+import org.apache.wicket.protocol.http.WebApplication;
 import org.springframework.context.annotation.Configuration;
 
+import org.apache.isis.viewer.wicket.model.isis.WicketApplicationInitializer;
 import org.apache.isis.viewer.wicket.viewer.IsisModuleViewerWicketViewer;
 
+import lombok.Getter;
 import lombok.experimental.UtilityClass;
 
 @UtilityClass
 public class WicketViewerXray {
 
-    private final String KEY = IsisModuleViewerWicketViewer.NAMESPACE + 
".xray";
-
     /**
      * Activates visual debugging mode for the Wicket Viewer.
      * Use for troubleshooting and bug hunting.
@@ -37,21 +37,18 @@ public class WicketViewerXray {
      * Not imported by {@link IsisModuleViewerWicketViewer}.
      */
     @Configuration
-    public static class Enable implements InitializingBean {
+    public static class Enable
+        implements WicketApplicationInitializer {
 
         @Override
-        public void afterPropertiesSet() throws Exception {
-            System.setProperty(KEY, "true");
+        public void init(final WebApplication webApplication) {
+            WicketViewerXray.enabled = true;
+            webApplication.getDebugSettings()
+                .setOutputMarkupContainerClassName(true);
         }
-
     }
 
-    public boolean isEnabled() {
-        return "true".equalsIgnoreCase(System.getProperty(KEY));
-    }
-
-    public void setEnabled(final boolean enabled) {
-        System.setProperty(KEY, "" + enabled);
-    }
+    @Getter
+    private boolean enabled = false;
 
 }