X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.eclipse.ui.rap%2Fsrc%2Forg%2Fargeo%2Feclipse%2Fui%2Fspecific%2FOpenFile.java;h=46de2c9182e706f8fda7be59bb6783ebf2bad1be;hb=19b5a36f4845c4720554fbe06a8354fbaf842671;hp=4d293727351a4e983e428660d593db76ebc0cd91;hpb=c3ce85c34a1a90e9ab5fc2fa9bee63daeb2087da;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFile.java b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFile.java
index 4d2937273..46de2c918 100644
--- a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFile.java
+++ b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFile.java
@@ -17,53 +17,52 @@ package org.argeo.eclipse.ui.specific;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.eclipse.core.commands.AbstractHandler;
-import org.eclipse.core.commands.ExecutionEvent;
-import org.eclipse.core.commands.ExecutionException;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.rap.rwt.client.service.UrlLauncher;
 
 /**
- * Rap specific command handler to open a file retrieved from the server. It
- * forwards the request to the correct service after encoding file name and path
- * in the request URI.
+ * RWT specific object to open a file retrieved from the server. It forwards the
+ * request to the correct service after encoding file name and path in the
+ * request URI.
  * 
+ * <p>
  * The parameter "URI" is used to determine the correct file service, the path
- * and the file name. An optional file name can be precised to present a
- * different file name as the one used to retrieve it to the end user/
+ * and the file name. An optional file name can be added to present the end user
+ * with a different file name as the one used to retrieve it.
+ * </p>
  * 
- * Various instances of this handler with different command ID might coexist in
- * order to provide context specific download service.
  * 
+ * <p>
  * The instance specific service is called by its ID and must have been
  * externally created
+ * </p>
  */
-public class OpenFile extends AbstractHandler {
+public class OpenFile {
 	private final static Log log = LogFactory.getLog(OpenFile.class);
 
-	/* DEPENDENCY INJECTION */
-	private String openFileServiceId;
+	// /* DEPENDENCY INJECTION */
+	// private String openFileServiceId;
+	//
+	// public final static String PARAM_FILE_NAME =
+	// OpenFileService.PARAM_FILE_NAME;
+	// public final static String PARAM_FILE_URI =
+	// OpenFileService.PARAM_FILE_URI; // "param.fileURI";
 
-	public final static String PARAM_FILE_NAME = OpenFileService.PARAM_FILE_NAME;
-	public final static String PARAM_FILE_URI = OpenFileService.PARAM_FILE_URI; // "param.fileURI";
-
-	public Object execute(ExecutionEvent event) throws ExecutionException {
-		String fileName = event.getParameter(PARAM_FILE_NAME);
-		String fileUri = event.getParameter(PARAM_FILE_URI);
-
-		// sanity check
-		if (fileUri == null || "".equals(fileUri.trim())
-				|| openFileServiceId == null
-				|| "".equals(openFileServiceId.trim()))
-			return null;
+	public Object execute(String openFileServiceId, String fileUri,
+			String fileName) {
+		// // Sanity check
+		// if (fileUri == null || "".equals(fileUri.trim())
+		// || openFileServiceId == null
+		// || "".equals(openFileServiceId.trim()))
+		// return null;
 
 		StringBuilder url = new StringBuilder();
 		url.append(RWT.getServiceManager().getServiceHandlerUrl(
 				openFileServiceId));
 
-		url.append("&").append(PARAM_FILE_NAME).append("=");
+		url.append("&").append(OpenFileService.PARAM_FILE_NAME).append("=");
 		url.append(fileName);
-		url.append("&").append(PARAM_FILE_URI).append("=");
+		url.append("&").append(OpenFileService.PARAM_FILE_URI).append("=");
 		url.append(fileUri);
 
 		String downloadUrl = url.toString();
@@ -71,22 +70,12 @@ public class OpenFile extends AbstractHandler {
 			log.debug("URL : " + downloadUrl);
 
 		UrlLauncher launcher = RWT.getClient().getService(UrlLauncher.class);
-		// FIXME: find a way to manage correctly the addition of the base
-		// context for the workbench.
-		launcher.openURL("/ui" + downloadUrl);
-
-		// 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");
+		launcher.openURL(downloadUrl);
 		return null;
 	}
 
-	/* DEPENDENCY INJECTION */
-	public void setOpenFileServiceId(String openFileServiceId) {
-		this.openFileServiceId = openFileServiceId;
-	}
+	// /* DEPENDENCY INJECTION */
+	// public void setOpenFileServiceId(String openFileServiceId) {
+	// this.openFileServiceId = openFileServiceId;
+	// }
 }
\ No newline at end of file