Reduce verbosity in file icon selection and fix a warning.

diff --git a/gss/src/gr/ebs/gss/client/FileList.java b/gss/src/gr/ebs/gss/client/FileList.java
index ae416f5..44a0288 100644 (file)
--- a/gss/src/gr/ebs/gss/client/FileList.java
+++ b/gss/src/gr/ebs/gss/client/FileList.java
@@ -618,69 +618,33 @@ public class FileList extends Composite implements TableListener, ClickListener
        private AbstractImagePrototype getFileIcon(FileResource file) {\r
                String mimetype = file.getContentType();\r
                boolean shared = file.isShared();\r
-               if (mimetype == null){\r
-                       if(shared)\r
-                               return images.documentShared();\r
-                       return images.document();\r
-               }\r
-               else if ("application/pdf".equalsIgnoreCase(mimetype)){\r
-                       if(shared)\r
-                               return images.pdfShared();\r
-                       return images.pdf();\r
-               }\r
-               else if ("application/vnd.ms-excel".equalsIgnoreCase(mimetype)){\r
-                       if(shared)\r
-                               return images.spreadsheetShared();\r
-                       return images.spreadsheet();\r
-               }\r
-               else if ("application/msword".equalsIgnoreCase(mimetype)){\r
-                       if(shared)\r
-                               return images.wordprocessorShared();\r
-                       return images.wordprocessor();\r
-               }\r
-               else if ("application/vnd.ms-powerpoint".equalsIgnoreCase(mimetype)){\r
-                       if(shared)\r
-                               return images.presentationShared();\r
-                       return images.presentation();\r
-               }\r
+               if (mimetype == null)\r
+                       return shared ? images.documentShared() : images.document();\r
+               else if ("application/pdf".equalsIgnoreCase(mimetype))\r
+                       return shared ? images.pdfShared() : images.pdf();\r
+               else if ("application/vnd.ms-excel".equalsIgnoreCase(mimetype))\r
+                       return shared ? images.spreadsheetShared() : images.spreadsheet();\r
+               else if ("application/msword".equalsIgnoreCase(mimetype))\r
+                       return shared ? images.wordprocessorShared() : images.wordprocessor();\r
+               else if ("application/vnd.ms-powerpoint".equalsIgnoreCase(mimetype))\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
-                       if(shared)\r
-                               return images.zipShared();\r
-                       return images.zip();\r
-               }\r
-               else if ("text/html".equalsIgnoreCase(mimetype)){\r
-                       if(shared)\r
-                               return images.htmlShared();\r
-                       return images.html();\r
-               }\r
-               else if ("text/plain".equalsIgnoreCase(mimetype)){\r
-                       if(shared)\r
-                               return images.txtShared();\r
-                       return images.txt();\r
-               }\r
-               else if (mimetype.startsWith("image/")){\r
-                       if(shared)\r
-                               return images.imageShared();\r
-                       return images.image();\r
-               }\r
-               else if (mimetype.startsWith("video/")){\r
-                       if(shared)\r
-                               return images.videoShared();\r
-                       return images.video();\r
-               }\r
-               else if (mimetype.startsWith("audio/")){\r
-                       if(shared)\r
-                               return images.audioShared();\r
-                       return images.audio();\r
-               }\r
-               else if(shared)\r
-                       return images.documentShared();\r
-               else\r
-                       return images.document();\r
+                                       "application/x-gtar".equalsIgnoreCase(mimetype))\r
+                       return shared ? images.zipShared() : images.zip();\r
+               else if ("text/html".equalsIgnoreCase(mimetype))\r
+                       return shared ? images.htmlShared() : images.html();\r
+               else if ("text/plain".equalsIgnoreCase(mimetype))\r
+                       return shared ? images.txtShared() : images.txt();\r
+               else if (mimetype.startsWith("image/"))\r
+                       return shared ? images.imageShared() : images.image();\r
+               else if (mimetype.startsWith("video/"))\r
+                       return shared ? images.videoShared() : images.video();\r
+               else if (mimetype.startsWith("audio/"))\r
+                       return shared ? images.audioShared() : images.audio();\r
+               return shared ? images.documentShared() : images.document();\r
        }\r
 \r
        /**\r
@@ -724,6 +688,7 @@ public class FileList extends Composite implements TableListener, ClickListener
                                                        if(GSS.get().getFolders().isFileItem(folderItem)){\r
                                                                MultipleHeadCommand<FileResource> getFiles = new MultipleHeadCommand<FileResource>(FileResource.class, folderItem.getFolderResource().getFilePaths().toArray(new String[0])){\r
 \r
+                                                                       @Override\r
                                                                        public void onComplete(){\r
                                                                                folderItem.getFolderResource().setFiles(getResult());\r
                                                                                updateFileCache(clearSelection);\r