Author: dazarov Date: 2011-12-14 19:38:35 -0500 (Wed, 14 Dec 2011) New Revision: 37334 Modified: 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/CDIRenameProcessor.java 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.ui/src/org/jboss/tools/cdi/ui/refactoring/CDIRefactorContributionFactory.java Log: CDI EL Refactoring and Searchers don't look for ELs in dependent project https://issues.jboss.org/browse/JBIDE-10331 Modified: 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/AddQualifiersToBeanProcessor.java 2011-12-15 00:32:52 UTC (rev 37333) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/AddQualifiersToBeanProcessor.java 2011-12-15 00:38:35 UTC (rev 37334) @@ -128,6 +128,7 @@ return rootChange; } + @Override protected void createRootChange(){ } Modified: trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIRenameProcessor.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIRenameProcessor.java 2011-12-15 00:32:52 UTC (rev 37333) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/CDIRenameProcessor.java 2011-12-15 00:38:35 UTC (rev 37334) @@ -146,6 +146,7 @@ change(file, offset, length, newName); } + @Override protected ELInvocationExpression findComponentReference(ELInvocationExpression invocationExpression){ if(bean != null) return invocationExpression; Modified: 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 2011-12-15 00:32:52 UTC (rev 37333) +++ trunk/cdi/plugins/org.jboss.tools.cdi.core/src/org/jboss/tools/cdi/internal/core/refactoring/ValuedQualifier.java 2011-12-15 00:38:35 UTC (rev 37334) @@ -37,6 +37,7 @@ this.value = value; } + @Override public boolean equals(Object obj) { if(obj instanceof ValuedQualifier) return getQualifier().getSourceType().getFullyQualifiedName().equals(((ValuedQualifier)obj).getQualifier().getSourceType().getFullyQualifiedName()); Modified: trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/refactoring/CDIRefactorContributionFactory.java =================================================================== --- trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/refactoring/CDIRefactorContributionFactory.java 2011-12-15 00:32:52 UTC (rev 37333) +++ trunk/cdi/plugins/org.jboss.tools.cdi.ui/src/org/jboss/tools/cdi/ui/refactoring/CDIRefactorContributionFactory.java 2011-12-15 00:38:35 UTC (rev 37334) @@ -20,8 +20,8 @@ import org.eclipse.jface.action.Separator; import org.eclipse.jface.text.TextSelection; import org.eclipse.ltk.core.refactoring.participants.RenameRefactoring; -import org.eclipse.ltk.internal.core.refactoring.Messages; import org.eclipse.ltk.ui.refactoring.RefactoringWizardOpenOperation; +import org.eclipse.osgi.util.NLS; import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.internal.services.IWorkbenchLocationService; @@ -148,10 +148,11 @@ class RenameNamedBeanAction extends Action{ IBean bean; public RenameNamedBeanAction(IBean bean){ - super(Messages.format(CDIUIMessages.CDI_REFACTOR_CONTRIBUTOR_RENAME_NAMED_BEAN_ACTION_NAME, bean.getName())); + super(NLS.bind(CDIUIMessages.CDI_REFACTOR_CONTRIBUTOR_RENAME_NAMED_BEAN_ACTION_NAME, bean.getName())); this.bean = bean; } + @Override public void run(){ saveAndBuild();