Improve error reporting in eclipse ui

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

diff --git a/eclipse/plugins/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/SpringExtensionFactory.java b/eclipse/plugins/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/SpringExtensionFactory.java
index 92a3fed1375c04901d384514eb1b6df58c209608..49a226d39339bf15d5a7dffb3884f79709896897 100644 (file)
--- a/eclipse/plugins/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/SpringExtensionFactory.java
+++ b/eclipse/plugins/org.argeo.eclipse.ui/src/main/java/org/argeo/eclipse/spring/SpringExtensionFactory.java
@@ -16,6 +16,7 @@
 \r
 package org.argeo.eclipse.spring;\r
 \r
+import org.argeo.ArgeoException;\r
 import org.eclipse.core.runtime.CoreException;\r
 import org.eclipse.core.runtime.IConfigurationElement;\r
 import org.eclipse.core.runtime.IExecutableExtension;\r
@@ -41,7 +42,8 @@ import org.springframework.context.ApplicationContext;
  * spring extension factory uses the id of the extension itself to identify the\r
  * bean.\r
  * \r
- * original code from: <a href="http://martinlippert.blogspot.com/2008/10/new-version-of-spring-extension-factory.html"\r
+ * original code from: <a href=\r
+ * "http://martinlippert.blogspot.com/2008/10/new-version-of-spring-extension-factory.html"\r
  * >Blog entry</a>\r
  * \r
  * @author Martin Lippert\r
@@ -53,21 +55,30 @@ public class SpringExtensionFactory implements IExecutableExtensionFactory,
        private Object bean;\r
 \r
        public Object create() throws CoreException {\r
+               if (bean == null)\r
+                       throw new ArgeoException("No underlying bean for extension");\r
                return bean;\r
        }\r
 \r
        public void setInitializationData(IConfigurationElement config,\r
                        String propertyName, Object data) throws CoreException {\r
                String beanName = getBeanName(data, config);\r
+               if (beanName == null)\r
+                       throw new ArgeoException("Cannot find bean name for extension "\r
+                                       + config);\r
+\r
+               String bundleSymbolicName = config.getContributor().getName();\r
                ApplicationContext appContext = ApplicationContextTracker\r
-                               .getApplicationContext(config.getContributor().getName());\r
+                               .getApplicationContext(bundleSymbolicName);\r
+               if (appContext == null)\r
+                       throw new ArgeoException(\r
+                                       "Cannot find application context for bundle "\r
+                                                       + bundleSymbolicName);\r
 \r
-               if (beanName != null && appContext != null) {\r
-                       this.bean = appContext.getBean(beanName);\r
-                       if (this.bean instanceof IExecutableExtension) {\r
-                               ((IExecutableExtension) this.bean).setInitializationData(\r
-                                               config, propertyName, data);\r
-                       }\r
+               this.bean = appContext.getBean(beanName);\r
+               if (this.bean instanceof IExecutableExtension) {\r
+                       ((IExecutableExtension) this.bean).setInitializationData(config,\r
+                                       propertyName, data);\r
                }\r
        }\r
 \r