[jbosstools-commits] JBoss Tools SVN: r30318 - in trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi: internal/core/impl and 1 other directory.
jbosstools-commits at lists.jboss.org
jbosstools-commits at lists.jboss.org
Mon Apr 4 21:25:41 EDT 2011
Author: scabanovich
Date: 2011-04-04 21:25:40 -0400 (Mon, 04 Apr 2011)
New Revision: 30318
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/IInjectionPointField.java
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointParameter.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/CDIProject.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/Parameter.java
Log:
JBIDE-8198
https://issues.jboss.org/browse/JBIDE-8198
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-04-05 01:06:20 UTC (rev 30317)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IBeanMember.java 2011-04-05 01:25:40 UTC (rev 30318)
@@ -25,4 +25,11 @@
* @return
*/
IClassBean getClassBean();
-}
\ No newline at end of file
+
+ /**
+ * Returns type of underlying Java member.
+ *
+ * @return
+ */
+ IParametedType getMemberType();
+}
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointField.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointField.java 2011-04-05 01:06:20 UTC (rev 30317)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointField.java 2011-04-05 01:25:40 UTC (rev 30318)
@@ -17,11 +17,4 @@
*/
public interface IInjectionPointField extends IBeanField, IInjectionPoint {
- /**
- * Extensions can override type.
- *
- * @return type that was set by an extension instead of Java member type
- */
- public ITypeDeclaration getOverridenType();
-
}
\ No newline at end of file
Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointParameter.java
===================================================================
--- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointParameter.java 2011-04-05 01:06:20 UTC (rev 30317)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointParameter.java 2011-04-05 01:25:40 UTC (rev 30318)
@@ -16,12 +16,4 @@
* @author Alexey Kazakov
*/
public interface IInjectionPointParameter extends IParameter, IInjectionPoint {
-
- /**
- * Extensions can override type.
- *
- * @return type that was set by an extension instead of Java parameter type
- */
- public ITypeDeclaration getOverridenType();
-
}
\ No newline at end of file
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-04-05 01:06:20 UTC (rev 30317)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/BeanMember.java 2011-04-05 01:25:40 UTC (rev 30318)
@@ -93,6 +93,10 @@
return typeDeclaration;
}
+ public IParametedType getMemberType() {
+ return typeDeclaration;
+ }
+
public int getLength() {
ISourceRange r = null;
try {
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-04-05 01:06:20 UTC (rev 30317)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/CDIProject.java 2011-04-05 01:25:40 UTC (rev 30318)
@@ -45,7 +45,6 @@
import org.jboss.tools.cdi.core.IDecorator;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
-import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.core.IInterceptor;
import org.jboss.tools.cdi.core.IInterceptorBinding;
import org.jboss.tools.cdi.core.IObserverMethod;
@@ -286,14 +285,6 @@
return result;
}
- IParametedType overridenType = null;
- if(injectionPoint instanceof IInjectionPointField) {
- overridenType = ((IInjectionPointField)injectionPoint).getOverridenType();
- } else if(injectionPoint instanceof IInjectionPointParameter) {
- overridenType = ((IInjectionPointParameter)injectionPoint).getOverridenType();
- }
- if(overridenType != null) type = overridenType;
-
if(type.getType() != null && CDIConstants.EVENT_TYPE_NAME.equals(type.getType().getFullyQualifiedName())) {
List<? extends IParametedType> ps = type.getParameters();
if(ps != null && ps.size() == 1) {
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-04-05 01:06:20 UTC (rev 30317)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointField.java 2011-04-05 01:25:40 UTC (rev 30318)
@@ -14,6 +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;
/**
@@ -25,10 +26,17 @@
public InjectionPointField() {}
- public ITypeDeclaration getOverridenType() {
- return getDefinition().getOverridenType();
+ public IParametedType getType() {
+ if(getDefinition().getOverridenType() != null) {
+ return getDefinition().getOverridenType();
+ }
+ return super.getType();
}
+ public IParametedType getJavaMemberType() {
+ return super.getType();
+ }
+
/*
* (non-Javadoc)
* @see org.jboss.tools.cdi.core.IInjectionPoint#getDelegateAnnotation()
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-04-05 01:06:20 UTC (rev 30317)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/InjectionPointParameter.java 2011-04-05 01:25:40 UTC (rev 30318)
@@ -30,9 +30,6 @@
public class InjectionPointParameter extends Parameter implements
IInjectionPointParameter {
- public ITypeDeclaration getOverridenType() {
- return definition.getOverridenType();
- }
/*
* (non-Javadoc)
* @see org.jboss.tools.cdi.core.IInjectionPoint#getDelegateAnnotation()
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-04-05 01:06:20 UTC (rev 30317)
+++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/Parameter.java 2011-04-05 01:25:40 UTC (rev 30318)
@@ -37,7 +37,14 @@
return definition.getName();
}
+ public IParametedType getMemberType() {
+ return definition.getType();
+ }
+
public IParametedType getType() {
+ if(definition.getOverridenType() != null) {
+ return definition.getOverridenType();
+ }
return definition.getType();
}
More information about the jbosstools-commits
mailing list