X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=inline;f=org.argeo.eclipse.ui.rap%2Fsrc%2Forg%2Fargeo%2Feclipse%2Fui%2Fspecific%2FOpenFile.java;h=efc07337d6b6e15e4b36beb87db50197fbc2b9cf;hb=6f440ffe5f042c31ff0f7d75e0441e7af024fdd3;hp=46de2c9182e706f8fda7be59bb6783ebf2bad1be;hpb=62507968a52ea82a8a0ec91a3f16826f111e7d9a;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 46de2c918..efc07337d 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,6 +17,10 @@ package org.argeo.eclipse.ui.specific;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.eclipse.ui.EclipseUiUtils;
+import org.argeo.eclipse.ui.utils.SingleSourcingConstants;
+import org.eclipse.core.commands.AbstractHandler;
+import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.rap.rwt.client.service.UrlLauncher;
 
@@ -37,45 +41,48 @@ import org.eclipse.rap.rwt.client.service.UrlLauncher;
  * externally created
  * </p>
  */
-public class OpenFile {
+public class OpenFile extends AbstractHandler {
 	private final static Log log = LogFactory.getLog(OpenFile.class);
 
-	// /* 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 ID = SingleSourcingConstants.OPEN_FILE_CMD_ID;
+	public final static String PARAM_FILE_NAME = SingleSourcingConstants.PARAM_FILE_NAME;
+	public final static String PARAM_FILE_URI = SingleSourcingConstants.PARAM_FILE_URI;;
+	
+	/* DEPENDENCY INJECTION */
+	private String openFileServiceId;
 
-	public Object execute(String openFileServiceId, String fileUri,
-			String fileName) {
-		// // Sanity check
-		// if (fileUri == null || "".equals(fileUri.trim())
-		// || openFileServiceId == null
-		// || "".equals(openFileServiceId.trim()))
-		// return null;
+	public Object execute(ExecutionEvent event) {
+		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;
 
+		org.argeo.eclipse.ui.specific.OpenFile openFileClient = new org.argeo.eclipse.ui.specific.OpenFile();
+		openFileClient.execute(openFileServiceId, fileUri, fileName);
+		return null;
+	}
+
+	public Object execute(String openFileServiceId, String fileUri, String fileName) {
 		StringBuilder url = new StringBuilder();
-		url.append(RWT.getServiceManager().getServiceHandlerUrl(
-				openFileServiceId));
+		url.append(RWT.getServiceManager().getServiceHandlerUrl(openFileServiceId));
 
-		url.append("&").append(OpenFileService.PARAM_FILE_NAME).append("=");
-		url.append(fileName);
-		url.append("&").append(OpenFileService.PARAM_FILE_URI).append("=");
-		url.append(fileUri);
+		if (EclipseUiUtils.notEmpty(fileName))
+			url.append("&").append(SingleSourcingConstants.PARAM_FILE_NAME).append("=").append(fileName);
+		url.append("&").append(SingleSourcingConstants.PARAM_FILE_URI).append("=").append(fileUri);
 
 		String downloadUrl = url.toString();
 		if (log.isTraceEnabled())
-			log.debug("URL : " + downloadUrl);
+			log.trace("Calling OpenFileService with ID: " + openFileServiceId + " , with download URL: " + downloadUrl);
 
 		UrlLauncher launcher = RWT.getClient().getService(UrlLauncher.class);
 		launcher.openURL(downloadUrl);
 		return null;
 	}
 
-	// /* DEPENDENCY INJECTION */
-	// public void setOpenFileServiceId(String openFileServiceId) {
-	// this.openFileServiceId = openFileServiceId;
-	// }
-}
\ No newline at end of file
+	/* DEPENDENCY INJECTION */
+	public void setOpenFileServiceId(String openFileServiceId) {
+		this.openFileServiceId = openFileServiceId;
+	}
+}