Author: scabanovich
Date: 2011-05-13 18:45:22 -0400 (Fri, 13 May 2011)
New Revision: 31309
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigExtension.java
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SeamDefinitionBuilder.java
Log:
JBIDE-8941
https://issues.jboss.org/browse/JBIDE-8941
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigExtension.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigExtension.java 2011-05-13
22:18:50 UTC (rev 31308)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/CDISeamConfigExtension.java 2011-05-13
22:45:22 UTC (rev 31309)
@@ -41,6 +41,7 @@
import org.jboss.tools.cdi.seam.config.core.xml.SAXNode;
import org.jboss.tools.common.model.XModelObject;
import org.jboss.tools.common.model.filesystems.impl.FileAnyImpl;
+import org.jboss.tools.common.model.filesystems.impl.FolderImpl;
import org.jboss.tools.common.model.util.EclipseResourceUtil;
/**
@@ -105,7 +106,11 @@
isSeamBeans = true;
}
if(o instanceof FileAnyImpl) {
- String text = ((FileAnyImpl)o).getAsText();
+ FileAnyImpl f = (FileAnyImpl)o;
+ if(f.getParent() instanceof FolderImpl) {
+ ((FolderImpl)f.getParent()).update();
+ }
+ String text = f.getAsText();
IResource resource = (IResource)o.getAdapter(IResource.class);
IDocument document = new Document();
SeamDefinitionBuilder builder = new SeamDefinitionBuilder();
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SeamDefinitionBuilder.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SeamDefinitionBuilder.java 2011-05-13
22:18:50 UTC (rev 31308)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.seam.config.core/src/org/jboss/tools/cdi/seam/config/core/scanner/SeamDefinitionBuilder.java 2011-05-13
22:45:22 UTC (rev 31309)
@@ -351,7 +351,7 @@
if(pd != null) def.addParameter(pd);
}
IJavaAnnotation inject = createInject(element);
- def.addAnnotation(inject);
+ if(inject != null) def.addAnnotation(inject);
IMethod method = null;
try {
method = Util.findMethod(def, type, null, context.getRootContext());