Author: dazarov Date: 2011-07-25 16:59:31 -0400 (Mon, 25 Jul 2011) New Revision: 33181 Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java Log: https://issues.jboss.org/browse/JBIDE-7684, https://issues.jboss.org/browse/JBIDE-7683 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-25 17:43:00 UTC (rev 33180) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-07-25 20:59:31 UTC (rev 33181) @@ -332,11 +332,9 @@ IJavaElement element = findJavaElement(file, start); if(element != null){ IJavaElement disposerElement = findJavaElementByAnnotation(element, CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME); - IJavaElement interceptorElement = findJavaElementByAnnotation(element, CDIConstants.INTERCEPTOR_ANNOTATION_TYPE_NAME); - if(disposerElement != null && interceptorElement != null){ + if(disposerElement != null){ return new IMarkerResolution[] { - new DeleteAnnotationMarkerResolution(disposerElement, CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME), - new DeleteAnnotationMarkerResolution(interceptorElement, CDIConstants.INTERCEPTOR_ANNOTATION_TYPE_NAME) + new DeleteAnnotationMarkerResolution(disposerElement, CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME) }; } } @@ -344,14 +342,32 @@ IJavaElement element = findJavaElement(file, start); if(element != null){ IJavaElement disposerElement = findJavaElementByAnnotation(element, CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME); - IJavaElement decoratorElement = findJavaElementByAnnotation(element, CDIConstants.DECORATOR_TYPE_NAME); - if(disposerElement != null && decoratorElement != null){ + if(disposerElement != null){ return new IMarkerResolution[] { - new DeleteAnnotationMarkerResolution(disposerElement, CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME), - new DeleteAnnotationMarkerResolution(decoratorElement, CDIConstants.DECORATOR_TYPE_NAME) + new DeleteAnnotationMarkerResolution(disposerElement, CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME) }; } } + }else if(messageId == CDIValidationErrorManager.PRODUCER_IN_INTERCEPTOR_ID){ + IJavaElement element = findJavaElement(file, start); + if(element != null){ + IJavaElement producerElement = findJavaElementByAnnotation(element, CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME); + if(producerElement != null){ + return new IMarkerResolution[] { + new DeleteAnnotationMarkerResolution(producerElement, CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME) + }; + } + } + }else if(messageId == CDIValidationErrorManager.PRODUCER_IN_DECORATOR_ID){ + IJavaElement element = findJavaElement(file, start); + if(element != null){ + IJavaElement producerElement = findJavaElementByAnnotation(element, CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME); + if(producerElement != null){ + return new IMarkerResolution[] { + new DeleteAnnotationMarkerResolution(producerElement, CDIConstants.PRODUCES_ANNOTATION_TYPE_NAME) + }; + } + } } } return new IMarkerResolution[] {};