[jbosstools-commits] JBoss Tools SVN: r17821 - trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring.

[jbosstools-commits at lists.jboss.org]

Author: dazarov
Date: 2009-09-30 13:05:14 -0400 (Wed, 30 Sep 2009)
New Revision: 17821

Modified:
   trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java
Log:
https://jira.jboss.org/jira/browse/JBIDE-4771

Modified: trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java
===================================================================
--- trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java	2009-09-30 15:10:15 UTC (rev 17820)
+++ trunk/seam/plugins/org.jboss.tools.seam.core/src/org/jboss/tools/seam/internal/core/refactoring/SeamRefactorSearcher.java	2009-09-30 17:05:14 UTC (rev 17821)
@@ -23,6 +23,7 @@
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.jdt.core.IJavaElement;
 import org.eclipse.jdt.core.IJavaProject;
+import org.eclipse.jdt.core.IType;
 import org.eclipse.jdt.core.search.IJavaSearchScope;
 import org.eclipse.jdt.internal.ui.text.FastJavaPartitionScanner;
 import org.eclipse.jdt.ui.text.IJavaPartitions;
@@ -57,6 +58,7 @@
 import org.jboss.tools.common.el.core.resolver.JavaMemberELSegment;
 import org.jboss.tools.common.el.core.resolver.SimpleELContext;
 import org.jboss.tools.common.el.core.resolver.Var;
+import org.jboss.tools.common.model.util.EclipseJavaUtil;
 import org.jboss.tools.common.model.util.EclipseResourceUtil;
 import org.jboss.tools.common.util.FileUtil;
 import org.jboss.tools.seam.core.SeamCorePlugin;
@@ -280,7 +282,7 @@
 					ELInvocationExpression expression = findComponentReference(ie);
 					if(expression != null){
 						ELInvocationExpression left = expression.getLeft();
-						checkMatch(file, expression, offset+getOffset(left), offset+getOffset(expression), getLength(expression));
+						checkMatch(file, left, offset+getOffset(left), offset+getOffset(expression), getLength(expression));
 					}
 				}
 			}
@@ -409,12 +411,13 @@
 		return false;
 	}
 
-	private void resolve(IFile file, ELExpression operand, int leftOffset, int offset, int length){
-		//System.out.println("resolve file - "+file.getFullPath()+" leftOffset - "+leftOffset+" offset - "+offset);
-		ELResolver[] resolvers = ELResolverFactoryManager.getInstance().getResolvers(file);
+	private void resolve(IFile file, ELExpression operand, int leftOffset,
+			int offset, int length) {
+		ELResolver[] resolvers = ELResolverFactoryManager.getInstance()
+				.getResolvers(file);
 
-		for(ELResolver resolver : resolvers){
-			if(!(resolver instanceof ELCompletionEngine))
+		for (ELResolver resolver : resolvers) {
+			if (!(resolver instanceof ELCompletionEngine))
 				continue;
 
 			SimpleELContext context = new SimpleELContext();
@@ -422,7 +425,8 @@
 			context.setResource(file);
 			context.setElResolvers(resolvers);
 
-			List<Var> vars = ElVarSearcher.findAllVars(context, leftOffset, resolver);
+			List<Var> vars = ElVarSearcher.findAllVars(context, leftOffset,
+					resolver);
 
 			context.setVars(vars);
 
@@ -430,10 +434,19 @@
 
 			ELSegment segment = resolution.findSegmentByOffset(leftOffset);
 
-			if(segment != null && segment instanceof JavaMemberELSegment && segment.isResolved()) {
-				JavaMemberELSegment javaSegment = (JavaMemberELSegment)segment;
+			if (segment != null && segment instanceof JavaMemberELSegment
+					&& segment.isResolved()) {
+				JavaMemberELSegment javaSegment = (JavaMemberELSegment) segment;
 				IJavaElement segmentJavaElement = javaSegment.getJavaElement();
-				if(javaElement.equals(segmentJavaElement))
+				if (javaElement instanceof IType
+						&& segmentJavaElement instanceof IType) {
+					if (EclipseJavaUtil.isDerivedClass(
+							((IType) segmentJavaElement)
+									.getFullyQualifiedName(),
+							((IType) javaElement).getFullyQualifiedName(), file
+									.getProject()))
+						;
+				} else if (javaElement.equals(segmentJavaElement))
 					match(file, offset, length);
 			}
 		}