summaryrefslogtreecommitdiffstats
path: root/shared
diff options
context:
space:
mode:
authorJohannes Dahlström <johannesd@vaadin.com>2015-04-24 15:54:23 +0300
committerVaadin Code Review <review@vaadin.com>2015-05-06 10:02:54 +0000
commit49ded4acd2682cc7dc888fb5d57b8afe47dc30d5 (patch)
tree1c92fe96e8064a7f57cd91206eec7a9be4b71315 /shared
parent0fcac7054158ec6dbd8e8707854ee2700be72439 (diff)
downloadvaadin-framework-49ded4acd2682cc7dc888fb5d57b8afe47dc30d5.tar.gz
vaadin-framework-49ded4acd2682cc7dc888fb5d57b8afe47dc30d5.zip
Fix for declarative FontIcon support (#17275)
Change-Id: I5d61ed7003811f95bba4ded71937bb08742936c5
Diffstat (limited to 'shared')
-rw-r--r--shared/src/com/vaadin/shared/ApplicationConstants.java8
-rw-r--r--shared/src/com/vaadin/shared/VaadinUriResolver.java2
2 files changed, 9 insertions, 1 deletions
diff --git a/shared/src/com/vaadin/shared/ApplicationConstants.java b/shared/src/com/vaadin/shared/ApplicationConstants.java
index d7aaee6267..fa6aa33fc0 100644
--- a/shared/src/com/vaadin/shared/ApplicationConstants.java
+++ b/shared/src/com/vaadin/shared/ApplicationConstants.java
@@ -39,6 +39,14 @@ public class ApplicationConstants implements Serializable {
public static final String PUBLISHED_PROTOCOL_NAME = "published";
public static final String PUBLISHED_PROTOCOL_PREFIX = PUBLISHED_PROTOCOL_NAME
+ "://";
+ /**
+ * Prefix used for theme resource URLs
+ *
+ * @see com.vaadin.server.ThemeResource
+ * @since
+ */
+ public static final String THEME_PROTOCOL_PREFIX = "theme://";
+
public static final String UIDL_SECURITY_TOKEN_ID = "Vaadin-Security-Key";
@Deprecated
diff --git a/shared/src/com/vaadin/shared/VaadinUriResolver.java b/shared/src/com/vaadin/shared/VaadinUriResolver.java
index b45d32f71a..ee8d13f10f 100644
--- a/shared/src/com/vaadin/shared/VaadinUriResolver.java
+++ b/shared/src/com/vaadin/shared/VaadinUriResolver.java
@@ -58,7 +58,7 @@ public abstract class VaadinUriResolver implements Serializable {
if (vaadinUri == null) {
return null;
}
- if (vaadinUri.startsWith("theme://")) {
+ if (vaadinUri.startsWith(ApplicationConstants.THEME_PROTOCOL_PREFIX)) {
final String themeUri = getThemeUri();
vaadinUri = themeUri + vaadinUri.substring(7);
}