Author: dazarov Date: 2011-07-20 18:58:24 -0400 (Wed, 20 Jul 2011) New Revision: 33086 Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddNonbindingAnnotationMarkerResolution.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AAnnotation.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor1.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor1.qfxresult trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor2.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor2.qfxresult trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier5.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier5.qfxresult trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier6.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier6.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/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/AddRetentionAnnotationMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddTargetAnnotationMarkerResolution.java 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/ChangeRetentionAnnotationMarkerResolution.java 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/MakeInjectedPointUnambiguousMarkerResolution.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/marker/SelectBeanMarkerResolution.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-7641 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-20 22:49:54 UTC (rev 33085) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2011-07-20 22:58:24 UTC (rev 33086) @@ -2319,7 +2319,13 @@ * 9.5.2. Interceptor binding types with members * array-valued or annotation-valued member of an interceptor binding type is not annotated @Nonbinding (Non-Portable behavior) */ - validateAnnotationMembers(binding, CDIValidationMessages.MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER, CDIValidationMessages.MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER, CDIPreferences.MISSING_NONBINDING_IN_INTERCEPTOR_BINDING_TYPE_MEMBER); + validateAnnotationMembers( + binding, + CDIValidationMessages.MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER, + CDIValidationMessages.MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER, + CDIPreferences.MISSING_NONBINDING_IN_INTERCEPTOR_BINDING_TYPE_MEMBER, + MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER_ID, + MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER_ID); try { annotationValidator.validateInterceptorBindingAnnotationTypeAnnotations(binding); @@ -2345,7 +2351,13 @@ * 5.2.5. Qualifier annotations with members * - array-valued or annotation-valued member of a qualifier type is not annotated @Nonbinding (Non-Portable behavior) */ - validateAnnotationMembers(qualifier, CDIValidationMessages.MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_QUALIFIER_TYPE_MEMBER, CDIValidationMessages.MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_QUALIFIER_TYPE_MEMBER, CDIPreferences.MISSING_NONBINDING_IN_QUALIFIER_TYPE_MEMBER); + validateAnnotationMembers( + qualifier, + CDIValidationMessages.MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_QUALIFIER_TYPE_MEMBER, + CDIValidationMessages.MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_QUALIFIER_TYPE_MEMBER, + CDIPreferences.MISSING_NONBINDING_IN_QUALIFIER_TYPE_MEMBER, + MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_QUALIFIER_TYPE_MEMBER_ID, + MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_QUALIFIER_TYPE_MEMBER_ID); /* * Qualifier annotation type should be annotated with @Target({METHOD, FIELD, PARAMETER, TYPE}) @@ -2357,7 +2369,7 @@ } } - void validateAnnotationMembers(ICDIAnnotation annotation, String arrayMessageErrorKey, String annotationValueErrorKey, String preferencesKey) { + void validateAnnotationMembers(ICDIAnnotation annotation, String arrayMessageErrorKey, String annotationValueErrorKey, String preferencesKey, int arrayMessageId, int annotationValueId) { IType type = annotation.getSourceType(); try { IMethod[] methods = type.getMethods(); @@ -2367,7 +2379,7 @@ if(kind == Signature.ARRAY_TYPE_SIGNATURE) { if(!annotation.getNonBindingMethods().contains(method)) { ITextSourceReference reference = CDIUtil.convertToSourceReference(method.getNameRange(), annotation.getResource()); - addError(arrayMessageErrorKey, preferencesKey, reference, annotation.getResource()); + addError(arrayMessageErrorKey, preferencesKey, reference, annotation.getResource(), arrayMessageId); } } else if(kind == Signature.CLASS_TYPE_SIGNATURE) { String typeName = Signature.getSignatureSimpleName(returnTypeSignature); @@ -2382,7 +2394,7 @@ if(memberType!=null && memberType.isAnnotation()) { if(!annotation.getNonBindingMethods().contains(method)) { ITextSourceReference reference = CDIUtil.convertToSourceReference(method.getNameRange(), annotation.getResource()); - addError(annotationValueErrorKey, preferencesKey, reference, annotation.getResource()); + addError(annotationValueErrorKey, preferencesKey, reference, annotation.getResource(), annotationValueId); } } } 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-20 22:49:54 UTC (rev 33085) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java 2011-07-20 22:58:24 UTC (rev 33086) @@ -35,7 +35,12 @@ public static final int MISSING_TARGET_ANNOTATION_IN_QUALIFIER_TYPE_ID = 14; public static final int MISSING_TARGET_ANNOTATION_IN_STEREOTYPE_TYPE_ID = 15; public static final int MISSING_TARGET_ANNOTATION_IN_SCOPE_TYPE_ID = 16; + public static final int MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_QUALIFIER_TYPE_MEMBER_ID = 17; + public static final int MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_QUALIFIER_TYPE_MEMBER_ID = 18; + public static final int MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER_ID = 19; + public static final int MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER_ID = 20; + /* * (non-Javadoc) * @see org.jboss.tools.jst.web.kb.internal.validation.ValidationErrorManager#getPreference(org.eclipse.core.resources.IProject, java.lang.String) 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-20 22:49:54 UTC (rev 33085) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java 2011-07-20 22:58:24 UTC (rev 33086) @@ -107,6 +107,7 @@ 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_NONBINDING_MARKER_RESOLUTION_TITLE; public static String QUESTION; public static String DECREASING_FIELD_VISIBILITY_MAY_CAUSE_COMPILATION_PROBLEMS; 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-20 22:49:54 UTC (rev 33085) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2011-07-20 22:58:24 UTC (rev 33086) @@ -91,6 +91,7 @@ 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_NONBINDING_MARKER_RESOLUTION_TITLE=Add @Nonbinding annotation to ''{0}'' member QUESTION=Question DECREASING_FIELD_VISIBILITY_MAY_CAUSE_COMPILATION_PROBLEMS=Decreasing field visibility may cause compilation problems. Do you want to continue? Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddNonbindingAnnotationMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddNonbindingAnnotationMarkerResolution.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddNonbindingAnnotationMarkerResolution.java 2011-07-20 22:58:24 UTC (rev 33086) @@ -0,0 +1,60 @@ +/******************************************************************************* + * 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.ICompilationUnit; +import org.eclipse.jdt.core.IMember; +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 AddNonbindingAnnotationMarkerResolution implements + IMarkerResolution2 { + private IMember member; + private String label; + + public AddNonbindingAnnotationMarkerResolution(IMember member){ + this.member = member; + label = NLS.bind(CDIUIMessages.ADD_NONBINDING_MARKER_RESOLUTION_TITLE, member.getElementName()); + } + + public String getLabel() { + return label; + } + + public void run(IMarker marker) { + try{ + ICompilationUnit original = member.getCompilationUnit(); + ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor()); + + MarkerResolutionUtils.addAnnotation(CDIConstants.NON_BINDING_ANNOTATION_TYPE_NAME, compilationUnit, member); + + compilationUnit.commitWorkingCopy(false, new NullProgressMonitor()); + compilationUnit.discardWorkingCopy(); + }catch(CoreException ex){ + CDIUIPlugin.getDefault().logError(ex); + } + } + + public String getDescription() { + return label; + } + + public Image getImage() { + return null; + } +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddNonbindingAnnotationMarkerResolution.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddRetentionAnnotationMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddRetentionAnnotationMarkerResolution.java 2011-07-20 22:49:54 UTC (rev 33085) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddRetentionAnnotationMarkerResolution.java 2011-07-20 22:58:24 UTC (rev 33086) @@ -15,7 +15,6 @@ import org.eclipse.core.runtime.NullProgressMonitor; 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; @@ -44,10 +43,8 @@ MarkerResolutionUtils.addImport(CDIConstants.RETENTION_POLICY_RUNTIME_TYPE_NAME, compilationUnit, true); - IType workingCopyType = MarkerResolutionUtils.findWorkingCopyType(compilationUnit, type); + MarkerResolutionUtils.addAnnotation(CDIConstants.RETENTION_ANNOTATION_TYPE_NAME, compilationUnit, type, "(RUNTIME)"); - MarkerResolutionUtils.addAnnotation(CDIConstants.RETENTION_ANNOTATION_TYPE_NAME, compilationUnit, workingCopyType, "(RUNTIME)"); - compilationUnit.commitWorkingCopy(false, new NullProgressMonitor()); compilationUnit.discardWorkingCopy(); }catch(CoreException ex){ Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddTargetAnnotationMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddTargetAnnotationMarkerResolution.java 2011-07-20 22:49:54 UTC (rev 33085) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddTargetAnnotationMarkerResolution.java 2011-07-20 22:58:24 UTC (rev 33086) @@ -51,10 +51,8 @@ MarkerResolutionUtils.addImport(qualifiedName, compilationUnit, true); } - IType workingCopyType = MarkerResolutionUtils.findWorkingCopyType(compilationUnit, type); + MarkerResolutionUtils.addAnnotation(CDIConstants.TARGET_ANNOTATION_TYPE_NAME, compilationUnit, type, "("+totalList+")"); - MarkerResolutionUtils.addAnnotation(CDIConstants.TARGET_ANNOTATION_TYPE_NAME, compilationUnit, workingCopyType, "("+totalList+")"); - compilationUnit.commitWorkingCopy(false, new NullProgressMonitor()); compilationUnit.discardWorkingCopy(); }catch(CoreException ex){ 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-20 22:49:54 UTC (rev 33085) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-07-20 22:58:24 UTC (rev 33086) @@ -23,6 +23,7 @@ import org.eclipse.jdt.core.ICompilationUnit; import org.eclipse.jdt.core.IField; import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IMember; import org.eclipse.jdt.core.IMethod; import org.eclipse.jdt.core.IType; import org.eclipse.jdt.core.JavaModelException; @@ -256,6 +257,16 @@ } } + }else if(messageId == CDIValidationErrorManager.MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER_ID || + messageId == CDIValidationErrorManager.MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_QUALIFIER_TYPE_MEMBER_ID || + messageId == CDIValidationErrorManager.MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER_ID || + messageId == CDIValidationErrorManager.MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_QUALIFIER_TYPE_MEMBER_ID){ + IJavaElement element = findJavaElement(file, start); + if(element instanceof IMember){ + return new IMarkerResolution[] { + new AddNonbindingAnnotationMarkerResolution((IMember)element) + }; + } } } return new IMarkerResolution[] {}; Modified: 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-20 22:49:54 UTC (rev 33085) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeRetentionAnnotationMarkerResolution.java 2011-07-20 22:58:24 UTC (rev 33086) @@ -52,12 +52,11 @@ MarkerResolutionUtils.addImport(CDIConstants.RETENTION_POLICY_RUNTIME_TYPE_NAME, compilationUnit, true); - IAnnotation workingCopyAnnotation = MarkerResolutionUtils.findWorkingCopyAnnotation(compilationUnit, type, annotation); + 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()); Modified: 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-20 22:49:54 UTC (rev 33085) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeTargetAnnotationMarkerResolution.java 2011-07-20 22:58:24 UTC (rev 33086) @@ -62,7 +62,7 @@ MarkerResolutionUtils.addImport(qualifiedName, compilationUnit, true); } - IAnnotation workingCopyAnnotation = MarkerResolutionUtils.findWorkingCopyAnnotation(compilationUnit, type, annotation); + IAnnotation workingCopyAnnotation = MarkerResolutionUtils.findWorkingCopy(compilationUnit, annotation); IBuffer buffer = compilationUnit.getBuffer(); String shortName = MarkerResolutionUtils.getShortName(CDIConstants.TARGET_ANNOTATION_TYPE_NAME); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java 2011-07-20 22:49:54 UTC (rev 33085) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java 2011-07-20 22:58:24 UTC (rev 33086) @@ -111,7 +111,7 @@ } } - MarkerResolutionUtils.addQualifiersToInjectedPoint(injectionPoint, selectedBean); + MarkerResolutionUtils.addQualifiersToInjectionPoint(injectionPoint, selectedBean); } private boolean checkBeans(){ 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-07-20 22:49:54 UTC (rev 33085) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-07-20 22:58:24 UTC (rev 33086) @@ -37,7 +37,6 @@ import org.eclipse.jdt.core.ITypeParameter; import org.eclipse.jdt.core.JavaModelException; import org.eclipse.jdt.core.Signature; -import org.eclipse.jdt.core.SourceRange; import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IInjectionPoint; @@ -158,27 +157,37 @@ return false; } - public static void addAnnotation(String qualifiedName, ICompilationUnit compilationUnit, IType element) throws JavaModelException{ + public static void addAnnotation(String qualifiedName, ICompilationUnit compilationUnit, IMember element) throws JavaModelException{ addAnnotation(qualifiedName, compilationUnit, element, ""); } - public static void addAnnotation(String qualifiedName, ICompilationUnit compilationUnit, IType element, String params) throws JavaModelException{ - IAnnotation annotation = getAnnotation(element, qualifiedName); + public static void addAnnotation(String qualifiedName, ICompilationUnit compilationUnit, IMember element, String params) throws JavaModelException{ + IMember workingCopyMember = findWorkingCopy(compilationUnit, element); + if(workingCopyMember == null) + return; + + IAnnotation annotation = getAnnotation(workingCopyMember, qualifiedName); if(annotation != null && annotation.exists()) return; boolean duplicateShortName = addImport(qualifiedName, compilationUnit); - String lineDelim = compilationUnit.findRecommendedLineSeparator(); - IBuffer buffer = compilationUnit.getBuffer(); String shortName = getShortName(qualifiedName); if(duplicateShortName) shortName = qualifiedName; - buffer.replace(element.getSourceRange().getOffset(), 0, AT+shortName+params+lineDelim); + String str = AT+shortName+params; + if(workingCopyMember instanceof IType){ + str += compilationUnit.findRecommendedLineSeparator(); + }else{ + str += SPACE; + } + + buffer.replace(workingCopyMember.getSourceRange().getOffset(), 0, str); + synchronized(compilationUnit) { compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null); } @@ -358,7 +367,7 @@ for(ILocalVariable parameter : method.getParameters()){ if(parameter.getElementName().equals(paramName)){ - return new SourceRange(parameter.getSourceRange().getOffset(), parameter.getSourceRange().getLength()); + return parameter.getSourceRange(); } } }catch(JavaModelException ex){ @@ -367,7 +376,7 @@ return null; } - public static void addQualifiersToInjectedPoint(IInjectionPoint injectionPoint, IBean bean){ + public static void addQualifiersToInjectionPoint(IInjectionPoint injectionPoint, IBean bean){ try{ ICompilationUnit original = injectionPoint.getClassBean().getBeanClass().getCompilationUnit(); ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor()); @@ -407,15 +416,12 @@ ICompilationUnit original = EclipseUtil.getCompilationUnit(file); ICompilationUnit compilationUnit = original.getWorkingCopy(new NullProgressMonitor()); - IType type = compilationUnit.findPrimaryType(); - if(type != null){ - for(IQualifier qualifier : deployed){ - String qualifierName = qualifier.getSourceType().getFullyQualifiedName(); - if(!qualifierName.equals(CDIConstants.ANY_QUALIFIER_TYPE_NAME) && !qualifierName.equals(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)){ - MarkerResolutionUtils.addAnnotation(qualifier.getSourceType().getFullyQualifiedName(), compilationUnit, type); - } - + for(IQualifier qualifier : deployed){ + String qualifierName = qualifier.getSourceType().getFullyQualifiedName(); + if(!qualifierName.equals(CDIConstants.ANY_QUALIFIER_TYPE_NAME) && !qualifierName.equals(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)){ + MarkerResolutionUtils.addAnnotation(qualifier.getSourceType().getFullyQualifiedName(), compilationUnit, bean.getBeanClass()); } + } compilationUnit.commitWorkingCopy(false, new NullProgressMonitor()); @@ -485,20 +491,26 @@ return null; } - public static IType findWorkingCopyType(ICompilationUnit compilationUnit, IType type) throws JavaModelException{ - for(IType t : compilationUnit.getAllTypes()){ - if(t.getFullyQualifiedName().equals(type.getFullyQualifiedName())) - return t; + @SuppressWarnings("unchecked") + public static <T extends IJavaElement> T findWorkingCopy(ICompilationUnit compilationUnit, T element) throws JavaModelException{ + if(element instanceof IAnnotation){ + IJavaElement parent = findWorkingCopy(compilationUnit, element.getParent()); + if(parent instanceof IAnnotatable){ + for(IAnnotation a : ((IAnnotatable)parent).getAnnotations()){ + if(a.getElementName().equals(element.getElementName())) + return (T)a; + } + } + }else{ + IJavaElement[] elements = compilationUnit.findElements(element); + if(elements != null){ + for(IJavaElement e : elements){ + if(e.getClass().equals(element.getClass())) + return (T)e; + } + } } return null; } - public static IAnnotation findWorkingCopyAnnotation(ICompilationUnit compilationUnit, IType type, IAnnotation annotation) throws JavaModelException{ - IType workingCopyType = findWorkingCopyType(compilationUnit, type); - for(IAnnotation a : workingCopyType.getAnnotations()){ - if(a.getElementName().equals(annotation.getElementName())) - return a; - } - return null; - } } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java 2011-07-20 22:49:54 UTC (rev 33085) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java 2011-07-20 22:58:24 UTC (rev 33086) @@ -110,7 +110,7 @@ break; } } - MarkerResolutionUtils.addQualifiersToInjectedPoint(injectionPoint, selectedBean); + MarkerResolutionUtils.addQualifiersToInjectionPoint(injectionPoint, selectedBean); } public String getDescription() { Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AAnnotation.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AAnnotation.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AAnnotation.java 2011-07-20 22:58:24 UTC (rev 33086) @@ -0,0 +1,5 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +@interface AAnnotation { + +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/AAnnotation.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor1.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor1.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor1.java 2011-07-20 22:58:24 UTC (rev 33086) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.interceptor.InterceptorBinding; + +@Inherited +@InterceptorBinding +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +public @interface TestInterceptor1 { + AAnnotation abc(); +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor1.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor1.qfxresult =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor1.qfxresult (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor1.qfxresult 2011-07-20 22:58:24 UTC (rev 33086) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.interceptor.InterceptorBinding; +import javax.enterprise.util.Nonbinding; + +@Inherited +@InterceptorBinding +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +public @interface TestInterceptor1 { + @Nonbinding AAnnotation abc(); +} Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor2.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor2.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor2.java 2011-07-20 22:58:24 UTC (rev 33086) @@ -0,0 +1,19 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.interceptor.InterceptorBinding; + +@Inherited +@InterceptorBinding +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +public @interface TestInterceptor2 { + String[] abc(); +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor2.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor2.qfxresult =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor2.qfxresult (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestInterceptor2.qfxresult 2011-07-20 22:58:24 UTC (rev 33086) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +import javax.interceptor.InterceptorBinding; +import javax.enterprise.util.Nonbinding; + +@Inherited +@InterceptorBinding +@Target( { TYPE, METHOD }) +@Retention(RUNTIME) +public @interface TestInterceptor2 { + @Nonbinding String[] abc(); +} Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier5.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier5.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier5.java 2011-07-20 22:58:24 UTC (rev 33086) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import java.lang.annotation.Documented; +import java.lang.annotation.Target; + +import javax.inject.Qualifier; + +import java.lang.annotation.Retention; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; + +@Retention(RUNTIME) +@Target({TYPE, METHOD, FIELD, PARAMETER}) +@Documented +@Qualifier +public @interface TestQualifier5 { + AAnnotation abc(); +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier5.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier5.qfxresult =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier5.qfxresult (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier5.qfxresult 2011-07-20 22:58:24 UTC (rev 33086) @@ -0,0 +1,22 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import java.lang.annotation.Documented; +import java.lang.annotation.Target; + +import javax.inject.Qualifier; + +import java.lang.annotation.Retention; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import javax.enterprise.util.Nonbinding; + +@Retention(RUNTIME) +@Target({TYPE, METHOD, FIELD, PARAMETER}) +@Documented +@Qualifier +public @interface TestQualifier5 { + @Nonbinding AAnnotation abc(); +} Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier6.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier6.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier6.java 2011-07-20 22:58:24 UTC (rev 33086) @@ -0,0 +1,20 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import java.lang.annotation.Documented; +import java.lang.annotation.Target; + +import javax.inject.Qualifier; +import java.lang.annotation.Retention; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; + +@Retention(RUNTIME) +@Target({TYPE, METHOD, FIELD, PARAMETER}) +@Documented +@Qualifier +public @interface TestQualifier6 { + String[] abc(); +} Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier6.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier6.qfxresult =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier6.qfxresult (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TestQualifier6.qfxresult 2011-07-20 22:58:24 UTC (rev 33086) @@ -0,0 +1,21 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import java.lang.annotation.Documented; +import java.lang.annotation.Target; + +import javax.inject.Qualifier; +import java.lang.annotation.Retention; +import static java.lang.annotation.RetentionPolicy.RUNTIME; +import static java.lang.annotation.ElementType.TYPE; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.PARAMETER; +import javax.enterprise.util.Nonbinding; + +@Retention(RUNTIME) +@Target({TYPE, METHOD, FIELD, PARAMETER}) +@Documented +@Qualifier +public @interface TestQualifier6 { + @Nonbinding String[] abc(); +} 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-20 22:49:54 UTC (rev 33085) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/marker/CDIMarkerResolutionTest.java 2011-07-20 22:58:24 UTC (rev 33086) @@ -28,6 +28,7 @@ import org.jboss.tools.cdi.internal.core.validation.CDICoreValidator; import org.jboss.tools.cdi.internal.core.validation.CDIValidationErrorManager; import org.jboss.tools.cdi.ui.marker.AddLocalBeanMarkerResolution; +import org.jboss.tools.cdi.ui.marker.AddNonbindingAnnotationMarkerResolution; import org.jboss.tools.cdi.ui.marker.AddRetentionAnnotationMarkerResolution; import org.jboss.tools.cdi.ui.marker.AddSerializableInterfaceMarkerResolution; import org.jboss.tools.cdi.ui.marker.AddTargetAnnotationMarkerResolution; @@ -548,5 +549,61 @@ CDIValidationErrorManager.MISSING_TARGET_ANNOTATION_IN_SCOPE_TYPE_ID, ChangeTargetAnnotationMarkerResolution.class); } + + public void testAddNonbindingToAnnotationMemberOfQualifierResolution() throws CoreException{ + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestQualifier5.java" + }, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestQualifier5.qfxresult" + }, + CDICoreValidator.PROBLEM_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_QUALIFIER_TYPE_MEMBER_ID, + AddNonbindingAnnotationMarkerResolution.class); + } + public void testAddNonbindingToArrayMemberOfQualifierResolution() throws CoreException{ + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestQualifier6.java" + }, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestQualifier6.qfxresult" + }, + CDICoreValidator.PROBLEM_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_QUALIFIER_TYPE_MEMBER_ID, + AddNonbindingAnnotationMarkerResolution.class); + } + + public void testAddNonbindingToAnnotationMemberOfInterceptorResolution() throws CoreException{ + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestInterceptor1.java" + }, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestInterceptor1.qfxresult" + }, + CDICoreValidator.PROBLEM_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.MISSING_NONBINDING_FOR_ANNOTATION_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER_ID, + AddNonbindingAnnotationMarkerResolution.class); + } + + public void testAddNonbindingToArrayMemberOfInterceptorResolution() throws CoreException{ + checkResolution(tckProject, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestInterceptor2.java" + }, + new String[]{ + "JavaSource/org/jboss/jsr299/tck/tests/jbt/quickfixes/TestInterceptor2.qfxresult" + }, + CDICoreValidator.PROBLEM_TYPE, + CDIValidationErrorManager.MESSAGE_ID_ATTRIBUTE_NAME, + CDIValidationErrorManager.MISSING_NONBINDING_FOR_ARRAY_VALUE_IN_INTERCEPTOR_BINDING_TYPE_MEMBER_ID, + AddNonbindingAnnotationMarkerResolution.class); + } + } \ No newline at end of file