Author: scabanovich Date: 2009-12-09 13:31:16 -0500 (Wed, 09 Dec 2009) New Revision: 19162 Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParametedType.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/DecoratorBean.java Removed: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/DecoratorBean.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IDecorator.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ITypeDeclaration.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java Log: https://jira.jboss.org/jira/browse/JBIDE-4943 Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/DecoratorBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/DecoratorBean.java 2009-12-09 18:30:18 UTC (rev 19161) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/DecoratorBean.java 2009-12-09 18:31:16 UTC (rev 19162) @@ -1,20 +0,0 @@ -package org.jboss.tools.cdi.core; - -import java.util.Set; -import org.eclipse.jdt.core.IType; -import org.jboss.tools.cdi.internal.core.impl.ClassBean; -import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition; - -public class DecoratorBean extends ClassBean implements IDecorator { - - public DecoratorBean() {} - - public Set<IType> getDecoratedTypes() { - return ((TypeDefinition)definition).getInheritedTypes(); - } - - public IAnnotationDeclaration getDecoratorAnnotation() { - return decorator; - } - -} Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java 2009-12-09 18:30:18 UTC (rev 19161) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java 2009-12-09 18:31:16 UTC (rev 19162) @@ -53,7 +53,7 @@ * * @return the legal types */ - Set<IType> getLegalTypes(); + Set<IParametedType> getLegalTypes(); /** * Obtains all the type declarations of the bean class or producer method or Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IDecorator.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IDecorator.java 2009-12-09 18:30:18 UTC (rev 19161) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IDecorator.java 2009-12-09 18:31:16 UTC (rev 19162) @@ -33,5 +33,5 @@ * * @return the set of decorated types */ - Set<IType> getDecoratedTypes(); + Set<IParametedType> getDecoratedTypes(); } \ No newline at end of file Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParametedType.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParametedType.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParametedType.java 2009-12-09 18:31:16 UTC (rev 19162) @@ -0,0 +1,13 @@ +package org.jboss.tools.cdi.core; + +import org.eclipse.jdt.core.IType; + +public interface IParametedType { + + /** + * Returns the corresponding IType of the declaration. + * + * @return the corresponding IType of the declaration. + */ + IType getType(); +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParametedType.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ITypeDeclaration.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ITypeDeclaration.java 2009-12-09 18:30:18 UTC (rev 19161) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ITypeDeclaration.java 2009-12-09 18:31:16 UTC (rev 19162) @@ -16,12 +16,6 @@ /** * @author Alexey Kazakov */ -public interface ITypeDeclaration extends ITextSourceReference { +public interface ITypeDeclaration extends IParametedType, ITextSourceReference { - /** - * Returns the corresponding IType of the declaration. - * - * @return the corresponding IType of the declaration. - */ - IType getType(); } \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java 2009-12-09 18:30:18 UTC (rev 19161) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/el/CdiElResolver.java 2009-12-09 18:31:16 UTC (rev 19162) @@ -33,6 +33,7 @@ import org.jboss.tools.cdi.core.ICDIProject; import org.jboss.tools.cdi.core.IClassBean; import org.jboss.tools.cdi.core.IInjectionPoint; +import org.jboss.tools.cdi.core.IParametedType; import org.jboss.tools.cdi.core.IStereotypeDeclaration; import org.jboss.tools.cdi.core.ITypeDeclaration; import org.jboss.tools.common.EclipseUtil; @@ -167,7 +168,7 @@ return Collections.emptySet(); } - public Set<IType> getLegalTypes() { + public Set<IParametedType> getLegalTypes() { return Collections.emptySet(); } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2009-12-09 18:30:18 UTC (rev 19161) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2009-12-09 18:31:16 UTC (rev 19162) @@ -18,6 +18,7 @@ import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IInterceptorBindingDeclaration; import org.jboss.tools.cdi.core.IObserverMethod; +import org.jboss.tools.cdi.core.IParametedType; import org.jboss.tools.cdi.core.IProducer; import org.jboss.tools.cdi.core.IStereotype; import org.jboss.tools.cdi.core.IStereotypeDeclaration; @@ -142,8 +143,8 @@ return result; } - public Set<IType> getLegalTypes() { - // TODO Auto-generated method stub + public Set<IParametedType> getLegalTypes() { + // TODO return null; } Copied: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/DecoratorBean.java (from rev 19160, trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/DecoratorBean.java) =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/DecoratorBean.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/DecoratorBean.java 2009-12-09 18:31:16 UTC (rev 19162) @@ -0,0 +1,22 @@ +package org.jboss.tools.cdi.internal.core.impl; + +import java.util.Set; +import org.eclipse.jdt.core.IType; +import org.jboss.tools.cdi.core.IAnnotationDeclaration; +import org.jboss.tools.cdi.core.IDecorator; +import org.jboss.tools.cdi.core.IParametedType; +import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition; + +public class DecoratorBean extends ClassBean implements IDecorator { + + public DecoratorBean() {} + + public Set<IParametedType> getDecoratedTypes() { + return ((TypeDefinition)definition).getInheritedTypes(); + } + + public IAnnotationDeclaration getDecoratorAnnotation() { + return decorator; + } + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/DecoratorBean.java ___________________________________________________________________ Name: svn:mime-type + text/plain Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java 2009-12-09 18:30:18 UTC (rev 19161) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java 2009-12-09 18:31:16 UTC (rev 19162) @@ -14,6 +14,7 @@ import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IInjectionPoint; +import org.jboss.tools.cdi.core.IParametedType; import org.jboss.tools.cdi.core.IProducerField; import org.jboss.tools.cdi.core.IStereotype; import org.jboss.tools.cdi.core.IStereotypeDeclaration; @@ -47,7 +48,7 @@ return new HashSet<IInjectionPoint>(); } - public Set<IType> getLegalTypes() { + public Set<IParametedType> getLegalTypes() { // TODO return null; } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2009-12-09 18:30:18 UTC (rev 19161) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2009-12-09 18:31:16 UTC (rev 19162) @@ -13,6 +13,7 @@ import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IInjectionPoint; +import org.jboss.tools.cdi.core.IParametedType; import org.jboss.tools.cdi.core.IProducerMethod; import org.jboss.tools.cdi.core.IStereotype; import org.jboss.tools.cdi.core.IStereotypeDeclaration; @@ -53,7 +54,7 @@ return new HashSet<IInjectionPoint>(); } - public Set<IType> getLegalTypes() { + public Set<IParametedType> getLegalTypes() { // TODO Auto-generated method stub return null; } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2009-12-09 18:30:18 UTC (rev 19161) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2009-12-09 18:31:16 UTC (rev 19162) @@ -5,12 +5,13 @@ import org.eclipse.core.runtime.CoreException; import org.eclipse.jdt.core.IType; +import org.jboss.tools.cdi.core.IParametedType; import org.jboss.tools.common.model.util.EclipseJavaUtil; public class AbstractTypeDefinition extends AbstractMemberDefinition { protected String qualifiedName; protected IType type; - protected Set<IType> inheritedTypes = new HashSet<IType>(); + protected Set<IParametedType> inheritedTypes = new HashSet<IParametedType>(); public AbstractTypeDefinition() {} @@ -33,10 +34,12 @@ qualifiedName = getType().getFullyQualifiedName(); String sc = type.getSuperclassTypeSignature(); if(sc != null) { + //TODO process parameter types correctly!!! sc = EclipseJavaUtil.resolveType(contextType, sc); if(sc != null && sc.length() > 0) { IType t = EclipseJavaUtil.findType(contextType.getJavaProject(), sc); - if(t != null) inheritedTypes.add(t); +//TODO +// if(t != null) inheritedTypes.add(t); } } String[] is = type.getSuperInterfaceTypeSignatures(); @@ -44,12 +47,13 @@ String c = EclipseJavaUtil.resolveType(contextType, is[i]); if(c != null && c.length() > 0) { IType t = EclipseJavaUtil.findType(contextType.getJavaProject(), c); - if(t != null) inheritedTypes.add(t); +//TODO +// if(t != null) inheritedTypes.add(t); } } } - public Set<IType> getInheritedTypes() { + public Set<IParametedType> getInheritedTypes() { return inheritedTypes; }