Author: scabanovich
Date: 2011-08-10 17:43:23 -0400 (Wed, 10 Aug 2011)
New Revision: 33791
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/CDISeamInternationalDefinitionContext.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDISeamPersistenceExtension.java
Log:
JBIDE-9484
https://issues.jboss.org/browse/JBIDE-9484
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/CDISeamInternationalDefinitionContext.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/CDISeamInternationalDefinitionContext.java 2011-08-10
20:48:21 UTC (rev 33790)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/international/CDISeamInternationalDefinitionContext.java 2011-08-10
21:43:23 UTC (rev 33791)
@@ -16,6 +16,7 @@
import java.util.Set;
import org.eclipse.core.runtime.IPath;
+import org.jboss.tools.cdi.core.CDICoreNature;
import org.jboss.tools.cdi.core.extension.AbstractDefinitionContextExtension;
import org.jboss.tools.cdi.seam.core.international.scanner.BundleFileSet;
import org.jboss.tools.common.model.XModelObject;
@@ -82,7 +83,16 @@
}
public Set<XModelObject> getAllBundles() {
- return allBundles;
+ Set<XModelObject> result = new HashSet<XModelObject>();
+ result.addAll(allBundles);
+ Set<CDICoreNature> ns = root.getProject().getCDIProjects(true);
+ for (CDICoreNature n: ns) {
+ CDISeamInternationalExtension extension =
CDISeamInternationalExtension.getExtension(n);
+ if(extension != null) {
+ result.addAll(extension.getContext().allBundles);
+ }
+ }
+ return result;
}
}
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDISeamPersistenceExtension.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDISeamPersistenceExtension.java 2011-08-10
20:48:21 UTC (rev 33790)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.seam.core/src/org/jboss/tools/cdi/seam/core/persistence/CDISeamPersistenceExtension.java 2011-08-10
21:43:23 UTC (rev 33791)
@@ -74,6 +74,10 @@
@Override
public void buildBeans(CDIProject target) {
+ if(target.getNature() != context.getRootContext().getProject()) {
+ //because we getAll type definitions
+ return;
+ }
List<TypeDefinition> definitions = target.getNature().getAllTypeDefinitions();
if(definitions.isEmpty()) {
//no beans to build