From: Bruno Sinou <bsinou@argeo.org>
Date: Thu, 15 Sep 2016 11:14:04 +0000 (+0000)
Subject: Use injected bundle context
X-Git-Tag: argeo-commons-2.1.46~22
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=e96281c4b38362f33a585bcda7af45f69f0c5499;p=lgpl%2Fargeo-commons.git

Use injected bundle context

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

diff --git a/org.argeo.cms.ui/src/org/argeo/cms/util/CmsLink.java b/org.argeo.cms.ui/src/org/argeo/cms/util/CmsLink.java
index bd5052c5b..01b1fde2f 100644
--- a/org.argeo.cms.ui/src/org/argeo/cms/util/CmsLink.java
+++ b/org.argeo.cms.ui/src/org/argeo/cms/util/CmsLink.java
@@ -27,8 +27,7 @@ import org.osgi.framework.FrameworkUtil;
 /** A link to an internal or external location. */
 public class CmsLink implements CmsUiProvider {
 	private final static Log log = LogFactory.getLog(CmsLink.class);
-	private BundleContext bc = FrameworkUtil.getBundle(getClass())
-			.getBundleContext();
+	private BundleContext bundleContext ;
 
 	private String label;
 	private String custom;
@@ -174,7 +173,7 @@ public class CmsLink implements CmsUiProvider {
 			// pure URL
 			url = new URL(image);
 		} catch (MalformedURLException e1) {
-			url = bc.getBundle().getResource(image);
+			url = bundleContext.getBundle().getResource(image);
 		}
 
 		if (url == null)
@@ -183,6 +182,10 @@ public class CmsLink implements CmsUiProvider {
 		return url;
 	}
 
+	public void setBundleContext(BundleContext bundleContext) {
+		this.bundleContext = bundleContext;
+	}
+
 	public void setLabel(String label) {
 		this.label = label;
 	}