summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorMatti Tahvonen <matti.tahvonen@itmill.com>2008-03-17 12:52:19 +0000
committerMatti Tahvonen <matti.tahvonen@itmill.com>2008-03-17 12:52:19 +0000
commit86a4d4d3dca1e4a026d61bd0fd1f8b8a483a81f3 (patch)
tree3033ee88deae00b65b8ff2e468c031150b41ff68 /src/com
parenta0b0979d068f9db46615def52c7c240bbbbd2646 (diff)
downloadvaadin-framework-86a4d4d3dca1e4a026d61bd0fd1f8b8a483a81f3.tar.gz
vaadin-framework-86a4d4d3dca1e4a026d61bd0fd1f8b8a483a81f3.zip
fixes #1499
svn changeset:4060/svn branch:trunk
Diffstat (limited to 'src/com')
-rw-r--r--src/com/itmill/toolkit/service/FileTypeResolver.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/com/itmill/toolkit/service/FileTypeResolver.java b/src/com/itmill/toolkit/service/FileTypeResolver.java
index 79aadf899f..277e432749 100644
--- a/src/com/itmill/toolkit/service/FileTypeResolver.java
+++ b/src/com/itmill/toolkit/service/FileTypeResolver.java
@@ -315,14 +315,14 @@ public class FileTypeResolver {
throw new NullPointerException("File can not be null");
}
- // Drives
- if (file.getParentFile() == null) {
- return "inode/drive";
- }
-
// Directories
if (file.isDirectory()) {
- return "inode/directory";
+ // Drives
+ if (file.getParentFile() == null) {
+ return "inode/drive";
+ } else {
+ return "inode/directory";
+ }
}
// Return type from extension