X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fsrc%2Forg%2Fargeo%2Fcms%2Fosgi%2FBundleCmsTheme.java;h=de7eec8c2a39e19ea93faa507a8b1ef6fc2aa4b8;hb=f3ea14abccc33b1c3326417a87c91145be776c72;hp=75a2212b65ce5fe6f3a51e07b7b5e925c1dce8db;hpb=b7683883512d924a039a43c2e1102290aa49f64d;p=lgpl%2Fargeo-commons.git diff --git a/org.argeo.cms/src/org/argeo/cms/osgi/BundleCmsTheme.java b/org.argeo.cms/src/org/argeo/cms/osgi/BundleCmsTheme.java index 75a2212b6..de7eec8c2 100644 --- a/org.argeo.cms/src/org/argeo/cms/osgi/BundleCmsTheme.java +++ b/org.argeo.cms/src/org/argeo/cms/osgi/BundleCmsTheme.java @@ -7,17 +7,17 @@ import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; import java.net.URL; -import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Enumeration; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; import java.util.TreeSet; import java.util.stream.Collectors; -import org.apache.commons.io.IOUtils; -import org.argeo.api.cms.CmsTheme; +import org.argeo.api.cms.ux.CmsTheme; +import org.argeo.util.StreamUtils; import org.osgi.framework.Bundle; import org.osgi.framework.BundleContext; @@ -42,6 +42,8 @@ public class BundleCmsTheme implements CmsTheme { // private final static Log log = LogFactory.getLog(BundleCmsTheme.class); + private CmsTheme parentTheme; + private String themeId; private Set webCssPaths = new TreeSet<>(); private Set rapCssPaths = new TreeSet<>(); @@ -52,7 +54,7 @@ public class BundleCmsTheme implements CmsTheme { private String headerCss; private List fonts = new ArrayList<>(); - private String bodyHtml=""; + private String bodyHtml = ""; private String basePath; private String styleCssPath; @@ -61,7 +63,8 @@ public class BundleCmsTheme implements CmsTheme { // private String swtCssPath; private Bundle themeBundle; - private Integer defaultIconSize = 16; + private Integer smallIconSize = 16; + private Integer bigIconSize = 32; public BundleCmsTheme() { @@ -137,7 +140,7 @@ public class BundleCmsTheme implements CmsTheme { if (bodyUrl != null) { loadBodyHtml(bodyUrl); } -} + } public String getHtmlHeaders() { StringBuilder sb = new StringBuilder(); @@ -156,8 +159,6 @@ public class BundleCmsTheme implements CmsTheme { else return sb.toString(); } - - @Override public String getBodyHtml() { @@ -211,7 +212,7 @@ public class BundleCmsTheme implements CmsTheme { void loadBodyHtml(URL url) { try (BufferedReader in = new BufferedReader(new InputStreamReader(url.openStream(), UTF_8))) { - bodyHtml= IOUtils.toString(url,StandardCharsets.UTF_8); + bodyHtml = StreamUtils.toString(in); } catch (IOException e) { throw new IllegalArgumentException("Cannot load URL " + url, e); } @@ -260,10 +261,11 @@ public class BundleCmsTheme implements CmsTheme { URL res = themeBundle.getEntry(resourceName); if (res == null) { res = themeBundle.getResource(resourceName); - if (res == null) - return null; -// throw new IllegalArgumentException( -// "Resource " + resourceName + " not found in bundle " + themeBundle.getSymbolicName()); + if (res == null) { + if (parentTheme == null) + return null; + return parentTheme.getResourceAsStream(resourceName); + } } return res.openStream(); } @@ -272,43 +274,43 @@ public class BundleCmsTheme implements CmsTheme { return themeId; } -// public void setThemeId(String themeId) { -// this.themeId = themeId; -// } -// -// public String getBasePath() { -// return basePath; -// } -// -// public void setBasePath(String basePath) { -// this.basePath = basePath; -// } -// -// public String getRapCssPath() { -// return rapCssPath; -// } -// -// public void setRapCssPath(String cssPath) { -// this.rapCssPath = cssPath; -// } - @Override public Set getWebCssPaths() { + if (parentTheme != null) { + Set res = new HashSet<>(parentTheme.getWebCssPaths()); + res.addAll(webCssPaths); + return res; + } return webCssPaths; } @Override public Set getRapCssPaths() { + if (parentTheme != null) { + Set res = new HashSet<>(parentTheme.getRapCssPaths()); + res.addAll(rapCssPaths); + return res; + } return rapCssPaths; } @Override public Set getSwtCssPaths() { + if (parentTheme != null) { + Set res = new HashSet<>(parentTheme.getSwtCssPaths()); + res.addAll(swtCssPaths); + return res; + } return swtCssPaths; } @Override public Set getImagesPaths() { + if (parentTheme != null) { + Set res = new HashSet<>(parentTheme.getImagesPaths()); + res.addAll(imagesPaths); + return res; + } return imagesPaths; } @@ -318,17 +320,27 @@ public class BundleCmsTheme implements CmsTheme { } @Override - public Integer getDefaultIconSize() { - return defaultIconSize; + public int getSmallIconSize() { + return smallIconSize; + } + + @Override + public int getBigIconSize() { + return bigIconSize; } @Override public InputStream loadPath(String path) throws IOException { URL url = themeBundle.getResource(path); - if (url == null) - throw new IllegalArgumentException( - "Path " + path + " not found in bundle " + themeBundle.getSymbolicName()); - return url.openStream(); + if (url == null) { + if (parentTheme != null) + return parentTheme.loadPath(path); + else + throw new IllegalArgumentException( + "Path " + path + " not found in bundle " + themeBundle.getSymbolicName()); + } else { + return url.openStream(); + } } private static Bundle findThemeBundle(BundleContext bundleContext, String themeId) { @@ -357,4 +369,8 @@ public class BundleCmsTheme implements CmsTheme { return "Bundle CMS Theme " + themeId; } + public void setParentTheme(CmsTheme parentTheme) { + this.parentTheme = parentTheme; + } + }