Author: scabanovich Date: 2011-06-29 17:12:12 -0400 (Wed, 29 Jun 2011) New Revision: 32464 Removed: 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/ITypeDeclaration.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/TypeDeclaration.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 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/IBeanManager.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.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/IInjectionPoint.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParameter.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 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/BuiltInBean.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.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/DecoratorBean.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/EventBean.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/JavaAnnotation.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.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 trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/FieldDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParameterDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/ImplementationCollector.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java Log: JBIDE-5046 https://issues.jboss.org/browse/JBIDE-5046 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDICoreNature.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -33,9 +33,9 @@ import org.jboss.tools.cdi.core.extension.CDIExtensionManager; import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition; import org.jboss.tools.cdi.internal.core.impl.definition.DefinitionContext; -import org.jboss.tools.cdi.internal.core.impl.definition.ParametedTypeFactory; import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition; import org.jboss.tools.cdi.internal.core.scanner.lib.ClassPathMonitor; +import org.jboss.tools.common.java.ParametedTypeFactory; import org.jboss.tools.common.model.XJob; import org.jboss.tools.common.model.XJob.XRunnable; import org.jboss.tools.common.model.util.EclipseResourceUtil; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -57,6 +57,7 @@ import org.jboss.tools.cdi.internal.core.impl.ClassBean; import org.jboss.tools.common.EclipseUtil; import org.jboss.tools.common.java.IJavaMemberReference; +import org.jboss.tools.common.java.IParametedType; import org.jboss.tools.common.model.util.EclipseJavaUtil; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.text.ITextSourceReference; 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 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBean.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -14,6 +14,8 @@ import org.eclipse.jdt.core.IType; import org.jboss.tools.common.el.core.resolver.IVariable; +import org.jboss.tools.common.java.IParametedType; +import org.jboss.tools.common.java.ITypeDeclaration; import org.jboss.tools.common.text.ITextSourceReference; /** Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanManager.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -15,6 +15,7 @@ import org.eclipse.core.runtime.IPath; import org.eclipse.jdt.core.IType; +import org.jboss.tools.common.java.IParametedType; import org.jboss.tools.common.text.INodeReference; /** Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -11,6 +11,7 @@ package org.jboss.tools.cdi.core; import org.jboss.tools.common.java.IJavaSourceReference; +import org.jboss.tools.common.java.IParametedType; /** * Represents a member of bean class. Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IClassBean.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -13,6 +13,7 @@ import java.util.Set; import org.jboss.tools.common.java.IJavaMemberReference; +import org.jboss.tools.common.java.IParametedType; /** * Represents a class-based bean. 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 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IDecorator.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -12,6 +12,8 @@ import java.util.Set; +import org.jboss.tools.common.java.IParametedType; + /** * Represents a decorator. * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPoint.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -12,6 +12,7 @@ import java.util.Set; +import org.jboss.tools.common.java.IParametedType; import org.jboss.tools.common.text.ITextSourceReference; /** Deleted: 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 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParametedType.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -1,60 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.cdi.core; - -import java.util.List; - -import org.eclipse.jdt.core.IType; - -/** - * Represents a wrapper for IType object which could be parameted. - * For example if we have some method - * List<String> getList() {...} - * then IParametedType for return type of this method will wrap List<> and its signature. - */ -public interface IParametedType { - - /** - * Returns the corresponding IType of the declaration. May be null. - * - * @return the corresponding IType of the declaration. - */ - IType getType(); - - /** - * Returns signature of the declaration. - * - * @return signature of the declaration - */ - public String getSignature(); - - /** - * Returns true if the type is a primitive type. - * - * @return true if the type is a primitive type - */ - boolean isPrimitive(); - - /** - * Returns the simple name of the type. In case of IType this method will return the short name of the type. - * If this type is primitive then the method will return the name of the primitive type. - * - * @return the simple name of the type. - */ - String getSimpleName(); - - /** - * Returns type parameters - * - * @return type parameters - */ - List<? extends IParametedType> getParameters(); -} \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParameter.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParameter.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IParameter.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -12,6 +12,7 @@ import java.util.Set; +import org.jboss.tools.common.java.IParametedType; import org.jboss.tools.common.text.ITextSourceReference; /** Deleted: 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 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/ITypeDeclaration.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -1,20 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.cdi.core; - -import org.jboss.tools.common.text.ITextSourceReference; - -/** - * @author Alexey Kazakov - */ -public interface ITypeDeclaration extends IParametedType, ITextSourceReference { - -} \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/AbstractBeanElement.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -32,16 +32,18 @@ import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IInterceptorBinding; import org.jboss.tools.cdi.core.IInterceptorBindingDeclaration; -import org.jboss.tools.cdi.core.IParametedType; import org.jboss.tools.cdi.core.IQualifier; import org.jboss.tools.cdi.core.IQualifierDeclaration; import org.jboss.tools.cdi.core.IScopeDeclaration; import org.jboss.tools.cdi.core.IStereotype; import org.jboss.tools.cdi.core.IStereotypeDeclaration; -import org.jboss.tools.cdi.core.ITypeDeclaration; import org.jboss.tools.cdi.internal.core.impl.definition.AbstractMemberDefinition; import org.jboss.tools.cdi.internal.core.impl.definition.AbstractTypeDefinition; import org.jboss.tools.cdi.internal.core.impl.definition.AnnotationDefinition; +import org.jboss.tools.common.java.IParametedType; +import org.jboss.tools.common.java.ITypeDeclaration; +import org.jboss.tools.common.java.ParametedType; +import org.jboss.tools.common.java.TypeDeclaration; import org.jboss.tools.common.text.ITextSourceReference; /** 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-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -22,8 +22,10 @@ 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.core.IParametedType; 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.TypeDeclaration; /** * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BuiltInBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BuiltInBean.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BuiltInBean.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -10,13 +10,13 @@ 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.IQualifier; import org.jboss.tools.cdi.core.IQualifierDeclaration; import org.jboss.tools.cdi.core.IScope; import org.jboss.tools.cdi.core.IScopeDeclaration; import org.jboss.tools.cdi.core.IStereotypeDeclaration; -import org.jboss.tools.cdi.core.ITypeDeclaration; +import org.jboss.tools.common.java.IParametedType; +import org.jboss.tools.common.java.ITypeDeclaration; import org.jboss.tools.common.text.ITextSourceReference; /** Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIElement.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -18,7 +18,8 @@ import org.jboss.tools.cdi.core.CDICorePlugin; import org.jboss.tools.cdi.core.ICDIElement; import org.jboss.tools.cdi.core.extension.CDIExtensionManager; -import org.jboss.tools.cdi.internal.core.impl.definition.ParametedTypeFactory; +import org.jboss.tools.common.java.ParametedType; +import org.jboss.tools.common.java.ParametedTypeFactory; /** * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -50,7 +50,6 @@ import org.jboss.tools.cdi.core.IInterceptor; import org.jboss.tools.cdi.core.IInterceptorBinding; import org.jboss.tools.cdi.core.IObserverMethod; -import org.jboss.tools.cdi.core.IParametedType; import org.jboss.tools.cdi.core.IParameter; import org.jboss.tools.cdi.core.IProducer; import org.jboss.tools.cdi.core.IProducerMethod; @@ -65,6 +64,8 @@ import org.jboss.tools.cdi.internal.core.impl.definition.DefinitionContext; import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition; import org.jboss.tools.cdi.internal.core.scanner.ImplementationCollector; +import org.jboss.tools.common.java.IParametedType; +import org.jboss.tools.common.java.ParametedType; import org.jboss.tools.common.model.XModelObject; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.text.INodeReference; 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 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -31,7 +31,6 @@ import org.jboss.tools.cdi.core.IInterceptorBinding; 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.IParameter; import org.jboss.tools.cdi.core.IProducer; import org.jboss.tools.cdi.core.IQualifierDeclaration; @@ -39,12 +38,15 @@ import org.jboss.tools.cdi.core.IScopeDeclaration; import org.jboss.tools.cdi.core.IStereotype; import org.jboss.tools.cdi.core.IStereotypeDeclaration; -import org.jboss.tools.cdi.core.ITypeDeclaration; import org.jboss.tools.cdi.internal.core.impl.definition.AbstractMemberDefinition; import org.jboss.tools.cdi.internal.core.impl.definition.AbstractTypeDefinition; import org.jboss.tools.cdi.internal.core.impl.definition.FieldDefinition; import org.jboss.tools.cdi.internal.core.impl.definition.MethodDefinition; import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition; +import org.jboss.tools.common.java.IParametedType; +import org.jboss.tools.common.java.ITypeDeclaration; +import org.jboss.tools.common.java.ParametedType; +import org.jboss.tools.common.java.TypeDeclaration; import org.jboss.tools.common.text.ITextSourceReference; /** Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/DecoratorBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/DecoratorBean.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/DecoratorBean.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -18,7 +18,7 @@ import org.jboss.tools.cdi.core.CDICorePlugin; 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.common.java.IParametedType; /** * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/EventBean.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/EventBean.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/EventBean.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -10,13 +10,13 @@ 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.IQualifier; import org.jboss.tools.cdi.core.IQualifierDeclaration; import org.jboss.tools.cdi.core.IScope; import org.jboss.tools.cdi.core.IScopeDeclaration; import org.jboss.tools.cdi.core.IStereotypeDeclaration; -import org.jboss.tools.cdi.core.ITypeDeclaration; +import org.jboss.tools.common.java.IParametedType; +import org.jboss.tools.common.java.ITypeDeclaration; import org.jboss.tools.common.text.ITextSourceReference; /** Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -14,8 +14,7 @@ import org.jboss.tools.cdi.core.CDIUtil; import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IInjectionPointField; -import org.jboss.tools.cdi.core.IParametedType; -import org.jboss.tools.cdi.core.ITypeDeclaration; +import org.jboss.tools.common.java.IParametedType; /** * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -10,16 +10,13 @@ ******************************************************************************/ package org.jboss.tools.cdi.internal.core.impl; -import java.util.HashSet; import java.util.Set; import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.CDIUtil; import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IInjectionPointParameter; -import org.jboss.tools.cdi.core.IQualifier; import org.jboss.tools.cdi.core.IQualifierDeclaration; -import org.jboss.tools.cdi.core.ITypeDeclaration; import org.jboss.tools.common.text.ITextSourceReference; /** Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/JavaAnnotation.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/JavaAnnotation.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/JavaAnnotation.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -23,8 +23,6 @@ public class JavaAnnotation implements IJavaAnnotation { IAnnotation annotation; - protected int startPosition = -1; - protected int length = 0; String annotationTypeName; IType type; @@ -56,24 +54,24 @@ try { ISourceRange range = annotation.getSourceRange(); if(range != null) { - return length = range.getLength(); + return range.getLength(); } } catch (JavaModelException e) { CDICorePlugin.getDefault().logError(e); } - return length; + return 0; } public int getStartPosition() { try { ISourceRange range = annotation.getSourceRange(); if(range != null) { - return startPosition = range.getOffset(); + return range.getOffset(); } } catch (JavaModelException e) { CDICorePlugin.getDefault().logError(e); } - return startPosition; + return 0; } public IMember getParentMember() { Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ParametedType.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -1,385 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.cdi.internal.core.impl; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.eclipse.jdt.core.ISourceRange; -import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.core.ITypeParameter; -import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.core.Signature; -import org.jboss.tools.cdi.core.CDICorePlugin; -import org.jboss.tools.cdi.core.IParametedType; -import org.jboss.tools.cdi.internal.core.impl.definition.ParametedTypeFactory; - -/** - * - * @author Viacheslav Kabanovich - * - */ -public class ParametedType implements IParametedType { - protected ParametedTypeFactory typeFactory = null; - protected IType type; - protected String arrayPrefix = ""; - protected String signature; - protected List<ParametedType> parameterTypes = new ArrayList<ParametedType>(); - protected boolean primitive; - - protected boolean isUpper = false; - protected boolean isLower = false; - protected boolean isVariable = false; - - boolean inheritanceIsBuilt = false; - protected ParametedType superType = null; - protected Set<IParametedType> inheritedTypes = new HashSet<IParametedType>(); - Set<IParametedType> allInheritedTypes = null; - - public static interface PositionProvider { - ISourceRange getRange(String superTypeName); - } - - PositionProvider provider = null; - - public ParametedType() {} - - /* - * (non-Javadoc) - * @see org.jboss.tools.cdi.core.IParametedType#isPrimitive() - */ - public boolean isPrimitive() { - return primitive; - } - - public void setPrimitive(boolean primitive) { - this.primitive = primitive; - } - - public boolean isUpper() { - return isUpper; - } - - public void setUpper(boolean b) { - isUpper = b; - } - - public boolean isLower() { - return isLower; - } - - public void setLower(boolean b) { - isLower = b; - } - - public boolean isVariable() { - return isVariable; - } - - public void setVariable(boolean b) { - isVariable = b; - } - - public ParametedTypeFactory getFactory() { - return typeFactory; - } - - public void setFactory(ParametedTypeFactory typefactory) { - this.typeFactory = typefactory; - } - - public IType getType() { - return type; - } - - public String getArrayPrefix() { - return arrayPrefix; - } - - public String getSignature() { - return signature; - } - - public void setType(IType type) { - this.type = type; - } - - public void setSignature(String signature) { - this.signature = signature; - arrayPrefix = ""; - if(signature != null) { - for (int i = 0; i < signature.length(); i++) { - if(signature.charAt(i) == '[') arrayPrefix += "["; else break; - } - } - } - - public void addParameter(ParametedType p) { - parameterTypes.add(p); - } - - public List<? extends IParametedType> getParameters() { - return parameterTypes; - } - - public void setPositionProvider(PositionProvider p) { - provider = p; - } - - public boolean equals(Object object) { - if(!(object instanceof ParametedType)) return false; - ParametedType other = (ParametedType)object; - if(signature != null && signature.equals(other.signature)) { - return true; - } - if(type == null || other.type == null || !type.getFullyQualifiedName().equals(other.type.getFullyQualifiedName())) { - return false; - } - if(parameterTypes.size() != other.parameterTypes.size()) { - return false; - } - for (int i = 0; i < parameterTypes.size(); i++) { - if(!parameterTypes.get(i).equals(other.parameterTypes.get(i))) { - return false; - } - } - if(!arrayPrefix.equals(other.arrayPrefix)) { - return false; - } - - return true; - } - - void buildInheritance() { - if(type == null) return; - Set<IParametedType> inheritedTypes = new HashSet<IParametedType>(); - try { - if(!type.isInterface() && !type.isAnnotation()) { - String sc = type.getSuperclassTypeSignature(); - boolean objectArray = false; - if(sc != null) { - try { - sc = resolveParameters(sc); - } catch (Exception e) { - CDICorePlugin.getDefault().logError(e); - } - } else if(!"java.lang.Object".equals(type.getFullyQualifiedName())) { - sc = ParametedTypeFactory.OBJECT; - } else if("java.lang.Object".equals(type.getFullyQualifiedName()) && arrayPrefix.length() > 0) { - objectArray = true; - sc = ParametedTypeFactory.OBJECT; - } - if(!objectArray && arrayPrefix.length() > 0) { - sc = arrayPrefix + sc; - } - - superType = getFactory().getParametedType(type, sc); - if(superType != null) { - if(provider != null) { - String scn = type.getSuperclassName(); - if(scn != null && provider.getRange(scn) != null) { - ISourceRange r = provider.getRange(scn); - superType = new TypeDeclaration(superType, type.getResource(), r.getOffset(), r.getLength()); - } - - } - inheritedTypes.add(superType); - } - } - String[] is = type.getSuperInterfaceTypeSignatures(); - if(is != null) for (int i = 0; i < is.length; i++) { - String p = resolveParameters(is[i]); - if(arrayPrefix.length() > 0) p = arrayPrefix + p; - ParametedType t = getFactory().getParametedType(type, p); - if(t != null) { - if(provider != null) { - String scn = type.getSuperInterfaceNames()[i]; - if(scn != null && provider.getRange(scn) != null) { - ISourceRange r = provider.getRange(scn); - t = new TypeDeclaration(t, type.getResource(), r.getOffset(), r.getLength()); - } - - } - inheritedTypes.add(t); - } - } - } catch (JavaModelException e) { - CDICorePlugin.getDefault().logError(e); - } - this.inheritedTypes = inheritedTypes; - inheritanceIsBuilt = true; - } - - public ParametedType getSuperType() { - if(!inheritanceIsBuilt) { - buildInheritance(); - } - return superType; - } - - public Set<IParametedType> getInheritedTypes() { - if(!inheritanceIsBuilt) { - buildInheritance(); - } - return inheritedTypes; - } - - public String resolveParameters(String typeSignature) { - if(typeSignature == null) { - return typeSignature; - } - int i = typeSignature.indexOf('<'); - if(i < 0) { - if(( typeSignature.startsWith("T") || typeSignature.startsWith("Q") || typeSignature.startsWith("L")) && typeSignature.endsWith(";")) { - String param = typeSignature.substring(1, typeSignature.length() - 1); - String s = findParameterSignature(param); - return s == null ? typeSignature : s; - } - return typeSignature; - } - int j = typeSignature.lastIndexOf('>'); - if(j < i) { - return typeSignature; - } - boolean replaced = false; - StringBuffer newParams = new StringBuffer(); - String[] ps = Signature.getTypeArguments(typeSignature); - for (String param: ps) { - String newParam = resolveParameters( param); - if(!param.equals(newParam)) replaced = true; - newParams.append(newParam); - } - if(replaced) { - typeSignature = typeSignature.substring(0, i) + '<' + newParams.toString() + '>' + ';'; - } - return typeSignature; - } - - public String findParameterSignature(String paramName) { - if(type == null) { - return null; - } - ITypeParameter[] ps = null; - try { - ps = type.getTypeParameters(); - } catch (JavaModelException e) { - return null; - } - if(ps != null) for (int i = 0; i < ps.length; i++) { - if(ps[i].getElementName().equals(paramName)) { - if(parameterTypes.size() > i) { - ParametedType p = parameterTypes.get(i); - return p.getSignature(); - } - } - } - return null; - } - - public Set<IParametedType> getAllTypes() { - if(allInheritedTypes == null) { - allInheritedTypes = buildAllTypes(new HashSet<String>(), this, new HashSet<IParametedType>()); - } - return allInheritedTypes; - } - - Set<IParametedType> buildAllTypes(Set<String> processed, ParametedType p, Set<IParametedType> types) { - IType t = p.getType(); - if(t != null) { - String key = p.getArrayPrefix() + t.getFullyQualifiedName(); - if(!processed.contains(key)) { - processed.add(key); - types.add(p); - Set<IParametedType> ts = p.getInheritedTypes(); - if(ts != null) for (IParametedType pp: ts) { - buildAllTypes(processed, (ParametedType)pp, types); - } - } - } - return types; - } - - public String toString() { - return signature + ":" + super.toString(); - } - - public boolean isAssignableTo(ParametedType other, boolean checkInheritance) { - if(equals(other)) return true; - if(this.type == null) return false; - if(other.isVariable && other.type == null) return true; - if(this.type.equals(other.type)) { - if(areTypeParametersAssignableTo(other)) return true; - } - if(checkInheritance) { - for (IParametedType t: getInheritedTypes()) { - if(((ParametedType)t).isAssignableTo(other, false)) return true; - } - } - return false; - } - - boolean areTypeParametersAssignableTo(ParametedType other) { - if(other.parameterTypes.size() == 0) return true; - if(this.parameterTypes.size() != other.parameterTypes.size()) return false; - for (int i = 0; i < parameterTypes.size(); i++) { - ParametedType p1 = parameterTypes.get(i); - ParametedType p2 = other.parameterTypes.get(i); - if(p1.isLower() || p1.isUpper()) return false; - if(p1.isVariable()) { - if(p2.isVariable()) { - if(p2.isAssignableTo(p1, true)) continue; - } else if(p2.isLower()) { - if(p2.isAssignableTo(p1, true)) continue; - } else if(p2.isUpper()) { - if(p2.isAssignableTo(p1, true)) continue; - if(p1.isAssignableTo(p2, true)) continue; - } else { - if(p2.isAssignableTo(p1, true)) continue; - } - } else { - if(p2.isLower()) { - if(p2.isAssignableTo(p1, true)) continue; - } else { - if(p1.isAssignableTo(p2, true)) continue; - } - } - - return false; - } - return true; - } - - static Map<String, String> primitives = new HashMap<String, String>(); - static { - primitives.put("Integer", "int"); - primitives.put("Short", "short"); - primitives.put("Long", "long"); - primitives.put("Character", "char"); - primitives.put("Float", "float"); - primitives.put("Double", "double"); - primitives.put("Boolean", "boolean"); - } - - /* - * (non-Javadoc) - * @see org.jboss.tools.cdi.core.IParametedType#getSimpleName() - */ - public String getSimpleName() { - if(getSignature()!=null) { - return isPrimitive()?primitives.get(Signature.getSignatureSimpleName(getSignature())):Signature.getSignatureSimpleName(getSignature()); - } - return ""; - } -} \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -10,11 +10,11 @@ import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IBeanMethod; import org.jboss.tools.cdi.core.IClassBean; -import org.jboss.tools.cdi.core.IParametedType; import org.jboss.tools.cdi.core.IParameter; import org.jboss.tools.cdi.core.IQualifier; import org.jboss.tools.cdi.core.IQualifierDeclaration; import org.jboss.tools.cdi.internal.core.impl.definition.ParameterDefinition; +import org.jboss.tools.common.java.IParametedType; public class Parameter extends BeanMember implements IParameter { BeanMethod beanMethod; 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 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerField.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.cdi.internal.core.impl; - import java.util.HashSet; import java.util.Set; @@ -19,13 +18,14 @@ 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.IScope; import org.jboss.tools.cdi.core.IScopeDeclaration; import org.jboss.tools.cdi.core.IStereotype; import org.jboss.tools.cdi.core.IStereotypeDeclaration; -import org.jboss.tools.cdi.core.ITypeDeclaration; +import org.jboss.tools.common.java.IParametedType; +import org.jboss.tools.common.java.ITypeDeclaration; +import org.jboss.tools.common.java.ParametedType; import org.jboss.tools.common.text.ITextSourceReference; /** 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 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ProducerMethod.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -10,7 +10,6 @@ ******************************************************************************/ package org.jboss.tools.cdi.internal.core.impl; - import java.util.HashSet; import java.util.Set; @@ -18,16 +17,17 @@ import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.IAnnotationDeclaration; import org.jboss.tools.cdi.core.IInjectionPoint; -import org.jboss.tools.cdi.core.IParametedType; import org.jboss.tools.cdi.core.IParameter; import org.jboss.tools.cdi.core.IProducerMethod; import org.jboss.tools.cdi.core.IScope; import org.jboss.tools.cdi.core.IScopeDeclaration; import org.jboss.tools.cdi.core.IStereotype; import org.jboss.tools.cdi.core.IStereotypeDeclaration; -import org.jboss.tools.cdi.core.ITypeDeclaration; import org.jboss.tools.cdi.internal.core.impl.definition.MethodDefinition; import org.jboss.tools.cdi.internal.core.impl.definition.ParameterDefinition; +import org.jboss.tools.common.java.IParametedType; +import org.jboss.tools.common.java.ITypeDeclaration; +import org.jboss.tools.common.java.ParametedType; import org.jboss.tools.common.text.ITextSourceReference; import org.jboss.tools.common.util.BeanUtil; Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/TypeDeclaration.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/TypeDeclaration.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/TypeDeclaration.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -1,59 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.cdi.internal.core.impl; - -import org.eclipse.core.resources.IResource; -import org.jboss.tools.cdi.core.ITypeDeclaration; - -/** - * - * @author Viacheslav Kabanovich - * - */ -public class TypeDeclaration extends ParametedType implements ITypeDeclaration { - IResource resource; - int length; - int startPosition; - - public TypeDeclaration(ParametedType type, IResource resource, int startPosition, int length) { - this.setFactory(type.getFactory()); - this.type = type.getType(); - arrayPrefix = type.arrayPrefix; - this.resource = resource; - this.length = length; - this.startPosition = startPosition; - - signature = type.signature; - parameterTypes = type.parameterTypes; - - allInheritedTypes = type.allInheritedTypes; - inheritanceIsBuilt = type.inheritanceIsBuilt; - inheritedTypes = type.inheritedTypes; - superType = type.superType; - primitive = type.primitive; - - isLower = type.isLower; - isUpper = type.isUpper; - isVariable = type.isVariable; - } - - public int getLength() { - return length; - } - - public int getStartPosition() { - return startPosition; - } - - public IResource getResource() { - return resource; - } -} 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 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/AbstractTypeDefinition.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -21,9 +21,9 @@ import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.SourceRange; import org.jboss.tools.cdi.core.CDICorePlugin; -import org.jboss.tools.cdi.core.IParametedType; import org.jboss.tools.cdi.core.IRootDefinitionContext; -import org.jboss.tools.cdi.internal.core.impl.ParametedType; +import org.jboss.tools.common.java.IParametedType; +import org.jboss.tools.common.java.ParametedType; import org.jboss.tools.common.util.FileUtil; /** Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/DefinitionContext.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -384,6 +384,14 @@ workingCopy = null; } + public void dropWorkingCopy() { + if(original != null) { + original.dropWorkingCopy(); + } else { + workingCopy = null; + } + } + public AnnotationDefinition getAnnotation(IType type) { String name = type.getFullyQualifiedName(); AnnotationDefinition result = annotations.get(name); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/FieldDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/FieldDefinition.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/FieldDefinition.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -12,7 +12,7 @@ import org.eclipse.jdt.core.IField; import org.jboss.tools.cdi.core.IRootDefinitionContext; -import org.jboss.tools.cdi.core.ITypeDeclaration; +import org.jboss.tools.common.java.ITypeDeclaration; /** * Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParametedTypeFactory.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -1,216 +0,0 @@ -/******************************************************************************* - * Copyright (c) 2009 Red Hat, Inc. - * Distributed under license by Red Hat, Inc. All rights reserved. - * This program is made available under the terms of the - * Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - * - * Contributors: - * Red Hat, Inc. - initial API and implementation - ******************************************************************************/ -package org.jboss.tools.cdi.internal.core.impl.definition; - -import java.util.HashMap; -import java.util.Map; -import java.util.StringTokenizer; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.jdt.core.IMember; -import org.eclipse.jdt.core.IMethod; -import org.eclipse.jdt.core.ISourceRange; -import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.core.Signature; -import org.jboss.tools.cdi.core.CDICorePlugin; -import org.jboss.tools.cdi.internal.core.impl.ParametedType; -import org.jboss.tools.cdi.internal.core.impl.TypeDeclaration; -import org.jboss.tools.common.model.util.EclipseJavaUtil; - -public class ParametedTypeFactory { - // I S J C F D Z - static HashMap<String,String> primitives = new HashMap<String, String>(); - static { - primitives.put("I", "Ljava.lang.Integer;"); - primitives.put("S", "Ljava.lang.Short;"); - primitives.put("J", "Ljava.lang.Long;"); - primitives.put("C", "Ljava.lang.Character;"); - primitives.put("F", "Ljava.lang.Float;"); - primitives.put("D", "Ljava.lang.Double;"); - primitives.put("Z", "Ljava.lang.Boolean;"); - } - //unresolved Object signature - public static String OBJECT = "QObject;"; - Map<String, ParametedType> cache = new HashMap<String, ParametedType>(); - - public ParametedType newParametedType(IType type) { - ParametedType parametedType = new ParametedType(); - if(type != null && !type.isBinary()) { - ISourceRange r = null; - try { - r = type.getNameRange(); - } catch (CoreException e) { - CDICorePlugin.getDefault().logError(e); - } - if(r != null) { - parametedType = new TypeDeclaration(parametedType, type.getResource(), r.getOffset(), r.getLength()); - } - } - parametedType.setFactory(this); - parametedType.setType(type); - if(type != null) parametedType.setSignature("L" + type.getFullyQualifiedName() + ";"); - String[] ps = null; - try { - ps = type.getTypeParameterSignatures(); - } catch (JavaModelException e) { - CDICorePlugin.getDefault().logError(e); - } - if(ps != null && ps.length > 0) { - for (int i = 0; i < ps.length; i++) { - try { - ParametedType p = getParametedTypeForParameter(type, ps[i], null); - if(p != null) parametedType.addParameter(p); - } catch (JavaModelException e) { - CDICorePlugin.getDefault().logError(e); - } catch (Exception ee) { - CDICorePlugin.getDefault().logError(ee); - } - - } - } - return parametedType; - } - - public ParametedType getParametedType(IMember context, String typeSignature) throws JavaModelException { - if(typeSignature == null) return null; - - IType contextType = context instanceof IType ? (IType)context : context.getDeclaringType(); - - String key = context == null || context.isBinary() || OBJECT.equals(typeSignature) ? typeSignature : contextType.getFullyQualifiedName() + "+" + typeSignature; - if(cache.containsKey(key)) return cache.get(key); - ParametedType result = new ParametedType(); - result.setFactory(this); - result.setSignature(typeSignature); - - typeSignature = typeSignature.substring(result.getArrayPrefix().length()); - - if(primitives.containsKey(typeSignature)) { - typeSignature = primitives.get(typeSignature); - result.setSignature(result.getArrayPrefix() + typeSignature); - result.setPrimitive(true); - } else if(typeSignature.startsWith("+")) { - typeSignature = typeSignature.substring(1); - result.setUpper(true); - } else if(typeSignature.startsWith("-")) { - typeSignature = typeSignature.substring(1); - result.setLower(true); - } - - int startToken = typeSignature.indexOf('<'); - if(startToken < 0) { - String resovedTypeName = EclipseJavaUtil.resolveTypeAsString(contextType, typeSignature); - if(resovedTypeName == null) return null; - if(!context.isBinary()) { - StringBuffer ns = new StringBuffer(); - ns.append(result.getArrayPrefix()); - if(result.isLower()) ns.append('-'); - if(result.isUpper()) ns.append('+'); - ns.append('L').append(resovedTypeName).append(";"); - result.setSignature(ns.toString()); - } - IType type = EclipseJavaUtil.findType(context.getJavaProject(), resovedTypeName); - if(type != null) { - result.setType(type); - cache.put(key, result); - return result; - } - if(context instanceof IMethod) { - String[] ps = ((IMethod)context).getTypeParameterSignatures(); - for (int i = 0; i < ps.length; i++) { - ParametedType st = getParametedTypeForParameter(context, ps[i], result); - if(st != null) { - if(st.getSignature().indexOf(':') >= 0) { - CDICorePlugin.getDefault().logWarning("Wrong signature=" + st.getSignature()); - } - return st; - } - } - } - String[] ps = contextType.getTypeParameterSignatures(); - for (int i = 0; i < ps.length; i++) { - ParametedType st = getParametedTypeForParameter(contextType, ps[i], result); - if(st != null) return st; - } - } else { - int endToken = typeSignature.lastIndexOf('>'); - if(endToken < startToken) return null; - String typeName = typeSignature.substring(0, startToken) + typeSignature.substring(endToken + 1); - String resovedTypeName = EclipseJavaUtil.resolveTypeAsString(contextType, typeName); - if(resovedTypeName == null) return null; - IType type = EclipseJavaUtil.findType(context.getJavaProject(), resovedTypeName); - if(type != null) { - result.setType(type); - cache.put(key, result); - StringBuffer newParams = new StringBuffer(); - String[] paramSignatures = null; - try { - paramSignatures = Signature.getTypeArguments(typeSignature); - } catch (Exception e) { - CDICorePlugin.getDefault().logError(e); - } - if(paramSignatures != null) for (String paramSignature: paramSignatures) { - ParametedType param = getParametedType(context, paramSignature); - if(param == null) { - param = new ParametedType(); - param.setSignature(paramSignature); - } - result.addParameter(param); - newParams.append(param.getSignature()); - } - if(!context.isBinary()) { - StringBuffer ns = new StringBuffer(); - ns.append(result.getArrayPrefix()); - if(result.isLower()) ns.append('-'); - if(result.isUpper()) ns.append('+'); - ns.append('L').append(resovedTypeName).append('<').append(newParams).append(">;"); - result.setSignature(ns.toString()); - } - return result; - } - } - return null; - } - - public ParametedType getParametedTypeForParameter(IMember context, String typeParameterSignature, ParametedType result) throws JavaModelException { - IType contextType = context instanceof IType ? (IType)context : context.getDeclaringType(); - String key = context == null ? typeParameterSignature : contextType.getFullyQualifiedName() + "+" + typeParameterSignature; - - String t = Signature.getTypeVariable(typeParameterSignature); - String[] bounds = Signature.getTypeParameterBounds(typeParameterSignature); - - t = "L" + t + ";"; - if(result == null || t.equals(result.getSignature())) { - String sts = bounds.length > 0 ? bounds[0] : ""; - if(sts.length() > 0) { - ParametedType st = getParametedType(contextType, sts); - if(st != null) { - result = new TypeDeclaration(st, context.getResource(), 0, 0); - } - } else if(result != null) { - result.setSignature(t); - } - if(result == null) { - result = new ParametedType(); - result.setFactory(this); - result.setSignature(t); - } - result.setVariable(true); - cache.put(key, result); - return result; - } - return null; - } - - public void clean() { - cache.clear(); - } -} \ No newline at end of file Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParameterDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParameterDefinition.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/ParameterDefinition.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -17,8 +17,8 @@ import org.eclipse.jdt.core.ISourceRange; import org.eclipse.jdt.core.IType; import org.jboss.tools.cdi.core.IRootDefinitionContext; -import org.jboss.tools.cdi.internal.core.impl.ParametedType; -import org.jboss.tools.cdi.internal.core.impl.TypeDeclaration; +import org.jboss.tools.common.java.ParametedType; +import org.jboss.tools.common.java.TypeDeclaration; import org.jboss.tools.common.text.ITextSourceReference; public class ParameterDefinition extends BeanMemberDefinition { Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/definition/TypeDefinition.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -24,7 +24,7 @@ import org.jboss.tools.cdi.core.IRootDefinitionContext; import org.jboss.tools.cdi.core.extension.feature.IProcessAnnotatedMemberFeature; import org.jboss.tools.cdi.internal.core.impl.AnnotationDeclaration; -import org.jboss.tools.cdi.internal.core.impl.ParametedType; +import org.jboss.tools.common.java.ParametedType; /** * Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/ImplementationCollector.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/ImplementationCollector.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/scanner/ImplementationCollector.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -18,8 +18,8 @@ import org.eclipse.jdt.core.JavaModelException; import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.CDICorePlugin; -import org.jboss.tools.cdi.core.IParametedType; import org.jboss.tools.cdi.internal.core.impl.definition.TypeDefinition; +import org.jboss.tools.common.java.IParametedType; public class ImplementationCollector { List<TypeDefinition> typeDefinitions; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-06-29 21:10:24 UTC (rev 32463) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-06-29 21:12:12 UTC (rev 32464) @@ -68,7 +68,6 @@ import org.jboss.tools.cdi.core.IInterceptorBinded; import org.jboss.tools.cdi.core.IInterceptorBinding; import org.jboss.tools.cdi.core.IInterceptorBindingDeclaration; -import org.jboss.tools.cdi.core.IParametedType; import org.jboss.tools.cdi.core.IParameter; import org.jboss.tools.cdi.core.IProducer; import org.jboss.tools.cdi.core.IProducerField; @@ -81,13 +80,14 @@ import org.jboss.tools.cdi.core.IStereotype; import org.jboss.tools.cdi.core.IStereotypeDeclaration; import org.jboss.tools.cdi.core.IStereotyped; -import org.jboss.tools.cdi.core.ITypeDeclaration; import org.jboss.tools.cdi.core.extension.feature.IValidatorFeature; import org.jboss.tools.cdi.core.preferences.CDIPreferences; import org.jboss.tools.cdi.internal.core.impl.CDIProject; -import org.jboss.tools.cdi.internal.core.impl.ParametedType; import org.jboss.tools.cdi.internal.core.impl.SessionBean; import org.jboss.tools.cdi.internal.core.impl.definition.Dependencies; +import org.jboss.tools.common.java.IParametedType; +import org.jboss.tools.common.java.ITypeDeclaration; +import org.jboss.tools.common.java.ParametedType; import org.jboss.tools.common.model.util.EclipseJavaUtil; import org.jboss.tools.common.model.util.EclipseResourceUtil; import org.jboss.tools.common.text.ITextSourceReference;