Author: dazarov
Date: 2011-07-27 15:31:12 -0400 (Wed, 27 Jul 2011)
New Revision: 33268
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator4.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator4.qfxresult
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor6.java
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor6.qfxresult
Removed:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeRetentionAnnotationMarkerResolution.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeTargetAnnotationMarkerResolution.java
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/CDIUIMessages.java
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties
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-7686
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-27
19:01:06 UTC (rev 33267)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-07-27
19:31:12 UTC (rev 33268)
@@ -758,9 +758,9 @@
IAnnotationDeclaration specializesDeclaration =
bean.getSpecializesAnnotationDeclaration();
if(specializesDeclaration!=null) {
if(bean instanceof IDecorator) {
- addError(CDIValidationMessages.DECORATOR_ANNOTATED_SPECIALIZES,
CDIPreferences.INTERCEPTOR_ANNOTATED_SPECIALIZES, specializesDeclaration,
bean.getResource());
+ addError(CDIValidationMessages.DECORATOR_ANNOTATED_SPECIALIZES,
CDIPreferences.INTERCEPTOR_ANNOTATED_SPECIALIZES, specializesDeclaration,
bean.getResource(), DECORATOR_ANNOTATED_SPECIALIZES_ID);
} else if(bean instanceof IInterceptor) {
- addError(CDIValidationMessages.INTERCEPTOR_ANNOTATED_SPECIALIZES,
CDIPreferences.INTERCEPTOR_ANNOTATED_SPECIALIZES, specializesDeclaration,
bean.getResource());
+ addError(CDIValidationMessages.INTERCEPTOR_ANNOTATED_SPECIALIZES,
CDIPreferences.INTERCEPTOR_ANNOTATED_SPECIALIZES, specializesDeclaration,
bean.getResource(), INTERCEPTOR_ANNOTATED_SPECIALIZES_ID);
}
}
IBean specializedBean = bean.getSpecializedBean();
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-27
19:01:06 UTC (rev 33267)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java 2011-07-27
19:31:12 UTC (rev 33268)
@@ -52,6 +52,8 @@
public static final int INTERCEPTOR_HAS_NAME_ID = 31;
public static final int DECORATOR_HAS_NAME_ID = 32;
public static final int STEREOTYPE_IS_ANNOTATED_TYPED_ID = 33;
+ public static final int INTERCEPTOR_ANNOTATED_SPECIALIZES_ID = 34;
+ public static final int DECORATOR_ANNOTATED_SPECIALIZES_ID = 35;
/*
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java 2011-07-27
19:01:06 UTC (rev 33267)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java 2011-07-27
19:31:12 UTC (rev 33268)
@@ -104,9 +104,7 @@
public static String MAKE_BEAN_SCOPED_DEPENDENT_MARKER_RESOLUTION_TITLE;
public static String MAKE_FIELD_PROTECTED_MARKER_RESOLUTION_TITLE;
public static String ADD_RETENTION_MARKER_RESOLUTION_TITLE;
- public static String CHANGE_RETENTION_MARKER_RESOLUTION_TITLE;
public static String ADD_TARGET_MARKER_RESOLUTION_TITLE;
- public static String CHANGE_TARGET_MARKER_RESOLUTION_TITLE;
public static String ADD_ANNOTATION_MARKER_RESOLUTION_TITLE;
public static String DELETE_ANNOTATION_MARKER_RESOLUTION_TITLE;
public static String CHANGE_ANNOTATION_MARKER_RESOLUTION_TITLE;
Modified:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2011-07-27
19:01:06 UTC (rev 33267)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2011-07-27
19:31:12 UTC (rev 33268)
@@ -88,9 +88,7 @@
MAKE_BEAN_SCOPED_DEPENDENT_MARKER_RESOLUTION_TITLE=Make ''{0}'' bean
scoped @Dependent
MAKE_FIELD_PROTECTED_MARKER_RESOLUTION_TITLE=Make ''{0}'' field
protected
ADD_RETENTION_MARKER_RESOLUTION_TITLE=Add @Retention(RUNTIME) annotation to
''{0}'' class
-CHANGE_RETENTION_MARKER_RESOLUTION_TITLE=Change ''{0}'' annotation to
@Retention(RUNTIME)
ADD_TARGET_MARKER_RESOLUTION_TITLE=Add @Target({0}) annotation to ''{1}''
class
-CHANGE_TARGET_MARKER_RESOLUTION_TITLE=Change ''{0}'' annotation to
@Target({1})
ADD_ANNOTATION_MARKER_RESOLUTION_TITLE=Add @{0} annotation to ''{1}''
{2}
DELETE_ANNOTATION_MARKER_RESOLUTION_TITLE=Delete @{0} annotation from
''{1}'' {2}
CHANGE_ANNOTATION_MARKER_RESOLUTION_TITLE=Change ''{0}'' annotation to
{1}
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-27
19:01:06 UTC (rev 33267)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-07-27
19:31:12 UTC (rev 33268)
@@ -202,7 +202,7 @@
};
}else{
return new IMarkerResolution[] {
- new ChangeRetentionAnnotationMarkerResolution(ta.type, ta.annotation)
+ new ChangeAnnotationMarkerResolution(ta.annotation,
CDIConstants.RETENTION_POLICY_RUNTIME_TYPE_NAME)
};
}
@@ -217,8 +217,8 @@
};
}else{
return new IMarkerResolution[] {
- new ChangeTargetAnnotationMarkerResolution(ta.type, ta.annotation, new
String[]{CDIConstants.ELEMENT_TYPE_TYPE_NAME, CDIConstants.ELEMENT_TYPE_METHOD_NAME,
CDIConstants.ELEMENT_TYPE_FIELD_NAME, CDIConstants.ELEMENT_TYPE_PARAMETER_NAME}),
- new ChangeTargetAnnotationMarkerResolution(ta.type, ta.annotation, new
String[]{CDIConstants.ELEMENT_TYPE_FIELD_NAME, CDIConstants.ELEMENT_TYPE_PARAMETER_NAME})
+ new ChangeAnnotationMarkerResolution(ta.annotation, new
String[]{CDIConstants.ELEMENT_TYPE_TYPE_NAME, CDIConstants.ELEMENT_TYPE_METHOD_NAME,
CDIConstants.ELEMENT_TYPE_FIELD_NAME, CDIConstants.ELEMENT_TYPE_PARAMETER_NAME}),
+ new ChangeAnnotationMarkerResolution(ta.annotation, new
String[]{CDIConstants.ELEMENT_TYPE_FIELD_NAME, CDIConstants.ELEMENT_TYPE_PARAMETER_NAME})
};
}
@@ -236,11 +236,11 @@
};
}else{
return new IMarkerResolution[] {
- new ChangeTargetAnnotationMarkerResolution(ta.type, ta.annotation, new
String[]{CDIConstants.ELEMENT_TYPE_TYPE_NAME, CDIConstants.ELEMENT_TYPE_METHOD_NAME,
CDIConstants.ELEMENT_TYPE_FIELD_NAME}),
- new ChangeTargetAnnotationMarkerResolution(ta.type, ta.annotation, new
String[]{CDIConstants.ELEMENT_TYPE_METHOD_NAME, CDIConstants.ELEMENT_TYPE_FIELD_NAME}),
- new ChangeTargetAnnotationMarkerResolution(ta.type, ta.annotation, new
String[]{CDIConstants.ELEMENT_TYPE_TYPE_NAME}),
- new ChangeTargetAnnotationMarkerResolution(ta.type, ta.annotation, new
String[]{CDIConstants.ELEMENT_TYPE_METHOD_NAME}),
- new ChangeTargetAnnotationMarkerResolution(ta.type, ta.annotation, new
String[]{CDIConstants.ELEMENT_TYPE_FIELD_NAME})
+ new ChangeAnnotationMarkerResolution(ta.annotation, new
String[]{CDIConstants.ELEMENT_TYPE_TYPE_NAME, CDIConstants.ELEMENT_TYPE_METHOD_NAME,
CDIConstants.ELEMENT_TYPE_FIELD_NAME}),
+ new ChangeAnnotationMarkerResolution(ta.annotation, new
String[]{CDIConstants.ELEMENT_TYPE_METHOD_NAME, CDIConstants.ELEMENT_TYPE_FIELD_NAME}),
+ new ChangeAnnotationMarkerResolution(ta.annotation, new
String[]{CDIConstants.ELEMENT_TYPE_TYPE_NAME}),
+ new ChangeAnnotationMarkerResolution(ta.annotation, new
String[]{CDIConstants.ELEMENT_TYPE_METHOD_NAME}),
+ new ChangeAnnotationMarkerResolution(ta.annotation, new
String[]{CDIConstants.ELEMENT_TYPE_FIELD_NAME})
};
}
@@ -254,7 +254,7 @@
};
}else{
return new IMarkerResolution[] {
- new ChangeTargetAnnotationMarkerResolution(ta.type, ta.annotation, new
String[]{CDIConstants.ELEMENT_TYPE_TYPE_NAME, CDIConstants.ELEMENT_TYPE_METHOD_NAME,
CDIConstants.ELEMENT_TYPE_FIELD_NAME})
+ new ChangeAnnotationMarkerResolution(ta.annotation, new
String[]{CDIConstants.ELEMENT_TYPE_TYPE_NAME, CDIConstants.ELEMENT_TYPE_METHOD_NAME,
CDIConstants.ELEMENT_TYPE_FIELD_NAME})
};
}
@@ -364,6 +364,14 @@
new DeleteAnnotationMarkerResolution(ta.type,
CDIConstants.TYPED_ANNOTATION_TYPE_NAME)
};
}
+ }else if(messageId == CDIValidationErrorManager.INTERCEPTOR_ANNOTATED_SPECIALIZES_ID
||
+ messageId == CDIValidationErrorManager.DECORATOR_ANNOTATED_SPECIALIZES_ID){
+ TypeAndAnnotation ta = findTypeAndAnnotation(file, start,
CDIConstants.SPECIALIZES_ANNOTATION_TYPE_NAME);
+ if(ta != null && ta.annotation != null && ta.type != null){
+ return new IMarkerResolution[] {
+ new DeleteAnnotationMarkerResolution(ta.type,
CDIConstants.SPECIALIZES_ANNOTATION_TYPE_NAME)
+ };
+ }
}
}
return new IMarkerResolution[] {};
Deleted:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeRetentionAnnotationMarkerResolution.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeRetentionAnnotationMarkerResolution.java 2011-07-27
19:01:06 UTC (rev 33267)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeRetentionAnnotationMarkerResolution.java 2011-07-27
19:31:12 UTC (rev 33268)
@@ -1,78 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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.ui.marker;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IBuffer;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IMarkerResolution2;
-import org.jboss.tools.cdi.core.CDIConstants;
-import org.jboss.tools.cdi.ui.CDIUIMessages;
-import org.jboss.tools.cdi.ui.CDIUIPlugin;
-
-public class ChangeRetentionAnnotationMarkerResolution implements
- IMarkerResolution2 {
- private String label=null;
- private IType type;
- private IAnnotation annotation;
-
- public ChangeRetentionAnnotationMarkerResolution(IType type, IAnnotation annotation){
- this.type = type;
- this.annotation = annotation;
- try {
- label = NLS.bind(CDIUIMessages.CHANGE_RETENTION_MARKER_RESOLUTION_TITLE,
annotation.getSource());
- } catch (JavaModelException e) {
- CDIUIPlugin.getDefault().logError(e);
- }
- }
-
- public String getLabel() {
- return label;
- }
-
- public void run(IMarker marker) {
- try{
- ICompilationUnit original = type.getCompilationUnit();
- ICompilationUnit compilationUnit = original.getWorkingCopy(new
NullProgressMonitor());
-
- MarkerResolutionUtils.addImport(CDIConstants.RETENTION_ANNOTATION_TYPE_NAME,
compilationUnit);
-
- MarkerResolutionUtils.addImport(CDIConstants.RETENTION_POLICY_RUNTIME_TYPE_NAME,
compilationUnit, true);
-
- IAnnotation workingCopyAnnotation =
MarkerResolutionUtils.findWorkingCopy(compilationUnit, annotation);
-
- IBuffer buffer = compilationUnit.getBuffer();
- String shortName =
MarkerResolutionUtils.getShortName(CDIConstants.RETENTION_ANNOTATION_TYPE_NAME);
-
- buffer.replace(workingCopyAnnotation.getSourceRange().getOffset(),
workingCopyAnnotation.getSourceRange().getLength(),
MarkerResolutionUtils.AT+shortName+"(RUNTIME)");
-
- compilationUnit.commitWorkingCopy(false, new NullProgressMonitor());
- compilationUnit.discardWorkingCopy();
- }catch(CoreException ex){
- CDIUIPlugin.getDefault().logError(ex);
- }
- }
-
- public String getDescription() {
- return label;
- }
-
- public Image getImage() {
- return null;
- }
-}
Deleted:
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeTargetAnnotationMarkerResolution.java
===================================================================
---
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeTargetAnnotationMarkerResolution.java 2011-07-27
19:01:06 UTC (rev 33267)
+++
trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeTargetAnnotationMarkerResolution.java 2011-07-27
19:31:12 UTC (rev 33268)
@@ -1,88 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2011 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.ui.marker;
-
-import org.eclipse.core.resources.IMarker;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.jdt.core.IAnnotation;
-import org.eclipse.jdt.core.IBuffer;
-import org.eclipse.jdt.core.ICompilationUnit;
-import org.eclipse.jdt.core.IType;
-import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.osgi.util.NLS;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.ui.IMarkerResolution2;
-import org.jboss.tools.cdi.core.CDIConstants;
-import org.jboss.tools.cdi.ui.CDIUIMessages;
-import org.jboss.tools.cdi.ui.CDIUIPlugin;
-
-public class ChangeTargetAnnotationMarkerResolution implements
- IMarkerResolution2 {
- private String label=null;
- private IType type;
- private IAnnotation annotation;
- private String[] qualifiedNames;
- private String[] shortNames;
- private String totalList;
-
-
- public ChangeTargetAnnotationMarkerResolution(IType type, IAnnotation annotation,
String[] typeNames){
- this.type = type;
- this.annotation = annotation;
- this.qualifiedNames = typeNames;
- shortNames = MarkerResolutionUtils.getShortNames(qualifiedNames);
- totalList =
MarkerResolutionUtils.OPEN_BRACE+MarkerResolutionUtils.getTotalList(shortNames)+MarkerResolutionUtils.CLOSE_BRACE;
-
- try {
- label = NLS.bind(CDIUIMessages.CHANGE_TARGET_MARKER_RESOLUTION_TITLE,
annotation.getSource(), totalList);
- } catch (JavaModelException e) {
- CDIUIPlugin.getDefault().logError(e);
- }
- }
-
- public String getLabel() {
- return label;
- }
-
- public void run(IMarker marker) {
- try{
- ICompilationUnit original = type.getCompilationUnit();
- ICompilationUnit compilationUnit = original.getWorkingCopy(new
NullProgressMonitor());
-
- MarkerResolutionUtils.addImport(CDIConstants.TARGET_ANNOTATION_TYPE_NAME,
compilationUnit);
-
- for(String qualifiedName : qualifiedNames){
- MarkerResolutionUtils.addImport(qualifiedName, compilationUnit, true);
- }
-
- IAnnotation workingCopyAnnotation =
MarkerResolutionUtils.findWorkingCopy(compilationUnit, annotation);
-
- IBuffer buffer = compilationUnit.getBuffer();
- String shortName =
MarkerResolutionUtils.getShortName(CDIConstants.TARGET_ANNOTATION_TYPE_NAME);
-
- buffer.replace(workingCopyAnnotation.getSourceRange().getOffset(),
workingCopyAnnotation.getSourceRange().getLength(),
MarkerResolutionUtils.AT+shortName+"("+totalList+")");
-
- compilationUnit.commitWorkingCopy(false, new NullProgressMonitor());
- compilationUnit.discardWorkingCopy();
- }catch(CoreException ex){
- CDIUIPlugin.getDefault().logError(ex);
- }
- }
-
- public String getDescription() {
- return label;
- }
-
- public Image getImage() {
- return null;
- }
-}
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator4.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator4.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator4.java 2011-07-27
19:31:12 UTC (rev 33268)
@@ -0,0 +1,17 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.enterprise.inject.Specializes;
+import javax.inject.Inject;
+
+@Decorator
+@Specializes
+public class TestDecorator4 extends 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/TestDecorator4.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator4.qfxresult
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator4.qfxresult
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestDecorator4.qfxresult 2011-07-27
19:31:12 UTC (rev 33268)
@@ -0,0 +1,15 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.decorator.Decorator;
+import javax.decorator.Delegate;
+import javax.inject.Inject;
+
+@Decorator
+public class TestDecorator4 extends 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/TestInterceptor6.java
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor6.java
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor6.java 2011-07-27
19:31:12 UTC (rev 33268)
@@ -0,0 +1,17 @@
+package org.jboss.jsr299.tck.tests.jbt.quickfixes;
+
+import javax.enterprise.inject.Specializes;
+import javax.interceptor.Interceptor;
+
+import org.jboss.jsr299.tck.tests.decorators.interceptor.FooBinding;
+
+@Interceptor
+@FooBinding
+@Specializes
+public class TestInterceptor6 extends TestInterceptor5{
+
+
+ public String produce(){
+ return "a";
+ }
+}
Property changes on:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor6.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added:
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor6.qfxresult
===================================================================
---
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor6.qfxresult
(rev 0)
+++
trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor6.qfxresult 2011-07-27
19:31:12 UTC (rev 33268)
@@ -0,0 +1,15 @@
+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 TestInterceptor6 extends 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-27
19:01:06 UTC (rev 33267)
+++
trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-07-27
19:31:12 UTC (rev 33268)
@@ -33,8 +33,6 @@
import org.jboss.tools.cdi.ui.marker.AddSerializableInterfaceMarkerResolution;
import org.jboss.tools.cdi.ui.marker.AddTargetAnnotationMarkerResolution;
import org.jboss.tools.cdi.ui.marker.ChangeAnnotationMarkerResolution;
-import org.jboss.tools.cdi.ui.marker.ChangeRetentionAnnotationMarkerResolution;
-import org.jboss.tools.cdi.ui.marker.ChangeTargetAnnotationMarkerResolution;
import org.jboss.tools.cdi.ui.marker.DeleteAllDisposerDuplicantMarkerResolution;
import org.jboss.tools.cdi.ui.marker.DeleteAllInjectedConstructorsMarkerResolution;
import org.jboss.tools.cdi.ui.marker.DeleteAnnotationMarkerResolution;
@@ -421,7 +419,7 @@
CDICoreValidator.PROBLEM_TYPE,
CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
CDIValidationErrorManager.MISSING_RETENTION_ANNOTATION_IN_QUALIFIER_TYPE_ID,
- ChangeRetentionAnnotationMarkerResolution.class);
+ ChangeAnnotationMarkerResolution.class);
}
public void testAddRetentionToScopeResolution() throws CoreException{
@@ -449,7 +447,7 @@
CDICoreValidator.PROBLEM_TYPE,
CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
CDIValidationErrorManager.MISSING_RETENTION_ANNOTATION_IN_SCOPE_TYPE_ID,
- ChangeRetentionAnnotationMarkerResolution.class);
+ ChangeAnnotationMarkerResolution.class);
}
public void testAddRetentionToStereotypeResolution() throws CoreException{
@@ -477,7 +475,7 @@
CDICoreValidator.PROBLEM_TYPE,
CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
CDIValidationErrorManager.MISSING_RETENTION_ANNOTATION_IN_STEREOTYPE_TYPE_ID,
- ChangeRetentionAnnotationMarkerResolution.class);
+ ChangeAnnotationMarkerResolution.class);
}
public void testAddTargetToStereotypeResolution() throws CoreException{
@@ -499,7 +497,7 @@
CDICoreValidator.PROBLEM_TYPE,
CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
CDIValidationErrorManager.MISSING_TARGET_ANNOTATION_IN_STEREOTYPE_TYPE_ID,
- ChangeTargetAnnotationMarkerResolution.class);
+ ChangeAnnotationMarkerResolution.class);
}
public void testAddTargetToQualifierResolution() throws CoreException{
@@ -521,7 +519,7 @@
CDICoreValidator.PROBLEM_TYPE,
CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
CDIValidationErrorManager.MISSING_TARGET_ANNOTATION_IN_QUALIFIER_TYPE_ID,
- ChangeTargetAnnotationMarkerResolution.class);
+ ChangeAnnotationMarkerResolution.class);
}
public void testAddTargetToScopeResolution() throws CoreException{
@@ -549,7 +547,7 @@
CDICoreValidator.PROBLEM_TYPE,
CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
CDIValidationErrorManager.MISSING_TARGET_ANNOTATION_IN_SCOPE_TYPE_ID,
- ChangeTargetAnnotationMarkerResolution.class);
+ ChangeAnnotationMarkerResolution.class);
}
public void testAddNonbindingToAnnotationMemberOfQualifierResolution() throws
CoreException{
@@ -799,5 +797,32 @@
CDIValidationErrorManager.STEREOTYPE_IS_ANNOTATED_TYPED_ID,
DeleteAnnotationMarkerResolution.class);
}
-
+
+ public void testSpecializesInDecoratorResolution() throws CoreException{
+ checkResolution(tckProject,
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestDecorator4.java"
+ },
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestDecorator4.qfxresult"
+ },
+ CDICoreValidator.PROBLEM_TYPE,
+ CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
+ CDIValidationErrorManager.DECORATOR_ANNOTATED_SPECIALIZES_ID,
+ DeleteAnnotationMarkerResolution.class);
+ }
+
+ public void testSpecializesInInterceptorResolution() throws CoreException{
+ checkResolution(tckProject,
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestInterceptor6.java"
+ },
+ new String[]{
+ "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestInterceptor6.qfxresult"
+ },
+ CDICoreValidator.PROBLEM_TYPE,
+ CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME,
+ CDIValidationErrorManager.INTERCEPTOR_ANNOTATED_SPECIALIZES_ID,
+ DeleteAnnotationMarkerResolution.class);
+ }
}
\ No newline at end of file