Index: lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceOutputFactory.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceOutputFactory.java,v diff -u -r1.2 -r1.3 --- lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceOutputFactory.java 13 Aug 2009 09:47:38 -0000 1.2 +++ lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceOutputFactory.java 23 Aug 2009 11:32:54 -0000 1.3 @@ -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; }