X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=eclipse%2Fruntime%2Forg.argeo.eclipse.ui.rap%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Feclipse%2Fui%2Fspecific%2FFileHandler.java;h=f873f1a524cf0c078dfa73a120f929cde74916df;hb=a99d11e0c2696ff1a4a258adaa94d137440c8d6c;hp=289cd2b903c412cf762aee3e3a7c050dc1430200;hpb=048ba975269c26509657b099e6bc71c73a269c07;p=lgpl%2Fargeo-commons.git

diff --git a/eclipse/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java b/eclipse/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java
index 289cd2b90..f873f1a52 100644
--- a/eclipse/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java
+++ b/eclipse/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java
@@ -1,6 +1,5 @@
 package org.argeo.eclipse.ui.specific;
 
-import java.io.InputStream;
 import java.net.URL;
 
 import org.apache.commons.logging.Log;
@@ -32,10 +31,15 @@ public class FileHandler {
 		IServiceManager manager = RWT.getServiceManager();
 		IServiceHandler handler = new DownloadServiceHandler(provider);
 		manager.registerServiceHandler("downloadServiceHandler", handler);
-
 	}
 
-	public void openFile(String fileName, String fileId, InputStream is) {
+	public void openFile(String fileName, String fileId) {
+
+		// See RAP FAQ:
+		// http://wiki.eclipse.org/RAP/FAQ#How_to_provide_download_link.3F
+		// And forum discussion :
+		// http://www.eclipse.org/forums/index.php?t=msg&th=205487&start=0&S=43d85dacc88b505402420592109c7240
+
 		try {
 			if (log.isDebugEnabled())
 				log.debug("URL : " + createFullDownloadUrl(fileName, fileId));
@@ -43,138 +47,19 @@ public class FileHandler {
 			URL url = new URL(createFullDownloadUrl(fileName, fileId));
 			PlatformUI.getWorkbench().getBrowserSupport()
 					.createBrowser("DownloadDialog").openURL(url);
-
-			/*
-			 * // New try : must define a service handler for the current file,
-			 * // register it and redirect the URL to it.
-			 * 
-			 * // workaround : create a tmp file. String prefix = "", suffix =
-			 * ""; if (fileName != null) { int ind = fileName.lastIndexOf('.');
-			 * if (ind > 0) { prefix = fileName.substring(0, ind); suffix =
-			 * fileName.substring(ind); } }
-			 * 
-			 * File tmpFile = createTmpFile(prefix, suffix, is);
-			 * HttpServletResponse response = RWT.getResponse();
-			 * 
-			 * DownloadHandler dh = new DownloadHandler(tmpFile.getName(),
-			 * tmpFile, "application/pdf", fileName);
-			 * 
-			 * log.debug("Got a DH : " + dh.toString());
-			 * 
-			 * // TODO : should try with that. // String encodedURL =
-			 * RWT.getResponse().encodeURL(url.toString());
-			 * response.sendRedirect(dh.getURL());
-			 */
-
-			// final Browser browser = new Browser(parent, SWT.NONE);
-			// browser.setText(createDownloadHtml("test.pdf", "Download file"));
-
 		} catch (Exception e) {
 			e.printStackTrace();
 		}
 
-		// // Which file to download?
-		// String fileName = RWT.getRequest().getParameter( "filename" );
-		// // Get the file content
-		// byte[] download = MyDataStore.getByteArrayData( fileName );
-		// // Send the file in the response
-		// HttpServletResponse response = RWT.getResponse();
-		// response.setContentType( "application/octet-stream" );
-		// response.setContentLength( download.length );
-		// String contentDisposition = "attachment; filename=\"" + fileName +
-		// "\"";
-		// response.setHeader( "Content-Disposition", contentDisposition );
-		// try {
-		// response.getOutputStream().write( download );
-		// } catch( IOException e1 ) {
-		// e1.printStackTrace();
-		// }
-		//
-		//
-
-		/**
-		 * try {
-		 * 
-		 * // / workaround : create a tmp file. String prefix = "", suffix = "";
-		 * if (fileName != null) { int ind = fileName.lastIndexOf('.'); if (ind
-		 * > 0) { prefix = fileName.substring(0, ind); suffix =
-		 * fileName.substring(ind); } }
-		 * 
-		 * File tmpFile = createTmpFile(prefix, suffix, is);
-		 * 
-		 * // Send the file in the response HttpServletResponse response =
-		 * RWT.getResponse(); byte[] ba = null; ba =
-		 * FileUtils.readFileToByteArray(tmpFile);
-		 * 
-		 * long l = tmpFile.length();
-		 * 
-		 * if (l < Integer.MIN_VALUE || l > Integer.MAX_VALUE) throw new
-		 * ArgeoException("IllegalArgumentException : " + l +
-		 * " cannot be cast to int without changing its value.");
-		 * response.setContentLength((int) l);
-		 * 
-		 * // response.setContentLength(ba.length);
-		 * 
-		 * // String contentDisposition = "attachment; filename=\"" + fileName
-		 * // + "\""; String contentDisposition = "attachment; filename=\"" +
-		 * fileName + "\"";
-		 * response.setContentType("application/force-download");
-		 * response.setHeader("Content-Disposition", contentDisposition);
-		 * response.setHeader("Content-Transfer-Encoding", "binary");
-		 * response.setHeader("Pragma", "no-cache");
-		 * response.setHeader("Cache-Control", "no-cache, must-revalidate");
-		 * 
-		 * // must-revalidate");
-		 * 
-		 * if (log.isDebugEnabled()) { log.debug("Header Set "); }
-		 * 
-		 * // header("Content-Type: application/force-download; name=\"".
-		 * $localName."\""); // 852 header("Content-Transfer-Encoding: binary");
-		 * // 853 if($gzip){ // 854 header("Content-Encoding: gzip"); // 855 //
-		 * If gzip, recompute data size! // 856 $gzippedData = //
-		 * ($data?gzencode
-		 * ($filePathOrData,9):gzencode(file_get_contents($filePathOrData), //
-		 * 9)); // 857 $size = strlen($gzippedData); // 858 } // 859
-		 * header("Content-Length: ".$size); // 860 if ($isFile && ($size != 0))
-		 * header("Content-Range: bytes 0-" // . ($size - 1) . "/" . $size .
-		 * ";"); // 861 //
-		 * header("Content-Disposition: attachment; filename=\"".
-		 * $localName."\""); // 862 header("Expires: 0"); // 863
-		 * header("Cache-Control: no-cache, must-revalidate"); // 864
-		 * header("Pragma: no-cache");
-		 * 
-		 * // IOUtils.copy(is, response.getOutputStream());
-		 * response.getOutputStream().write(ba); //
-		 * Error.show("In Open File for RAP.");
-		 * 
-		 * 
-		 * 
-		 * 
-		 * } catch (IOException ioe) {
-		 * 
-		 * throw new ArgeoException("Cannot copy input stream from file " +
-		 * fileName + " to HttpServletResponse", ioe); }
-		 */
-
+		// These lines are useless in the current use case but might be
+		// necessary with new browsers. Stored here for memo
+		// response.setContentType("application/force-download");
+		// response.setHeader("Content-Disposition", contentDisposition);
+		// response.setHeader("Content-Transfer-Encoding", "binary");
+		// response.setHeader("Pragma", "no-cache");
+		// response.setHeader("Cache-Control", "no-cache, must-revalidate");
 	}
 
-	// private File createTmpFile(String prefix, String suffix, InputStream is)
-	// {
-	// File tmpFile = null;
-	// OutputStream os = null;
-	// try {
-	// tmpFile = File.createTempFile(prefix, suffix);
-	// os = new FileOutputStream(tmpFile);
-	// IOUtils.copy(is, os);
-	// } catch (IOException e) {
-	// throw new ArgeoException("Cannot open file " + prefix + "."
-	// + suffix, e);
-	// } finally {
-	// IOUtils.closeQuietly(os);
-	// }
-	// return tmpFile;
-	// }
-
 	private String createFullDownloadUrl(String fileName, String fileId) {
 		StringBuilder url = new StringBuilder();
 		url.append(RWT.getRequest().getRequestURL());