Changeset 423 for gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/java

Timestamp:

08/21/12 12:53:20 (13 years ago)

Author:

mcichenski

Message:

 

File:

• gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/java/gssim/gssimstudio/flex/app/editor/GanntChart.java (modified) (2 diffs)

gssim_ui/branches/vine/gssimstudio/src/web/ui/flex/java/gssim/gssimstudio/flex/app/editor/GanntChart.java

@@ -154 +154 @@
             }
 
-            //String fileDownloadServletUrl = FileDownloadServlet.getResourceUrl();
-
-            for (FileLocation fileLocation : fileLocationList) {
-
+            ServletContext servletContext = FlexContext.getServletContext();
+            
+            for (FileLocation fileLocation : fileLocationList) {                
                 HashMap<String, String> fileLocationItem = new HashMap<String, String>();
                 fileLocationItemList.add(fileLocationItem);
@@ -194 +193 @@
                 fileLocationItem.put("folderUrl", folderLocation.getUrl());
                 
-                // Download url
-                if (fileType.equals(FileType.FILE)) {
-                    //fileLocationItem.put("fileDownloadUrl", FileDownloadServlet.getResourceUrlForFileLocation(fileLocation, false));
+                String contentType = servletContext.getMimeType(fileLocation.getFileName().toLowerCase());
+                String openUrl = null;
+                if (contentType != null) {
+                    openUrl = VineFlexUtilClass.getURL(fileLocation, contentType);
+                } else {
+                    openUrl = VineFlexUtilClass.getDownloadURL(fileLocation);
                 }
+                fileLocationItem.put("fileAccessUrl", openUrl);
             }