[jbosstools-commits] JBoss Tools SVN: r18204 - branches/jbosstools-3.1.0.M4/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring.

Author: dazarov Date: 2009-10-21 09:38:32 -0400 (Wed, 21 Oct 2009) New Revision: 18204 Modified: branches/jbosstools-3.1.0.M4/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java branches/jbosstools-3.1.0.M4/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java Log: https://jira.jboss.org/jira/browse/JBIDE-5063 Modified: branches/jbosstools-3.1.0.M4/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java =================================================================== --- branches/jbosstools-3.1.0.M4/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java 2009-10-21 13:19:47 UTC (rev 18203) +++ branches/jbosstools-3.1.0.M4/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java 2009-10-21 13:38:32 UTC (rev 18204) @@ -38,7 +38,7 @@ public abstract class SeamRefactorSearcher extends RefactorSearcher { private SeamProjectsSet projectsSet; - private ISeamComponent component; + protected ISeamComponent seamComponent; public SeamRefactorSearcher(IFile file, String name){ super(file, name); @@ -52,7 +52,7 @@ public SeamRefactorSearcher(IFile file, String name, ISeamComponent component){ this(file, name); - this.component = component; + this.seamComponent = component; } protected IProject[] getProjects(){ @@ -83,33 +83,33 @@ protected void checkMatch(IFile file, ELExpression operand, int offset, int length){ if(javaElement != null && operand != null) resolve(file, operand, offset-getOffset((ELInvocationExpression)operand)); - else if(component != null && operand != null) + else if(seamComponent != null && operand != null) resolveComponentsReferences(file, operand, offset-getOffset((ELInvocationExpression)operand)); else match(file, offset, length); } protected void updateEnvironment(IProject project){ - if(component == null) + if(seamComponent == null) return; ISeamProject seamProject = SeamCorePlugin.getSeamProject(project, true); if(seamProject == null) return; - ISeamComponent oldComponent = component; + ISeamComponent oldComponent = seamComponent; if(oldComponent.getJavaDeclaration() != null){ - component = getComponent(seamProject, oldComponent.getName(), (IFile)oldComponent.getJavaDeclaration().getResource()); + seamComponent = getComponent(seamProject, oldComponent.getName(), (IFile)oldComponent.getJavaDeclaration().getResource()); }else{ for(ISeamXmlComponentDeclaration xDecl : oldComponent.getXmlDeclarations()){ - component = getComponent(seamProject, oldComponent.getName(), (IFile)xDecl.getResource()); - if(component != null) + seamComponent = getComponent(seamProject, oldComponent.getName(), (IFile)xDecl.getResource()); + if(seamComponent != null) return; } } - if(component == null) - component = oldComponent; + if(seamComponent == null) + seamComponent = oldComponent; } private ISeamComponent getComponent(ISeamProject seamProject, String name, IFile file){ @@ -141,7 +141,7 @@ ELResolution resolution = resolver.resolve(context, operand); - List<ELSegment> segments = resolution.findSegmentsByVariable(component); + List<ELSegment> segments = resolution.findSegmentsByVariable(seamComponent); for(ELSegment segment : segments){ match(file, offset+segment.getSourceReference().getStartPosition(), segment.getSourceReference().getLength()); Modified: branches/jbosstools-3.1.0.M4/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java =================================================================== --- branches/jbosstools-3.1.0.M4/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java 2009-10-21 13:19:47 UTC (rev 18203) +++ branches/jbosstools-3.1.0.M4/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRenameProcessor.java 2009-10-21 13:38:32 UTC (rev 18204) @@ -443,7 +443,7 @@ class SeamSearcher extends SeamRefactorSearcher{ public SeamSearcher(IFile declarationFile, String oldName){ - super(declarationFile, oldName, component); + super(declarationFile, oldName/*, component*/); } @Override @@ -457,7 +457,7 @@ } protected ELInvocationExpression findComponentReference(ELInvocationExpression invocationExpression){ - if(component != null) + if(seamComponent != null) return invocationExpression; ELInvocationExpression invExp = invocationExpression;