summaryrefslogtreecommitdiffstats
path: root/server/src/com/vaadin/service
diff options
context:
space:
mode:
Diffstat (limited to 'server/src/com/vaadin/service')
-rw-r--r--server/src/com/vaadin/service/ApplicationContext.java2
-rw-r--r--server/src/com/vaadin/service/FileTypeResolver.java4
2 files changed, 3 insertions, 3 deletions
diff --git a/server/src/com/vaadin/service/ApplicationContext.java b/server/src/com/vaadin/service/ApplicationContext.java
index 55495dcd5c..aaf5d1b386 100644
--- a/server/src/com/vaadin/service/ApplicationContext.java
+++ b/server/src/com/vaadin/service/ApplicationContext.java
@@ -22,7 +22,7 @@ import java.net.URL;
import java.util.Collection;
import com.vaadin.Application;
-import com.vaadin.terminal.ApplicationResource;
+import com.vaadin.server.ApplicationResource;
import com.vaadin.terminal.gwt.server.AbstractCommunicationManager;
/**
diff --git a/server/src/com/vaadin/service/FileTypeResolver.java b/server/src/com/vaadin/service/FileTypeResolver.java
index 2b289d6752..4b1c8697eb 100644
--- a/server/src/com/vaadin/service/FileTypeResolver.java
+++ b/server/src/com/vaadin/service/FileTypeResolver.java
@@ -23,8 +23,8 @@ import java.util.Hashtable;
import java.util.Map;
import java.util.StringTokenizer;
-import com.vaadin.terminal.Resource;
-import com.vaadin.terminal.ThemeResource;
+import com.vaadin.server.Resource;
+import com.vaadin.server.ThemeResource;
/**
* Utility class that can figure out mime-types and icons related to files.