X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms.ui%2Fsrc%2Forg%2Fargeo%2Fcms%2Fscript%2FTheme.java;h=584f521e08262c582a91a622e1111b6f4042a055;hb=890b1739c54daf0b2f5a40b808f3cff78917d80c;hp=3fa4bc451edae6b324603c5a0dadf5840a1e6bbe;hpb=088c1b517a543e935d8ab65c3b2fd2d0269b551d;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/script/Theme.java b/org.argeo.cms.ui/src/org/argeo/cms/script/Theme.java
index 3fa4bc451..584f521e0 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/script/Theme.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/script/Theme.java
@@ -1,184 +1,18 @@
 package org.argeo.cms.script;
 
-import static java.nio.charset.StandardCharsets.UTF_8;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.argeo.cms.CmsException;
-import org.argeo.cms.util.BundleResourceLoader;
-import org.argeo.cms.util.ThemeUtils;
-import org.eclipse.rap.rwt.application.Application;
-import org.eclipse.rap.rwt.service.ResourceLoader;
-import org.osgi.framework.Bundle;
+import org.argeo.cms.util.CmsTheme;
 import org.osgi.framework.BundleContext;
 
-public class Theme {
-	private final static Log log = LogFactory.getLog(Theme.class);
-
-	private final String themeId;
-	private Map<String, ResourceLoader> css = new HashMap<>();
-	private Map<String, ResourceLoader> resources = new HashMap<>();
-
-	private String headerCss;
-	private List<String> fonts = new ArrayList<>();
-
-	private String basePath;
-	private String cssPath;
-
-	public Theme(BundleContext bundleContext) {
-		this(bundleContext, null);
-	}
+/** @deprecated Use <code>CmsTheme</code> instead. */
+@Deprecated
+public class Theme extends CmsTheme {
 
 	public Theme(BundleContext bundleContext, String symbolicName) {
-		Bundle themeBundle;
-		if (symbolicName == null) {
-			themeBundle = bundleContext.getBundle();
-			basePath = "/theme/internal/";
-			cssPath = basePath;
-		} else {
-			themeBundle = ThemeUtils.findThemeBundle(bundleContext, symbolicName);
-			basePath = "/";
-			cssPath = "/rap/";
-		}
-		this.themeId = themeBundle.getSymbolicName();
-		addStyleSheets(themeBundle, new BundleResourceLoader(themeBundle));
-		BundleResourceLoader themeBRL = new BundleResourceLoader(themeBundle);
-		addResources(themeBRL, "*.png");
-		addResources(themeBRL, "*.gif");
-		addResources(themeBRL, "*.jpg");
-		addResources(themeBRL, "*.jpeg");
-		addResources(themeBRL, "*.svg");
-		addResources(themeBRL, "*.ico");
-
-		// fonts
-		URL fontsUrl = themeBundle.getEntry(basePath + "fonts.txt");
-		if (fontsUrl != null) {
-			loadFontsUrl(fontsUrl);
-		}
-
-		// common CSS header (plain CSS)
-		URL headerCssUrl = themeBundle.getEntry(basePath + "header.css");
-		if (headerCssUrl != null) {
-			try (BufferedReader buffer = new BufferedReader(new InputStreamReader(headerCssUrl.openStream(), UTF_8))) {
-				headerCss = buffer.lines().collect(Collectors.joining("\n"));
-			} catch (IOException e) {
-				throw new CmsException("Cannot read " + headerCssUrl, e);
-			}
-		}
-
-	}
-
-	public void apply(Application application) {
-		for (String name : resources.keySet()) {
-			application.addResource(name, resources.get(name));
-			if (log.isDebugEnabled())
-				log.debug("Added resource " + name);
-		}
-		for (String name : css.keySet()) {
-			application.addStyleSheet(themeId, name, css.get(name));
-			if (log.isDebugEnabled())
-				log.debug("Added RAP CSS " + name);
-		}
-	}
-
-	public String getAdditionalHeaders() {
-		StringBuilder sb = new StringBuilder();
-		if (headerCss != null) {
-			sb.append("<style type='text/css'>\n");
-			sb.append(headerCss);
-			sb.append("\n</style>\n");
-		}
-		for (String link : fonts) {
-			sb.append("<link rel='stylesheet' href='");
-			sb.append(link);
-			sb.append("'/>\n");
-		}
-		if (sb.length() == 0)
-			return null;
-		else
-			return sb.toString();
-	}
-
-	void addStyleSheets(Bundle themeBundle, ResourceLoader ssRL) {
-		Enumeration<URL> themeResources = themeBundle.findEntries(cssPath, "*.css", true);
-		if (themeResources == null)
-			return;
-		while (themeResources.hasMoreElements()) {
-			String resource = themeResources.nextElement().getPath();
-			// remove first '/' so that RWT registers it
-			resource = resource.substring(1);
-			if (!resource.endsWith("/")) {
-				if (css.containsKey(resource))
-					log.warn("Overriding " + resource + " from " + themeBundle.getSymbolicName());
-				css.put(resource, ssRL);
-			}
-
-		}
-
+		super(bundleContext, symbolicName);
 	}
 
-	void loadFontsUrl(URL url) {
-		try (BufferedReader in = new BufferedReader(new InputStreamReader(url.openStream(), UTF_8))) {
-			String line = null;
-			while ((line = in.readLine()) != null) {
-				line = line.trim();
-				if (!line.equals("") && !line.startsWith("#")) {
-					fonts.add(line);
-				}
-			}
-		} catch (IOException e) {
-			throw new CmsException("Cannot load URL " + url, e);
-		}
-	}
-
-	void addResources(BundleResourceLoader themeBRL, String pattern) {
-		Bundle themeBundle = themeBRL.getBundle();
-		Enumeration<URL> themeResources = themeBundle.findEntries(basePath, pattern, true);
-		if (themeResources == null)
-			return;
-		while (themeResources.hasMoreElements()) {
-			String resource = themeResources.nextElement().getPath();
-			// remove first '/' so that RWT registers it
-			resource = resource.substring(1);
-			if (!resource.endsWith("/")) {
-				if (resources.containsKey(resource))
-					log.warn("Overriding " + resource + " from " + themeBundle.getSymbolicName());
-				resources.put(resource, themeBRL);
-			}
-
-		}
-
-	}
-
-	public String getThemeId() {
-		return themeId;
-	}
-
-	public String getBasePath() {
-		return basePath;
-	}
-
-	public void setBasePath(String basePath) {
-		this.basePath = basePath;
-	}
-
-	public String getCssPath() {
-		return cssPath;
-	}
-
-	public void setCssPath(String cssPath) {
-		this.cssPath = cssPath;
+	public Theme(BundleContext bundleContext) {
+		super(bundleContext);
 	}
 
 }