Author: dazarov Date: 2010-12-16 11:22:49 -0500 (Thu, 16 Dec 2010) New Revision: 27555 Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerAnnotationsProcessor.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeletePreviewWizard.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Spider.java trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TimestampLogger_Broken.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 Log: https://issues.jboss.org/browse/JBIDE-7673 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 2010-12-16 16:17:20 UTC (rev 27554) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDICoreValidator.java 2010-12-16 16:22:49 UTC (rev 27555) @@ -850,7 +850,7 @@ for (IBeanMethod disposerMethod : disposerMethods) { Set<ITextSourceReference> disposerDeclarations = CDIUtil.getAnnotationPossitions(disposerMethod, CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME); for (ITextSourceReference declaration : disposerDeclarations) { - addError(CDIValidationMessages.MULTIPLE_DISPOSERS_FOR_PRODUCER, CDIPreferences.MULTIPLE_DISPOSERS_FOR_PRODUCER, declaration, bean.getResource()); + addError(CDIValidationMessages.MULTIPLE_DISPOSERS_FOR_PRODUCER, CDIPreferences.MULTIPLE_DISPOSERS_FOR_PRODUCER, declaration, bean.getResource(), MULTIPLE_DISPOSERS_FOR_PRODUCER_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 2010-12-16 16:17:20 UTC (rev 27554) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/validation/CDIValidationErrorManager.java 2010-12-16 16:22:49 UTC (rev 27555) @@ -22,6 +22,7 @@ public static final int ILLEGAL_PRODUCER_METHOD_IN_SESSION_BEAN_ID = 2; public static final int ILLEGAL_DISPOSER_IN_SESSION_BEAN_ID = 3; public static final int ILLEGAL_OBSERVER_IN_SESSION_BEAN_ID = 4; + public static final int MULTIPLE_DISPOSERS_FOR_PRODUCER_ID = 5; /* * (non-Javadoc) 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 2010-12-16 16:17:20 UTC (rev 27554) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.java 2010-12-16 16:22:49 UTC (rev 27555) @@ -82,6 +82,7 @@ public static String MAKE_METHOD_PUBLIC_MARKER_RESOLUTION_TITLE; public static String MAKE_METHOD_BUSINESS_MARKER_RESOLUTION_TITLE; public static String ADD_LOCAL_BEAN_MARKER_RESOLUTION_TITLE; + public static String DELETE_ALL_DISPOSER_DUPLICANT_MARKER_RESOLUTION_TITLE; public static String CDI_GENERATE_BEANS_XML; public static String CDI_INSTALL_WIZARD_PAGE_FACET; 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 2010-12-16 16:17:20 UTC (rev 27554) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/CDIUIMessages.properties 2010-12-16 16:22:49 UTC (rev 27555) @@ -66,10 +66,11 @@ MAKE_METHOD_PUBLIC_MARKER_RESOLUTION_TITLE=Make ''{0}'' method public MAKE_METHOD_BUSINESS_MARKER_RESOLUTION_TITLE=Add ''{0}'' method to ''{1}'' interface ADD_LOCAL_BEAN_MARKER_RESOLUTION_TITLE=Add @LocalBean annotation to ''{0}'' class +DELETE_ALL_DISPOSER_DUPLICANT_MARKER_RESOLUTION_TITLE=Delete @Disposes annotations from all methods except ''{0}'' method CDI_GENERATE_BEANS_XML=Generate beans.xml file: CDI_INSTALL_WIZARD_PAGE_FACET=Context and Dependency Injection (CDI) Facet -CDI_INSTALL_WIZARD_PAGE_CONFIGURE=Configure Context and Dependency Injection (CDI) Facet Settings>>>>>>> .r27235 +CDI_INSTALL_WIZARD_PAGE_CONFIGURE=Configure Context and Dependency Injection (CDI) Facet Settings NEW_BEANS_XML_WIZARD_TITLE=New beans.xml File NEW_BEANS_XML_WIZARD_PAGE_NAME=beans.xml File 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 2010-12-16 16:17:20 UTC (rev 27554) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2010-12-16 16:22:49 UTC (rev 27555) @@ -93,6 +93,13 @@ return resolutions; } } + }else if (messageId == CDIValidationErrorManager.MULTIPLE_DISPOSERS_FOR_PRODUCER_ID) { + IMethod method = findMethod(file, start); + if(method != null){ + return new IMarkerResolution[] { + new DeleteAllDisposerDuplicantMarkerResolution(method, file) + }; + } } } return new IMarkerResolution[] {}; Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerAnnotationsProcessor.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerAnnotationsProcessor.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerAnnotationsProcessor.java 2010-12-16 16:22:49 UTC (rev 27555) @@ -0,0 +1,190 @@ +/******************************************************************************* + * Copyright (c) 2010 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 java.text.MessageFormat; +import java.util.HashSet; +import java.util.Set; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.jdt.core.IMethod; +import org.eclipse.ltk.core.refactoring.Change; +import org.eclipse.ltk.core.refactoring.CompositeChange; +import org.eclipse.ltk.core.refactoring.RefactoringStatus; +import org.eclipse.ltk.core.refactoring.TextFileChange; +import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; +import org.eclipse.ltk.core.refactoring.participants.RefactoringParticipant; +import org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor; +import org.eclipse.ltk.core.refactoring.participants.SharableParticipants; +import org.eclipse.ltk.internal.core.refactoring.Messages; +import org.eclipse.text.edits.MultiTextEdit; +import org.eclipse.text.edits.ReplaceEdit; +import org.eclipse.text.edits.TextEdit; +import org.jboss.tools.cdi.core.CDIConstants; +import org.jboss.tools.cdi.core.CDICoreMessages; +import org.jboss.tools.cdi.core.CDICoreNature; +import org.jboss.tools.cdi.core.CDICorePlugin; +import org.jboss.tools.cdi.core.CDIUtil; +import org.jboss.tools.cdi.core.IBean; +import org.jboss.tools.cdi.core.IBeanMethod; +import org.jboss.tools.cdi.core.ICDIProject; +import org.jboss.tools.cdi.core.IClassBean; +import org.jboss.tools.cdi.core.IProducer; +import org.jboss.tools.cdi.core.IProducerMethod; +import org.jboss.tools.cdi.ui.CDIUIMessages; +import org.jboss.tools.common.text.ITextSourceReference; + +public class DeleteAllDisposerAnnotationsProcessor extends RefactoringProcessor { + protected static final RefactoringParticipant[] EMPTY_REF_PARTICIPANT = new RefactoringParticipant[0]; + private IFile file; + private IMethod method; + private RefactoringStatus status; + + private CompositeChange rootChange; + private TextFileChange change; + private IClassBean bean; + + + public DeleteAllDisposerAnnotationsProcessor(IFile file, IMethod method){ + this.file = file; + this.method = method; + } + + private IClassBean findClassBean(){ + CDICoreNature cdiNature = CDICorePlugin.getCDI(file.getProject(), true); + if(cdiNature == null) + return null; + + ICDIProject cdiProject = cdiNature.getDelegate(); + + if(cdiProject == null) + return null; + + Set<IBean> beans = cdiProject.getBeans(file.getFullPath()); + + for(IBean bean : beans){ + if(bean instanceof IClassBean) + return (IClassBean)bean; + } + + return null; + } + + private void changeDisposers(IClassBean bean) { + Set<IBeanMethod> disposers = bean.getDisposers(); + if (disposers.isEmpty()) { + return; + } + + Set<IBeanMethod> boundDisposers = new HashSet<IBeanMethod>(); + Set<IProducer> producers = bean.getProducers(); + for (IProducer producer : producers) { + if (producer instanceof IProducerMethod) { + IProducerMethod producerMethod = (IProducerMethod) producer; + Set<IBeanMethod> disposerMethods = producer.getCDIProject().resolveDisposers(producerMethod); + boundDisposers.addAll(disposerMethods); + if (disposerMethods.size() > 1) { + for (IBeanMethod disposerMethod : disposerMethods) { + if(!disposerMethod.getMethod().isSimilar(method)){ + Set<ITextSourceReference> disposerDeclarations = CDIUtil.getAnnotationPossitions(disposerMethod, CDIConstants.DISPOSES_ANNOTATION_TYPE_NAME); + for (ITextSourceReference declaration : disposerDeclarations) { + TextEdit edit = new ReplaceEdit(declaration.getStartPosition(), declaration.getLength(), ""); + change.addEdit(edit); + } + } + } + } + } + } + } + + private boolean isFileCorrect(IFile file){ + if(!file.isSynchronized(IResource.DEPTH_ZERO)){ + status.addFatalError(Messages.format(CDICoreMessages.CDI_RENAME_PROCESSOR_OUT_OF_SYNC_FILE, file.getFullPath().toString())); + return false; + }else if(file.isPhantom()){ + status.addFatalError(Messages.format(CDICoreMessages.CDI_RENAME_PROCESSOR_ERROR_PHANTOM_FILE, file.getFullPath().toString())); + return false; + }else if(file.isReadOnly()){ + status.addFatalError(Messages.format(CDICoreMessages.CDI_RENAME_PROCESSOR_ERROR_READ_ONLY_FILE, file.getFullPath().toString())); + return false; + } + return true; + } + + @Override + public Object[] getElements() { + return null; + } + + @Override + public String getIdentifier() { + return ""; + } + + @Override + public String getProcessorName() { + return MessageFormat.format(CDIUIMessages.DELETE_ALL_DISPOSER_DUPLICANT_MARKER_RESOLUTION_TITLE, new Object[]{method.getElementName()}); + } + + @Override + public boolean isApplicable() throws CoreException { + return true; + } + + @Override + public RefactoringStatus checkInitialConditions(IProgressMonitor pm) + throws CoreException, OperationCanceledException { + status = new RefactoringStatus(); + + if(isFileCorrect(file)){ + bean = findClassBean(); + }else + status.addFatalError("CDI Bean Class not found"); + + return status; + } + + @Override + public RefactoringStatus checkFinalConditions(IProgressMonitor pm, + CheckConditionsContext context) throws CoreException, + OperationCanceledException { + + rootChange = new CompositeChange(MessageFormat.format(CDIUIMessages.DELETE_ALL_DISPOSER_DUPLICANT_MARKER_RESOLUTION_TITLE, new Object[]{method.getElementName()})); + change = new TextFileChange(file.getName(), file); + MultiTextEdit root = new MultiTextEdit(); + change.setEdit(root); + rootChange.add(change); + + if(bean != null) + changeDisposers(bean); + + return status; + } + + @Override + public Change createChange(IProgressMonitor pm) throws CoreException, + OperationCanceledException { + return rootChange; + } + + @Override + public RefactoringParticipant[] loadParticipants(RefactoringStatus status, + SharableParticipants sharedParticipants) throws CoreException { + return EMPTY_REF_PARTICIPANT; + } + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerAnnotationsProcessor.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java 2010-12-16 16:22:49 UTC (rev 27555) @@ -0,0 +1,78 @@ +/******************************************************************************* + * Copyright (c) 2010 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 java.text.MessageFormat; +import java.util.HashSet; +import java.util.Set; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IMarker; +import org.eclipse.jdt.core.IMethod; +import org.eclipse.ltk.core.refactoring.participants.ProcessorBasedRefactoring; +import org.eclipse.ltk.ui.refactoring.RefactoringWizard; +import org.eclipse.ltk.ui.refactoring.RefactoringWizardOpenOperation; +import org.eclipse.swt.graphics.Image; +import org.eclipse.swt.widgets.Shell; +import org.eclipse.ui.IMarkerResolution2; +import org.eclipse.ui.internal.Workbench; +import org.jboss.tools.cdi.core.CDIConstants; +import org.jboss.tools.cdi.core.CDIUtil; +import org.jboss.tools.cdi.core.IBeanMethod; +import org.jboss.tools.cdi.core.IClassBean; +import org.jboss.tools.cdi.core.IProducer; +import org.jboss.tools.cdi.core.IProducerMethod; +import org.jboss.tools.cdi.ui.CDIUIMessages; +import org.jboss.tools.common.text.ITextSourceReference; + +/** + * @author Daniel Azarov + */ +public class DeleteAllDisposerDuplicantMarkerResolution implements IMarkerResolution2 { + private String label; + private IMethod method; + private IFile file; + + public DeleteAllDisposerDuplicantMarkerResolution(IMethod method, IFile file){ + this.label = MessageFormat.format(CDIUIMessages.DELETE_ALL_DISPOSER_DUPLICANT_MARKER_RESOLUTION_TITLE, new Object[]{method.getElementName()}); + this.method = method; + this.file = file; + } + + public String getLabel() { + return label; + } + + + public void run(IMarker marker) { + DeleteAllDisposerAnnotationsProcessor processor = new DeleteAllDisposerAnnotationsProcessor(file, method); + ProcessorBasedRefactoring refactoring = new ProcessorBasedRefactoring(processor); + DeletePreviewWizard wizard = new DeletePreviewWizard(refactoring, RefactoringWizard.WIZARD_BASED_USER_INTERFACE); + RefactoringWizardOpenOperation op = new RefactoringWizardOpenOperation(wizard); + Shell shell = Workbench.getInstance().getActiveWorkbenchWindow().getShell(); + try { + String titleForFailedChecks = CDIUIMessages.CDI_REFACTOR_CONTRIBUTOR_ERROR; + op.run(shell, titleForFailedChecks); + } catch (final InterruptedException irex) { + // operation was canceled + } + + } + + public String getDescription() { + return null; + } + + public Image getImage() { + return null; + } + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeletePreviewWizard.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeletePreviewWizard.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeletePreviewWizard.java 2010-12-16 16:22:49 UTC (rev 27555) @@ -0,0 +1,26 @@ +/******************************************************************************* + * Copyright (c) 2010 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.ltk.core.refactoring.Refactoring; +import org.eclipse.ltk.ui.refactoring.RefactoringWizard; + +public class DeletePreviewWizard extends RefactoringWizard { + + public DeletePreviewWizard(Refactoring refactoring, int flags) { + super(refactoring, flags); + } + + @Override + protected void addUserInputPages() { + } + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeletePreviewWizard.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Spider.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Spider.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Spider.java 2010-12-16 16:22:49 UTC (rev 27555) @@ -0,0 +1,4 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +class Spider { +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/Spider.java ___________________________________________________________________ Name: svn:mime-type + text/plain Added: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TimestampLogger_Broken.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TimestampLogger_Broken.java (rev 0) +++ trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TimestampLogger_Broken.java 2010-12-16 16:22:49 UTC (rev 27555) @@ -0,0 +1,18 @@ +package org.jboss.jsr299.tck.tests.jbt.quickfixes; + +import javax.enterprise.inject.Disposes; +import javax.enterprise.inject.Produces; + +public class TimestampLogger_Broken { + + @Produces + public static Spider getSpider() { + return new Spider(); + } + + public static void destorySpider(@Disposes Spider spider) { + } + + public static void destorySpiderAgain(@Disposes Spider spider) { + } +} \ No newline at end of file Property changes on: trunk/cdi/tests/org.jboss.tools.cdi.core.test/resources/tck/tests/jbt/quickfixes/TimestampLogger_Broken.java ___________________________________________________________________ Name: svn:mime-type + text/plain