+ Finalization of history request

[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 dc35c7d7f003fd365f14462267053a1b0d47cf9e..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
@@ -1,5 +1,22 @@
+/*\r
+ * Copyright (C) 2010 Mathieu Baudier <mbaudier@argeo.org>\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ *         http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\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
@@ -25,7 +42,12 @@ 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=\r
+ * "http://martinlippert.blogspot.com/2008/10/new-version-of-spring-extension-factory.html"\r
+ * >Blog entry</a>\r
+ * \r
  * @author Martin Lippert\r
+ * @author mbaudier\r
  */\r
 public class SpringExtensionFactory implements IExecutableExtensionFactory,\r
                IExecutableExtension {\r
@@ -33,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