Author: dazarov Date: 2011-11-29 16:12:26 -0500 (Tue, 29 Nov 2011) New Revision: 36748 Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/AddQualifiersToBeanProcessor.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIRefactoringProcessor.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/DeleteAllDisposerAnnotationsProcessor.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/DeleteAllInjectedConstructorsProcessor.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/MarkerResolutionUtils.java trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java Removed: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddQualifiersToBeanProcessor.java 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/DeleteAllInjectedConstructorsProcessor.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/refactoring/CDIRefactoringProcessor.java Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlinkDetector.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddAnnotationMarkerResolution.java 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/AddSerializableInterfaceMarkerResolution.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/ChangeAnnotationMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CreateCDIElementMarkerResolution.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/DeleteAllInjectedConstructorsMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAnnotationMarkerResolution.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.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/MakeMethodBusinessMarkerResolution.java 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/wizard/AbstractModifyInjectionPointWizard.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AddQualifiersToBeanWizard.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AddQualifiersToBeanWizardPage.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectBeanWizard.java trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/AddQualifiersToBeanWizardTest.java Log: Quickfix and Wizard for fixing ambigious injection warning is confusing https://issues.jboss.org/browse/JBIDE-9940 Copied: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/AddQualifiersToBeanProcessor.java (from rev 36738, trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddQualifiersToBeanProcessor.java) =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/AddQualifiersToBeanProcessor.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/AddQualifiersToBeanProcessor.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -0,0 +1,169 @@ +/******************************************************************************* + * 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.internal.core.refactoring; + +import java.util.ArrayList; +import java.util.List; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IProject; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.IJavaProject; +import org.eclipse.jdt.core.JavaCore; +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.text.edits.MultiTextEdit; +import org.jboss.tools.cdi.core.CDICoreMessages; +import org.jboss.tools.cdi.core.IBean; +import org.jboss.tools.cdi.core.IInjectionPoint; +import org.jboss.tools.common.EclipseUtil; + +public class AddQualifiersToBeanProcessor extends CDIRefactoringProcessor { + protected IBean selectedBean; + protected IInjectionPoint injectionPoint; + protected List<IBean> beans; + protected ArrayList<ValuedQualifier> qualifiers; + + public AddQualifiersToBeanProcessor(String label, IInjectionPoint injectionPoint, List<IBean> beans, IBean bean) { + super(label); + this.selectedBean = bean; + this.injectionPoint = injectionPoint; + this.beans = beans; + } + + @Override + public RefactoringStatus checkInitialConditions(IProgressMonitor pm) + throws CoreException, OperationCanceledException { + status = new RefactoringStatus(); + + if(injectionPoint == null){ + status.addFatalError(CDICoreMessages.CDI_RENAME_PROCESSOR_ERROR_INJECTION_POINT_NOT_FOUND); + return status; + } + + IFile injectionPointFile = (IFile)injectionPoint.getClassBean().getResource(); + + isFileCorrect(injectionPointFile); + + return status; + } + + @Override + public RefactoringStatus checkFinalConditions(IProgressMonitor pm, + CheckConditionsContext context) throws CoreException, + OperationCanceledException { + + if(selectedBean == null){ + status.addFatalError(CDICoreMessages.CDI_RENAME_PROCESSOR_ERROR_BEAN_NOT_FOUND); + return status; + } + + IFile beanFile = (IFile)selectedBean.getBeanClass().getResource(); + + if(!isFileCorrect(beanFile)){ + return status; + } + return status; + } + + private ICompilationUnit getCompilationUnit(IFile file) throws CoreException{ + IProject project = file.getProject(); + IJavaProject javaProject = (IJavaProject)project.getNature(JavaCore.NATURE_ID); + IJavaElement element = javaProject.findElement(file.getProjectRelativePath()); + if(element instanceof ICompilationUnit) + return (ICompilationUnit)element; + + return null; + } + + @Override + public Change createChange(IProgressMonitor pm) throws CoreException, + OperationCanceledException { + rootChange = new CompositeChange(label); + + IFile file = (IFile)selectedBean.getBeanClass().getResource(); + ICompilationUnit original = EclipseUtil.getCompilationUnit(file); + + ICompilationUnit compilationUnit = original.getWorkingCopy(pm); + + TextFileChange fileChange = new CDIFileChange(file.getName(), file); + if(getEditor(file) != null) + fileChange.setSaveMode(TextFileChange.LEAVE_DIRTY); + else + fileChange.setSaveMode(TextFileChange.FORCE_SAVE); + + MultiTextEdit edit = new MultiTextEdit(); + + MarkerResolutionUtils.addQualifiersToBean(qualifiers, selectedBean, compilationUnit, edit); + + IFile file2 = (IFile)injectionPoint.getClassBean().getResource(); + ICompilationUnit original2 = injectionPoint.getClassBean().getBeanClass().getCompilationUnit(); + ICompilationUnit compilationUnit2 = original2.getWorkingCopy(pm); + + if(!original.equals(original2)){ + compilationUnit.discardWorkingCopy(); + if(edit.getChildrenSize() > 0){ + fileChange.setEdit(edit); + rootChange.add(fileChange); + } + fileChange = new CDIFileChange(file2.getName(), file2); + if(getEditor(file2) != null) + fileChange.setSaveMode(TextFileChange.LEAVE_DIRTY); + else + fileChange.setSaveMode(TextFileChange.FORCE_SAVE); + + edit = new MultiTextEdit(); + }else{ + compilationUnit2 = compilationUnit; + } + + MarkerResolutionUtils.addQualifiersToInjectionPoint(qualifiers, injectionPoint, compilationUnit2, edit); + + if(edit.getChildrenSize() > 0){ + fileChange.setEdit(edit); + rootChange.add(fileChange); + } + compilationUnit.discardWorkingCopy(); + return rootChange; + } + + protected void createRootChange(){ + + } + + public IBean getSelectedBean(){ + return selectedBean; + } + + public IInjectionPoint getInjectionPoint(){ + return injectionPoint; + } + + public List<IBean> getBeans(){ + return beans; + } + + public void setSelectedBean(IBean bean){ + selectedBean = bean; + } + + public void setDeployedQualifiers(ArrayList<ValuedQualifier> qualifiers){ + this.qualifiers = qualifiers; + } + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/AddQualifiersToBeanProcessor.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIRefactoringProcessor.java (from rev 36744, trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/refactoring/CDIRefactoringProcessor.java) =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIRefactoringProcessor.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIRefactoringProcessor.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -0,0 +1,193 @@ +/******************************************************************************* + * 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.internal.core.refactoring; + +import java.util.Set; + +import org.eclipse.core.resources.IFile; +import org.eclipse.core.resources.IResource; +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.IProgressMonitor; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.core.runtime.OperationCanceledException; +import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility; +import org.eclipse.jface.text.IDocument; +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.RefactoringParticipant; +import org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor; +import org.eclipse.ltk.core.refactoring.participants.SharableParticipants; +import org.eclipse.osgi.util.NLS; +import org.eclipse.swt.widgets.Display; +import org.eclipse.text.edits.MultiTextEdit; +import org.eclipse.ui.IEditorInput; +import org.eclipse.ui.IEditorPart; +import org.eclipse.ui.IWorkbenchWindow; +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.IBean; +import org.jboss.tools.cdi.core.ICDIProject; +import org.jboss.tools.cdi.core.IClassBean; + +public abstract class CDIRefactoringProcessor extends RefactoringProcessor { + protected static final RefactoringParticipant[] EMPTY_REF_PARTICIPANT = new RefactoringParticipant[0]; + protected IFile file; + protected RefactoringStatus status; + protected String label; + + protected CompositeChange rootChange; + protected TextFileChange change; + protected IClassBean bean; + + + public CDIRefactoringProcessor(IFile file, String label){ + this(label); + this.file = file; + } + + public CDIRefactoringProcessor(String label){ + this.label = label; + } + + protected void createRootChange(){ + rootChange = new CompositeChange(label); + change = new CDIFileChange(file.getName(), file); + + if(getEditor(file) != null) + change.setSaveMode(TextFileChange.LEAVE_DIRTY); + else + change.setSaveMode(TextFileChange.FORCE_SAVE); + + MultiTextEdit root = new MultiTextEdit(); + change.setEdit(root); + rootChange.add(change); + rootChange.markAsSynthetic(); + } + + protected IEditorPart getEditor(IFile file){ + IEditorInput ii = EditorUtility.getEditorInput(file); + + IWorkbenchWindow[] windows = CDICorePlugin.getDefault().getWorkbench().getWorkbenchWindows(); + for(IWorkbenchWindow window : windows){ + IEditorPart editor = window.getActivePage().findEditor(ii); + if(editor != null) + return editor; + } + return null; + } + + 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; + } + + protected boolean isFileCorrect(IFile file){ + if(file == null){ + status.addFatalError(CDICoreMessages.CDI_RENAME_PROCESSOR_ERROR_FILE_NOT_FOUND); + return false; + }else if(!file.isSynchronized(IResource.DEPTH_ZERO)){ + status.addFatalError(NLS.bind(CDICoreMessages.CDI_RENAME_PROCESSOR_ERROR_OUT_OF_SYNC_PROJECT, file.getProject().getFullPath().toString())); + return false; + }else if(file.isPhantom()){ + status.addFatalError(NLS.bind(CDICoreMessages.CDI_RENAME_PROCESSOR_ERROR_PHANTOM_FILE, file.getFullPath().toString())); + return false; + }else if(file.isReadOnly()){ + status.addFatalError(NLS.bind(CDICoreMessages.CDI_RENAME_PROCESSOR_ERROR_READ_ONLY_FILE, file.getFullPath().toString())); + return false; + } + return true; + } + + @Override + public Object[] getElements() { + return new Object[]{file}; + } + + @Override + public String getIdentifier() { + return ""; + } + + @Override + public String getProcessorName() { + return label; + } + + @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(CDICoreMessages.CDI_RENAME_PROCESSOR_ERROR_BEAN_NOT_FOUND); + + 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; + } + + protected class CDIFileChange extends TextFileChange{ + + public CDIFileChange(String name, IFile file) { + super(name, file); + } + + @Override + protected void releaseDocument(final IDocument document, IProgressMonitor pm) + throws CoreException { + super.releaseDocument(document, pm); + Display.getDefault().asyncExec(new Runnable() { + public void run() { + IEditorPart editor = getEditor(getFile()); + if(editor != null){ + editor.doSave(new NullProgressMonitor()); + } + } + + }); + } + } +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIRefactoringProcessor.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/DeleteAllDisposerAnnotationsProcessor.java (from rev 36738, trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerAnnotationsProcessor.java) =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/DeleteAllDisposerAnnotationsProcessor.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/DeleteAllDisposerAnnotationsProcessor.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -0,0 +1,80 @@ +/******************************************************************************* + * 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.internal.core.refactoring; + +import java.util.HashSet; +import java.util.Set; + +import org.eclipse.core.resources.IFile; +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.RefactoringStatus; +import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; +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.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.common.text.ITextSourceReference; + +public class DeleteAllDisposerAnnotationsProcessor extends CDIRefactoringProcessor { + private IMethod method; + + public DeleteAllDisposerAnnotationsProcessor(IFile file, IMethod method, String label){ + super(file, label); + this.method = method; + } + + 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); + 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); + } + } + } + } + } + } + + @Override + public RefactoringStatus checkFinalConditions(IProgressMonitor pm, + CheckConditionsContext context) throws CoreException, + OperationCanceledException { + + createRootChange(); + + if(bean != null) + changeDisposers(bean); + + return status; + } + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/DeleteAllDisposerAnnotationsProcessor.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/DeleteAllInjectedConstructorsProcessor.java (from rev 36738, trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsProcessor.java) =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/DeleteAllInjectedConstructorsProcessor.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/DeleteAllInjectedConstructorsProcessor.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -0,0 +1,71 @@ +/******************************************************************************* + * 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.internal.core.refactoring; + +import java.util.HashSet; +import java.util.Set; + +import org.eclipse.core.resources.IFile; +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.RefactoringStatus; +import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; +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.IBeanMethod; +import org.jboss.tools.cdi.core.IClassBean; +import org.jboss.tools.common.java.IAnnotationDeclaration; + +public class DeleteAllInjectedConstructorsProcessor extends CDIRefactoringProcessor { + private IMethod method; + + public DeleteAllInjectedConstructorsProcessor(IFile file, IMethod method, String label){ + super(file, label); + this.method = method; + } + + private void changeConstructors(IClassBean bean) { + Set<IBeanMethod> constructors = bean.getBeanConstructors(); + if(constructors.size()>1) { + Set<IAnnotationDeclaration> injects = new HashSet<IAnnotationDeclaration>(); + for (IBeanMethod constructor : constructors) { + if(!constructor.getMethod().isSimilar(method)){ + IAnnotationDeclaration inject = constructor.getAnnotation(CDIConstants.INJECT_ANNOTATION_TYPE_NAME); + if(inject!=null) { + injects.add(inject); + } + } + } + for (IAnnotationDeclaration inject : injects) { + TextEdit edit = new ReplaceEdit(inject.getStartPosition(), inject.getLength(), ""); + change.addEdit(edit); + } + } + } + + + @Override + public RefactoringStatus checkFinalConditions(IProgressMonitor pm, + CheckConditionsContext context) throws CoreException, + OperationCanceledException { + + createRootChange(); + + if(bean != null) + changeConstructors(bean); + + return status; + } + +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/DeleteAllInjectedConstructorsProcessor.java ___________________________________________________________________ Added: svn:mime-type + text/plain Copied: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/MarkerResolutionUtils.java (from rev 36744, trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java) =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/MarkerResolutionUtils.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/MarkerResolutionUtils.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -0,0 +1,887 @@ +/******************************************************************************* + * 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.internal.core.refactoring; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +import org.eclipse.core.runtime.CoreException; +import org.eclipse.core.runtime.NullProgressMonitor; +import org.eclipse.jdt.core.Flags; +import org.eclipse.jdt.core.IAnnotatable; +import org.eclipse.jdt.core.IAnnotation; +import org.eclipse.jdt.core.IBuffer; +import org.eclipse.jdt.core.ICompilationUnit; +import org.eclipse.jdt.core.IField; +import org.eclipse.jdt.core.IImportContainer; +import org.eclipse.jdt.core.IImportDeclaration; +import org.eclipse.jdt.core.IJavaElement; +import org.eclipse.jdt.core.ILocalVariable; +import org.eclipse.jdt.core.IMember; +import org.eclipse.jdt.core.IMethod; +import org.eclipse.jdt.core.IPackageDeclaration; +import org.eclipse.jdt.core.ISourceRange; +import org.eclipse.jdt.core.ISourceReference; +import org.eclipse.jdt.core.IType; +import org.eclipse.jdt.core.ITypeParameter; +import org.eclipse.jdt.core.JavaModelException; +import org.eclipse.jdt.core.Signature; +import org.eclipse.text.edits.DeleteEdit; +import org.eclipse.text.edits.InsertEdit; +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.CDICorePlugin; +import org.jboss.tools.cdi.core.IBean; +import org.jboss.tools.cdi.core.IBeanField; +import org.jboss.tools.cdi.core.IBeanMethod; +import org.jboss.tools.cdi.core.IInjectionPoint; +import org.jboss.tools.cdi.core.IInjectionPointField; +import org.jboss.tools.cdi.core.IInjectionPointParameter; +import org.jboss.tools.cdi.core.IQualifier; +import org.jboss.tools.cdi.core.IQualifierDeclaration; +import org.jboss.tools.common.model.util.EclipseJavaUtil; +import org.jboss.tools.common.util.BeanUtil; + +/** + * @author Daniel Azarov + */ +public class MarkerResolutionUtils { + public static final String DOT = "."; //$NON-NLS-1$ + public static final String COMMA = ","; //$NON-NLS-1$ + public static final String SEMICOLON = ";"; //$NON-NLS-1$ + public static final String SPACE = " "; //$NON-NLS-1$ + public static final String AT = "@"; //$NON-NLS-1$ + public static final String IMPLEMENTS = "implements"; //$NON-NLS-1$ + public static final String IMPORT = "import"; //$NON-NLS-1$ + public static final String EXTENDS = "extends"; //$NON-NLS-1$ + public static final String OPEN_BRACE = "{"; //$NON-NLS-1$ + public static final String CLOSE_BRACE = "}"; //$NON-NLS-1$ + + static final HashSet<String> primitives = new HashSet<String>(); + static{ + primitives.add("void"); //$NON-NLS-1$ + primitives.add("int"); //$NON-NLS-1$ + primitives.add("java.lang.Integer"); //$NON-NLS-1$ + primitives.add("char"); //$NON-NLS-1$ + primitives.add("java.lang.Character"); //$NON-NLS-1$ + primitives.add("boolean"); //$NON-NLS-1$ + primitives.add("java.lang.Boolean"); //$NON-NLS-1$ + primitives.add("short"); //$NON-NLS-1$ + primitives.add("java.lang.Short"); //$NON-NLS-1$ + primitives.add("long"); //$NON-NLS-1$ + primitives.add("java.lang.Long"); //$NON-NLS-1$ + primitives.add("float"); //$NON-NLS-1$ + primitives.add("java.lang.Float"); //$NON-NLS-1$ + primitives.add("double"); //$NON-NLS-1$ + primitives.add("java.lang.Double"); //$NON-NLS-1$ + primitives.add("byte"); //$NON-NLS-1$ + primitives.add("java.lang.Byte"); //$NON-NLS-1$ + primitives.add("java.lang.String"); //$NON-NLS-1$ + } + + /** + * + * @param qualifiedName + * @param compilationUnit + * @return true if there is import in compilation unit with the same short name + * @throws JavaModelException + */ + public static boolean addImport(String qualifiedName, ICompilationUnit compilationUnit) throws JavaModelException{ + return addImport(qualifiedName, compilationUnit, false, null); + } + + public static boolean addImport(String qualifiedName, ICompilationUnit compilationUnit, MultiTextEdit rootEdit) throws JavaModelException{ + return addImport(qualifiedName, compilationUnit, false, rootEdit); + } + + /** + * + * @param qualifiedName + * @param compilationUnit + * @param staticFlag + * @return true if there is import in compilation unit with the same short name + * @throws JavaModelException + */ + public static boolean addImport(String qualifiedName, ICompilationUnit compilationUnit, boolean staticFlag) throws JavaModelException{ + return addImport(qualifiedName, compilationUnit, staticFlag, null); + } + + public static boolean addImport(String qualifiedName, ICompilationUnit compilationUnit, boolean staticFlag, MultiTextEdit rootEdit) throws JavaModelException{ + if(primitives.contains(qualifiedName)) + return false; + + if(qualifiedName != null){ + String shortName = getShortName(qualifiedName); + + IPackageDeclaration[] packages = compilationUnit.getPackageDeclarations(); + + // local classes do not need to be imported + if(qualifiedName.indexOf(DOT) >= 0){ + String typePackage = qualifiedName.substring(0,qualifiedName.lastIndexOf(DOT)); + + for(IPackageDeclaration packageDeclaration : packages){ + if(packageDeclaration.getElementName().equals(typePackage)) + return false; + } + + for(IPackageDeclaration packageDeclaration : packages){ + IType type = compilationUnit.getJavaProject().findType(packageDeclaration.getElementName()+DOT+shortName); + if(type != null && type.exists()) + return true; + } + } + + IImportDeclaration[] importDeclarations = compilationUnit.getImports(); + + for(IImportDeclaration importDeclaration : importDeclarations){ + String importName = importDeclaration.getElementName(); + String elementShort = getShortName(importName); + if(importDeclaration.isOnDemand()){ + int importLastDot = importName.lastIndexOf(DOT); + if(importLastDot == -1) return false; // invalid import declaration + int elementLastDot = qualifiedName.lastIndexOf(DOT); + if(elementLastDot == -1) return false; // invalid import declaration + + if(qualifiedName.substring(0, elementLastDot).equals(importName.substring(0, importLastDot))) + return false; + } + + if(importName.equals(qualifiedName)) + return false; + if(elementShort.equals(shortName)) + return true; + + } + if(rootEdit == null){ + if(staticFlag){ + compilationUnit.createImport(qualifiedName, null, Flags.AccStatic, new NullProgressMonitor()); + }else{ + compilationUnit.createImport(qualifiedName, null, new NullProgressMonitor()); + } + }else{ + String text = compilationUnit.findRecommendedLineSeparator()+IMPORT+SPACE+qualifiedName+SEMICOLON; + if(!isDuplicate(rootEdit, text)){ + int importPosition = findPositionForImport(compilationUnit); + TextEdit edit = new InsertEdit(importPosition, text); + rootEdit.addChild(edit); + } + } + } + return false; + } + + + private static int findPositionForImport(ICompilationUnit compilationUnit) throws JavaModelException{ + if(compilationUnit.getImportContainer().exists()){ + return compilationUnit.getImportContainer().getSourceRange().getOffset()+compilationUnit.getImportContainer().getSourceRange().getLength(); + }else{ + IPackageDeclaration[] packageDeclarations = compilationUnit.getPackageDeclarations(); + if(packageDeclarations.length == 0){ + return 0; + } + int position = 0; + for(IPackageDeclaration declaration : packageDeclarations){ + position = declaration.getSourceRange().getOffset()+declaration.getSourceRange().getLength(); + } + return position; + } + } + + private static boolean isDuplicate(MultiTextEdit rootEdit, String text){ + for(TextEdit edit : rootEdit.getChildren()){ + if(edit instanceof InsertEdit && ((InsertEdit) edit).getText().equals(text)) + return true; + } + return false; + } + + public static void addAnnotation(String qualifiedName, ICompilationUnit compilationUnit, IJavaElement element) throws JavaModelException{ + addAnnotation(qualifiedName, compilationUnit, element, ""); + } + public static void updateAnnotation(String qualifiedName, ICompilationUnit compilationUnit, IJavaElement element, String params) throws JavaModelException{ + updateAnnotation(qualifiedName, compilationUnit, element, params, null); + } + + public static void updateAnnotation(String qualifiedName, ICompilationUnit compilationUnit, IJavaElement element, String params, MultiTextEdit rootEdit) throws JavaModelException{ + IJavaElement workingCopyElement = findWorkingCopy(compilationUnit, element); + if(workingCopyElement == null){ + return; + } + + if(!(workingCopyElement instanceof IMember)) + return; + + IMember workingCopyMember = (IMember) workingCopyElement; + + IAnnotation annotation = findAnnotation(workingCopyMember, qualifiedName); + if(annotation == null || !annotation.exists()) + return; + + boolean duplicateShortName = addImport(qualifiedName, compilationUnit, null); + + IBuffer buffer = compilationUnit.getBuffer(); + String shortName = getShortName(qualifiedName); + + if(duplicateShortName) + shortName = qualifiedName; + + String newValue = AT+shortName+params; + + if(!annotation.getSource().equals(newValue)){ + if(rootEdit != null){ + TextEdit edit = new ReplaceEdit(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), newValue); + rootEdit.addChild(edit); + }else{ + buffer.replace(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), newValue); + + synchronized(compilationUnit) { + compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null); + } + } + } + + } + + public static void addAnnotation(String qualifiedName, ICompilationUnit compilationUnit, IJavaElement element, String params) throws JavaModelException{ + addAnnotation(qualifiedName, compilationUnit, element, params, null); + } + + public static void addAnnotation(String qualifiedName, ICompilationUnit compilationUnit, IJavaElement element, String params, MultiTextEdit rootEdit) throws JavaModelException{ + IJavaElement workingCopyElement = findWorkingCopy(compilationUnit, element); + if(workingCopyElement == null){ + return; + } + + if(!(workingCopyElement instanceof IMember)) + return; + + IMember workingCopyMember = (IMember) workingCopyElement; + + IAnnotation annotation = findAnnotation(workingCopyMember, qualifiedName); + if(annotation != null && annotation.exists()) + return; + + boolean duplicateShortName = addImport(qualifiedName, compilationUnit, rootEdit); + + IBuffer buffer = compilationUnit.getBuffer(); + String shortName = getShortName(qualifiedName); + + if(duplicateShortName) + shortName = qualifiedName; + + String str = AT+shortName+params; + + if(workingCopyMember instanceof IType){ + str += compilationUnit.findRecommendedLineSeparator(); + }else{ + str += SPACE; + } + + if(rootEdit != null){ + TextEdit edit = new InsertEdit(workingCopyMember.getSourceRange().getOffset(), str); + rootEdit.addChild(edit); + }else{ + buffer.replace(workingCopyMember.getSourceRange().getOffset(), 0, str); + + synchronized(compilationUnit) { + compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null); + } + } + + + + } + + public static void addQualifier(String qualifiedName, String value, ICompilationUnit compilationUnit, IJavaElement element, MultiTextEdit rootEdit) throws JavaModelException{ + if(!(element instanceof ISourceReference)) + return; + IAnnotation annotation = findAnnotation(element, qualifiedName); + if(annotation != null && annotation.exists()) + return; + + boolean duplicateShortName = addImport(qualifiedName, compilationUnit, rootEdit); + + String lineDelim = SPACE; + + IBuffer buffer = compilationUnit.getBuffer(); + String shortName = getShortName(qualifiedName); + + if(!value.isEmpty()) + value = "(\""+value+"\")"; + + if(duplicateShortName) + shortName = qualifiedName; + + annotation = findAnnotation(element, CDIConstants.INJECT_ANNOTATION_TYPE_NAME); + + if(rootEdit != null){ + if(annotation != null && annotation.exists()){ + TextEdit edit = new InsertEdit(annotation.getSourceRange().getOffset()+annotation.getSourceRange().getLength(), lineDelim+AT+shortName+value); + rootEdit.addChild(edit); + }else{ + TextEdit edit = new InsertEdit(((ISourceReference)element).getSourceRange().getOffset(), AT+shortName+value+lineDelim); + rootEdit.addChild(edit); + } + }else{ + if(annotation != null && annotation.exists()){ + buffer.replace(annotation.getSourceRange().getOffset()+annotation.getSourceRange().getLength(), 0, lineDelim+AT+shortName+value); + }else{ + buffer.replace(((ISourceReference)element).getSourceRange().getOffset(), 0, AT+shortName+value+lineDelim); + } + + synchronized(compilationUnit) { + compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null); + } + } + } + + public static void updateQualifier(String qualifiedName, String value, ICompilationUnit compilationUnit, IJavaElement element, MultiTextEdit rootEdit) throws JavaModelException{ + if(!(element instanceof ISourceReference)) + return; + IAnnotation annotation = findAnnotation(element, qualifiedName); + if(annotation == null || !annotation.exists()) + return; + + boolean duplicateShortName = addImport(qualifiedName, compilationUnit, rootEdit); + + IBuffer buffer = compilationUnit.getBuffer(); + String shortName = getShortName(qualifiedName); + + if(!value.isEmpty()) + value = "(\""+value+"\")"; + + if(duplicateShortName) + shortName = qualifiedName; + + String newValue = AT+shortName+value; + + if(!annotation.getSource().equals(newValue)){ + if(rootEdit != null){ + TextEdit edit = new ReplaceEdit(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), newValue); + rootEdit.addChild(edit); + }else{ + buffer.replace(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), newValue); + + synchronized(compilationUnit) { + compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null); + } + } + } + } + + public static String getShortName(String qualifiedName){ + int lastDot = qualifiedName.lastIndexOf(DOT); + String name; + if(lastDot < 0) + name = qualifiedName; + else + name = qualifiedName.substring(lastDot+1); + return name; + } + + public static String getPackageName(String qualifiedName){ + int lastDot = qualifiedName.lastIndexOf(DOT); + String name; + if(lastDot < 0) + name = ""; + else + name = qualifiedName.substring(0, lastDot); + return name; + } + + public static String[] getShortNames(String[] qualifiedNames){ + String[] shortNames = new String[qualifiedNames.length]; + for(int i = 0; i < qualifiedNames.length; i++){ + shortNames[i] = getShortName(qualifiedNames[i]); + } + return shortNames; + } + + public static String getTotalList(String[] names){ + String list = ""; + for(int i = 0; i < names.length; i++){ + if(i != 0) + list += ", "; + list += names[i]; + } + return list; + } + + public static IAnnotation findAnnotation(IJavaElement element, String qualifiedName){ + if(element instanceof IAnnotatable){ + String name = getShortName(qualifiedName); + IAnnotation annotation = ((IAnnotatable)element).getAnnotation(qualifiedName); + if (!annotation.exists()) { + annotation = ((IAnnotatable)element).getAnnotation(name); + } else { + return annotation; + } + if(annotation.exists()) { + IType type=null; + if(element instanceof IType){ + type = (IType)element; + }else if(element instanceof IMember){ + type = ((IMember)element).getDeclaringType(); + }else if(element instanceof ITypeParameter){ + type = ((ITypeParameter)element).getDeclaringMember().getDeclaringType(); + }else if(element instanceof ILocalVariable){ + type = ((ILocalVariable)element).getDeclaringMember().getDeclaringType(); + } + if (type != null && annotation != null && qualifiedName.equals(EclipseJavaUtil.resolveType(type, name))) { + return annotation; + } + } + } + return null; + } + + private static boolean contains(IQualifierDeclaration declaration, List<ValuedQualifier> declarations){ + for(ValuedQualifier d : declarations){ + if(declaration.getQualifier().getSourceType().getFullyQualifiedName().equals(d.getQualifier().getSourceType().getFullyQualifiedName())) + return true; + } + return false; + } + + private static List<IQualifier> findQualifiersToDelete(IInjectionPoint injectionPoint, List<ValuedQualifier> qualifiers){ + ArrayList<IQualifier> list = new ArrayList<IQualifier>(); + Set<IQualifierDeclaration> declarations = injectionPoint.getQualifierDeclarations(); + for(IQualifierDeclaration declaration : declarations){ + if(!contains(declaration, qualifiers)) + list.add(declaration.getQualifier()); + } + return list; + } + + private static void addQualifiersToParameter(ICompilationUnit compilationUnit, IInjectionPoint injectionPoint, List<ValuedQualifier> declarations, MultiTextEdit rootEdit){ + HashMap<IQualifier, Boolean> duplicants = new HashMap<IQualifier, Boolean>(); + if(!(injectionPoint instanceof IInjectionPointParameter)) + return; + try{ + for(ValuedQualifier declaration : declarations){ + String qualifierName = declaration.getQualifier().getSourceType().getFullyQualifiedName(); + boolean duplicant = false; + if(!qualifierName.equals(CDIConstants.ANY_QUALIFIER_TYPE_NAME) && + !qualifierName.equals(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)){ + duplicant = addImport(qualifierName, compilationUnit, rootEdit); + } + duplicants.put(declaration.getQualifier(), new Boolean(duplicant)); + } + + String paramName = ((IInjectionPointParameter)injectionPoint).getName(); + IMethod method = ((IInjectionPointParameter)injectionPoint).getBeanMethod().getMethod(); + IType type = method.getDeclaringType(); + IType t = compilationUnit.getType(type.getElementName()); + IMethod m = t.getMethod(method.getElementName(), method.getParameterTypes()); + + IBuffer buffer = compilationUnit.getBuffer(); + + ILocalVariable[] parameters = m.getParameters(); + for(int index = 0; index < parameters.length; index++){ + if(parameters[index].getElementName().equals(paramName)){ + StringBuffer b = new StringBuffer(); + if(index > 0) + b.append(SPACE); + for(ValuedQualifier declaration : declarations){ + String qualifierName = declaration.getQualifier().getSourceType().getFullyQualifiedName(); + String value = declaration.getValue(); + + if(!value.isEmpty()) + value = "(\""+value+"\")"; + + if(!qualifierName.equals(CDIConstants.ANY_QUALIFIER_TYPE_NAME) && !qualifierName.equals(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)){ + boolean duplicant = duplicants.get(declaration.getQualifier()).booleanValue(); + String annotation = getShortName(qualifierName); + if(duplicant) + annotation = qualifierName; + b.append(AT+annotation+value+SPACE); + } + } + b.append(Signature.getSignatureSimpleName(parameters[index].getTypeSignature())+SPACE); + b.append(parameters[index].getElementName()); + + String newValue = b.toString(); + + if(!parameters[index].getSource().equals(newValue)){ + if(rootEdit != null){ + TextEdit edit = new ReplaceEdit(parameters[index].getSourceRange().getOffset(), parameters[index].getSourceRange().getLength(), b.toString()); + rootEdit.addChild(edit); + }else{ + buffer.replace(parameters[index].getSourceRange().getOffset(), parameters[index].getSourceRange().getLength(), b.toString()); + + synchronized(compilationUnit) { + compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null); + } + } + } + } + } + + }catch(JavaModelException ex){ + CDICorePlugin.getDefault().logError(ex); + } + } + + public static ISourceRange getParameterRegion(IInjectionPointParameter injectionParameter){ + try{ + String paramName = injectionParameter.getName(); + IMethod method = injectionParameter.getBeanMethod().getMethod(); + + for(ILocalVariable parameter : method.getParameters()){ + if(parameter.getElementName().equals(paramName)){ + return parameter.getSourceRange(); + } + } + }catch(JavaModelException ex){ + CDICorePlugin.getDefault().logError(ex); + } + return null; + } + + public static void addQualifiersToInjectionPoint(List<ValuedQualifier> deployed, IInjectionPoint injectionPoint, ICompilationUnit compilationUnit, MultiTextEdit edit){ + try{ + if(injectionPoint instanceof IInjectionPointParameter){ + addQualifiersToParameter(compilationUnit, injectionPoint, deployed, edit); + }else{ + IJavaElement element = getInjectedJavaElement(compilationUnit, injectionPoint); + if(element == null || !element.exists()) + return; + + // delete unneeded qualifiers + List<IQualifier> toDelete = findQualifiersToDelete(injectionPoint, deployed); + + for(IQualifier qualifier : toDelete){ + deleteAnnotation(qualifier.getSourceType().getFullyQualifiedName(), compilationUnit, element, edit); + } + + for(ValuedQualifier declaration : deployed){ + String qualifierName = declaration.getQualifier().getSourceType().getFullyQualifiedName(); + String value = declaration.getValue(); + if(!qualifierName.equals(CDIConstants.ANY_QUALIFIER_TYPE_NAME) && !qualifierName.equals(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)){ + addQualifier(qualifierName, value, compilationUnit, element, edit); + updateQualifier(qualifierName, value, compilationUnit, element, edit); + } + } + } + }catch(CoreException ex){ + CDICorePlugin.getDefault().logError(ex); + } + + } + + public static void addQualifiersToBean(List<ValuedQualifier> deployed, IBean bean, ICompilationUnit compilationUnit, MultiTextEdit edit){ + IJavaElement beanElement = null; + if(bean instanceof IBeanField){ + beanElement = ((IBeanField) bean).getField(); + }else if(bean instanceof IBeanMethod){ + beanElement = ((IBeanMethod) bean).getMethod(); + }else{ + beanElement = bean.getBeanClass(); + } + + try{ + for(IQualifierDeclaration declaration : bean.getQualifierDeclarations()){ + IQualifier qualifier = declaration.getQualifier(); + String qualifierName = qualifier.getSourceType().getFullyQualifiedName(); + if(!isQualifierNeeded(deployed, qualifier)){ + deleteAnnotation(qualifierName, compilationUnit, beanElement, edit); + } + } + + for(ValuedQualifier vq : deployed){ + String qualifierName = vq.getQualifier().getSourceType().getFullyQualifiedName(); + String value = vq.getValue(); + String elName = getELName(bean); + + if(!value.isEmpty() && (!value.equals(elName) || !qualifierName.equals(CDIConstants.NAMED_QUALIFIER_TYPE_NAME))){ + value = "(\""+value+"\")"; + }else{ + value = ""; + } + + if(!qualifierName.equals(CDIConstants.ANY_QUALIFIER_TYPE_NAME) && !qualifierName.equals(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)){ + addAnnotation(qualifierName, compilationUnit, beanElement, value, edit); + updateAnnotation(qualifierName, compilationUnit, beanElement, value, edit); + } + + } + }catch(CoreException ex){ + CDICorePlugin.getDefault().logError(ex); + } + + } + + private static boolean isQualifierNeeded(List<ValuedQualifier> vQualifiers, IQualifier qualifier){ + for(ValuedQualifier vq : vQualifiers){ + if(vq.getQualifier().equals(qualifier)) + return true; + } + return false; + } + + public static void addInterfaceToClass(ICompilationUnit compilationUnit, IType type, String qualifiedName) throws JavaModelException{ + String shortName = getShortName(qualifiedName); + + IType[] types = compilationUnit.getTypes(); + IType workingType = null; + for(IType t : types){ + if(t.getElementName().equals(type.getElementName())){ + workingType = t; + break; + } + } + + if(workingType != null){ + addImport(qualifiedName, compilationUnit, null); + + IBuffer buffer = compilationUnit.getBuffer(); + + String text = buffer.getText(workingType.getSourceRange().getOffset(), workingType.getSourceRange().getLength()); + + int namePosition = text.indexOf(workingType.getElementName()); + if(namePosition >= 0){ + int implementsPosition = text.indexOf(IMPLEMENTS,namePosition); + if(implementsPosition > 0){ + buffer.replace(workingType.getSourceRange().getOffset()+implementsPosition+IMPLEMENTS.length(),0,SPACE+shortName+COMMA); + }else{ + int extedsPosition = text.indexOf(EXTENDS,namePosition); + if(extedsPosition > 0){ + int bracePosition = text.indexOf(OPEN_BRACE, extedsPosition); + String str = IMPLEMENTS+SPACE+shortName+SPACE; + if(!text.substring(bracePosition-1,bracePosition).equals(SPACE)) + str = SPACE+str; + buffer.replace(workingType.getSourceRange().getOffset()+bracePosition,0,str); + }else{ + buffer.replace(workingType.getSourceRange().getOffset()+namePosition+workingType.getElementName().length(),0,SPACE+IMPLEMENTS+SPACE+shortName); + } + } + } + } + + } + + private static IJavaElement getInjectedJavaElement(ICompilationUnit compilationUnit, IInjectionPoint injectionPoint){ + if(injectionPoint instanceof IInjectionPointField){ + IField field = ((IInjectionPointField)injectionPoint).getField(); + IType type = field.getDeclaringType(); + IType t = compilationUnit.getType(type.getElementName()); + IField f = t.getField(field.getElementName()); + + return f; + }else if(injectionPoint instanceof IInjectionPointParameter){ + IMethod method = ((IInjectionPointParameter)injectionPoint).getBeanMethod().getMethod(); + IType type = method.getDeclaringType(); + IType t = compilationUnit.getType(type.getElementName()); + IMethod m = t.getMethod(method.getElementName(), method.getParameterTypes()); + // Why method? Why not Java element for parameter? + return m; + } + return null; + } + + @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 if(element instanceof ILocalVariable && ((ILocalVariable) element).isParameter()){ + IJavaElement parent = findWorkingCopy(compilationUnit, element.getParent()); + if(parent instanceof IMethod){ + for(ILocalVariable parameter : ((IMethod)parent).getParameters()){ + if(parameter.getElementName().equals(element.getElementName()) && parameter.getTypeSignature().equals(((ILocalVariable)element).getTypeSignature())) + return (T)parameter; + } + } + }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 void deleteAnnotation(String qualifiedName, ICompilationUnit compilationUnit, IJavaElement element) throws JavaModelException{ + deleteAnnotation(qualifiedName, compilationUnit, element, null); + } + + public static void deleteAnnotation(String qualifiedName, ICompilationUnit compilationUnit, IJavaElement element, MultiTextEdit rootEdit) throws JavaModelException{ + IJavaElement workingCopyElement = findWorkingCopy(compilationUnit, element); + if(workingCopyElement == null){ + return; + } + + IAnnotation annotation = findAnnotation(workingCopyElement, qualifiedName); + if(annotation != null){ + IBuffer buffer = compilationUnit.getBuffer(); + + int position = annotation.getSourceRange().getOffset() + annotation.getSourceRange().getLength(); + int numberOfSpaces = 0; + if(position < buffer.getLength()-1){ + char c = buffer.getChar(position); + while((c == ' ' || c == '\t' || c == '\n' || c == '\r') && position < buffer.getLength()-1){ + numberOfSpaces++; + position++; + c = buffer.getChar(position); + } + } + + // delete annotation + if(rootEdit != null){ + TextEdit edit = new DeleteEdit(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength()); + rootEdit.addChild(edit); + }else{ + buffer.replace(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength()+numberOfSpaces, ""); + } + + // check and delete import + IImportDeclaration importDeclaration = compilationUnit.getImport(qualifiedName); + IImportContainer importContainer = compilationUnit.getImportContainer(); + if(importDeclaration.exists() && importContainer.exists()){ + int importSize = importContainer.getSourceRange().getOffset()+importContainer.getSourceRange().getLength(); + + if(rootEdit != null){ + int annotationStart = annotation.getSourceRange().getOffset(); + int annotationEnd = annotationStart+annotation.getSourceRange().getLength(); + String textBefore = buffer.getText(importSize, annotationStart-importSize); + String textAfter = buffer.getText(annotationEnd, buffer.getLength()-annotationEnd); + if(checkImport(textBefore, qualifiedName) && checkImport(textAfter, qualifiedName)){ + TextEdit edit = new DeleteEdit(importDeclaration.getSourceRange().getOffset(), importDeclaration.getSourceRange().getLength()); + rootEdit.addChild(edit); + } + }else{ + String text = buffer.getText(importSize, buffer.getLength()-importSize); + if(checkImport(text, qualifiedName)){ + importDeclaration.delete(false, new NullProgressMonitor()); + } + } + } + + if(rootEdit == null){ + synchronized(compilationUnit) { + compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null); + } + } + } + } + + private static boolean checkImport(String text, String qualifiedName){ + String name = getShortName(qualifiedName); + + Pattern p = Pattern.compile(".*\\W"+name+"\\W.*",Pattern.DOTALL); //$NON-NLS-1$ //$NON-NLS-2$ + Matcher m = p.matcher(text); + return !m.matches(); + } + + public static IMember getJavaMember(IJavaElement element){ + while(element != null){ + if(element instanceof IMember) + return (IMember)element; + element = element.getParent(); + } + return null; + } + + public static boolean checkBeanQualifiers(IBean selectedBean, IBean bean, Set<IQualifier> qualifiers){ + HashSet<ValuedQualifier> valuedQualifiers = new HashSet<ValuedQualifier>(); + for(IQualifier qualifier : qualifiers){ + valuedQualifiers.add(new ValuedQualifier(qualifier)); + } + return checkValuedQualifiers(selectedBean, bean, valuedQualifiers); + } + + public static boolean checkValuedQualifiers(IBean selectedBean, IBean bean, Set<ValuedQualifier> qualifiers){ + for(ValuedQualifier qualifier : qualifiers){ + if(!isBeanContainQualifier(bean, qualifier)){ + return false; + } + } + if(bean.getQualifiers().size() == qualifiers.size()) + return true; + return false; + } + + private static boolean isBeanContainQualifier(IBean bean, ValuedQualifier valuedQualifier){ + + Set<IQualifier> qualifiers = bean.getQualifiers(); + for(IQualifier q : qualifiers){ + if(q.getSourceType().getFullyQualifiedName().equals(valuedQualifier.getQualifier().getSourceType().getFullyQualifiedName())) + return true; + } + return false; + } + + public static String findQualifierValue(IBean bean, IQualifier qualifier){ + IQualifierDeclaration declaration = findQualifierDeclaration(bean, qualifier); + if(declaration == null) + return ""; + + return findQualifierValue(bean, declaration); + } + + public static String findQualifierValue(IBean bean, IQualifierDeclaration declaration){ + Object value = declaration.getMemberValue(null); + + String result = value == null ? "" : value.toString(); + + if("".equals(result) && declaration.getQualifier().getSourceType().getFullyQualifiedName().equals(CDIConstants.NAMED_QUALIFIER_TYPE_NAME)) + result = getELName(bean); + + return result; + } + + public static IQualifierDeclaration findQualifierDeclaration(IBean bean, IQualifier qualifier){ + Set<IQualifierDeclaration> declarations = bean.getQualifierDeclarations(); + + if(declarations == null) + return null; + + for(IQualifierDeclaration declaration : declarations){ + if(declaration.getQualifier().getSourceType().getFullyQualifiedName().equals(qualifier.getSourceType().getFullyQualifiedName())) + return declaration; + } + return null; + } + + public static String getELName(IBean bean){ + String name; + if(bean instanceof IBeanField){ + name = ((IBeanField) bean).getField().getElementName(); + }else if(bean instanceof IBeanMethod){ + name = ((IBeanMethod) bean).getMethod().getElementName(); + if(BeanUtil.isGetter(((IBeanMethod) bean).getMethod())) { + return BeanUtil.getPropertyName(name); + } + }else{ + name = bean.getBeanClass().getElementName(); + if(name.length() > 0) { + name = name.substring(0, 1).toLowerCase() + name.substring(1); + } + } + + return name; + } +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/MarkerResolutionUtils.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java (rev 0) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -0,0 +1,45 @@ +/******************************************************************************* + * 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.internal.core.refactoring; + +import org.jboss.tools.cdi.core.IQualifier; + +public class ValuedQualifier{ + private IQualifier qualifier; + private String value=""; + + public ValuedQualifier(IQualifier qualifier){ + this.qualifier = qualifier; + } + + public ValuedQualifier(IQualifier qualifier, String value){ + this(qualifier); + this.value = value; + } + + public IQualifier getQualifier(){ + return qualifier; + } + + public String getValue(){ + return value; + } + + public void setValue(String value){ + this.value = value; + } + + public boolean equals(Object obj) { + if(obj instanceof ValuedQualifier) + return getQualifier().getSourceType().getFullyQualifiedName().equals(((ValuedQualifier)obj).getQualifier().getSourceType().getFullyQualifiedName()); + return false; + } +} Property changes on: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java ___________________________________________________________________ Added: svn:mime-type + text/plain Modified: trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlinkDetector.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlinkDetector.java 2011-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.seam.text.ext/src/org/jboss/tools/cdi/seam/text/ext/hyperlink/CDISeamResourceLoadingHyperlinkDetector.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -31,8 +31,8 @@ import org.eclipse.jface.text.hyperlink.AbstractHyperlinkDetector; import org.eclipse.jface.text.hyperlink.IHyperlink; import org.eclipse.ui.texteditor.ITextEditor; +import org.jboss.tools.cdi.internal.core.refactoring.MarkerResolutionUtils; import org.jboss.tools.cdi.seam.text.ext.CDISeamExtPlugin; -import org.jboss.tools.cdi.ui.marker.MarkerResolutionUtils; import org.jboss.tools.common.EclipseUtil; public class CDISeamResourceLoadingHyperlinkDetector extends AbstractHyperlinkDetector{ Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddAnnotationMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddAnnotationMarkerResolution.java 2011-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddAnnotationMarkerResolution.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -24,6 +24,7 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IMarkerResolution2; import org.jboss.tools.cdi.core.CDIImages; +import org.jboss.tools.cdi.internal.core.refactoring.MarkerResolutionUtils; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddQualifiersToBeanProcessor.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddQualifiersToBeanProcessor.java 2011-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddQualifiersToBeanProcessor.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -1,171 +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 java.util.ArrayList; -import java.util.List; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IProject; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.jdt.core.ICompilationUnit; -import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jdt.core.IJavaProject; -import org.eclipse.jdt.core.JavaCore; -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.text.edits.MultiTextEdit; -import org.jboss.tools.cdi.core.CDICoreMessages; -import org.jboss.tools.cdi.core.IBean; -import org.jboss.tools.cdi.core.IInjectionPoint; -import org.jboss.tools.cdi.ui.refactoring.CDIRefactoringProcessor; -import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite.ValuedQualifier; -import org.jboss.tools.common.EclipseUtil; - -public class AddQualifiersToBeanProcessor extends CDIRefactoringProcessor { - protected IBean selectedBean; - protected IInjectionPoint injectionPoint; - protected List<IBean> beans; - protected ArrayList<ValuedQualifier> qualifiers; - - public AddQualifiersToBeanProcessor(String label, IInjectionPoint injectionPoint, List<IBean> beans, IBean bean) { - super(label); - this.selectedBean = bean; - this.injectionPoint = injectionPoint; - this.beans = beans; - } - - @Override - public RefactoringStatus checkInitialConditions(IProgressMonitor pm) - throws CoreException, OperationCanceledException { - status = new RefactoringStatus(); - - if(injectionPoint == null){ - status.addFatalError(CDICoreMessages.CDI_RENAME_PROCESSOR_ERROR_INJECTION_POINT_NOT_FOUND); - return status; - } - - IFile injectionPointFile = (IFile)injectionPoint.getClassBean().getResource(); - - isFileCorrect(injectionPointFile); - - return status; - } - - @Override - public RefactoringStatus checkFinalConditions(IProgressMonitor pm, - CheckConditionsContext context) throws CoreException, - OperationCanceledException { - - if(selectedBean == null){ - status.addFatalError(CDICoreMessages.CDI_RENAME_PROCESSOR_ERROR_BEAN_NOT_FOUND); - return status; - } - - IFile beanFile = (IFile)selectedBean.getBeanClass().getResource(); - - if(!isFileCorrect(beanFile)){ - return status; - } - return status; - } - - private ICompilationUnit getCompilationUnit(IFile file) throws CoreException{ - IProject project = file.getProject(); - IJavaProject javaProject = (IJavaProject)project.getNature(JavaCore.NATURE_ID); - IJavaElement element = javaProject.findElement(file.getProjectRelativePath()); - if(element instanceof ICompilationUnit) - return (ICompilationUnit)element; - - return null; - } - - @Override - public Change createChange(IProgressMonitor pm) throws CoreException, - OperationCanceledException { - rootChange = new CompositeChange(label); - - IFile file = (IFile)selectedBean.getBeanClass().getResource(); - ICompilationUnit original = EclipseUtil.getCompilationUnit(file); - - ICompilationUnit compilationUnit = original.getWorkingCopy(pm); - - TextFileChange fileChange = new CDIFileChange(file.getName(), file); - if(getEditor(file) != null) - fileChange.setSaveMode(TextFileChange.LEAVE_DIRTY); - else - fileChange.setSaveMode(TextFileChange.FORCE_SAVE); - - MultiTextEdit edit = new MultiTextEdit(); - - MarkerResolutionUtils.addQualifiersToBean(qualifiers, selectedBean, compilationUnit, edit); - - IFile file2 = (IFile)injectionPoint.getClassBean().getResource(); - ICompilationUnit original2 = injectionPoint.getClassBean().getBeanClass().getCompilationUnit(); - ICompilationUnit compilationUnit2 = original2.getWorkingCopy(pm); - - if(!original.equals(original2)){ - compilationUnit.discardWorkingCopy(); - if(edit.getChildrenSize() > 0){ - fileChange.setEdit(edit); - rootChange.add(fileChange); - } - fileChange = new CDIFileChange(file2.getName(), file2); - if(getEditor(file2) != null) - fileChange.setSaveMode(TextFileChange.LEAVE_DIRTY); - else - fileChange.setSaveMode(TextFileChange.FORCE_SAVE); - - edit = new MultiTextEdit(); - }else{ - compilationUnit2 = compilationUnit; - } - - MarkerResolutionUtils.addQualifiersToInjectionPoint(qualifiers, injectionPoint, compilationUnit2, edit); - - if(edit.getChildrenSize() > 0){ - fileChange.setEdit(edit); - rootChange.add(fileChange); - } - compilationUnit.discardWorkingCopy(); - return rootChange; - } - - protected void createRootChange(){ - - } - - public IBean getSelectedBean(){ - return selectedBean; - } - - public IInjectionPoint getInjectionPoint(){ - return injectionPoint; - } - - public List<IBean> getBeans(){ - return beans; - } - - public void setSelectedBean(IBean bean){ - selectedBean = bean; - } - - public void setDeployedQualifiers(ArrayList<ValuedQualifier> qualifiers){ - this.qualifiers = qualifiers; - } - -} 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-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddRetentionAnnotationMarkerResolution.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -20,6 +20,7 @@ import org.eclipse.ui.IMarkerResolution2; import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.CDIImages; +import org.jboss.tools.cdi.internal.core.refactoring.MarkerResolutionUtils; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddSerializableInterfaceMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddSerializableInterfaceMarkerResolution.java 2011-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddSerializableInterfaceMarkerResolution.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -21,6 +21,7 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IMarkerResolution2; import org.jboss.tools.cdi.core.CDIImages; +import org.jboss.tools.cdi.internal.core.refactoring.MarkerResolutionUtils; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; import org.jboss.tools.common.EclipseUtil; 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-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/AddTargetAnnotationMarkerResolution.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -20,6 +20,7 @@ import org.eclipse.ui.IMarkerResolution2; import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.CDIImages; +import org.jboss.tools.cdi.internal.core.refactoring.MarkerResolutionUtils; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; 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-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CDIProblemMarkerResolutionGenerator.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -50,6 +50,7 @@ import org.jboss.tools.cdi.core.IStereotype; import org.jboss.tools.cdi.core.IStereotyped; import org.jboss.tools.cdi.internal.core.impl.CDIProject; +import org.jboss.tools.cdi.internal.core.refactoring.MarkerResolutionUtils; import org.jboss.tools.cdi.internal.core.validation.CDIValidationErrorManager; import org.jboss.tools.cdi.ui.CDIUIPlugin; import org.jboss.tools.common.EclipseUtil; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeAnnotationMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeAnnotationMarkerResolution.java 2011-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/ChangeAnnotationMarkerResolution.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -22,6 +22,7 @@ import org.eclipse.ui.IMarkerResolution2; import org.jboss.tools.cdi.core.CDIConstants; import org.jboss.tools.cdi.core.CDIImages; +import org.jboss.tools.cdi.internal.core.refactoring.MarkerResolutionUtils; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CreateCDIElementMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CreateCDIElementMarkerResolution.java 2011-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/CreateCDIElementMarkerResolution.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -20,6 +20,7 @@ import org.eclipse.ui.IMarkerResolution2; import org.eclipse.ui.PlatformUI; import org.jboss.tools.cdi.core.CDIImages; +import org.jboss.tools.cdi.internal.core.refactoring.MarkerResolutionUtils; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.wizard.NewBeanCreationWizard; import org.jboss.tools.cdi.ui.wizard.NewCDIElementWizard; Deleted: 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 2011-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerAnnotationsProcessor.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -1,81 +0,0 @@ -/******************************************************************************* - * 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.util.HashSet; -import java.util.Set; - -import org.eclipse.core.resources.IFile; -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.RefactoringStatus; -import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; -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.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.refactoring.CDIRefactoringProcessor; -import org.jboss.tools.common.text.ITextSourceReference; - -public class DeleteAllDisposerAnnotationsProcessor extends CDIRefactoringProcessor { - private IMethod method; - - public DeleteAllDisposerAnnotationsProcessor(IFile file, IMethod method, String label){ - super(file, label); - this.method = method; - } - - 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); - 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); - } - } - } - } - } - } - - @Override - public RefactoringStatus checkFinalConditions(IProgressMonitor pm, - CheckConditionsContext context) throws CoreException, - OperationCanceledException { - - createRootChange(); - - if(bean != null) - changeDisposers(bean); - - return status; - } - -} Modified: 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 2011-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllDisposerDuplicantMarkerResolution.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -20,6 +20,7 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IMarkerResolution2; import org.jboss.tools.cdi.core.CDIImages; +import org.jboss.tools.cdi.internal.core.refactoring.DeleteAllDisposerAnnotationsProcessor; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.wizard.DeletePreviewWizard; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java 2011-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsMarkerResolution.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -21,6 +21,7 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IMarkerResolution2; import org.jboss.tools.cdi.core.CDIImages; +import org.jboss.tools.cdi.internal.core.refactoring.DeleteAllInjectedConstructorsProcessor; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.wizard.DeletePreviewWizard; Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsProcessor.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsProcessor.java 2011-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAllInjectedConstructorsProcessor.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -1,72 +0,0 @@ -/******************************************************************************* - * 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.util.HashSet; -import java.util.Set; - -import org.eclipse.core.resources.IFile; -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.RefactoringStatus; -import org.eclipse.ltk.core.refactoring.participants.CheckConditionsContext; -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.IBeanMethod; -import org.jboss.tools.cdi.core.IClassBean; -import org.jboss.tools.cdi.ui.refactoring.CDIRefactoringProcessor; -import org.jboss.tools.common.java.IAnnotationDeclaration; - -public class DeleteAllInjectedConstructorsProcessor extends CDIRefactoringProcessor { - private IMethod method; - - public DeleteAllInjectedConstructorsProcessor(IFile file, IMethod method, String label){ - super(file, label); - this.method = method; - } - - private void changeConstructors(IClassBean bean) { - Set<IBeanMethod> constructors = bean.getBeanConstructors(); - if(constructors.size()>1) { - Set<IAnnotationDeclaration> injects = new HashSet<IAnnotationDeclaration>(); - for (IBeanMethod constructor : constructors) { - if(!constructor.getMethod().isSimilar(method)){ - IAnnotationDeclaration inject = constructor.getAnnotation(CDIConstants.INJECT_ANNOTATION_TYPE_NAME); - if(inject!=null) { - injects.add(inject); - } - } - } - for (IAnnotationDeclaration inject : injects) { - TextEdit edit = new ReplaceEdit(inject.getStartPosition(), inject.getLength(), ""); - change.addEdit(edit); - } - } - } - - - @Override - public RefactoringStatus checkFinalConditions(IProgressMonitor pm, - CheckConditionsContext context) throws CoreException, - OperationCanceledException { - - createRootChange(); - - if(bean != null) - changeConstructors(bean); - - return status; - } - -} Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAnnotationMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAnnotationMarkerResolution.java 2011-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/DeleteAnnotationMarkerResolution.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -24,6 +24,7 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IMarkerResolution2; import org.jboss.tools.cdi.core.CDIImages; +import org.jboss.tools.cdi.internal.core.refactoring.MarkerResolutionUtils; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java 2011-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeBeanScopedDependentMarkerResolution.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -32,6 +32,7 @@ import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IScopeDeclaration; +import org.jboss.tools.cdi.internal.core.refactoring.MarkerResolutionUtils; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; import org.jboss.tools.common.EclipseUtil; 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-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeInjectedPointUnambiguousMarkerResolution.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -20,6 +20,7 @@ import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IInjectionPoint; +import org.jboss.tools.cdi.internal.core.refactoring.AddQualifiersToBeanProcessor; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.wizard.AddQualifiersToBeanWizard; Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java 2011-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MakeMethodBusinessMarkerResolution.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -26,6 +26,7 @@ import org.eclipse.swt.graphics.Image; import org.eclipse.ui.IMarkerResolution2; import org.jboss.tools.cdi.core.CDIImages; +import org.jboss.tools.cdi.internal.core.refactoring.MarkerResolutionUtils; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; import org.jboss.tools.common.EclipseUtil; Deleted: 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-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/MarkerResolutionUtils.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -1,888 +0,0 @@ -/******************************************************************************* - * 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.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.jdt.core.Flags; -import org.eclipse.jdt.core.IAnnotatable; -import org.eclipse.jdt.core.IAnnotation; -import org.eclipse.jdt.core.IBuffer; -import org.eclipse.jdt.core.ICompilationUnit; -import org.eclipse.jdt.core.IField; -import org.eclipse.jdt.core.IImportContainer; -import org.eclipse.jdt.core.IImportDeclaration; -import org.eclipse.jdt.core.IJavaElement; -import org.eclipse.jdt.core.ILocalVariable; -import org.eclipse.jdt.core.IMember; -import org.eclipse.jdt.core.IMethod; -import org.eclipse.jdt.core.IPackageDeclaration; -import org.eclipse.jdt.core.ISourceRange; -import org.eclipse.jdt.core.ISourceReference; -import org.eclipse.jdt.core.IType; -import org.eclipse.jdt.core.ITypeParameter; -import org.eclipse.jdt.core.JavaModelException; -import org.eclipse.jdt.core.Signature; -import org.eclipse.text.edits.DeleteEdit; -import org.eclipse.text.edits.InsertEdit; -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.IBean; -import org.jboss.tools.cdi.core.IBeanField; -import org.jboss.tools.cdi.core.IBeanMethod; -import org.jboss.tools.cdi.core.IInjectionPoint; -import org.jboss.tools.cdi.core.IInjectionPointField; -import org.jboss.tools.cdi.core.IInjectionPointParameter; -import org.jboss.tools.cdi.core.IQualifier; -import org.jboss.tools.cdi.core.IQualifierDeclaration; -import org.jboss.tools.cdi.ui.CDIUIPlugin; -import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite.ValuedQualifier; -import org.jboss.tools.common.model.util.EclipseJavaUtil; -import org.jboss.tools.common.util.BeanUtil; - -/** - * @author Daniel Azarov - */ -public class MarkerResolutionUtils { - public static final String DOT = "."; //$NON-NLS-1$ - public static final String COMMA = ","; //$NON-NLS-1$ - public static final String SEMICOLON = ";"; //$NON-NLS-1$ - public static final String SPACE = " "; //$NON-NLS-1$ - public static final String AT = "@"; //$NON-NLS-1$ - public static final String IMPLEMENTS = "implements"; //$NON-NLS-1$ - public static final String IMPORT = "import"; //$NON-NLS-1$ - public static final String EXTENDS = "extends"; //$NON-NLS-1$ - public static final String OPEN_BRACE = "{"; //$NON-NLS-1$ - public static final String CLOSE_BRACE = "}"; //$NON-NLS-1$ - - static final HashSet<String> primitives = new HashSet<String>(); - static{ - primitives.add("void"); //$NON-NLS-1$ - primitives.add("int"); //$NON-NLS-1$ - primitives.add("java.lang.Integer"); //$NON-NLS-1$ - primitives.add("char"); //$NON-NLS-1$ - primitives.add("java.lang.Character"); //$NON-NLS-1$ - primitives.add("boolean"); //$NON-NLS-1$ - primitives.add("java.lang.Boolean"); //$NON-NLS-1$ - primitives.add("short"); //$NON-NLS-1$ - primitives.add("java.lang.Short"); //$NON-NLS-1$ - primitives.add("long"); //$NON-NLS-1$ - primitives.add("java.lang.Long"); //$NON-NLS-1$ - primitives.add("float"); //$NON-NLS-1$ - primitives.add("java.lang.Float"); //$NON-NLS-1$ - primitives.add("double"); //$NON-NLS-1$ - primitives.add("java.lang.Double"); //$NON-NLS-1$ - primitives.add("byte"); //$NON-NLS-1$ - primitives.add("java.lang.Byte"); //$NON-NLS-1$ - primitives.add("java.lang.String"); //$NON-NLS-1$ - } - - /** - * - * @param qualifiedName - * @param compilationUnit - * @return true if there is import in compilation unit with the same short name - * @throws JavaModelException - */ - public static boolean addImport(String qualifiedName, ICompilationUnit compilationUnit) throws JavaModelException{ - return addImport(qualifiedName, compilationUnit, false, null); - } - - public static boolean addImport(String qualifiedName, ICompilationUnit compilationUnit, MultiTextEdit rootEdit) throws JavaModelException{ - return addImport(qualifiedName, compilationUnit, false, rootEdit); - } - - /** - * - * @param qualifiedName - * @param compilationUnit - * @param staticFlag - * @return true if there is import in compilation unit with the same short name - * @throws JavaModelException - */ - public static boolean addImport(String qualifiedName, ICompilationUnit compilationUnit, boolean staticFlag) throws JavaModelException{ - return addImport(qualifiedName, compilationUnit, staticFlag, null); - } - - public static boolean addImport(String qualifiedName, ICompilationUnit compilationUnit, boolean staticFlag, MultiTextEdit rootEdit) throws JavaModelException{ - if(primitives.contains(qualifiedName)) - return false; - - if(qualifiedName != null){ - String shortName = getShortName(qualifiedName); - - IPackageDeclaration[] packages = compilationUnit.getPackageDeclarations(); - - // local classes do not need to be imported - if(qualifiedName.indexOf(DOT) >= 0){ - String typePackage = qualifiedName.substring(0,qualifiedName.lastIndexOf(DOT)); - - for(IPackageDeclaration packageDeclaration : packages){ - if(packageDeclaration.getElementName().equals(typePackage)) - return false; - } - - for(IPackageDeclaration packageDeclaration : packages){ - IType type = compilationUnit.getJavaProject().findType(packageDeclaration.getElementName()+DOT+shortName); - if(type != null && type.exists()) - return true; - } - } - - IImportDeclaration[] importDeclarations = compilationUnit.getImports(); - - for(IImportDeclaration importDeclaration : importDeclarations){ - String importName = importDeclaration.getElementName(); - String elementShort = getShortName(importName); - if(importDeclaration.isOnDemand()){ - int importLastDot = importName.lastIndexOf(DOT); - if(importLastDot == -1) return false; // invalid import declaration - int elementLastDot = qualifiedName.lastIndexOf(DOT); - if(elementLastDot == -1) return false; // invalid import declaration - - if(qualifiedName.substring(0, elementLastDot).equals(importName.substring(0, importLastDot))) - return false; - } - - if(importName.equals(qualifiedName)) - return false; - if(elementShort.equals(shortName)) - return true; - - } - if(rootEdit == null){ - if(staticFlag){ - compilationUnit.createImport(qualifiedName, null, Flags.AccStatic, new NullProgressMonitor()); - }else{ - compilationUnit.createImport(qualifiedName, null, new NullProgressMonitor()); - } - }else{ - String text = compilationUnit.findRecommendedLineSeparator()+IMPORT+SPACE+qualifiedName+SEMICOLON; - if(!isDuplicate(rootEdit, text)){ - int importPosition = findPositionForImport(compilationUnit); - TextEdit edit = new InsertEdit(importPosition, text); - rootEdit.addChild(edit); - } - } - } - return false; - } - - - private static int findPositionForImport(ICompilationUnit compilationUnit) throws JavaModelException{ - if(compilationUnit.getImportContainer().exists()){ - return compilationUnit.getImportContainer().getSourceRange().getOffset()+compilationUnit.getImportContainer().getSourceRange().getLength(); - }else{ - IPackageDeclaration[] packageDeclarations = compilationUnit.getPackageDeclarations(); - if(packageDeclarations.length == 0){ - return 0; - } - int position = 0; - for(IPackageDeclaration declaration : packageDeclarations){ - position = declaration.getSourceRange().getOffset()+declaration.getSourceRange().getLength(); - } - return position; - } - } - - private static boolean isDuplicate(MultiTextEdit rootEdit, String text){ - for(TextEdit edit : rootEdit.getChildren()){ - if(edit instanceof InsertEdit && ((InsertEdit) edit).getText().equals(text)) - return true; - } - return false; - } - - public static void addAnnotation(String qualifiedName, ICompilationUnit compilationUnit, IJavaElement element) throws JavaModelException{ - addAnnotation(qualifiedName, compilationUnit, element, ""); - } - public static void updateAnnotation(String qualifiedName, ICompilationUnit compilationUnit, IJavaElement element, String params) throws JavaModelException{ - updateAnnotation(qualifiedName, compilationUnit, element, params, null); - } - - public static void updateAnnotation(String qualifiedName, ICompilationUnit compilationUnit, IJavaElement element, String params, MultiTextEdit rootEdit) throws JavaModelException{ - IJavaElement workingCopyElement = findWorkingCopy(compilationUnit, element); - if(workingCopyElement == null){ - return; - } - - if(!(workingCopyElement instanceof IMember)) - return; - - IMember workingCopyMember = (IMember) workingCopyElement; - - IAnnotation annotation = findAnnotation(workingCopyMember, qualifiedName); - if(annotation == null || !annotation.exists()) - return; - - boolean duplicateShortName = addImport(qualifiedName, compilationUnit, null); - - IBuffer buffer = compilationUnit.getBuffer(); - String shortName = getShortName(qualifiedName); - - if(duplicateShortName) - shortName = qualifiedName; - - String newValue = AT+shortName+params; - - if(!annotation.getSource().equals(newValue)){ - if(rootEdit != null){ - TextEdit edit = new ReplaceEdit(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), newValue); - rootEdit.addChild(edit); - }else{ - buffer.replace(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), newValue); - - synchronized(compilationUnit) { - compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null); - } - } - } - - } - - public static void addAnnotation(String qualifiedName, ICompilationUnit compilationUnit, IJavaElement element, String params) throws JavaModelException{ - addAnnotation(qualifiedName, compilationUnit, element, params, null); - } - - public static void addAnnotation(String qualifiedName, ICompilationUnit compilationUnit, IJavaElement element, String params, MultiTextEdit rootEdit) throws JavaModelException{ - IJavaElement workingCopyElement = findWorkingCopy(compilationUnit, element); - if(workingCopyElement == null){ - return; - } - - if(!(workingCopyElement instanceof IMember)) - return; - - IMember workingCopyMember = (IMember) workingCopyElement; - - IAnnotation annotation = findAnnotation(workingCopyMember, qualifiedName); - if(annotation != null && annotation.exists()) - return; - - boolean duplicateShortName = addImport(qualifiedName, compilationUnit, rootEdit); - - IBuffer buffer = compilationUnit.getBuffer(); - String shortName = getShortName(qualifiedName); - - if(duplicateShortName) - shortName = qualifiedName; - - String str = AT+shortName+params; - - if(workingCopyMember instanceof IType){ - str += compilationUnit.findRecommendedLineSeparator(); - }else{ - str += SPACE; - } - - if(rootEdit != null){ - TextEdit edit = new InsertEdit(workingCopyMember.getSourceRange().getOffset(), str); - rootEdit.addChild(edit); - }else{ - buffer.replace(workingCopyMember.getSourceRange().getOffset(), 0, str); - - synchronized(compilationUnit) { - compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null); - } - } - - - - } - - public static void addQualifier(String qualifiedName, String value, ICompilationUnit compilationUnit, IJavaElement element, MultiTextEdit rootEdit) throws JavaModelException{ - if(!(element instanceof ISourceReference)) - return; - IAnnotation annotation = findAnnotation(element, qualifiedName); - if(annotation != null && annotation.exists()) - return; - - boolean duplicateShortName = addImport(qualifiedName, compilationUnit, rootEdit); - - String lineDelim = SPACE; - - IBuffer buffer = compilationUnit.getBuffer(); - String shortName = getShortName(qualifiedName); - - if(!value.isEmpty()) - value = "(\""+value+"\")"; - - if(duplicateShortName) - shortName = qualifiedName; - - annotation = findAnnotation(element, CDIConstants.INJECT_ANNOTATION_TYPE_NAME); - - if(rootEdit != null){ - if(annotation != null && annotation.exists()){ - TextEdit edit = new InsertEdit(annotation.getSourceRange().getOffset()+annotation.getSourceRange().getLength(), lineDelim+AT+shortName+value); - rootEdit.addChild(edit); - }else{ - TextEdit edit = new InsertEdit(((ISourceReference)element).getSourceRange().getOffset(), AT+shortName+value+lineDelim); - rootEdit.addChild(edit); - } - }else{ - if(annotation != null && annotation.exists()){ - buffer.replace(annotation.getSourceRange().getOffset()+annotation.getSourceRange().getLength(), 0, lineDelim+AT+shortName+value); - }else{ - buffer.replace(((ISourceReference)element).getSourceRange().getOffset(), 0, AT+shortName+value+lineDelim); - } - - synchronized(compilationUnit) { - compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null); - } - } - } - - public static void updateQualifier(String qualifiedName, String value, ICompilationUnit compilationUnit, IJavaElement element, MultiTextEdit rootEdit) throws JavaModelException{ - if(!(element instanceof ISourceReference)) - return; - IAnnotation annotation = findAnnotation(element, qualifiedName); - if(annotation == null || !annotation.exists()) - return; - - boolean duplicateShortName = addImport(qualifiedName, compilationUnit, rootEdit); - - IBuffer buffer = compilationUnit.getBuffer(); - String shortName = getShortName(qualifiedName); - - if(!value.isEmpty()) - value = "(\""+value+"\")"; - - if(duplicateShortName) - shortName = qualifiedName; - - String newValue = AT+shortName+value; - - if(!annotation.getSource().equals(newValue)){ - if(rootEdit != null){ - TextEdit edit = new ReplaceEdit(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), newValue); - rootEdit.addChild(edit); - }else{ - buffer.replace(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength(), newValue); - - synchronized(compilationUnit) { - compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null); - } - } - } - } - - public static String getShortName(String qualifiedName){ - int lastDot = qualifiedName.lastIndexOf(DOT); - String name; - if(lastDot < 0) - name = qualifiedName; - else - name = qualifiedName.substring(lastDot+1); - return name; - } - - public static String getPackageName(String qualifiedName){ - int lastDot = qualifiedName.lastIndexOf(DOT); - String name; - if(lastDot < 0) - name = ""; - else - name = qualifiedName.substring(0, lastDot); - return name; - } - - public static String[] getShortNames(String[] qualifiedNames){ - String[] shortNames = new String[qualifiedNames.length]; - for(int i = 0; i < qualifiedNames.length; i++){ - shortNames[i] = getShortName(qualifiedNames[i]); - } - return shortNames; - } - - public static String getTotalList(String[] names){ - String list = ""; - for(int i = 0; i < names.length; i++){ - if(i != 0) - list += ", "; - list += names[i]; - } - return list; - } - - public static IAnnotation findAnnotation(IJavaElement element, String qualifiedName){ - if(element instanceof IAnnotatable){ - String name = getShortName(qualifiedName); - IAnnotation annotation = ((IAnnotatable)element).getAnnotation(qualifiedName); - if (!annotation.exists()) { - annotation = ((IAnnotatable)element).getAnnotation(name); - } else { - return annotation; - } - if(annotation.exists()) { - IType type=null; - if(element instanceof IType){ - type = (IType)element; - }else if(element instanceof IMember){ - type = ((IMember)element).getDeclaringType(); - }else if(element instanceof ITypeParameter){ - type = ((ITypeParameter)element).getDeclaringMember().getDeclaringType(); - }else if(element instanceof ILocalVariable){ - type = ((ILocalVariable)element).getDeclaringMember().getDeclaringType(); - } - if (type != null && annotation != null && qualifiedName.equals(EclipseJavaUtil.resolveType(type, name))) { - return annotation; - } - } - } - return null; - } - - private static boolean contains(IQualifierDeclaration declaration, List<ValuedQualifier> declarations){ - for(ValuedQualifier d : declarations){ - if(declaration.getQualifier().getSourceType().getFullyQualifiedName().equals(d.getQualifier().getSourceType().getFullyQualifiedName())) - return true; - } - return false; - } - - private static List<IQualifier> findQualifiersToDelete(IInjectionPoint injectionPoint, List<ValuedQualifier> qualifiers){ - ArrayList<IQualifier> list = new ArrayList<IQualifier>(); - Set<IQualifierDeclaration> declarations = injectionPoint.getQualifierDeclarations(); - for(IQualifierDeclaration declaration : declarations){ - if(!contains(declaration, qualifiers)) - list.add(declaration.getQualifier()); - } - return list; - } - - private static void addQualifiersToParameter(ICompilationUnit compilationUnit, IInjectionPoint injectionPoint, List<ValuedQualifier> declarations, MultiTextEdit rootEdit){ - HashMap<IQualifier, Boolean> duplicants = new HashMap<IQualifier, Boolean>(); - if(!(injectionPoint instanceof IInjectionPointParameter)) - return; - try{ - for(ValuedQualifier declaration : declarations){ - String qualifierName = declaration.getQualifier().getSourceType().getFullyQualifiedName(); - boolean duplicant = false; - if(!qualifierName.equals(CDIConstants.ANY_QUALIFIER_TYPE_NAME) && - !qualifierName.equals(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)){ - duplicant = addImport(qualifierName, compilationUnit, rootEdit); - } - duplicants.put(declaration.getQualifier(), new Boolean(duplicant)); - } - - String paramName = ((IInjectionPointParameter)injectionPoint).getName(); - IMethod method = ((IInjectionPointParameter)injectionPoint).getBeanMethod().getMethod(); - IType type = method.getDeclaringType(); - IType t = compilationUnit.getType(type.getElementName()); - IMethod m = t.getMethod(method.getElementName(), method.getParameterTypes()); - - IBuffer buffer = compilationUnit.getBuffer(); - - ILocalVariable[] parameters = m.getParameters(); - for(int index = 0; index < parameters.length; index++){ - if(parameters[index].getElementName().equals(paramName)){ - StringBuffer b = new StringBuffer(); - if(index > 0) - b.append(SPACE); - for(ValuedQualifier declaration : declarations){ - String qualifierName = declaration.getQualifier().getSourceType().getFullyQualifiedName(); - String value = declaration.getValue(); - - if(!value.isEmpty()) - value = "(\""+value+"\")"; - - if(!qualifierName.equals(CDIConstants.ANY_QUALIFIER_TYPE_NAME) && !qualifierName.equals(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)){ - boolean duplicant = duplicants.get(declaration.getQualifier()).booleanValue(); - String annotation = getShortName(qualifierName); - if(duplicant) - annotation = qualifierName; - b.append(AT+annotation+value+SPACE); - } - } - b.append(Signature.getSignatureSimpleName(parameters[index].getTypeSignature())+SPACE); - b.append(parameters[index].getElementName()); - - String newValue = b.toString(); - - if(!parameters[index].getSource().equals(newValue)){ - if(rootEdit != null){ - TextEdit edit = new ReplaceEdit(parameters[index].getSourceRange().getOffset(), parameters[index].getSourceRange().getLength(), b.toString()); - rootEdit.addChild(edit); - }else{ - buffer.replace(parameters[index].getSourceRange().getOffset(), parameters[index].getSourceRange().getLength(), b.toString()); - - synchronized(compilationUnit) { - compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null); - } - } - } - } - } - - }catch(JavaModelException ex){ - CDIUIPlugin.getDefault().logError(ex); - } - } - - public static ISourceRange getParameterRegion(IInjectionPointParameter injectionParameter){ - try{ - String paramName = injectionParameter.getName(); - IMethod method = injectionParameter.getBeanMethod().getMethod(); - - for(ILocalVariable parameter : method.getParameters()){ - if(parameter.getElementName().equals(paramName)){ - return parameter.getSourceRange(); - } - } - }catch(JavaModelException ex){ - CDIUIPlugin.getDefault().logError(ex); - } - return null; - } - - public static void addQualifiersToInjectionPoint(List<ValuedQualifier> deployed, IInjectionPoint injectionPoint, ICompilationUnit compilationUnit, MultiTextEdit edit){ - try{ - if(injectionPoint instanceof IInjectionPointParameter){ - addQualifiersToParameter(compilationUnit, injectionPoint, deployed, edit); - }else{ - IJavaElement element = getInjectedJavaElement(compilationUnit, injectionPoint); - if(element == null || !element.exists()) - return; - - // delete unneeded qualifiers - List<IQualifier> toDelete = findQualifiersToDelete(injectionPoint, deployed); - - for(IQualifier qualifier : toDelete){ - deleteAnnotation(qualifier.getSourceType().getFullyQualifiedName(), compilationUnit, element, edit); - } - - for(ValuedQualifier declaration : deployed){ - String qualifierName = declaration.getQualifier().getSourceType().getFullyQualifiedName(); - String value = declaration.getValue(); - if(!qualifierName.equals(CDIConstants.ANY_QUALIFIER_TYPE_NAME) && !qualifierName.equals(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)){ - addQualifier(qualifierName, value, compilationUnit, element, edit); - updateQualifier(qualifierName, value, compilationUnit, element, edit); - } - } - } - }catch(CoreException ex){ - CDIUIPlugin.getDefault().logError(ex); - } - - } - - public static void addQualifiersToBean(List<ValuedQualifier> deployed, IBean bean, ICompilationUnit compilationUnit, MultiTextEdit edit){ - IJavaElement beanElement = null; - if(bean instanceof IBeanField){ - beanElement = ((IBeanField) bean).getField(); - }else if(bean instanceof IBeanMethod){ - beanElement = ((IBeanMethod) bean).getMethod(); - }else{ - beanElement = bean.getBeanClass(); - } - - try{ - for(IQualifierDeclaration declaration : bean.getQualifierDeclarations()){ - IQualifier qualifier = declaration.getQualifier(); - String qualifierName = qualifier.getSourceType().getFullyQualifiedName(); - if(!isQualifierNeeded(deployed, qualifier)){ - deleteAnnotation(qualifierName, compilationUnit, beanElement, edit); - } - } - - for(ValuedQualifier vq : deployed){ - String qualifierName = vq.getQualifier().getSourceType().getFullyQualifiedName(); - String value = vq.getValue(); - String elName = getELName(bean); - - if(!value.isEmpty() && (!value.equals(elName) || !qualifierName.equals(CDIConstants.NAMED_QUALIFIER_TYPE_NAME))){ - value = "(\""+value+"\")"; - }else{ - value = ""; - } - - if(!qualifierName.equals(CDIConstants.ANY_QUALIFIER_TYPE_NAME) && !qualifierName.equals(CDIConstants.DEFAULT_QUALIFIER_TYPE_NAME)){ - addAnnotation(qualifierName, compilationUnit, beanElement, value, edit); - updateAnnotation(qualifierName, compilationUnit, beanElement, value, edit); - } - - } - }catch(CoreException ex){ - CDIUIPlugin.getDefault().logError(ex); - } - - } - - private static boolean isQualifierNeeded(List<ValuedQualifier> vQualifiers, IQualifier qualifier){ - for(ValuedQualifier vq : vQualifiers){ - if(vq.getQualifier().equals(qualifier)) - return true; - } - return false; - } - - public static void addInterfaceToClass(ICompilationUnit compilationUnit, IType type, String qualifiedName) throws JavaModelException{ - String shortName = getShortName(qualifiedName); - - IType[] types = compilationUnit.getTypes(); - IType workingType = null; - for(IType t : types){ - if(t.getElementName().equals(type.getElementName())){ - workingType = t; - break; - } - } - - if(workingType != null){ - addImport(qualifiedName, compilationUnit, null); - - IBuffer buffer = compilationUnit.getBuffer(); - - String text = buffer.getText(workingType.getSourceRange().getOffset(), workingType.getSourceRange().getLength()); - - int namePosition = text.indexOf(workingType.getElementName()); - if(namePosition >= 0){ - int implementsPosition = text.indexOf(IMPLEMENTS,namePosition); - if(implementsPosition > 0){ - buffer.replace(workingType.getSourceRange().getOffset()+implementsPosition+IMPLEMENTS.length(),0,SPACE+shortName+COMMA); - }else{ - int extedsPosition = text.indexOf(EXTENDS,namePosition); - if(extedsPosition > 0){ - int bracePosition = text.indexOf(OPEN_BRACE, extedsPosition); - String str = IMPLEMENTS+SPACE+shortName+SPACE; - if(!text.substring(bracePosition-1,bracePosition).equals(SPACE)) - str = SPACE+str; - buffer.replace(workingType.getSourceRange().getOffset()+bracePosition,0,str); - }else{ - buffer.replace(workingType.getSourceRange().getOffset()+namePosition+workingType.getElementName().length(),0,SPACE+IMPLEMENTS+SPACE+shortName); - } - } - } - } - - } - - private static IJavaElement getInjectedJavaElement(ICompilationUnit compilationUnit, IInjectionPoint injectionPoint){ - if(injectionPoint instanceof IInjectionPointField){ - IField field = ((IInjectionPointField)injectionPoint).getField(); - IType type = field.getDeclaringType(); - IType t = compilationUnit.getType(type.getElementName()); - IField f = t.getField(field.getElementName()); - - return f; - }else if(injectionPoint instanceof IInjectionPointParameter){ - IMethod method = ((IInjectionPointParameter)injectionPoint).getBeanMethod().getMethod(); - IType type = method.getDeclaringType(); - IType t = compilationUnit.getType(type.getElementName()); - IMethod m = t.getMethod(method.getElementName(), method.getParameterTypes()); - // Why method? Why not Java element for parameter? - return m; - } - return null; - } - - @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 if(element instanceof ILocalVariable && ((ILocalVariable) element).isParameter()){ - IJavaElement parent = findWorkingCopy(compilationUnit, element.getParent()); - if(parent instanceof IMethod){ - for(ILocalVariable parameter : ((IMethod)parent).getParameters()){ - if(parameter.getElementName().equals(element.getElementName()) && parameter.getTypeSignature().equals(((ILocalVariable)element).getTypeSignature())) - return (T)parameter; - } - } - }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 void deleteAnnotation(String qualifiedName, ICompilationUnit compilationUnit, IJavaElement element) throws JavaModelException{ - deleteAnnotation(qualifiedName, compilationUnit, element, null); - } - - public static void deleteAnnotation(String qualifiedName, ICompilationUnit compilationUnit, IJavaElement element, MultiTextEdit rootEdit) throws JavaModelException{ - IJavaElement workingCopyElement = findWorkingCopy(compilationUnit, element); - if(workingCopyElement == null){ - return; - } - - IAnnotation annotation = findAnnotation(workingCopyElement, qualifiedName); - if(annotation != null){ - IBuffer buffer = compilationUnit.getBuffer(); - - int position = annotation.getSourceRange().getOffset() + annotation.getSourceRange().getLength(); - int numberOfSpaces = 0; - if(position < buffer.getLength()-1){ - char c = buffer.getChar(position); - while((c == ' ' || c == '\t' || c == '\n' || c == '\r') && position < buffer.getLength()-1){ - numberOfSpaces++; - position++; - c = buffer.getChar(position); - } - } - - // delete annotation - if(rootEdit != null){ - TextEdit edit = new DeleteEdit(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength()); - rootEdit.addChild(edit); - }else{ - buffer.replace(annotation.getSourceRange().getOffset(), annotation.getSourceRange().getLength()+numberOfSpaces, ""); - } - - // check and delete import - IImportDeclaration importDeclaration = compilationUnit.getImport(qualifiedName); - IImportContainer importContainer = compilationUnit.getImportContainer(); - if(importDeclaration.exists() && importContainer.exists()){ - int importSize = importContainer.getSourceRange().getOffset()+importContainer.getSourceRange().getLength(); - - if(rootEdit != null){ - int annotationStart = annotation.getSourceRange().getOffset(); - int annotationEnd = annotationStart+annotation.getSourceRange().getLength(); - String textBefore = buffer.getText(importSize, annotationStart-importSize); - String textAfter = buffer.getText(annotationEnd, buffer.getLength()-annotationEnd); - if(checkImport(textBefore, qualifiedName) && checkImport(textAfter, qualifiedName)){ - TextEdit edit = new DeleteEdit(importDeclaration.getSourceRange().getOffset(), importDeclaration.getSourceRange().getLength()); - rootEdit.addChild(edit); - } - }else{ - String text = buffer.getText(importSize, buffer.getLength()-importSize); - if(checkImport(text, qualifiedName)){ - importDeclaration.delete(false, new NullProgressMonitor()); - } - } - } - - if(rootEdit == null){ - synchronized(compilationUnit) { - compilationUnit.reconcile(ICompilationUnit.NO_AST, true, null, null); - } - } - } - } - - private static boolean checkImport(String text, String qualifiedName){ - String name = getShortName(qualifiedName); - - Pattern p = Pattern.compile(".*\\W"+name+"\\W.*",Pattern.DOTALL); //$NON-NLS-1$ //$NON-NLS-2$ - Matcher m = p.matcher(text); - return !m.matches(); - } - - public static IMember getJavaMember(IJavaElement element){ - while(element != null){ - if(element instanceof IMember) - return (IMember)element; - element = element.getParent(); - } - return null; - } - - public static boolean checkBeanQualifiers(IBean selectedBean, IBean bean, Set<IQualifier> qualifiers){ - HashSet<ValuedQualifier> valuedQualifiers = new HashSet<ValuedQualifier>(); - for(IQualifier qualifier : qualifiers){ - valuedQualifiers.add(new ValuedQualifier(qualifier)); - } - return checkValuedQualifiers(selectedBean, bean, valuedQualifiers); - } - - public static boolean checkValuedQualifiers(IBean selectedBean, IBean bean, Set<ValuedQualifier> qualifiers){ - for(ValuedQualifier qualifier : qualifiers){ - if(!isBeanContainQualifier(bean, qualifier)){ - return false; - } - } - if(bean.getQualifiers().size() == qualifiers.size()) - return true; - return false; - } - - private static boolean isBeanContainQualifier(IBean bean, ValuedQualifier valuedQualifier){ - - Set<IQualifier> qualifiers = bean.getQualifiers(); - for(IQualifier q : qualifiers){ - if(q.getSourceType().getFullyQualifiedName().equals(valuedQualifier.getQualifier().getSourceType().getFullyQualifiedName())) - return true; - } - return false; - } - - public static String findQualifierValue(IBean bean, IQualifier qualifier){ - IQualifierDeclaration declaration = findQualifierDeclaration(bean, qualifier); - if(declaration == null) - return ""; - - return findQualifierValue(bean, declaration); - } - - public static String findQualifierValue(IBean bean, IQualifierDeclaration declaration){ - Object value = declaration.getMemberValue(null); - - String result = value == null ? "" : value.toString(); - - if("".equals(result) && declaration.getQualifier().getSourceType().getFullyQualifiedName().equals(CDIConstants.NAMED_QUALIFIER_TYPE_NAME)) - result = getELName(bean); - - return result; - } - - public static IQualifierDeclaration findQualifierDeclaration(IBean bean, IQualifier qualifier){ - Set<IQualifierDeclaration> declarations = bean.getQualifierDeclarations(); - - if(declarations == null) - return null; - - for(IQualifierDeclaration declaration : declarations){ - if(declaration.getQualifier().getSourceType().getFullyQualifiedName().equals(qualifier.getSourceType().getFullyQualifiedName())) - return declaration; - } - return null; - } - - public static String getELName(IBean bean){ - String name; - if(bean instanceof IBeanField){ - name = ((IBeanField) bean).getField().getElementName(); - }else if(bean instanceof IBeanMethod){ - name = ((IBeanMethod) bean).getMethod().getElementName(); - if(BeanUtil.isGetter(((IBeanMethod) bean).getMethod())) { - return BeanUtil.getPropertyName(name); - } - }else{ - name = bean.getBeanClass().getElementName(); - if(name.length() > 0) { - name = name.substring(0, 1).toLowerCase() + name.substring(1); - } - } - - return name; - } -} 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-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/marker/SelectBeanMarkerResolution.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -10,28 +10,18 @@ ******************************************************************************/ package org.jboss.tools.cdi.ui.marker; -import java.util.ArrayList; import java.util.List; import org.eclipse.core.resources.IMarker; -import org.eclipse.core.resources.ResourcesPlugin; -import org.eclipse.core.runtime.jobs.Job; -import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.ltk.core.refactoring.CompositeChange; import org.eclipse.ltk.core.refactoring.participants.ProcessorBasedRefactoring; import org.eclipse.swt.graphics.Image; -import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IMarkerResolution2; -import org.eclipse.ui.PlatformUI; import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.core.IBean; -import org.jboss.tools.cdi.core.ICDIProject; import org.jboss.tools.cdi.core.IInjectionPoint; -import org.jboss.tools.cdi.core.IQualifier; +import org.jboss.tools.cdi.internal.core.refactoring.AddQualifiersToBeanProcessor; import org.jboss.tools.cdi.ui.CDIUIMessages; -import org.jboss.tools.cdi.ui.wizard.AddQualifiersToBeanWizard; import org.jboss.tools.cdi.ui.wizard.SelectBeanWizard; -import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite.ValuedQualifier; /** * @author Daniel Azarov Deleted: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/refactoring/CDIRefactoringProcessor.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/refactoring/CDIRefactoringProcessor.java 2011-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/refactoring/CDIRefactoringProcessor.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -1,194 +0,0 @@ -/******************************************************************************* - * 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.refactoring; - -import java.util.Set; - -import org.eclipse.core.resources.IFile; -import org.eclipse.core.resources.IResource; -import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.IProgressMonitor; -import org.eclipse.core.runtime.NullProgressMonitor; -import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.jdt.internal.ui.javaeditor.EditorUtility; -import org.eclipse.jface.text.IDocument; -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.RefactoringParticipant; -import org.eclipse.ltk.core.refactoring.participants.RefactoringProcessor; -import org.eclipse.ltk.core.refactoring.participants.SharableParticipants; -import org.eclipse.osgi.util.NLS; -import org.eclipse.swt.widgets.Display; -import org.eclipse.text.edits.MultiTextEdit; -import org.eclipse.ui.IEditorInput; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IWorkbenchWindow; -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.IBean; -import org.jboss.tools.cdi.core.ICDIProject; -import org.jboss.tools.cdi.core.IClassBean; -import org.jboss.tools.cdi.ui.CDIUIPlugin; - -public abstract class CDIRefactoringProcessor extends RefactoringProcessor { - protected static final RefactoringParticipant[] EMPTY_REF_PARTICIPANT = new RefactoringParticipant[0]; - protected IFile file; - protected RefactoringStatus status; - protected String label; - - protected CompositeChange rootChange; - protected TextFileChange change; - protected IClassBean bean; - - - public CDIRefactoringProcessor(IFile file, String label){ - this(label); - this.file = file; - } - - public CDIRefactoringProcessor(String label){ - this.label = label; - } - - protected void createRootChange(){ - rootChange = new CompositeChange(label); - change = new CDIFileChange(file.getName(), file); - - if(getEditor(file) != null) - change.setSaveMode(TextFileChange.LEAVE_DIRTY); - else - change.setSaveMode(TextFileChange.FORCE_SAVE); - - MultiTextEdit root = new MultiTextEdit(); - change.setEdit(root); - rootChange.add(change); - rootChange.markAsSynthetic(); - } - - protected IEditorPart getEditor(IFile file){ - IEditorInput ii = EditorUtility.getEditorInput(file); - - IWorkbenchWindow[] windows = CDIUIPlugin.getDefault().getWorkbench().getWorkbenchWindows(); - for(IWorkbenchWindow window : windows){ - IEditorPart editor = window.getActivePage().findEditor(ii); - if(editor != null) - return editor; - } - return null; - } - - 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; - } - - protected boolean isFileCorrect(IFile file){ - if(file == null){ - status.addFatalError(CDICoreMessages.CDI_RENAME_PROCESSOR_ERROR_FILE_NOT_FOUND); - return false; - }else if(!file.isSynchronized(IResource.DEPTH_ZERO)){ - status.addFatalError(NLS.bind(CDICoreMessages.CDI_RENAME_PROCESSOR_ERROR_OUT_OF_SYNC_PROJECT, file.getProject().getFullPath().toString())); - return false; - }else if(file.isPhantom()){ - status.addFatalError(NLS.bind(CDICoreMessages.CDI_RENAME_PROCESSOR_ERROR_PHANTOM_FILE, file.getFullPath().toString())); - return false; - }else if(file.isReadOnly()){ - status.addFatalError(NLS.bind(CDICoreMessages.CDI_RENAME_PROCESSOR_ERROR_READ_ONLY_FILE, file.getFullPath().toString())); - return false; - } - return true; - } - - @Override - public Object[] getElements() { - return new Object[]{file}; - } - - @Override - public String getIdentifier() { - return ""; - } - - @Override - public String getProcessorName() { - return label; - } - - @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(CDICoreMessages.CDI_RENAME_PROCESSOR_ERROR_BEAN_NOT_FOUND); - - 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; - } - - protected class CDIFileChange extends TextFileChange{ - - public CDIFileChange(String name, IFile file) { - super(name, file); - } - - @Override - protected void releaseDocument(final IDocument document, IProgressMonitor pm) - throws CoreException { - super.releaseDocument(document, pm); - Display.getDefault().asyncExec(new Runnable() { - public void run() { - IEditorPart editor = getEditor(getFile()); - if(editor != null){ - editor.doSave(new NullProgressMonitor()); - } - } - - }); - } - } -} Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AbstractModifyInjectionPointWizard.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AbstractModifyInjectionPointWizard.java 2011-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AbstractModifyInjectionPointWizard.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -21,8 +21,8 @@ import org.eclipse.ui.PlatformUI; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IInjectionPoint; +import org.jboss.tools.cdi.internal.core.refactoring.AddQualifiersToBeanProcessor; import org.jboss.tools.cdi.ui.CDIUIPlugin; -import org.jboss.tools.cdi.ui.marker.AddQualifiersToBeanProcessor; public abstract class AbstractModifyInjectionPointWizard extends RefactoringWizard { public AbstractModifyInjectionPointWizard(ProcessorBasedRefactoring refactoring){ Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AddQualifiersToBeanWizard.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AddQualifiersToBeanWizard.java 2011-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AddQualifiersToBeanWizard.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -15,8 +15,8 @@ import org.eclipse.ltk.core.refactoring.participants.ProcessorBasedRefactoring; import org.eclipse.osgi.util.NLS; import org.jboss.tools.cdi.core.IQualifier; +import org.jboss.tools.cdi.internal.core.refactoring.ValuedQualifier; import org.jboss.tools.cdi.ui.CDIUIMessages; -import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite.ValuedQualifier; import org.jboss.tools.common.model.ui.ModelUIImages; public class AddQualifiersToBeanWizard extends AbstractModifyInjectionPointWizard{ Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AddQualifiersToBeanWizardPage.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AddQualifiersToBeanWizardPage.java 2011-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/AddQualifiersToBeanWizardPage.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -18,10 +18,10 @@ import org.eclipse.swt.widgets.Composite; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IQualifier; +import org.jboss.tools.cdi.internal.core.refactoring.AddQualifiersToBeanProcessor; +import org.jboss.tools.cdi.internal.core.refactoring.ValuedQualifier; import org.jboss.tools.cdi.ui.CDIUIMessages; -import org.jboss.tools.cdi.ui.marker.AddQualifiersToBeanProcessor; import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite; -import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite.ValuedQualifier; public class AddQualifiersToBeanWizardPage extends UserInputWizardPage{ Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectBeanWizard.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectBeanWizard.java 2011-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/SelectBeanWizard.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -42,9 +42,9 @@ import org.jboss.tools.cdi.core.CDIImages; import org.jboss.tools.cdi.core.IBean; import org.jboss.tools.cdi.core.IQualifier; +import org.jboss.tools.cdi.internal.core.refactoring.MarkerResolutionUtils; +import org.jboss.tools.cdi.internal.core.refactoring.ValuedQualifier; import org.jboss.tools.cdi.ui.CDIUIMessages; -import org.jboss.tools.cdi.ui.marker.MarkerResolutionUtils; -import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite.ValuedQualifier; import org.jboss.tools.common.model.ui.ModelUIImages; public class SelectBeanWizard extends AbstractModifyInjectionPointWizard{ Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/wizard/xpl/AddQualifiersToBeanComposite.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -77,9 +77,10 @@ import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IQualifier; import org.jboss.tools.cdi.core.IQualifierDeclaration; +import org.jboss.tools.cdi.internal.core.refactoring.MarkerResolutionUtils; +import org.jboss.tools.cdi.internal.core.refactoring.ValuedQualifier; import org.jboss.tools.cdi.ui.CDIUIMessages; import org.jboss.tools.cdi.ui.CDIUIPlugin; -import org.jboss.tools.cdi.ui.marker.MarkerResolutionUtils; import org.jboss.tools.cdi.ui.wizard.AbstractModifyInjectionPointWizard; import org.jboss.tools.cdi.ui.wizard.AddQualifiersToBeanWizardPage; import org.jboss.tools.cdi.ui.wizard.NewQualifierCreationWizard; @@ -549,7 +550,7 @@ } remove.setEnabled(enabled); - if(enabled && ms.length == 1 && isEditEnabled(ms[0].qualifier)){ + if(enabled && ms.length == 1 && isEditEnabled(ms[0].getQualifier())){ editQualifierValue.setEnabled(true); }else{ editQualifierValue.setEnabled(false); @@ -716,7 +717,7 @@ public Image getImage(Object element) { if(element instanceof ValuedQualifier){ - return CDIImages.getImageByElement(((ValuedQualifier) element).qualifier); + return CDIImages.getImageByElement(((ValuedQualifier) element).getQualifier()); } return null; } @@ -794,37 +795,6 @@ } } - public static class ValuedQualifier{ - private IQualifier qualifier; - private String value=""; - - public ValuedQualifier(IQualifier qualifier){ - this.qualifier = qualifier; - } - - public ValuedQualifier(IQualifier qualifier, String value){ - this(qualifier); - this.value = value; - } - - public IQualifier getQualifier(){ - return qualifier; - } - - public String getValue(){ - return value; - } - - public void setValue(String value){ - this.value = value; - } - - public boolean equals(Object obj) { - if(obj instanceof ValuedQualifier) - return getQualifier().getSourceType().getFullyQualifiedName().equals(((ValuedQualifier)obj).getQualifier().getSourceType().getFullyQualifiedName()); - return false; - } - } static class ValueDialog extends MessageDialog{ String value; Modified: trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/AddQualifiersToBeanWizardTest.java =================================================================== --- trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/AddQualifiersToBeanWizardTest.java 2011-11-29 21:01:05 UTC (rev 36747) +++ trunk/cdi/tests/org.jboss.tools.cdi.ui.test/src/org/jboss/tools/cdi/ui/test/wizard/AddQualifiersToBeanWizardTest.java 2011-11-29 21:12:26 UTC (rev 36748) @@ -19,12 +19,12 @@ import org.jboss.tools.cdi.core.IClassBean; import org.jboss.tools.cdi.core.IInjectionPoint; import org.jboss.tools.cdi.core.IQualifier; -import org.jboss.tools.cdi.ui.marker.AddQualifiersToBeanProcessor; +import org.jboss.tools.cdi.internal.core.refactoring.AddQualifiersToBeanProcessor; +import org.jboss.tools.cdi.internal.core.refactoring.ValuedQualifier; import org.jboss.tools.cdi.ui.test.testmodel.CDIBean; import org.jboss.tools.cdi.ui.test.testmodel.CDIInjectionPoint; import org.jboss.tools.cdi.ui.test.testmodel.CDIProject; import org.jboss.tools.cdi.ui.wizard.AddQualifiersToBeanWizard; -import org.jboss.tools.cdi.ui.wizard.xpl.AddQualifiersToBeanComposite.ValuedQualifier; public class AddQualifiersToBeanWizardTest extends TestCase{