4:39 p.m.
Author: scabanovich
Date: 2011-09-12 17:39:13 -0400 (Mon, 12 Sep 2011)
New Revision: 34651
Removed:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointMethod.java
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/internal/core/impl/ClassBean.java
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.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIElementWrapper.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ObserverMethodResolutionTest.java
Log:
JBIDE-9698
https://issues.jboss.org/browse/JBIDE-9698
IInjectionPointMethod interface removed.
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-09-12
21:32:35 UTC (rev 34650)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/CDIUtil.java 2011-09-12
21:39:13 UTC (rev 34651)
@@ -220,9 +220,6 @@
if (element instanceof IField && iPoint instanceof IInjectionPointField) {
if (((IInjectionPointField) iPoint).getField() != null &&
((IInjectionPointField)
iPoint).getField().getElementName().equals(element.getElementName()))
return iPoint;
- } else if (element instanceof IMethod && iPoint instanceof
IInjectionPointMethod && position == 0) {
- if (((IInjectionPointMethod) iPoint).getMethod() != null &&
((IInjectionPointMethod) iPoint).getMethod().equals(element))
- return iPoint;
}else if(element instanceof ILocalVariable && iPoint instanceof
IInjectionPointParameter){
if (((IInjectionPointParameter) iPoint).getName().equals(element.getElementName()))
return iPoint;
Deleted:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointMethod.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointMethod.java 2011-09-12
21:32:35 UTC (rev 34650)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/core/IInjectionPointMethod.java 2011-09-12
21:39:13 UTC (rev 34651)
@@ -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;
-
-/**
- * Represents an injection point which is a method of a bean class.
- *
- * @author Alexey Kazakov
- */
-public interface IInjectionPointMethod extends IInjectionPoint, IBeanMethod {
-
-}
\ No newline at end of file
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-09-12
21:32:35 UTC (rev 34650)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/impl/ClassBean.java 2011-09-12
21:39:13 UTC (rev 34651)
@@ -313,9 +313,6 @@
}
}
for (BeanMethod m: methods) {
-// if(m instanceof IInjectionPoint) {
-// result.add((IInjectionPoint)m);
-// }
List<IParameter> ps = m.getParameters();
for (IParameter p: ps) {
if(p instanceof IInjectionPoint) {
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-09-12
21:32:35 UTC (rev 34650)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-09-12
21:39:13 UTC (rev 34651)
@@ -63,7 +63,6 @@
import org.jboss.tools.cdi.core.IInitializerMethod;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
-import org.jboss.tools.cdi.core.IInjectionPointMethod;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.core.IInterceptor;
import org.jboss.tools.cdi.core.IInterceptorBinded;
@@ -1463,11 +1462,7 @@
private void validateInitializers(IClassBean bean) {
Set<IInitializerMethod> initializers = bean.getInitializers();
for (IInitializerMethod initializer: initializers) {
- try {
- validateInitializerMethod(initializer);
- } catch (Exception e) {
- e.printStackTrace();
- }
+ validateInitializerMethod(initializer);
}
}
@@ -1522,11 +1517,11 @@
* 5.2.2. Legal injection point types
* - injection point type is a type variable
*/
- if(!(injection instanceof IInjectionPointMethod) &&
CDIUtil.isTypeVariable(injection, false)) {
+ if(CDIUtil.isTypeVariable(injection, false)) {
addError(CDIValidationMessages.INJECTION_TYPE_IS_VARIABLE,
CDIPreferences.INJECTION_TYPE_IS_VARIABLE, declaration, injection.getResource());
}
- if(declaration!=null && !(injection instanceof IInjectionPointMethod)) {
+ if(declaration!=null) {
Set<IBean> beans = cdiProject.getBeans(true, injection);
ITextSourceReference reference = injection instanceof
IInjectionPointParameter?injection:declaration;
/*
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java 2011-09-12
21:32:35 UTC (rev 34650)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/GenericInjectedPointHyperlinkDetector.java 2011-09-12
21:39:13 UTC (rev 34651)
@@ -42,7 +42,6 @@
import org.jboss.tools.cdi.core.IClassBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
-import org.jboss.tools.cdi.core.IInjectionPointMethod;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.seam.solder.core.CDISeamSolderConstants;
import org.jboss.tools.cdi.seam.solder.core.generic.GenericClassBean;
@@ -182,9 +181,6 @@
if (element instanceof IField && iPoint instanceof IInjectionPointField) {
if (((IInjectionPointField) iPoint).getField() != null &&
((IInjectionPointField)
iPoint).getField().getElementName().equals(element.getElementName()))
results.add(iPoint);
- } else if (element instanceof IMethod && iPoint instanceof
IInjectionPointMethod && position == 0) {
- if (((IInjectionPointMethod) iPoint).getMethod() != null &&
((IInjectionPointMethod) iPoint).getMethod().equals(element))
- results.add(iPoint);
}else if(element instanceof ILocalVariable && iPoint instanceof
IInjectionPointParameter){
if (((IInjectionPointParameter) iPoint).getName().equals(element.getElementName()))
results.add(iPoint);
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java 2011-09-12
21:32:35 UTC (rev 34650)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventAndObserverMethodHyperlinkDetector.java 2011-09-12
21:39:13 UTC (rev 34651)
@@ -145,13 +145,13 @@
Set<IObserverMethod> observers = ((IClassBean)bean).getObserverMethods();
for (IObserverMethod bm: observers) {
ISourceRange sr = bm.getMethod().getSourceRange();
- if(sr.getOffset() <= offset && sr.getOffset() + sr.getLength() >=
offset) {
+// if(sr.getOffset() <= offset && sr.getOffset() + sr.getLength() >=
offset) {
IObserverMethod obs = (IObserverMethod)bm;
Set<IParameter> ps = obs.getObservedParameters();
if(!ps.isEmpty()) {
result.add(ps.iterator().next());
}
- }
+// }
}
}
}
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java 2011-09-12
21:32:35 UTC (rev 34650)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.text.ext/src/org/jboss/tools/cdi/text/ext/hyperlink/EventHyperlink.java 2011-09-12
21:39:13 UTC (rev 34651)
@@ -22,7 +22,7 @@
import org.jboss.tools.cdi.core.ICDIElement;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
-import org.jboss.tools.cdi.core.IInjectionPointMethod;
+import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.core.IObserverMethod;
import org.jboss.tools.cdi.text.ext.CDIExtensionsMessages;
import org.jboss.tools.cdi.text.ext.CDIExtensionsPlugin;
@@ -59,8 +59,8 @@
IJavaElement element = event.getClassBean().getBeanClass();
if(event instanceof IInjectionPointField)
element = ((IInjectionPointField)event).getField();
- else if(event instanceof IInjectionPointMethod)
- element = ((IInjectionPointMethod)event).getMethod();
+ else if(event instanceof IInjectionPointParameter)
+ element = ((IInjectionPointParameter)event).getBeanMethod().getMethod();
if (part != null) {
JavaUI.revealInEditor(part, element);
@@ -74,10 +74,12 @@
public String getHyperlinkText() {
String text = CDIExtensionsMessages.CDI_EVENT_HYPERLINK_OPEN_EVENT+"
"+event.getClassBean().getBeanClass().getElementName();
- if(event instanceof IInjectionPointField)
+ if(event instanceof IInjectionPointField) {
text += "."+((IInjectionPointField)event).getField().getElementName();
- else if(event instanceof IInjectionPointMethod)
- text += "."+((IInjectionPointMethod)event).getMethod().getElementName();
+ } else if(event instanceof IInjectionPointParameter) {
+ IInjectionPointParameter p = (IInjectionPointParameter)event;
+ text += "." + p.getBeanMethod().getMethod().getElementName();
+ }
return text;
}
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-09-12
21:32:35 UTC (rev 34650)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-09-12
21:39:13 UTC (rev 34651)
@@ -46,7 +46,6 @@
import org.jboss.tools.cdi.core.IBeanMethod;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
-import org.jboss.tools.cdi.core.IInjectionPointMethod;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.core.IQualifier;
import org.jboss.tools.cdi.core.IQualifierDeclaration;
@@ -575,12 +574,12 @@
IField f = t.getField(field.getElementName());
return f;
- }else if(injectionPoint instanceof IInjectionPointMethod){
- IMethod method = ((IInjectionPointMethod)injectionPoint).getMethod();
+ }else if(injectionPoint instanceof IInjectionPointParameter){
+ IMethod method =
((IInjectionPointParameter)injectionPoint).getBeanMethod().getMethod();
IType type = method.getDeclaringType();
IType t = compilationUnit.getType(type.getElementName());
IMethod m = t.getMethod(method.getElementName(), method.getParameterTypes());
-
+ // Why method? Why not Java element for parameter?
return m;
}
return null;
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java 2011-09-12
21:32:35 UTC (rev 34650)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIBeanQueryParticipant.java 2011-09-12
21:39:13 UTC (rev 34651)
@@ -35,9 +35,9 @@
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.ICDIElement;
import org.jboss.tools.cdi.core.ICDIProject;
+import org.jboss.tools.cdi.core.IInitializerMethod;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
-import org.jboss.tools.cdi.core.IInjectionPointMethod;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.ui.CDIUIMessages;
import org.jboss.tools.cdi.ui.CDIUIPlugin;
@@ -171,7 +171,8 @@
if(cdiElement instanceof IInjectionPointField){
return NLS.bind(CDIUIMessages.CDI_BEAN_QUERY_PARTICIPANT_INJECT_FIELD, label);
- }else if(cdiElement instanceof IInjectionPointMethod){
+ }else if(cdiElement instanceof IInitializerMethod){
+ //It is not an injection point, but it has annotation @Inject and contains injection
point parameters
return NLS.bind(CDIUIMessages.CDI_BEAN_QUERY_PARTICIPANT_INJECT_METHOD, label);
}else if(cdiElement instanceof IInjectionPointParameter){
return NLS.bind(CDIUIMessages.CDI_BEAN_QUERY_PARTICIPANT_INJECT_PARAMETER, label);
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIElementWrapper.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIElementWrapper.java 2011-09-12
21:32:35 UTC (rev 34650)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/CDIElementWrapper.java 2011-09-12
21:39:13 UTC (rev 34651)
@@ -17,11 +17,10 @@
import org.jboss.tools.cdi.core.CDIUtil;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.ICDIElement;
+import org.jboss.tools.cdi.core.IInitializerMethod;
import org.jboss.tools.cdi.core.IInjectionPointField;
-import org.jboss.tools.cdi.core.IInjectionPointMethod;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.core.IObserverMethod;
-import org.jboss.tools.cdi.ui.marker.MarkerResolutionUtils;
public class CDIElementWrapper {
private static String SPACE = " ";
@@ -45,9 +44,9 @@
}else if(element instanceof IInjectionPointField){
javaElement = ((IInjectionPointField)element).getField();
label =
((IInjectionPointField)element).getField().getDeclaringType().getElementName()+DOT+((IInjectionPointField)element).getField().getElementName();
- }else if(element instanceof IInjectionPointMethod){
- javaElement = ((IInjectionPointMethod)element).getMethod();
- label =
((IInjectionPointMethod)element).getMethod().getDeclaringType().getElementName()+DOT+((IInjectionPointMethod)element).getMethod().getElementName()+BRACKETS;
+ }else if(element instanceof IInitializerMethod){
+ javaElement = ((IInitializerMethod)element).getMethod();
+ label =
((IInitializerMethod)element).getMethod().getDeclaringType().getElementName()+DOT+((IInitializerMethod)element).getMethod().getElementName()+BRACKETS;
}else if(element instanceof IInjectionPointParameter){
IMethod method = ((IInjectionPointParameter)element).getBeanMethod().getMethod();
javaElement = CDIUtil.getParameter(method,
((IInjectionPointParameter)element).getName());
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java 2011-09-12
21:32:35 UTC (rev 34650)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/search/InjectionPointLabelProvider.java 2011-09-12
21:39:13 UTC (rev 34651)
@@ -16,8 +16,8 @@
import org.eclipse.swt.graphics.Image;
import org.jboss.tools.cdi.core.IBean;
import org.jboss.tools.cdi.core.ICDIElement;
+import org.jboss.tools.cdi.core.IInitializerMethod;
import org.jboss.tools.cdi.core.IInjectionPointField;
-import org.jboss.tools.cdi.core.IInjectionPointMethod;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.core.IObserverMethod;
import org.jboss.tools.cdi.ui.CDIUIMessages;
@@ -39,7 +39,7 @@
return NLS.bind(CDIUIMessages.INJECTION_POINT_LABEL_PROVIDER_OBSERVER_METHOD,
label);
}else if(cdiElement instanceof IInjectionPointField){
return NLS.bind(CDIUIMessages.INJECTION_POINT_LABEL_PROVIDER_EVENT, label);
- }else if(cdiElement instanceof IInjectionPointMethod){
+ }else if(cdiElement instanceof IInitializerMethod){
return NLS.bind(CDIUIMessages.INJECTION_POINT_LABEL_PROVIDER_EVENT, label);
}else if(cdiElement instanceof IInjectionPointParameter){
return NLS.bind(CDIUIMessages.INJECTION_POINT_LABEL_PROVIDER_EVENT, label);
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java 2011-09-12
21:32:35 UTC (rev 34650)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/CDIUtilTest.java 2011-09-12
21:39:13 UTC (rev 34651)
@@ -15,7 +15,6 @@
import org.jboss.tools.cdi.core.CDIUtil;
import org.jboss.tools.cdi.core.IClassBean;
import org.jboss.tools.cdi.core.IInjectionPoint;
-import org.jboss.tools.cdi.core.IInjectionPointMethod;
import org.jboss.tools.common.java.IAnnotationDeclaration;
/**
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ObserverMethodResolutionTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ObserverMethodResolutionTest.java 2011-09-12
21:32:35 UTC (rev 34650)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/src/org/jboss/tools/cdi/core/test/tck/ObserverMethodResolutionTest.java 2011-09-12
21:39:13 UTC (rev 34651)
@@ -19,7 +19,6 @@
import org.jboss.tools.cdi.core.IInitializerMethod;
import org.jboss.tools.cdi.core.IInjectionPoint;
import org.jboss.tools.cdi.core.IInjectionPointField;
-import org.jboss.tools.cdi.core.IInjectionPointMethod;
import org.jboss.tools.cdi.core.IInjectionPointParameter;
import org.jboss.tools.cdi.core.IObserverMethod;
import org.jboss.tools.cdi.core.IParameter;