Adapt Security to RCP

[lgpl/argeo-commons.git] / eclipse / plugins / org.argeo.eclipse.ui / src / main / java / org / argeo / eclipse / spring / ApplicationContextTracker.java

diff --git a/eclipse/plugins/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/ApplicationContextTracker.java b/eclipse/plugins/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/ApplicationContextTracker.java
index e29d5a05690e2974027c06184ff138570fb1f0c0..805d11d8a580632bc71acc7eb72bc2e19f8e35fc 100644 (file)
--- a/eclipse/plugins/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/ApplicationContextTracker.java
+++ b/eclipse/plugins/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/ApplicationContextTracker.java
@@ -20,7 +20,6 @@ import static java.text.MessageFormat.format;
 \r
 import org.apache.commons.logging.Log;\r
 import org.apache.commons.logging.LogFactory;\r
-import org.argeo.eclipse.ui.ArgeoUiPlugin;\r
 import org.eclipse.core.runtime.Platform;\r
 import org.osgi.framework.Bundle;\r
 import org.osgi.framework.BundleContext;\r
@@ -54,8 +53,8 @@ class ApplicationContextTracker {
         */\r
        public ApplicationContextTracker(final Bundle contributorBundle,\r
                        final BundleContext factoryBundleContext) {\r
-               final String filter = format(FILTER, contributorBundle\r
-                               .getSymbolicName());\r
+               final String filter = format(FILTER,\r
+                               contributorBundle.getSymbolicName());\r
                try {\r
                        applicationContextServiceTracker = new ServiceTracker(\r
                                        factoryBundleContext, FrameworkUtil.createFilter(filter),\r
@@ -98,9 +97,7 @@ class ApplicationContextTracker {
 \r
        static ApplicationContext getApplicationContext(Bundle contributorBundle) {\r
                if (log.isTraceEnabled())\r
-                       log\r
-                                       .trace("Get application context for bundle "\r
-                                                       + contributorBundle);\r
+                       log.trace("Get application context for bundle " + contributorBundle);\r
 \r
                if (contributorBundle.getState() != Bundle.ACTIVE\r
                                && contributorBundle.getState() != Bundle.STARTING) {\r
@@ -114,8 +111,7 @@ class ApplicationContextTracker {
                }\r
 \r
                final ApplicationContextTracker applicationContextTracker = new ApplicationContextTracker(\r
-                               contributorBundle, ArgeoUiPlugin.getDefault()\r
-                                               .getBundleContext());\r
+                               contributorBundle, contributorBundle.getBundleContext());\r
                ApplicationContext applicationContext = null;\r
                try {\r
                        applicationContext = applicationContextTracker\r