X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fui%2Futil%2FBundleCmsTheme.java;h=c86ba3601950022cd5367e172236dc7adb4728df;hb=fea7cd546f9c04c00f961918919dd6307c32cc8e;hp=a4749fbabe150f4624782f45ead79e274dc7fd1f;hpb=522bb9426e6f5889a2c4db0c9677eb19401f1b0e;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/ui/util/BundleCmsTheme.java b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/BundleCmsTheme.java
index a4749fbab..c86ba3601 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/ui/util/BundleCmsTheme.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/ui/util/BundleCmsTheme.java
@@ -135,28 +135,30 @@ public class BundleCmsTheme extends AbstractCmsTheme {
 
 	Set<String> addCss(Bundle themeBundle, String path) {
 		Set<String> paths = new TreeSet<>();
-		Enumeration<URL> themeResources = themeBundle.findEntries(path, "*.css", true);
-		if (themeResources == null)
-			return paths;
-		while (themeResources.hasMoreElements()) {
-			String resource = themeResources.nextElement().getPath();
-			// remove first '/' so that RWT registers it
-			resource = resource.substring(1);
-			if (!resource.endsWith("/")) {
-				paths.add(resource);
-			}
-		}
 
 		// common CSS
 		Enumeration<URL> commonResources = themeBundle.findEntries(styleCssPath, "*.css", true);
-		if (commonResources == null)
-			return paths;
-		while (commonResources.hasMoreElements()) {
-			String resource = commonResources.nextElement().getPath();
-			// remove first '/' so that RWT registers it
-			resource = resource.substring(1);
-			if (!resource.endsWith("/")) {
-				paths.add(resource);
+		if (commonResources != null) {
+			while (commonResources.hasMoreElements()) {
+				String resource = commonResources.nextElement().getPath();
+				// remove first '/' so that RWT registers it
+				resource = resource.substring(1);
+				if (!resource.endsWith("/")) {
+					paths.add(resource);
+				}
+			}
+		}
+
+		// specific CSS
+		Enumeration<URL> themeResources = themeBundle.findEntries(path, "*.css", true);
+		if (themeResources != null) {
+			while (themeResources.hasMoreElements()) {
+				String resource = themeResources.nextElement().getPath();
+				// remove first '/' so that RWT registers it
+				resource = resource.substring(1);
+				if (!resource.endsWith("/")) {
+					paths.add(resource);
+				}
 			}
 		}
 		return paths;
@@ -277,4 +279,14 @@ public class BundleCmsTheme extends AbstractCmsTheme {
 		return themeBundle;
 	}
 
+	@Override
+	public int hashCode() {
+		return themeId.hashCode();
+	}
+
+	@Override
+	public String toString() {
+		return "Bundle CMS Theme " + themeId;
+	}
+
 }