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 672bfa6b0f ISIS-3054: just moving more wkt vwr resources into sub
packages
672bfa6b0f is described below
commit 672bfa6b0f6b3d9517953a4a3783eb82b66a8c08
Author: Andi Huber <[email protected]>
AuthorDate: Fri May 20 14:43:16 2022 +0200
ISIS-3054: just moving more wkt vwr resources into sub packages
---
.../serviceactions/ServiceActionsPanel.java | 7 +++---
.../isis/viewer/wicket/ui/pages/PageAbstract.java | 2 +-
.../fontawesome}/FontAwesomeCssReferenceWkt.java | 2 +-
.../js/ServerSentEventsJsReference.java} | 28 ++++++++++++++--------
.../js/isis-server-sent-events.js} | 0
5 files changed, 24 insertions(+), 15 deletions(-)
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
index 38be38b214..c0ad39d489 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionmenu/serviceactions/ServiceActionsPanel.java
@@ -25,7 +25,7 @@ import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.request.resource.CssResourceReference;
-import org.apache.isis.viewer.wicket.ui.util.SSESupport;
+import
org.apache.isis.viewer.wicket.ui.pages.common.serversentevents.js.ServerSentEventsJsReference;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
import lombok.val;
@@ -62,8 +62,9 @@ public class ServiceActionsPanel extends MenuActionPanel {
@Override
public void renderHead(final IHeaderResponse response) {
super.renderHead(response);
- response.render(CssHeaderItem.forReference(new
CssResourceReference(ServiceActionsPanel.class, "ServiceActionsPanel.css")));
- SSESupport.renderHead(response);
+ response.render(CssHeaderItem.forReference(
+ new CssResourceReference(ServiceActionsPanel.class,
"ServiceActionsPanel.css")));
+ response.render(ServerSentEventsJsReference.asHeaderItem());
}
}
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index fd3c2eb2ea..bd4bdfbdae 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -74,10 +74,10 @@ import
org.apache.isis.viewer.wicket.ui.components.widgets.breadcrumbs.Breadcrum
import org.apache.isis.viewer.wicket.ui.errors.ExceptionModel;
import org.apache.isis.viewer.wicket.ui.errors.JGrowlBehaviour;
import
org.apache.isis.viewer.wicket.ui.pages.common.bootstrap.css.BootstrapOverridesCssResourceReference;
+import
org.apache.isis.viewer.wicket.ui.pages.common.fontawesome.FontAwesomeCssReferenceWkt;
import
org.apache.isis.viewer.wicket.ui.pages.common.livequery.js.LiveQueryJsResourceReference;
import
org.apache.isis.viewer.wicket.ui.pages.common.sidebar.css.SidebarCssResourceReference;
import
org.apache.isis.viewer.wicket.ui.pages.common.viewer.js.IsisWicketViewerJsResourceReference;
-import org.apache.isis.viewer.wicket.ui.util.FontAwesomeCssReferenceWkt;
import org.apache.isis.viewer.wicket.ui.util.Wkt;
import org.apache.isis.viewer.wicket.ui.util.Wkt.EventTopic;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/FontAwesomeCssReferenceWkt.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/fontawesome/FontAwesomeCssReferenceWkt.java
similarity index 96%
rename from
viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/FontAwesomeCssReferenceWkt.java
rename to
viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/fontawesome/FontAwesomeCssReferenceWkt.java
index c2310d98c1..1ac5ae91f9 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/FontAwesomeCssReferenceWkt.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/fontawesome/FontAwesomeCssReferenceWkt.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.isis.viewer.wicket.ui.util;
+package org.apache.isis.viewer.wicket.ui.pages.common.fontawesome;
import org.apache.wicket.markup.head.CssHeaderItem;
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/SSESupport.java
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/serversentevents/js/ServerSentEventsJsReference.java
similarity index 58%
rename from
viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/SSESupport.java
rename to
viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/serversentevents/js/ServerSentEventsJsReference.java
index 72fc6a4f85..78295eb0c8 100644
---
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/SSESupport.java
+++
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/serversentevents/js/ServerSentEventsJsReference.java
@@ -14,12 +14,15 @@
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License. */
-package org.apache.isis.viewer.wicket.ui.util;
+package org.apache.isis.viewer.wicket.ui.pages.common.serversentevents.js;
-import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem;
import org.apache.wicket.request.resource.JavaScriptResourceReference;
+import lombok.Getter;
+import lombok.experimental.Accessors;
+
/**
* Server-sent events.
*
@@ -28,18 +31,23 @@ import
org.apache.wicket.request.resource.JavaScriptResourceReference;
*
* @since 2.0
*/
-public class SSESupport {
+public class ServerSentEventsJsReference
+extends JavaScriptResourceReference {
+ private static final long serialVersionUID = 1L;
+
+ @Getter(lazy = true) @Accessors(fluent = true)
+ private static final ServerSentEventsJsReference instance =
+ new ServerSentEventsJsReference();
- private static final JavaScriptResourceReference SSE_SUPPORT_JS =
- new JavaScriptResourceReference(SSESupport.class, "SSESupport.js");
+ public static JavaScriptHeaderItem asHeaderItem() {
+ return
JavaScriptReferenceHeaderItem.forReference(ServerSentEventsJsReference.instance());
+ }
/**
- * To include the SSE-javascript when a page is rendered.
- * @param response
+ * Private constructor.
*/
- public static void renderHead(IHeaderResponse response) {
-
response.render(JavaScriptReferenceHeaderItem.forReference(SSE_SUPPORT_JS));
+ private ServerSentEventsJsReference() {
+ super(ServerSentEventsJsReference.class, "isis-server-sent-events.js");
}
-
}
diff --git
a/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/SSESupport.js
b/viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/serversentevents/js/isis-server-sent-events.js
similarity index 100%
rename from
viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/util/SSESupport.js
rename to
viewers/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/common/serversentevents/js/isis-server-sent-events.js
