From 525d50c47d85c7683d93f467b120e24fc41c6067 Mon Sep 17 00:00:00 2001 From: Florian Necas Date: Mon, 27 Nov 2023 10:47:21 +0100 Subject: [PATCH] feat: rename georchestra iframe to webcomponent --- ...HeaderIframe.java => GeorchestraHeaderWebComponent.java} | 6 +++--- .../src/main/java/org/geoserver/web/GeoServerBasePage.html | 2 +- .../src/main/java/org/geoserver/web/GeoServerBasePage.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename src/web/core/src/main/java/org/georchestra/{GeorchestraHeaderIframe.java => GeorchestraHeaderWebComponent.java} (89%) diff --git a/src/web/core/src/main/java/org/georchestra/GeorchestraHeaderIframe.java b/src/web/core/src/main/java/org/georchestra/GeorchestraHeaderWebComponent.java similarity index 89% rename from src/web/core/src/main/java/org/georchestra/GeorchestraHeaderIframe.java rename to src/web/core/src/main/java/org/georchestra/GeorchestraHeaderWebComponent.java index 94ada361a18..c8c151558f5 100644 --- a/src/web/core/src/main/java/org/georchestra/GeorchestraHeaderIframe.java +++ b/src/web/core/src/main/java/org/georchestra/GeorchestraHeaderWebComponent.java @@ -6,13 +6,13 @@ import org.geoserver.web.GeoServerApplication; import org.geotools.util.logging.Logging; -public class GeorchestraHeaderIframe extends WebComponent { +public class GeorchestraHeaderWebComponent extends WebComponent { private String headerUrl; private String headerHeight; private String legacyHeader; - private static Logger LOGGER = Logging.getLogger(GeorchestraHeaderIframe.class); + private static Logger LOGGER = Logging.getLogger(GeorchestraHeaderWebComponent.class); private void init() { headerHeight = getGeoServerApplication().getBean("georchestraHeaderHeight").toString(); @@ -24,7 +24,7 @@ protected GeoServerApplication getGeoServerApplication() { return (GeoServerApplication) getApplication(); } - public GeorchestraHeaderIframe(String id) { + public GeorchestraHeaderWebComponent(String id) { super(id); init(); } diff --git a/src/web/core/src/main/java/org/geoserver/web/GeoServerBasePage.html b/src/web/core/src/main/java/org/geoserver/web/GeoServerBasePage.html index 9a0473a6373..f81fc6e40e2 100644 --- a/src/web/core/src/main/java/org/geoserver/web/GeoServerBasePage.html +++ b/src/web/core/src/main/java/org/geoserver/web/GeoServerBasePage.html @@ -29,7 +29,7 @@
- +
diff --git a/src/web/core/src/main/java/org/geoserver/web/GeoServerBasePage.java b/src/web/core/src/main/java/org/geoserver/web/GeoServerBasePage.java index 26fb7871ee9..cc19c3ad854 100644 --- a/src/web/core/src/main/java/org/geoserver/web/GeoServerBasePage.java +++ b/src/web/core/src/main/java/org/geoserver/web/GeoServerBasePage.java @@ -46,7 +46,7 @@ import org.apache.wicket.request.resource.JavaScriptResourceReference; import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.resource.JQueryResourceReference; -import org.georchestra.GeorchestraHeaderIframe; +import org.georchestra.GeorchestraHeaderWebComponent; import org.geoserver.catalog.Catalog; import org.geoserver.config.GeoServer; import org.geoserver.ows.URLMangler; @@ -108,7 +108,7 @@ protected GeoServerBasePage() { } protected void commonBaseInit() { - add(new GeorchestraHeaderIframe("georchestraIframe")); + add(new GeorchestraHeaderWebComponent("georchestraWebComponent")); // lookup for a pluggable favicon PackageResourceReference faviconReference = null; List cssContribs =