merge master

1 files changed, 17 insertions, 1 deletions

diff --git a/src/com/vaadin/terminal/gwt/server/ResourceReference.java b/src/com/vaadin/terminal/gwt/server/ResourceReference.java
index 56f2bed896..2104ad4b87 100644
--- a/src/com/vaadin/terminal/gwt/server/ResourceReference.java
+++ b/src/com/vaadin/terminal/gwt/server/ResourceReference.java
@@ -4,11 +4,11 @@
 package com.vaadin.terminal.gwt.server;
 
 import com.vaadin.Application;
+import com.vaadin.shared.communication.URLReference;
 import com.vaadin.terminal.ApplicationResource;
 import com.vaadin.terminal.ExternalResource;
 import com.vaadin.terminal.Resource;
 import com.vaadin.terminal.ThemeResource;
-import com.vaadin.terminal.gwt.client.communication.URLReference;
 
 public class ResourceReference extends URLReference {
 
@@ -48,4 +48,20 @@ public class ResourceReference extends URLReference {
         }
 
     }
+
+    public static ResourceReference create(Resource resource) {
+        if (resource == null) {
+            return null;
+        } else {
+            return new ResourceReference(resource);
+        }
+    }
+
+    public static Resource getResource(URLReference reference) {
+        if (reference == null) {
+            return null;
+        }
+        assert reference instanceof ResourceReference;
+        return ((ResourceReference) reference).getResource();
+    }
 }