Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceOutputFactory.java =================================================================== diff -u -r0deb16204d87ee066914a10b3b545cf25eb4d714 -rd351bb9274cfee54342c4c5012abedcf96874881 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceOutputFactory.java (.../ResourceOutputFactory.java) (revision 0deb16204d87ee066914a10b3b545cf25eb4d714) +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceOutputFactory.java (.../ResourceOutputFactory.java) (revision d351bb9274cfee54342c4c5012abedcf96874881) @@ -103,31 +103,32 @@ if (!item.isCreateByAuthor()) { uploadedItems.add(item); } - SimpleURL[] uploadedItemUrls = new SimpleURL[uploadedItems.size()]; - int uploadedItemIndex = 0; - if (!uploadedItems.isEmpty()) { - String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL); - for (ResourceItem uploadedItem : uploadedItems) { + } + SimpleURL[] uploadedItemUrls = new SimpleURL[uploadedItems.size()]; + int uploadedItemIndex = 0; + if (!uploadedItems.isEmpty()) { + String serverUrl = Configuration.get(ConfigurationKeys.SERVER_URL); + for (ResourceItem uploadedItem : uploadedItems) { - String path = uploadedItem.getUrl(); - if (path == null) { - path = serverUrl + "download/?uuid=" + uploadedItem.getFileUuid() - + "&preferDownload=false&" + AttributeNames.PARAM_TOOL_CONTENT_HANDLER_NAME - + "=" + ResourceConstants.TOOL_CONTENT_HANDLER_NAME; + String path = uploadedItem.getUrl(); + if (path == null) { + path = serverUrl + "download/?uuid=" + uploadedItem.getFileUuid() + + "&preferDownload=false&" + AttributeNames.PARAM_TOOL_CONTENT_HANDLER_NAME + "=" + + ResourceConstants.TOOL_CONTENT_HANDLER_NAME; - } - path = "javascript:var dummy = window.open('" + path + "','" + uploadedItem.getTitle() - + "','resizable,scrollbars')"; - SimpleURL url = new SimpleURL(uploadedItem.getTitle(), path); - uploadedItemUrls[uploadedItemIndex] = url; - uploadedItemIndex++; } - return new ToolOutput(ResourceConstants.SHARED_ITEMS_DEFINITION_NAME, getI18NText( - ResourceConstants.SHARED_ITEMS_DEFINITION_NAME, true), uploadedItemUrls, false); + path = "javascript:var dummy = window.open('" + path + "','" + uploadedItem.getTitle() + + "','resizable,scrollbars')"; + SimpleURL url = new SimpleURL(uploadedItem.getTitle(), path); + uploadedItemUrls[uploadedItemIndex] = url; + uploadedItemIndex++; } - + return new ToolOutput(ResourceConstants.SHARED_ITEMS_DEFINITION_NAME, getI18NText( + ResourceConstants.SHARED_ITEMS_DEFINITION_NAME, true), uploadedItemUrls, false); } + } + } return null; }