aboutsummaryrefslogtreecommitdiffstats
path: root/src/com/vaadin/terminal/ThemeResource.java
diff options
context:
space:
mode:
authorJouni Koivuviita <jouni@vaadin.com>2012-08-07 16:05:49 +0300
committerJouni Koivuviita <jouni@vaadin.com>2012-08-07 16:05:49 +0300
commit8356465b3897fa16233064cfd586b4557f33e8e4 (patch)
treeaa14a1e52e85935486e7a4aec453247939a228fc /src/com/vaadin/terminal/ThemeResource.java
parent9a83722fde94af949b45d4c091399ba9e1f6ba29 (diff)
parent5813e0e9e5af4f946e5ea9c73d426e95d93b7bc4 (diff)
downloadvaadin-framework-8356465b3897fa16233064cfd586b4557f33e8e4.tar.gz
vaadin-framework-8356465b3897fa16233064cfd586b4557f33e8e4.zip
merge master
Diffstat (limited to 'src/com/vaadin/terminal/ThemeResource.java')
-rw-r--r--src/com/vaadin/terminal/ThemeResource.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/com/vaadin/terminal/ThemeResource.java b/src/com/vaadin/terminal/ThemeResource.java
index d456047653..41674b2373 100644
--- a/src/com/vaadin/terminal/ThemeResource.java
+++ b/src/com/vaadin/terminal/ThemeResource.java
@@ -89,6 +89,7 @@ public class ThemeResource implements Resource {
/**
* @see com.vaadin.terminal.Resource#getMIMEType()
*/
+ @Override
public String getMIMEType() {
return FileTypeResolver.getMIMEType(getResourceId());
}