Author: dazarov
Date: 2011-07-26 19:55:03 -0400 (Tue, 26 Jul 2011)
New Revision: 33224
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator3.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator3.qfxresult
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor5.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor5.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-7636
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-26
23:29:40 UTC (rev 33223)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-07-26
23:55:03 UTC (rev 33224)
@@ -1898,7 +1898,7 @@
if (declaration == null) {
declaration = CDIUtil.getNamedStereotypeDeclaration(interceptor);
}
- addError(CDIValidationMessages.INTERCEPTOR_HAS_NAME,
CDIPreferences.INTERCEPTOR_OR_DECORATOR_HAS_NAME, declaration,
interceptor.getResource());
+ addError(CDIValidationMessages.INTERCEPTOR_HAS_NAME,
CDIPreferences.INTERCEPTOR_OR_DECORATOR_HAS_NAME, declaration, interceptor.getResource(),
INTERCEPTOR_HAS_NAME_ID);
}
/*
@@ -1986,7 +1986,7 @@
if (declaration == null) {
declaration = CDIUtil.getNamedStereotypeDeclaration(decorator);
}
- addError(CDIValidationMessages.DECORATOR_HAS_NAME,
CDIPreferences.INTERCEPTOR_OR_DECORATOR_HAS_NAME, declaration, decorator.getResource());
+ addError(CDIValidationMessages.DECORATOR_HAS_NAME,
CDIPreferences.INTERCEPTOR_OR_DECORATOR_HAS_NAME, declaration, decorator.getResource(),
DECORATOR_HAS_NAME_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-26
23:29:40 UTC (rev 33223)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java 2011-07-26
23:55:03 UTC (rev 33224)
@@ -49,6 +49,8 @@
public static final int DISPOSER_IN_INTERCEPTOR_ID = 28;
public static final int DISPOSER_IN_DECORATOR_ID = 29;
public static final int STEREOTYPE_DECLARES_NON_EMPTY_NAME_ID = 30;
+ public static final int INTERCEPTOR_HAS_NAME_ID = 31;
+ public static final int DECORATOR_HAS_NAME_ID = 32;
/*
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-26
23:29:40 UTC (rev 33223)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-07-26
23:55:03 UTC (rev 33224)
@@ -308,16 +308,6 @@
};
}
}
- }else if(messageId ==
CDIValidationErrorManager.CONSTRUCTOR_PARAMETER_ANNOTATED_DISPOSES_ID){
- IJavaElement element = findJavaElement(file, start);
- if(element != null){
- IJavaElement disposesElement = findJavaElementByAnnotation(element,
CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME);
- if(disposesElement != null){
- return new IMarkerResolution[] {
- new DeleteAnnotationMarkerResolution(disposesElement,
CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME)
- };
- }
- }
}else if(messageId ==
CDIValidationErrorManager.CONSTRUCTOR_PARAMETER_ANNOTATED_OBSERVES_ID){
IJavaElement element = findJavaElement(file, start);
if(element != null){
@@ -328,7 +318,9 @@
};
}
}
- }else if(messageId == CDIValidationErrorManager.DISPOSER_IN_INTERCEPTOR_ID){
+ }else if(messageId == CDIValidationErrorManager.DISPOSER_IN_INTERCEPTOR_ID ||
+ messageId == CDIValidationErrorManager.DISPOSER_IN_DECORATOR_ID ||
+ messageId ==
CDIValidationErrorManager.CONSTRUCTOR_PARAMETER_ANNOTATED_DISPOSES_ID){
IJavaElement element = findJavaElement(file, start);
if(element != null){
IJavaElement disposerElement = findJavaElementByAnnotation(element,
CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME);
@@ -338,19 +330,10 @@
};
}
}
- }else if(messageId == CDIValidationErrorManager.DISPOSER_IN_DECORATOR_ID){
+ }else if(messageId == CDIValidationErrorManager.PRODUCER_IN_INTERCEPTOR_ID ||
+ messageId == CDIValidationErrorManager.PRODUCER_IN_DECORATOR_ID){
IJavaElement element = findJavaElement(file, start);
if(element != null){
- IJavaElement disposerElement = findJavaElementByAnnotation(element,
CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME);
- if(disposerElement != null){
- return new IMarkerResolution[] {
- 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[] {
@@ -358,16 +341,6 @@
};
}
}
- }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)
- };
- }
- }
}else if(messageId ==
CDIValidationErrorManager.STEREOTYPE_DECLARES_NON_EMPTY_NAME_ID){
TypeAndAnnotation ta = findTypeAndAnnotation(file, start,
CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
if(ta != null && ta.annotation != null && ta.type != null){
@@ -376,6 +349,14 @@
new DeleteAnnotationMarkerResolution(ta.type,
CDIConstants.NAMED_QUALIFIER_TYPE_NAME)
};
}
+ }else if(messageId == CDIValidationErrorManager.INTERCEPTOR_HAS_NAME_ID ||
+ messageId == CDIValidationErrorManager.DECORATOR_HAS_NAME_ID){
+ TypeAndAnnotation ta = findTypeAndAnnotation(file, start,
CDIConstants.NAMED_QUALIFIER_TYPE_NAME);
+ if(ta != null && ta.annotation != null && ta.type != null){
+ return new IMarkerResolution[] {
+ new DeleteAnnotationMarkerResolution(ta.type,
CDIConstants.NAMED_QUALIFIER_TYPE_NAME)
+ };
+ }
}
}
return new IMarkerResolution[] {};
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator3.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator3.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator3.java 2011-07-26
23:55:03 UTC (rev 33224)
@@ -0,0 +1,17 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+import javax.inject.Named;
+
+@Decorator
+@Named("Vasja")
+public class TestDecorator3 {
+ @Inject @Delegate @AAnnotation String str;
+
+
+ public String produce(){
+ return str;
+ }
+}
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator3.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator3.qfxresult
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator3.qfxresult
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator3.qfxresult 2011-07-26
23:55:03 UTC (rev 33224)
@@ -0,0 +1,16 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+@Decorator
+
+public class TestDecorator3 {
+ @Inject @Delegate @AAnnotation String str;
+
+
+ public String produce(){
+ return str;
+ }
+}
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor5.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor5.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor5.java 2011-07-26
23:55:03 UTC (rev 33224)
@@ -0,0 +1,17 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.inject.Named;
+import javax.interceptor.Interceptor;
+
+import org.jboss.jsr299.tck.tests.decorators.interceptor.FooBinding;
+
+@Interceptor
+@FooBinding
+@Named
+public class TestInterceptor5{
+
+
+ public String produce(){
+ return "a";
+ }
+}
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor5.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor5.qfxresult
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor5.qfxresult
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor5.qfxresult 2011-07-26
23:55:03 UTC (rev 33224)
@@ -0,0 +1,16 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.interceptor.Interceptor;
+
+import org.jboss.jsr299.tck.tests.decorators.interceptor.FooBinding;
+
+@Interceptor
+@FooBinding
+
+public class TestInterceptor5{
+
+
+ public String produce(){
+ return "a";
+ }
+}
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-26
23:29:40 UTC (rev 33223)
+++
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-07-26
23:55:03 UTC (rev 33224)
@@ -758,4 +758,32 @@
ChangeAnnotationMarkerResolution.class);
}
+ public void testNamedInInterceptorResolution() throws CoreException{
+ checkResolution(tckProject,
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestInterceptor5.java"
+ },
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestInterceptor5.qfxresult"
+ },
+ CDICoreValidator.PROBLEM_TYPE,
+ CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
+ CDIValidationErrorManager.INTERCEPTOR_HAS_NAME_ID,
+ DeleteAnnotationMarkerResolution.class);
+ }
+
+ public void testNamedInDecoratorResolution() throws CoreException{
+ checkResolution(tckProject,
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestDecorator3.java"
+ },
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestDecorator3.qfxresult"
+ },
+ CDICoreValidator.PROBLEM_TYPE,
+ CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
+ CDIValidationErrorManager.DECORATOR_HAS_NAME_ID,
+ DeleteAnnotationMarkerResolution.class);
+ }
+
}
\ No newline at end of file