[isis] branch master updated: ISIS-3071: minor refactoring

[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 6043503c51 ISIS-3071: minor refactoring
6043503c51 is described below

commit 6043503c51447504a9bdaf98630bd8484c8f997c
Author: Andi Huber <ahu...@apache.org>
AuthorDate: Sat Nov 12 07:38:13 2022 +0100

    ISIS-3071: minor refactoring
---
 .../js/CausewayWicketViewerJsResourceReference.java  | 20 +++++++++++---------
 .../viewer/wicket/ui/util/WktHeaderItems.java        |  2 +-
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git 
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/viewer/js/CausewayWicketViewerJsResourceReference.java
 
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/viewer/js/CausewayWicketViewerJsResourceReference.java
index c2d0039c82..462c660d95 100644
--- 
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/viewer/js/CausewayWicketViewerJsResourceReference.java
+++ 
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/pages/common/viewer/js/CausewayWicketViewerJsResourceReference.java
@@ -23,26 +23,28 @@ import org.apache.wicket.markup.head.HeaderItem;
 import org.apache.causeway.viewer.wicket.ui.util.WktHeaderItems;
 
 import lombok.Getter;
-import lombok.RequiredArgsConstructor;
 import lombok.experimental.Accessors;
 
 /**
  * Javascript (client-side) extensions and fixes.
  */
-@RequiredArgsConstructor
-public class CausewayWicketViewerJsResourceReference {
+public class CausewayWicketViewerJsResourceReference
+extends WktHeaderItems.HeaderContributor {
+
+    private static final long serialVersionUID = 1L;
 
     @Getter(lazy = true) @Accessors(fluent = true)
     private static final CausewayWicketViewerJsResourceReference instance =
-        new CausewayWicketViewerJsResourceReference(
-                WktHeaderItems.forScriptReference(
-                        CausewayWicketViewerJsResourceReference.class,
-                        "causeway-jquery-wicket-viewer.nocompress.js"));
+        new CausewayWicketViewerJsResourceReference();
 
-    private final HeaderItem headerItem;
+    public CausewayWicketViewerJsResourceReference() {
+        super(WktHeaderItems.forScriptReference(
+                CausewayWicketViewerJsResourceReference.class,
+                "causeway-jquery-wicket-viewer.nocompress.js"));
+    }
 
     public static HeaderItem asHeaderItem() {
-        return instance().headerItem;
+        return instance().getHeaderItem();
     }
 
 }
diff --git 
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/WktHeaderItems.java
 
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/WktHeaderItems.java
index f7e18c47da..8952d608c0 100644
--- 
a/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/WktHeaderItems.java
+++ 
b/viewers/wicket/ui/src/main/java/org/apache/causeway/viewer/wicket/ui/util/WktHeaderItems.java
@@ -43,7 +43,7 @@ public class WktHeaderItems {
     // -- FACTORIES
 
     /**
-     * Reading JS from source, it skips 18 license header lines
+     * Reading JS from source, it (hardcoded) skips 18 license header lines
      * and any single line comments as well as empty lines.
      * @apiNote that could be done by the yui-compressor maven plugin as well,
      *      but at the time of writing did not look into it