From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 17 Oct 2015 16:23:47 +0000 (+0000)
Subject: Improve dependencies.
X-Git-Tag: argeo-commons-2.1.30~73
X-Git-Url: https://git.argeo.org/?a=commitdiff_plain;h=598bcf4d1f14ccf0decb98cbb4a100b22fdf0ef3;p=lgpl%2Fargeo-commons.git

Improve dependencies.

git-svn-id: https://svn.argeo.org/commons/trunk@8506 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/org.argeo.eclipse.ui.rap/bnd.bnd b/org.argeo.eclipse.ui.rap/bnd.bnd
index 83a2036d4..460b6b168 100644
--- a/org.argeo.eclipse.ui.rap/bnd.bnd
+++ b/org.argeo.eclipse.ui.rap/bnd.bnd
@@ -1,10 +1,3 @@
-Require-Bundle: org.eclipse.rap.ui,org.eclipse.core.runtime
-Import-Package: org.apache.commons.io,\
-org.argeo,\
-org.springframework.beans.factory,\
-org.springframework.core.io.support,\
-!org.eclipse.rwt.widgets,\
-!org.eclipse.core.runtime,\
-!org.eclipse.core.commands,\
-!org.eclipse.ui.plugin,\
+Import-Package: org.eclipse.swt,\
+ org.eclipse.jface.dialogs,\
 *
diff --git a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFileService.java b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFileService.java
index a9302e194..2818fc7ea 100644
--- a/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFileService.java
+++ b/org.argeo.eclipse.ui.rap/src/org/argeo/eclipse/ui/specific/OpenFileService.java
@@ -23,7 +23,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.commons.io.FileUtils;
-import org.argeo.ArgeoException;
 import org.eclipse.rap.rwt.service.ServiceHandler;
 
 /**
@@ -80,8 +79,8 @@ public class OpenFileService implements ServiceHandler {
 				return FileUtils.readFileToByteArray(new File(
 						getFilePathFromUri(uri)));
 			} catch (IOException ioe) {
-				throw new ArgeoException("Error getting the file at " + uri,
-						ioe);
+				throw new SingleSourcingException("Error getting the file at "
+						+ uri, ioe);
 			}
 		}
 		return null;