diff options
| author | Artur Signell <artur@vaadin.com> | 2016-08-18 23:36:31 +0300 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2016-08-22 05:31:31 +0000 |
| commit | 6c7d2dafcdb9978175da549010f01fd1f2bfbad7 (patch) | |
| tree | 6f6fd78d65ec97ad2ab7c4b2912a69612e2e6040 /server | |
| parent | 17b6232a8aa2b586539863dbce2c282117ffac88 (diff) | |
| download | vaadin-framework-6c7d2dafcdb9978175da549010f01fd1f2bfbad7.tar.gz vaadin-framework-6c7d2dafcdb9978175da549010f01fd1f2bfbad7.zip | |
Map <vaadin7> declarative prefix to com.vaadin.v7.ui
Change-Id: I3b529cf4c918eb6ce733fa6d126428d759c88345
Diffstat (limited to 'server')
| -rw-r--r-- | server/src/main/java/com/vaadin/ui/declarative/DesignContext.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/server/src/main/java/com/vaadin/ui/declarative/DesignContext.java b/server/src/main/java/com/vaadin/ui/declarative/DesignContext.java index 834afd6e76..505437d778 100644 --- a/server/src/main/java/com/vaadin/ui/declarative/DesignContext.java +++ b/server/src/main/java/com/vaadin/ui/declarative/DesignContext.java @@ -58,8 +58,10 @@ public class DesignContext implements Serializable { private static final String LEGACY_PREFIX = "v"; private static final String VAADIN_PREFIX = "vaadin"; + private static final String VAADIN7_PREFIX = "vaadin7"; private static final String VAADIN_UI_PACKAGE = "com.vaadin.ui"; + private static final String VAADIN7_UI_PACKAGE = "com.vaadin.v7.ui"; // cache for object instances private static Map<Class<?>, Component> instanceCache = new ConcurrentHashMap<Class<?>, Component>(); @@ -102,6 +104,7 @@ public class DesignContext implements Serializable { addPackagePrefix(VAADIN_PREFIX, VAADIN_UI_PACKAGE); prefixToPackage.put(LEGACY_PREFIX, VAADIN_UI_PACKAGE); } + addPackagePrefix(VAADIN7_PREFIX, VAADIN7_UI_PACKAGE); } public DesignContext() { @@ -422,7 +425,7 @@ public class DesignContext implements Serializable { for (String prefix : getPackagePrefixes()) { // Only store the prefix-name mapping if it is not a default mapping // (such as "vaadin" -> "com.vaadin.ui") - if (!VAADIN_PREFIX.equals(prefix) + if (!VAADIN_PREFIX.equals(prefix) && !VAADIN7_PREFIX.equals(prefix) && !LEGACY_PREFIX.equals(prefix)) { Node newNode = doc.createElement("meta"); newNode.attr("name", "package-mapping"); |