Loosen mime type checking to cover cases where charset information is also included...
authordroutsis <devnull@localhost>
Thu, 7 May 2009 13:07:30 +0000 (13:07 +0000)
committerdroutsis <devnull@localhost>
Thu, 7 May 2009 13:07:30 +0000 (13:07 +0000)
gss/src/gr/ebs/gss/client/FileList.java

index 7f0fb0a..9cab865 100644 (file)
@@ -622,23 +622,24 @@ public class FileList extends Composite implements TableListener, ClickListener
                boolean shared = file.isShared();\r
                if (mimetype == null)\r
                        return shared ? images.documentShared() : images.document();\r
-               else if ("application/pdf".equalsIgnoreCase(mimetype))\r
+               mimetype = mimetype.toLowerCase();\r
+               if (mimetype.startsWith("application/pdf"))\r
                        return shared ? images.pdfShared() : images.pdf();\r
-               else if ("application/vnd.ms-excel".equalsIgnoreCase(mimetype))\r
+               else if (mimetype.startsWith("application/vnd.ms-excel"))\r
                        return shared ? images.spreadsheetShared() : images.spreadsheet();\r
-               else if ("application/msword".equalsIgnoreCase(mimetype))\r
+               else if (mimetype.startsWith("application/msword"))\r
                        return shared ? images.wordprocessorShared() : images.wordprocessor();\r
-               else if ("application/vnd.ms-powerpoint".equalsIgnoreCase(mimetype))\r
+               else if (mimetype.startsWith("application/vnd.ms-powerpoint"))\r
                        return shared ? images.presentationShared() : images.presentation();\r
-               else if ("application/zip".equalsIgnoreCase(mimetype) ||\r
-                                       "application/gzip".equalsIgnoreCase(mimetype) ||\r
-                                       "application/x-gzip".equalsIgnoreCase(mimetype) ||\r
-                                       "application/x-tar".equalsIgnoreCase(mimetype) ||\r
-                                       "application/x-gtar".equalsIgnoreCase(mimetype))\r
+               else if (mimetype.startsWith("application/zip") ||\r
+                                       mimetype.startsWith("application/gzip") ||\r
+                                       mimetype.startsWith("application/x-gzip") ||\r
+                                       mimetype.startsWith("application/x-tar") ||\r
+                                       mimetype.startsWith("application/x-gtar"))\r
                        return shared ? images.zipShared() : images.zip();\r
-               else if ("text/html".equalsIgnoreCase(mimetype))\r
+               else if (mimetype.startsWith("text/html"))\r
                        return shared ? images.htmlShared() : images.html();\r
-               else if ("text/plain".equalsIgnoreCase(mimetype))\r
+               else if (mimetype.startsWith("text/plain"))\r
                        return shared ? images.txtShared() : images.txt();\r
                else if (mimetype.startsWith("image/"))\r
                        return shared ? images.imageShared() : images.image();\r