X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=base%2Fruntime%2Forg.argeo.eclipse.ui.rap%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Feclipse%2Fui%2Fspecific%2FFileHandler.java;fp=base%2Fruntime%2Forg.argeo.eclipse.ui.rap%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Feclipse%2Fui%2Fspecific%2FFileHandler.java;h=1c53d84c35e9591f989317e472e61bdc1742d732;hb=c88e6afe57bf577949bd091a2e26471b957efa5e;hp=1d1b2739ca93ddef96b6462edebd4ab8a8e35d45;hpb=02e559277cffe1c8f5228e2a95e4e82569302555;p=lgpl%2Fargeo-commons.git

diff --git a/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java b/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java
index 1d1b2739c..1c53d84c3 100644
--- a/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java
+++ b/base/runtime/org.argeo.eclipse.ui.rap/src/main/java/org/argeo/eclipse/ui/specific/FileHandler.java
@@ -17,6 +17,7 @@ package org.argeo.eclipse.ui.specific;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.argeo.ArgeoException;
 import org.eclipse.rap.rwt.RWT;
 import org.eclipse.rap.rwt.client.service.UrlLauncher;
 import org.eclipse.rap.rwt.service.ServiceHandler;
@@ -37,22 +38,26 @@ public class FileHandler {
 
 	public FileHandler(FileProvider provider) {
 		ServiceHandler handler = new DownloadServiceHandler(provider);
-		RWT.getServiceManager().registerServiceHandler(DOWNLOAD_SERVICE_NAME,
-				handler);
+		try {
+			RWT.getServiceManager().registerServiceHandler(
+					DOWNLOAD_SERVICE_NAME, handler);
+		} catch (IllegalArgumentException iae) {
+			log.warn("Handler is already registered, clean this registering process");
+		}
 	}
 
 	public void openFile(String fileName, String fileId) {
 		try {
 			String downloadUrl = RWT.getServiceManager().getServiceHandlerUrl(
 					DOWNLOAD_SERVICE_NAME)
-					+ createParamUrl(fileName, fileId); 
+					+ createParamUrl(fileName, fileId);
 			if (log.isTraceEnabled())
 				log.debug("URL : " + downloadUrl);
 			UrlLauncher launcher = RWT.getClient()
 					.getService(UrlLauncher.class);
 			launcher.openURL(downloadUrl);
 		} catch (Exception e) {
-			e.printStackTrace();
+			throw new ArgeoException("Unable to open file " + fileName, e);
 		}
 		// These lines are useless in the current use case but might be
 		// necessary with new browsers. Stored here for memo