This is an automated email from the ASF dual-hosted git repository. cziegeler pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/felix-dev.git
The following commit(s) were added to refs/heads/master by this push: new def8da5730 FELIX-6638 : Migrate WebConsole to Jakarta Servlet API def8da5730 is described below commit def8da5730bc862c5889013912859916420e1bcc Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Thu Dec 28 10:27:26 2023 +0100 FELIX-6638 : Migrate WebConsole to Jakarta Servlet API --- .../felix/webconsole/DefaultBrandingPlugin.java | 51 +++++++++++++++++++++- 1 file changed, 49 insertions(+), 2 deletions(-) diff --git a/webconsole/src/main/java/org/apache/felix/webconsole/DefaultBrandingPlugin.java b/webconsole/src/main/java/org/apache/felix/webconsole/DefaultBrandingPlugin.java index 032384f706..2ad5cd184c 100644 --- a/webconsole/src/main/java/org/apache/felix/webconsole/DefaultBrandingPlugin.java +++ b/webconsole/src/main/java/org/apache/felix/webconsole/DefaultBrandingPlugin.java @@ -86,12 +86,14 @@ import org.apache.felix.webconsole.internal.servlet.BrandingPluginImpl; * @deprecated Plugins should never use the branding plugin directly */ @Deprecated -public class DefaultBrandingPlugin extends BrandingPluginImpl implements BrandingPlugin { +public class DefaultBrandingPlugin implements BrandingPlugin { private static volatile DefaultBrandingPlugin instance; + private final BrandingPluginImpl delegate; + private DefaultBrandingPlugin() { - super(); + this.delegate = new BrandingPluginImpl(); } /** @@ -105,4 +107,49 @@ public class DefaultBrandingPlugin extends BrandingPluginImpl implements Brandin } return instance; } + + @Override + public String getBrandName() { + return delegate.getBrandName(); + } + + @Override + public String getFavIcon() { + return delegate.getFavIcon(); + } + + @Override + public String getMainStyleSheet() { + return delegate.getMainStyleSheet(); + } + + @Override + public String getProductImage() { + return delegate.getProductImage(); + } + + @Override + public String getProductName() { + return delegate.getProductName(); + } + + @Override + public String getProductURL() { + return delegate.getProductURL(); + } + + @Override + public String getVendorImage() { + return delegate.getVendorImage(); + } + + @Override + public String getVendorName() { + return delegate.getVendorName(); + } + + @Override + public String getVendorURL() { + return delegate.getVendorURL(); + } }