Author: scabanovich Date: 2011-12-15 20:36:39 -0500 (Thu, 15 Dec 2011) New Revision: 37385 Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/.settings/ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/.settings/org.eclipse.jdt.core.prefs Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderDefaultBeanExtension.java Log: JBIDE-10496 https://issues.jboss.org/browse/JBIDE-10496 CDIUtil.convertToSourceReference should return instance of IJavaSourceReference when Java element is available. Added: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/.settings/org.eclipse.jdt.core.prefs =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/.settings/org.eclipse.jdt.core.prefs (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/.settings/org.eclipse.jdt.core.prefs 2011-12-16 01:36:39 UTC (rev 37385) @@ -0,0 +1,8 @@ +#Fri Nov 04 10:56:09 PDT 2011 +eclipse.preferences.version=1 +org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled +org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 +org.eclipse.jdt.core.compiler.compliance=1.6 +org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enumIdentifier=error +org.eclipse.jdt.core.compiler.source=1.6 Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/.settings/org.eclipse.jdt.core.prefs ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderDefaultBeanExtension.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderDefaultBeanExtension.java 2011-12-16 01:35:14 UTC (rev 37384) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.solder.core/src/org/jboss/tools/cdi/seam/solder/core/CDISeamSolderDefaultBeanExtension.java 2011-12-16 01:36:39 UTC (rev 37385) @@ -19,11 +19,13 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.runtime.CoreException; +import org.eclipse.jdt.core.IMember; import org.eclipse.jdt.core.IMemberValuePair; import org.eclipse.jdt.core.IType; import org.eclipse.osgi.util.NLS; import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.CDIUtil; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.ICDIProject; import org.jboss.tools.cdi.core.IClassBean; @@ -49,6 +51,7 @@ import org.jboss.tools.cdi.seam.solder.core.validation.SeamSolderValidationMessages; import org.jboss.tools.common.java.IAnnotationDeclaration; import org.jboss.tools.common.java.IJavaAnnotation; +import org.jboss.tools.common.java.IJavaReference; import org.jboss.tools.common.java.IParametedType; import org.jboss.tools.common.java.ITypeDeclaration; import org.jboss.tools.common.java.impl.AnnotationLiteral; @@ -171,7 +174,8 @@ if(a == null) { Set<ITypeDeclaration> ds = bean.getAllTypeDeclarations(); if(!ds.isEmpty()) { - a = ds.iterator().next(); + IMember e = bean instanceof IJavaReference ? ((IJavaReference)bean).getSourceMember() : bean.getBeanClass(); + a = CDIUtil.convertToJavaSourceReference(ds.iterator().next(), e); } else { continue; }