[jbosstools-commits] JBoss Tools SVN: r35879 - trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl.

[jbosstools-commits at lists.jboss.org]

Author: scabanovich
Date: 2011-10-20 20:13:00 -0400 (Thu, 20 Oct 2011)
New Revision: 35879

Modified:
   trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java
Log:
JBIDE-9988
https://issues.jboss.org/browse/JBIDE-9988
Code that builds reference to member type is reused for computing type restriction of default producer bean without @DefaultBean annotation.

Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java	2011-10-21 00:11:06 UTC (rev 35878)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java	2011-10-21 00:13:00 UTC (rev 35879)
@@ -22,9 +22,11 @@
 import org.jboss.tools.cdi.core.CDICorePlugin;
 import org.jboss.tools.cdi.core.IBeanMember;
 import org.jboss.tools.cdi.core.IClassBean;
+import org.jboss.tools.cdi.internal.core.impl.definition.AbstractMemberDefinition;
 import org.jboss.tools.cdi.internal.core.impl.definition.BeanMemberDefinition;
 import org.jboss.tools.common.java.IParametedType;
 import org.jboss.tools.common.java.ParametedType;
+import org.jboss.tools.common.java.ParametedTypeFactory;
 import org.jboss.tools.common.java.TypeDeclaration;
 
 /**
@@ -43,6 +45,11 @@
 	}
 
 	protected void setMember(IJavaElement member) {
+		typeDeclaration = getTypeDeclaration(getDefinition(), getCDIProject().getNature().getTypeFactory());
+	}
+
+	public static TypeDeclaration getTypeDeclaration(AbstractMemberDefinition definition, ParametedTypeFactory typeFactory) {
+		IJavaElement member = (IJavaElement)definition.getMember();
 		try {
 			String returnType = null;
 			IMember currentMember = null;
@@ -57,12 +64,12 @@
 				currentMember = ((ILocalVariable)member).getDeclaringMember();
 			}
 			if(returnType != null) {
-				ParametedType p = getCDIProject().getNature().getTypeFactory().getParametedType(currentMember, returnType);
+				ParametedType p = typeFactory.getParametedType(currentMember, returnType);
 				if(p != null) {
 
 					int offset = -1;
 					int length = 0;
-					String content = getDefinition().getTypeDefinition().getContent();
+					String content = definition.getTypeDefinition().getContent();
 					if(content != null) {
 						ISourceRange sr = ((ISourceReference)member).getSourceRange();
 						ISourceRange nr = ((ISourceReference)member).getNameRange();
@@ -88,12 +95,13 @@
 						}
 					}
 
-					typeDeclaration = new TypeDeclaration(p, member.getResource(), offset, length);
+					return new TypeDeclaration(p, member.getResource(), offset, length);
 				}
 			}
 		} catch (JavaModelException e) {
 			CDICorePlugin.getDefault().logError(e);
 		}
+		return null;
 	}
 
 	/**