Author: tchemit Date: 2011-11-21 16:40:40 +0100 (Mon, 21 Nov 2011) New Revision: 102 Url: http://forge.codelutin.com/repositories/revision/echobase/102 Log: use selected export file name Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java 2011-11-21 15:26:30 UTC (rev 101) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/dbeditor/ExportTable.java 2011-11-21 15:40:40 UTC (rev 102) @@ -49,21 +49,25 @@ protected String tableName; /** Default file name to create. */ - protected String fileName; + protected String exportFileName; - /** WTF ? */ + /** Stream of the file to export. */ protected InputStream inputStream; - /** WTF ? */ + /** Length of the file to export. */ protected long contentLength; - /** WTF ? */ + /** Type of the file to export. */ protected String contentType; public void setTableName(String tableName) { this.tableName = tableName; } + public void setExportFileName(String exportFileName) { + this.exportFileName = exportFileName; + } + public InputStream getInputStream() { return inputStream; } @@ -76,8 +80,8 @@ return contentType; } - public String getFileName() { - return fileName; + public String getExportFileName() { + return exportFileName; } @Override @@ -88,7 +92,6 @@ File file = dbEditorService.exportDatas(tableName); contentType = "text/csv"; - fileName = file.getName(); contentLength = file.length(); inputStream = new FileInputStream(file); Modified: trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2011-11-21 15:26:30 UTC (rev 101) +++ trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2011-11-21 15:40:40 UTC (rev 102) @@ -32,7 +32,8 @@ <package name="dbeditor" extends="loggued" namespace="/dbeditor"> <result-types> - <result-type name="redirectToDbEditor" class="org.apache.struts2.dispatcher.ServletActionRedirectResult"> + <result-type name="redirectToDbEditor" + class="org.apache.struts2.dispatcher.ServletActionRedirectResult"> <param name="namespace">/dbeditor</param> <param name="actionName">dbeditor</param> <param name="tableName">${tableName}</param> @@ -86,7 +87,7 @@ <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> - <param name="contentDisposition">filename="${fileName}"</param> + <param name="contentDisposition">filename="${exportFileName}"</param> </result> </action>