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=3312d72f96eefff8ffa0552c0811e0870b87cdab;hpb=e1123c4b16bc6125c9b9e6827ab754d0a4be643a;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 3312d72f9..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,7 +7,6 @@ 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;
@@ -17,8 +16,8 @@ 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;
 
@@ -64,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() {
 
@@ -212,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);
 		}
@@ -320,8 +320,13 @@ public class BundleCmsTheme implements CmsTheme {
 	}
 
 	@Override
-	public Integer getDefaultIconSize() {
-		return defaultIconSize;
+	public int getSmallIconSize() {
+		return smallIconSize;
+	}
+
+	@Override
+	public int getBigIconSize() {
+		return bigIconSize;
 	}
 
 	@Override