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=b2d3518a71bf9f7a8f384167770bc763b65c1660;hb=c53fec78daddb69c489686844188036b04e1615a;hp=10682c4ce554ab6071eaf73b3753da79f3f85918;hpb=c149774fa220fe69f430f7b230ac4c442ea6d0fe;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 10682c4ce..b2d3518a7 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
@@ -1,23 +1,9 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.argeo.eclipse.ui.specific;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.argeo.eclipse.ui.utils.SingleSourcingConstants;
+import org.argeo.eclipse.ui.EclipseUiUtils;
+import org.argeo.eclipse.ui.util.SingleSourcingConstants;
 import org.eclipse.core.commands.AbstractHandler;
 import org.eclipse.core.commands.ExecutionEvent;
 import org.eclipse.rap.rwt.RWT;
@@ -46,6 +32,7 @@ public class OpenFile extends AbstractHandler {
 	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;
 
@@ -63,23 +50,16 @@ public class OpenFile extends AbstractHandler {
 	}
 
 	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(SingleSourcingConstants.PARAM_FILE_NAME).append("=");
-		url.append(fileName);
-		url.append("&").append(SingleSourcingConstants.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);