Author: dazarov
Date: 2011-07-29 17:56:42 -0400 (Fri, 29 Jul 2011)
New Revision: 33374
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SessionBeanAnnotatedDecoratorBroken.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SessionBeanAnnotatedDecoratorBroken.qfxresult
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SessionBeanAnnotatedInterceptorBroken.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SessionBeanAnnotatedInterceptorBroken.qfxresult
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/CDIValidationErrorManager.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java
Log:
https://issues.jboss.org/browse/JBIDE-7680
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-07-29
20:57:50 UTC (rev 33373)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-07-29
21:56:42 UTC (rev 33374)
@@ -1665,9 +1665,9 @@
*/
if (decoratorDeclaration != null) {
addError(CDIValidationMessages.SESSION_BEAN_ANNOTATED_DECORATOR,
CDIPreferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR,
- sessionDeclaration, bean.getResource());
+ sessionDeclaration, bean.getResource(), SESSION_BEAN_ANNOTATED_DECORATOR_ID);
addError(CDIValidationMessages.SESSION_BEAN_ANNOTATED_DECORATOR,
CDIPreferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR,
- decoratorDeclaration, bean.getResource());
+ decoratorDeclaration, bean.getResource(), SESSION_BEAN_ANNOTATED_DECORATOR_ID);
}
/*
* 3.2. Session beans
@@ -1675,9 +1675,9 @@
*/
if (interceptorDeclaration != null) {
addError(CDIValidationMessages.SESSION_BEAN_ANNOTATED_INTERCEPTOR,
CDIPreferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR,
- sessionDeclaration, bean.getResource());
+ sessionDeclaration, bean.getResource(), SESSION_BEAN_ANNOTATED_INTERCEPTOR_ID);
addError(CDIValidationMessages.SESSION_BEAN_ANNOTATED_INTERCEPTOR,
CDIPreferences.SESSION_BEAN_ANNOTATED_INTERCEPTOR_OR_DECORATOR,
- interceptorDeclaration, bean.getResource());
+ interceptorDeclaration, bean.getResource(),
SESSION_BEAN_ANNOTATED_INTERCEPTOR_ID);
}
}
}
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java 2011-07-29
20:57:50 UTC (rev 33373)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java 2011-07-29
21:56:42 UTC (rev 33374)
@@ -59,6 +59,8 @@
public static final int OBSERVER_PARAMETER_ILLEGALLY_ANNOTATED_ID = 38;
public static final int OBSERVER_IN_DECORATOR_ID = 39;
public static final int OBSERVER_IN_INTERCEPTOR_ID = 40;
+ public static final int SESSION_BEAN_ANNOTATED_INTERCEPTOR_ID = 41;
+ public static final int SESSION_BEAN_ANNOTATED_DECORATOR_ID = 42;
/*
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-07-29
20:57:50 UTC (rev 33373)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-07-29
21:56:42 UTC (rev 33374)
@@ -419,6 +419,26 @@
};
}
}
+ }else if(messageId ==
CDIValidationErrorManager.SESSION_BEAN_ANNOTATED_INTERCEPTOR_ID){
+ IJavaElement element = findJavaElement(file, start);
+ if(element != null){
+ IJavaElement interceptorElement = findJavaElementByAnnotation(element,
CDIConstants.INTERCEPTOR_ANNOTATION_TYPE_NAME);
+ if(interceptorElement != null){
+ return new IMarkerResolution[] {
+ new DeleteAnnotationMarkerResolution(interceptorElement,
CDIConstants.INTERCEPTOR_ANNOTATION_TYPE_NAME)
+ };
+ }
+ }
+ }else if(messageId == CDIValidationErrorManager.SESSION_BEAN_ANNOTATED_DECORATOR_ID){
+ IJavaElement element = findJavaElement(file, start);
+ if(element != null){
+ IJavaElement decoratorElement = findJavaElementByAnnotation(element,
CDIConstants.DECORATOR_STEREOTYPE_TYPE_NAME);
+ if(decoratorElement != null){
+ return new IMarkerResolution[] {
+ new DeleteAnnotationMarkerResolution(decoratorElement,
CDIConstants.DECORATOR_STEREOTYPE_TYPE_NAME)
+ };
+ }
+ }
}
}
return new IMarkerResolution[] {};
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SessionBeanAnnotatedDecoratorBroken.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SessionBeanAnnotatedDecoratorBroken.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SessionBeanAnnotatedDecoratorBroken.java 2011-07-29
21:56:42 UTC (rev 33374)
@@ -0,0 +1,10 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.decorator.Decorator;
+import javax.ejb.Stateless;
+
+@Decorator
+@Stateless
+public class SessionBeanAnnotatedDecoratorBroken {
+
+}
\ No newline at end of file
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SessionBeanAnnotatedDecoratorBroken.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SessionBeanAnnotatedDecoratorBroken.qfxresult
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SessionBeanAnnotatedDecoratorBroken.qfxresult
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SessionBeanAnnotatedDecoratorBroken.qfxresult 2011-07-29
21:56:42 UTC (rev 33374)
@@ -0,0 +1,8 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.ejb.Stateless;
+
+@Stateless
+public class SessionBeanAnnotatedDecoratorBroken {
+
+}
\ No newline at end of file
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SessionBeanAnnotatedInterceptorBroken.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SessionBeanAnnotatedInterceptorBroken.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SessionBeanAnnotatedInterceptorBroken.java 2011-07-29
21:56:42 UTC (rev 33374)
@@ -0,0 +1,15 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.ejb.Singleton;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.Interceptor;
+import javax.interceptor.InvocationContext;
+
+@Interceptor
+@Singleton
+public class SessionBeanAnnotatedInterceptorBroken {
+ @AroundInvoke
+ public Object alwaysReturnThis(InvocationContext ctx) throws Exception {
+ return ctx.proceed();
+ }
+}
\ No newline at end of file
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SessionBeanAnnotatedInterceptorBroken.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SessionBeanAnnotatedInterceptorBroken.qfxresult
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SessionBeanAnnotatedInterceptorBroken.qfxresult
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/SessionBeanAnnotatedInterceptorBroken.qfxresult 2011-07-29
21:56:42 UTC (rev 33374)
@@ -0,0 +1,13 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.ejb.Singleton;
+import javax.interceptor.AroundInvoke;
+import javax.interceptor.InvocationContext;
+
+@Singleton
+public class SessionBeanAnnotatedInterceptorBroken {
+ @AroundInvoke
+ public Object alwaysReturnThis(InvocationContext ctx) throws Exception {
+ return ctx.proceed();
+ }
+}
\ No newline at end of file
Modified:
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-07-29
20:57:50 UTC (rev 33373)
+++
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-07-29
21:56:42 UTC (rev 33374)
@@ -886,4 +886,32 @@
CDIValidationErrorManager.OBSERVER_IN_INTERCEPTOR_ID,
DeleteAnnotationMarkerResolution.class);
}
+
+ public void testSessionBeanAnnotatedDecoratorResolution() throws CoreException{
+ checkResolution(tckProject,
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/SessionBeanAnnotatedDecoratorBroken.java"
+ },
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/SessionBeanAnnotatedDecoratorBroken.qfxresult"
+ },
+ CDICoreValidator.PROBLEM_TYPE,
+ CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
+ CDIValidationErrorManager.SESSION_BEAN_ANNOTATED_DECORATOR_ID,
+ DeleteAnnotationMarkerResolution.class);
+ }
+
+ public void testSessionBeanAnnotatedInterceptorBrokenResolution() throws CoreException{
+ checkResolution(tckProject,
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/SessionBeanAnnotatedInterceptorBroken.java"
+ },
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/SessionBeanAnnotatedInterceptorBroken.qfxresult"
+ },
+ CDICoreValidator.PROBLEM_TYPE,
+ CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
+ CDIValidationErrorManager.SESSION_BEAN_ANNOTATED_INTERCEPTOR_ID,
+ DeleteAnnotationMarkerResolution.class);
+ }
}
\ No newline at end of file